wave-code 1.5.1 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     "wrap-ansi": "^10.0.0",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "1.5.1"
+    "wave-agent-sdk": "1.6.0"
   },
   "engines": {
     "node": ">=22"
@@ -69,11 +69,11 @@
     "wave": "tsx --tsconfig tsconfig.dev.json src/index.ts",
     "build": "rimraf dist && node scripts/bundle.mjs",
     "type-check": "tsc --noEmit --incremental",
-    "test": "vitest run --reporter=dot",
-    "test:coverage": "vitest run --coverage --reporter=dot",
-    "test:unit": "vitest run --reporter=dot --exclude 'tests/integration/**' --exclude '**/*.integration.test.ts'",
-    "test:unit:coverage": "vitest run --coverage --reporter=dot --exclude 'tests/integration/**' --exclude '**/*.integration.test.ts'",
-    "test:integration": "vitest run --reporter=dot tests/integration .integration.test",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:unit": "vitest run --exclude 'tests/integration/**' --exclude '**/*.integration.test.ts'",
+    "test:unit:coverage": "vitest run --coverage --exclude 'tests/integration/**' --exclude '**/*.integration.test.ts'",
+    "test:integration": "vitest run tests/integration .integration.test",
     "lint": "oxlint",
     "format": "prettier --write ."
   }

package/src/cli.tsx

@@ -3,7 +3,7 @@ import { render } from "ink";
 import { ensureRuntimeDeps } from "wave-agent-sdk";
 import { App } from "./components/App.js";
 import { cleanupLogs } from "./utils/logger.js";
-import { removeWorktree } from "./utils/worktree.js";
+import { describeWorktreeSurvival, removeWorktree } from "./utils/worktree.js";
 import { BaseAppProps } from "./types.js";
 
 export interface CliOptions extends BaseAppProps {
@@ -96,8 +96,14 @@ export async function startCli(options: CliOptions): Promise<void> {
     if (shouldRemoveWorktree && worktreeSession) {
       process.stdout.write("\nDeleting worktree ...\n");
       process.chdir(worktreeSession.repoRoot);
-      await removeWorktree(worktreeSession);
-      process.stdout.write("Done.\n");
+      // "Done." only when it is: removal is best-effort, and a surviving
+      // directory (with its branch kept for it) needs the cleanup commands
+      // printed rather than a success line over the leftovers.
+      process.stdout.write(
+        (await removeWorktree(worktreeSession))
+          ? "Done.\n"
+          : `\n${describeWorktreeSurvival(worktreeSession)}\n`,
+      );
     }
 
     process.exit(0);

package/src/components/McpManager.tsx

@@ -157,6 +157,26 @@ export const McpManager: React.FC<McpManagerProps> = ({
               </Text>
             </Box>
           )}
+          {/* Not dialed yet (lazy dial): the tool list comes from the local
+              snapshot of the last successful connection, and says so. */}
+          {selectedServer.status !== "connected" &&
+            selectedServer.toolsFromCache && (
+              <Box>
+                <Text>
+                  <Text color="blue">Tools:</Text>{" "}
+                  {selectedServer.toolsFromCache.length} tools{" "}
+                  <Text color="gray" dimColor>
+                    (cached
+                    {selectedServer.toolsCachedAt
+                      ? ` · last connected ${formatTime(
+                          selectedServer.toolsCachedAt,
+                        )}`
+                      : ""}
+                    )
+                  </Text>
+                </Text>
+              </Box>
+            )}
           {selectedServer.capabilities && (
             <Box>
               <Text>
@@ -270,6 +290,12 @@ export const McpManager: React.FC<McpManagerProps> = ({
             {server.status === "connected" && server.toolCount && (
               <Text color="green"> · {server.toolCount} tools</Text>
             )}
+            {server.status !== "connected" && server.toolsFromCache && (
+              <Text color="gray" dimColor>
+                {" "}
+                · {server.toolsFromCache.length} tools (cached)
+              </Text>
+            )}
           </Text>
           {index === state.selectedIndex && (
             <Box marginLeft={4} flexDirection="column">

package/src/components/MessageBlockItem.tsx

@@ -41,9 +41,21 @@ export const MessageBlockItem = ({
         </Box>
       )}
 
-      {block.type === "error" && (
+      {/* A line for the human, never sent to the model (see NoticeBlock in the
+          SDK): a failed turn (`error`, red) or a hook's status line (`info`,
+          muted). */}
+      {block.type === "notice" && (
         <Box>
-          <Text color="red">Error: {block.content}</Text>
+          {block.level === "error" ? (
+            <Text color="red">Error: {block.content}</Text>
+          ) : (
+            <Text
+              color={block.level === "warning" ? "yellow" : "gray"}
+              dimColor
+            >
+              {block.content}
+            </Text>
+          )}
         </Box>
       )}
 

package/src/components/RemoteControlView.tsx

@@ -1,7 +1,7 @@
 /**
  * RemoteControlView — `/remote-control` 的覆盖层（把这条前台会话交给手机）。
  *
- * 规格：docs/specs/ui/remote-control.md「前台 CLI 会话也能被手机接管」。
+ * 规格：docs/specs/remote/remote-web.md「前台 CLI 会话也能被手机接管」。
  *
  * **这个斜杠命令不带参数**：没有 `on` / `off` / `status` 子命令，也不收机器名。
  * 判据是「状态自己决定动作」——`off` / `error` 时唯一合法动作是开启，`connecting`

package/src/contexts/useChat.tsx

@@ -14,6 +14,7 @@ import {
 } from "../hooks/useRemoteControl.js";
 import type {
   Message,
+  MessageBlock,
   McpServerStatus,
   BackgroundTask,
   Task,
@@ -363,6 +364,38 @@ const applyToolBlockUpdate = (
   });
 };
 
+/**
+ * Append a block to the last message — only when it is an assistant message
+ * (the current turn's in-flight reply). If the last message is a user message,
+ * the block belongs BELOW it: create a new assistant message instead of
+ * polluting the stale assistant from an earlier turn. Same rule the webview
+ * reducer applies (APPEND_NOTICE_BLOCK).
+ *
+ * Both the error and the system line use this: the SDK appends them to the
+ * same place (`appendBlockToLastAssistant`), so the CLI must not invent a
+ * second placement rule.
+ */
+const appendBlockToLastAssistant = (
+  prev: Message[],
+  block: MessageBlock,
+): Message[] => {
+  const last = prev[prev.length - 1];
+  if (last && last.role === "assistant") {
+    return prev.map((m, idx) =>
+      idx === prev.length - 1 ? { ...m, blocks: [...m.blocks, block] } : m,
+    );
+  }
+  return [
+    ...prev,
+    {
+      id: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`,
+      role: "assistant",
+      timestamp: new Date().toISOString(),
+      blocks: [block],
+    },
+  ];
+};
+
 export const ChatProvider: React.FC<ChatProviderProps> = ({
   children,
   bypassPermissions,
@@ -726,39 +759,19 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           // `end` carries the authoritative final values.
           setMessages((prev) => applyToolBlockUpdate(prev, params));
         },
-        onErrorBlockAdded: (error: string) => {
-          remoteStream?.onErrorBlockAdded(error);
+        onNoticeAdded: ({ level, content }) => {
+          remoteStream?.onNoticeAdded({ level, content });
           if (isExpandedRef.current) return;
-          // One-shot structural update — applied directly (errors must not be
-          // delayed by the tool-running window).
-          setMessages((prev) => {
-            // Append to the LAST message only if it is an assistant message
-            // (the current turn's in-flight reply). If the last message is a
-            // user message, the error belongs BELOW it — create a new
-            // assistant message instead of polluting the stale assistant from
-            // an earlier turn (which surfaced the error above the latest
-            // user message and accumulated it there).
-            const last = prev[prev.length - 1];
-            if (last && last.role === "assistant") {
-              return prev.map((m, idx) =>
-                idx === prev.length - 1
-                  ? {
-                      ...m,
-                      blocks: [...m.blocks, { type: "error", content: error }],
-                    }
-                  : m,
-              );
-            }
-            return [
-              ...prev,
-              {
-                id: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`,
-                role: "assistant",
-                timestamp: new Date().toISOString(),
-                blocks: [{ type: "error", content: error }],
-              },
-            ];
-          });
+          // One-shot structural update — applied directly (a failure must not
+          // be delayed by the tool-running window; a hook's round line must
+          // not wait for the next `refreshMessages`).
+          setMessages((prev) =>
+            appendBlockToLastAssistant(prev, {
+              type: "notice",
+              level,
+              content,
+            }),
+          );
         },
         onLatestTotalTokensChange: (tokens) => {
           setLatestTotalTokens(tokens);
@@ -1213,7 +1226,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
             timestamp: new Date().toISOString(),
             blocks: [
               {
-                type: "error",
+                type: "notice",
+                level: "error",
                 content: `Failed to resume conversation: ${
                   error instanceof Error ? error.message : String(error)
                 }`,