@co0ontty/wand 4.11.2 → 4.12.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "26afd2798da3b5ba08d434492ac457a4959ee69a",
-  "builtAt": "2026-07-17T10:32:08.535Z",
-  "version": "4.11.2",
+  "commit": "c1870fda254528fbd1c34b8907f4f1be5a229c54",
+  "builtAt": "2026-07-17T11:06:16.718Z",
+  "version": "4.12.0",
   "channel": "stable"
 }

package/dist/git-quick-commit.d.ts

@@ -1,5 +1,5 @@
 import { GitStatusResult, PushResult, QuickCommitResult, SessionProvider, SessionSnapshot, TagHeadResult } from "./types.js";
-export type QuickCommitErrorCode = "CWD_MISSING" | "NO_CWD" | "NOT_A_GIT_REPO" | "NO_COMMIT" | "NOTHING_TO_COMMIT" | "NOTHING_TO_PUSH" | "EMPTY_MESSAGE" | "EMPTY_TAG" | "EMPTY_AI_MESSAGE" | "INVALID_AI_TAG" | "TAG_EXISTS" | "GIT_ADD_FAILED" | "GIT_DIFF_FAILED" | "GIT_COMMIT_FAILED" | "GIT_TAG_FAILED" | "CLAUDE_CLI_MISSING" | "CLAUDE_CLI_FAILED" | "CLAUDE_TIMEOUT";
+export type QuickCommitErrorCode = "CWD_MISSING" | "NO_CWD" | "NOT_A_GIT_REPO" | "NO_COMMIT" | "NOTHING_TO_COMMIT" | "NOTHING_TO_PUSH" | "EMPTY_MESSAGE" | "EMPTY_TAG" | "EMPTY_AI_MESSAGE" | "AI_FALLBACK_FAILED" | "INVALID_AI_TAG" | "TAG_EXISTS" | "GIT_ADD_FAILED" | "GIT_DIFF_FAILED" | "GIT_COMMIT_FAILED" | "GIT_TAG_FAILED" | "CLAUDE_CLI_MISSING" | "CLAUDE_CLI_FAILED" | "CLAUDE_TIMEOUT";
 export declare function getGitStatus(cwd: string): GitStatusResult;
 /** Non-blocking status implementation used by HTTP routes. */
 export declare function getGitStatusAsync(cwd: string): Promise<GitStatusResult>;
@@ -10,6 +10,8 @@ interface QuickCommitOptions {
     model?: string | null;
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    /** Direct API to try when the selected Commit source is a CLI. */
+    fallbackSystemAi?: import("./types.js").SystemAiConfig;
     systemAi?: import("./types.js").SystemAiConfig;
     autoMessage: boolean;
     customMessage?: string;
@@ -28,6 +30,7 @@ interface QuickCommitAiOptions {
     model?: string | null;
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    fallbackSystemAi?: import("./types.js").SystemAiConfig;
     systemAi?: import("./types.js").SystemAiConfig;
 }
 export declare class QuickCommitError extends Error {
@@ -47,6 +50,8 @@ interface TagHeadOptions {
     model?: string | null;
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    fallbackSystemAi?: import("./types.js").SystemAiConfig;
+    systemAi?: import("./types.js").SystemAiConfig;
     /** Explicit tag name. If empty and `autoTag` is true, ask the session provider to generate one. */
     tag?: string;
     autoTag?: boolean;

package/dist/git-quick-commit.js

@@ -605,9 +605,7 @@ async function callOpenCodeText(prompt, cwd, opts) {
         throw new QuickCommitError("OpenCode 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
     return text;
 }
-async function callAiText(prompt, cwd, language, opts) {
-    if (opts.systemAi?.enabled)
-        return callSystemAiText(prompt, opts.systemAi);
+async function callCliAiText(prompt, cwd, language, opts) {
     const provider = normalizeProvider(opts.provider);
     if (provider === "codex") {
         return callCodexText(prompt, cwd, opts);
@@ -616,6 +614,49 @@ async function callAiText(prompt, cwd, language, opts) {
         return callOpenCodeText(prompt, cwd, opts);
     return callClaudeText(prompt, cwd, language, opts.model);
 }
+async function callDirectApiText(prompt, systemAi) {
+    const text = await callSystemAiText(prompt, systemAi);
+    if (!text.trim()) {
+        throw new QuickCommitError("直连 API 返回了空结果。", "EMPTY_AI_MESSAGE");
+    }
+    return text;
+}
+function aiFallbackFailed(primary, primaryError, fallbackError) {
+    const fallback = primary === "直连 API" ? "CLI" : "直连 API";
+    return new QuickCommitError(`${primary} 与 ${fallback} 均失败：${getGitErrorMessage(primaryError)}；${getGitErrorMessage(fallbackError)}`, "AI_FALLBACK_FAILED");
+}
+async function callAiText(prompt, cwd, language, opts) {
+    if (opts.systemAi?.enabled) {
+        try {
+            return await callDirectApiText(prompt, opts.systemAi);
+        }
+        catch (apiError) {
+            try {
+                // The user selected the direct API first. If it is unavailable or
+                // empty, retry this exact request through their selected CLI.
+                return await callCliAiText(prompt, cwd, language, opts);
+            }
+            catch (cliError) {
+                throw aiFallbackFailed("直连 API", apiError, cliError);
+            }
+        }
+    }
+    try {
+        return await callCliAiText(prompt, cwd, language, opts);
+    }
+    catch (cliError) {
+        if (!opts.fallbackSystemAi?.enabled)
+            throw cliError;
+        try {
+            // The user selected the CLI first. A complete direct-API profile is only
+            // provided here as the reciprocal fallback, never as a second CLI try.
+            return await callDirectApiText(prompt, opts.fallbackSystemAi);
+        }
+        catch (apiError) {
+            throw aiFallbackFailed("CLI", cliError, apiError);
+        }
+    }
+}
 async function collectStagedDiff(cwd) {
     let diff;
     try {
@@ -854,6 +895,8 @@ export async function runTagHead(opts) {
             model: opts.model,
             thinkingEffort: opts.thinkingEffort,
             inheritEnv: opts.inheritEnv,
+            fallbackSystemAi: opts.fallbackSystemAi,
+            systemAi: opts.systemAi,
         });
     }
     if (!tagName) {
@@ -1246,11 +1289,7 @@ async function runQuickCommitFallbackCli(opts, priorError) {
         pushed: false,
     };
 }
-function shouldFallbackToCli(error, opts) {
-    // An explicit direct-API selection is a hard boundary: never execute a local
-    // provider CLI (especially the permission-bypassing fallback) behind it.
-    if (opts.systemAi?.enabled)
-        return false;
+function shouldFallbackToCli(error) {
     return ![
         "CWD_MISSING",
         "NO_CWD",
@@ -1260,6 +1299,7 @@ function shouldFallbackToCli(error, opts) {
         "NOTHING_TO_PUSH",
         "EMPTY_MESSAGE",
         "EMPTY_TAG",
+        "AI_FALLBACK_FAILED",
         "TAG_EXISTS",
     ].includes(error.code);
 }
@@ -1268,7 +1308,7 @@ export async function runQuickCommitWithFallback(opts) {
         return await runQuickCommit(opts);
     }
     catch (error) {
-        if (error instanceof QuickCommitError && shouldFallbackToCli(error, opts)) {
+        if (error instanceof QuickCommitError && shouldFallbackToCli(error)) {
             return runQuickCommitFallbackCli(opts, error.message);
         }
         throw error;
@@ -1281,6 +1321,7 @@ export async function runQuickCommit(opts) {
         model: opts.model,
         thinkingEffort: opts.thinkingEffort,
         inheritEnv: opts.inheritEnv,
+        fallbackSystemAi: opts.fallbackSystemAi,
         systemAi: opts.systemAi,
     };
     await assertGitWorkTreeAsync(cwd);

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

@@ -4,6 +4,8 @@ export interface SessionAiContext {
     model?: string;
     thinkingEffort: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    /** Direct API to try when Commit is configured to prefer its CLI. */
+    fallbackSystemAi?: SystemAiConfig;
     systemAi?: SystemAiConfig;
 }
 /**

package/dist/session-ai-context.js

@@ -44,6 +44,11 @@ function normalizeModel(value) {
     const model = value?.trim();
     return model && model !== "default" ? model : undefined;
 }
+function usableSystemAi(config) {
+    if (!config.baseUrl.trim() || !config.apiKey.trim() || !config.model.trim())
+        return undefined;
+    return { ...config, enabled: true };
+}
 /** Build the provider-specific settings used by session-adjacent AI actions. */
 export function resolveSessionAiContext(snapshot, config) {
     const provider = resolveSessionProvider(snapshot);
@@ -66,10 +71,13 @@ export function resolveCommitAiContext(snapshot, config) {
         apiKey: "",
         model: "",
     };
+    const readyDirectApi = usableSystemAi(directApi);
     return {
         ...sessionContext,
         provider: config.commitCli === "codex" || config.commitCli === "opencode" ? config.commitCli : "claude",
         model: normalizeModel(config.commitModel),
-        ...(config.commitAiSource === "api" ? { systemAi: { ...directApi, enabled: true } } : {}),
+        ...(config.commitAiSource === "api"
+            ? { systemAi: { ...directApi, enabled: true } }
+            : readyDirectApi ? { fallbackSystemAi: readyDirectApi } : {}),
     };
 }