larkin 0.4.29 → 0.5.0

package/dist/setup/bot-register.mjs

@@ -12,10 +12,7 @@ import { createAgentStateStore } from "../agent/agent-state-store.mjs";
 import { hydrateRuntimeAgent, syncAgentProfile, syncAgentProfileAsync } from "../app/runtime-agent-config.mjs";
 import { managedLarkCliEnv } from "../app/agent-lark-cli-workspace.mjs";
 import { resolveOfficialLarkCli } from "../app/official-lark-cli.mjs";
-import { collectSetupAgentChoice, recoverUnavailableExternalPi, terminalSetupQuestioner } from "./setup-agent-choice.mjs";
-import { probeNativeRuntimeReadiness } from "../runtime/runtime-readiness.mjs";
-import { configureBuiltinPiProviderModel, stageBuiltinPiProvider, validatePiBaseUrl, validateBuiltinPiProviderSelection, listProviderModels, PI_PROVIDER_PRESETS } from "../runtime/pi-provider-config.mjs";
-import { beginBuiltinPiCredentialTransaction, createOfficialPiCredentialRuntime, createOfficialPiAuthInteraction, createOfficialPiModelRuntime, createOfficialPiLogoutRuntime, createOfficialPiRegistryRuntime, listOfficialPiAuthProviders, logoutOfficialPiProvider, officialPiAuthStatus, runOfficialPiLogin, verifyOfficialPiProviderTurn, } from "../runtime/pi-official-auth.mjs";
+import { collectSetupAgentChoice, missingRuntimeInstallMessage, terminalSetupQuestioner } from "./setup-agent-choice.mjs";
 import { documentCommentSubscriptionCapability, markDocumentCommentSubscriptionVerified, } from "../platform/callback-capability.mjs";
 import { openPlatformHost, parseLarkinTenant, registerAppAccountsHost, } from "../feishu/platform-hosts.mjs";
 import { authorizationUrlFailureMessage, presentAuthorizationUrl } from "./setup-authorization-url.mjs";
@@ -35,7 +32,6 @@ const resolveOfficialCli = testFixture?.resolveOfficialLarkCli ?? resolveOfficia
 const wait = testFixture?.wait ?? ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
 const CFG_DIR = larkinConfig.resolveConfigDir(process.env);
 let temporaryAgentChoiceFile = null;
-let pendingPiAuthTransaction = null;
 let pendingBindChild = null;
 let pendingChildSettled = null;
 let settlePendingChild = null;
@@ -54,7 +50,6 @@ function trackPendingChild(child) {
     pendingChildSettled = null;
 }
 process.on("exit", () => {
-    pendingPiAuthTransaction?.rollback();
     if (!temporaryAgentChoiceFile)
         return;
     try {
@@ -70,8 +65,6 @@ for (const signal of ["SIGINT", "SIGTERM"]) {
         const settling = pendingChildSettled;
         shutdownController.abort(new Error(`setup interrupted by ${signal}`));
         void (settling ?? Promise.resolve()).finally(() => {
-            pendingPiAuthTransaction?.rollback();
-            pendingPiAuthTransaction = null;
             process.exit(signal === "SIGINT" ? 130 : 143);
         });
     });
@@ -99,8 +92,6 @@ const CHILD_MAX_OUTPUT_BYTES = Number.isFinite(testChildMaxOutput) && testChildM
 function officialCliForProfile(env) {
     if (resolvedSetupOfficialCli)
         return resolvedSetupOfficialCli;
-    if (pendingPiAuthTransaction)
-        throw new Error("official lark-cli must be resolved before the Pi credential transaction starts");
     resolvedSetupOfficialCli = resolveOfficialCli({ env });
     return resolvedSetupOfficialCli;
 }
@@ -304,7 +295,7 @@ function openBrowser(url) {
     }
 }
 async function runBindProcess(command, args) {
-    if (testFixture?.spawnSync && !pendingPiAuthTransaction) {
+    if (testFixture?.spawnSync) {
         return spawnSync(command, [...args], { env: process.env, stdio: "inherit" }).status;
     }
     return await new Promise((resolve, reject) => {
@@ -336,7 +327,7 @@ async function runBindProcess(command, args) {
     }).finally(() => { trackPendingChild(null); });
 }
 async function runBoundedCliProcess(command, args, env, label) {
-    if (testFixture?.spawnSync && !pendingPiAuthTransaction && process.env.LARKIN_TEST_ASYNC_IDENTITY !== "1") {
+    if (testFixture?.spawnSync && process.env.LARKIN_TEST_ASYNC_IDENTITY !== "1") {
         const result = spawnSync(command, [...args], { encoding: "utf8", env });
         return { status: result.status, stdout: result.stdout || "", stderr: result.stderr || "" };
     }
@@ -643,128 +634,30 @@ Lark 必须用 --tenant lark：授权二维码是官方 /page/cli（begin 仍走
         : commentSubscription === "none" || !priorSubscription
             ? { mode: "none", status: "safe-default", source: "setup-default", updatedAt: requestedAt }
             : priorSubscription;
+    if (flag("--provider") || flag("--api-key") || flag("--base-url") || flag("--pi-distribution")) {
+        die("setup 不再接受 --provider/--api-key/--base-url；请安装并登录外部 pi、codex 或 claude");
+    }
     const injectedAgentChoice = testFixture?.collectSetupAgentChoice;
     if (!flag("--runtime") && (!testFixture || injectedAgentChoice || process.env.LARKIN_TEST_ENABLE_AGENT_CHOICE === "1")) {
         const existing = larkinConfig.loadConfig(process.env).config.agents[id];
-        // The official resolver performs a synchronous login-shell probe. Resolve it
-        // exactly once before the credential heartbeat lock becomes active.
         resolvedSetupOfficialCli = resolveOfficialCli({ env: process.env });
         const questioner = injectedAgentChoice ? { ask: async () => "", secret: async () => "" } : terminalSetupQuestioner();
-        // One setup-owned transaction starts before status/logout and remains active
-        // through selection, login, bind, readiness, and the final setup commit.
-        pendingPiAuthTransaction = beginBuiltinPiCredentialTransaction(CFG_DIR, id);
-        const authServices = {
-            providers: async () => listOfficialPiAuthProviders(await createOfficialPiRegistryRuntime()),
-            status: async () => officialPiAuthStatus(await createOfficialPiCredentialRuntime(CFG_DIR, id)),
-            logout: async (providerId) => logoutOfficialPiProvider(await createOfficialPiLogoutRuntime(CFG_DIR, id), providerId),
-            report: (message) => say(message),
-        };
         try {
-            const requested = injectedAgentChoice
-                ? await injectedAgentChoice()
-                : await collectSetupAgentChoice(questioner, existing, authServices);
             const choice = injectedAgentChoice
-                ? requested
-                : await recoverUnavailableExternalPi(requested, questioner, () => probeNativeRuntimeReadiness({
-                    runtime: "pi", agentId: id, cwd: path.join(CFG_DIR, "agents", id),
-                    env: { ...process.env, LARKIN_CONFIG_DIR: CFG_DIR, LARKIN_PI_DISTRIBUTION: "external" },
-                }), (message) => say(`! ${message}`), authServices);
+                ? await injectedAgentChoice()
+                : await collectSetupAgentChoice(questioner, existing);
             if (choice) {
-                let serializedChoice = choice;
-                if (choice.runtime === "pi" && choice.distribution === "builtin") {
-                    if (!injectedAgentChoice) {
-                        const official = choice.preset === "official" ? choice : null;
-                        const configured = official ? null : configureBuiltinPiProviderModel(CFG_DIR, id, choice);
-                        const providerId = official?.providerId || configured.provider;
-                        const authType = official?.authType || "api_key";
-                        let piRuntime;
-                        try {
-                            say(`正在通过捆绑官方 Pi 登录 ${providerId}（${authType}）…`);
-                            piRuntime = await createOfficialPiModelRuntime(CFG_DIR, id);
-                            await runOfficialPiLogin(piRuntime, providerId, authType, createOfficialPiAuthInteraction({ questioner, report: (message) => say(message), openUrl: openBrowser }));
-                        }
-                        catch {
-                            pendingPiAuthTransaction.rollback();
-                            pendingPiAuthTransaction = null;
-                            throw new Error(`官方 Pi ${providerId} 登录失败或已取消；credential/config 未修改`);
-                        }
-                        if (process.env.LARKIN_TEST_SKIP_BUILTIN_PI_PROVIDER_TURN !== "1") {
-                            say("正在验证内置 Pi provider（受控单轮，不发送飞书（Lark）消息）…");
-                            try {
-                                await verifyOfficialPiProviderTurn(piRuntime, choice.model);
-                            }
-                            catch {
-                                pendingPiAuthTransaction.rollback();
-                                pendingPiAuthTransaction = null;
-                                throw new Error(`官方 Pi ${providerId} readiness 失败；credential/config 未修改`);
-                            }
-                        }
-                    }
-                    serializedChoice = { ...choice, authCompleted: true, readinessCompleted: true };
-                }
+                const missing = missingRuntimeInstallMessage(choice.runtime, process.env);
+                if (missing)
+                    die(missing);
                 temporaryAgentChoiceFile = path.join(CFG_DIR, `.setup-agent-choice-${process.pid}-${Date.now()}.json`);
-                fs.writeFileSync(temporaryAgentChoiceFile, `${JSON.stringify(serializedChoice)}\n`, { mode: 0o600, flag: "wx" });
+                fs.writeFileSync(temporaryAgentChoiceFile, `${JSON.stringify({ runtime: choice.runtime })}\n`, { mode: 0o600, flag: "wx" });
             }
         }
         finally {
             questioner.close?.();
         }
     }
-    // ── 非交互参数化内置 Pi（builtin-pi 是默认 runtime 类型）──
-    // --pi-distribution builtin：需 --provider <id> + --api-key <key>（或 --base-url 自定义端点）。
-    const piDistributionFlag = flag("--pi-distribution");
-    const setupProvider = flag("--provider");
-    const setupApiKey = flag("--api-key");
-    const setupBaseUrl = flag("--base-url");
-    const setupModel = flag("--model");
-    if (piDistributionFlag === "builtin") {
-        if (!setupProvider && !setupBaseUrl) {
-            throw new Error(`builtin-pi 需要 --provider <id>（${PI_PROVIDER_PRESETS.map((p) => p.id).join("|")}|custom）或 --base-url；或改用 --runtime pi 使用已有 pi 环境`);
-        }
-        if (!setupApiKey)
-            throw new Error("builtin-pi 需要 --api-key；或改用 --runtime pi 使用已有 pi 登录");
-        // 自定义网关（--base-url）走 custom 预设：pi 会把 baseUrl 作为 provider 端点写入配置，
-        // 而不是用预设厂商目录（否则会打到预设默认地址，如 api.openai.com）。
-        const presetId = setupBaseUrl ? "custom" : (setupProvider ?? "custom");
-        if (presetId === "custom" && !setupModel)
-            throw new Error("custom base-url 需要 --model <模型名>");
-        const presetDef = PI_PROVIDER_PRESETS.find((p) => p.id === presetId);
-        if (!presetDef && !setupBaseUrl)
-            throw new Error(`未知 provider \`${presetId}\`；可选：${PI_PROVIDER_PRESETS.map((p) => p.id).join(" | ")} | custom`);
-        const raw = {
-            distribution: "builtin",
-            preset: presetId,
-            model: setupModel ?? presetDef?.defaultModel ?? "",
-            // 显式 --base-url 优先于预设默认值（自定义网关场景，如 opencode）。
-            ...(setupBaseUrl ? { baseUrl: validatePiBaseUrl(setupBaseUrl) } : presetDef ? { baseUrl: presetDef.baseUrl } : {}),
-        };
-        if (setupModel && raw.baseUrl) {
-            // Owner 决策：模型名必须来自 provider 的权威可用列表，输错即报错，不做运行时猜测。
-            // 网络超时/不可达时不阻塞 setup（null），运行时对账会严格兜底。
-            const availableIds = await listProviderModels(raw.baseUrl, setupApiKey);
-            if (availableIds !== null) {
-                const matched = availableIds.some((id) => id === setupModel || id.endsWith(`/${setupModel}`));
-                if (!matched) {
-                    const preview = availableIds.slice(0, 12).join(", ") + (availableIds.length > 12 ? ", …" : "");
-                    throw new Error(`未知模型 ${setupModel}；provider 可用模型：[${preview || "无"}]`);
-                }
-            }
-            else {
-                say("[setup] 网络暂不可达，跳过 /models 预校验；运行时将对模型严格对账");
-            }
-        }
-        stageBuiltinPiProvider(CFG_DIR, id, { ...raw, apiKey: setupApiKey });
-        // 选择文件写入解析后的全称模型（custom 预设为 larkin-custom/<model>）：
-        // pi 运行时按 provider 前缀解析凭证，裸模型名会回落到默认 provider（deepseek）
-        // 导致「No API key found for deepseek」。
-        const validated = validateBuiltinPiProviderSelection({ ...raw, apiKey: setupApiKey });
-        temporaryAgentChoiceFile = path.join(CFG_DIR, `.setup-agent-choice-${process.pid}-${Date.now()}.json`);
-        fs.writeFileSync(temporaryAgentChoiceFile, `${JSON.stringify({ ...raw, runtime: "pi", model: validated.model, authCompleted: true, readinessCompleted: true })}\n`, { mode: 0o600, flag: "wx" });
-        say(`[setup 2/5] ✓ 内置 Pi provider 已配置（${presetId}${setupBaseUrl ? " / custom" : ""}）`);
-    }
-    else if (piDistributionFlag === "external" && (setupProvider || setupApiKey || setupBaseUrl)) {
-        throw new Error("pi 使用已有 pi 环境与登录，不接受 --provider/--api-key/--base-url");
-    }
     const stagedBotFile = path.join(botsDir, `.${id}.${process.pid}.tmp`);
     try {
         fs.writeFileSync(stagedBotFile, `${JSON.stringify({
@@ -811,13 +704,14 @@ Lark 必须用 --tenant lark：授权二维码是官方 /page/cli（begin 仍走
     const runtime = flag("--runtime");
     if (runtime)
         bindArgs.push("--runtime", runtime);
+    const model = flag("--model");
+    if (model)
+        bindArgs.push("--model", model);
     if (temporaryAgentChoiceFile)
         bindArgs.push("--selection-file", temporaryAgentChoiceFile);
     const bindSpec = internalCommandSpec("setup-bind", bindArgs, process.env);
     const bindStatus = await runBindProcess(bindSpec.command, bindSpec.args);
     if (bindStatus !== 0) {
-        pendingPiAuthTransaction?.rollback();
-        pendingPiAuthTransaction = null;
         die("新 bot 凭证已发布但 Agent 绑定失败；权威凭证状态已保留，请重跑 larkin setup 并在网页中重新选择机器人");
     }
     try {
@@ -943,8 +837,6 @@ Lark 必须用 --tenant lark：授权二维码是官方 /page/cli（begin 仍走
             die("Agent 绑定与新 bot 凭证已保留，但 setup 结果写入失败；请重跑 larkin setup 并在网页中重新选择机器人");
         }
     }
-    pendingPiAuthTransaction?.commit();
-    pendingPiAuthTransaction = null;
 }
 if (path.resolve(process.argv[1] || "") === path.resolve(fileURLToPath(import.meta.url))) {
     main().catch((error) => { if (!requestedShutdown)

package/dist/setup/setup-agent-choice.mjs

@@ -1,92 +1,66 @@
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
-import { toUserRuntime } from "../runtime/user-runtime.mjs";
-import { PI_PROVIDER_PRESETS, resolveBuiltinPiProviderSetupSelection, } from "../runtime/pi-provider-config.mjs";
+import { RUNTIME_OPTIONS, toUserRuntime } from "../runtime/user-runtime.mjs";
+import { resolveRuntimeExecutable, runtimeInstallNextAction } from "../runtime/runtime-readiness.mjs";
+function runtimeCommand(runtime, env) {
+    if (runtime === "pi")
+        return env.LARKIN_PI_COMMAND || "pi";
+    if (runtime === "codex")
+        return env.LARKIN_CODEX_COMMAND || "codex";
+    return env.LARKIN_CLAUDE_COMMAND || "claude";
+}
+export function listRuntimeInstallStatuses(env = process.env) {
+    return RUNTIME_OPTIONS.map((runtime) => {
+        if (resolveRuntimeExecutable(runtimeCommand(runtime, env), env))
+            return { runtime, installed: true };
+        return {
+            runtime,
+            installed: false,
+            reason: `${runtime} is not installed`,
+            nextAction: runtimeInstallNextAction(runtime),
+        };
+    });
+}
+export function missingRuntimeInstallMessage(runtime, env = process.env) {
+    if (runtime !== "pi" && runtime !== "codex" && runtime !== "claude")
+        return null;
+    const status = listRuntimeInstallStatuses(env).find((entry) => entry.runtime === runtime);
+    if (!status || status.installed)
+        return null;
+    return `${status.reason}；${status.nextAction}`;
+}
+const RUNTIME_LABELS = {
+    pi: "pi（本机官方 pi CLI）",
+    codex: "Codex",
+    claude: "Claude Code",
+};
 function number(value, fallback, max) {
     const parsed = value.trim() ? Number(value.trim()) : fallback;
     if (!Number.isInteger(parsed) || parsed < 1 || parsed > max)
         throw new Error(`请选择 1-${max}`);
     return parsed;
 }
-export async function collectBuiltinPiChoice(questioner, services) {
-    const lines = PI_PROVIDER_PRESETS.map((preset, index) => `  ${index + 1}. ${preset.name} — ${preset.baseUrl}`).join("\n");
-    const providerChoice = number(await questioner.ask(`选择模型服务 / 认证：\n${lines}\n  5. Custom OpenAI-compatible\n  6. 官方 Pi provider 登录（API Key / OAuth / subscription）\n  7. 查看或退出已有官方 Pi 认证\n> `), 1, 7);
-    if (providerChoice === 7) {
-        if (!services)
-            throw new Error("当前 setup 上下文无法管理官方 Pi 认证");
-        const status = await services.status();
-        if (status.length === 0)
-            services.report("尚无已配置的官方 Pi credential");
-        else
-            status.forEach((entry, index) => services.report(`  ${index + 1}. ${entry.providerName} (${entry.providerId}) — ${entry.credentialType}/${entry.source}${entry.stored ? "，已存储" : "，ambient"}`));
-        const answer = (await questioner.ask("输入要 logout 的序号；直接回车返回：")).trim();
-        if (answer) {
-            const selected = number(answer, 0, status.length);
-            await services.logout(status[selected - 1].providerId);
-            services.report(`已退出 ${status[selected - 1].providerName}；未修改其他 provider`);
-        }
-        return collectBuiltinPiChoice(questioner, services);
-    }
-    if (providerChoice === 6) {
-        if (!services)
-            throw new Error("当前 setup 上下文无法读取官方 Pi auth registry");
-        const providers = await services.providers();
-        const methods = providers.flatMap((provider) => provider.methods.map((method) => ({ provider, method })));
-        if (methods.length === 0)
-            throw new Error("捆绑官方 Pi auth registry 没有可交互登录方式");
-        const methodLines = methods.map(({ provider, method }, index) => `  ${index + 1}. ${provider.name} — ${method.name} [${method.type}]`).join("\n");
-        const methodChoice = number(await questioner.ask(`选择官方 Pi 登录方式：\n${methodLines}\n> `), 1, methods.length);
-        const selected = methods[methodChoice - 1];
-        const defaultModel = selected.provider.models[0] || "";
-        const model = (await questioner.ask(`模型 ID${defaultModel ? `（默认 ${defaultModel}）` : "（provider/model）"}：`)).trim() || defaultModel;
-        if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,127}\/[A-Za-z0-9][A-Za-z0-9._:@+\/-]{0,255}$/.test(model))
-            throw new Error("模型 ID 必须是安全的 provider/model");
-        if (!model.startsWith(`${selected.provider.id}/`))
-            throw new Error(`模型 ID 必须属于 ${selected.provider.id}`);
-        return { runtime: "pi", distribution: "builtin", preset: "official", providerId: selected.provider.id,
-            authType: selected.method.type, model };
-    }
-    const preset = providerChoice === 5 ? "custom" : PI_PROVIDER_PRESETS[providerChoice - 1].id;
-    const selected = preset === "custom" ? null : PI_PROVIDER_PRESETS.find((candidate) => candidate.id === preset);
-    const baseUrl = preset === "custom" ? await questioner.ask("Base URL（https；localhost 可用 http）：") : selected.baseUrl;
-    const model = (await questioner.ask(`模型 ID${selected ? `（默认 ${selected.defaultModel}）` : ""}：`)).trim() || selected?.defaultModel || "";
-    const validated = resolveBuiltinPiProviderSetupSelection({ distribution: "builtin", preset, model, ...(baseUrl ? { baseUrl } : {}) });
-    return { runtime: "pi", distribution: "builtin", preset, model: validated.model, ...(preset === "custom" ? { baseUrl: validated.baseUrl } : {}) };
+function formatRuntimeMenu(statuses) {
+    const lines = statuses.map((status, index) => {
+        const mark = status.installed ? "installed" : "not installed";
+        return `  ${index + 1}. ${RUNTIME_LABELS[status.runtime]} [${mark}]`;
+    });
+    return `选择 Agent：\n${lines.join("\n")}\n> `;
 }
-export async function collectSetupAgentChoice(questioner, prior, services) {
+export async function collectSetupAgentChoice(questioner, prior, statuses = listRuntimeInstallStatuses()) {
     if (prior) {
-        const keep = (await questioner.ask(`已有 Agent：${toUserRuntime(prior.runtime, prior.piDistribution)}/${prior.model}。直接回车保留；输入 c 才修改：`)).trim().toLowerCase();
+        const keep = (await questioner.ask(`已有 Agent：${toUserRuntime(prior.runtime)}/${prior.model}。直接回车保留；输入 c 才修改：`)).trim().toLowerCase();
         if (!keep)
             return null;
         if (keep !== "c")
             throw new Error("请输入 c 修改，或直接回车保留现有配置");
     }
-    const runtimeChoice = number(await questioner.ask("选择 Agent：\n  1. builtin-pi（Larkin 捆绑，推荐）\n  2. pi（本机官方 pi CLI）\n  3. Codex\n  4. Claude Code\n> "), 1, 4);
-    if (runtimeChoice === 3)
-        return { runtime: "codex" };
-    if (runtimeChoice === 4)
-        return { runtime: "claude" };
-    if (runtimeChoice === 2)
-        return { runtime: "pi", distribution: "external" };
-    return collectBuiltinPiChoice(questioner, services);
-}
-export async function recoverUnavailableExternalPi(initial, questioner, probe, report = () => { }, services) {
-    let choice = initial;
-    for (let attempt = 1; attempt <= 3; attempt += 1) {
-        if (choice?.runtime !== "pi" || choice.distribution !== "external")
-            return choice;
-        const readiness = await probe();
-        if (readiness.state === "ready")
-            return choice;
-        report(`外置 Pi ${readiness.state}：${readiness.reason || "prerequisite unavailable"}；${readiness.nextAction || "可切换到 builtin-pi"}`);
-        const action = number(await questioner.ask("外置 Pi 当前不可用：\n  1. 切换到 builtin-pi（推荐）\n  2. 重新选择 Agent\n  3. 取消 setup（保留原配置）\n> "), 1, 3);
-        if (action === 1)
-            return collectBuiltinPiChoice(questioner, services);
-        if (action === 3)
-            throw new Error("setup 已取消；未修改 Agent/config");
-        choice = await collectSetupAgentChoice(questioner, undefined, services);
+    const runtimeChoice = number(await questioner.ask(formatRuntimeMenu(statuses)), 1, statuses.length);
+    const selected = statuses[runtimeChoice - 1];
+    if (!selected.installed) {
+        throw new Error(`${selected.reason}；${selected.nextAction}`);
     }
-    throw new Error("外置 Pi 恢复选择已达到 3 次；未修改 Agent/config，请修复后重试");
+    return { runtime: selected.runtime };
 }
 export function terminalSetupQuestioner() {
     let rl = null;
@@ -150,7 +124,7 @@ export function terminalSetupQuestioner() {
                 const onData = (chunk) => {
                     for (const byte of chunk) {
                         if (byte === 3)
-                            return finish(new Error("setup 已取消；未保存 API Key"));
+                            return finish(new Error("setup 已取消；未保存输入"));
                         if (byte === 10 || byte === 13)
                             return finish();
                         if (byte === 8 || byte === 127) {