wave-code 0.19.4 → 0.19.6

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkEjE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEjE"}

package/dist/cli.js

@@ -4,7 +4,7 @@ import { App } from "./components/App.js";
 import { cleanupLogs } from "./utils/logger.js";
 import { removeWorktree } from "./utils/worktree.js";
 export async function startCli(options) {
-    const { restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, mcpServers, } = options;
+    const { restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, originalCwd, version, model, mcpServers, } = options;
     // Continue with ink-based UI for normal mode
     let shouldRemoveWorktree = false;
     const handleExit = (shouldRemove) => {
@@ -12,7 +12,7 @@ export async function startCli(options) {
         unmount();
     };
     // Render the application
-    const { unmount, waitUntilExit } = render(_jsx(App, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, mcpServers: mcpServers, onExit: handleExit }), { exitOnCtrlC: false });
+    const { unmount, waitUntilExit } = render(_jsx(App, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, originalCwd: originalCwd, version: version, model: model, mcpServers: mcpServers, onExit: handleExit }), { exitOnCtrlC: false });
     // Wait for the app to finish unmounting
     await waitUntilExit();
     try {

package/dist/components/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAwID,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAqClC,CAAC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AA2ID,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAuClC,CAAC"}

package/dist/components/App.js

@@ -50,7 +50,7 @@ const ChatWithExitPrompt = ({ worktreeSession, onExit }) => {
     }
     return _jsx(ChatInterface, {});
 };
-const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, mcpServers, onExit, }) => {
+const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, originalCwd, version, model, mcpServers, onExit, }) => {
     // Handle Ctrl-C for non-worktree sessions (immediate exit)
     // Ink runs terminal in raw mode, so Ctrl+C arrives as useInput event, not SIGINT
     useInput((input, key) => {
@@ -60,10 +60,10 @@ const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools
         }
     });
     if (worktreeSession) {
-        return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatWithExitPrompt, { worktreeSession: worktreeSession, onExit: onExit }) }));
+        return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, originalCwd: originalCwd, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatWithExitPrompt, { worktreeSession: worktreeSession, onExit: onExit }) }));
     }
-    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatInterface, {}) }));
+    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, originalCwd: originalCwd, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatInterface, {}) }));
 };
-export const App = ({ restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, mcpServers, onExit, }) => {
-    return (_jsx(AppProvider, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, children: _jsx(AppWithProviders, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, mcpServers: mcpServers, onExit: onExit }) }));
+export const App = ({ restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, originalCwd, version, model, mcpServers, onExit, }) => {
+    return (_jsx(AppProvider, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, children: _jsx(AppWithProviders, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, originalCwd: originalCwd, version: version, model: model, mcpServers: mcpServers, onExit: onExit }) }));
 };

package/dist/contexts/useChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}

package/dist/contexts/useChat.js

@@ -15,7 +15,7 @@ export const useChat = () => {
     }
     return context;
 };
-export const ChatProvider = ({ children, bypassPermissions, permissionMode: initialPermissionMode, pluginDirs, tools, allowedTools, disallowedTools, workdir, worktreeSession, version, model, mcpServers, }) => {
+export const ChatProvider = ({ children, bypassPermissions, permissionMode: initialPermissionMode, pluginDirs, tools, allowedTools, disallowedTools, workdir, worktreeSession, originalCwd, version, model, mcpServers, }) => {
     const { restoreSessionId, continueLastSession } = useAppConfig();
     const { stdout } = useStdout();
     // Message Display State
@@ -233,6 +233,20 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
                 mcpServers,
             });
             agentRef.current = agent;
+            // Inject worktree session into this agent's own DI container so system
+            // prompts and permission checks reflect the CLI -w worktree. This state is
+            // per-session, not process-global (see specs/047-worktree.md FR-042).
+            if (worktreeSession) {
+                const session = {
+                    originalCwd: originalCwd ?? worktreeSession.repoRoot,
+                    worktreePath: worktreeSession.path,
+                    worktreeBranch: worktreeSession.branch,
+                    worktreeName: worktreeSession.name,
+                    isNew: worktreeSession.isNew,
+                    repoRoot: worktreeSession.repoRoot,
+                };
+                agent.setWorktreeSession(session);
+            }
             // Get initial state
             setSessionId(agent.sessionId);
             setMessages(agent.messages);
@@ -266,6 +280,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         disallowedTools,
         workdir,
         worktreeSession,
+        originalCwd,
         model,
         initialPermissionMode,
         throttledSetMessages,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAoBA,wBAAsB,IAAI,kBAsZzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,wBAAsB,IAAI,kBAmZzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { generateRandomName, setCurrentWorktreeSession, } from "wave-agent-sdk";
+import { generateRandomName } from "wave-agent-sdk";
 import { createWorktree } from "./utils/worktree.js";
 import path from "path";
 import { readFileSync } from "fs";
@@ -237,15 +237,9 @@ export async function main() {
                 name = generateRandomName();
             }
             worktreeSession = createWorktree(name, originalCwd);
-            // Register worktree session so system prompt includes worktree warnings
-            setCurrentWorktreeSession({
-                originalCwd,
-                worktreePath: worktreeSession.path,
-                worktreeBranch: worktreeSession.branch,
-                worktreeName: worktreeSession.name,
-                isNew: worktreeSession.isNew,
-                repoRoot: worktreeSession.repoRoot,
-            });
+            // Note: the full worktree session (originalCwd etc.) is injected into the
+            // agent's DI container after the agent is created in useChat.tsx. This keeps
+            // worktree state per-session instead of process-global.
         }
         const workdir = worktreeSession?.path || originalCwd;
         if (worktreeSession) {
@@ -272,6 +266,7 @@ export async function main() {
                 disallowedTools,
                 worktreeSession,
                 workdir,
+                originalCwd,
                 version,
                 model: argv.model,
                 mcpServers,
@@ -293,6 +288,7 @@ export async function main() {
                 disallowedTools,
                 worktreeSession,
                 workdir,
+                originalCwd,
                 version,
                 model: argv.model,
                 mcpServers,
@@ -314,6 +310,7 @@ export async function main() {
             disallowedTools,
             worktreeSession,
             workdir,
+            originalCwd,
             version,
             model: argv.model,
             mcpServers,

package/dist/print-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC;CACvE;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqL3E"}
+{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC;CACvE;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqM3E"}

package/dist/print-cli.js

@@ -14,7 +14,7 @@ function displayTimingInfo(startTime, showStats) {
 }
 export async function startPrintCli(options) {
     const startTime = new Date();
-    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, model, mcpServers, } = options;
+    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, originalCwd, model, mcpServers, } = options;
     if ((typeof message !== "string" || message.trim() === "") &&
         !continueLastSession &&
         !restoreSessionId) {
@@ -81,10 +81,24 @@ export async function startPrintCli(options) {
             allowedTools,
             disallowedTools,
             workdir,
+            worktreeName: worktreeSession?.name,
+            isNewWorktree: worktreeSession?.isNew,
             model,
             mcpServers,
             // 保持流式模式以获得更好的命令行用户体验
         });
+        // Inject worktree session into this agent's container (per-session, not global)
+        if (worktreeSession) {
+            const session = {
+                originalCwd: originalCwd ?? worktreeSession.repoRoot,
+                worktreePath: worktreeSession.path,
+                worktreeBranch: worktreeSession.branch,
+                worktreeName: worktreeSession.name,
+                isNew: worktreeSession.isNew,
+                repoRoot: worktreeSession.repoRoot,
+            };
+            agent.setWorktreeSession(session);
+        }
         // Send message if provided and not empty
         if (typeof message === "string" && message.trim() !== "") {
             await agent.sendMessage(message);

package/dist/stdio/agentBridge.d.ts

@@ -41,6 +41,8 @@ export declare class AgentBridge {
     private clearMessages;
     private rewindToMessage;
     private deleteQueuedMessage;
+    private updateQueuedMessage;
+    private deleteQueuedMessageById;
     private getMessages;
     private getFullMessageThread;
     private setPermissionMode;

package/dist/stdio/agentBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentBridge.d.ts","sourceRoot":"","sources":["../../src/stdio/agentBridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAuBH,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AAiBvB,MAAM,MAAM,mBAAmB,GAAG,CAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,MAAM,KACf,IAAI,CAAC;AAEV,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,mBAAmB,CAAC;CAC3B;AAsDD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,kBAAkB,CAGtB;IACJ,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,iBAAiB,CAAqB;gBAElC,OAAO,EAAE,kBAAkB;IAMjC,aAAa,CACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAyJnB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;YAiB3C,UAAU;YAsDV,OAAO;YAWP,cAAc;YASd,YAAY;IAU1B,OAAO,CAAC,cAAc;YAiBR,YAAY;YAkDZ,WAAW;YA2BX,IAAI;YAMJ,YAAY;YAMZ,aAAa;YAMb,eAAe;IAuB7B,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,WAAW;YAKL,oBAAoB;YAUpB,iBAAiB;IAS/B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,aAAa;YAKP,gBAAgB;YAShB,mBAAmB;IAWjC,OAAO,CAAC,gBAAgB;YAOV,WAAW;YAYX,gBAAgB;YAYhB,mBAAmB;IAejC,OAAO,CAAC,UAAU;YA+BJ,aAAa;YAWb,KAAK;YAaL,MAAM;IAQpB,OAAO,CAAC,aAAa;YAUP,WAAW;YAoBX,aAAa;YAYb,eAAe;YASf,YAAY;YASZ,aAAa;YAYb,YAAY;YAQZ,gBAAgB;YAIhB,cAAc;YASd,iBAAiB;YAUjB,iBAAiB;IAW/B,OAAO,CAAC,eAAe;IA0GvB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,iBAAiB;CAI1B;AAID,qBAAa,QAAS,SAAQ,KAAK;IACjC,IAAI,EAAE,MAAM,CAAC;gBACD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKzC,cAAc,IAAI,YAAY;CAG/B"}
+{"version":3,"file":"agentBridge.d.ts","sourceRoot":"","sources":["../../src/stdio/agentBridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAuBH,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AAkBvB,MAAM,MAAM,mBAAmB,GAAG,CAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,MAAM,KACf,IAAI,CAAC;AAEV,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,mBAAmB,CAAC;CAC3B;AAsDD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,kBAAkB,CAGtB;IACJ,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,IAAI,CAAsB;IAClC,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,iBAAiB,CAAqB;gBAElC,OAAO,EAAE,kBAAkB;IAMjC,aAAa,CACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAkKnB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;YAiB3C,UAAU;YAwDV,OAAO;YAWP,cAAc;YASd,YAAY;IAU1B,OAAO,CAAC,cAAc;YAiBR,YAAY;YAkDZ,WAAW;YA2BX,IAAI;YAMJ,YAAY;YAMZ,aAAa;YAMb,eAAe;IAuB7B,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,WAAW;YAKL,oBAAoB;YAUpB,iBAAiB;IAS/B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,aAAa;YAKP,gBAAgB;YAShB,mBAAmB;IAWjC,OAAO,CAAC,gBAAgB;YAOV,WAAW;YAYX,gBAAgB;YAYhB,mBAAmB;IAejC,OAAO,CAAC,UAAU;YA+BJ,aAAa;YAab,KAAK;YAaL,MAAM;IAQpB,OAAO,CAAC,aAAa;YAUP,WAAW;YAoBX,aAAa;YAYb,eAAe;YASf,YAAY;YASZ,aAAa;YAYb,YAAY;YAQZ,gBAAgB;YAIhB,cAAc;YASd,iBAAiB;YAUjB,iBAAiB;IAW/B,OAAO,CAAC,eAAe;IAoHvB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,iBAAiB;CAI1B;AAID,qBAAa,QAAS,SAAQ,KAAK;IACjC,IAAI,EAAE,MAAM,CAAC;gBACD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKzC,cAAc,IAAI,YAAY;CAG/B"}

package/dist/stdio/agentBridge.js

@@ -19,6 +19,7 @@ import { INTERNAL_ERROR as PROTOCOL_INTERNAL_ERROR, METHOD_NOT_FOUND as PROTOCOL
 import { readFileSync } from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
+import { logger } from "../utils/logger.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const CLI_VERSION = (() => {
     try {
@@ -66,6 +67,10 @@ export class AgentBridge {
                 return this.rewindToMessage(p.messageId, sessionId);
             case "deleteQueuedMessage":
                 return this.deleteQueuedMessage(p.index, sessionId);
+            case "updateQueuedMessage":
+                return this.updateQueuedMessage(p.id, p.text, p.images, sessionId);
+            case "deleteQueuedMessageById":
+                return this.deleteQueuedMessageById(p.id, sessionId);
             case "getMessages":
                 return this.getMessages(sessionId);
             case "getFullMessageThread":
@@ -141,6 +146,7 @@ export class AgentBridge {
         const callbacks = this.createCallbacks(ctx);
         const options = {
             callbacks,
+            logger,
             workdir: params.workdir,
             restoreSessionId: params.restoreSessionId,
             apiKey: params.apiKey,
@@ -165,7 +171,8 @@ export class AgentBridge {
             storedConfig: { ...params },
         });
         if (params.clientVersion) {
-            console.debug(`[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}`);
+            // stdout 是 JSON-RPC 协议通道，诊断日志必须走 stderr 以免污染协议
+            process.stderr.write(`[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}\n`);
         }
         return {
             sessionId: agent.sessionId,
@@ -292,6 +299,19 @@ export class AgentBridge {
         entry.agent.removeQueuedMessage(index);
         return null;
     }
+    updateQueuedMessage(id, text, images, sessionId) {
+        const entry = this.requireSession(sessionId);
+        const ok = entry.agent.updateQueuedMessageById(id, {
+            content: text,
+            images,
+        });
+        return { ok };
+    }
+    deleteQueuedMessageById(id, sessionId) {
+        const entry = this.requireSession(sessionId);
+        entry.agent.removeQueuedMessageById(id);
+        return null;
+    }
     getMessages(sessionId) {
         const entry = this.requireSession(sessionId);
         return { messages: entry.agent.messages };
@@ -374,6 +394,7 @@ export class AgentBridge {
         return {
             isAuthenticated: authService.isSSOAuthenticated(),
             user: authService.getAuthUser(),
+            serverUrl: authService.getServerUrl(),
         };
     }
     async login(serverUrl) {
@@ -509,6 +530,9 @@ export class AgentBridge {
             onPermissionModeChange: (mode) => {
                 this.emit("permissionModeChange", { mode }, ctx.registeredSessionId);
             },
+            onWorkdirChange: (newCwd) => {
+                this.emit("workdirChange", { workdir: newCwd }, ctx.registeredSessionId);
+            },
             onMcpServersChange: (servers) => {
                 this.emit("mcpServersChange", { servers }, ctx.registeredSessionId);
             },
@@ -527,6 +551,9 @@ export class AgentBridge {
                         b.taskId === params.taskId));
                 this.emit("notificationMessageAdded", { ...params, message: msg }, ctx.registeredSessionId);
             },
+            onCompactBlockAdded: (content) => {
+                this.emit("compactBlockAdded", { content }, ctx.registeredSessionId);
+            },
         };
     }
     findLastUserMessage(agent) {

package/dist/stdio/protocol.d.ts

@@ -34,9 +34,9 @@ export declare const INVALID_REQUEST = -32600;
 export declare const METHOD_NOT_FOUND = -32601;
 export declare const INVALID_PARAMS = -32602;
 export declare const INTERNAL_ERROR = -32603;
-export type RequestMethod = "initialize" | "destroy" | "restoreSession" | "listSessions" | "getSessionInfo" | "sendMessage" | "bang" | "abortMessage" | "clearMessages" | "rewindToMessage" | "deleteQueuedMessage" | "getMessages" | "getFullMessageThread" | "setPermissionMode" | "getPermissionMode" | "getMcpServers" | "connectMcpServer" | "disconnectMcpServer" | "getSlashCommands" | "searchFiles" | "getPromptHistory" | "searchPromptHistory" | "updateConfig" | "getAuthStatus" | "login" | "logout" | "listPlugins" | "installPlugin" | "uninstallPlugin" | "enablePlugin" | "disablePlugin" | "updatePlugin" | "listMarketplaces" | "addMarketplace" | "removeMarketplace" | "updateMarketplace";
+export type RequestMethod = "initialize" | "destroy" | "restoreSession" | "listSessions" | "getSessionInfo" | "sendMessage" | "bang" | "abortMessage" | "clearMessages" | "rewindToMessage" | "deleteQueuedMessage" | "updateQueuedMessage" | "deleteQueuedMessageById" | "getMessages" | "getFullMessageThread" | "setPermissionMode" | "getPermissionMode" | "getMcpServers" | "connectMcpServer" | "disconnectMcpServer" | "getSlashCommands" | "searchFiles" | "getPromptHistory" | "searchPromptHistory" | "updateConfig" | "getAuthStatus" | "login" | "logout" | "listPlugins" | "installPlugin" | "uninstallPlugin" | "enablePlugin" | "disablePlugin" | "updatePlugin" | "listMarketplaces" | "addMarketplace" | "removeMarketplace" | "updateMarketplace";
 export type ClientNotificationMethod = "permissionResponse";
-export type ServerNotificationMethod = "messagesChange" | "userMessageAdded" | "assistantMessageAdded" | "assistantContentUpdated" | "assistantReasoningUpdated" | "toolBlockUpdated" | "errorBlockAdded" | "loadingChange" | "commandRunningChange" | "queuedMessagesChange" | "tasksChange" | "sessionIdChange" | "permissionModeChange" | "mcpServersChange" | "bangMessageAdded" | "bangMessageUpdated" | "bangMessageCompleted" | "notificationMessageAdded" | "permissionRequest" | "authUrl";
+export type ServerNotificationMethod = "messagesChange" | "userMessageAdded" | "assistantMessageAdded" | "assistantContentUpdated" | "assistantReasoningUpdated" | "toolBlockUpdated" | "errorBlockAdded" | "loadingChange" | "commandRunningChange" | "queuedMessagesChange" | "tasksChange" | "sessionIdChange" | "permissionModeChange" | "mcpServersChange" | "workdirChange" | "bangMessageAdded" | "bangMessageUpdated" | "bangMessageCompleted" | "notificationMessageAdded" | "permissionRequest" | "authUrl" | "compactBlockAdded";
 export declare function isRequest(msg: unknown): msg is JsonRpcRequest;
 export declare function isNotification(msg: unknown): msg is JsonRpcNotification;
 //# sourceMappingURL=protocol.d.ts.map

package/dist/stdio/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/stdio/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,cAAc,SAAS,CAAC;AAIrC,MAAM,MAAM,aAAa,GACrB,YAAY,GACZ,SAAS,GACT,gBAAgB,GAChB,cAAc,GACd,gBAAgB,GAChB,aAAa,GACb,MAAM,GACN,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,qBAAqB,GACrB,aAAa,GACb,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,GACf,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,qBAAqB,GACrB,cAAc,GAEd,eAAe,GACf,OAAO,GACP,QAAQ,GAER,aAAa,GACb,eAAe,GACf,iBAAiB,GACjB,cAAc,GACd,eAAe,GACf,cAAc,GACd,kBAAkB,GAClB,gBAAgB,GAChB,mBAAmB,GACnB,mBAAmB,CAAC;AAIxB,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,CAAC;AAI5D,MAAM,MAAM,wBAAwB,GAChC,gBAAgB,GAChB,kBAAkB,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,2BAA2B,GAC3B,kBAAkB,GAClB,iBAAiB,GACjB,eAAe,GACf,sBAAsB,GACtB,sBAAsB,GACtB,aAAa,GACb,iBAAiB,GACjB,sBAAsB,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,oBAAoB,GACpB,sBAAsB,GACtB,0BAA0B,GAC1B,mBAAmB,GACnB,SAAS,CAAC;AAId,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,cAAc,CAS7D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,mBAAmB,CAIvE"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/stdio/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,cAAc,SAAS,CAAC;AAIrC,MAAM,MAAM,aAAa,GACrB,YAAY,GACZ,SAAS,GACT,gBAAgB,GAChB,cAAc,GACd,gBAAgB,GAChB,aAAa,GACb,MAAM,GACN,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,qBAAqB,GACrB,qBAAqB,GACrB,yBAAyB,GACzB,aAAa,GACb,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,GACf,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,qBAAqB,GACrB,cAAc,GAEd,eAAe,GACf,OAAO,GACP,QAAQ,GAER,aAAa,GACb,eAAe,GACf,iBAAiB,GACjB,cAAc,GACd,eAAe,GACf,cAAc,GACd,kBAAkB,GAClB,gBAAgB,GAChB,mBAAmB,GACnB,mBAAmB,CAAC;AAIxB,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,CAAC;AAI5D,MAAM,MAAM,wBAAwB,GAChC,gBAAgB,GAChB,kBAAkB,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,2BAA2B,GAC3B,kBAAkB,GAClB,iBAAiB,GACjB,eAAe,GACf,sBAAsB,GACtB,sBAAsB,GACtB,aAAa,GACb,iBAAiB,GACjB,sBAAsB,GACtB,kBAAkB,GAClB,eAAe,GACf,kBAAkB,GAClB,oBAAoB,GACpB,sBAAsB,GACtB,0BAA0B,GAC1B,mBAAmB,GACnB,SAAS,GACT,mBAAmB,CAAC;AAIxB,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,cAAc,CAS7D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,mBAAmB,CAIvE"}

package/dist/types.d.ts

@@ -9,6 +9,8 @@ export interface BaseAppProps {
     disallowedTools?: string[];
     worktreeSession?: WorktreeSession;
     workdir?: string;
+    /** The working directory before entering a worktree (CLI -w); injected into the agent's container. */
+    originalCwd?: string;
     version?: string;
     model?: string;
     /** Optional MCP server configs to pass to Agent.create() */

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC9C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sGAAsG;IACtG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.19.4",
+  "version": "0.19.6",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "semver": "^7.7.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.19.4"
+    "wave-agent-sdk": "0.19.6"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/cli.tsx

@@ -22,6 +22,7 @@ export async function startCli(options: CliOptions): Promise<void> {
     disallowedTools,
     worktreeSession,
     workdir,
+    originalCwd,
     version,
     model,
     mcpServers,
@@ -48,6 +49,7 @@ export async function startCli(options: CliOptions): Promise<void> {
       disallowedTools={disallowedTools}
       worktreeSession={worktreeSession}
       workdir={workdir}
+      originalCwd={originalCwd}
       version={version}
       model={model}
       mcpServers={mcpServers}

package/src/components/App.tsx

@@ -98,6 +98,7 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
   disallowedTools,
   worktreeSession,
   workdir,
+  originalCwd,
   version,
   model,
   mcpServers,
@@ -123,6 +124,7 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
         disallowedTools={disallowedTools}
         workdir={workdir}
         worktreeSession={worktreeSession}
+        originalCwd={originalCwd}
         version={version}
         model={model}
         mcpServers={mcpServers}
@@ -142,6 +144,7 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
       disallowedTools={disallowedTools}
       workdir={workdir}
       worktreeSession={worktreeSession}
+      originalCwd={originalCwd}
       version={version}
       model={model}
       mcpServers={mcpServers}
@@ -162,6 +165,7 @@ export const App: React.FC<AppProps> = ({
   disallowedTools,
   worktreeSession,
   workdir,
+  originalCwd,
   version,
   model,
   mcpServers,
@@ -181,6 +185,7 @@ export const App: React.FC<AppProps> = ({
         disallowedTools={disallowedTools}
         worktreeSession={worktreeSession}
         workdir={workdir}
+        originalCwd={originalCwd}
         version={version}
         model={model}
         mcpServers={mcpServers}

package/src/contexts/useChat.tsx

@@ -24,6 +24,7 @@ import {
   Agent,
   AgentCallbacks,
   type ToolPermissionContext,
+  type WorktreeSession,
   OPERATION_CANCELLED_BY_USER,
   extractLatestTotalTokens,
 } from "wave-agent-sdk";
@@ -161,6 +162,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   disallowedTools,
   workdir,
   worktreeSession,
+  originalCwd,
   version,
   model,
   mcpServers,
@@ -478,6 +480,21 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
 
         agentRef.current = agent;
 
+        // Inject worktree session into this agent's own DI container so system
+        // prompts and permission checks reflect the CLI -w worktree. This state is
+        // per-session, not process-global (see specs/047-worktree.md FR-042).
+        if (worktreeSession) {
+          const session: WorktreeSession = {
+            originalCwd: originalCwd ?? worktreeSession.repoRoot,
+            worktreePath: worktreeSession.path,
+            worktreeBranch: worktreeSession.branch,
+            worktreeName: worktreeSession.name,
+            isNew: worktreeSession.isNew,
+            repoRoot: worktreeSession.repoRoot,
+          };
+          agent.setWorktreeSession(session);
+        }
+
         // Get initial state
         setSessionId(agent.sessionId);
         setMessages(agent.messages);
@@ -513,6 +530,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       disallowedTools,
       workdir,
       worktreeSession,
+      originalCwd,
       model,
       initialPermissionMode,
       throttledSetMessages,

package/src/index.ts

@@ -1,12 +1,7 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import {
-  Scope,
-  generateRandomName,
-  type PermissionMode,
-  setCurrentWorktreeSession,
-} from "wave-agent-sdk";
+import { Scope, generateRandomName, type PermissionMode } from "wave-agent-sdk";
 import { createWorktree, type WorktreeSession } from "./utils/worktree.js";
 import path from "path";
 import { readFileSync } from "fs";
@@ -327,15 +322,9 @@ export async function main() {
       }
       worktreeSession = createWorktree(name, originalCwd);
 
-      // Register worktree session so system prompt includes worktree warnings
-      setCurrentWorktreeSession({
-        originalCwd,
-        worktreePath: worktreeSession.path,
-        worktreeBranch: worktreeSession.branch,
-        worktreeName: worktreeSession.name,
-        isNew: worktreeSession.isNew,
-        repoRoot: worktreeSession.repoRoot,
-      });
+      // Note: the full worktree session (originalCwd etc.) is injected into the
+      // agent's DI container after the agent is created in useChat.tsx. This keeps
+      // worktree state per-session instead of process-global.
     }
 
     const workdir = worktreeSession?.path || originalCwd;
@@ -369,6 +358,7 @@ export async function main() {
         disallowedTools,
         worktreeSession,
         workdir,
+        originalCwd,
         version,
         model: argv.model as string | undefined,
         mcpServers,
@@ -393,6 +383,7 @@ export async function main() {
         disallowedTools,
         worktreeSession,
         workdir,
+        originalCwd,
         version,
         model: argv.model as string | undefined,
         mcpServers,
@@ -416,6 +407,7 @@ export async function main() {
       disallowedTools,
       worktreeSession,
       workdir,
+      originalCwd,
       version,
       model: argv.model as string | undefined,
       mcpServers,

package/src/print-cli.ts

@@ -4,6 +4,7 @@ import {
   hasUncommittedChanges,
   hasNewCommits,
   getDefaultRemoteBranch,
+  type WorktreeSession,
 } from "wave-agent-sdk";
 import { displayUsageSummary } from "./utils/usageSummary.js";
 import { removeWorktree } from "./utils/worktree.js";
@@ -47,6 +48,7 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
     disallowedTools,
     worktreeSession,
     workdir,
+    originalCwd,
     model,
     mcpServers,
   } = options;
@@ -126,11 +128,26 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
       allowedTools,
       disallowedTools,
       workdir,
+      worktreeName: worktreeSession?.name,
+      isNewWorktree: worktreeSession?.isNew,
       model,
       mcpServers,
       // 保持流式模式以获得更好的命令行用户体验
     });
 
+    // Inject worktree session into this agent's container (per-session, not global)
+    if (worktreeSession) {
+      const session: WorktreeSession = {
+        originalCwd: originalCwd ?? worktreeSession.repoRoot,
+        worktreePath: worktreeSession.path,
+        worktreeBranch: worktreeSession.branch,
+        worktreeName: worktreeSession.name,
+        isNew: worktreeSession.isNew,
+        repoRoot: worktreeSession.repoRoot,
+      };
+      agent.setWorktreeSession(session);
+    }
+
     // Send message if provided and not empty
     if (typeof message === "string" && message.trim() !== "") {
       await agent.sendMessage(message);

package/src/stdio/agentBridge.ts

@@ -44,6 +44,7 @@ import {
 import { readFileSync } from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
+import { logger } from "../utils/logger.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const CLI_VERSION: string = (() => {
@@ -177,6 +178,15 @@ export class AgentBridge {
         return this.rewindToMessage(p.messageId as string, sessionId);
       case "deleteQueuedMessage":
         return this.deleteQueuedMessage(p.index as number, sessionId);
+      case "updateQueuedMessage":
+        return this.updateQueuedMessage(
+          p.id as string,
+          p.text as string,
+          p.images as Array<{ path: string; mimeType: string }> | undefined,
+          sessionId,
+        );
+      case "deleteQueuedMessageById":
+        return this.deleteQueuedMessageById(p.id as string, sessionId);
       case "getMessages":
         return this.getMessages(sessionId);
       case "getFullMessageThread":
@@ -322,6 +332,7 @@ export class AgentBridge {
 
     const options: AgentOptions = {
       callbacks,
+      logger,
       workdir: params.workdir,
       restoreSessionId: params.restoreSessionId,
       apiKey: params.apiKey,
@@ -350,8 +361,9 @@ export class AgentBridge {
     });
 
     if (params.clientVersion) {
-      console.debug(
-        `[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}`,
+      // stdout 是 JSON-RPC 协议通道，诊断日志必须走 stderr 以免污染协议
+      process.stderr.write(
+        `[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}\n`,
       );
     }
 
@@ -535,6 +547,26 @@ export class AgentBridge {
     return null;
   }
 
+  private updateQueuedMessage(
+    id: string,
+    text: string,
+    images: Array<{ path: string; mimeType: string }> | undefined,
+    sessionId?: string,
+  ): { ok: boolean } {
+    const entry = this.requireSession(sessionId);
+    const ok = entry.agent.updateQueuedMessageById(id, {
+      content: text,
+      images,
+    });
+    return { ok };
+  }
+
+  private deleteQueuedMessageById(id: string, sessionId?: string): null {
+    const entry = this.requireSession(sessionId);
+    entry.agent.removeQueuedMessageById(id);
+    return null;
+  }
+
   private getMessages(sessionId?: string): { messages: Message[] } {
     const entry = this.requireSession(sessionId);
     return { messages: entry.agent.messages };
@@ -671,11 +703,13 @@ export class AgentBridge {
   private async getAuthStatus(): Promise<{
     isAuthenticated: boolean;
     user: { id: string; email?: string } | undefined;
+    serverUrl: string;
   }> {
     const authService = AuthService.getInstance();
     return {
       isAuthenticated: authService.isSSOAuthenticated(),
       user: authService.getAuthUser(),
+      serverUrl: authService.getServerUrl(),
     };
   }
 
@@ -889,6 +923,13 @@ export class AgentBridge {
       onPermissionModeChange: (mode: PermissionMode) => {
         this.emit("permissionModeChange", { mode }, ctx.registeredSessionId);
       },
+      onWorkdirChange: (newCwd: string) => {
+        this.emit(
+          "workdirChange",
+          { workdir: newCwd },
+          ctx.registeredSessionId,
+        );
+      },
       onMcpServersChange: (servers: McpServerStatus[]) => {
         this.emit("mcpServersChange", { servers }, ctx.registeredSessionId);
       },
@@ -917,6 +958,9 @@ export class AgentBridge {
           ctx.registeredSessionId,
         );
       },
+      onCompactBlockAdded: (content: string) => {
+        this.emit("compactBlockAdded", { content }, ctx.registeredSessionId);
+      },
     };
   }
 

package/src/stdio/protocol.ts

@@ -58,6 +58,8 @@ export type RequestMethod =
   | "clearMessages"
   | "rewindToMessage"
   | "deleteQueuedMessage"
+  | "updateQueuedMessage"
+  | "deleteQueuedMessageById"
   | "getMessages"
   | "getFullMessageThread"
   | "setPermissionMode"
@@ -107,12 +109,14 @@ export type ServerNotificationMethod =
   | "sessionIdChange"
   | "permissionModeChange"
   | "mcpServersChange"
+  | "workdirChange"
   | "bangMessageAdded"
   | "bangMessageUpdated"
   | "bangMessageCompleted"
   | "notificationMessageAdded"
   | "permissionRequest"
-  | "authUrl";
+  | "authUrl"
+  | "compactBlockAdded";
 
 // ── Helper: is this a request (has id)? ─────────────────────────
 

package/src/types.ts

@@ -10,6 +10,8 @@ export interface BaseAppProps {
   disallowedTools?: string[];
   worktreeSession?: WorktreeSession;
   workdir?: string;
+  /** The working directory before entering a worktree (CLI -w); injected into the agent's container. */
+  originalCwd?: string;
   version?: string;
   model?: string;
   /** Optional MCP server configs to pass to Agent.create() */