@co0ontty/wand 4.81.0 → 4.82.0

package/dist/git-quick-commit.js

@@ -3,6 +3,7 @@ import { spawn } from "node:child_process";
 import { buildChildEnv } from "./env-utils.js";
 import { buildLanguageDirective } from "./language-prompt.js";
 import { isSessionProvider, providerCliInstalled } from "./session-provider.js";
+import { asRecord } from "./structured-content.js";
 import { runGitAsync as runGitAsyncBase, runGitRawAsync as runGitRawAsyncBase, getGitErrorMessage, } from "./git-utils.js";
 import { composeSystemFallback, systemPromptFlag, thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToGrokEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToQoderEffort, thinkingEffortToPiLevel, } from "./structured-provider-common.js";
 /** provider 缺省值：无法识别时回落到 Claude。 */
@@ -277,7 +278,9 @@ export class QuickCommitError extends Error {
         this.name = "QuickCommitError";
     }
 }
-// ── AI commit message generation ──
+function cliTextTimeoutMs(defaultMs, opts) {
+    return opts.deadline === undefined ? defaultMs : Math.min(defaultMs, Math.max(1, opts.deadline - Date.now()));
+}
 /**
  * 一次性 Claude 文本生成（commit message / tag / 提示词优化…）。
  *
@@ -302,7 +305,7 @@ async function callClaudeText(request, cwd, language, opts) {
         args.push("--effort", effort);
     const stdout = await runCliText("claude", args, request.prompt, {
         cwd,
-        timeoutMs: CLAUDE_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CLAUDE_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = stdout.trim();
@@ -316,7 +319,72 @@ function stripFences(raw) {
 function normalizeAiText(raw) {
     return stripFences(raw).replace(/^["'`]+|["'`]+$/g, "").trim();
 }
+/** Read explicit protocol failures, not error-looking prose that could be legitimate output. */
+function cliProtocolErrorText(value) {
+    if (typeof value === "string")
+        return value.trim();
+    if (Array.isArray(value))
+        return value.map(cliProtocolErrorText).filter(Boolean).join("\n");
+    const record = asRecord(value);
+    if (!record)
+        return "";
+    for (const key of ["message", "error", "errors", "data", "result"]) {
+        const text = cliProtocolErrorText(record[key]);
+        if (text)
+            return text;
+    }
+    return "";
+}
+/** A zero process exit does not imply a successful model response. */
+function assertCliProtocolSucceeded(stdout, provider) {
+    let failure = null;
+    const failed = (value) => cliProtocolErrorText(value) || `${provider} CLI execution failed`;
+    for (const line of stdout.split(/\r?\n/)) {
+        let event;
+        try {
+            event = asRecord(JSON.parse(line));
+        }
+        catch {
+            continue;
+        }
+        if (!event)
+            continue;
+        if (provider === "codex") {
+            if (event.type === "error" || event.type === "turn.failed")
+                failure = failed(event);
+            if (event.type === "turn.completed")
+                failure = null;
+        }
+        else if (provider === "qoder" && event.type === "result") {
+            failure = event.is_error === true || event.subtype !== "success" ? failed(event) : null;
+        }
+        else if (provider === "pi") {
+            const messages = event.type === "agent_end" && Array.isArray(event.messages)
+                ? event.messages
+                : event.type === "message_end" || event.type === "turn_end" ? [event.message] : [];
+            for (const raw of messages) {
+                const message = asRecord(raw);
+                if (message?.role !== "assistant")
+                    continue;
+                failure = message.stopReason === "error" || message.stopReason === "aborted"
+                    ? failed(message.errorMessage) : null;
+            }
+        }
+        else if (provider === "gemini") {
+            if (event.type === "error" && event.severity === "error")
+                failure = failed(event);
+            if (event.type === "result")
+                failure = event.status === "error" ? failed(event) : null;
+        }
+        else if ((provider === "grok" || provider === "opencode") && event.type === "error") {
+            failure = failed(event);
+        }
+    }
+    if (failure)
+        throw new QuickCommitError(`${provider} CLI 失败：${failure}`, "CLAUDE_CLI_FAILED");
+}
 function extractCodexText(stdout) {
+    assertCliProtocolSucceeded(stdout, "codex");
     let lastAgentText = "";
     for (const line of stdout.split(/\r?\n/)) {
         const trimmed = line.trim();
@@ -343,6 +411,7 @@ function extractCodexText(stdout) {
     return "";
 }
 function extractOpenCodeText(stdout) {
+    assertCliProtocolSucceeded(stdout, "opencode");
     const texts = [];
     for (const line of stdout.split(/\r?\n/)) {
         const trimmed = line.trim();
@@ -361,6 +430,7 @@ function extractOpenCodeText(stdout) {
     return texts.join("\n").trim();
 }
 function extractGrokText(stdout) {
+    assertCliProtocolSucceeded(stdout, "grok");
     let text = "";
     for (const line of stdout.split(/\r?\n/)) {
         const trimmed = line.trim();
@@ -378,6 +448,7 @@ function extractGrokText(stdout) {
     return text.trim();
 }
 function extractQoderText(stdout) {
+    assertCliProtocolSucceeded(stdout, "qoder");
     let resultText = "";
     const assistantTexts = [];
     for (const line of stdout.split(/\r?\n/)) {
@@ -408,6 +479,7 @@ function extractQoderText(stdout) {
     return (resultText || assistantTexts.join("\n")).trim();
 }
 function extractPiText(stdout) {
+    assertCliProtocolSucceeded(stdout, "pi");
     let text = "";
     for (const line of stdout.split(/\r?\n/)) {
         try {
@@ -425,6 +497,7 @@ function extractPiText(stdout) {
 }
 /** Gemini `--output-format stream-json`：assistant message 是增量 chunk，拼接即可。 */
 function extractGeminiText(stdout) {
+    assertCliProtocolSucceeded(stdout, "gemini");
     let text = "";
     for (const line of stdout.split(/\r?\n/)) {
         const trimmed = line.trim();
@@ -574,7 +647,7 @@ async function callCodexText(request, cwd, opts) {
     args.push("-");
     const stdout = await runCliText("codex", args, contentWithSystemPrompt("codex", request), {
         cwd,
-        timeoutMs: CODEX_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = extractCodexText(stdout);
@@ -593,7 +666,7 @@ async function callOpenCodeText(request, cwd, opts) {
         args.push("--variant", variant);
     const stdout = await runCliText("opencode", args, contentWithSystemPrompt("opencode", request), {
         cwd,
-        timeoutMs: CODEX_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = extractOpenCodeText(stdout);
@@ -604,7 +677,7 @@ async function callOpenCodeText(request, cwd, opts) {
 async function callGrokText(request, cwd, opts) {
     const stdout = await runCliText("grok", buildGrokTextArgs(request, opts), "", {
         cwd,
-        timeoutMs: CODEX_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = extractGrokText(stdout);
@@ -615,7 +688,7 @@ async function callGrokText(request, cwd, opts) {
 async function callQoderText(request, cwd, opts) {
     const stdout = await runCliText("qodercli", buildQoderTextArgs(request, opts), "", {
         cwd,
-        timeoutMs: CODEX_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = extractQoderText(stdout);
@@ -624,7 +697,9 @@ async function callQoderText(request, cwd, opts) {
     return text;
 }
 async function callPiText(request, cwd, opts) {
-    const stdout = await runCliText("pi", buildPiTextArgs(request, opts), "", { cwd, timeoutMs: CODEX_MESSAGE_TIMEOUT_MS, inheritEnv: opts.inheritEnv });
+    const stdout = await runCliText("pi", buildPiTextArgs(request, opts), "", {
+        cwd, timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts), inheritEnv: opts.inheritEnv,
+    });
     const text = extractPiText(stdout);
     if (!text)
         throw new QuickCommitError("Pi 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
@@ -633,7 +708,7 @@ async function callPiText(request, cwd, opts) {
 async function callGeminiText(request, cwd, opts) {
     const stdout = await runCliText("gemini", buildGeminiTextArgs(opts), contentWithSystemPrompt("gemini", request), {
         cwd,
-        timeoutMs: CODEX_MESSAGE_TIMEOUT_MS,
+        timeoutMs: cliTextTimeoutMs(CODEX_MESSAGE_TIMEOUT_MS, opts),
         inheritEnv: opts.inheritEnv,
     });
     const text = extractGeminiText(stdout);
@@ -689,41 +764,43 @@ function singleCandidate(opts) {
     };
 }
 /**
- * 按顺序尝试候选：跳过没安装的 CLI，逐条收集错误，成功即返回。
+ * 按顺序尝试候选：跳过没安装的 CLI，协议与输出校验均成功才返回。
  * 只有一条候选时保持原行为（错误原样抛出，不摘要）。
+ * 仅用于一次性文本生成；执行工具的任务不能使用这条无条件重试路径。
  */
-async function callCliCandidates(request, cwd, language, opts) {
+async function callCliCandidates(request, cwd, language, opts, parseOutput) {
     const chain = opts.cliCandidates?.length ? opts.cliCandidates : [singleCandidate(opts)];
     if (chain.length === 1) {
-        return callCliAiText(request, cwd, language, candidateOptions(opts, chain[0]));
+        return parseOutput(await callCliAiText(request, cwd, language, candidateOptions(opts, chain[0])));
     }
     const installed = chain.filter((candidate) => providerCliInstalled(candidate.provider));
     const attempts = installed.length ? installed : chain;
     const deadline = Date.now() + CLI_CHAIN_BUDGET_MS;
     const errors = [];
     for (const candidate of attempts) {
-        if (Date.now() > deadline) {
+        if (Date.now() >= deadline) {
             errors.push("已超过等待上限");
             break;
         }
         try {
-            const text = await callCliAiText(request, cwd, language, candidateOptions(opts, candidate));
-            if (text.trim())
-                return text;
-            errors.push(`${candidate.provider}: 返回空结果`);
+            const text = await callCliAiText(request, cwd, language, { ...candidateOptions(opts, candidate), deadline });
+            const result = await parseOutput(text);
+            if (candidate !== attempts[0]) {
+                console.info(`[SystemAi] 候选 ${chain.indexOf(candidate) + 1}/${chain.length} (${candidate.provider}) 成功`);
+            }
+            return result;
         }
         catch (error) {
             errors.push(`${candidate.provider}: ${getGitErrorMessage(error)}`);
+            // 不记录提示词、路径、CLI 原始响应或可能带鉴权信息的错误正文。
+            const code = error instanceof QuickCommitError ? error.code : "INVALID_AI_RESULT";
+            console.warn(`[SystemAi] 候选 ${chain.indexOf(candidate) + 1}/${chain.length} (${candidate.provider}) 失败: ${code}`);
         }
     }
     throw new QuickCommitError(`所有 CLI 候选均失败：${errors.join("；")}`, "AI_FALLBACK_FAILED");
 }
-/**
- * Run a lightweight AI request through the system employee's CLI chain.
- * 所有 Wand 自有文本调用都走本机已安装的 CLI，没有任何直连 API 分支。
- */
-export async function callConfiguredAiText(request, cwd, language, opts) {
-    return callCliCandidates(withOpsPersona(request, opts.opsPersona), cwd, language, opts);
+export async function callConfiguredAiText(request, cwd, language, opts, parseOutput = (raw) => raw) {
+    return callCliCandidates(withOpsPersona(request, opts.opsPersona), cwd, language, opts, parseOutput);
 }
 /** Read the unstaged + staged tree without touching the index. */
 async function collectWorkingTreeDiff(cwd) {
@@ -814,12 +891,12 @@ function commitTaskLine(lang, usedIteration) {
 async function generateCommitMessage(cwd, language, ai = {}, options = {}) {
     const { input, usedIteration } = await buildCommitPromptInput(cwd, options);
     const lang = language.trim() || "中文";
-    const raw = await callConfiguredAiText({ system: commitTaskLine(lang, usedIteration), prompt: input }, cwd, language, ai);
-    const message = normalizeAiText(raw);
-    if (!message) {
-        throw new QuickCommitError("AI 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
-    }
-    return message;
+    return callConfiguredAiText({ system: commitTaskLine(lang, usedIteration), prompt: input }, cwd, language, ai, (raw) => {
+        const message = normalizeAiText(raw);
+        if (!message)
+            throw new QuickCommitError("AI 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
+        return message;
+    });
 }
 function tryParseJson(raw) {
     let text = raw.trim();
@@ -867,23 +944,15 @@ async function generateCommitMessageWithTag(cwd, language, ai = {}, options = {}
 
 请严格输出**单行 JSON 对象**，不要 Markdown 代码块、不要任何解释文字、不要多余引号。格式：
 {"message":"...","tag":"v1.2.3"}`;
-    const raw = await callConfiguredAiText({ system, prompt: `${tagHint}\n\n${input}` }, cwd, language, ai);
-    const parsed = tryParseJson(raw);
-    let message;
-    let suggestedTag;
-    if (parsed && typeof parsed.message === "string") {
-        message = normalizeAiText(parsed.message);
-        suggestedTag = sanitizeSuggestedTag(parsed.tag);
-    }
-    else {
-        // Fallback: treat whole output as message, no tag suggestion
-        message = normalizeAiText(raw);
-        suggestedTag = undefined;
-    }
-    if (!message) {
-        throw new QuickCommitError("AI 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
-    }
-    return { message, suggestedTag };
+    return callConfiguredAiText({ system, prompt: `${tagHint}\n\n${input}` }, cwd, language, ai, (raw) => {
+        const parsed = tryParseJson(raw);
+        // Preserve the plain-message fallback for older CLIs that do not return JSON.
+        const message = normalizeAiText(parsed && typeof parsed.message === "string" ? parsed.message : raw);
+        const suggestedTag = parsed && typeof parsed.message === "string" ? sanitizeSuggestedTag(parsed.tag) : undefined;
+        if (!message)
+            throw new QuickCommitError("AI 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
+        return { message, suggestedTag };
+    });
 }
 export async function generateCommitMessageOnly(cwd, language, ai = {}, options = {}) {
     if (!cwd || !existsSync(cwd)) {
@@ -932,19 +1001,13 @@ async function generateTagAfterCommit(cwd, language, commitMessage, ai = {}) {
 请用${lang}思考但严格输出**单行 JSON 对象**，不要 Markdown 代码块、不要任何解释文字、不要多余引号。格式：
 {"tag":"v1.2.3"}`;
     const prompt = `${tagHint}\n\ncommit message：${commitMessage}\n\ngit diff：\n${diff}`;
-    const raw = await callConfiguredAiText({ system, prompt }, cwd, language, ai);
-    const parsed = tryParseJson(raw);
-    let suggested;
-    if (parsed && typeof parsed.tag === "string") {
-        suggested = sanitizeSuggestedTag(parsed.tag);
-    }
-    else {
-        suggested = sanitizeSuggestedTag(raw);
-    }
-    if (!suggested) {
-        throw new QuickCommitError("AI 没有给出合法的 tag，请手动填写。", "INVALID_AI_TAG");
-    }
-    return suggested;
+    return callConfiguredAiText({ system, prompt }, cwd, language, ai, (raw) => {
+        const parsed = tryParseJson(raw);
+        const suggested = sanitizeSuggestedTag(parsed && typeof parsed.tag === "string" ? parsed.tag : raw);
+        if (!suggested)
+            throw new QuickCommitError("AI 没有给出合法的 tag，请手动填写。", "INVALID_AI_TAG");
+        return suggested;
+    });
 }
 /**
  * Push current branch (with upstream auto-setup) and/or tags.

package/dist/iteration-log.d.ts

@@ -1,4 +1,5 @@
 import type { WandStorage } from "./storage.js";
+import type { SessionSource } from "./types.js";
 import { type WandIterationPrompt, type WandIterationPromptSource } from "./task-types.js";
 /** commit 生成的输入模式：iteration = 只用本轮提示词（默认，省 token）；diff = 读完整 diff。 */
 export type CommitContextMode = "iteration" | "diff";
@@ -13,6 +14,10 @@ export interface IterationPromptSession {
     cwd?: string;
     workspaceId?: string;
     workspaceTaskId?: string;
+    sessionSource?: SessionSource;
+    automationId?: string;
+    interactiveShell?: boolean;
+    employeeId?: string;
 }
 export interface IterationPromptTarget {
     milestoneId: string;

package/dist/iteration-log.js

@@ -9,6 +9,9 @@ import path from "node:path";
 import { getErrorMessage } from "./error-utils.js";
 import { runGitAsync } from "./git-utils.js";
 import { shouldGenerateSessionTopicFromInput, summarizeSessionTitleFromInput } from "./session-topic.js";
+import { recordUserMemory } from "./user-memory.js";
+import { DEFAULT_EMPLOYEE_ID } from "./ai-team-types.js";
+import { explicitEmployeeMemoryContent } from "./employee-knowledge-content.js";
 import { WAND_ITERATION_PROMPT_DETAIL_MAX_LENGTH, WAND_ITERATION_PROMPT_TITLE_MAX_LENGTH, } from "./task-types.js";
 /** 用户在上次选择后记住的模式；两条互不影响，互相切不会被覆盖。 */
 export const COMMIT_CONTEXT_MODE_PREF_KEY = "pref:commitContextMode";
@@ -119,11 +122,19 @@ export function whenIterationPromptsSettled() {
  */
 export function recordIterationPrompt(storage, session, prompt, source = "session", options = {}) {
     const raw = prompt?.trim();
-    if (!raw)
+    if (!raw || explicitEmployeeMemoryContent(raw))
         return;
+    // 明确记忆不是代码变更意图，不进入共享迭代/commit 摘要。
     // 与会话标题共用同一把尺子：太短的输入不值得进迭代记录。
     if (!options.skipFilter && !shouldGenerateSessionTopicFromInput(raw))
         return;
+    // Only real interactive user prompts; never learn from team-generated instructions or shell input.
+    if (((!session.sessionSource || session.sessionSource === "interactive") && !session.automationId
+        || session.automationId?.startsWith("wand-task:"))
+        && (!session.employeeId || session.employeeId === DEFAULT_EMPLOYEE_ID)
+        && !session.interactiveShell && !/^[\/!]/.test(raw)) {
+        recordUserMemory(storage, "session.prompt", raw, session.id);
+    }
     const run = async () => {
         try {
             const detail = clip(cleanIterationPromptText(raw), WAND_ITERATION_PROMPT_DETAIL_MAX_LENGTH);

package/dist/message-truncator.js

@@ -378,19 +378,23 @@ function toolActivity(use, hasImage) {
     const occurredAt = use.occurredAt ?? use.activity?.occurredAt;
     return {
         kind,
-        label: activityLabel(kind),
+        label: activityLabel(kind, use, path),
         ...(fileKey ? { fileKey } : {}),
         ...(hasImage || imagePath || use.activity?.hasImage ? { hasImage: true } : {}),
-        ...(kind === "run_command" && occurredAt ? { occurredAt } : {}),
+        ...(occurredAt ? { occurredAt } : {}),
     };
 }
-function activityLabel(kind) {
-    switch (kind) {
-        case "edit_file": return "修改文件";
-        case "read_file": return "查看文件";
-        case "run_command": return "运行命令";
-        default: return "使用工具";
-    }
+function activityLabel(kind, use, path) {
+    // Only a bounded file/tool identity belongs in the timeline, never commands,
+    // patches, search queries or output. Keep labels stable when projecting twice.
+    if (!path && use.activity?.label)
+        return use.activity.label;
+    const file = path.replace(/\\/g, "/").split("/").filter(Boolean).slice(-2).join("/");
+    const name = use.name.replace(/\s+/g, " ").trim().slice(0, 80) || "工具";
+    const label = kind === "edit_file" ? `修改 ${file}`
+        : kind === "read_file" ? `查看 ${file}`
+            : kind === "run_command" ? `运行命令 · ${name}` : `调用 ${name}`;
+    return label.length > 120 ? `${label.slice(0, 119)}…` : label;
 }
 const INDEPENDENT_TOOL_NAMES = new Set([
     "AskUserQuestion", "TodoWrite", "TaskCreate", "TaskUpdate", "TaskList",

package/dist/models.d.ts

@@ -1,3 +1,4 @@
+import { type PiModelEndpointDiscoveryOptions } from "./pi-model-discovery.js";
 import { ClaudeModelInfo } from "./types.js";
 /**
  * The complete server-side model catalog. Keep this separate from the Claude
@@ -36,6 +37,9 @@ export interface ModelRefreshOptions {
     commandRunner?: ModelCommandRunner;
     modelsApi?: ClaudeModelsApi;
     verifyClaudeCandidates?: boolean;
+    piEndpointDiscovery?: PiModelEndpointDiscoveryOptions & {
+        enabled: boolean;
+    };
     now?: () => Date;
 }
 export interface ThinkingEffortLevel {

package/dist/models.js

@@ -3,6 +3,7 @@ import { createHash } from "node:crypto";
 import { promisify } from "node:util";
 import Anthropic from "@anthropic-ai/sdk";
 import { resolveChildEnv } from "./env-utils.js";
+import { discoverPiEndpointModels } from "./pi-model-discovery.js";
 import { extractSemver } from "./version-utils.js";
 const execFileAsync = promisify(execFile);
 const CLAUDE_VERIFICATION_CACHE_KEY = "claude-model-verifications-v1";
@@ -384,20 +385,47 @@ async function probeQoderModels(runner, env) {
         return { ok: false };
     }
 }
-async function probePiModels(runner, env) {
+async function probePiModels(runner, env, options) {
     const rpcText = await commandText(runner, "pi", ["--mode", "rpc", "--no-session"], env, 12_000, `${JSON.stringify({ id: "wand-models", type: "get_available_models" })}\n`);
     const fromRpc = parsePiRpcModels(rpcText);
-    if (fromRpc.length > 1 || (fromRpc.length === 1 && fromRpc[0]?.id !== "default")) {
-        return { ok: true, value: fromRpc };
-    }
-    try {
-        const { stdout } = await runner("pi", ["--list-models"], { env, timeout: 8000 });
-        const parsed = parsePiModels(stdout);
-        return parsed.some((model) => model.id !== "default") ? { ok: true, value: parsed } : { ok: false };
+    let configuredModels = fromRpc.length > 1 || (fromRpc.length === 1 && fromRpc[0]?.id !== "default")
+        ? fromRpc
+        : [];
+    if (!configuredModels.length) {
+        try {
+            const { stdout } = await runner("pi", ["--list-models"], { env, timeout: 8000 });
+            const parsed = parsePiModels(stdout);
+            if (parsed.some((model) => model.id !== "default"))
+                configuredModels = parsed;
+        }
+        catch {
+            // The remote endpoint catalog can still be useful when the Pi CLI is temporarily unavailable.
+        }
     }
-    catch {
+    const endpointModels = options.piEndpointDiscovery?.enabled
+        ? await discoverPiEndpointModels({
+            agentDir: options.piEndpointDiscovery.agentDir,
+            env,
+            fetchImpl: options.piEndpointDiscovery.fetchImpl,
+        })
+        : [];
+    if (!configuredModels.length && !endpointModels.length)
         return { ok: false };
+    return { ok: true, value: mergePiModelCatalog(configuredModels, endpointModels) };
+}
+function mergePiModelCatalog(configuredModels, endpointModels) {
+    const defaultModel = configuredModels.find((model) => model.id === "default")
+        ?? cloneModels(PI_FALLBACK_MODELS)[0];
+    const models = new Map();
+    for (const model of configuredModels) {
+        if (model.id !== "default")
+            models.set(model.id, model);
+    }
+    for (const model of endpointModels) {
+        if (model.id !== "default" && !models.has(model.id))
+            models.set(model.id, model);
     }
+    return [defaultModel, ...models.values()];
 }
 /** 从 CLI 的 help / 非法档位报错里抽出 `low, medium, high` 这种列表。 */
 export function parseCliEffortList(text) {
@@ -1025,7 +1053,7 @@ async function discoverModelCache(options, previous) {
         probeOpenCode(runner, env),
         probeGrokModels(runner, env),
         probeQoderModels(runner, env),
-        probePiModels(runner, env),
+        probePiModels(runner, env, options),
         listClaudeModelsFromApi(options, env),
         probeEffortList(runner, env, "claude", ["--effort", "__wand_probe__", "--help"]),
         probeEffortList(runner, env, "grok", ["--effort", "__wand_probe__", "-p", "x", "--output-format", "streaming-json", "--max-turns", "1"]),

package/dist/pi-model-discovery.d.ts

@@ -0,0 +1,12 @@
+import type { ClaudeModelInfo } from "./types.js";
+export interface PiModelEndpointDiscoveryOptions {
+    /** Defaults to PI_CODING_AGENT_DIR or ~/.pi/agent. */
+    agentDir?: string;
+    env?: NodeJS.ProcessEnv;
+    fetchImpl?: typeof fetch;
+}
+/**
+ * Discovers additional chat model IDs exposed by the API endpoints configured in Pi's models.json.
+ * The endpoint's key stays in memory and is never returned, logged, or persisted in the model catalog.
+ */
+export declare function discoverPiEndpointModels(options?: PiModelEndpointDiscoveryOptions): Promise<ClaudeModelInfo[]>;