wave-code 1.6.3 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -54,10 +54,10 @@
     "string-width": "^8.2.2",
     "tsx": "^4.20.4",
     "vitest": "^5.1.0",
+    "wave-agent-sdk": "1.6.4",
     "wrap-ansi": "^10.0.0",
     "yargs": "^17.7.2",
-    "zod": "^3.23.8",
-    "wave-agent-sdk": "1.6.3"
+    "zod": "^3.23.8"
   },
   "engines": {
     "node": ">=22"

package/src/daemon/commands.ts

@@ -28,7 +28,7 @@
  * must be destroyed via the envelope sessionId returned by `initialize`.
  */
 
-import { execFile, spawn, type ChildProcess } from "node:child_process";
+import { spawn, type ChildProcess } from "node:child_process";
 import * as fs from "node:fs";
 import net from "node:net";
 import path from "node:path";
@@ -36,6 +36,7 @@ import {
   ASK_USER_QUESTION_TOOL_NAME,
   ENTER_PLAN_MODE_TOOL_NAME,
   EXIT_PLAN_MODE_TOOL_NAME,
+  execFileHidden,
   getGitMainRepoRoot,
   getMessageContent,
   hasWorktreeCreateHook,
@@ -126,6 +127,12 @@ function startDaemon(socketPath: string): LaunchedDaemon {
   const log = openDaemonLogForChild();
   const child = spawn(process.execPath, [entry, "--daemon", socketPath], {
     detached: true,
+    // No-op here, kept for intent only: `windowsHide` reaches the child as
+    // CREATE_NO_WINDOW, which Windows ignores when DETACHED_PROCESS is also
+    // set — and `detached` is exactly that. The daemon's console window (if it
+    // ever shows one) cannot be suppressed from here; that needs ConPTY,
+    // `Start-Process -WindowStyle Hidden`, or a native CreateProcess call.
+    windowsHide: true,
     stdio: ["ignore", "ignore", log ? log.fd : "ignore"],
   });
   if (log) {
@@ -1425,7 +1432,7 @@ export interface DestroyOptions {
 /** Run one git command and return trimmed stdout (rejects on git failure). */
 function runGit(cwd: string, args: string[]): Promise<string> {
   return new Promise((resolve, reject) => {
-    execFile("git", args, { cwd, windowsHide: true }, (err, stdout) => {
+    execFileHidden("git", args, { cwd }, (err, stdout) => {
       if (err) reject(err);
       else resolve(stdout.trim());
     });

package/src/remote/notificationCoalescer.ts

@@ -93,7 +93,9 @@ function mergeSpec(method: string, params: unknown): MergeSpec | undefined {
     }
     return {
       field: "content",
-      key: `b\u0000${p.question}\u0000${typeof p.type === "string" ? p.type : ""}`,
+      // 归属键里有 requestId：多轮追问之后同一个问题可以同时在途两次（从主输入框
+      // 连发两次 `/btw 同样的话`），只按 question 合并会把两轮的增量揉成一团。
+      key: `b\u0000${typeof p.requestId === "string" ? p.requestId : ""}\u0000${p.question}\u0000${typeof p.type === "string" ? p.type : ""}`,
     };
   }
 

package/src/stdio/agentBridge.ts

@@ -21,6 +21,7 @@ import {
   type AgentOptions,
   type BackgroundTask,
   type BackgroundTaskSummary,
+  type BtwHistoryTurn,
   type SerializableWorkflowRun,
   type Message,
   type PermissionDecision,
@@ -441,7 +442,12 @@ export class AgentBridge {
       case "bang":
         return this.bang(p.command as string, sessionId);
       case "askBtw":
-        return this.askBtw(p.question as string, sessionId);
+        return this.askBtw(
+          p.question as string,
+          sessionId,
+          p.history as BtwHistoryTurn[] | undefined,
+          p.requestId as string | undefined,
+        );
       case "abortMessage":
         return this.abortMessage(sessionId);
       case "clearMessages":
@@ -839,6 +845,19 @@ export class AgentBridge {
       if (entry) {
         this.pendingPermissions.delete(p.requestId);
         entry.resolve(p.decision);
+        // 这条请求从此不再是待审批 —— 告诉**所有**客户端，不只是答话的这个。
+        // 审批卡是每个客户端各挂一份的（桌面端在 `pendingConfirmations` 里、
+        // 手机那页在 `shownApprovals` 里），而这台机器上的请求只有一份：从手机
+        // 上答掉的那几条，桌面窗口只能靠这条通知撤卡，否则用户从手机回来看到
+        // 一叠已经答过的卡（点它只会发一条 requestId 已消失的 `permissionResponse`，
+        // 上面那个 `if (entry)` 静默忽略）。放在 `resolve` 之后：答复本身先落地，
+        // 撤卡失败/迟到都不影响回合继续（spec ui/confirm-ui.md「同一条审批只有
+        // 一份，谁答都算数」）。
+        this.emit(
+          "permissionResolved",
+          { requestId: p.requestId },
+          entry.sessionId,
+        );
         // 不带反馈的拒绝 = 用户关掉了确认卡（关闭键 / Esc），本轮在用户这边就
         // 结束：与桌面端 / VS Code / JetBrains 的 `denied → abortMessage()` 是
         // 同一条语义，也与 Claude Code 的 `cancelAndAbort`（无 feedback 直接
@@ -869,6 +888,12 @@ export class AgentBridge {
     currentWorkdir: string;
     sessionCwd: string;
     repoRoot?: string;
+    worktree?: {
+      path: string;
+      branch?: string;
+      repoRoot: string;
+      hookBased: boolean;
+    };
     permissionMode: PermissionMode;
     latestTotalTokens: number;
   }> {
@@ -878,7 +903,12 @@ export class AgentBridge {
     if (params.restoreSessionId) {
       const live = this.sessions.get(params.restoreSessionId);
       if (live) {
-        return this.initializeReply(live.agent, live.createdWorkdir);
+        return this.initializeReply(
+          live.agent,
+          live.createdWorkdir,
+          deriveWorktreeInfo(live.createdWorkdir),
+          live.createdWorktreeBranch,
+        );
       }
     }
 
@@ -958,7 +988,12 @@ export class AgentBridge {
       createdWorktreeBranch,
     });
 
-    return this.initializeReply(agent, createdWorkdir, worktree);
+    return this.initializeReply(
+      agent,
+      createdWorkdir,
+      worktree,
+      createdWorktreeBranch,
+    );
   }
 
   /**
@@ -1054,12 +1089,20 @@ export class AgentBridge {
     // Derived once by the caller: this reply and the creation-branch snapshot
     // both need it, and it reads config files.
     worktree = deriveWorktreeInfo(sessionCwd),
+    /** Branch the worktree was created on — what removal may delete. */
+    createdBranch?: string,
   ): {
     sessionId: string;
     currentWorkdir: string;
     sessionCwd: string;
     workspaceRoot: string;
     repoRoot?: string;
+    worktree?: {
+      path: string;
+      branch?: string;
+      repoRoot: string;
+      hookBased: boolean;
+    };
     permissionMode: PermissionMode;
     latestTotalTokens: number;
   } {
@@ -1073,6 +1116,19 @@ export class AgentBridge {
       // tree, `@` search).
       workspaceRoot: agent.workspaceRoot,
       ...(worktree ? { repoRoot: worktree.repoRoot } : {}),
+      // The full record, not just the root: a host with no creation record of
+      // its own (a `/resume` pick off disk) has nothing else to remove the
+      // checkout and its branch with when the user deletes that session.
+      ...(worktree
+        ? {
+            worktree: {
+              path: worktree.path,
+              ...(createdBranch ? { branch: createdBranch } : {}),
+              repoRoot: worktree.repoRoot,
+              hookBased: worktree.hookBased,
+            },
+          }
+        : {}),
       permissionMode: agent.getPermissionMode(),
       latestTotalTokens: agent.latestTotalTokens,
     };
@@ -2102,7 +2158,12 @@ export class AgentBridge {
     return null;
   }
 
-  private async askBtw(question: string, sessionId?: string): Promise<string> {
+  private async askBtw(
+    question: string,
+    sessionId?: string,
+    history?: BtwHistoryTurn[],
+    requestId?: string,
+  ): Promise<string> {
     const entry = this.requireSession(sessionId);
     return entry.agent.askBtw(
       question,
@@ -2110,11 +2171,15 @@ export class AgentBridge {
       // Stream partial content to the client so webview hosts can render the
       // answer incrementally (thinking and content travel on separate
       // channels so the panel can drop thinking text once content starts).
+      // `requestId` is echoed back so the host can attribute the chunk to the
+      // side-chat turn that asked (spec commands/btw-command.md「Webview 端继续
+      // 提问」: repeated questions within one session are otherwise
+      // indistinguishable).
       (content) => {
         if (sessionId) {
           this.emit(
             "btwContent",
-            { question, content, type: "content" },
+            { question, requestId, content, type: "content" },
             sessionId,
           );
         }
@@ -2123,11 +2188,12 @@ export class AgentBridge {
         if (sessionId) {
           this.emit(
             "btwContent",
-            { question, content, type: "thinking" },
+            { question, requestId, content, type: "thinking" },
             sessionId,
           );
         }
       },
+      history,
     );
   }
 

package/src/utils/workspaceDiff.ts

@@ -9,14 +9,12 @@
  * connection handshakes for a single panel refresh.
  */
 
-import { execFile } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { promisify } from "node:util";
+import { execFileAsyncHidden } from "wave-agent-sdk";
 
 // Never execFileSync: the shared `wave --stdio` process handles every desktop
 // session, so a synchronous git call would freeze them all (see utils/worktree).
-const execFileAsync = promisify(execFile);
 
 export type WorkspaceFileStatus =
   | "added"
@@ -97,7 +95,7 @@ const GIT_BUFFER = 16 * 1024 * 1024;
 
 /** Run git in `cwd` and return stdout. */
 async function git(cwd: string, args: string[]): Promise<string> {
-  const { stdout } = await execFileAsync("git", ["-C", cwd, ...args], {
+  const { stdout } = await execFileAsyncHidden("git", ["-C", cwd, ...args], {
     encoding: "utf-8" as const,
     maxBuffer: GIT_BUFFER,
   });