wave-code 0.19.5 → 0.19.7

package/dist/reducers/rewindSelectorReducer.d.ts

@@ -19,4 +19,3 @@ export type SelectorAction = {
     type: "CLEAR_DECISION";
 };
 export declare function rewindSelectorReducer(state: SelectorState, action: SelectorAction): SelectorState;
-//# sourceMappingURL=rewindSelectorReducer.d.ts.map

package/dist/reducers/selectorReducer.d.ts

@@ -21,4 +21,3 @@ export type SelectorAction<T = unknown> = {
     type: "CLEAR_DECISION";
 };
 export declare function selectorReducer<T = unknown>(state: SelectorState<T>, action: SelectorAction<T>): SelectorState<T>;
-//# sourceMappingURL=selectorReducer.d.ts.map

package/dist/reducers/workflowManagerReducer.d.ts

@@ -38,4 +38,3 @@ export type WorkflowManagerAction = {
     type: "CLEAR_PENDING_EFFECT";
 };
 export declare function workflowManagerReducer(state: WorkflowManagerState, action: WorkflowManagerAction): WorkflowManagerState;
-//# sourceMappingURL=workflowManagerReducer.d.ts.map

package/dist/session-selector-cli.d.ts

@@ -1,4 +1,3 @@
 export declare function startSessionSelectorCli({ workdir, }?: {
     workdir?: string;
 }): Promise<string | null>;
-//# sourceMappingURL=session-selector-cli.d.ts.map

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;
@@ -77,4 +79,3 @@ export declare class RpcError extends Error {
     constructor(code: number, message: string);
     toJsonRpcError(): JsonRpcError;
 }
-//# sourceMappingURL=agentBridge.d.ts.map

package/dist/stdio/agentBridge.js

@@ -16,19 +16,7 @@
  */
 import { Agent, listSessions, searchFiles, PromptHistoryManager, AuthService, PluginCore, } from "wave-agent-sdk";
 import { INTERNAL_ERROR as PROTOCOL_INTERNAL_ERROR, METHOD_NOT_FOUND as PROTOCOL_METHOD_NOT_FOUND, } from "./protocol.js";
-import { readFileSync } from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const CLI_VERSION = (() => {
-    try {
-        const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "../../package.json"), "utf-8"));
-        return pkg.version ?? "";
-    }
-    catch {
-        return "";
-    }
-})();
+import { logger } from "../utils/logger.js";
 export class AgentBridge {
     constructor(options) {
         this.sessions = new Map();
@@ -66,6 +54,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 +133,7 @@ export class AgentBridge {
         const callbacks = this.createCallbacks(ctx);
         const options = {
             callbacks,
+            logger,
             workdir: params.workdir,
             restoreSessionId: params.restoreSessionId,
             apiKey: params.apiKey,
@@ -164,15 +157,11 @@ export class AgentBridge {
             agent,
             storedConfig: { ...params },
         });
-        if (params.clientVersion) {
-            console.debug(`[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}`);
-        }
         return {
             sessionId: agent.sessionId,
             workingDirectory: agent.workingDirectory,
             permissionMode: agent.getPermissionMode(),
             latestTotalTokens: agent.latestTotalTokens,
-            serverVersion: CLI_VERSION,
         };
     }
     async destroy(sessionId) {
@@ -292,6 +281,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 };
@@ -356,16 +358,6 @@ export class AgentBridge {
         return new Promise((resolve) => {
             this.pendingPermissions.set(requestId, resolve);
             this.emit("permissionRequest", { requestId, context }, ctx.registeredSessionId);
-            // 5-minute timeout → auto-deny
-            setTimeout(() => {
-                if (this.pendingPermissions.has(requestId)) {
-                    this.pendingPermissions.delete(requestId);
-                    resolve({
-                        behavior: "deny",
-                        message: "Permission request timed out",
-                    });
-                }
-            }, 5 * 60 * 1000);
         });
     }
     // ── Auth (global) ────────────────────────────────────────────
@@ -510,6 +502,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);
             },
@@ -528,6 +523,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/index.d.ts

@@ -1,4 +1,3 @@
 export { StdioServer, type StdioServerOptions } from "./stdioServer.js";
 export { AgentBridge, type AgentBridgeOptions, RpcError, } from "./agentBridge.js";
 export * from "./protocol.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/stdio/protocol.d.ts

@@ -34,9 +34,8 @@ 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/stdioServer.d.ts

@@ -31,4 +31,3 @@ export declare class StdioServer {
     sendNotification(method: string, params?: unknown, sessionId?: string): void;
     private write;
 }
-//# sourceMappingURL=stdioServer.d.ts.map

package/dist/stdio-cli.d.ts

@@ -6,4 +6,3 @@
  * the client sends an "initialize" request.
  */
 export declare function startStdioCli(): Promise<void>;
-//# sourceMappingURL=stdio-cli.d.ts.map

package/dist/types.d.ts

@@ -9,9 +9,10 @@ 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() */
     mcpServers?: Record<string, McpServerConfig>;
 }
-//# sourceMappingURL=types.d.ts.map

package/dist/utils/clipboard.d.ts

@@ -19,4 +19,3 @@ export declare function cleanupTempImage(imagePath: string): void;
  * @returns Promise<boolean> Whether it contains image
  */
 export declare function hasClipboardImage(): Promise<boolean>;
-//# sourceMappingURL=clipboard.d.ts.map

package/dist/utils/constants.d.ts

@@ -14,4 +14,3 @@ export declare const LOG_FILE: string;
  * Pagination related constants
  */
 export declare const MESSAGES_PER_PAGE = 15;
-//# sourceMappingURL=constants.d.ts.map

package/dist/utils/highlightUtils.d.ts

@@ -1,2 +1 @@
 export declare function highlightToAnsi(code: string, language?: string): string;
-//# sourceMappingURL=highlightUtils.d.ts.map

package/dist/utils/inputUtils.d.ts

@@ -15,4 +15,3 @@ export declare const getProjectedState: (inputText: string, cursorPosition: numb
     newInputText: string;
     newCursorPosition: number;
 };
-//# sourceMappingURL=inputUtils.d.ts.map

package/dist/utils/logger.d.ts

@@ -69,4 +69,3 @@ interface LogCleanupConfig {
  */
 export declare const cleanupLogs: (customConfig?: Partial<LogCleanupConfig>) => Promise<void>;
 export {};
-//# sourceMappingURL=logger.d.ts.map

package/dist/utils/throttle.d.ts

@@ -12,4 +12,3 @@ export interface ThrottledFunction<T extends (...args: unknown[]) => void> {
  * every `wait` milliseconds.
  */
 export declare function throttle<T extends (...args: unknown[]) => void>(func: T, wait: number, options?: ThrottleOptions): ThrottledFunction<T>;
-//# sourceMappingURL=throttle.d.ts.map

package/dist/utils/toolParameterTransforms.d.ts

@@ -16,4 +16,3 @@ export declare function transformEditParameters(parameters: EditToolParameters):
  * Forces type judgment based on tool name using type assertions
  */
 export declare function transformToolBlockToChanges(toolName: string, parameters: string, startLineNumber?: number): Change[];
-//# sourceMappingURL=toolParameterTransforms.d.ts.map

package/dist/utils/usageSummary.d.ts

@@ -30,4 +30,3 @@ export declare function calculateTokenSummary(usages: Usage[]): Record<string, T
  * @param sessionFilePath Optional session file path to display
  */
 export declare function displayUsageSummary(usages: Usage[], sessionFilePath?: string): void;
-//# sourceMappingURL=usageSummary.d.ts.map

package/dist/utils/version.d.ts

@@ -1,2 +1 @@
 export declare function isUpdateAvailable(currentVersion: string, latestVersion: string): boolean;
-//# sourceMappingURL=version.d.ts.map

package/dist/utils/worktree.d.ts

@@ -19,4 +19,3 @@ export declare function createWorktree(name: string, cwd: string): WorktreeSessi
  * @param session Worktree session details
  */
 export declare function removeWorktree(session: WorktreeSession): void;
-//# sourceMappingURL=worktree.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.19.5",
+  "version": "0.19.7",
   "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.5"
+    "wave-agent-sdk": "0.19.7"
   },
   "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

@@ -41,21 +41,7 @@ import {
   INTERNAL_ERROR as PROTOCOL_INTERNAL_ERROR,
   METHOD_NOT_FOUND as PROTOCOL_METHOD_NOT_FOUND,
 } from "./protocol.js";
-import { readFileSync } from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const CLI_VERSION: string = (() => {
-  try {
-    const pkg = JSON.parse(
-      readFileSync(path.resolve(__dirname, "../../package.json"), "utf-8"),
-    );
-    return pkg.version ?? "";
-  } catch {
-    return "";
-  }
-})();
+import { logger } from "../utils/logger.js";
 
 export type NotificationEmitter = (
   method: string,
@@ -83,7 +69,6 @@ interface InitializeParams {
   disallowedTools?: string[];
   pluginDirs?: string[];
   mcpServers?: Record<string, McpServerConfig>;
-  clientVersion?: string;
 }
 
 interface UpdateConfigParams {
@@ -177,6 +162,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":
@@ -315,13 +309,13 @@ export class AgentBridge {
     workingDirectory: string;
     permissionMode: PermissionMode;
     latestTotalTokens: number;
-    serverVersion: string;
   }> {
     const ctx: SessionContext = {};
     const callbacks = this.createCallbacks(ctx);
 
     const options: AgentOptions = {
       callbacks,
+      logger,
       workdir: params.workdir,
       restoreSessionId: params.restoreSessionId,
       apiKey: params.apiKey,
@@ -349,18 +343,11 @@ export class AgentBridge {
       storedConfig: { ...params },
     });
 
-    if (params.clientVersion) {
-      console.debug(
-        `[agentBridge] clientVersion=${params.clientVersion} serverVersion=${CLI_VERSION}`,
-      );
-    }
-
     return {
       sessionId: agent.sessionId,
       workingDirectory: agent.workingDirectory,
       permissionMode: agent.getPermissionMode(),
       latestTotalTokens: agent.latestTotalTokens,
-      serverVersion: CLI_VERSION,
     };
   }
 
@@ -535,6 +522,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 };
@@ -649,20 +656,6 @@ export class AgentBridge {
         { requestId, context },
         ctx.registeredSessionId,
       );
-
-      // 5-minute timeout → auto-deny
-      setTimeout(
-        () => {
-          if (this.pendingPermissions.has(requestId)) {
-            this.pendingPermissions.delete(requestId);
-            resolve({
-              behavior: "deny",
-              message: "Permission request timed out",
-            });
-          }
-        },
-        5 * 60 * 1000,
-      );
     });
   }
 
@@ -891,6 +884,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);
       },
@@ -919,6 +919,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() */

package/dist/cli.d.ts.map

@@ -1 +0,0 @@
-{"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"}