@co0ontty/wand 2.4.1 → 2.4.2

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "f3d51073dca38b18ea1104511c7fdebdd125b086",
-  "builtAt": "2026-07-04T10:40:24.303Z",
-  "version": "2.4.1",
+  "commit": "618521bbe5e23601be39a6599b110d008f469b01",
+  "builtAt": "2026-07-04T11:34:01.260Z",
+  "version": "2.4.2",
   "channel": "stable"
 }

package/dist/config.d.ts

@@ -7,7 +7,7 @@ import type { WandStorage } from "./storage.js";
  * 升级路径：老 JSON 里仍存有这些字段时，首次启动会被搬到 DB（见 migrateLegacyPreferencesToDb），
  * 然后下一次 saveConfig 写回 JSON 时它们会被剥离（见 stripPreferenceFields）。
  */
-export declare const PREFERENCE_KEYS: readonly ["defaultMode", "defaultCwd", "defaultModel", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
+export declare const PREFERENCE_KEYS: readonly ["defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
 export type PreferenceKey = (typeof PREFERENCE_KEYS)[number];
 export declare function isPreferenceKey(key: string): key is PreferenceKey;
 export declare const defaultConfig: () => WandConfig;
@@ -40,4 +40,9 @@ export declare function applyStoragePreferences(config: WandConfig, storage: Wan
 export declare function writePreferenceToStorage(config: WandConfig, storage: WandStorage, key: PreferenceKey, value: unknown): void;
 export declare function normalizeCardDefaults(input: unknown): CardExpandDefaults;
 export declare function isExecutionMode(value: unknown): value is ExecutionMode;
+export declare function getProviderDefaultModels(config: Pick<WandConfig, "defaultModel" | "defaultCodexModel">): {
+    claude: string;
+    codex: string;
+};
+export declare function getDefaultModelForProvider(config: Pick<WandConfig, "defaultModel" | "defaultCodexModel">, provider: "claude" | "codex" | undefined): string;
 export declare function normalizeMode(input: string | undefined, fallback: ExecutionMode): ExecutionMode;

package/dist/config.js

@@ -17,6 +17,7 @@ export const PREFERENCE_KEYS = [
     "defaultMode",
     "defaultCwd",
     "defaultModel",
+    "defaultCodexModel",
     "defaultThinkingEffort",
     "structuredRunner",
     "language",
@@ -51,6 +52,7 @@ export const defaultConfig = () => ({
     macos: defaultMacosDmgConfig(),
     cardDefaults: defaultCardExpandDefaults(),
     defaultModel: "",
+    defaultCodexModel: "",
     defaultThinkingEffort: "off",
     structuredRunner: "cli",
     inheritEnv: true,
@@ -250,6 +252,11 @@ export function applyStoragePreferences(config, storage) {
         if (typeof v === "string")
             config.defaultModel = v.trim();
     }
+    if (storage.hasPreference(preferenceStorageKey("defaultCodexModel"))) {
+        const v = storage.getPreference(preferenceStorageKey("defaultCodexModel"), defaults.defaultCodexModel ?? "");
+        if (typeof v === "string")
+            config.defaultCodexModel = v.trim();
+    }
     if (storage.hasPreference(preferenceStorageKey("defaultThinkingEffort"))) {
         const v = storage.getPreference(preferenceStorageKey("defaultThinkingEffort"), defaults.defaultThinkingEffort ?? "off");
         if (v === "off" || v === "standard" || v === "deep" || v === "max")
@@ -298,6 +305,12 @@ export function writePreferenceToStorage(config, storage, key, value) {
             config.defaultModel = v;
             break;
         }
+        case "defaultCodexModel": {
+            const v = typeof value === "string" ? value.trim() : "";
+            storage.setPreference(dbKey, v);
+            config.defaultCodexModel = v;
+            break;
+        }
         case "defaultThinkingEffort": {
             const v = value === "standard" || value === "deep" || value === "max" ? value : "off";
             storage.setPreference(dbKey, v);
@@ -467,6 +480,7 @@ function mergeWithDefaults(input) {
         macos: normalizeMacosDmgConfig(input.macos) ?? defaults.macos,
         cardDefaults: normalizeCardDefaults(input.cardDefaults),
         defaultModel: typeof input.defaultModel === "string" ? input.defaultModel.trim() : defaults.defaultModel,
+        defaultCodexModel: typeof input.defaultCodexModel === "string" ? input.defaultCodexModel.trim() : defaults.defaultCodexModel,
         defaultThinkingEffort: input.defaultThinkingEffort === "standard"
             || input.defaultThinkingEffort === "deep"
             || input.defaultThinkingEffort === "max"
@@ -479,6 +493,16 @@ function mergeWithDefaults(input) {
 export function isExecutionMode(value) {
     return value === "assist" || value === "agent" || value === "agent-max" || value === "auto-edit" || value === "default" || value === "full-access" || value === "native" || value === "managed";
 }
+export function getProviderDefaultModels(config) {
+    return {
+        claude: (config.defaultModel ?? "").trim(),
+        codex: (config.defaultCodexModel ?? "").trim(),
+    };
+}
+export function getDefaultModelForProvider(config, provider) {
+    const defaults = getProviderDefaultModels(config);
+    return provider === "codex" ? defaults.codex : defaults.claude;
+}
 export function normalizeMode(input, fallback) {
     return isExecutionMode(input) ? input : fallback;
 }

package/dist/server-session-routes.js

@@ -1,6 +1,6 @@
 import express from "express";
 import { SessionInputError } from "./process-manager.js";
-import { normalizeMode } from "./config.js";
+import { getDefaultModelForProvider, normalizeMode } from "./config.js";
 import { blockWindowMessagesForTransport, sliceTurnBlocksForTransport, truncateMessagesForTransport, windowMessagesForTransport } from "./message-truncator.js";
 import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -221,13 +221,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             const provider = body.provider === "codex" ? "codex" : "claude";
+            const rawModel = typeof body.model === "string" ? body.model.trim() : "";
             const snapshot = structured.createSession({
                 cwd: resolveSessionCwd(body.cwd, config.defaultCwd),
                 mode: normalizeMode(body.mode, defaultMode),
                 provider,
                 runner: body.runner ?? (provider === "codex" ? "codex-cli-exec" : "claude-cli-print"),
                 worktreeEnabled: body.worktreeEnabled === true,
-                model: typeof body.model === "string" ? body.model.trim() : (config.defaultModel ?? "").trim() || undefined,
+                model: rawModel || getDefaultModelForProvider(config, provider) || undefined,
                 thinkingEffort: typeof body.thinkingEffort === "string"
                     ? body.thinkingEffort
                     : config.defaultThinkingEffort,
@@ -540,7 +541,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
                 provider: snapshot.provider,
-                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? config.defaultModel,
+                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? getDefaultModelForProvider(config, snapshot.provider),
                 thinkingEffort: snapshot.thinkingEffort ?? config.defaultThinkingEffort,
                 inheritEnv: config.inheritEnv,
                 autoMessage: body.autoMessage !== false,
@@ -574,7 +575,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         try {
             const result = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "", {
                 provider: snapshot.provider,
-                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? config.defaultModel,
+                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? getDefaultModelForProvider(config, snapshot.provider),
                 thinkingEffort: snapshot.thinkingEffort ?? config.defaultThinkingEffort,
                 inheritEnv: config.inheritEnv,
             });

package/dist/server.js

@@ -15,7 +15,7 @@ import { WebSocketServer } from "ws";
 import { createSession, readSessionCookie, revokeSession, SESSION_COOKIE_HTTP, SESSION_COOKIE_HTTPS, SESSION_COOKIE_LEGACY, setAuthStorage, validateSession, } from "./auth.js";
 import { ensureCertificates } from "./cert.js";
 import { buildChildEnv } from "./env-utils.js";
-import { isExecutionMode, normalizeMode, PREFERENCE_KEYS, resolveConfigDir, saveConfig, writePreferenceToStorage, } from "./config.js";
+import { getDefaultModelForProvider, getProviderDefaultModels, isExecutionMode, normalizeMode, PREFERENCE_KEYS, resolveConfigDir, saveConfig, writePreferenceToStorage, } from "./config.js";
 import { getCachedModels, refreshModels } from "./models.js";
 import { ProcessManager } from "./process-manager.js";
 import { SessionLogger } from "./session-logger.js";
@@ -1305,12 +1305,15 @@ export async function startServer(config, configPath) {
     // ── Config & Session info ──
     app.get("/api/config", async (_req, res) => {
         const structuredChatPersona = await buildStructuredChatPersonaPayload(configPath, config);
+        const defaultModels = getProviderDefaultModels(config);
         res.json({
             host: config.host,
             port: config.port,
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
-            defaultModel: config.defaultModel ?? "",
+            defaultModel: defaultModels.claude,
+            defaultCodexModel: defaultModels.codex,
+            defaultModels,
             defaultThinkingEffort: config.defaultThinkingEffort ?? "off",
             commandPresets: config.commandPresets,
             structuredRunner: config.structuredRunner ?? "cli",
@@ -1449,6 +1452,7 @@ export async function startServer(config, configPath) {
             certPath: path.join(configDir, "server.crt"),
         };
         const { password: _pw, ...safeConfig } = config;
+        const defaultModels = getProviderDefaultModels(config);
         const localApk = await resolveAndroidApkAsset(configDir, config);
         const ghApk = await fetchGitHubLatestApk();
         const apkDir = resolveAndroidApkDir(configDir, config);
@@ -1471,7 +1475,12 @@ export async function startServer(config, configPath) {
             packageName: PKG_NAME,
             nodeVersion: PKG_NODE_REQ,
             repoUrl: PKG_REPO_URL,
-            config: safeConfig,
+            config: {
+                ...safeConfig,
+                defaultModel: defaultModels.claude,
+                defaultCodexModel: defaultModels.codex,
+                defaultModels,
+            },
             hasCert: existsSync(certPaths.keyPath) && existsSync(certPaths.certPath),
             updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
             latestVersion: cachedUpdateInfo?.latest ?? null,
@@ -1645,6 +1654,23 @@ export async function startServer(config, configPath) {
             res.status(400).json({ error: `无效执行模式: ${body.defaultMode}` });
             return;
         }
+        if (body.defaultModels && typeof body.defaultModels === "object") {
+            const modelDefaults = body.defaultModels;
+            try {
+                if (Object.prototype.hasOwnProperty.call(modelDefaults, "claude")) {
+                    writePreferenceToStorage(config, storage, "defaultModel", modelDefaults.claude);
+                    touchedPreferenceField = true;
+                }
+                if (Object.prototype.hasOwnProperty.call(modelDefaults, "codex")) {
+                    writePreferenceToStorage(config, storage, "defaultCodexModel", modelDefaults.codex);
+                    touchedPreferenceField = true;
+                }
+            }
+            catch (err) {
+                res.status(400).json({ error: getErrorMessage(err, "默认模型配置校验失败") });
+                return;
+            }
+        }
         for (const field of PREFERENCE_KEYS) {
             if (!(field in body) || body[field] === undefined)
                 continue;
@@ -1666,8 +1692,18 @@ export async function startServer(config, configPath) {
                 await saveConfig(configPath, config);
             }
             const { password: _pw, ...safeConfig } = config;
+            const defaultModels = getProviderDefaultModels(config);
             // 只有部署字段才需要重启；偏好字段已经热生效。
-            res.json({ ok: true, config: safeConfig, restartRequired: touchedDeployField });
+            res.json({
+                ok: true,
+                config: {
+                    ...safeConfig,
+                    defaultModel: defaultModels.claude,
+                    defaultCodexModel: defaultModels.codex,
+                    defaultModels,
+                },
+                restartRequired: touchedDeployField,
+            });
         }
         catch (error) {
             res.status(500).json({ error: getErrorMessage(error, "保存配置失败。") });
@@ -1675,23 +1711,29 @@ export async function startServer(config, configPath) {
     });
     app.get("/api/models", (_req, res) => {
         const cached = getCachedModels();
+        const defaultModels = getProviderDefaultModels(config);
         res.json({
             models: cached.models,
             codexModels: cached.codexModels,
             claudeVersion: cached.claudeVersion,
             refreshedAt: cached.refreshedAt,
-            defaultModel: config.defaultModel ?? "",
+            defaultModel: defaultModels.claude,
+            defaultCodexModel: defaultModels.codex,
+            defaultModels,
         });
     });
     app.post("/api/models/refresh", async (_req, res) => {
         try {
             const refreshed = await refreshModels();
+            const defaultModels = getProviderDefaultModels(config);
             res.json({
                 models: refreshed.models,
                 codexModels: refreshed.codexModels,
                 claudeVersion: refreshed.claudeVersion,
                 refreshedAt: refreshed.refreshedAt,
-                defaultModel: config.defaultModel ?? "",
+                defaultModel: defaultModels.claude,
+                defaultCodexModel: defaultModels.codex,
+                defaultModels,
             });
         }
         catch (error) {
@@ -2263,12 +2305,13 @@ export async function startServer(config, configPath) {
         const initialInput = body.initialInput?.trim();
         try {
             const rawModel = typeof body.model === "string" ? body.model.trim() : "";
-            const effectiveModel = rawModel || (config.defaultModel ?? "").trim() || undefined;
+            const provider = body.provider === "codex" || /^codex\b/.test(body.command.trim()) ? "codex" : "claude";
+            const effectiveModel = rawModel || getDefaultModelForProvider(config, provider) || undefined;
             const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
             const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
             const snapshot = processes.start(body.command, body.cwd, normalizeMode(body.mode, config.defaultMode), initialInput || undefined, {
                 worktreeEnabled: body.worktreeEnabled === true,
-                provider: body.provider,
+                provider,
                 model: effectiveModel,
                 cols: reqCols,
                 rows: reqRows,

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

@@ -1,6 +1,6 @@
 import { SessionLogger } from "./session-logger.js";
 import { WandStorage } from "./storage.js";
-import { ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, WandConfig } from "./types.js";
+import { ContentBlock, ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, WandConfig } from "./types.js";
 interface CreateStructuredSessionOptions {
     cwd: string;
     mode: ExecutionMode;
@@ -8,7 +8,7 @@ interface CreateStructuredSessionOptions {
     provider?: SessionProvider;
     runner?: SessionRunner;
     worktreeEnabled?: boolean;
-    /** 用户指定的 Claude 模型（别名或完整 ID）。留空则 spawn 时不加 --model。 */
+    /** 用户指定的模型（别名或完整 ID）。留空则 spawn 时不加 --model。 */
     model?: string;
     /** 用户预设的思考深度。留空 / null 视为 off。 */
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
@@ -31,8 +31,9 @@ export declare function thinkingEffortToSdkBudget(effort: SessionSnapshot["think
 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。 */
+/** Codex CLI 用：把 thinkingEffort 映射到 model_reasoning_effort 配置。off → 不覆盖 Codex 默认。 */
 export declare function thinkingEffortToCodexReasoningEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
+export declare function buildCodexPatchApplyBlocks(item: Record<string, unknown>): ContentBlock[];
 export declare class StructuredSessionManager {
     private readonly storage;
     private readonly config;
@@ -173,6 +174,10 @@ export declare class StructuredSessionManager {
     private resolveQueuedMessagesAfterInterrupt;
     private normalizeToolInput;
     private normalizeToolResultContent;
+    private unwrapCodexStreamEvent;
+    private applyCodexLooseEvent;
+    private codexFunctionToolUse;
+    private codexMcpToolBlocks;
     private extractCodexText;
     /**
      * Merge one codex `item.*` event into `turnState.blocks`.