@co0ontty/wand 4.23.0 → 4.24.0

package/dist/system-ai.js

@@ -35,7 +35,9 @@ export function normalizeSystemAiConfig(value, fallback) {
         apiKey: typeof raw.apiKey === "string" ? raw.apiKey.trim() : fallback?.apiKey ?? "",
         model: typeof raw.model === "string" ? raw.model.trim() : fallback?.model ?? "",
         authHeader: raw.authHeader === "x-api-key" ? "x-api-key" : "bearer",
-        source: raw.source === "claude" || raw.source === "codex" || raw.source === "opencode" ? raw.source : "custom",
+        source: raw.source === "claude" || raw.source === "codex" || raw.source === "opencode" || raw.source === "grok"
+            ? raw.source
+            : "custom",
     };
     if (Array.isArray(raw.fallbacks)) {
         normalized.fallbacks = raw.fallbacks
@@ -57,6 +59,25 @@ export function normalizeSystemAiConfig(value, fallback) {
     }
     return normalized;
 }
+function tryNormalizeSystemAiConfig(value) {
+    try {
+        return normalizeSystemAiConfig(value);
+    }
+    catch {
+        // A stale or partially edited tool profile must not prevent the remaining
+        // APIs—or the final current-session CLI fallback—from being tried.
+        return null;
+    }
+}
+function systemAiProfileKey(profile) {
+    return [
+        profile.protocol,
+        profile.baseUrl,
+        profile.apiKey,
+        profile.model,
+        profile.authHeader ?? "bearer",
+    ].join("\0");
+}
 function readJson(filePath) {
     if (!existsSync(filePath))
         return null;
@@ -67,6 +88,54 @@ function readJson(filePath) {
         return null;
     }
 }
+function parseTomlString(raw) {
+    const value = raw.trim();
+    if (value.startsWith('"')) {
+        const quoted = /^"(?:\\.|[^"\\])*"/.exec(value)?.[0];
+        if (!quoted)
+            return null;
+        try {
+            const parsed = JSON.parse(quoted);
+            return typeof parsed === "string" ? parsed : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    if (value.startsWith("'")) {
+        const end = value.indexOf("'", 1);
+        return end < 0 ? null : value.slice(1, end);
+    }
+    return null;
+}
+function readTomlStringSections(filePath) {
+    if (!existsSync(filePath))
+        return null;
+    try {
+        const sections = new Map();
+        let section = "";
+        sections.set(section, new Map());
+        for (const line of readFileSync(filePath, "utf8").split(/\r?\n/)) {
+            const sectionMatch = /^\s*\[([^\]]+)\]\s*(?:#.*)?$/.exec(line);
+            if (sectionMatch) {
+                section = sectionMatch[1].trim();
+                if (!sections.has(section))
+                    sections.set(section, new Map());
+                continue;
+            }
+            const assignment = /^\s*([A-Za-z0-9_-]+)\s*=\s*(.+)$/.exec(line);
+            if (!assignment)
+                continue;
+            const value = parseTomlString(assignment[2]);
+            if (value !== null)
+                sections.get(section).set(assignment[1], value);
+        }
+        return sections;
+    }
+    catch {
+        return null;
+    }
+}
 function discoverClaude(home) {
     const settings = readJson(path.join(home, ".claude", "settings.json"));
     const env = settings?.env && typeof settings.env === "object" ? settings.env : {};
@@ -76,7 +145,7 @@ function discoverClaude(home) {
     const model = typeof settings?.model === "string" ? settings.model : "";
     if (!apiKey || !model)
         return null;
-    return normalizeSystemAiConfig({
+    return tryNormalizeSystemAiConfig({
         enabled: true, protocol: "anthropic", baseUrl, apiKey, model,
         authHeader: typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? "bearer" : "x-api-key",
         source: "claude",
@@ -100,7 +169,7 @@ function discoverOpenCode(home) {
             : typeof provider?.model === "string" ? provider.model : Object.keys(models)[0] ?? "";
         if (!apiKey || !baseUrl || !configuredModel)
             continue;
-        found.push(normalizeSystemAiConfig({
+        const profile = tryNormalizeSystemAiConfig({
             enabled: true,
             protocol: "openai",
             baseUrl,
@@ -108,7 +177,9 @@ function discoverOpenCode(home) {
             model: configuredModel,
             authHeader: "bearer",
             source: "opencode",
-        }));
+        });
+        if (profile)
+            found.push(profile);
     }
     return found;
 }
@@ -127,7 +198,40 @@ function discoverCodex(home) {
     catch { /* optional config */ }
     if (!model)
         return null;
-    return normalizeSystemAiConfig({ enabled: true, protocol: "openai", baseUrl, apiKey, model, authHeader: "bearer", source: "codex" });
+    return tryNormalizeSystemAiConfig({ enabled: true, protocol: "openai", baseUrl, apiKey, model, authHeader: "bearer", source: "codex" });
+}
+function discoverGrok(home) {
+    const sections = readTomlStringSections(path.join(home, ".grok", "config.toml"));
+    if (!sections)
+        return [];
+    const defaultProfile = sections.get("models")?.get("default") ?? "";
+    const modelSections = [...sections.entries()].filter(([name]) => name.startsWith("model."));
+    const orderedSections = [
+        ...modelSections.filter(([name]) => name === `model.${defaultProfile}`),
+        ...modelSections.filter(([name]) => name !== `model.${defaultProfile}`),
+    ];
+    const found = [];
+    for (const [section, values] of orderedSections) {
+        if (values.get("api_backend")?.trim().toLowerCase() !== "chat_completions")
+            continue;
+        const apiKey = values.get("api_key") ?? "";
+        const baseUrl = values.get("base_url") ?? "";
+        const model = values.get("model") ?? section.slice("model.".length);
+        if (!apiKey || !baseUrl || !model)
+            continue;
+        const profile = tryNormalizeSystemAiConfig({
+            enabled: true,
+            protocol: "openai",
+            baseUrl,
+            apiKey,
+            model,
+            authHeader: "bearer",
+            source: "grok",
+        });
+        if (profile)
+            found.push(profile);
+    }
+    return found;
 }
 /** Copy every usable direct-API profile from the user's configured CLIs. */
 export function discoverCliSystemAiConfigs(preferred, home = os.homedir()) {
@@ -135,15 +239,23 @@ export function discoverCliSystemAiConfigs(preferred, home = os.homedir()) {
         claude: (dir) => [discoverClaude(dir)].filter((item) => item !== null),
         codex: (dir) => [discoverCodex(dir)].filter((item) => item !== null),
         opencode: discoverOpenCode,
+        grok: discoverGrok,
     };
-    const order = [preferred ?? "claude", "claude", "opencode", "codex"];
+    const order = [preferred ?? "claude", "claude", "opencode", "grok", "codex"];
     const found = [];
     const seen = new Set();
     for (const provider of [...new Set(order)]) {
-        if (provider === "grok" || provider === "qoder")
+        if (provider === "qoder")
             continue;
-        for (const profile of discoverers[provider](home)) {
-            const key = [profile.protocol, profile.baseUrl, profile.apiKey, profile.model].join("\0");
+        let discovered;
+        try {
+            discovered = discoverers[provider](home);
+        }
+        catch {
+            continue;
+        }
+        for (const profile of discovered) {
+            const key = systemAiProfileKey(profile);
             if (seen.has(key))
                 continue;
             seen.add(key);
@@ -163,25 +275,53 @@ export function systemAiProfiles(config, forceEnabled = false) {
     const candidates = [config, ...(config.fallbacks ?? [])];
     const seen = new Set();
     return candidates.flatMap((candidate) => {
-        const normalized = normalizeSystemAiConfig({ ...candidate, enabled: true, fallbacks: undefined });
+        const normalized = tryNormalizeSystemAiConfig({ ...candidate, enabled: true, fallbacks: undefined });
+        if (!normalized)
+            return [];
         if (!normalized.baseUrl || !normalized.apiKey || !normalized.model)
             return [];
-        const key = [normalized.protocol, normalized.baseUrl, normalized.apiKey, normalized.model].join("\0");
+        const key = systemAiProfileKey(normalized);
         if (seen.has(key))
             return [];
         seen.add(key);
         return [normalized];
     });
 }
+/**
+ * Flatten and combine direct-API groups in priority order. Dynamically discovered
+ * profiles can be passed first, followed by stored/legacy settings.
+ */
+export function mergeSystemAiConfigs(...groups) {
+    const profiles = [];
+    const seen = new Set();
+    for (const group of groups) {
+        for (const config of Array.isArray(group) ? group : group ? [group] : []) {
+            for (const profile of systemAiProfiles(config, true)) {
+                const key = systemAiProfileKey(profile);
+                if (seen.has(key))
+                    continue;
+                seen.add(key);
+                profiles.push({ ...profile, enabled: true, fallbacks: undefined });
+            }
+        }
+    }
+    const [primary, ...fallbacks] = profiles;
+    if (!primary)
+        return undefined;
+    const merged = { ...primary, enabled: true };
+    if (fallbacks.length)
+        merged.fallbacks = fallbacks;
+    return merged;
+}
 function endpoint(baseUrl, protocol) {
     const url = new URL(baseUrl);
     const pathName = url.pathname.replace(/\/+$/, "");
     const fullSuffix = protocol === "anthropic" ? "/v1/messages" : "/v1/chat/completions";
     const shortSuffix = protocol === "anthropic" ? "/messages" : "/chat/completions";
-    if (pathName.toLowerCase().endsWith(fullSuffix)) {
+    if (pathName.toLowerCase().endsWith(shortSuffix)) {
         url.pathname = pathName;
     }
-    else if (pathName.toLowerCase().endsWith("/v1")) {
+    else if (/\/v\d+(?:\.\d+)?$/i.test(pathName)) {
         url.pathname = `${pathName}${shortSuffix}`;
     }
     else {

package/dist/types.d.ts

@@ -145,7 +145,7 @@ export interface SystemAiConfig {
     model: string;
     authHeader?: SystemAiAuthHeader;
     /** 自动导入时记录来源，仅用于设置页说明。 */
-    source?: "claude" | "codex" | "opencode" | "custom";
+    source?: "claude" | "codex" | "opencode" | "grok" | "custom";
     /**
      * 其余可直连 API，按数组顺序依次尝试。保留顶层字段作为首选项，
      * 以兼容已有配置与手工编辑入口。