@co0ontty/wand 2.7.0 → 2.8.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "fe6482dc2c6a1a02fbe00800836b78af034d851a",
-  "builtAt": "2026-07-11T12:18:50.530Z",
-  "version": "2.7.0",
+  "commit": "18413d7915a788ea6eb7460e0819c2df102a17d2",
+  "builtAt": "2026-07-11T13:15:01.244Z",
+  "version": "2.8.0",
   "channel": "stable"
 }

package/dist/config.js

@@ -4,6 +4,13 @@ import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
 import { isRunningAsRoot } from "./env-utils.js";
+function isThinkingEffort(value) {
+    return value === "off"
+        || value === "standard"
+        || value === "deep"
+        || value === "max"
+        || (typeof value === "string" && /^codex:[a-z0-9][a-z0-9_-]{0,31}$/.test(value));
+}
 const DEFAULT_CONFIG_DIR = ".wand";
 const DEFAULT_CONFIG_FILE = "config.json";
 /**
@@ -273,7 +280,7 @@ export function applyStoragePreferences(config, storage) {
     }
     if (storage.hasPreference(preferenceStorageKey("defaultThinkingEffort"))) {
         const v = storage.getPreference(preferenceStorageKey("defaultThinkingEffort"), defaults.defaultThinkingEffort ?? "off");
-        if (v === "off" || v === "standard" || v === "deep" || v === "max")
+        if (isThinkingEffort(v))
             config.defaultThinkingEffort = v;
     }
     if (storage.hasPreference(preferenceStorageKey("structuredRunner"))) {
@@ -339,7 +346,7 @@ export function writePreferenceToStorage(config, storage, key, value) {
             break;
         }
         case "defaultThinkingEffort": {
-            const v = value === "standard" || value === "deep" || value === "max" ? value : "off";
+            const v = isThinkingEffort(value) ? value : "off";
             storage.setPreference(dbKey, v);
             config.defaultThinkingEffort = v;
             break;
@@ -510,11 +517,7 @@ function mergeWithDefaults(input) {
         defaultCodexModel: typeof input.defaultCodexModel === "string" ? input.defaultCodexModel.trim() : defaults.defaultCodexModel,
         commitCli: input.commitCli === "codex" ? "codex" : "claude",
         commitModel: typeof input.commitModel === "string" ? input.commitModel.trim() : defaults.commitModel,
-        defaultThinkingEffort: input.defaultThinkingEffort === "standard"
-            || input.defaultThinkingEffort === "deep"
-            || input.defaultThinkingEffort === "max"
-            ? input.defaultThinkingEffort
-            : "off",
+        defaultThinkingEffort: isThinkingEffort(input.defaultThinkingEffort) ? input.defaultThinkingEffort : "off",
         structuredRunner: (input.structuredRunner === "sdk" || input.structuredRunner === "cli") ? input.structuredRunner : defaults.structuredRunner,
         inheritEnv: typeof input.inheritEnv === "boolean" ? input.inheritEnv : (defaults.inheritEnv ?? true),
     };

package/dist/models.d.ts

@@ -5,6 +5,8 @@ interface ModelCache {
     claudeVersion: string | null;
     refreshedAt: string;
 }
+/** Parse the machine-readable model registry emitted by the installed Codex CLI. */
+export declare function parseCodexModels(stdout: string): ClaudeModelInfo[];
 export declare function getCachedModels(): ModelCache;
 export declare function refreshModels(): Promise<ModelCache>;
 export {};

package/dist/models.js

@@ -31,8 +31,18 @@ async function probeClaudeVersion() {
 async function probeCodexModels() {
     try {
         const { stdout } = await execAsync("codex debug models", { timeout: 8000 });
+        return parseCodexModels(stdout);
+    }
+    catch {
+        return CODEX_FALLBACK_MODELS.map((m) => ({ ...m }));
+    }
+}
+/** Parse the machine-readable model registry emitted by the installed Codex CLI. */
+export function parseCodexModels(stdout) {
+    try {
         const data = JSON.parse(stdout);
-        const visible = data.models
+        const visible = (Array.isArray(data.models) ? data.models : [])
+            .filter((m) => typeof m.slug === "string" && m.slug.length > 0)
             .filter((m) => m.visibility === "list")
             .sort((a, b) => (a.priority ?? 99) - (b.priority ?? 99));
         if (!visible.length)
@@ -40,12 +50,18 @@ async function probeCodexModels() {
         const defaultModel = visible[0];
         const defaultLabel = formatCodexModelLabel(defaultModel);
         const result = [
-            { id: "default", label: `${defaultLabel}（Codex 默认）`, alias: true },
+            {
+                id: "default",
+                label: `${defaultLabel}（Codex 默认）`,
+                alias: true,
+                ...codexReasoningMetadata(defaultModel),
+            },
         ];
         for (const m of visible) {
             result.push({
                 id: m.slug,
                 label: formatCodexModelLabel(m),
+                ...codexReasoningMetadata(m),
             });
         }
         return result;
@@ -54,6 +70,20 @@ async function probeCodexModels() {
         return CODEX_FALLBACK_MODELS.map((m) => ({ ...m }));
     }
 }
+function codexReasoningMetadata(model) {
+    const reasoningEfforts = (Array.isArray(model.supported_reasoning_levels) ? model.supported_reasoning_levels : [])
+        .filter((level) => typeof level?.effort === "string" && level.effort.length > 0)
+        .map((level) => ({
+        effort: level.effort,
+        ...(typeof level.description === "string" && level.description ? { description: level.description } : {}),
+    }));
+    return {
+        ...(reasoningEfforts.length ? { reasoningEfforts } : {}),
+        ...(typeof model.default_reasoning_level === "string" && model.default_reasoning_level
+            ? { defaultReasoningEffort: model.default_reasoning_level }
+            : {}),
+    };
+}
 function formatCodexModelLabel(model) {
     return model.display_name && model.display_name !== model.slug
         ? `${model.display_name} · ${model.slug}`

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 { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort } from "./structured-session-manager.js";
+import { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort, thinkingEffortToCodexReasoningEffort } from "./structured-session-manager.js";
 import { generateSessionTopic } from "./session-topic.js";
 import { getErrorMessage } from "./error-utils.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -2118,6 +2118,10 @@ export class ProcessManager extends EventEmitter {
                 const escapedModel = trimmedModel.replace(/'/g, "'\\''");
                 result += ` --model '${escapedModel}'`;
             }
+            const reasoningEffort = thinkingEffortToCodexReasoningEffort(thinkingEffort ?? null);
+            if (reasoningEffort && !/model_reasoning_effort\s*=/.test(command)) {
+                result += ` -c 'model_reasoning_effort="${reasoningEffort}"'`;
+            }
             if (mode === "full-access") {
                 if (!/--dangerously-bypass-approvals-and-sandbox(?:\s|$)/.test(result)) {
                     result += " --dangerously-bypass-approvals-and-sandbox";

package/dist/structured-session-manager.js

@@ -34,6 +34,8 @@ export function normalizeThinkingEffort(value) {
     const v = value.trim().toLowerCase();
     if (v === "off" || v === "standard" || v === "deep" || v === "max")
         return v;
+    if (/^codex:[a-z0-9][a-z0-9_-]{0,31}$/.test(v))
+        return v;
     return null;
 }
 /** Claude SDK 用：把 thinkingEffort 映射成 `thinking.budget_tokens`。off / 空 → 0（不启用）。 */
@@ -62,6 +64,9 @@ export function thinkingEffortToClaudeSlashEffort(effort) {
 }
 /** Codex CLI 用：把 thinkingEffort 映射到 model_reasoning_effort 配置。off → 不覆盖 Codex 默认。 */
 export function thinkingEffortToCodexReasoningEffort(effort) {
+    if (typeof effort === "string" && effort.startsWith("codex:")) {
+        return effort.slice("codex:".length) || null;
+    }
     switch (effort) {
         case "standard": return "low";
         case "deep": return "medium";

package/dist/types.d.ts

@@ -109,7 +109,7 @@ export interface WandConfig {
     /** 快捷提交专用模型。留空则跟随所选 CLI 的默认模型。 */
     commitModel?: string;
     /** 新建会话时默认使用的思考深度。 */
-    defaultThinkingEffort?: "off" | "standard" | "deep" | "max";
+    defaultThinkingEffort?: ThinkingEffort;
     /** 结构化会话使用的 runner: "cli"（默认，spawn claude -p）或 "sdk"（@anthropic-ai/claude-agent-sdk）。 */
     structuredRunner?: "cli" | "sdk";
     /**
@@ -128,7 +128,20 @@ export interface ClaudeModelInfo {
     note?: string;
     /** 是否为别名（opus/sonnet 等）；完整 ID 为 false */
     alias?: boolean;
+    /** Codex 模型声明的可用推理档位；Claude 模型通常不提供。 */
+    reasoningEfforts?: ReasoningEffortInfo[];
+    /** Codex 模型的默认推理档位。 */
+    defaultReasoningEffort?: string;
 }
+export interface ReasoningEffortInfo {
+    effort: string;
+    description?: string;
+}
+/**
+ * 旧的四档值需要继续兼容已有会话。Codex 动态档位加 provider 前缀，
+ * 避免 `max`（旧值代表 xhigh）与 Codex 新增的原生 max 档位冲突。
+ */
+export type ThinkingEffort = "off" | "standard" | "deep" | "max" | `codex:${string}`;
 interface WorktreeInfo {
     branch: string;
     path: string;
@@ -257,7 +270,7 @@ export interface CommandRequest {
     /** 创建会话时由前端测得的真实行数。 */
     rows?: number;
     /** 思考深度。null/缺省 视为 off（不启用思考）。 */
-    thinkingEffort?: "off" | "standard" | "deep" | "max" | null;
+    thinkingEffort?: ThinkingEffort | null;
 }
 export interface InputRequest {
     input?: string;
@@ -446,12 +459,13 @@ export interface SessionSnapshot {
     selectedModel?: string | null;
     /**
      * 用户选定的思考深度。
-     *   - off:      不覆盖默认思考深度（SDK: 不传 thinking；Claude CLI: auto/default；Codex: model_reasoning_effort minimal）
+     *   - off:      不覆盖默认思考深度（SDK: 不传 thinking；Claude CLI: auto/default；Codex: 使用模型默认值）
      *   - 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: xhigh）
+     *   - max:     旧版最深档（SDK: budget 31999；Claude CLI: max；Codex: xhigh）
+     *   - codex:*: Codex CLI 动态声明的原生推理档位
      */
-    thinkingEffort?: "off" | "standard" | "deep" | "max" | null;
+    thinkingEffort?: ThinkingEffort | null;
     /** 当前 PTY 列宽，由最近一次 resize 决定。前端用它来判断本端 fit 是否需要校准。 */
     ptyCols?: number;
     /** 当前 PTY 行数，由最近一次 resize 决定。 */