wave-code 1.5.0 → 1.6.0

package/src/daemon/socketPath.ts

@@ -0,0 +1,123 @@
+/**
+ * Daemon socket addressing — one default, two platform shapes.
+ *
+ * POSIX keeps the file-socket it has always used (`~/.wave/daemon.sock`). On
+ * Windows libuv only accepts the `\\.\pipe\` shape: handing `net.Server.listen`
+ * a filesystem path fails with `EACCES` and the `.sock` file is never created,
+ * so the daemon could not start at all there. The default is therefore mapped to
+ * a named pipe on Windows.
+ *
+ * Two constraints shape the mapping:
+ * - the pipe namespace is **machine-global** (every OS user shares `\\.\pipe\`),
+ *   so the name must carry a per-user component — otherwise one user's daemon
+ *   occupies another's default socket;
+ * - a home path cannot be embedded verbatim, because `\` and `:` are illegal in
+ *   pipe names. Hence a stable digest of the default path, not the path itself.
+ *
+ * The mapping applies to **the default socket only**, and it is applied on both
+ * sides (client and `--daemon` server) by this one function. A name that is
+ * already a pipe, or any other path, is used verbatim: rewriting what the caller
+ * named would silently point the daemon somewhere else.
+ */
+
+import { createHash } from "node:crypto";
+import os from "node:os";
+import path from "node:path";
+
+/** The default daemon socket as a file path — the shape POSIX listens on. */
+export const DEFAULT_DAEMON_SOCKET_FILE = path.join(
+  os.homedir(),
+  ".wave",
+  "daemon.sock",
+);
+
+/** libuv's Windows named-pipe prefixes (`\\.\pipe\` is the documented form). */
+const WINDOWS_PIPE_PREFIXES = ["\\\\.\\pipe\\", "\\\\?\\pipe\\"] as const;
+
+/** True when `socketPath` is already a Windows named-pipe name. */
+export function isWindowsPipeName(socketPath: string): boolean {
+  return WINDOWS_PIPE_PREFIXES.some((prefix) => socketPath.startsWith(prefix));
+}
+
+/**
+ * Derive the pipe name for a file-path socket. The digest is stable per path, so
+ * the same user always lands on the same name (a re-launched daemon finds and
+ * refuses to double-bind it), while different home directories — different OS
+ * users on one machine — land on different names.
+ */
+export function windowsPipeNameFor(socketFilePath: string): string {
+  const digest = createHash("sha256")
+    .update(socketFilePath)
+    .digest("hex")
+    .slice(0, 32);
+  return `\\\\.\\pipe\\wave-daemon-${digest}`;
+}
+
+/**
+ * Same file, allowing for how it was spelled — separator style, `.`/`..`
+ * segments, and (on Windows) letter case. A user who writes the default socket
+ * out by hand rarely matches `path.join`'s spelling byte for byte
+ * (`C:/Users/me/.wave/daemon.sock` vs `C:\Users\me\.wave\daemon.sock`), and
+ * missing that match would land the server on an `EACCES` instead of the pipe the
+ * client derives.
+ */
+function isSameFilePath(
+  a: string,
+  b: string,
+  platform: NodeJS.Platform,
+): boolean {
+  if (a === b) return true;
+  const resolvedA = path.resolve(a);
+  const resolvedB = path.resolve(b);
+  return platform === "win32"
+    ? resolvedA.toLowerCase() === resolvedB.toLowerCase()
+    : resolvedA === resolvedB;
+}
+
+/**
+ * Resolve the socket a caller means: identity on POSIX, and on Windows the pipe
+ * form of the default socket (anything else — an explicit path or a name that is
+ * already a pipe — is returned unchanged).
+ */
+export function resolveDaemonSocket(
+  platform: NodeJS.Platform,
+  socketPath: string,
+): string {
+  if (platform !== "win32") return socketPath;
+  if (isWindowsPipeName(socketPath)) return socketPath;
+  return isSameFilePath(socketPath, DEFAULT_DAEMON_SOCKET_FILE, platform)
+    ? // Digest the canonical spelling so every way of writing the default socket
+      // derives the same name — the pipe is a shared address, not a per-caller one.
+      windowsPipeNameFor(path.resolve(socketPath))
+    : socketPath;
+}
+
+/**
+ * The fixed default socket every `wave daemon` subcommand talks to (spec:
+ * 默认 socket 固定，形态随平台). No `--socket` override exists, so this is the
+ * only address the client side ever uses.
+ */
+export const DEFAULT_DAEMON_SOCKET = resolveDaemonSocket(
+  process.platform,
+  DEFAULT_DAEMON_SOCKET_FILE,
+);
+
+/**
+ * Translate a `listen` failure on a daemon address. `EADDRINUSE` is the shape a
+ * second daemon takes when the first one already holds the name — on Windows that
+ * is the *only* shape, since a pipe name has no stale file to probe first (the
+ * POSIX path detects the same situation by connecting to the socket file). The
+ * raw errno tells a user nothing actionable, so it becomes the same sentence both
+ * platforms report.
+ */
+export function describeListenError(
+  socketPath: string,
+  err: NodeJS.ErrnoException,
+): Error {
+  if (err.code === "EADDRINUSE") {
+    return new Error(
+      `Another wave daemon is already listening on ${socketPath}`,
+    );
+  }
+  return err;
+}

package/src/daemon-cli.ts

@@ -1,16 +1,18 @@
 /**
  * daemon-cli.ts — Entry point for `wave --daemon <socket-path>` mode.
  *
- * Starts a DaemonServer that serves JSON-RPC over a unix socket. The desktop
- * app launches this on a remote host via nohup/setsid and tunnels the socket
- * back with `ssh -L`; multiple attach/detach cycles share one process, so
- * sessions and pending permissions survive client disconnects. The net server
- * keeps the process alive — there is no stdin to wait on.
+ * Starts a DaemonServer that serves JSON-RPC over a local socket (a unix domain
+ * socket on POSIX, a named pipe on Windows). The desktop app launches this on a
+ * remote host via nohup/setsid and tunnels the socket back with `ssh -L`;
+ * multiple attach/detach cycles share one process, so sessions and pending
+ * permissions survive client disconnects. The net server keeps the process
+ * alive — there is no stdin to wait on.
  */
 
 import { ensureRuntimeDeps } from "wave-agent-sdk";
 import { DaemonServer } from "./stdio/daemonServer.js";
 import { createRemoteControlSinkFactory } from "./remote/remoteControlSink.js";
+import { resolveDaemonSocket } from "./daemon/socketPath.js";
 
 export async function startDaemonCli(socketPath: string): Promise<void> {
   // Install the on-demand runtime dependencies (image codec + ripgrep) before
@@ -19,10 +21,21 @@ export async function startDaemonCli(socketPath: string): Promise<void> {
   // since the host reports "daemon ready" on this socket.
   await ensureRuntimeDeps();
 
+  // Resolve the address exactly like the client does. The default path is the
+  // one name both sides must agree on, and on Windows it is reachable only in
+  // its pipe form — a caller that spells it out (`wave --daemon
+  // ~/.wave/daemon.sock`) must land on the same pipe the client derives, not on
+  // an EACCES. An explicit pipe name, or any other path, is used verbatim so a
+  // wrong address still fails loudly instead of being silently renamed.
+  const resolvedSocketPath = resolveDaemonSocket(process.platform, socketPath);
+
   // The resident daemon owns the remote sessions, so it is the process that
   // serves a paired phone. Off (undefined) unless the switch says otherwise.
   const createRemoteSink = createRemoteControlSinkFactory(process.cwd());
-  const server = new DaemonServer({ socketPath, createRemoteSink });
+  const server = new DaemonServer({
+    socketPath: resolvedSocketPath,
+    createRemoteSink,
+  });
   await server.start();
   // Ready — any error that follows goes to the daemon log via stderr.
 }

package/src/hooks/useInputManager.ts

@@ -4,9 +4,11 @@ import {
   inputReducer,
   initialState,
   InputManagerCallbacks,
+  FileSelectorItem,
   ESC_DOUBLE_PRESS_TIMEOUT_MS,
   btwOverlayActiveRef,
 } from "../managers/inputReducer.js";
+import { toAgentSelectorItems } from "../utils/agentSelector.js";
 import {
   searchFiles as searchFilesUtil,
   PermissionMode,
@@ -49,10 +51,10 @@ export const useInputManager = (
     onAskBtw,
     sessionId,
     workdir,
-    getFullMessageThread,
     logger,
     hasQueuedMessages: hasQueuedMessagesProp,
     onRecallQueuedMessage,
+    subagentConfigurations,
     onClearMessages,
     onCompact,
     onReloadPlugins,
@@ -62,7 +64,8 @@ export const useInputManager = (
     isIdle: isIdleProp,
   } = callbacks;
 
-  // Handle debounced file search
+  // Handle debounced file search. 子代理条目与文件结果一起下发（子代理是内存里
+  // 的稳定集合，不参与防抖；文件搜索失败也只是没有文件，子代理照旧可选）。
   useEffect(() => {
     if (state.showFileSelector) {
       const debounceDelay =
@@ -70,17 +73,26 @@ export const useInputManager = (
           ? 0
           : parseInt(process.env.FILE_SELECTOR_DEBOUNCE_MS || "300", 10);
       const timer = setTimeout(async () => {
+        let fileItems: FileSelectorItem[] = [];
         try {
-          const fileItems = await searchFilesUtil(state.fileSearchQuery);
-          dispatch({ type: "SET_FILTERED_FILES", payload: fileItems });
+          fileItems = await searchFilesUtil(state.fileSearchQuery);
         } catch (error) {
           console.error("File search error:", error);
-          dispatch({ type: "SET_FILTERED_FILES", payload: [] });
         }
+        dispatch({
+          type: "SET_FILTERED_FILES",
+          payload: [
+            ...toAgentSelectorItems(
+              subagentConfigurations,
+              state.fileSearchQuery,
+            ),
+            ...fileItems,
+          ],
+        });
       }, debounceDelay);
       return () => clearTimeout(timer);
     }
-  }, [state.showFileSelector, state.fileSearchQuery]);
+  }, [state.showFileSelector, state.fileSearchQuery, subagentConfigurations]);
 
   // Auto-expire the double-Esc clear pending flag after the timeout window
   // (aligned with Claude Code's useDoublePress timeout-based expiry).
@@ -150,15 +162,16 @@ export const useInputManager = (
               const answer = await onAskBtw?.(
                 effect.question,
                 controller.signal,
-                (content: string) => {
+                (delta: string) => {
                   // Stream partial answers into the overlay so the user sees
                   // the response grow in real time (same visual language as
                   // assistant text / thinking blocks) instead of a static
-                  // "Answering" indicator.
+                  // "Answering" indicator. The callback hands over a delta, so
+                  // this appends rather than replacing.
                   if (!btwDismissedRef.current) {
                     dispatch({
-                      type: "SET_BTW_STATE",
-                      payload: { answer: content, isLoading: true },
+                      type: "APPEND_BTW_ANSWER",
+                      payload: delta,
                     });
                   }
                 },
@@ -193,18 +206,8 @@ export const useInputManager = (
             onPermissionModeChange?.(effect.mode);
             break;
           case "FETCH_HISTORY": {
-            let sessionIds: string[] | undefined = sessionId
-              ? [sessionId]
-              : undefined;
-
-            if (getFullMessageThread) {
-              try {
-                const thread = await getFullMessageThread();
-                sessionIds = thread.sessionIds;
-              } catch (error) {
-                logger?.error("Failed to fetch ancestor session IDs", error);
-              }
-            }
+            // 同 inputHandlers 里那条：只按当前会话取，不为两个字段读整份转录。
+            const sessionIds = sessionId ? [sessionId] : undefined;
 
             const history = await PromptHistoryManager.getHistory({
               sessionId: sessionIds,
@@ -310,7 +313,6 @@ export const useInputManager = (
     onPermissionModeChange,
     sessionId,
     workdir,
-    getFullMessageThread,
     logger,
     onHasSlashCommand,
     onRecallQueuedMessage,
@@ -430,8 +432,8 @@ export const useInputManager = (
     dispatch({ type: "ACTIVATE_FILE_SELECTOR", payload: position });
   }, []);
 
-  const handleFileSelect = useCallback((filePath: string) => {
-    dispatch({ type: "SELECT_FILE", payload: filePath });
+  const handleFileSelect = useCallback((item: FileSelectorItem) => {
+    dispatch({ type: "SELECT_FILE", payload: item });
   }, []);
 
   const handleCancelFileSelect = useCallback(() => {

package/src/index.ts

@@ -11,6 +11,12 @@ import { createWorktree, type WorktreeSession } from "./utils/worktree.js";
 import path from "path";
 import { pathToFileURL } from "url";
 import { readNearestPackageJson } from "./utils/readPackageJson.js";
+import { ensurePlainNodeArgv } from "./utils/argvCompat.js";
+
+// Must run before `main()` builds its yargs instance (see argvCompat.ts):
+// when a host runs this bundle directly under Electron RUN_AS_NODE, yargs would
+// otherwise treat the script path as an unknown positional and exit 1.
+ensurePlainNodeArgv();
 
 const version = readNearestPackageJson().version;
 
@@ -61,6 +67,14 @@ export async function main() {
         type: "boolean",
         global: false,
       })
+      .option("output-format", {
+        description:
+          'Print-mode output format: "text" (default), "json" (a single result object), or "stream-json" (one JSON event per line)',
+        choices: ["text", "json", "stream-json"] as const,
+        default: "text" as const,
+        type: "string",
+        global: false,
+      })
       .option("dangerously-skip-permissions", {
         description: "Skip all permission checks (dangerous)",
         type: "boolean",
@@ -726,17 +740,34 @@ export async function main() {
       });
     }
 
+    // --output-format only means anything for a print-mode run: anywhere else
+    // stdout is the Ink UI, so a JSON request there would silently do nothing.
+    // (`text` is the default, so an explicit `text` is not an error — and
+    // subcommands may not carry the flag at all.)
+    if (
+      argv.print === undefined &&
+      argv.outputFormat !== undefined &&
+      argv.outputFormat !== "text"
+    ) {
+      console.error(
+        `--output-format ${argv.outputFormat} requires print mode (-p).`,
+      );
+      process.exit(1);
+    }
+
     // Validate an explicitly-specified restore ID before entering the CLI —
-    // loadSessionFromJsonl scans every project dir as a fallback, so a miss
+    // sessionExistsAnywhere scans every project dir as a fallback, so a miss
     // here means the session truly does not exist. Fail fast with a clear
-    // error instead of silently starting a fresh session.
+    // error instead of silently starting a fresh session. It is a yes/no
+    // question, so it does not read the transcript: the CLI loads the session
+    // for real a moment later.
     if (
       typeof argv.restore === "string" &&
       argv.restore !== "" &&
       !argv.print
     ) {
-      const { loadSessionFromJsonl } = await import("wave-agent-sdk");
-      const exists = await loadSessionFromJsonl(argv.restore, workdir);
+      const { sessionExistsAnywhere } = await import("wave-agent-sdk");
+      const exists = await sessionExistsAnywhere(argv.restore, workdir);
       if (!exists) {
         console.error(`Session ${argv.restore} not found on disk.`);
         process.exit(1);
@@ -751,6 +782,7 @@ export async function main() {
         continueLastSession: argv.continue as boolean | undefined,
         message: argv.print,
         showStats: argv.showStats as boolean | undefined,
+        outputFormat: argv.outputFormat as "text" | "json" | "stream-json",
         bypassPermissions: argv.dangerouslySkipPermissions as
           | boolean
           | undefined,

package/src/managers/inputHandlers.ts

@@ -582,22 +582,12 @@ export const handleNormalInput = async (
 
   if (key.upArrow) {
     if (state.history.length === 0) {
-      let sessionIds: string[] | undefined = callbacks.sessionId
+      // 提示历史只按当前会话取：`sessionIds` 恒为 `[当前会话 id]`，不要为了这两个
+      // 字段去读整份转录，几万条的会话为此白读几十 MB。
+      const sessionIds = callbacks.sessionId
         ? [callbacks.sessionId]
         : undefined;
 
-      if (callbacks.getFullMessageThread) {
-        try {
-          const thread = await callbacks.getFullMessageThread();
-          sessionIds = thread.sessionIds;
-        } catch (error) {
-          callbacks.logger?.error(
-            "Failed to fetch ancestor session IDs",
-            error,
-          );
-        }
-      }
-
       const history = await PromptHistoryManager.getHistory({
         sessionId: sessionIds,
         workdir: callbacks.workdir,

package/src/managers/inputReducer.ts

@@ -1,9 +1,8 @@
 import {
-  FileItem,
   PermissionMode,
   Logger,
   PromptEntry,
-  Message,
+  SubagentConfiguration,
 } from "wave-agent-sdk";
 import { Key } from "ink";
 import {
@@ -27,6 +26,23 @@ export interface BtwState {
   isLoading: boolean;
 }
 
+/**
+ * `@` 候选条目。文件/目录来自 SDK 的 `searchFiles`，子代理来自
+ * `agent.getSubagentConfigurations()`（spec `multi-agent/subagent.md`
+ * 「用户故事：显式子代理调用」）。
+ *
+ * 子代理条目的 `path` 是 `agent:<名称>` 占位值、`agentName` 是判据；选中后插入
+ * `@agent:<名称>`，SDK 会在每轮首回合把它解析成点名提醒。
+ */
+export interface FileSelectorItem {
+  path: string;
+  type: "file" | "directory" | "agent";
+  /** 子代理名（`type === "agent"` 时有值），也是插入正文的名字。 */
+  agentName?: string;
+  /** 子代理定义的 description，作为条目的第二行说明。 */
+  agentDescription?: string;
+}
+
 /**
  * True while the /btw overlay is up (a question is on display, loading or
  * answered). App's Ctrl+C exit handler checks this so Ctrl+C does not quit
@@ -85,7 +101,7 @@ export interface InputManagerCallbacks {
   onCursorPositionChange?: (position: number) => void;
   onFileSelectorStateChange?: (
     show: boolean,
-    files: FileItem[],
+    files: FileSelectorItem[],
     query: string,
     position: number,
   ) => void;
@@ -126,14 +142,15 @@ export interface InputManagerCallbacks {
   onPlanCommand?: (args?: string) => Promise<void> | void;
   sessionId?: string;
   workdir?: string;
-  getFullMessageThread?: () => Promise<{
-    messages: Message[];
-    sessionIds: string[];
-  }>;
   logger?: Logger;
   hasQueuedMessages?: boolean;
   isIdle?: boolean;
   onRecallQueuedMessage?: () => void;
+  /**
+   * 已加载的子代理（`Agent.getSubagentConfigurations()`），`@` 候选会把它们并到
+   * 文件结果之前（spec `multi-agent/subagent.md`「用户故事：显式子代理调用」）。
+   */
+  subagentConfigurations?: SubagentConfiguration[];
 }
 
 export interface InputState {
@@ -142,7 +159,7 @@ export interface InputState {
   showFileSelector: boolean;
   atPosition: number;
   fileSearchQuery: string;
-  filteredFiles: FileItem[];
+  filteredFiles: FileSelectorItem[];
   showCommandSelector: boolean;
   slashPosition: number;
   commandSearchQuery: string;
@@ -486,7 +503,7 @@ export type InputAction =
   | { type: "MOVE_CURSOR"; payload: number }
   | { type: "ACTIVATE_FILE_SELECTOR"; payload: number }
   | { type: "SET_FILE_SEARCH_QUERY"; payload: string }
-  | { type: "SET_FILTERED_FILES"; payload: FileItem[] }
+  | { type: "SET_FILTERED_FILES"; payload: FileSelectorItem[] }
   | { type: "CANCEL_FILE_SELECTOR" }
   | { type: "ACTIVATE_COMMAND_SELECTOR"; payload: number }
   | { type: "SET_COMMAND_SEARCH_QUERY"; payload: string }
@@ -526,8 +543,9 @@ export type InputAction =
   | { type: "SELECT_HISTORY_ENTRY"; payload: PromptEntry }
   | { type: "SELECT_COMMAND"; payload: string }
   | { type: "INSERT_COMMAND"; payload: string }
-  | { type: "SELECT_FILE"; payload: string }
+  | { type: "SELECT_FILE"; payload: FileSelectorItem }
   | { type: "SET_BTW_STATE"; payload: Partial<BtwState> }
+  | { type: "APPEND_BTW_ANSWER"; payload: string }
   | { type: "CLEAR_PENDING_EFFECT" }
   | { type: "RESET_ESC_CLEAR_PENDING" }
   | {
@@ -915,13 +933,17 @@ export function inputReducer(
       return state;
     }
     case "SELECT_FILE": {
-      const filePath = action.payload;
+      const item = action.payload;
+      // 子代理条目插入 `@agent:<名称>`（SDK 的判据），文件/目录仍插 `@路径`。
+      const inserted = item.agentName
+        ? `@agent:${item.agentName}`
+        : `@${item.path}`;
       if (state.atPosition >= 0) {
         const wordEnd = getWordEnd(state.inputText, state.atPosition);
         const beforeAt = state.inputText.substring(0, state.atPosition);
         const afterWord = state.inputText.substring(wordEnd);
-        const newInput = beforeAt + `@${filePath} ` + afterWord;
-        const newCursorPosition = beforeAt.length + filePath.length + 2;
+        const newInput = beforeAt + `${inserted} ` + afterWord;
+        const newCursorPosition = beforeAt.length + inserted.length + 1;
 
         return {
           ...state,
@@ -1664,6 +1686,15 @@ export function inputReducer(
           ...action.payload,
         },
       };
+    case "APPEND_BTW_ANSWER":
+      // Streaming deltas are appended, never treated as the whole answer.
+      return {
+        ...state,
+        btwState: {
+          ...state.btwState,
+          answer: (state.btwState.answer ?? "") + action.payload,
+        },
+      };
     default:
       return state;
   }