@co0ontty/wand 1.75.7 → 2.0.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "7ae7673cfd6236680dba087cbd52c1ddbf1e5d65",
-  "builtAt": "2026-06-26T11:17:58.046Z",
-  "version": "1.75.7",
+  "commit": "77a39200ebf0d88b0048856c3eeb12a00b4dd2b2",
+  "builtAt": "2026-06-27T08:59:08.623Z",
+  "version": "2.0.0",
   "channel": "stable"
 }

package/dist/git-quick-commit.js

@@ -3,7 +3,7 @@ import { spawn } from "node:child_process";
 import { ClaudeRunError, runClaudePrint } from "./claude-sdk-runner.js";
 import { buildChildEnv } from "./env-utils.js";
 import { runGit as runGitBase, runGitRaw as runGitRawBase, getGitErrorMessage } from "./git-utils.js";
-import { applyThinkingEffortToPrompt, thinkingEffortToCodexReasoningEffort } from "./structured-session-manager.js";
+import { thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort } from "./structured-session-manager.js";
 const GIT_TIMEOUT_MS = 1500;
 const GIT_PUSH_TIMEOUT_MS = 30_000;
 const MAX_FILE_ENTRIES = 200;
@@ -957,9 +957,11 @@ async function runQuickCommitFallbackCli(opts, priorError) {
         const model = opts.model?.trim();
         if (model && model !== "default")
             args.push("--model", model);
+        const claudeEffort = thinkingEffortToClaudeCliEffort(opts.thinkingEffort ?? "off");
+        if (claudeEffort)
+            args.push("--effort", claudeEffort);
         args.push("--permission-mode", "bypassPermissions");
-        const effectivePrompt = applyThinkingEffortToPrompt(prompt, opts.thinkingEffort ?? "off");
-        await runCliText("claude", args, effectivePrompt, {
+        await runCliText("claude", args, prompt, {
             cwd: opts.cwd,
             timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
             inheritEnv: opts.inheritEnv,

package/dist/process-manager.d.ts

@@ -92,9 +92,8 @@ export declare class ProcessManager extends EventEmitter {
      */
     setSessionModel(id: string, model: string | null): SessionSnapshot;
     /**
-     * Set the thinking-effort level for a PTY session. For interactive Claude PTY
-     * we don't intercept raw key input; the effort is applied only when wand UI
-     * sends a chat-view message (see sendInput → applyThinkingEffortToPrompt).
+     * Set the thinking-effort level for a PTY session. Interactive Claude supports
+     * this through /effort; off maps to auto, which restores the model default.
      */
     setSessionThinkingEffort(id: string, effort: SessionSnapshot["thinkingEffort"]): SessionSnapshot;
     /**

package/dist/process-manager.js

@@ -14,7 +14,7 @@ import { ensureNodePtyHelperExecutable } from "./ensure-node-pty-helper.js";
 import { buildLanguageDirective, buildManagedAutonomyDirective } from "./language-prompt.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getCodexResumeCommandSessionId, getResumeCommandSessionId } from "./resume-policy.js";
-import { applyThinkingEffortToPrompt, normalizeThinkingEffort } from "./structured-session-manager.js";
+import { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort } from "./structured-session-manager.js";
 import { generateSessionTopic } from "./session-topic.js";
 import { getErrorMessage } from "./error-utils.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -780,7 +780,8 @@ export class ProcessManager extends EventEmitter {
         const effectiveMode = provider === "codex" ? "full-access" : mode;
         const isClaudeProvider = provider === "claude";
         const selectedModel = opts?.model?.trim() || undefined;
-        const processedCommand = this.processCommandForMode(command, effectiveMode, provider, selectedModel);
+        const initialThinkingEffort = normalizeThinkingEffort(opts?.thinkingEffort);
+        const processedCommand = this.processCommandForMode(command, effectiveMode, provider, selectedModel, initialThinkingEffort);
         const resumeCommandSessionId = isClaudeProvider
             ? getResumeCommandSessionId(processedCommand) ?? getResumeCommandSessionId(command)
             : null;
@@ -842,7 +843,7 @@ export class ProcessManager extends EventEmitter {
             codexSessionDiscoveryTimer: null,
             approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
             selectedModel: selectedModel ?? null,
-            thinkingEffort: normalizeThinkingEffort(opts?.thinkingEffort),
+            thinkingEffort: initialThinkingEffort,
             // cols 上限 256：与 @wterm/dom WASM grid 的 maxCols 硬编码一致，
             // 防止服务端按 >256 cols 让 Claude 用 CSI 绝对列定位写到 wterm 实际
             // 渲染不到的列上（表现为"内容神奇复制下行"）。
@@ -1224,14 +1225,16 @@ export class ProcessManager extends EventEmitter {
         return this.snapshot(record);
     }
     /**
-     * Set the thinking-effort level for a PTY session. For interactive Claude PTY
-     * we don't intercept raw key input; the effort is applied only when wand UI
-     * sends a chat-view message (see sendInput → applyThinkingEffortToPrompt).
+     * Set the thinking-effort level for a PTY session. Interactive Claude supports
+     * this through /effort; off maps to auto, which restores the model default.
      */
     setSessionThinkingEffort(id, effort) {
         const record = this.mustGet(id);
         const normalized = normalizeThinkingEffort(effort);
         record.thinkingEffort = normalized;
+        if (record.provider === "claude" && record.status === "running" && record.ptyProcess) {
+            record.ptyProcess.write(`/effort ${thinkingEffortToClaudeSlashEffort(normalized)}\r`);
+        }
         this.persist(record);
         this.emitEvent({ type: "status", sessionId: id, data: { thinkingEffort: normalized } });
         return this.snapshot(record);
@@ -1280,19 +1283,11 @@ export class ProcessManager extends EventEmitter {
             };
             this.logger.appendShortcutLog(id, shortcutKey, tailLines, ctx);
         }
-        // Thinking-depth magic-word injection. Only applied to chat-view submits
-        // (terminal direct keystrokes are pass-through). applyThinkingEffortToPrompt
-        // is safe on empty / lone-\r chunks (returns input unchanged) and won't
-        // double-prefix if the user already wrote the magic word themselves.
-        let effectiveInput = input;
-        if (view === "chat" && record.thinkingEffort && record.thinkingEffort !== "off") {
-            effectiveInput = applyThinkingEffortToPrompt(input, record.thinkingEffort);
-        }
         // Track user input via bridge for Chat mode
         if (record.ptyBridge) {
-            record.ptyBridge.onUserInput(effectiveInput);
+            record.ptyBridge.onUserInput(input);
         }
-        record.ptyProcess.write(effectiveInput);
+        record.ptyProcess.write(input);
         this.persist(record);
         return this.snapshot(record);
     }
@@ -1963,7 +1958,7 @@ export class ProcessManager extends EventEmitter {
         }
         return false;
     }
-    processCommandForMode(command, mode, provider, model) {
+    processCommandForMode(command, mode, provider, model, thinkingEffort) {
         if (provider === "codex") {
             let result = command;
             const trimmedModel = model?.trim();
@@ -1987,6 +1982,10 @@ export class ProcessManager extends EventEmitter {
             const escapedModel = trimmedModel.replace(/'/g, "'\\''");
             result += ` --model '${escapedModel}'`;
         }
+        const claudeEffort = thinkingEffortToClaudeCliEffort(thinkingEffort ?? null);
+        if (claudeEffort && !/--effort(?:\s|=|$)/.test(command)) {
+            result += ` --effort ${claudeEffort}`;
+        }
         const hasPermFlag = /--permission-mode\s/.test(command);
         if (!hasPermFlag) {
             if (isRunningAsRoot()) {

package/dist/server-session-routes.js

@@ -269,7 +269,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
     });
     // 思考深度切换：与 /model 路由对称。结构化会话立即影响下一条 prompt（CLI/SDK 各自接入
-    // applyThinkingEffortToPrompt / thinking budget），PTY 会话仅影响通过 chat 视图发送的输入。
+    // --effort / thinking budget），PTY 会话通过 /effort 更新当前 Claude 进程。
     app.post("/api/sessions/:id/thinking-effort", express.json(), (req, res) => {
         const body = req.body;
         const raw = typeof body?.thinkingEffort === "string" ? body.thinkingEffort : null;

package/dist/structured-session-manager.d.ts

@@ -27,11 +27,10 @@ interface CreateStructuredSessionOptions {
 export declare function normalizeThinkingEffort(value: unknown): SessionSnapshot["thinkingEffort"];
 /** Claude SDK 用：把 thinkingEffort 映射成 `thinking.budget_tokens`。off / 空 → 0（不启用）。 */
 export declare function thinkingEffortToSdkBudget(effort: SessionSnapshot["thinkingEffort"]): number;
-/**
- * Claude CLI 用：在 prompt 前注入魔法词，让 claude code 自动识别为思考请求。
- * off → 原 prompt 不变。
- */
-export declare function applyThinkingEffortToPrompt(prompt: string, effort: SessionSnapshot["thinkingEffort"]): string;
+/** Claude CLI 用：把 thinkingEffort 映射到 `--effort` / `/effort` 支持的等级。off → 不覆盖默认值。 */
+export declare function thinkingEffortToClaudeCliEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
+/** Claude PTY slash-command 用：off 表示恢复模型默认 effort。 */
+export declare function thinkingEffortToClaudeSlashEffort(effort: SessionSnapshot["thinkingEffort"]): string;
 /** Codex CLI 用：把 thinkingEffort 映射到 model_reasoning_effort 配置。off → minimal。 */
 export declare function thinkingEffortToCodexReasoningEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare class StructuredSessionManager {
@@ -121,8 +120,8 @@ export declare class StructuredSessionManager {
     setSessionModel(sessionId: string, model: string | null): SessionSnapshot;
     /**
      * Update the thinking-effort level for a structured session. Takes effect on
-     * the next spawn / next message (SDK runner injects `thinking`, CLI runner
-     * prepends magic words, codex runner overrides `model_reasoning_effort`).
+     * the next spawn / next message (SDK runner injects `thinking`, Claude CLI
+     * runner passes `--effort`, codex runner overrides `model_reasoning_effort`).
      */
     setSessionThinkingEffort(sessionId: string, effort: SessionSnapshot["thinkingEffort"]): SessionSnapshot;
     /**

package/dist/structured-session-manager.js

@@ -46,36 +46,19 @@ export function thinkingEffortToSdkBudget(effort) {
         default: return 0;
     }
 }
-/**
- * Claude CLI 用：在 prompt 前注入魔法词，让 claude code 自动识别为思考请求。
- * off → 原 prompt 不变。
- */
-export function applyThinkingEffortToPrompt(prompt, effort) {
-    const trimmed = prompt.trimStart();
-    if (!trimmed)
-        return prompt;
-    let prefix = "";
+/** Claude CLI 用：把 thinkingEffort 映射到 `--effort` / `/effort` 支持的等级。off → 不覆盖默认值。 */
+export function thinkingEffortToClaudeCliEffort(effort) {
     switch (effort) {
-        case "standard":
-            prefix = "think. ";
-            break;
-        case "deep":
-            prefix = "think hard. ";
-            break;
-        case "max":
-            prefix = "ultrathink. ";
-            break;
+        case "standard": return "low";
+        case "deep": return "medium";
+        case "max": return "max";
         case "off":
-        default: return prompt;
-    }
-    // 用户已经手写了相同强度的指令时不重复加，避免把 "ultrathink. ultrathink." 喂给模型。
-    const lower = trimmed.toLowerCase();
-    if (lower.startsWith("ultrathink") || lower.startsWith("think hard") || lower.startsWith("think very") || lower.startsWith("think harder")) {
-        return prompt;
+        default: return null;
     }
-    if (effort === "standard" && lower.startsWith("think"))
-        return prompt;
-    return prefix + trimmed;
+}
+/** Claude PTY slash-command 用：off 表示恢复模型默认 effort。 */
+export function thinkingEffortToClaudeSlashEffort(effort) {
+    return thinkingEffortToClaudeCliEffort(effort) ?? "auto";
 }
 /** Codex CLI 用：把 thinkingEffort 映射到 model_reasoning_effort 配置。off → minimal。 */
 export function thinkingEffortToCodexReasoningEffort(effort) {
@@ -893,8 +876,8 @@ export class StructuredSessionManager {
     }
     /**
      * Update the thinking-effort level for a structured session. Takes effect on
-     * the next spawn / next message (SDK runner injects `thinking`, CLI runner
-     * prepends magic words, codex runner overrides `model_reasoning_effort`).
+     * the next spawn / next message (SDK runner injects `thinking`, Claude CLI
+     * runner passes `--effort`, codex runner overrides `model_reasoning_effort`).
      */
     setSessionThinkingEffort(sessionId, effort) {
         const session = this.requireSession(sessionId);
@@ -1490,6 +1473,10 @@ export class StructuredSessionManager {
             if (modelChoice && modelChoice !== "default") {
                 args.push("--model", modelChoice);
             }
+            const claudeEffort = thinkingEffortToClaudeCliEffort(session.thinkingEffort);
+            if (claudeEffort) {
+                args.push("--effort", claudeEffort);
+            }
             // 托管模式：禁用 AskUserQuestion，让 agent 自己拍板，不要等用户决策。
             // 非托管模式：保留工具，靠 processLine 检测后主动 kill child 触发"中断+续接"流程。
             const isManaged = session.mode === "managed";
@@ -1504,9 +1491,7 @@ export class StructuredSessionManager {
             // 下一个 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);
+            // 思考深度通过 --effort 传给 Claude CLI；prompt 保持用户原文。
             const spawnedAt = new Date().toISOString();
             const child = spawn("claude", args, {
                 cwd: session.cwd,
@@ -1519,13 +1504,13 @@ export class StructuredSessionManager {
                 pid: child.pid ?? null,
                 cwd: session.cwd,
                 args,
-                prompt: effectivePrompt.slice(0, 2048),
-                promptLength: effectivePrompt.length,
+                prompt: prompt.slice(0, 2048),
+                promptLength: prompt.length,
                 claudeSessionId: session.claudeSessionId,
                 spawnedAt,
             });
             this.pendingChildren.set(sessionId, child);
-            child.stdin?.end(effectivePrompt);
+            child.stdin?.end(prompt);
             const turnState = {
                 blocks: [],
                 result: "",

package/dist/types.d.ts

@@ -438,10 +438,10 @@ export interface SessionSnapshot {
     selectedModel?: string | null;
     /**
      * 用户选定的思考深度。
-     *   - off:      不启用思考（SDK: 不传 thinking；CLI: 不插魔法词；Codex: model_reasoning_effort minimal）
-     *   - standard: 标准（SDK: budget 4096；CLI: think；Codex: low）
-     *   - deep:    深度（SDK: budget 16000；CLI: think hard；Codex: medium）
-     *   - max:     最深（SDK: budget 31999；CLI: ultrathink；Codex: high）
+     *   - off:      不覆盖默认思考深度（SDK: 不传 thinking；Claude CLI: auto/default；Codex: model_reasoning_effort minimal）
+     *   - standard: 标准（SDK: budget 4096；Claude CLI: low；Codex: low）
+     *   - deep:    深度（SDK: budget 16000；Claude CLI: medium；Codex: medium）
+     *   - max:     最深（SDK: budget 31999；Claude CLI: max；Codex: high）
      */
     thinkingEffort?: "off" | "standard" | "deep" | "max" | null;
     /** 当前 PTY 列宽，由最近一次 resize 决定。前端用它来判断本端 fit 是否需要校准。 */