larkin 0.4.29 → 0.5.1

package/dist/runtime/runtime-readiness.mjs

@@ -1,11 +1,7 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
-import { resolveConfigDir as resolveRootConfigDir } from "../platform/root-layout.mjs";
-import { applyPiPackageDirForChild, piChildDistributionFromOverrides } from "./builtin-pi-assets.mjs";
-import { assertBuiltinPiAgentDirectory, BUNDLED_PI_VERSION, builtinPiProviderRecoveryNextAction, ownedPiCatalogAgentDir, piAgentDirectory } from "./pi-provider-config.mjs";
-import { traceProcessBoundary } from "../platform/process-boundary-trace.mjs";
+import { MINIMUM_PI_VERSION, parsePiExecutableVersion } from "./pi-compaction-recovery.mjs";
 export function safeProviderId(value) {
     const provider = typeof value === "string" ? value.trim() : "";
     return /^[A-Za-z0-9][A-Za-z0-9._-]{0,79}$/.test(provider) ? provider : null;
@@ -13,9 +9,6 @@ export function safeProviderId(value) {
 function safeProviderLabel(value) {
     return safeProviderId(value);
 }
-export function isBuiltinPiDistribution(value) {
-    return value === "builtin";
-}
 /** Model ids are `provider/model`; only the provider prefix is used for scope. */
 export function configuredProviderId(model) {
     const value = typeof model === "string" ? model.trim() : "";
@@ -38,53 +31,20 @@ export function parsePersistedAuthFailure(state) {
         const provider = safeProviderId(failure.provider);
         if (kind === "missing-provider" && !provider)
             return null;
-        const piDistribution = failure.piDistribution === "builtin" || failure.piDistribution === "external"
-            ? failure.piDistribution : undefined;
-        return {
-            kind,
-            runtime,
-            ...(piDistribution ? { piDistribution } : {}),
-            provider,
-        };
+        return { kind, runtime, provider };
     }
     const legacy = safeProviderId(record.authFailureProvider);
-    return legacy
-        ? { kind: "missing-provider", runtime: "pi", piDistribution: "builtin", provider: legacy }
-        : null;
+    return legacy ? { kind: "missing-provider", runtime: "pi", provider: legacy } : null;
 }
 function currentAdapterId(current) {
-    return current.adapterId ?? (current.runtime === "builtin-pi" ? "pi" : current.runtime);
-}
-function currentIsBuiltinPi(current) {
-    return currentAdapterId(current) === "pi"
-        && (isBuiltinPiDistribution(current.piDistribution) || current.runtime === "builtin-pi");
+    return current.adapterId ?? current.runtime;
 }
-/**
- * Missing-provider and known-provider generic markers apply only to that provider.
- * Generic without a provider is conservative fallback: it still binds runtime /
- * builtin distribution, but cannot reject an A→B model switch because the
- * upstream provider was genuinely unavailable.
- */
 export function authFailureAppliesTo(current, failure) {
-    if (failure.kind === "missing-provider") {
-        return currentIsBuiltinPi(current)
-            && failure.runtime === "pi"
-            && failure.piDistribution === "builtin"
-            && Boolean(failure.provider)
-            && configuredProviderId(current.model) === failure.provider;
-    }
     if (failure.runtime !== currentAdapterId(current))
         return false;
-    if (failure.runtime === "pi") {
-        const persistedBuiltin = failure.piDistribution === "builtin";
-        if (currentIsBuiltinPi(current) !== persistedBuiltin)
-            return false;
-    }
     if (!failure.provider)
         return true;
     const currentProvider = configuredProviderId(current.model);
-    if (currentIsBuiltinPi(current))
-        return currentProvider === failure.provider;
     return currentProvider ? currentProvider === failure.provider : true;
 }
 export function readinessForPersistedAuthFailure(failure) {
@@ -103,6 +63,20 @@ export function classifyPiMissingCredentialRejection(message) {
     const provider = match ? safeProviderLabel(match[2]) : null;
     return provider && match ? { provider, diagnostic: `${match[1]} ${provider}` } : null;
 }
+export function runtimeInstallNextAction(runtime) {
+    if (runtime === "pi")
+        return "Install Pi and ensure `pi` is on PATH, or set LARKIN_PI_COMMAND.";
+    if (runtime === "codex")
+        return "Install Codex and ensure `codex` is on PATH, or set LARKIN_CODEX_COMMAND.";
+    return "Install Claude Code and ensure `claude` is on PATH, or set LARKIN_CLAUDE_COMMAND.";
+}
+export function runtimeLoginNextAction(runtime) {
+    if (runtime === "pi")
+        return "Log in with the external `pi` CLI, then retry.";
+    if (runtime === "codex")
+        return "Run `codex login`, then retry.";
+    return "Run `claude login`, then retry.";
+}
 export function providerAuthenticationFailureReadiness(runtime, provider) {
     const label = safeProviderLabel(provider);
     return {
@@ -111,23 +85,20 @@ export function providerAuthenticationFailureReadiness(runtime, provider) {
         reason: label
             ? `Provider ${label} API-key authentication failed during a Runtime turn.`
             : "Configured provider API-key authentication failed during a Runtime turn.",
-        nextAction: "Check the provider login or API-key resolver command, then retry the Agent turn.",
+        nextAction: runtimeLoginNextAction(runtime),
     };
 }
-/** P0 分类；Pi nextAction 共用 UX preset 恢复文案，不写官方 provider ID。 */
 export function missingProviderCredentialReadiness(runtime, provider) {
     const label = safeProviderLabel(provider);
     return {
         runtime,
         state: "unauthenticated",
         reason: label
-            ? `Provider ${label} is missing from this Agent's official credential store.`
-            : "The configured provider is missing from this Agent's official credential store.",
-        nextAction: runtime === "pi"
-            ? builtinPiProviderRecoveryNextAction({ providerId: label ?? undefined })
-            : label
-                ? `Add the missing ${label} credential to this Agent's official store, then retry the Agent turn.`
-                : "Add the missing provider credential to this Agent's official store, then retry the Agent turn.",
+            ? `Provider ${label} is not authenticated for this runtime.`
+            : "The configured provider is not authenticated for this runtime.",
+        nextAction: runtime === "pi" && label
+            ? `Log in with the external \`pi\` CLI for provider ${label}, then retry.`
+            : runtimeLoginNextAction(runtime),
     };
 }
 export class RuntimePrerequisiteError extends Error {
@@ -159,27 +130,37 @@ export function classifyRuntimePrerequisite(runtime, error, executable) {
     const reason = (error instanceof Error ? error.message : String(error)).replace(/[\r\n]+/g, " ").slice(0, 500);
     if (/ENOENT|not found|no such file|spawn .* failed/i.test(reason))
         return {
-            runtime, state: "missing", ...(executable ? { executable } : {}), reason,
-            nextAction: runtime === "pi" ? "Install Pi and ensure `pi` is on PATH, or set LARKIN_PI_COMMAND." : `Install ${runtime} and ensure it is on PATH.`,
+            runtime, state: "missing", ...(executable ? { executable } : {}),
+            reason: `${runtime} is not installed`,
+            nextAction: runtimeInstallNextAction(runtime),
         };
     if (/no authenticated available models|login|credential|unauthenticated|unauthorized|oauth/i.test(reason))
         return {
             runtime, state: "unauthenticated", ...(executable ? { executable } : {}), reason,
-            // 此分类没有 distribution：外部 Pi 不能指向 Dashboard / pi-auth login。
+            nextAction: runtimeLoginNextAction(runtime),
+        };
+    if (/older than the minimum|not a supported version(?: line)?|version output must contain exactly one/i.test(reason)) {
+        return {
+            runtime, state: "incompatible", ...(executable ? { executable } : {}), reason,
             nextAction: runtime === "pi"
-                ? "Run the official `pi` login flow, then retry."
-                : `Authenticate ${runtime}, then retry.`,
+                ? `Upgrade pi to ${MINIMUM_PI_VERSION} or newer`
+                : `Upgrade ${runtime}, then retry.`,
         };
-    if (/protocol (?:version )?(?:mismatch|unsupported|incompatible)|unsupported (?:rpc|protocol|schema)|schema (?:mismatch|incompatible)|requires (?:a )?newer version/i.test(reason))
+    }
+    if (/protocol (?:version )?(?:mismatch|unsupported|incompatible)|unsupported (?:rpc|protocol|schema)|schema (?:mismatch|incompatible)|requires (?:a )?newer version/i.test(reason)) {
         return {
             runtime, state: "incompatible", ...(executable ? { executable } : {}), reason,
-            nextAction: runtime === "pi" ? "Upgrade local Pi to a version that supports the documented RPC protocol." : `Upgrade ${runtime}, then retry.`,
+            nextAction: runtime === "pi"
+                ? "Upgrade local Pi to a version that supports the documented RPC protocol."
+                : `Upgrade ${runtime}, then retry.`,
         };
-    if (/timeout|timed out|unexpected EOF|\bEOF\b|TLS|ECONNRESET|socket hang up|network|temporar(?:y|ily)|unavailable/i.test(reason))
+    }
+    if (/timeout|timed out|unexpected EOF|\bEOF\b|TLS|ECONNRESET|socket hang up|network|temporar(?:y|ily)|unavailable/i.test(reason)) {
         return {
             runtime, state: "unavailable", ...(executable ? { executable } : {}), reason,
             nextAction: `Retry ${runtime}; Larkin will use its bounded Runtime recreate/backoff policy.`,
         };
+    }
     return {
         runtime, state: "unavailable", ...(executable ? { executable } : {}), reason,
         nextAction: `Retry ${runtime}; the failure is not proven to be a protocol incompatibility.`,
@@ -202,47 +183,30 @@ function executableVersion(executable, env, commandArgs = []) {
 }
 /** Resolve and handshake through each runtime's structured native control protocol. */
 export async function probeNativeRuntimeReadiness(options) {
-    let env = { ...process.env, ...options.env };
-    const piDistribution = options.runtime === "pi" ? piChildDistributionFromOverrides(options.env) : "external";
-    if (options.runtime === "pi" && piDistribution !== "builtin") {
-        if (env.LARKIN_PI_DISTRIBUTION === "builtin")
-            delete env.LARKIN_PI_DISTRIBUTION;
-        env = applyPiPackageDirForChild(env, { distribution: "external" });
+    const env = { ...process.env, ...options.env };
+    const command = selectedCommand(options);
+    const executable = resolveRuntimeExecutable(command, env);
+    if (!executable) {
+        return {
+            runtime: options.runtime,
+            state: "missing",
+            reason: `${options.runtime} is not installed`,
+            nextAction: runtimeInstallNextAction(options.runtime),
+        };
     }
-    if (options.runtime === "pi" && piDistribution === "builtin") {
+    let version = executableVersion(executable, env, options.commandArgs);
+    if (options.runtime === "pi") {
         try {
-            if (!options.agentId || !env.LARKIN_CONFIG_DIR)
-                throw new Error("内置 Pi readiness 缺少 Agent/config identity");
-            assertBuiltinPiAgentDirectory(piAgentDirectory(env.LARKIN_CONFIG_DIR, options.agentId));
-            return { runtime: "pi", state: "ready", executable: process.execPath, version: `official-pi ${BUNDLED_PI_VERSION} (bundled)` };
+            const probe = spawnSync(executable, [...options.commandArgs ?? [], "--version"], {
+                env, encoding: "utf8", timeout: 5_000, maxBuffer: 64 * 1024,
+            });
+            version = parsePiExecutableVersion(String(probe.stdout || ""));
         }
         catch (error) {
-            traceProcessBoundary(env, "readiness:builtin-pi-failure", { configDir: env.LARKIN_CONFIG_DIR, agentId: options.agentId, targetDir: options.agentId && env.LARKIN_CONFIG_DIR ? piAgentDirectory(env.LARKIN_CONFIG_DIR, options.agentId) : undefined, error });
-            return { runtime: "pi", state: "unauthenticated", reason: error instanceof Error ? error.message : String(error),
-                nextAction: builtinPiProviderRecoveryNextAction({ agentId: options.agentId }) };
+            const classified = classifyRuntimePrerequisite("pi", error, executable);
+            return { ...classified, executable, ...(version ? { version } : {}) };
         }
     }
-    const command = selectedCommand(options);
-    const executable = resolveRuntimeExecutable(command, env);
-    if (!executable)
-        return {
-            runtime: options.runtime, state: "missing",
-            reason: `${command} executable was not found`,
-            nextAction: options.runtime === "pi"
-                ? "Install Pi and ensure `pi` is on PATH, or set LARKIN_PI_COMMAND."
-                : `Install ${options.runtime} and ensure it is on PATH.`,
-        };
-    const piAgentId = options.agentId;
-    if (options.runtime === "pi" && !piAgentId) {
-        return {
-            runtime: "pi",
-            state: "unavailable",
-            executable,
-            reason: "Pi catalog readiness requires Agent ID",
-            nextAction: "Retry setup or start so Larkin can probe the Agent-owned Pi provider directory.",
-        };
-    }
-    const version = executableVersion(executable, env, options.commandArgs);
     try {
         if (options.runtime === "pi") {
             const { discoverPiModelCatalog } = await import("./pi-model-catalog.mjs");
@@ -251,7 +215,6 @@ export async function probeNativeRuntimeReadiness(options) {
                 command: executable,
                 commandArgs: options.commandArgs,
                 env,
-                agentDir: ownedPiCatalogAgentDir(resolveRootConfigDir(env, os.homedir()), piAgentId),
             });
         }
         else if (options.runtime === "codex") {

package/dist/runtime/user-runtime.cjs

@@ -7,45 +7,28 @@ exports.runtimeOptionOf = runtimeOptionOf;
 exports.toUserRuntime = toUserRuntime;
 exports.runtimeOptionTarget = runtimeOptionTarget;
 exports.fromUserRuntime = fromUserRuntime;
-exports.piCatalogDistributionForUserRuntime = piCatalogDistributionForUserRuntime;
-exports.RUNTIME_OPTIONS = ["codex", "claude", "pi", "builtin-pi"];
+exports.RUNTIME_OPTIONS = ["codex", "claude", "pi"];
 exports.USER_RUNTIMES = exports.RUNTIME_OPTIONS;
 exports.ADAPTER_RUNTIMES = ["pi", "codex", "claude"];
 function isUserRuntime(value) {
-    return value === "pi" || value === "builtin-pi" || value === "codex" || value === "claude";
+    return value === "pi" || value === "codex" || value === "claude";
 }
 function isAdapterRuntime(value) {
     return value === "pi" || value === "codex" || value === "claude";
 }
-/** Project stored adapter + distribution to the user-facing sibling id. Legacy `runtime=pi` without distribution is `pi`, never builtin. */
+/** Identity mapping with validation. */
 function runtimeOptionOf(input) {
-    const { runtime, piDistribution } = input;
-    if (runtime === "codex" || runtime === "claude" || runtime === "builtin-pi")
-        return runtime;
-    if (runtime === "pi")
-        return piDistribution === "builtin" ? "builtin-pi" : "pi";
-    return runtime;
+    return input.runtime;
 }
-function toUserRuntime(runtime, piDistribution) {
-    return runtimeOptionOf({ runtime, piDistribution });
+function toUserRuntime(runtime) {
+    return runtimeOptionOf({ runtime });
 }
-/** Persist a user-facing sibling as adapter id + distribution. Adapter id stays `pi` for both Pi siblings. */
+/** Persist a user-facing runtime as the stored adapter id. */
 function runtimeOptionTarget(option) {
     if (!isUserRuntime(option))
         throw new Error(`未知 runtime：${option}`);
-    if (option === "builtin-pi")
-        return { runtime: "pi", piDistribution: "builtin" };
-    if (option === "pi")
-        return { runtime: "pi", piDistribution: "external" };
     return { runtime: option };
 }
 function fromUserRuntime(userRuntime) {
     return runtimeOptionTarget(userRuntime);
 }
-function piCatalogDistributionForUserRuntime(userRuntime) {
-    if (userRuntime === "builtin-pi")
-        return "builtin";
-    if (userRuntime === "pi")
-        return "external";
-    throw new Error(`非 Pi sibling runtime：${userRuntime}`);
-}

package/dist/runtime/user-runtime.mjs

@@ -1,41 +1,25 @@
-export const RUNTIME_OPTIONS = ["codex", "claude", "pi", "builtin-pi"];
+export const RUNTIME_OPTIONS = ["codex", "claude", "pi"];
 export const USER_RUNTIMES = RUNTIME_OPTIONS;
 export const ADAPTER_RUNTIMES = ["pi", "codex", "claude"];
 export function isUserRuntime(value) {
-    return value === "pi" || value === "builtin-pi" || value === "codex" || value === "claude";
+    return value === "pi" || value === "codex" || value === "claude";
 }
 export function isAdapterRuntime(value) {
     return value === "pi" || value === "codex" || value === "claude";
 }
-/** Project stored adapter + distribution to the user-facing sibling id. Legacy `runtime=pi` without distribution is `pi`, never builtin. */
+/** Identity mapping with validation. */
 export function runtimeOptionOf(input) {
-    const { runtime, piDistribution } = input;
-    if (runtime === "codex" || runtime === "claude" || runtime === "builtin-pi")
-        return runtime;
-    if (runtime === "pi")
-        return piDistribution === "builtin" ? "builtin-pi" : "pi";
-    return runtime;
+    return input.runtime;
 }
-export function toUserRuntime(runtime, piDistribution) {
-    return runtimeOptionOf({ runtime, piDistribution });
+export function toUserRuntime(runtime) {
+    return runtimeOptionOf({ runtime });
 }
-/** Persist a user-facing sibling as adapter id + distribution. Adapter id stays `pi` for both Pi siblings. */
+/** Persist a user-facing runtime as the stored adapter id. */
 export function runtimeOptionTarget(option) {
     if (!isUserRuntime(option))
         throw new Error(`未知 runtime：${option}`);
-    if (option === "builtin-pi")
-        return { runtime: "pi", piDistribution: "builtin" };
-    if (option === "pi")
-        return { runtime: "pi", piDistribution: "external" };
     return { runtime: option };
 }
 export function fromUserRuntime(userRuntime) {
     return runtimeOptionTarget(userRuntime);
 }
-export function piCatalogDistributionForUserRuntime(userRuntime) {
-    if (userRuntime === "builtin-pi")
-        return "builtin";
-    if (userRuntime === "pi")
-        return "external";
-    throw new Error(`非 Pi sibling runtime：${userRuntime}`);
-}

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)