@co0ontty/wand 2.6.0 → 2.7.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "c212a14a9564a6f3cf23c019f76d82f623b8fc25",
-  "builtAt": "2026-07-10T23:50:15.693Z",
-  "version": "2.6.0",
+  "commit": "fe6482dc2c6a1a02fbe00800836b78af034d851a",
+  "builtAt": "2026-07-11T12:18:50.530Z",
+  "version": "2.7.0",
   "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", "defaultCodexModel", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
+export declare const PREFERENCE_KEYS: readonly ["defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "commitCli", "commitModel", "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;

package/dist/config.js

@@ -18,6 +18,8 @@ export const PREFERENCE_KEYS = [
     "defaultCwd",
     "defaultModel",
     "defaultCodexModel",
+    "commitCli",
+    "commitModel",
     "defaultThinkingEffort",
     "structuredRunner",
     "language",
@@ -53,6 +55,8 @@ export const defaultConfig = () => ({
     cardDefaults: defaultCardExpandDefaults(),
     defaultModel: "",
     defaultCodexModel: "",
+    commitCli: "claude",
+    commitModel: "",
     defaultThinkingEffort: "off",
     structuredRunner: "cli",
     inheritEnv: true,
@@ -257,6 +261,16 @@ export function applyStoragePreferences(config, storage) {
         if (typeof v === "string")
             config.defaultCodexModel = v.trim();
     }
+    if (storage.hasPreference(preferenceStorageKey("commitCli"))) {
+        const v = storage.getPreference(preferenceStorageKey("commitCli"), defaults.commitCli ?? "claude");
+        if (v === "claude" || v === "codex")
+            config.commitCli = v;
+    }
+    if (storage.hasPreference(preferenceStorageKey("commitModel"))) {
+        const v = storage.getPreference(preferenceStorageKey("commitModel"), defaults.commitModel ?? "");
+        if (typeof v === "string")
+            config.commitModel = 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")
@@ -311,6 +325,19 @@ export function writePreferenceToStorage(config, storage, key, value) {
             config.defaultCodexModel = v;
             break;
         }
+        case "commitCli": {
+            if (value !== "claude" && value !== "codex")
+                throw new Error(`无效 commit CLI: ${value}`);
+            storage.setPreference(dbKey, value);
+            config.commitCli = value;
+            break;
+        }
+        case "commitModel": {
+            const v = typeof value === "string" ? value.trim() : "";
+            storage.setPreference(dbKey, v);
+            config.commitModel = v;
+            break;
+        }
         case "defaultThinkingEffort": {
             const v = value === "standard" || value === "deep" || value === "max" ? value : "off";
             storage.setPreference(dbKey, v);
@@ -481,6 +508,8 @@ function mergeWithDefaults(input) {
         cardDefaults: normalizeCardDefaults(input.cardDefaults),
         defaultModel: typeof input.defaultModel === "string" ? input.defaultModel.trim() : defaults.defaultModel,
         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"

package/dist/server-session-routes.js

@@ -4,7 +4,7 @@ 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";
-import { resolveSessionAiContext } from "./session-ai-context.js";
+import { resolveCommitAiContext } from "./session-ai-context.js";
 import { getGitStatus, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
 export { getErrorMessage };
@@ -21,6 +21,18 @@ function getInputErrorResponse(error, sessionId) {
             },
         };
     }
+    const errorCode = error?.code;
+    if (errorCode === "duplicate_queued_message" || errorCode === "duplicate_idempotency_key") {
+        return {
+            statusCode: 409,
+            payload: {
+                error: getErrorMessage(error, "检测到重复发送，已拦截。"),
+                errorCode,
+                sessionId,
+                sessionStatus: null,
+            },
+        };
+    }
     return {
         statusCode: 400,
         payload: {
@@ -346,7 +358,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         catch (error) {
             const errorCode = error?.code;
-            const status = errorCode === "duplicate_idempotency_key" ? 409 : 400;
+            const status = errorCode === "duplicate_idempotency_key" || errorCode === "duplicate_queued_message" ? 409 : 400;
             res.status(status).json({
                 error: getErrorMessage(error, "无法发送结构化消息。"),
                 errorCode,
@@ -538,7 +550,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
-            const ai = resolveSessionAiContext(snapshot, config);
+            const ai = resolveCommitAiContext(snapshot, config);
             const result = await runQuickCommitWithFallback({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
@@ -572,7 +584,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             return;
         }
         try {
-            const ai = resolveSessionAiContext(snapshot, config);
+            const ai = resolveCommitAiContext(snapshot, config);
             const result = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "", {
                 ...ai,
             });
@@ -598,7 +610,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
-            const ai = resolveSessionAiContext(snapshot, config);
+            const ai = resolveCommitAiContext(snapshot, config);
             const result = await runTagHead({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",

package/dist/session-ai-context.d.ts

@@ -13,3 +13,5 @@ export interface SessionAiContext {
 export declare function resolveSessionProvider(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command">): SessionProvider;
 /** Build the provider-specific settings used by session-adjacent AI actions. */
 export declare function resolveSessionAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultThinkingEffort" | "inheritEnv">): SessionAiContext;
+/** Build the AI context for quick-commit actions from their global preferences. */
+export declare function resolveCommitAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultThinkingEffort" | "inheritEnv" | "commitCli" | "commitModel">): SessionAiContext;

package/dist/session-ai-context.js

@@ -34,3 +34,12 @@ export function resolveSessionAiContext(snapshot, config) {
         inheritEnv: config.inheritEnv,
     };
 }
+/** Build the AI context for quick-commit actions from their global preferences. */
+export function resolveCommitAiContext(snapshot, config) {
+    const sessionContext = resolveSessionAiContext(snapshot, config);
+    return {
+        ...sessionContext,
+        provider: config.commitCli === "codex" ? "codex" : "claude",
+        model: normalizeModel(config.commitModel),
+    };
+}

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

@@ -56,6 +56,16 @@ export declare function buildCodexFileChangeBlocks(item: Record<string, unknown>
  * model-produced text/tool arguments; the final provider value replaces this.
  */
 export declare function estimateCodexOutputTokens(blocks: ContentBlock[]): number;
+/**
+ * 返回最近一次真正提交给结构化会话的用户输入。
+ *
+ * 排队非空时，队尾才是“上一条提交”；否则回看当前正在处理的最后一个 user turn。
+ * 这里只接受可无损还原成字符串的 text / tool_result，避免把图片等结构化内容误判
+ * 成更早的纯文本输入。
+ */
+export declare function getLastSubmittedStructuredInput(snapshot: Pick<SessionSnapshot, "messages" | "queuedMessages">): string | null;
+/** 仅用于 in-flight 排队分支：连续两次内容相同则把后一次视为输入重放。 */
+export declare function isDuplicateStructuredQueueInput(snapshot: Pick<SessionSnapshot, "messages" | "queuedMessages">, input: string): boolean;
 export declare class StructuredSessionManager {
     private readonly storage;
     private readonly config;

package/dist/structured-session-manager.js

@@ -694,6 +694,44 @@ function buildStructuredOutputPayload(snapshot) {
         summary: snapshot.description ?? snapshot.summary,
     };
 }
+/**
+ * 返回最近一次真正提交给结构化会话的用户输入。
+ *
+ * 排队非空时，队尾才是“上一条提交”；否则回看当前正在处理的最后一个 user turn。
+ * 这里只接受可无损还原成字符串的 text / tool_result，避免把图片等结构化内容误判
+ * 成更早的纯文本输入。
+ */
+export function getLastSubmittedStructuredInput(snapshot) {
+    const queue = snapshot.queuedMessages ?? [];
+    for (let i = queue.length - 1; i >= 0; i--) {
+        const queued = queue[i]?.trim();
+        if (queued)
+            return queued;
+    }
+    const messages = snapshot.messages ?? [];
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const turn = messages[i];
+        if (turn.role !== "user")
+            continue;
+        const textParts = turn.content
+            .filter((block) => block.type === "text")
+            .map((block) => block.text);
+        if (textParts.length > 0) {
+            const text = textParts.join("\n").trim();
+            return text || null;
+        }
+        const toolResult = turn.content.find((block) => block.type === "tool_result" && typeof block.content === "string");
+        return toolResult && typeof toolResult.content === "string" ? toolResult.content.trim() || null : null;
+    }
+    return null;
+}
+/** 仅用于 in-flight 排队分支：连续两次内容相同则把后一次视为输入重放。 */
+export function isDuplicateStructuredQueueInput(snapshot, input) {
+    const prompt = input.trim();
+    if (!prompt)
+        return false;
+    return getLastSubmittedStructuredInput(snapshot) === prompt;
+}
 function buildIncrementalStructuredPayload(snapshot, cardDefaults) {
     const messages = snapshot.messages ?? [];
     const lastTurn = messages.length > 0 ? messages[messages.length - 1] : undefined;
@@ -1001,6 +1039,11 @@ export class StructuredSessionManager {
             }
             else {
                 const queue = [...(session.queuedMessages ?? [])];
+                if (isDuplicateStructuredQueueInput(session, prompt)) {
+                    const err = new Error("与上一条消息相同，已忽略，不会加入排队。");
+                    err.code = "duplicate_queued_message";
+                    throw err;
+                }
                 if (queue.length >= 10) {
                     throw new Error("排队消息已满（最多 10 条），请等待当前消息处理完成。");
                 }

package/dist/types.d.ts

@@ -104,6 +104,10 @@ export interface WandConfig {
     defaultModel?: string;
     /** 新建 Codex 会话时默认使用的模型。留空则不传 --model，由 codex 自行决定。 */
     defaultCodexModel?: string;
+    /** 快捷提交生成 commit message / tag 时使用的 CLI。 */
+    commitCli?: SessionProvider;
+    /** 快捷提交专用模型。留空则跟随所选 CLI 的默认模型。 */
+    commitModel?: string;
     /** 新建会话时默认使用的思考深度。 */
     defaultThinkingEffort?: "off" | "standard" | "deep" | "max";
     /** 结构化会话使用的 runner: "cli"（默认，spawn claude -p）或 "sdk"（@anthropic-ai/claude-agent-sdk）。 */