wave-code 0.19.7 → 0.19.9

package/dist/utils/worktree.js

@@ -1,18 +1,27 @@
-import { execFileSync } from "node:child_process";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 import * as path from "node:path";
 import * as fs from "node:fs";
 import { getDefaultRemoteBranch, getGitMainRepoRoot } from "wave-agent-sdk";
+// Never use execFileSync here: the shared `wave --stdio` process handles all
+// desktop sessions, so a synchronous git call (especially a multi-second
+// recursive worktree delete or a network fetch) freezes every session.
+const execFileAsync = promisify(execFile);
 /**
  * Create a new git worktree
  * @param name Worktree name
  * @param cwd Current working directory
+ * @param options Optional creation options
+ * @param options.baseRef "fresh" (default, origin/<default-branch>) | "head" (local HEAD)
+ * @param options.baseBranch Explicit base branch (overrides baseRef)
  * @returns Worktree session details
  */
-export function createWorktree(name, cwd) {
+export async function createWorktree(name, cwd, options) {
     const repoRoot = getGitMainRepoRoot(cwd);
     const worktreePath = path.join(repoRoot, ".wave", "worktrees", name);
     const branchName = `worktree-${name}`;
-    const baseBranch = getDefaultRemoteBranch(cwd);
+    const useHead = options?.baseRef === "head";
+    const resolvedBaseBranch = options?.baseBranch ?? (useHead ? "HEAD" : getDefaultRemoteBranch(cwd));
     // Ensure parent directory exists
     const parentDir = path.dirname(worktreePath);
     if (!fs.existsSync(parentDir)) {
@@ -33,9 +42,8 @@ export function createWorktree(name, cwd) {
     }
     try {
         // Create worktree and branch
-        execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, baseBranch], {
+        await execFileAsync("git", ["worktree", "add", "-b", branchName, worktreePath, resolvedBaseBranch], {
             cwd: repoRoot,
-            stdio: ["ignore", "pipe", "pipe"],
         });
         return {
             name,
@@ -52,9 +60,8 @@ export function createWorktree(name, cwd) {
         if (stderr.includes("already exists")) {
             // If branch already exists, try to add worktree without -b
             try {
-                execFileSync("git", ["worktree", "add", worktreePath, branchName], {
+                await execFileAsync("git", ["worktree", "add", worktreePath, branchName], {
                     cwd: repoRoot,
-                    stdio: ["ignore", "pipe", "pipe"],
                 });
                 return {
                     name,
@@ -70,18 +77,24 @@ export function createWorktree(name, cwd) {
                 throw new Error(`Failed to add existing worktree branch: ${innerError.message}`);
             }
         }
-        if (stderr.includes("not a valid object name") ||
-            stderr.includes("unknown revision")) {
+        if (!useHead &&
+            (stderr.includes("not a valid object name") ||
+                stderr.includes("unknown revision"))) {
             // Base branch not fetched yet — try fetching then retrying
-            const branchNameOnly = baseBranch.split("/").pop();
+            const branchNameOnly = resolvedBaseBranch.split("/").pop();
             try {
-                execFileSync("git", ["fetch", "origin", branchNameOnly], {
+                await execFileAsync("git", ["fetch", "origin", branchNameOnly], {
                     cwd: repoRoot,
-                    stdio: ["ignore", "pipe", "pipe"],
                 });
-                execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, baseBranch], {
+                await execFileAsync("git", [
+                    "worktree",
+                    "add",
+                    "-b",
+                    branchName,
+                    worktreePath,
+                    resolvedBaseBranch,
+                ], {
                     cwd: repoRoot,
-                    stdio: ["ignore", "pipe", "pipe"],
                 });
                 return {
                     name,
@@ -96,9 +109,8 @@ export function createWorktree(name, cwd) {
             catch {
                 // Fetch or retry failed — fall back to HEAD
                 try {
-                    execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, "HEAD"], {
+                    await execFileAsync("git", ["worktree", "add", "-b", branchName, worktreePath, "HEAD"], {
                         cwd: repoRoot,
-                        stdio: ["ignore", "pipe", "pipe"],
                     });
                     return {
                         name,
@@ -122,31 +134,29 @@ export function createWorktree(name, cwd) {
  * Remove a git worktree and its associated branch
  * @param session Worktree session details
  */
-export function removeWorktree(session) {
+export async function removeWorktree(session) {
     const repoRoot = session.repoRoot;
     try {
         // Get current branch in worktree before removing it
         let currentBranch;
         try {
-            currentBranch = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+            const { stdout } = await execFileAsync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
                 cwd: session.path,
                 encoding: "utf8",
-                stdio: ["ignore", "pipe", "ignore"],
-            }).trim();
+            });
+            currentBranch = stdout.trim();
         }
         catch {
             // Ignore errors getting current branch
         }
         // Remove worktree
-        execFileSync("git", ["worktree", "remove", "--force", session.path], {
+        await execFileAsync("git", ["worktree", "remove", "--force", session.path], {
             cwd: repoRoot,
-            stdio: ["ignore", "pipe", "pipe"],
         });
         // Delete original branch
         try {
-            execFileSync("git", ["branch", "-D", session.branch], {
+            await execFileAsync("git", ["branch", "-D", session.branch], {
                 cwd: repoRoot,
-                stdio: ["ignore", "pipe", "pipe"],
             });
         }
         catch {
@@ -162,9 +172,8 @@ export function removeWorktree(session) {
                 currentBranch !== "main" &&
                 currentBranch !== "master") {
                 try {
-                    execFileSync("git", ["branch", "-D", currentBranch], {
+                    await execFileAsync("git", ["branch", "-D", currentBranch], {
                         cwd: repoRoot,
-                        stdio: ["ignore", "pipe", "pipe"],
                     });
                 }
                 catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.19.7",
+  "version": "0.19.9",
   "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.7"
+    "wave-agent-sdk": "0.19.9"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/cli.tsx

@@ -70,7 +70,7 @@ export async function startCli(options: CliOptions): Promise<void> {
     // Cleanup worktree if requested
     if (shouldRemoveWorktree && worktreeSession) {
       process.chdir(worktreeSession.repoRoot);
-      removeWorktree(worktreeSession);
+      await removeWorktree(worktreeSession);
     }
 
     process.exit(0);

package/src/components/ConfirmationSelector.tsx

@@ -39,7 +39,7 @@ export const ConfirmationSelector: React.FC<ConfirmationSelectorProps> = ({
   onCancel,
 }) => {
   const [state, dispatch] = useReducer(confirmationReducer, {
-    selectedOption: toolName === EXIT_PLAN_MODE_TOOL_NAME ? "clear" : "allow",
+    selectedOption: "allow",
     alternativeText: "",
     alternativeCursorPosition: 0,
     hasUserInput: false,
@@ -212,20 +212,6 @@ export const ConfirmationSelector: React.FC<ConfirmationSelectorProps> = ({
             <Text>Do you want to proceed?</Text>
           </Box>
           <Box marginTop={1} flexDirection="column">
-            {toolName === EXIT_PLAN_MODE_TOOL_NAME && (
-              <Box key="clear-option">
-                <Text
-                  color={state.selectedOption === "clear" ? "black" : "white"}
-                  backgroundColor={
-                    state.selectedOption === "clear" ? "yellow" : undefined
-                  }
-                  bold={state.selectedOption === "clear"}
-                >
-                  {state.selectedOption === "clear" ? "> " : "  "}
-                  Yes, clear context and auto-accept edits
-                </Text>
-              </Box>
-            )}
             <Box key="allow-option">
               <Text
                 color={state.selectedOption === "allow" ? "black" : "white"}
@@ -254,6 +240,21 @@ export const ConfirmationSelector: React.FC<ConfirmationSelectorProps> = ({
                 </Text>
               </Box>
             )}
+            {(toolName === BASH_TOOL_NAME ||
+              toolName === EXIT_PLAN_MODE_TOOL_NAME) && (
+              <Box key="bypass-option">
+                <Text
+                  color={state.selectedOption === "bypass" ? "black" : "white"}
+                  backgroundColor={
+                    state.selectedOption === "bypass" ? "yellow" : undefined
+                  }
+                  bold={state.selectedOption === "bypass"}
+                >
+                  {state.selectedOption === "bypass" ? "> " : "  "}
+                  Yes, and bypass permissions
+                </Text>
+              </Box>
+            )}
             <Box key="alternative-option">
               <Text
                 color={

package/src/components/TaskList.tsx

@@ -99,12 +99,9 @@ export const TaskList: React.FC = () => {
   const autoHideTimerRef = React.useRef<ReturnType<typeof setTimeout> | null>(
     null,
   );
-  const [autoHidden, setAutoHidden] = React.useState(() => {
-    // If all tasks are already completed on mount (e.g. session restore),
-    // start hidden immediately instead of flashing for 5 seconds.
-    const active = tasks.filter((t) => t.status !== "deleted");
-    return active.length > 0 && active.every((t) => t.status === "completed");
-  });
+  const [autoHidden, setAutoHidden] = React.useState(false);
+  // 是否在当前展示期间观察到过未完成任务；用于区分“任务在眼前完成”与“加载时已全部完成”
+  const hadIncompleteRef = React.useRef(false);
   const [, forceUpdate] = React.useState(0);
 
   const now = Date.now();
@@ -155,24 +152,45 @@ export const TaskList: React.FC = () => {
     activeTasks.length > 0 &&
     activeTasks.every((t) => t.status === "completed");
 
+  // 观察到任务从“存在未完成”变为“全部完成”时保留 5 秒再隐藏；
+  // 加载或恢复到已全部完成的会话时立即隐藏，避免先闪现再消失
   React.useEffect(() => {
-    if (allCompleted && !autoHidden) {
+    if (activeTasks.length === 0) {
+      hadIncompleteRef.current = false;
+      return;
+    }
+    if (!allCompleted) {
+      hadIncompleteRef.current = true;
+      if (autoHidden) {
+        setAutoHidden(false);
+      }
+      return;
+    }
+    if (!hadIncompleteRef.current) {
+      if (!autoHidden) {
+        setAutoHidden(true);
+      }
+      return;
+    }
+    if (!autoHidden) {
       autoHideTimerRef.current = setTimeout(() => {
         setAutoHidden(true);
       }, AUTO_HIDE_DELAY_MS);
     }
-    if (!allCompleted && autoHidden) {
-      setAutoHidden(false);
-    }
     return () => {
       if (autoHideTimerRef.current) {
         clearTimeout(autoHideTimerRef.current);
         autoHideTimerRef.current = null;
       }
     };
-  }, [allCompleted, autoHidden]);
+  }, [allCompleted, autoHidden, activeTasks.length]);
 
-  if (tasks.length === 0 || !isTaskListVisible || autoHidden) {
+  if (
+    tasks.length === 0 ||
+    !isTaskListVisible ||
+    autoHidden ||
+    (allCompleted && !hadIncompleteRef.current)
+  ) {
     return null;
   }
 

package/src/contexts/useChat.tsx

@@ -482,7 +482,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
 
         // 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).
+        // per-session, not process-global (see docs/specs/multi-agent/worktree.md FR-042).
         if (worktreeSession) {
           const session: WorktreeSession = {
             originalCwd: originalCwd ?? worktreeSession.repoRoot,

package/src/index.ts

@@ -1,7 +1,12 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { Scope, generateRandomName, type PermissionMode } from "wave-agent-sdk";
+import {
+  Scope,
+  generateRandomName,
+  loadMergedWaveConfig,
+  type PermissionMode,
+} from "wave-agent-sdk";
 import { createWorktree, type WorktreeSession } from "./utils/worktree.js";
 import path from "path";
 import { readFileSync } from "fs";
@@ -320,7 +325,8 @@ export async function main() {
       if (!name || name === "") {
         name = generateRandomName();
       }
-      worktreeSession = createWorktree(name, originalCwd);
+      const baseRef = loadMergedWaveConfig(originalCwd)?.worktree?.baseRef;
+      worktreeSession = await createWorktree(name, originalCwd, { baseRef });
 
       // 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

package/src/print-cli.ts

@@ -154,8 +154,18 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
       process.stdout.write("\n");
     }
 
-    // Wait for running background tasks and subagents to complete
-    while (agent.hasRunningBackgroundWork) {
+    // Wait for running background tasks/subagents to complete AND for the main
+    // agent to finish processing their completion notifications. The last
+    // background task flips status to "completed" before its notification is
+    // enqueued and before the main agent's follow-up turn runs, so
+    // hasRunningBackgroundWork alone becomes false while the main agent is
+    // still mid-turn — causing a TOCTOU race that aborts the final response.
+    // Including isLoading and queued notifications closes that gap.
+    while (
+      agent.hasRunningBackgroundWork ||
+      agent.isLoading ||
+      agent.hasPendingMessages
+    ) {
       await new Promise((resolve) => setTimeout(resolve, 500));
     }
 
@@ -184,7 +194,7 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
       const hasCommits = hasNewCommits(cwd, baseBranch);
 
       if (!hasChanges && !hasCommits) {
-        removeWorktree(worktreeSession);
+        await removeWorktree(worktreeSession);
       } else {
         process.stdout.write(
           `\n⚠️ Worktree '${worktreeSession.name}' has changes or commits. Keeping it at: ${worktreeSession.path}\n`,
@@ -220,7 +230,7 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
         const hasCommits = hasNewCommits(cwd, baseBranch);
 
         if (!hasChanges && !hasCommits) {
-          removeWorktree(worktreeSession);
+          await removeWorktree(worktreeSession);
         } else {
           process.stdout.write(
             `\n⚠️ Worktree '${worktreeSession.name}' has changes or commits. Keeping it at: ${worktreeSession.path}\n`,

package/src/reducers/confirmationReducer.ts

@@ -7,7 +7,7 @@ import {
 } from "wave-agent-sdk";
 
 export interface ConfirmationState {
-  selectedOption: "clear" | "auto" | "allow" | "alternative";
+  selectedOption: "auto" | "bypass" | "allow" | "alternative";
   alternativeText: string;
   alternativeCursorPosition: number;
   hasUserInput: boolean;
@@ -99,13 +99,7 @@ export function confirmationReducer(
 
       if (key.return) {
         let decision: PermissionDecision | null = null;
-        if (state.selectedOption === "clear") {
-          decision = {
-            behavior: "allow",
-            newPermissionMode: "acceptEdits",
-            clearContext: true,
-          };
-        } else if (state.selectedOption === "allow") {
+        if (state.selectedOption === "allow") {
           if (toolName === EXIT_PLAN_MODE_TOOL_NAME) {
             decision = { behavior: "allow", newPermissionMode: "default" };
           } else if (toolName === ENTER_PLAN_MODE_TOOL_NAME) {
@@ -134,6 +128,11 @@ export function confirmationReducer(
           } else {
             decision = { behavior: "allow", newPermissionMode: "acceptEdits" };
           }
+        } else if (state.selectedOption === "bypass") {
+          decision = {
+            behavior: "allow",
+            newPermissionMode: "bypassPermissions",
+          };
         } else if (state.alternativeText.trim()) {
           decision = {
             behavior: "deny",
@@ -174,9 +173,10 @@ export function confirmationReducer(
       }
 
       const availableOptions: ConfirmationState["selectedOption"][] = [];
-      if (toolName === EXIT_PLAN_MODE_TOOL_NAME) availableOptions.push("clear");
       availableOptions.push("allow");
       if (!hidePersistentOption) availableOptions.push("auto");
+      if (toolName === BASH_TOOL_NAME || toolName === EXIT_PLAN_MODE_TOOL_NAME)
+        availableOptions.push("bypass");
       availableOptions.push("alternative");
 
       if (key.upArrow) {