larkin 0.4.29 → 0.5.0

package/dist/app/agent-cli.mjs

@@ -12,6 +12,8 @@ import { createReminderRoutes } from "../agent/reminder-routes.mjs";
 import { InteractionStateMachine } from "../agent/interaction-state-machine.mjs";
 import { issueCallbackProbe, readCallbackCapability } from "../platform/callback-capability.mjs";
 import { requestAgentUpsert } from "./local-control.mjs";
+import { isUserRuntime } from "../runtime/user-runtime.mjs";
+import { resolveRuntimeExecutable, runtimeInstallNextAction } from "../runtime/runtime-readiness.mjs";
 export { AGENT_CLI_CAPABILITIES } from "../agent/agent-cli-capabilities.mjs";
 import { AGENT_CLI_CAPABILITIES } from "../agent/agent-cli-capabilities.mjs";
 import { CONFIG_CLI_USAGE, CONFIG_CLI_VALUES } from "../agent/config-cli-contract.mjs";
@@ -157,7 +159,7 @@ function agentConfigRequest(argv, env, config, agent, dependencies) {
     const target = config.agents[targetId];
     if (!target)
         throw new Error(`Agent 不存在：${targetId}；运行 larkin config show --json 查看可用 Agent`);
-    const currentDirectory = (runtime = larkinConfig.toUserRuntime(target.runtime, target.piDistribution)) => (dependencies.modelDirectory ?? ((input) => discoverRuntimeModelDirectorySync(input, env)))({
+    const currentDirectory = (runtime = larkinConfig.toUserRuntime(target.runtime)) => (dependencies.modelDirectory ?? ((input) => discoverRuntimeModelDirectorySync(input, env)))({
         agentId: target.agentId, cwd: target.workspaceDir, runtime,
     });
     if (operation === "show") {
@@ -173,6 +175,16 @@ function agentConfigRequest(argv, env, config, agent, dependencies) {
         const runtime = options.positionals[0];
         if (!runtime || options.positionals.length > 1)
             throw new Error("用法: larkin config runtime <runtime> [--model <model>] [--agent <App ID>]");
+        if (!isUserRuntime(runtime))
+            throw new Error(`未知 runtime：${runtime}`);
+        const command = runtime === "pi"
+            ? env.LARKIN_PI_COMMAND || "pi"
+            : runtime === "codex"
+                ? env.LARKIN_CODEX_COMMAND || "codex"
+                : env.LARKIN_CLAUDE_COMMAND || "claude";
+        if (!resolveRuntimeExecutable(command, env)) {
+            throw new Error(`${runtime} is not installed；${runtimeInstallNextAction(runtime)}`);
+        }
         const model = options.values.get("--model");
         if (model && !currentDirectory(runtime).some((item) => item.id === model))
             throw new Error(`model 不在 ${runtime} 当前目录中：${model}`);
@@ -594,7 +606,7 @@ export function runAgentCli(argv, env = process.env, dependencies = {}) {
                 openId: identity?.open_id ?? identity?.openId ?? null,
                 avatarUrl: identity?.avatar_url ?? identity?.avatarUrl ?? null,
                 runtime: agent.runtime,
-                runtimeOption: larkinConfig.toUserRuntime(agent.runtime, agent.piDistribution),
+                runtimeOption: larkinConfig.toUserRuntime(agent.runtime),
                 model: agent.model, reasoningEffort: agent.effort ?? null,
                 createdAt: agent.createdAt ?? "1970-01-01T00:00:00.000Z",
             });

package/dist/app/agent-config.mjs

@@ -11,9 +11,8 @@ import { isChannelReconnecting, projectAgentReadiness } from "./agent-readiness.
 import { requestAgentUpsert } from "./local-control.mjs";
 import * as larkinConfig from "../platform/config.mjs";
 import { managedOfficialLarkCli } from "./agent-lark-cli-workspace.mjs";
-import { assertBuiltinPiAgentDirectory, ownedPiCatalogAgentDir, piAgentDirectory, piCatalogCommandSpec } from "../runtime/pi-provider-config.mjs";
-import { RUNTIME_OPTIONS, fromUserRuntime, isUserRuntime, piCatalogDistributionForUserRuntime, toUserRuntime } from "../runtime/user-runtime.mjs";
-import { traceProcessBoundary } from "../platform/process-boundary-trace.mjs";
+import { RUNTIME_OPTIONS, fromUserRuntime, isUserRuntime, toUserRuntime } from "../runtime/user-runtime.mjs";
+import { resolveRuntimeExecutable, runtimeInstallNextAction } from "../runtime/runtime-readiness.mjs";
 function safeDocumentCommentCapabilities(configDir, profile) {
     try {
         return {
@@ -52,15 +51,15 @@ const die = (message) => {
         console.error("  下一步: larkin config --help");
     process.exit(1);
 };
-if (!kind || !["agents", "model", "runtime", "effort", "pi-distribution", "chats", "config"].includes(kind)) {
-    die("用法: larkin agents | larkin config <show|mention|apply> | larkin model [<id>] | larkin runtime [<id>] [--model <id>] | larkin pi-distribution [show|builtin|external] | larkin effort [<level>|clear] | larkin chats [free|strict <oc_id>]");
+if (!kind || !["agents", "model", "runtime", "effort", "chats", "config"].includes(kind)) {
+    die("用法: larkin agents | larkin config <show|mention|apply> | larkin model [<id>] | larkin runtime [<id>] [--model <id>] | larkin effort [<level>|clear] | larkin chats [free|strict <oc_id>]");
 }
 const allowedValueFlags = {
     agents: new Set(), model: new Set(["--agent"]), runtime: new Set(["--agent", "--model"]),
-    effort: new Set(["--agent"]), "pi-distribution": new Set(["--agent", "--snapshot"]), chats: new Set(["--agent"]), config: new Set(["--agent", "--chat"]),
+    effort: new Set(["--agent"]), chats: new Set(["--agent"]), config: new Set(["--agent", "--chat"]),
 };
 const allowedBooleanFlags = {
-    agents: new Set(["--json"]), model: new Set(), runtime: new Set(), effort: new Set(), "pi-distribution": new Set(["--import-external-profile"]), chats: new Set(), config: new Set(["--json"]),
+    agents: new Set(["--json"]), model: new Set(), runtime: new Set(), effort: new Set(), chats: new Set(), config: new Set(["--json"]),
 };
 const parsedValues = new Map();
 const parsedBooleans = new Set();
@@ -94,7 +93,6 @@ const flagAgent = parsedValues.get("--agent");
 const flagModel = parsedValues.get("--model");
 const flagChat = parsedValues.get("--chat");
 const flagJson = parsedBooleans.has("--json");
-const importExternalProfile = parsedBooleans.has("--import-external-profile");
 const value = positionals[0];
 function assertOnlyFlags(valueFlags, booleanFlags = []) {
     const allowedValues = new Set(valueFlags);
@@ -126,11 +124,6 @@ else if (kind === "effort") {
     if (positionals.length > 1)
         die("用法: larkin effort [<level>|clear|default] [--agent <App ID>]");
 }
-else if (kind === "pi-distribution") {
-    assertOnlyFlags(["--agent", "--snapshot"], ["--import-external-profile"]);
-    if (positionals.length > 1)
-        die("用法: larkin pi-distribution [show|builtin|external] [--agent <App ID>] [--snapshot <private-file>]");
-}
 else if (kind === "chats") {
     assertOnlyFlags(["--agent"]);
     if (![0, 2].includes(positionals.length))
@@ -178,21 +171,6 @@ const loaded = (() => {
 const { configDir, file, config } = loaded;
 if (!fs.existsSync(file))
     die("未找到 Larkin 配置，请运行 larkin setup");
-const snapshotFile = parsedValues.get("--snapshot");
-if (kind === "pi-distribution" && value === "rollback") {
-    if (importExternalProfile)
-        die("--import-external-profile 只允许与 builtin 一起使用");
-    if (!snapshotFile || flagAgent || positionals.length !== 1)
-        die("用法: larkin pi-distribution rollback --snapshot <private-file>");
-    try {
-        const result = larkinConfig.rollbackConfig(process.env, snapshotFile);
-        say(JSON.stringify({ ok: true, rolledBackAgent: result.agentId, revision: result.revision }));
-    }
-    catch (error) {
-        die(`回滚失败：${error instanceof Error ? error.message : String(error)}`);
-    }
-    process.exit(0);
-}
 if (kind === "agents") {
     const list = Object.values(config.agents || {});
     const daemon = readProcessState(config.larkinHome).daemon;
@@ -224,7 +202,7 @@ if (kind === "agents") {
                 agent_id: agent.agentId,
                 name: agent.name,
                 runtime: agent.runtime,
-                runtimeOption: toUserRuntime(agent.runtime, agent.piDistribution),
+                runtimeOption: toUserRuntime(agent.runtime),
                 model: effectiveModel,
                 document_comment: {
                     event: "drive.notice.comment_add_v1",
@@ -295,7 +273,7 @@ if (kind === "agents") {
         say(`  ${agent.name}${agent.name === config.activeAgent ? " [active]" : ""}`);
         const effectiveModel = status?.session?.runtime === agent.runtime && status.session.model ? status.session.model : agent.model;
         const effectiveEffort = status?.session?.runtime === agent.runtime && status.session.reasoningEffort ? status.session.reasoningEffort : agent.effort;
-        say(`    runtime=${toUserRuntime(agent.runtime, agent.piDistribution)}  model=${effectiveModel}${effectiveModel !== agent.model ? `  stored=${agent.model}` : ""}${effectiveEffort ? `  effort=${effectiveEffort}` : ""}`);
+        say(`    runtime=${toUserRuntime(agent.runtime)}  model=${effectiveModel}${effectiveModel !== agent.model ? `  stored=${agent.model}` : ""}${effectiveEffort ? `  effort=${effectiveEffort}` : ""}`);
         if (status?.runtimeReadiness) {
             const current = projectedReadiness.readiness.runtime_ready;
             const state = status.runtimeReadiness.state === "ready" && !current ? "unavailable" : status.runtimeReadiness.state || "incompatible";
@@ -429,7 +407,7 @@ if (!key) {
         say(`共 ${keys.length} 个 agent（用 --agent <appId> 查看/修改指定一个）:`);
         for (const candidate of keys) {
             const item = config.agents[candidate];
-            say(`  ${candidate}${candidate === config.activeAgent ? " [active]" : ""}  runtime=${toUserRuntime(item.runtime, item.piDistribution)}  model=${item.model}`);
+            say(`  ${candidate}${candidate === config.activeAgent ? " [active]" : ""}  runtime=${toUserRuntime(item.runtime)}  model=${item.model}`);
         }
         process.exit(0);
     }
@@ -437,49 +415,21 @@ if (!key) {
 }
 const selectedKey = key;
 const agent = config.agents[selectedKey];
-if (kind === "pi-distribution") {
-    traceProcessBoundary(process.env, "agent-config:pi-distribution-loaded", { configDir, agentId: selectedKey, targetDir: piAgentDirectory(configDir, selectedKey), requested: value || "show", importExternalProfile });
-    const requested = value || "show";
-    if (importExternalProfile && requested !== "builtin")
-        die("--import-external-profile 只允许与 builtin 一起使用");
-    if (requested === "show") {
-        say(JSON.stringify({
-            agentId: selectedKey,
-            runtime: agent.runtime,
-            runtimeOption: toUserRuntime(agent.runtime, agent.piDistribution),
-            piDistribution: agent.piDistribution ?? "external",
-        }));
-        process.exit(0);
-    }
-    if (requested !== "builtin" && requested !== "external")
-        die("Pi distribution 只允许 show/builtin/external");
-    if (agent.runtime !== "pi")
-        die(`Agent ${selectedKey} 不是 Pi runtime`);
-    if (!snapshotFile)
-        die("修改 Pi distribution 必须提供 --snapshot <private-file>");
-    if (requested === "builtin" && !importExternalProfile) {
-        try {
-            assertBuiltinPiAgentDirectory(piAgentDirectory(configDir, selectedKey));
-        }
-        catch {
-            die(agent.piDistribution === "builtin"
-                ? "内置 Pi provider 尚未为该 Agent 配置。请使用 Dashboard Provider Credentials 或 larkin pi-auth login。"
-                : "内置 Pi provider 尚未为该 Agent 配置。");
-        }
-    }
-    try {
-        const result = larkinConfig.mutateConfig(process.env, { kind: "set-agent-pi-distribution", agentId: selectedKey, distribution: requested }, { kind: "user" }, {
-            snapshotFile: snapshotFile, ...(importExternalProfile ? { importExternalProfile: true } : {}),
-        });
-        traceProcessBoundary(process.env, "agent-config:pi-distribution-persisted", { configDir, agentId: selectedKey, targetDir: piAgentDirectory(configDir, selectedKey), requested, applyState: result.applyState });
-        say(JSON.stringify({ ok: true, agentId: selectedKey, piDistribution: requested, revision: result.revision, applyState: result.applyState }));
+function runtimeExecutableName(runtime) {
+    if (runtime === "pi")
+        return process.env.LARKIN_PI_COMMAND || "pi";
+    if (runtime === "codex")
+        return process.env.LARKIN_CODEX_COMMAND || "codex";
+    return process.env.LARKIN_CLAUDE_COMMAND || "claude";
+}
+if (kind === "runtime" && value) {
+    if (!isUserRuntime(value)) {
+        console.error(`✗ 未知 runtime：${value}。合法值: ${RUNTIME_OPTIONS.join(", ")}`);
+        process.exit(1);
     }
-    catch (error) {
-        if (importExternalProfile)
-            die("Pi external profile import failed; no secret or private path was disclosed");
-        die(`Pi distribution 修改失败：${error instanceof Error ? error.message : String(error)}`);
+    if (!resolveRuntimeExecutable(runtimeExecutableName(value), process.env)) {
+        die(`${value} is not installed；${runtimeInstallNextAction(value)}`);
     }
-    process.exit(0);
 }
 const catalog = larkinConfig.loadRuntimeModels();
 if ((["model", "effort"].includes(kind || "") && agent.runtime === "codex") || (kind === "runtime" && value === "codex")) {
@@ -501,28 +451,22 @@ if ((["model", "effort"].includes(kind || "") && agent.runtime === "claude") ||
     }
 }
 let piCatalog = null;
-const userRuntime = toUserRuntime(agent.runtime, agent.piDistribution);
-const catalogUserRuntime = kind === "runtime" && (value === "pi" || value === "builtin-pi")
-    ? value
-    : userRuntime;
+const userRuntime = toUserRuntime(agent.runtime);
 if ((kind === "model" || kind === "effort" || kind === "runtime") && !value) {
     say(`agent=${selectedKey}  runtime=${userRuntime}  model=${agent.model}`);
 }
 const needsLivePiCatalog = (["model", "effort"].includes(kind) && agent.runtime === "pi")
-    || (kind === "runtime" && (value === "pi" || value === "builtin-pi") && Boolean(flagModel));
+    || (kind === "runtime" && value === "pi" && Boolean(flagModel));
 if (needsLivePiCatalog) {
     try {
-        const catalogCommand = piCatalogCommandSpec(piCatalogDistributionForUserRuntime(catalogUserRuntime), process.env);
         piCatalog = await discoverPiModelCatalog({
             cwd: String(agent.workspaceDir),
-            agentDir: ownedPiCatalogAgentDir(configDir, selectedKey),
-            command: catalogCommand.command,
-            commandArgs: catalogCommand.commandArgs,
+            command: process.env.LARKIN_PI_COMMAND || "pi",
             env: process.env,
         });
     }
     catch (error) {
-        die(`Pi 模型目录加载失败：${error instanceof Error ? error.message : String(error)}。请先用官方 pi 登录或检查该 Agent 的隔离 provider 目录。`);
+        die(`Pi 模型目录加载失败：${error instanceof Error ? error.message : String(error)}。请先运行官方 pi 登录流程。`);
     }
     if (!piCatalog)
         die("Pi 模型目录加载失败");
@@ -695,10 +639,6 @@ else {
         say("\n切换: larkin runtime <id> [--model <id>]");
         process.exit(0);
     }
-    if (!isUserRuntime(value)) {
-        console.error(`✗ "${value}" 不是合法 runtime。合法值: ${RUNTIME_OPTIONS.join(", ")}`);
-        process.exit(1);
-    }
     let model = flagModel;
     if (model) {
         const items = catalog[catalogRuntimeKey(value)];

package/dist/app/binary-entry.mjs

@@ -49,26 +49,6 @@ async function dispatchInternal(mode, rest) {
         case "lark-channel-secret":
             await (await import("./lark-channel-secret.mjs")).main(process.env);
             return;
-        case "pi-rpc": {
-            const { prepareBuiltinPiPackageAssets } = await import("../runtime/builtin-pi-assets.mjs");
-            prepareBuiltinPiPackageAssets();
-            process.title = "pi-rpc";
-            process.env.PI_CODING_AGENT = "true";
-            process.emitWarning = (() => { });
-            // The Pi package's normal Bun CLI registers OAuth loaders before starting.
-            // Larkin invokes its RPC entrypoint directly, so do the same here; otherwise
-            // an OAuth-backed compact falls back to a dynamic module import unavailable in
-            // a compiled standalone binary.
-            const { registerBunOAuthFlows } = await import("@earendil-works/pi-ai/bun-oauth");
-            registerBunOAuthFlows();
-            const { main: piMain } = await import("@earendil-works/pi-coding-agent");
-            const { invokeBuiltinPiRpc } = await import("../runtime/pi-inline-extensions.mjs");
-            await invokeBuiltinPiRpc(piMain, rest);
-            return;
-        }
-        case "pi-auth":
-            await (await import("./pi-auth-cli.mjs")).main(rest, process.env);
-            return;
         case "telemetry":
             await (await import("./telemetry.mjs")).main(rest, process.env);
             return;

package/dist/app/cli.mjs

@@ -29,11 +29,9 @@ const routes = {
     model: ["agent-config", "model"],
     runtime: ["agent-config", "runtime"],
     effort: ["agent-config", "effort"],
-    "pi-distribution": ["agent-config", "pi-distribution"],
     chats: ["agent-config", "chats"],
     config: ["agent-config", "config"],
     session: ["session-cli"],
-    "pi-auth": ["pi-auth"],
     telemetry: ["telemetry"],
 };
 const runtimeAgentAuthority = typeof process.env.LARKIN_AGENT_ID === "string"
@@ -49,8 +47,8 @@ if (runtimeAgentAuthority && command === "comment")
 const commandHelp = {
     start: `Usage: larkin start [--agent <App ID> | --agents <App ID,...>]
 Start one foreground supervisor for the daemon and local dashboard, or reuse it.`,
-    setup: `Usage: larkin setup [--tenant feishu|lark] [--runtime <builtin-pi|pi|codex|claude>] [--provider <id> --api-key <key>]
-Run setup to create or connect a bot, configure its Agent, and attach it. Choose Feishu or Lark before the authorization QR (--tenant; default feishu). Interactive terminals keep the guided flow; Agent-driven (non-TTY) runs default to builtin-pi and need --provider/--api-key (or --runtime pi).`,
+    setup: `Usage: larkin setup [--tenant feishu|lark] [--runtime <pi|codex|claude>]
+Run setup to create or connect a bot, configure its Agent, and attach it. Choose Feishu or Lark before the authorization QR (--tenant; default feishu). Interactive terminals list pi, Codex, and Claude Code with installed / not installed status. Non-TTY runs require --runtime and fail if that executable is missing.`,
     status: `Usage: larkin status [--json]
 Show Agent configuration, bot identity, credentials, and connection status. Use --json for readiness automation.`,
     agents: `Usage: larkin agents [--json]
@@ -58,10 +56,7 @@ List every configured Agent and its current local status. Use --json for daemon/
     model: `Usage: larkin model [<model>] [--agent <App ID>]
 Show or change an Agent model.`,
     runtime: `Usage: larkin runtime [<runtime>] [--agent <App ID>] [--model <model>]
-Show or change an Agent runtime. User-facing ids: pi | builtin-pi | codex | claude.`,
-    "pi-distribution": `Usage: larkin pi-distribution [show|builtin|external] [--agent <App ID>] [--snapshot <private-file>] [--import-external-profile]
-       larkin pi-distribution rollback --snapshot <private-file>
-Show or change one Pi Agent distribution. builtin requires configured provider state, or explicitly imports the external Pi 0.84.2 profile with --import-external-profile; all changes support config-lock CAS rollback.`,
+Show or change an Agent runtime. User-facing ids: pi | codex | claude. A missing executable is rejected and does not write config.`,
     effort: `Usage: larkin effort [<level>|clear|default] [--agent <App ID>]
 Show or change an Agent reasoning effort; clear/default restores the Runtime default.`,
     chats: `Usage: larkin chats [--agent <App ID>]
@@ -83,11 +78,6 @@ Credentials, internal paths, serverId, activeAgent, and raw config are never exp
     session: `Usage: larkin session reset --agent <App ID> --json [--wait-ready <seconds>]
        larkin session recover --agent <App ID> --reason context-overflow --json [--wait-ready <seconds>]
 Reset replaces one idle, zero-backlog Runtime session. Recover is an explicit operator-only context-window recovery that preserves and replays canonical Inbox deliveries.`,
-    "pi-auth": `Usage: larkin pi-auth status [--agent <App ID>] [--json]
-       larkin pi-auth providers [--json]
-       larkin pi-auth login <preset|custom> --agent <App ID> [--model <model>] [--base-url <url>] [--api-key-stdin] [--json]
-       larkin pi-auth logout <provider> [--agent <App ID>]
-Show a redacted builtin Pi provider catalog, configure one existing Agent with a known preset or custom OpenAI-compatible endpoint, or remove one target provider credential. API keys are accepted only from a TTY prompt or --api-key-stdin.`,
     comment: `Usage: larkin comment reply --message-id <doc_comment_message_id> --text '<reply>' --json
 Reply as the Runtime-bound Bot to the exact cloud-document comment locator supplied by canonical Inbox. Retrying the same body is idempotent; a different body appends a follow-up reply to the same comment.`,
     telemetry: `Usage: larkin telemetry <status|export|import|flush>
@@ -112,9 +102,10 @@ if (!runtimeAgentCommand && command === "config" && ["runtime", "model", "effort
 // At a user terminal, unregistered non-flag commands keep the legacy lark-cli passthrough.
 // Inside an Agent Runtime, unknown Feishu command groups enter the same Larkin-owned
 // identity and freshness AOP before delegation to the verified global official CLI.
+const retiredPublicCommands = new Set(["pi-auth", "pi-distribution"]);
 const wantsHelp = command === "help" || command === "--help" || command === "-h"
     || (!runtimeAgentAuthority && command.startsWith("-"));
-if (!routes[command] && !wantsHelp) {
+if (!routes[command] && !wantsHelp && !retiredPublicCommands.has(command)) {
     routes[command] = runtimeAgentAuthority ? ["lark-cli", command] : ["lark", command];
 }
 if (!routes[command]) {
@@ -132,7 +123,6 @@ Usage: larkin <command>
   config           Inspect effective config/source, edit mention inheritance, or explicitly apply runtime changes
   session reset    Replace one idle, zero-backlog Agent Runtime session for a fresh scenario
   session recover  Explicitly recover a context-overflowed session and replay retained Inbox deliveries
-  pi-auth          Show, configure, or logout one built-in Pi Agent provider credential
   comment reply    Reply to the exact cloud-document comment bound by a polled Inbox message
   telemetry        Inspect, export, import, or flush the durable OpenTelemetry trace queue
   <lark-cli 命令组>  im/docs/wiki/drive 等 lark-cli 命令原样转发，机器人身份已锁定（如 larkin im +chat-list）
@@ -146,15 +136,9 @@ Process persistence is managed externally. larkin start stays in the foreground
 }
 const [mode, ...presetArguments] = routes[command];
 const childSpec = internalCommandSpec(mode, [...presetArguments, ...rest]);
-// 管道 stdin 必须显式转发：Linux 上 inherit 会在父进程排空后再交给子进程，导致 --api-key-stdin 读到空。
-const pipeStdin = command === "pi-auth" && rest.includes("--api-key-stdin") && !process.stdin.isTTY;
-if (pipeStdin && typeof process.stdin.pause === "function")
-    process.stdin.pause();
 const child = spawn(childSpec.command, childSpec.args, {
-    stdio: [pipeStdin ? "pipe" : "inherit", "inherit", "inherit"],
+    stdio: ["inherit", "inherit", "inherit"],
 });
-if (pipeStdin && child.stdin)
-    process.stdin.pipe(child.stdin);
 // Package-manager bin shims add a wrapper process. Forward terminal signals so the actual command
 // does not become an orphan that keeps the machine lock or Feishu connection.
 const signalForwarders = new Map();

package/dist/app/internal-command.cjs

@@ -24,8 +24,6 @@ exports.INTERNAL_MODES = [
     "setup-bind",
     "grant-scopes",
     "lark-channel-secret",
-    "pi-rpc",
-    "pi-auth",
     "telemetry",
 ];
 exports.PROCESS_COMMAND_TOKENS = Object.freeze({

package/dist/app/internal-command.mjs

@@ -15,8 +15,6 @@ export const INTERNAL_MODES = [
     "setup-bind",
     "grant-scopes",
     "lark-channel-secret",
-    "pi-rpc",
-    "pi-auth",
     "telemetry",
 ];
 export const PROCESS_COMMAND_TOKENS = Object.freeze({

package/dist/app/runtime-model-directory.mjs

@@ -2,12 +2,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { loadConfig, resolveConfigDir } from "../platform/config.mjs";
 import { discoverClaudeModelCatalog } from "../runtime/claude-model-catalog.mjs";
 import { discoverPiModelCatalog } from "../runtime/pi-model-catalog.mjs";
 import { discoverCodexModelCatalog } from "../runtime/codex-model-catalog.mjs";
-import { ownedPiCatalogAgentDir, piCatalogCommandSpec } from "../runtime/pi-provider-config.mjs";
-import { piCatalogDistributionForUserRuntime } from "../runtime/user-runtime.mjs";
 function readTestModelDirectory(env) {
     const fixture = env?.LARKIN_TEST_RUNTIME_MODEL_DIRECTORY_FILE;
     if (!fixture)
@@ -37,22 +34,11 @@ export async function discoverRuntimeModelDirectory(input) {
             ...catalog.models.map(({ id, label, supportedReasoningEfforts }) => ({ id, label, supportedReasoningEfforts })),
         ];
     }
-    if (input.runtime === "pi" || input.runtime === "builtin-pi") {
+    if (input.runtime === "pi") {
         const env = input.env ?? process.env;
-        const agentId = input.agentId || "";
-        if (!agentId)
-            throw new Error("runtime model directory requires agentId for Pi");
-        const configDir = resolveConfigDir(env);
-        const { config } = loadConfig(env);
-        const agent = config.agents[agentId];
-        if (!agent)
-            throw new Error(`unknown agent: ${agentId}`);
-        const catalogCommand = piCatalogCommandSpec(piCatalogDistributionForUserRuntime(input.runtime), env);
         const catalog = await discoverPiModelCatalog({
             cwd: input.cwd,
-            agentDir: ownedPiCatalogAgentDir(configDir, agentId),
-            command: catalogCommand.command,
-            commandArgs: catalogCommand.commandArgs,
+            command: env.LARKIN_PI_COMMAND ?? process.env.LARKIN_PI_COMMAND ?? "pi",
             env,
         });
         if (!catalog.effectiveModel)

package/dist/app/runtime-process.mjs

@@ -65,7 +65,6 @@ export async function markConfigAppliedAfterRuntimeReady(env, runningAgents, run
         for (const running of runningAgents) {
             const current = loaded.config.agents[running.agentId];
             if (!current || current.runtime !== running.runtime || current.model !== running.model
-                || (current.piDistribution || "external") !== (running.piDistribution || "external")
                 || (current.effort || null) !== (running.effort || null))
                 continue;
             markConfigApplied(env, running.agentId, runtimeConfigSignature(loaded.config, running.agentId));

package/dist/app/setup.mjs

@@ -7,13 +7,11 @@ import path from "node:path";
 import readline from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import * as larkinConfig from "../platform/config.mjs";
-import { PI_PROVIDER_PRESETS } from "../runtime/pi-provider-config.mjs";
-import { fromUserRuntime, isUserRuntime } from "../runtime/user-runtime.mjs";
-const PI_PROVIDER_IDS = PI_PROVIDER_PRESETS.map((p) => p.id).join(" | ") + " | custom";
+import { isUserRuntime } from "../runtime/user-runtime.mjs";
 import { acquireProcessLock, readProcessState } from "../platform/process-state.mjs";
 import { requestAgentUpsert } from "./local-control.mjs";
 import { openOwnedDashboardWhenReady } from "./setup-dashboard.mjs";
-import { probeNativeRuntimeReadiness } from "../runtime/runtime-readiness.mjs";
+import { probeNativeRuntimeReadiness, resolveRuntimeExecutable, runtimeInstallNextAction } from "../runtime/runtime-readiness.mjs";
 import { internalCommandSpec, processCommandToken } from "./internal-command.mjs";
 import { ensureOfficialLarkCliForSetup, formatOfficialLarkCliConsent, } from "./official-lark-cli.mjs";
 const CFG_DIR = process.env.LARKIN_CONFIG_DIR || path.join(os.homedir(), ".larkin");
@@ -33,60 +31,54 @@ if (has("--start") && has("--no-start"))
 if (has("--comment-subscription")) {
     die("--comment-subscription 已移除：评论订阅默认 application（平台验证的应用级订阅），不需要该 flag");
 }
+const REMOVED_SETUP_FLAGS = ["--provider", "--api-key", "--base-url", "--pi-distribution", "--api-key-stdin", "--model-from-preset"];
+if (REMOVED_SETUP_FLAGS.some((name) => has(name) || argv.some((arg) => arg.startsWith(`${name}=`)))) {
+    die("setup 不再接受 --provider/--api-key/--base-url；请安装并登录外部 pi、codex 或 claude");
+}
 // 默认应用级评论订阅：平台验证的应用订阅让该应用可见文档的全部评论进入 Agent Inbox。
 const commentSubscription = "application";
-const OPT = { runtime: flag("--runtime") || null, commentSubscription, start: true, help: has("--help") || has("-h"), nonInteractive: !Boolean(process.stdin.isTTY) };
-// runtime 枚举归一：builtin-pi（默认）/ pi / codex / claude → 内部 (runtime, distribution)
-const RUNTIME_ENUM = ["builtin-pi", "pi", "codex", "claude"];
+const OPT = { runtime: flag("--runtime") || null, commentSubscription, start: !has("--no-start"), help: has("--help") || has("-h"), nonInteractive: !Boolean(process.stdin.isTTY) };
+const RUNTIME_ENUM = ["pi", "codex", "claude"];
+function runtimeCommand(runtime, env = process.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";
+}
 function normalizeRuntime(value) {
-    const raw = value || "builtin-pi";
-    if (raw === "external-pi") {
+    if (!value)
+        return null;
+    if (value === "external-pi") {
         console.error("external-pi 已改名为 pi");
-        return fromUserRuntime("pi");
+        return "pi";
     }
-    if (!isUserRuntime(raw) || !RUNTIME_ENUM.includes(raw)) {
-        die(`未知 runtime \`${value}\`；可选：${RUNTIME_ENUM.join(" | ")}`);
-    }
-    return fromUserRuntime(raw);
-}
-const normalizedRuntime = normalizeRuntime(OPT.runtime);
-// 参数化路径：显式 --runtime、无 TTY（Agent 驱动）、或任何 provider 参数。
-// 交互终端且未指定任何参数时，不传 --runtime 给 bot-register，由其交互选择流程接管。
-const parameterized = Boolean(OPT.runtime) || OPT.nonInteractive
-    || ["--provider", "--api-key", "--base-url"].some((name) => has(name));
-// builtin-pi 前置校验：授权前就 fast-fail（避免用户白授权后才发现缺 key）；--help 永远跳过
-if (!OPT.help && parameterized && normalizedRuntime.distribution === "builtin") {
-    const p = flag("--provider");
-    const b = flag("--base-url");
-    const k = flag("--api-key");
-    if (!p && !b)
-        die(`builtin-pi 需要 --provider <id>（${PI_PROVIDER_IDS}）或 --base-url；或 --runtime pi 用已有 pi`);
-    if (!k)
-        die("builtin-pi 需要 --api-key；或 --runtime pi 用已有登录");
+    if (isUserRuntime(value))
+        return value;
+    return die(`未知 runtime \`${value}\`；可选：${RUNTIME_ENUM.join(" | ")}`);
 }
-if (!OPT.help && normalizedRuntime.distribution === "external" && (flag("--provider") || flag("--api-key") || flag("--base-url"))) {
-    die("pi 使用已有 pi 环境，不接受 --provider/--api-key/--base-url");
+function assertRuntimeInstalled(runtime) {
+    if (resolveRuntimeExecutable(runtimeCommand(runtime), process.env))
+        return;
+    die(`${runtime} is not installed；${runtimeInstallNextAction(runtime)}`);
 }
 if (OPT.help) {
     say(`larkin setup — Create or connect a Feishu (Lark) bot, then configure and attach its Agent
 
 Usage:
-  larkin setup                         Select a bot in the browser and run setup（默认：内置 Pi + 配置完成即热挂载）
-  larkin setup --provider <id> --api-key <key>   指定内置 Pi provider（无需交互）
+  larkin setup                         Select a bot in the browser and choose an installed runtime
+  larkin setup --runtime pi            Non-interactive setup for an externally installed runtime
 
 Options:
-  --runtime <runtime>                   Agent runtime 枚举：builtin-pi（默认，内置 Pi）| pi | codex | claude
-  --provider <id>                       内置 Pi provider：deepseek | kimi | minimax | zhipu | openai |
-                                          anthropic | gemini | groq | cerebras | xai | fireworks |
-                                          together | mistral | openrouter | kimi-coding | qwen-cn | custom
-  --api-key <key>                       API key（内置 Pi 必填）
-  --base-url <url>                      custom 端点（provider=custom 时必填；也可覆盖 preset 默认端点）
-  --model <id>                          模型 ID；默认取 provider 预设。不同 runtime 的模型可用
-                                          \`larkin model\` 查看 / 切换
-  --from-cli-profile <name>            可选：复用已有官方 lark-cli profile（需 LARKIN_SETUP_APP_SECRET）
-  --tenant feishu|lark                  授权二维码之前选择品牌。默认 feishu（扫码 /page/launcher）。
-                                          Lark 用 --tenant lark：扫码 /page/cli，完成后凭证回传，
-                                          不要打开 /page/launcher。交互式未指定时会先询问。
+  --runtime <runtime>                   Required without a TTY. Agent runtime: pi | codex | claude
+  --model <id>                          Optional model ID; otherwise the runtime default is used.
+                                          Use \`larkin model\` after setup to inspect or switch.
+  --from-cli-profile <name>            Optional: reuse an existing official lark-cli profile
+                                          (requires LARKIN_SETUP_APP_SECRET)
+  --tenant feishu|lark                  Choose the brand before the authorization QR. Default feishu
+                                          (scan /page/launcher). Lark uses --tenant lark: scan /page/cli,
+                                          then credentials return; do not open /page/launcher.
+                                          Interactive runs ask when omitted.
 
 setup handles browser authorization, permission grants, credential storage, Agent configuration,
 and target-only hot attach. Each Agent is identified by its bot App ID: selecting the same bot reuses
@@ -95,11 +87,18 @@ its existing Agent, memory, and state; creating a new bot creates a new Agent.
 If larkin is running, only the selected Agent is added or updated. Otherwise setup starts the same
 daemon + dashboard supervisor used by larkin start.
 
-Interactive terminals without flags keep the guided flow (browser bot selection + runtime choice).
-Non-interactive (Agent-driven) runs default to builtin-pi and require --provider/--api-key (or
---runtime pi to reuse an existing pi login).`);
+Interactive terminals list pi, Codex, and Claude Code with installed / not installed status and
+refuse a runtime that is not installed. Non-interactive (Agent-driven) runs require --runtime
+and exit non-zero with the readiness message when that executable is missing.`);
     process.exit(0);
 }
+if (OPT.nonInteractive && !OPT.runtime) {
+    die("非交互 setup 必须指定 --runtime pi|codex|claude");
+}
+const selectedRuntime = normalizeRuntime(OPT.runtime);
+if (selectedRuntime)
+    assertRuntimeInstalled(selectedRuntime);
+const parameterized = Boolean(OPT.runtime);
 function runForeground(mode, args) {
     return new Promise((resolve, reject) => {
         const childSpec = internalCommandSpec(mode, args);
@@ -151,11 +150,8 @@ export async function main() {
     fs.mkdirSync(CFG_DIR, { recursive: true, mode: 0o700 });
     const resultFile = path.join(CFG_DIR, `.setup-result-${process.pid}.json`);
     const registerArgs = ["--auto", "--result-file", resultFile];
-    if (parameterized) {
-        registerArgs.push("--runtime", normalizedRuntime.runtime);
-        if (normalizedRuntime.distribution)
-            registerArgs.push("--pi-distribution", normalizedRuntime.distribution);
-    }
+    if (parameterized && selectedRuntime)
+        registerArgs.push("--runtime", selectedRuntime);
     registerArgs.push("--comment-subscription", OPT.commentSubscription);
     if (has("--tenant")) {
         const tenant = flag("--tenant");
@@ -163,7 +159,7 @@ export async function main() {
             die("--tenant 只支持 feishu 或 lark");
         registerArgs.push("--tenant", tenant === "lark" ? "lark" : "feishu");
     }
-    for (const name of ["--provider", "--api-key", "--base-url", "--model", "--from-cli-profile"]) {
+    for (const name of ["--model", "--from-cli-profile"]) {
         const value = flag(name);
         if (value)
             registerArgs.push(name, value);
@@ -193,12 +189,11 @@ export async function main() {
         die(`Runtime ${configuredAgent.runtime} 不受支持`);
     // 非交互（Agent 驱动）时仍跳过 probeNativeRuntimeReadiness：该探测保持 interactive-only。
     // external-pi 绑定已在 setup-bind 内做非交互 Pi RPC catalog discovery（RPC over pipes 不需要 TTY）；
-    // daemon attach 探测仍是权威校验。其余真实阻塞（缺 runtime 可执行文件 / 缺 key / 缺 lark-cli）一律 fast-fail。
+    // daemon attach 探测仍是权威校验。其余真实阻塞（缺 runtime 可执行文件 / 缺登录 / 缺 lark-cli）一律 fast-fail。
     if (!OPT.nonInteractive) {
         const runtimeReadiness = await probeNativeRuntimeReadiness({ runtime: configuredAgent.runtime,
             agentId: selectedAgentId, cwd: configuredAgent.workspaceDir,
-            env: { ...process.env, LARKIN_CONFIG_DIR: CFG_DIR,
-                ...(configuredAgent.piDistribution ? { LARKIN_PI_DISTRIBUTION: configuredAgent.piDistribution } : {}) } });
+            env: { ...process.env, LARKIN_CONFIG_DIR: CFG_DIR } });
         if (runtimeReadiness.state !== "ready") {
             die(`Runtime ${configuredAgent.runtime} ${runtimeReadiness.state}：${runtimeReadiness.reason || "prerequisite unavailable"}；${runtimeReadiness.nextAction || "修复后重试"}`);
         }