From a706458f985f0dbbcaa26291701c8414fb96bfa7 Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 27 Oct 2026 08:20:40 +0530 Subject: [PATCH 1/3] fix(ai): explain usage value and update Pro pin Clarify subscription coverage and show the API-price estimate explanation in both usage tooltips with paragraph breaks. Align Node lockfile versions with 5.5.11-0. --- src-node/package-lock.json | 6 +++--- src/nls/root/strings.js | 4 ++-- src/styles/Extn-AIChatPanel.less | 7 ++++++- tracking-repos.json | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src-node/package-lock.json b/src-node/package-lock.json index 2740ae1359..211086e5e9 100644 --- a/src-node/package-lock.json +++ b/src-node/package-lock.json @@ -1,12 +1,12 @@ { "name": "@phcode/node-core", - "version": "5.5.10-0", + "version": "5.5.11-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@phcode/node-core", - "version": "5.5.10-0", + "version": "5.5.11-0", "hasInstallScript": true, "license": "GNU-AGPL3.0", "dependencies": { @@ -32,7 +32,7 @@ } }, "..": { - "version": "5.5.10-0", + "version": "5.5.11-0", "hasInstallScript": true, "dependencies": { "@bugsnag/js": "^7.18.0", diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 7d931c19c5..bfa6a28605 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -2893,8 +2893,8 @@ define({ "AI_CHAT_USAGE_TURNS_CALLS": "Turns \u00b7 API calls", "AI_CHAT_USAGE_API_TIME": "Time in API", "AI_CHAT_USAGE_COST": "Cost at list price", - "AI_CHAT_USAGE_NOTE": "You won’t be charged this amount by Phoenix Pro.", - "AI_CHAT_USAGE_SPEND_INCLUDED": "If you’re using a Claude or ChatGPT subscription, you won’t be charged this amount separately by your AI provider.", + "AI_CHAT_USAGE_NOTE": "Your Claude or ChatGPT subscription covers this usage.", + "AI_CHAT_USAGE_SPEND_INCLUDED": "This estimates what your AI usage would cost at standard API prices, helping you see the value included in your subscription.\n\nIf you have a Claude or ChatGPT subscription, you won’t be charged this amount by your AI provider.", "AI_CHAT_USAGE_SPEND_NO_PRO_CHARGE": "You won’t be charged this amount by Phoenix Pro.", "AI_CHAT_USAGE_OPTION_TURNS": "Show usage after every turn", "AI_CHAT_USAGE_OPTION_DOLLARS": "Show $ cost", diff --git a/src/styles/Extn-AIChatPanel.less b/src/styles/Extn-AIChatPanel.less index ced1d358b7..0f5d4154de 100644 --- a/src/styles/Extn-AIChatPanel.less +++ b/src/styles/Extn-AIChatPanel.less @@ -4947,6 +4947,7 @@ border-radius: 8px; box-shadow: 0 4px 14px rgba(0, 0, 0, 0.35); color: @project-panel-text-1; + white-space: pre-line; line-height: 1.45; z-index: 1; pointer-events: none; @@ -7222,7 +7223,7 @@ } } - // Leave enough room for the no-charge sentence; wrap longer copy on narrow windows. + // Wrap the value explanation on narrow windows and preserve its paragraph breaks. .ai-usage-tip-note, .ai-usage-tip-foot { max-width: ~"min(280px, calc(100vw - 42px))"; @@ -7230,6 +7231,10 @@ line-height: 1.45; } + .ai-usage-tip-note { + white-space: pre-line; + } + .ai-usage-tip-foot { margin-top: 8px; padding-top: 7px; diff --git a/tracking-repos.json b/tracking-repos.json index 2e491514c0..86c5e335b1 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "69e7fa766936e0f35dda949f7a603a1f9afadd7a" + "commitID": "f91c5ba452fdde6cf8d83b1bcd94cf7601dd9727" } } From 6ce06b2d3d3ae087199b39ebcad668268bfdc70b Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 27 Oct 2026 08:35:57 +0530 Subject: [PATCH 2/3] fix(ai): use app name in CLI labels and update Pro pin --- src/nls/root/strings.js | 28 +++++++++++++--------------- tracking-repos.json | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index bfa6a28605..ea65c867d3 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -2760,29 +2760,27 @@ define({ "AI_CHAT_STOP_TITLE": "Stop generation (Esc)", "AI_NOTIFY_CLI_DONE_TITLE": "{0} is done", "AI_NOTIFY_VIEW_CHAT": "View chat", - "AI_CHAT_CLI_CONNECTING": "Connecting to Phoenix…", - "AI_CHAT_CLI_CONNECTED": "Connected to Phoenix", - "AI_CHAT_CLI_CONNECTION_TITLE": "Phoenix connection", + "AI_CHAT_CLI_CONNECTING": "Connecting to {APP_NAME}…", + "AI_CHAT_CLI_CONNECTED": "Connected to {APP_NAME}", + "AI_CHAT_CLI_CONNECTION_TITLE": "{APP_NAME} connection", "AI_CHAT_CLI_CONTEXT_TITLE": "See your editor context", "AI_CHAT_CLI_CONTEXT_DESC": "Open files, selections and Live Preview.", - "AI_CHAT_CLI_TOOLS_TITLE": "Use Phoenix tools", + "AI_CHAT_CLI_TOOLS_TITLE": "Use {APP_NAME} tools", "AI_CHAT_CLI_TOOLS_DESC": "Edit files, inspect the page and interact with Live Preview.", - "AI_CHAT_CLI_DISCONNECT": "Disconnect Phoenix", - "AI_CHAT_CLI_RECONNECT": "Reconnect Phoenix", - "AI_CHAT_CLI_DISCONNECTED": "Disconnected from Phoenix", + "AI_CHAT_CLI_DISCONNECT": "Disconnect {APP_NAME}", + "AI_CHAT_CLI_RECONNECT": "Reconnect {APP_NAME}", + "AI_CHAT_CLI_DISCONNECTED": "Disconnected from {APP_NAME}", "AI_CHAT_CLI_KEEP_RUNNING": "Your CLI session will keep running.", "AI_CHAT_CLI_CONNECT_RESTART": "Start a new CLI session to connect again.", "AI_CHAT_CLI_TOGGLE_FAILED": "Could not change the connection. Please try again.", - "AI_CHAT_CLI_EDITOR_UNAVAILABLE": "Waiting for the Phoenix editor to reconnect.", - "AI_CHAT_CLI_CONNECTED_TOOLTIP": "{0} is connected to Phoenix: it sees the open file, unsaved changes and the live preview, and can use the editor's tools.", - "AI_CHAT_CLI_CONNECTED_NO_HOOKS_TOOLTIP": "{0} can use Phoenix's editor tools, but does not yet receive the editor state with each prompt.", + "AI_CHAT_CLI_EDITOR_UNAVAILABLE": "Waiting for {APP_NAME} to reconnect.", "AI_CHAT_CLI_PAUSED": "Paused", "AI_CHAT_CLI_PAUSED_TOOLTIP": "A different project is open, so {0} cannot use the editor. Switch the session to this project to reconnect it.", - "AI_CHAT_CLI_NOT_CONNECTED": "Not connected to Phoenix", - "AI_CHAT_CLI_CONNECT_ERROR": "{0} could not connect to Phoenix and is running without it: {1}", - "AI_SETTINGS_CLI_CONNECT_LABEL": "Connect {0} to Phoenix", + "AI_CHAT_CLI_NOT_CONNECTED": "Not connected to {APP_NAME}", + "AI_CHAT_CLI_CONNECT_ERROR": "{0} could not connect to {APP_NAME} and is running without it: {1}", + "AI_SETTINGS_CLI_CONNECT_LABEL": "Connect {0} to {APP_NAME}", "AI_SETTINGS_CLI_CONNECT_DESC": "When launched from the AI panel, the CLI sees your open files, unsaved changes and live preview, and can use the editor's tools. Takes effect the next time it starts.", - "AI_CHAT_CLI_HOOK_REVIEW": "{0} may ask you to review Phoenix's hooks. After reviewing them, select “Trust all and continue” to keep editor context and open files in sync. Without these hooks, you can still use the Phoenix tools.", + "AI_CHAT_CLI_HOOK_REVIEW": "{0} may ask you to review {APP_NAME}'s hooks. After reviewing them, select “Trust all and continue” to keep editor context and open files in sync. Without these hooks, you can still use the {APP_NAME} tools.", "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed", "AI_CHAT_CLI_INSTALL_MSG": "Claude Code CLI must be installed on your system to use AI features in {APP_NAME}.", "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code", @@ -3190,7 +3188,7 @@ define({ "LIVE_DEV_AI_CHAT_TRANSFER_KEYS": "Transfer the draft, then submit in the CLI", "LIVE_DEV_AI_CHAT_CLI_NOT_READY": "Open a running CLI session, then try again. Your draft is kept here.", "LIVE_DEV_AI_CHAT_CLI_TRANSFERRED": "Draft added. Review and press Enter to send.", - "LIVE_DEV_AI_CHAT_CLI_CONNECTION_REQUIRED": "Connect Phoenix using the connection button in the CLI header, then try again. If this session started without a connection, start a connected session. Your draft is kept here.", + "LIVE_DEV_AI_CHAT_CLI_CONNECTION_REQUIRED": "Connect {APP_NAME} using the connection button in the CLI header, then try again. If this session started without a connection, start a connected session. Your draft is kept here.", "LIVE_DEV_AI_CHAT_CLI_CONTEXT_SUMMARY": "Attached from Phoenix: {0}.", "LIVE_DEV_AI_CHAT_CLI_SCREENSHOT": "1 screenshot", "LIVE_DEV_AI_CHAT_CLI_SCREENSHOTS": "{0} screenshots", diff --git a/tracking-repos.json b/tracking-repos.json index 86c5e335b1..c28f0afab0 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "f91c5ba452fdde6cf8d83b1bcd94cf7601dd9727" + "commitID": "25ca4fb58ceae29516f5830259283d64420d9582" } } From 77b15382463bbf4ca1ba22d18655007a2d560a43 Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 27 Oct 2026 11:31:32 +0530 Subject: [PATCH 3/3] build: update pro deps --- tracking-repos.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracking-repos.json b/tracking-repos.json index c28f0afab0..855dfc8acb 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "25ca4fb58ceae29516f5830259283d64420d9582" + "commitID": "d786c9f2f66d7a9836727672d72b37170c5747e9" } }