@co0ontty/wand 4.6.1 → 4.7.0-beta.gd325de7

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "c86da1ca2559537e44e57d7a085250bae857a3cc",
-  "builtAt": "2026-07-16T00:54:24.041Z",
-  "version": "4.6.1",
-  "channel": "stable"
+  "commit": "d325de70c28d8eda24f741294c3de61e96ee27e7",
+  "builtAt": "2026-07-16T11:22:44.578Z",
+  "version": "4.7.0-beta.gd325de7",
+  "channel": "beta"
 }

package/dist/cli.js

@@ -96,9 +96,7 @@ async function main() {
             break;
         }
         case "config:show": {
-            // 展示合并后的视图（JSON 部署字段 + DB 偏好字段）。password 脱敏：
-            // 显示是否已自定义（"<set>" / "change-me"），避免误把真密码截图分享出去；
-            // 想看真值就直接读 DB（sqlite3 wand.db "SELECT * FROM app_config WHERE key='password'"）。
+            // 展示合并后的视图（JSON 部署字段 + DB 偏好字段），但绝不打印运行时密钥。
             const { ensureDatabaseFile, resolveDatabasePath, WandStorage } = await import("./storage.js");
             const dbPath = resolveDatabasePath(configPath);
             ensureDatabaseFile(dbPath);
@@ -108,6 +106,11 @@ async function main() {
                 const display = {
                     ...config,
                     password: config.password === "change-me" ? "change-me" : "<set>",
+                    appSecret: config.appSecret ? "<set>" : "",
+                    systemAi: config.systemAi ? {
+                        ...config.systemAi,
+                        apiKey: config.systemAi.apiKey ? "<set>" : "",
+                    } : undefined,
                 };
                 process.stdout.write(`${JSON.stringify(display, null, 2)}\n`);
             }

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 ["defaultProvider", "defaultSessionKind", "defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultOpenCodeModel", "commitCli", "commitModel", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
+export declare const PREFERENCE_KEYS: readonly ["defaultProvider", "defaultSessionKind", "defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultOpenCodeModel", "commitCli", "commitModel", "commitAiSource", "systemAi", "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;
@@ -37,7 +37,11 @@ export declare function migrateLegacyPreferencesToDb(rawJsonInput: Partial<WandC
  */
 export declare function applyStoragePreferences(config: WandConfig, storage: WandStorage): WandConfig;
 /** Write a single preference value to DB and (in-place) update the live config object. */
-export declare function writePreferenceToStorage(config: WandConfig, storage: WandStorage, key: PreferenceKey, value: unknown): void;
+export declare function writePreferenceToStorage(config: WandConfig, storage: WandStorage, key: PreferenceKey, value: unknown, options?: {
+    deferCommitAiValidation?: boolean;
+}): void;
+/** Validate the cross-field contract for Commit's direct-API source. */
+export declare function validateCommitAiConfig(config: Pick<WandConfig, "commitAiSource" | "systemAi">): 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" | "defaultOpenCodeModel">): {

package/dist/config.js

@@ -4,6 +4,7 @@ import { chmod, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promi
 import path from "node:path";
 import process from "node:process";
 import { isRunningAsRoot } from "./env-utils.js";
+import { normalizeSystemAiConfig } from "./system-ai.js";
 function isThinkingEffort(value) {
     return value === "off"
         || value === "standard"
@@ -30,6 +31,8 @@ export const PREFERENCE_KEYS = [
     "defaultOpenCodeModel",
     "commitCli",
     "commitModel",
+    "commitAiSource",
+    "systemAi",
     "defaultThinkingEffort",
     "structuredRunner",
     "language",
@@ -70,6 +73,16 @@ export const defaultConfig = () => ({
     defaultOpenCodeModel: "",
     commitCli: "claude",
     commitModel: "",
+    commitAiSource: "cli",
+    systemAi: {
+        enabled: false,
+        protocol: "openai",
+        baseUrl: "",
+        apiKey: "",
+        model: "",
+        authHeader: "bearer",
+        source: "custom",
+    },
     defaultThinkingEffort: "off",
     structuredRunner: "cli",
     inheritEnv: true,
@@ -310,6 +323,15 @@ export function applyStoragePreferences(config, storage) {
         if (typeof v === "string")
             config.commitModel = v.trim();
     }
+    if (storage.hasPreference(preferenceStorageKey("commitAiSource"))) {
+        const v = storage.getPreference(preferenceStorageKey("commitAiSource"), defaults.commitAiSource ?? "cli");
+        if (v === "cli" || v === "api")
+            config.commitAiSource = v;
+    }
+    if (storage.hasPreference(preferenceStorageKey("systemAi"))) {
+        const v = storage.getPreference(preferenceStorageKey("systemAi"), defaults.systemAi);
+        config.systemAi = normalizeSystemAiConfig(v, defaults.systemAi);
+    }
     if (storage.hasPreference(preferenceStorageKey("defaultThinkingEffort"))) {
         const v = storage.getPreference(preferenceStorageKey("defaultThinkingEffort"), defaults.defaultThinkingEffort ?? "off");
         if (isThinkingEffort(v))
@@ -333,10 +355,11 @@ export function applyStoragePreferences(config, storage) {
         const v = storage.getPreference(preferenceStorageKey("inheritEnv"), defaults.inheritEnv ?? true);
         config.inheritEnv = v === false ? false : true;
     }
+    validateCommitAiConfig(config);
     return config;
 }
 /** Write a single preference value to DB and (in-place) update the live config object. */
-export function writePreferenceToStorage(config, storage, key, value) {
+export function writePreferenceToStorage(config, storage, key, value, options = {}) {
     const dbKey = preferenceStorageKey(key);
     switch (key) {
         case "defaultProvider": {
@@ -397,6 +420,31 @@ export function writePreferenceToStorage(config, storage, key, value) {
             config.commitModel = v;
             break;
         }
+        case "commitAiSource": {
+            if (value !== "cli" && value !== "api")
+                throw new Error(`无效 commit AI 来源: ${String(value)}`);
+            if (!options.deferCommitAiValidation) {
+                validateCommitAiConfig({ ...config, commitAiSource: value });
+            }
+            storage.setPreference(dbKey, value);
+            config.commitAiSource = value;
+            break;
+        }
+        case "systemAi": {
+            if (!value || typeof value !== "object" || Array.isArray(value)) {
+                throw new Error("systemAi 必须是对象。");
+            }
+            const normalized = normalizeSystemAiConfig(value, config.systemAi ?? defaultConfig().systemAi);
+            if (normalized.enabled && (!normalized.baseUrl || !normalized.apiKey || !normalized.model)) {
+                throw new Error("启用系统 AI API 时，地址、API Key 和模型不能为空。");
+            }
+            if (!options.deferCommitAiValidation) {
+                validateCommitAiConfig({ ...config, systemAi: normalized });
+            }
+            storage.setPreference(dbKey, normalized);
+            config.systemAi = normalized;
+            break;
+        }
         case "defaultThinkingEffort": {
             if (!isThinkingEffort(value))
                 throw new Error(`无效思考深度: ${String(value)}`);
@@ -435,6 +483,15 @@ export function writePreferenceToStorage(config, storage, key, value) {
         }
     }
 }
+/** Validate the cross-field contract for Commit's direct-API source. */
+export function validateCommitAiConfig(config) {
+    if (config.commitAiSource !== "api")
+        return;
+    const directApi = config.systemAi;
+    if (!directApi?.baseUrl || !directApi.apiKey || !directApi.model) {
+        throw new Error("选择直连 API 生成 Commit 时，必须先填写 API 地址、API Key 和模型。");
+    }
+}
 function defaultCardExpandDefaults() {
     return {
         editCards: false,
@@ -578,6 +635,7 @@ function mergeWithDefaults(input) {
         defaultOpenCodeModel: typeof input.defaultOpenCodeModel === "string" ? input.defaultOpenCodeModel.trim() : defaults.defaultOpenCodeModel,
         commitCli: input.commitCli === "codex" || input.commitCli === "opencode" ? input.commitCli : "claude",
         commitModel: typeof input.commitModel === "string" ? input.commitModel.trim() : defaults.commitModel,
+        commitAiSource: input.commitAiSource === "api" ? "api" : "cli",
         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/distribution-manager.d.ts

@@ -29,6 +29,11 @@ export interface DistributionManagerOptions {
     fetch?: typeof fetch;
     now?: () => number;
 }
+/**
+ * GitHub Release 正文还包含 Android/macOS/iOS 的安装指引；它们属于发布页，
+ * 不该出现在 Android 的更新弹窗。保留分隔线前的变更摘要，并兼容旧版正文。
+ */
+export declare function extractUpdateSummary(releaseBody: string): string;
 export declare class DistributionManager {
     private readonly options;
     private readonly fetchImpl;

package/dist/distribution-manager.js

@@ -2,6 +2,14 @@ import { mkdir, readdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
 import { compareApkInstallOrder, compareSemver, extractSemver } from "./version-utils.js";
 const GITHUB_CACHE_TTL_MS = 10 * 60 * 1000;
+/**
+ * GitHub Release 正文还包含 Android/macOS/iOS 的安装指引；它们属于发布页，
+ * 不该出现在 Android 的更新弹窗。保留分隔线前的变更摘要，并兼容旧版正文。
+ */
+export function extractUpdateSummary(releaseBody) {
+    const summary = releaseBody.split(/\r?\n---\s*(?:\r?\n|$)/, 1)[0]?.trim() ?? "";
+    return summary.slice(0, 500);
+}
 function asRecord(value) {
     return value && typeof value === "object" ? value : null;
 }
@@ -215,7 +223,7 @@ export class DistributionManager {
                 downloadUrl: hit.asset.browser_download_url,
                 fileName: hit.asset.name,
                 size: hit.asset.size,
-                ...(extension === ".apk" && hit.body ? { releaseNotes: hit.body.trim().slice(0, 500) } : {}),
+                ...(extension === ".apk" && hit.body ? { releaseNotes: extractUpdateSummary(hit.body) } : {}),
             };
             this.githubCache.set(extension, { asset, timestamp: this.now() });
             return asset;

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

@@ -10,6 +10,7 @@ interface QuickCommitOptions {
     model?: string | null;
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    systemAi?: import("./types.js").SystemAiConfig;
     autoMessage: boolean;
     customMessage?: string;
     tag?: string;
@@ -27,6 +28,7 @@ interface QuickCommitAiOptions {
     model?: string | null;
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    systemAi?: import("./types.js").SystemAiConfig;
 }
 export declare class QuickCommitError extends Error {
     readonly code: QuickCommitErrorCode;

package/dist/git-quick-commit.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { ClaudeRunError, runClaudePrint } from "./claude-sdk-runner.js";
+import { callSystemAiText } from "./system-ai.js";
 import { buildChildEnv } from "./env-utils.js";
 import { runGit as runGitBase, runGitAsync as runGitAsyncBase, runGitRaw as runGitRawBase, runGitRawAsync as runGitRawAsyncBase, getGitErrorMessage, } from "./git-utils.js";
 import { thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant } from "./structured-provider-common.js";
@@ -81,6 +82,58 @@ async function resolvePushRemoteAsync(cwd) {
     catch { /* use origin */ }
     return "origin";
 }
+function githubSshPushUrl(remoteUrl) {
+    try {
+        const parsed = new URL(remoteUrl);
+        if (parsed.protocol !== "https:" || parsed.hostname.toLowerCase() !== "github.com")
+            return undefined;
+        const path = decodeURIComponent(parsed.pathname).replace(/^\/+|\/+$/g, "");
+        const parts = path.split("/");
+        if (parts.length !== 2 || parts.some((part) => !part))
+            return undefined;
+        return `git@github.com:${parts[0]}/${parts[1]}`;
+    }
+    catch {
+        return undefined;
+    }
+}
+function isHttpsCredentialError(error) {
+    return /could not read (?:User|Pass)name|authentication failed|terminal prompts disabled|credential[^\n]*(?:failed|missing)|http basic: access denied/i
+        .test(getGitErrorMessage(error));
+}
+async function resolveRemotePushUrl(cwd, remote) {
+    try {
+        return await runGitAsync(["remote", "get-url", "--push", remote], cwd);
+    }
+    catch {
+        return remote;
+    }
+}
+/**
+ * Push explicit refs through one transport seam. A Wand service deliberately disables interactive
+ * credential prompts, so a GitHub HTTPS remote that has no non-interactive credential would
+ * otherwise fail even when the same machine is already configured for GitHub SSH.
+ */
+async function pushRemoteRefs(cwd, remote, options = [], refs = []) {
+    try {
+        await runGitAsync(["push", ...options, remote, ...refs], cwd, GIT_PUSH_TIMEOUT_MS);
+        return;
+    }
+    catch (error) {
+        if (!isHttpsCredentialError(error))
+            throw error;
+        const configuredUrl = await resolveRemotePushUrl(cwd, remote);
+        const sshUrl = githubSshPushUrl(configuredUrl);
+        if (!sshUrl)
+            throw error;
+        try {
+            await runGitAsync(["push", ...options, sshUrl, ...refs], cwd, GIT_PUSH_TIMEOUT_MS);
+        }
+        catch (sshError) {
+            throw new Error(`${getGitErrorMessage(error)}\nGitHub SSH 回退也失败：${getGitErrorMessage(sshError)}`, { cause: sshError });
+        }
+    }
+}
 function unquotePath(raw) {
     if (raw.startsWith("\"") && raw.endsWith("\"")) {
         return raw.slice(1, -1).replace(/\\"/g, "\"").replace(/\\\\/g, "\\");
@@ -553,6 +606,8 @@ async function callOpenCodeText(prompt, cwd, opts) {
     return text;
 }
 async function callAiText(prompt, cwd, language, opts) {
+    if (opts.systemAi?.enabled)
+        return callSystemAiText(prompt, opts.systemAi);
     const provider = normalizeProvider(opts.provider);
     if (provider === "codex") {
         return callCodexText(prompt, cwd, opts);
@@ -751,21 +806,21 @@ async function doPush(opts) {
     try {
         if (pushCommits) {
             if (hasUpstream) {
-                await runGitAsync(["push", recurseFlag], cwd, GIT_PUSH_TIMEOUT_MS);
+                await pushRemoteRefs(cwd, pushRemote, [recurseFlag]);
             }
             else {
-                await runGitAsync(["push", "-u", recurseFlag, pushRemote, "HEAD"], cwd, GIT_PUSH_TIMEOUT_MS);
+                await pushRemoteRefs(cwd, pushRemote, ["-u", recurseFlag], ["HEAD"]);
             }
             pushedCommits = true;
         }
         if (pushTags) {
             if (Array.isArray(pushTags)) {
                 for (const name of pushTags) {
-                    await runGitAsync(["push", pushRemote, `refs/tags/${name}`], cwd, GIT_PUSH_TIMEOUT_MS);
+                    await pushRemoteRefs(cwd, pushRemote, [], [`refs/tags/${name}`]);
                 }
             }
             else {
-                await runGitAsync(["push", pushRemote, "--tags"], cwd, GIT_PUSH_TIMEOUT_MS);
+                await pushRemoteRefs(cwd, pushRemote, ["--tags"]);
             }
             pushedTags = true;
         }
@@ -1012,7 +1067,7 @@ async function pushSubmodules(parentCwd, subInfos, opts) {
             continue;
         }
         try {
-            await runGitAsync(["push", info.remote, `HEAD:refs/heads/${info.branch}`], subCwd, GIT_PUSH_TIMEOUT_MS);
+            await pushRemoteRefs(subCwd, info.remote, [], [`HEAD:refs/heads/${info.branch}`]);
         }
         catch (error) {
             errors.push(`submodule ${info.path} 推送失败：${getGitErrorMessage(error)}`);
@@ -1020,7 +1075,7 @@ async function pushSubmodules(parentCwd, subInfos, opts) {
         }
         if (opts.pushTags && opts.tagName) {
             try {
-                await runGitAsync(["push", info.remote, `refs/tags/${opts.tagName}`], subCwd, GIT_PUSH_TIMEOUT_MS);
+                await pushRemoteRefs(subCwd, info.remote, [], [`refs/tags/${opts.tagName}`]);
             }
             catch (error) {
                 errors.push(`submodule ${info.path} 推送 tag 失败：${getGitErrorMessage(error)}`);
@@ -1191,7 +1246,11 @@ async function runQuickCommitFallbackCli(opts, priorError) {
         pushed: false,
     };
 }
-function shouldFallbackToCli(error) {
+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;
     return ![
         "CWD_MISSING",
         "NO_CWD",
@@ -1209,7 +1268,7 @@ export async function runQuickCommitWithFallback(opts) {
         return await runQuickCommit(opts);
     }
     catch (error) {
-        if (error instanceof QuickCommitError && shouldFallbackToCli(error)) {
+        if (error instanceof QuickCommitError && shouldFallbackToCli(error, opts)) {
             return runQuickCommitFallbackCli(opts, error.message);
         }
         throw error;
@@ -1222,6 +1281,7 @@ export async function runQuickCommit(opts) {
         model: opts.model,
         thinkingEffort: opts.thinkingEffort,
         inheritEnv: opts.inheritEnv,
+        systemAi: opts.systemAi,
     };
     await assertGitWorkTreeAsync(cwd);
     // 先 add 一次让我们能在 collectStagedDiff 看到完整改动（包含 submodule 指针），
@@ -1312,6 +1372,13 @@ export async function runQuickCommit(opts) {
     if (!tagName && autoTag) {
         tagName = await generateTagAfterCommit(cwd, language, message, ai);
     }
+    let submodulePushInfos = submoduleOutcome.commits;
+    if (submodule) {
+        // The selected scope is the declared submodule set, not merely the submodules dirtied by this
+        // request. A clean submodule can still have an unpushed HEAD or a pre-existing pointer change.
+        const collected = await collectSubmodulesForPush(cwd);
+        submodulePushInfos = collected.infos;
+    }
     if (tagName) {
         try {
             await runGitAsync(["tag", tagName], cwd);
@@ -1319,9 +1386,10 @@ export async function runQuickCommit(opts) {
         catch (error) {
             throw new QuickCommitError(`git tag 失败：${getGitErrorMessage(error)}`, "GIT_TAG_FAILED");
         }
-        // 纳入 submodule 时给刚提交的 submodule 打同名 tag（非致命，失败不阻断父仓库流程）。
-        if (submodule && submoduleOutcome.commits.length > 0) {
-            await tagSubmodules(cwd, submoduleOutcome.commits, tagName);
+        // 纳入 submodule 时给全部声明的 submodule 当前 HEAD 打同名 tag。这样纯指针变化或
+        // 已提前提交但尚未推送的 submodule 也不会漏掉发布 tag。
+        if (submodule && submodulePushInfos.length > 0) {
+            await tagSubmodules(cwd, submodulePushInfos, tagName);
         }
     }
     let pushed = false;
@@ -1330,10 +1398,10 @@ export async function runQuickCommit(opts) {
         // 纳入 submodule：先把各 submodule 的 HEAD（+ 同名 tag）分别推到各自远端分支，
         // 解决 detached HEAD 无法被父仓库 on-demand 递归推送的问题；父仓库随后用
         // recurse=no 单独推（submodule 已就绪）。否则父仓库用 recurse=check 做安全校验。
-        const includeSub = !!submodule && submoduleOutcome.commits.length > 0;
+        const includeSub = !!submodule && submodulePushInfos.length > 0;
         let subPushErrors = [];
         if (includeSub) {
-            const subPush = await pushSubmodules(cwd, submoduleOutcome.commits, { pushTags: !!tagName, tagName });
+            const subPush = await pushSubmodules(cwd, submodulePushInfos, { pushTags: !!tagName, tagName });
             subPushErrors = subPush.errors;
         }
         if (subPushErrors.length > 0) {

package/dist/npm-update-utils.js

@@ -19,6 +19,7 @@ import process from "node:process";
 import { promisify } from "node:util";
 import { whichSync } from "./path-repair.js";
 import { getErrorMessage } from "./error-utils.js";
+import { compareWandInstallOrder, extractSemver } from "./version-utils.js";
 const execFileAsync = promisify(execFile);
 export const PACKAGE_NAME = "@co0ontty/wand";
 const PACKAGE_SCOPE = "@co0ontty";
@@ -53,10 +54,13 @@ function computeUpdateAvailable(currentVersion, latestVersion, channel) {
     const target = channel === "stable"
         ? getStableTagVersion(latestVersion)
         : cleanVersion(latestVersion);
-    // npm's selected dist-tag is authoritative. Manual/local builds can have a
-    // numerically higher, lower, invalid, or suffixed version; any mismatch must
-    // still allow switching to the exact package selected by @latest or @beta.
-    return current !== target;
+    // Invalid/manual labels cannot be ordered safely, so offer the selected
+    // dist-tag. Valid versions only update forward. In particular, Wand's local
+    // X.Y.Z-debug.* build represents code after X.Y.Z and must not be replaced
+    // by the same stable release as an apparent "upgrade".
+    if (!extractSemver(current) || !extractSemver(target))
+        return current !== target;
+    return compareWandInstallOrder(target, current) > 0;
 }
 export function buildPackageUpdateInfo(currentVersion, channel, latestVersion) {
     const latest = latestVersion?.trim() || null;

package/dist/process-manager.js

@@ -1564,7 +1564,7 @@ export class ProcessManager extends EventEmitter {
         if (this.disposed || !prompt || !record || record.title || this.topicRequests.has(id))
             return;
         this.topicRequests.add(id);
-        void generateSessionTopic(prompt, record.cwd, this.config.language)
+        void generateSessionTopic(prompt, record.cwd, this.config.language, this.config.systemAi)
             .then(({ title, description }) => {
             if (!this.disposed && this.sessions.has(id))
                 this.setSessionTopic(id, title, description);

package/dist/prompt-optimizer.d.ts

@@ -1,5 +1,6 @@
+import type { SystemAiConfig } from "./types.js";
 export declare class PromptOptimizeError extends Error {
     readonly code: string;
     constructor(message: string, code: string);
 }
-export declare function optimizePrompt(rawText: string, language: string, cwd?: string): Promise<string>;
+export declare function optimizePrompt(rawText: string, language: string, cwd?: string, systemAi?: SystemAiConfig): Promise<string>;

package/dist/prompt-optimizer.js

@@ -1,4 +1,5 @@
 import { ClaudeRunError, runClaudePrint } from "./claude-sdk-runner.js";
+import { callSystemAiText } from "./system-ai.js";
 const CLAUDE_TIMEOUT_MS = 60_000;
 const MAX_INPUT_LENGTH = 8000;
 export class PromptOptimizeError extends Error {
@@ -41,7 +42,7 @@ function buildOptimizePrompt(userInput, language) {
         userInput,
     ].join("\n");
 }
-export async function optimizePrompt(rawText, language, cwd) {
+export async function optimizePrompt(rawText, language, cwd, systemAi) {
     const text = (rawText || "").trim();
     if (!text) {
         throw new PromptOptimizeError("请先输入要优化的内容。", "EMPTY_INPUT");
@@ -50,7 +51,7 @@ export async function optimizePrompt(rawText, language, cwd) {
         throw new PromptOptimizeError(`输入过长（${text.length} 字符），请缩短到 ${MAX_INPUT_LENGTH} 以内。`, "INPUT_TOO_LONG");
     }
     const prompt = buildOptimizePrompt(text, language);
-    const raw = await callClaudeText(prompt, cwd, language);
+    const raw = systemAi?.enabled ? await callSystemAiText(prompt, systemAi) : await callClaudeText(prompt, cwd, language);
     const cleaned = raw
         .replace(/^```[a-zA-Z]*\n?/, "")
         .replace(/\n?```$/, "")

package/dist/server-settings-routes.js

@@ -3,14 +3,20 @@ import path from "node:path";
 import { buildChildEnv } from "./env-utils.js";
 import { getErrorMessage } from "./error-utils.js";
 import { asyncRoute } from "./express-async.js";
-import { getProviderDefaultModels, PREFERENCE_KEYS, saveConfig, writePreferenceToStorage, } from "./config.js";
+import { getProviderDefaultModels, PREFERENCE_KEYS, saveConfig, validateCommitAiConfig, writePreferenceToStorage, } from "./config.js";
 import { getCachedModels, refreshModels } from "./models.js";
 import { DEPLOYMENT_CONFIG_KEYS } from "./runtime-config.js";
+import { discoverCliSystemAiConfig, normalizeSystemAiConfig } from "./system-ai.js";
 function publicConfig(config) {
     const { password: _password, appSecret: _appSecret, ...safe } = config;
     const defaultModels = getProviderDefaultModels(config);
     return {
         ...safe,
+        systemAi: safe.systemAi ? {
+            ...safe.systemAi,
+            apiKey: "",
+            hasApiKey: Boolean(safe.systemAi.apiKey),
+        } : undefined,
         defaultModel: defaultModels.claude,
         defaultCodexModel: defaultModels.codex,
         defaultOpenCodeModel: defaultModels.opencode,
@@ -104,6 +110,24 @@ export function registerSettingsRoutes(app, deps) {
         });
         res.json({ inheritEnv, total: entries.length, reveal, entries });
     });
+    app.post("/api/settings/system-ai/import", requireAdmin, (req, res) => {
+        const body = (req.body ?? {});
+        const source = body.source === "codex" || body.source === "opencode" || body.source === "claude"
+            ? body.source
+            : config.commitCli;
+        const imported = discoverCliSystemAiConfig(source);
+        if (!imported) {
+            res.status(404).json({ error: "没有在已配置的 CLI 文件中找到可直连的 API 地址、密钥和模型。" });
+            return;
+        }
+        const candidate = runtimeConfig.createCandidate();
+        writePreferenceToStorage(candidate, storage, "systemAi", {
+            ...imported,
+            enabled: candidate.systemAi?.enabled === true,
+        });
+        runtimeConfig.commit(candidate, new Set(["systemAi"]));
+        res.json({ ok: true, systemAi: (publicConfig(candidate).systemAi) });
+    });
     app.get("/api/app-connect-code", requireAdmin, (req, res) => {
         res.json(deps.resolveAppConnectCode(req));
     });
@@ -117,7 +141,9 @@ export function registerSettingsRoutes(app, deps) {
             setPreference(key, value) { stagedPreferences.push({ key, value }); },
         };
         const stagePreference = (field, value) => {
-            writePreferenceToStorage(candidateConfig, stagingStorage, field, value);
+            writePreferenceToStorage(candidateConfig, stagingStorage, field, value, {
+                deferCommitAiValidation: true,
+            });
             stagedPreferenceFields.add(field);
         };
         let touchedDeployField = false;
@@ -159,12 +185,25 @@ export function registerSettingsRoutes(app, deps) {
                 if (Object.hasOwn(body.defaultModels, "opencode"))
                     stagePreference("defaultOpenCodeModel", body.defaultModels.opencode);
             }
+            if (body.systemAi !== undefined) {
+                if (!body.systemAi || typeof body.systemAi !== "object" || Array.isArray(body.systemAi)) {
+                    throw new Error("systemAi 必须是对象。");
+                }
+                const previous = candidateConfig.systemAi;
+                const apiKey = typeof body.systemAi.apiKey === "string" && body.systemAi.apiKey.trim()
+                    ? body.systemAi.apiKey.trim()
+                    : previous?.apiKey ?? "";
+                stagePreference("systemAi", normalizeSystemAiConfig({ ...previous, ...body.systemAi, apiKey }, previous));
+            }
             for (const field of PREFERENCE_KEYS) {
+                if (field === "systemAi")
+                    continue;
                 const value = body[field];
                 if (!(field in body) || value === undefined)
                     continue;
                 stagePreference(field, value);
             }
+            validateCommitAiConfig(candidateConfig);
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "配置校验失败。") });

package/dist/server.js

@@ -59,18 +59,12 @@ async function checkLatestPackageVersion(channel, forceRefresh = false) {
     const now = Date.now();
     const cached = packageUpdateCache.get(channel);
     if (!forceRefresh && cached && now - cached.timestamp < CACHE_TTL_MS) {
-        return applyLocalBuildUpdateOverride(cached.info);
+        return cached.info;
     }
     const info = await checkPackageUpdateAsync(PKG_VERSION, channel);
     if (info.latest) {
         packageUpdateCache.set(channel, { info, timestamp: now });
     }
-    return applyLocalBuildUpdateOverride(info);
-}
-function applyLocalBuildUpdateOverride(info) {
-    if (info.channel === "stable" && BUILD_INFO.channel === "beta" && info.latest) {
-        return { ...info, updateAvailable: true };
-    }
     return info;
 }
 /** 读取 dist/build-info.json（由 scripts/stamp-build-info.js 在 build 时生成）。 */
@@ -924,7 +918,7 @@ export async function startServer(config, configPath, options = {}) {
                 cwd = snap.cwd;
         }
         try {
-            const optimized = await optimizePrompt(text, config.language ?? "", cwd);
+            const optimized = await optimizePrompt(text, config.language ?? "", cwd, config.systemAi);
             res.json({ optimized });
         }
         catch (error) {

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

@@ -1,9 +1,10 @@
-import type { SessionProvider, SessionSnapshot, WandConfig } from "./types.js";
+import type { SessionProvider, SessionSnapshot, SystemAiConfig, WandConfig } from "./types.js";
 export interface SessionAiContext {
     provider: SessionProvider;
     model?: string;
     thinkingEffort: SessionSnapshot["thinkingEffort"];
     inheritEnv?: boolean;
+    systemAi?: SystemAiConfig;
 }
 /**
  * Resolve the provider from every representation used by current and legacy
@@ -14,4 +15,4 @@ export declare function resolveSessionProvider(snapshot: Pick<SessionSnapshot, "
 /** 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" | "defaultOpenCodeModel" | "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" | "defaultOpenCodeModel" | "defaultThinkingEffort" | "inheritEnv" | "commitCli" | "commitModel">): SessionAiContext;
+export declare function resolveCommitAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultOpenCodeModel" | "defaultThinkingEffort" | "inheritEnv" | "commitCli" | "commitModel" | "commitAiSource" | "systemAi">): SessionAiContext;

package/dist/session-ai-context.js

@@ -41,9 +41,17 @@ export function resolveSessionAiContext(snapshot, config) {
 /** Build the AI context for quick-commit actions from their global preferences. */
 export function resolveCommitAiContext(snapshot, config) {
     const sessionContext = resolveSessionAiContext(snapshot, config);
+    const directApi = config.systemAi ?? {
+        enabled: true,
+        protocol: "openai",
+        baseUrl: "",
+        apiKey: "",
+        model: "",
+    };
     return {
         ...sessionContext,
         provider: config.commitCli === "codex" || config.commitCli === "opencode" ? config.commitCli : "claude",
         model: normalizeModel(config.commitModel),
+        ...(config.commitAiSource === "api" ? { systemAi: { ...directApi, enabled: true } } : {}),
     };
 }

package/dist/session-topic.d.ts

@@ -1,5 +1,6 @@
+import type { SystemAiConfig } from "./types.js";
 export interface SessionTopic {
     title: string;
     description: string;
 }
-export declare function generateSessionTopic(userMessage: string, cwd?: string, language?: string): Promise<SessionTopic>;
+export declare function generateSessionTopic(userMessage: string, cwd?: string, language?: string, systemAi?: SystemAiConfig): Promise<SessionTopic>;