@co0ontty/wand 1.30.0 → 1.31.0

package/dist/structured-session-manager.js

@@ -117,6 +117,50 @@ function tagSubagentBlocks(blocks, parentToolUseId, registry) {
     };
     return blocks.map((block) => ({ ...block, __subagent: stamp }));
 }
+/**
+ * 给已被 captureTaskMeta 识别为 Task/Agent 的 tool_use block 本身也盖 __subagent 章。
+ * taskId 用自己的 block.id —— 与子消息的 parent_tool_use_id（也等于这个 id）保持一致，
+ * 前端 splitTurnBySubagent 按 taskId 分组时父 Task tool_use 和 SDK 转发的子消息能合并到同一段。
+ */
+function stampSelfTask(blocks, registry) {
+    return blocks.map((b) => {
+        if (b.type !== "tool_use")
+            return b;
+        if (b.__subagent)
+            return b; // 已盖章不重复（防止幂等问题）
+        const meta = registry.get(b.id);
+        if (!meta && b.name !== "Task" && b.name !== "Agent")
+            return b;
+        const stamp = {
+            taskId: b.id,
+            ...(meta?.agentType ? { agentType: meta.agentType } : {}),
+            ...(meta?.description ? { taskDescription: meta.description } : {}),
+        };
+        return { ...b, __subagent: stamp };
+    });
+}
+/**
+ * 当父 assistant 在 parentToolUseId === null 的 user turn 里收到 Task 工具的 tool_result 时，
+ * tagSubagentBlocks 不会被调用（它只在 parentToolUseId 非空时盖章）。这里按 tool_use_id
+ * 反查 registry，给这条 tool_result 单独盖章，让前端能把它归到同一个 subagent 段。
+ */
+function stampParentTaskResults(blocks, registry) {
+    return blocks.map((b) => {
+        if (b.type !== "tool_result")
+            return b;
+        if (b.__subagent)
+            return b;
+        const meta = registry.get(b.tool_use_id);
+        if (!meta)
+            return b;
+        const stamp = {
+            taskId: b.tool_use_id,
+            ...(meta.agentType ? { agentType: meta.agentType } : {}),
+            ...(meta.description ? { taskDescription: meta.description } : {}),
+        };
+        return { ...b, __subagent: stamp };
+    });
+}
 const STREAM_EMIT_DEBOUNCE_MS = 16;
 /** Min interval between full saveSession() calls for an in-progress streaming turn.
  *  saveSession serializes the entire messages array, so doing it on every NDJSON
@@ -505,6 +549,7 @@ export class StructuredSessionManager {
             ? prepareSessionWorktree({ cwd: options.cwd, sessionId: id })
             : null;
         const selectedModel = options.model?.trim() || null;
+        const initialThinkingEffort = normalizeThinkingEffort(options.thinkingEffort);
         const snapshot = {
             id,
             sessionKind: "structured",
@@ -541,6 +586,7 @@ export class StructuredSessionManager {
             autoApprovePermissions: shouldAutoApproveForMode(options.mode),
             approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
             selectedModel,
+            thinkingEffort: initialThinkingEffort,
         };
         this.sessions.set(id, snapshot);
         this.storage.saveSession(snapshot);
@@ -999,6 +1045,11 @@ export class StructuredSessionManager {
         if (modelChoice && modelChoice !== "default") {
             args.push("--model", modelChoice);
         }
+        // 思考深度 → --reasoning-effort（off → minimal，standard → low，deep → medium，max → high）
+        const reasoningFlag = thinkingEffortToCodexFlag(session.thinkingEffort);
+        if (reasoningFlag) {
+            args.push("--reasoning-effort", reasoningFlag);
+        }
         if (session.claudeSessionId) {
             args.push("resume", session.claudeSessionId, "-");
         }
@@ -1340,6 +1391,10 @@ export class StructuredSessionManager {
             // variadic 参数贪婪吞掉（commander 的 <tools...> 会一直吃 positional 直到
             // 下一个 flag）。表现为 claude 报 "Input must be provided either through
             // stdin or as a prompt argument when using --print"。
+            //
+            // 思考深度通过给 prompt 前置魔法词触发（think / think hard / ultrathink）。
+            // applyThinkingEffortToPrompt 自身已经做了"用户已写过就不重复加"的保护。
+            const effectivePrompt = applyThinkingEffortToPrompt(prompt, session.thinkingEffort);
             const spawnedAt = new Date().toISOString();
             const child = spawn("claude", args, {
                 cwd: session.cwd,
@@ -1352,13 +1407,13 @@ export class StructuredSessionManager {
                 pid: child.pid ?? null,
                 cwd: session.cwd,
                 args,
-                prompt: prompt.slice(0, 2048),
-                promptLength: prompt.length,
+                prompt: effectivePrompt.slice(0, 2048),
+                promptLength: effectivePrompt.length,
                 claudeSessionId: session.claudeSessionId,
                 spawnedAt,
             });
             this.pendingChildren.set(sessionId, child);
-            child.stdin?.end(prompt);
+            child.stdin?.end(effectivePrompt);
             const turnState = {
                 blocks: [],
                 result: "",
@@ -1555,7 +1610,7 @@ export class StructuredSessionManager {
                         captureTaskMeta(extracted.content, taskMetaRegistry);
                     }
                     const stamped = parentToolUseId === null
-                        ? extracted.content
+                        ? stampSelfTask(extracted.content, taskMetaRegistry)
                         : tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry);
                     if (stamped.length > 0) {
                         upsertBlocks(msgId, stamped);
@@ -1599,7 +1654,7 @@ export class StructuredSessionManager {
                         ? parsed.parent_tool_use_id
                         : null;
                     const stamped = parentToolUseId === null
-                        ? collected
+                        ? stampParentTaskResults(collected, taskMetaRegistry)
                         : tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry);
                     if (stamped.length > 0) {
                         upsertBlocks(`tool_result:${toolResultSeq++}`, stamped);
@@ -1845,6 +1900,12 @@ export class StructuredSessionManager {
         // SDK 默认会把整个 process.env 透传给 claude 子进程；这里显式按 inheritEnv 配置组装，
         // 否则关闭"继承环境变量"开关时 SDK 路径会被静默忽略。
         const sdkEnv = buildChildEnv(this.config.inheritEnv !== false);
+        // 思考深度：off → 显式禁用 thinking，其他 → 给一个固定 budget。
+        // SDK 类型用驼峰 budgetTokens（API 层是 budget_tokens，SDK 内部已做转换）。
+        const sdkThinkingBudget = thinkingEffortToSdkBudget(session.thinkingEffort);
+        const sdkThinking = sdkThinkingBudget > 0
+            ? { type: "enabled", budgetTokens: sdkThinkingBudget }
+            : { type: "disabled" };
         const sdkOptions = {
             cwd: session.cwd,
             abortController,
@@ -1853,6 +1914,7 @@ export class StructuredSessionManager {
             ...(permPolicy.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}),
             ...(permPolicy.allowedTools ? { allowedTools: permPolicy.allowedTools } : {}),
             ...(isManaged ? { disallowedTools: ["AskUserQuestion"] } : {}),
+            thinking: sdkThinking,
             includePartialMessages: true,
             // 把子 agent 的 text/thinking 也转发回来，UI 才能把"被 Task 召唤来的协作者"
             // 渲染成独立角色的群聊消息。关掉这个开关时只会收到子 agent 的 tool_use/tool_result，
@@ -1983,7 +2045,13 @@ export class StructuredSessionManager {
                     streaming.push(block);
                 }
             }
-            return [...finalizedBlocks, ...streaming];
+            // 流式阶段就给 Task/Agent tool_use 本身盖章，防止"先显示工具卡片几秒再跳为
+            // handoff 行"的闪烁。content_block_start 阶段就有 name=Task/Agent，
+            // stampSelfTask 据此即可命中；agentType 字段藏在 input 里，delta 累计后再由
+            // 后续 captureTaskMeta 回填 registry，下次 rebuild 自动补上更完整的 stamp。
+            captureTaskMeta(streaming, taskMetaRegistry);
+            const stampedStreaming = stampSelfTask(streaming, taskMetaRegistry);
+            return [...finalizedBlocks, ...stampedStreaming];
         };
         const syncSnapshot = () => {
             const current = this.sessions.get(sessionId);
@@ -2095,7 +2163,7 @@ export class StructuredSessionManager {
                     const parentToolUseId = assistantMsg.parent_tool_use_id ?? null;
                     if (parentToolUseId === null) {
                         captureTaskMeta(extracted.content, taskMetaRegistry);
-                        finalizedBlocks.push(...extracted.content);
+                        finalizedBlocks.push(...stampSelfTask(extracted.content, taskMetaRegistry));
                     }
                     else {
                         finalizedBlocks.push(...tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry));
@@ -2150,7 +2218,7 @@ export class StructuredSessionManager {
                         }
                     }
                     if (parentToolUseId === null) {
-                        finalizedBlocks.push(...collected);
+                        finalizedBlocks.push(...stampParentTaskResults(collected, taskMetaRegistry));
                     }
                     else {
                         finalizedBlocks.push(...tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry));

package/dist/tui/attach.js

@@ -230,14 +230,13 @@ export function startAttachTui(deps) {
             layout.showToast("服务已安装，按 Shift+S 卸载", "warn", 2500);
             return;
         }
-        const ok = await layout.confirm({
-            title: "注册为系统服务",
-            body: process.platform === "linux"
-                ? "将写入 ~/.config/systemd/user/wand.service。"
-                : process.platform === "darwin"
-                    ? "将写入 ~/Library/LaunchAgents/com.wand.web.plist。"
-                    : "当前平台暂不支持。",
-        });
+        const isRoot = typeof process.getuid === "function" ? process.getuid() === 0 : false;
+        const body = process.platform === "linux"
+            ? `将写入 /etc/systemd/system/wand.service，systemctl enable --now，开机自启。\n${isRoot ? "当前是 root，可以直接装。" : "⚠ 需要 root,可以 Ctrl+C 退出 TUI 后跑 sudo wand service:install。"}`
+            : process.platform === "darwin"
+                ? `将写入 /Library/LaunchDaemons/com.wand.web.plist，launchctl load，开机自启。\n${isRoot ? "当前是 root,可以直接装。" : "⚠ 需要 root,退出 TUI 跑 sudo wand service:install。"}`
+                : "当前平台暂不支持。";
+        const ok = await layout.confirm({ title: "注册为系统服务", body });
         if (!ok)
             return;
         const r = await runOffMicrotask(() => installService({ configPath: deps.configPath }));

package/dist/tui/commands.d.ts

@@ -36,12 +36,29 @@ export declare function checkUpdate(currentVersion: string): UpdateInfo;
 export declare function installUpdate(): CommandResult;
 export declare function openInBrowser(url: string): CommandResult;
 export declare function copyToClipboard(text: string): CommandResult;
+/**
+ * 服务安装的作用域：
+ *   - "system" = Linux 写 /etc/systemd/system/wand.service；macOS 写 /Library/LaunchDaemons/
+ *                需要 root，开机自启，所有用户可用，不依赖 login session。
+ *   - "user"   = Linux 写 ~/.config/systemd/user/wand.service；macOS 写 ~/Library/LaunchAgents/
+ *                不要 root，登出会被回收（除非 loginctl enable-linger）。
+ *
+ * 默认 system。
+ */
+export type ServiceScope = "system" | "user";
+export declare const DEFAULT_SERVICE_SCOPE: ServiceScope;
 export interface ServiceContext {
     configPath: string;
     /** wand 可执行文件路径。优先使用 process.argv[1]，回退到 which wand。 */
     wandBin?: string;
+    /** 显式指定作用域。不传走 DEFAULT_SERVICE_SCOPE。 */
+    scope?: ServiceScope;
+}
+export interface ServiceOpts {
+    /** 不传 = 自动检测已装的那个；都没装就用 default。 */
+    scope?: ServiceScope;
 }
-export declare function isServiceInstalled(): boolean;
+export declare function isServiceInstalled(scope?: ServiceScope): boolean;
 export interface ServiceStatus {
     /** 是否已安装服务文件。 */
     installed: boolean;
@@ -54,11 +71,11 @@ export interface ServiceStatus {
     /** 平台。 */
     platform: NodeJS.Platform;
 }
-export declare function serviceStatus(): ServiceStatus;
-export declare function serviceStart(): CommandResult;
-export declare function serviceStop(): CommandResult;
-export declare function serviceRestart(): CommandResult;
+export declare function serviceStatus(opts?: ServiceOpts): ServiceStatus;
+export declare function serviceStart(opts?: ServiceOpts): CommandResult;
+export declare function serviceStop(opts?: ServiceOpts): CommandResult;
+export declare function serviceRestart(opts?: ServiceOpts): CommandResult;
 /** 取最近 N 行服务日志。 */
-export declare function serviceLogs(lines?: number): CommandResult;
+export declare function serviceLogs(lines?: number, opts?: ServiceOpts): CommandResult;
 export declare function installService(ctx: ServiceContext): CommandResult;
-export declare function uninstallService(): CommandResult;
+export declare function uninstallService(opts?: ServiceOpts): CommandResult;