larkin 0.4.28 → 0.5.0

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) {

package/dist/setup/setup-bind.mjs

@@ -9,12 +9,8 @@ import { fileURLToPath } from "node:url";
 import { isWindows } from "../platform/secure-metadata.mjs";
 import { TargetRootLayout } from "../platform/root-layout.mjs";
 import { planSingleRootBinding } from "./setup-binding.mjs";
-import { configureBuiltinPiProviderModel, piAgentDirectory } from "../runtime/pi-provider-config.mjs";
-import { applyPiProfileMigration, clearStalePiProfileMigrationLock, preparePiProfileMigration, releasePiProfileMigrationLock, rollbackPiProfileMigration, } from "../runtime/pi-profile-migration.mjs";
 import { discoverPiModelCatalog } from "../runtime/pi-model-catalog.mjs";
 import { calculatePiCompactionSettings } from "../runtime/pi-compaction-recovery.mjs";
-import { terminalSetupQuestioner } from "./setup-agent-choice.mjs";
-import { beginBuiltinPiCredentialTransaction, createOfficialPiAuthInteraction, createOfficialPiModelRuntime, runOfficialPiLogin, verifyOfficialPiProviderTurn, } from "../runtime/pi-official-auth.mjs";
 import * as larkinConfigImport from "../platform/config.mjs";
 import { resolveOfficialLarkCli } from "../app/official-lark-cli.mjs";
 import { loadValidatedBotCredential } from "./run-credential-preflight.mjs";
@@ -36,6 +32,7 @@ const options = {
     agent: flag("--agent"),
     profile: flag("--profile"),
     runtime: flag("--runtime"),
+    model: flag("--model"),
     selectionFile: flag("--selection-file"),
     yes: has("--yes"),
     list: has("--list"),
@@ -69,12 +66,6 @@ function larkJson(args) {
         return { ok: false, json: null, raw: stdout, err: stderr || stdout };
     }
 }
-function openAuthUrl(url) {
-    const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "rundll32.exe" : "xdg-open";
-    const args = process.platform === "win32" ? ["url.dll,FileProtocolHandler", url] : [url];
-    const result = spawnSync(command, args, { stdio: "ignore", timeout: 5_000 });
-    return result.status === 0;
-}
 function listProfilesFromEnv(env) {
     const official = resolveOfficialLarkCli({ env });
     const result = spawnSync(official.command, [...official.argsPrefix, "profile", "list"], { encoding: "utf8", env });
@@ -176,9 +167,10 @@ function readSetupSelection(fileArg) {
     const bytes = fs.readFileSync(file, "utf8");
     fs.unlinkSync(file);
     const raw = JSON.parse(bytes);
-    if (!raw || !["pi", "codex", "claude"].includes(raw.runtime))
-        die("setup Agent 选择无效");
-    return raw;
+    const runtime = raw?.runtime;
+    if (runtime === "pi" || runtime === "codex" || runtime === "claude")
+        return { runtime };
+    return die("setup Agent 选择无效");
 }
 function fabricateAttachment(root, serverId) {
     const directory = path.join(root, "computer", "servers", serverId);
@@ -208,12 +200,9 @@ function formatExternalPiSetupFailure(error, options) {
     const original = (error instanceof Error ? error.message : String(error)).replace(/[\r\n]+/g, " ").trim();
     const alternatives = catalogModelsFromError(error);
     const parts = [];
-    if (/external Pi (?:auth\.json|models\.json|settings\.json) is required|external Pi profile|external Pi auth\.json has an unsafe mode|external Pi models\.json has an unsafe mode|external Pi settings\.json has an unsafe mode/.test(original)) {
-        parts.push("pi requires the official file-backed Pi profile containing auth.json (0600), models.json, and settings.json, normally after `pi` login and default-model selection. Environment-variable-only credentials are unsupported.");
-    }
     if (original)
         parts.push(original);
-    parts.push("Fix the official `pi` login and default model, then rerun `larkin setup --runtime pi`.");
+    parts.push("Run the official `pi` login flow, then retry `larkin setup --runtime pi`.");
     if (options.agentExisted) {
         parts.push("This Agent already exists; after a successful setup you can switch models with `larkin model <provider>/<model>`.");
     }
@@ -222,19 +211,6 @@ function formatExternalPiSetupFailure(error, options) {
     }
     return parts.join(" ");
 }
-function safeProviderFailure(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (/\b(?:401|403)\b|unauth|invalid.*(?:key|token)|credential/i.test(message)) {
-        return new Error("内置 Pi provider 拒绝认证（401/403）；请重新登录或检查 credential");
-    }
-    if (/timeout|超时|ETIMEDOUT/i.test(message))
-        return new Error("内置 Pi provider readiness 超时；请检查网络和 endpoint");
-    if (/ENOTFOUND|ECONN|fetch failed|network|TLS/i.test(message))
-        return new Error("内置 Pi provider endpoint 不可达；请检查网络、TLS 和 Base URL");
-    if (/model|模型/i.test(message))
-        return new Error("内置 Pi provider 不接受所选模型；请检查 provider/model");
-    return new Error("内置 Pi provider readiness 失败；credential/config 已回滚，请检查 provider 状态后重试");
-}
 function printAgents(config) {
     const names = Object.keys(config.agents);
     if (!names.length) {
@@ -248,9 +224,6 @@ function printAgents(config) {
     }
 }
 export async function main() {
-    if (has("--model")) {
-        die("setup 不支持配置 model；请用 larkin model <id> 单独切换（bun run model -- <id>，带合法值校验）");
-    }
     if (options.help) {
         say(`larkin setup（内部绑定阶段）
 
@@ -260,13 +233,14 @@ export async function main() {
 参数（都可省略；单 bot 单 agent 场景零参数即可）:
   --agent <App ID>     必须与所选 profile 的 App ID 一致；缺省自动使用该 App ID
   --profile <name>     复用已有 lark-cli profile（可用 profile 名或 appId；缺省交互选择）
-  --runtime <runtime>  pi / codex / claude；缺省沿用已有 agent 的 runtime，全新 agent 默认 pi
+  --runtime <runtime>  pi / codex / claude；缺省沿用已有 agent 的 runtime
+  --model <id>         可选；按 runtime 目录校验后写入。省略则沿用已有值或 runtime 默认
   --yes                非交互接受默认项
   --list               查看已经配置的 Agent
   --help               显示帮助
 
 普通用户请直接运行 larkin setup；该内部阶段只负责绑定已取得的凭证。
-模型不在 setup 配置：沿用已有值（换 runtime 时重置为该 runtime 默认），切换用 larkin model <id>。`);
+省略 --model 时沿用已有值（换 runtime 时重置为该 runtime 默认）；也可用 larkin model <id> 事后切换。`);
         return;
     }
     const loaded = loadConfig();
@@ -287,66 +261,55 @@ export async function main() {
         verifyBot(profile);
     const requestedAgent = options.agent || profile.appId;
     const prior = config.agents[profile.appId];
-    const runtime = selection?.runtime || options.runtime || prior?.runtime || "pi";
-    const piDistribution = runtime === "pi"
-        ? (selection?.runtime === "pi" ? selection.distribution : prior?.piDistribution || "external")
-        : undefined;
+    const runtime = selection?.runtime || options.runtime || prior?.runtime;
+    if (!runtime)
+        die("必须指定 --runtime pi|codex|claude");
     validateRuntime(runtime);
+    const requestedModel = options.model?.trim() || undefined;
     const defaultModel = larkinConfig.defaultModelFor(runtime);
-    const selectedModel = selection?.runtime === "pi" && selection.distribution === "builtin" ? selection.model : undefined;
-    let targetModelId = selectedModel || (prior?.runtime === runtime ? prior.model : defaultModel);
+    let targetModelId = requestedModel && requestedModel !== "default"
+        ? requestedModel
+        : (prior?.runtime === runtime ? prior.model : defaultModel);
     let resolvedExternalModel;
-    let pendingMigration = null;
-    let setupConfigCommitted = false;
-    let providerTransaction = null;
-    let providerPublished = false;
-    const authAbort = new AbortController();
-    const cancelOnSignal = (signal) => {
-        authAbort.abort();
-        if (!setupConfigCommitted && pendingMigration) {
-            try {
-                rollbackPiProfileMigration(pendingMigration.state);
-            }
-            catch { /* best effort */ }
-        }
-        if (!providerPublished)
-            providerTransaction?.rollback();
-        process.exit(signal === "SIGINT" ? 130 : 143);
-    };
-    const onSigint = () => cancelOnSignal("SIGINT");
-    const onSigterm = () => cancelOnSignal("SIGTERM");
-    process.once("SIGINT", onSigint);
-    process.once("SIGTERM", onSigterm);
     let runtimeModels = larkinConfig.loadRuntimeModels()[runtime];
-    let authQuestioner = null;
     try {
-        if (runtime === "pi" && piDistribution === "external" && targetModelId === "default") {
-            fs.mkdirSync(CFG_DIR, { recursive: true, mode: 0o700 });
+        if (runtime === "pi" && (targetModelId === "default" || requestedModel)) {
             try {
-                clearStalePiProfileMigrationLock(CFG_DIR, profile.appId);
-                const plan = preparePiProfileMigration(process.env, CFG_DIR, profile.appId, "external");
-                pendingMigration = plan;
-                applyPiProfileMigration(plan);
                 const catalog = await discoverPiModelCatalog({
                     cwd: CFG_DIR,
-                    agentDir: piAgentDirectory(CFG_DIR, profile.appId),
-                    env: { ...process.env, LARKIN_PI_DISTRIBUTION: "external" },
+                    env: process.env,
                 });
-                const effective = catalog.effectiveModel;
-                const entry = effective ? catalog.models.find((model) => model.id === effective) : undefined;
-                if (!effective || !entry) {
-                    throw new Error("Pi official default resolution returned an unavailable model");
+                if (targetModelId === "default") {
+                    const effective = catalog.effectiveModel;
+                    const entry = effective ? catalog.models.find((model) => model.id === effective) : undefined;
+                    if (!effective || !entry) {
+                        throw new Error("Pi official default resolution returned an unavailable model");
+                    }
+                    if (!entry.contextWindow) {
+                        const alternatives = catalog.models
+                            .filter((model) => Number.isFinite(model.contextWindow) && Number(model.contextWindow) > 0)
+                            .map((model) => model.id);
+                        throw Object.assign(new Error("Pi effective model is missing a context window"), { catalogModels: alternatives });
+                    }
+                    calculatePiCompactionSettings(entry.contextWindow);
+                    targetModelId = effective;
+                    resolvedExternalModel = effective;
+                    runtimeModels = [{ id: effective, supportedReasoningEfforts: entry.supportedReasoningEfforts }];
                 }
-                if (!entry.contextWindow) {
-                    const alternatives = catalog.models
-                        .filter((model) => Number.isFinite(model.contextWindow) && Number(model.contextWindow) > 0)
-                        .map((model) => model.id);
-                    throw Object.assign(new Error("Pi effective model is missing a context window"), { catalogModels: alternatives });
+                else {
+                    const entry = catalog.models.find((model) => model.id === targetModelId);
+                    if (!entry)
+                        throw new Error(`目标模型 pi/${targetModelId} 不在 runtime 模型目录中；未修改 Agent 配置`);
+                    if (!entry.contextWindow) {
+                        const alternatives = catalog.models
+                            .filter((model) => Number.isFinite(model.contextWindow) && Number(model.contextWindow) > 0)
+                            .map((model) => model.id);
+                        throw Object.assign(new Error("Pi effective model is missing a context window"), { catalogModels: alternatives });
+                    }
+                    calculatePiCompactionSettings(entry.contextWindow);
+                    resolvedExternalModel = targetModelId;
+                    runtimeModels = [{ id: targetModelId, supportedReasoningEfforts: entry.supportedReasoningEfforts }];
                 }
-                calculatePiCompactionSettings(entry.contextWindow);
-                targetModelId = effective;
-                resolvedExternalModel = effective;
-                runtimeModels = [{ id: effective, supportedReasoningEfforts: entry.supportedReasoningEfforts }];
             }
             catch (error) {
                 throw new Error(formatExternalPiSetupFailure(error, { agentExisted: Boolean(prior) }));
@@ -358,6 +321,9 @@ export async function main() {
                 : [];
             runtimeModels = [{ id: targetModelId, supportedReasoningEfforts: preservedEffort }];
         }
+        else if (requestedModel && requestedModel !== "default") {
+            resolvedExternalModel = requestedModel;
+        }
         const targetModel = runtimeModels.find((model) => model.id === targetModelId);
         if (!targetModel)
             throw new Error(`目标模型 ${runtime}/${targetModelId} 不在 runtime 模型目录中；未修改 Agent 配置`);
@@ -366,67 +332,14 @@ export async function main() {
             profile,
             requestedAgent,
             runtime: selection?.runtime || options.runtime,
-            ...(runtime === "pi" && piDistribution ? { piDistribution } : {}),
-            ...(selectedModel || resolvedExternalModel ? { model: selectedModel || resolvedExternalModel } : {}),
+            ...(resolvedExternalModel ? { model: resolvedExternalModel } : {}),
             defaultModel,
             supportedReasoningEfforts: targetModel.supportedReasoningEfforts || [],
             now: new Date().toISOString(),
         });
         const bound = stored.agents[profile.appId];
         fs.mkdirSync(CFG_DIR, { recursive: true });
-        const authAlreadyCompleted = selection?.runtime === "pi" && selection.distribution === "builtin"
-            && selection.authCompleted === true;
-        const readinessAlreadyCompleted = authAlreadyCompleted
-            && selection.readinessCompleted === true;
-        providerTransaction = selection?.runtime === "pi" && selection.distribution === "builtin"
-            && !authAlreadyCompleted ? beginBuiltinPiCredentialTransaction(CFG_DIR, profile.appId)
-            : null;
-        if (selection?.runtime === "pi" && selection.distribution === "builtin") {
-            const official = selection.preset === "official" ? selection : null;
-            const configured = official ? null : configureBuiltinPiProviderModel(CFG_DIR, profile.appId, selection);
-            const providerId = official?.providerId || configured.provider;
-            const authType = official?.authType || "api_key";
-            let piRuntime = null;
-            if (!authAlreadyCompleted) {
-                piRuntime = await createOfficialPiModelRuntime(CFG_DIR, profile.appId);
-                authQuestioner = terminalSetupQuestioner();
-                say(`正在通过捆绑官方 Pi 登录 ${providerId}（${authType}）…`);
-                try {
-                    await runOfficialPiLogin(piRuntime, providerId, authType, createOfficialPiAuthInteraction({
-                        questioner: authQuestioner,
-                        report: (message) => say(message),
-                        openUrl: openAuthUrl,
-                        signal: authAbort.signal,
-                    }));
-                }
-                catch {
-                    throw new Error(`官方 Pi ${providerId} 登录失败或已取消；credential/config 未修改`);
-                }
-            }
-            if (!readinessAlreadyCompleted) {
-                piRuntime ??= await createOfficialPiModelRuntime(CFG_DIR, profile.appId);
-                say("正在验证内置 Pi provider（受控单轮，不发送飞书（Lark）消息）…");
-                try {
-                    if (!(process.env.LARKIN_TEST_SKIP_BUILTIN_PI_PROVIDER_TURN === "1" && process.env.LARKIN_TEST_BOT_REGISTER_MODULE)) {
-                        await verifyOfficialPiProviderTurn(piRuntime, selection.model, authAbort.signal);
-                    }
-                }
-                catch (error) {
-                    throw safeProviderFailure(error);
-                }
-            }
-        }
         larkinConfig.commitSetupConfig(process.env, loaded.revision, stored);
-        setupConfigCommitted = true;
-        providerTransaction?.commit();
-        providerPublished = true;
-        if (pendingMigration) {
-            try {
-                releasePiProfileMigrationLock(pendingMigration.state);
-            }
-            catch { /* post-commit lock release is best-effort; do not roll back credentials */ }
-            pendingMigration = null;
-        }
         fabricateAttachment(layout.root, stored.serverId);
         say(`\n✓ 已写配置: ${CFG_FILE}`);
         say(`  agent=${profile.appId}  runtime=${bound.runtime}  model=${bound.model}`);
@@ -438,21 +351,8 @@ export async function main() {
         say("  larkin setup");
     }
     catch (error) {
-        if (!setupConfigCommitted && pendingMigration) {
-            try {
-                rollbackPiProfileMigration(pendingMigration.state);
-            }
-            catch { /* best effort */ }
-            pendingMigration = null;
-        }
-        providerTransaction?.rollback();
         throw error;
     }
-    finally {
-        authQuestioner?.close?.();
-        process.off("SIGINT", onSigint);
-        process.off("SIGTERM", onSigterm);
-    }
 }
 if (path.resolve(process.argv[1] || "") === path.resolve(fileURLToPath(import.meta.url))) {
     main().catch((error) => die(error instanceof Error ? error.message : String(error)));

package/dist/setup/setup-binding.mjs

@@ -5,14 +5,13 @@ function cloneAgent(agent) {
     return {
         runtime: agent.runtime,
         model: agent.model,
-        ...(agent.piDistribution ? { piDistribution: agent.piDistribution } : {}),
         ...(agent.effort ? { effort: agent.effort } : {}),
         ...(agent.mentionPolicy ? { mentionPolicy: agent.mentionPolicy } : {}),
         ...(Object.keys(chatMentionPolicies).length ? { chatMentionPolicies } : {}),
         ...(agent.createdAt ? { createdAt: agent.createdAt } : {}),
     };
 }
-export function planSingleRootBinding({ config, profile, requestedAgent, runtime, piDistribution, model, defaultModel, supportedReasoningEfforts, now, }) {
+export function planSingleRootBinding({ config, profile, requestedAgent, runtime, model, defaultModel, supportedReasoningEfforts, now, }) {
     if (!/^cli_[A-Za-z0-9]+$/.test(profile.appId))
         throw new Error(`profile.appId 不是合法飞书 App ID：${profile.appId}`);
     if (typeof defaultModel !== "string" || !defaultModel)
@@ -25,22 +24,20 @@ export function planSingleRootBinding({ config, profile, requestedAgent, runtime
     }
     const agents = Object.fromEntries(Object.entries(config.agents).map(([key, agent]) => [key, cloneAgent(agent)]));
     const prior = agents[profile.appId];
-    const nextRuntime = runtime || prior?.runtime || "pi";
-    const nextPiDistribution = nextRuntime === "pi"
-        ? piDistribution || (prior?.runtime === "pi" ? prior.piDistribution : undefined)
-        : undefined;
+    const nextRuntime = runtime || prior?.runtime;
+    if (!nextRuntime)
+        throw new Error("必须指定 --runtime pi|codex|claude");
     if (prior) {
-        const { effort, piDistribution: _priorPiDistribution, ...withoutEffort } = prior;
+        const { effort, ...withoutEffort } = prior;
         agents[profile.appId] = {
             ...withoutEffort,
             runtime: nextRuntime,
             model: model || (prior.runtime === nextRuntime ? prior.model : defaultModel),
-            ...(nextPiDistribution ? { piDistribution: nextPiDistribution } : {}),
             ...(effort && supportedReasoningEfforts.includes(effort) ? { effort } : {}),
         };
     }
     else {
-        agents[profile.appId] = { runtime: nextRuntime, model: model || "default", ...(nextPiDistribution ? { piDistribution: nextPiDistribution } : {}), createdAt: now };
+        agents[profile.appId] = { runtime: nextRuntime, model: model || "default", createdAt: now };
     }
     return {
         version: 4,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkin",
-  "version": "0.4.28",
+  "version": "0.5.0",
   "private": false,
   "larkinPackageRole": "npm-published",
   "files": [
@@ -9,6 +9,7 @@
     "assets/",
     "scripts/npm/",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE",
     "SECURITY.md",
     "CONTRIBUTING.md",
@@ -88,7 +89,6 @@
     "test:live:agent-cli-routing-codex": "bun run build && LARKIN_RUN_AGENT_CLI_ROUTING_CODEX_LIVE=1 bun test --max-concurrency 1 test/live/agent-cli-routing-codex-live.test.mjs"
   },
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.2",
     "@larksuite/channel": "^0.4.0",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/resources": "^2.10.0",
@@ -104,6 +104,7 @@
     "undici": "8.5.0"
   },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "0.84.2",
     "@tailwindcss/vite": "^4.3.3",
     "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.3.2",

package/dist/app/pi-auth-cli.mjs

@@ -1,67 +0,0 @@
-import * as larkinConfig from "../platform/config.mjs";
-import { beginBuiltinPiCredentialTransaction, createOfficialPiCredentialRuntime, createOfficialPiLogoutRuntime, logoutOfficialPiProvider, officialPiAuthStatus, } from "../runtime/pi-official-auth.mjs";
-const APP_ID = /^cli_[A-Za-z0-9]+$/;
-function flag(args, name) {
-    const index = args.indexOf(name);
-    return index >= 0 ? args[index + 1] : undefined;
-}
-export async function main(args = process.argv.slice(2), env = process.env) {
-    const action = args[0] || "status";
-    const json = args.includes("--json");
-    const requestedAgent = flag(args, "--agent");
-    let index = action === "logout" ? 2 : 1;
-    let valid = action === "status" || action === "logout";
-    while (valid && index < args.length) {
-        const argument = args[index];
-        if (argument === "--json" && action === "status") {
-            index += 1;
-            continue;
-        }
-        if (argument === "--agent" && args[index + 1]) {
-            index += 2;
-            continue;
-        }
-        valid = false;
-    }
-    if (!valid) {
-        throw new Error("Usage: larkin pi-auth status [--agent <App ID>] [--json] | larkin pi-auth logout <provider> [--agent <App ID>]");
-    }
-    const loaded = larkinConfig.loadConfig(env);
-    const agentId = requestedAgent || loaded.config.activeAgent || undefined;
-    if (!agentId || !APP_ID.test(agentId))
-        throw new Error("请用 --agent <App ID> 选择 Agent");
-    const agent = loaded.config.agents[agentId];
-    if (!agent)
-        throw new Error(`Agent ${agentId} 不存在`);
-    if (agent.runtime !== "pi" || agent.piDistribution !== "builtin")
-        throw new Error(`Agent ${agentId} 不是内置 Pi`);
-    if (action === "status") {
-        const runtime = await createOfficialPiCredentialRuntime(loaded.configDir, agentId);
-        const statuses = await officialPiAuthStatus(runtime);
-        if (json)
-            console.log(JSON.stringify({ agentId, credentials: statuses }));
-        else if (statuses.length === 0)
-            console.log(`Agent ${agentId} 尚无已配置的官方 Pi credential`);
-        else {
-            console.log(`Agent ${agentId} 官方 Pi credential：`);
-            for (const entry of statuses)
-                console.log(`  ${entry.providerName} (${entry.providerId}): ${entry.credentialType}/${entry.source}${entry.stored ? " [stored]" : " [ambient]"}`);
-        }
-        return;
-    }
-    const providerId = args[1];
-    if (!providerId || providerId.startsWith("--") || !/^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(providerId)) {
-        throw new Error("logout 需要安全的 provider ID");
-    }
-    const transaction = beginBuiltinPiCredentialTransaction(loaded.configDir, agentId);
-    try {
-        const runtime = await createOfficialPiLogoutRuntime(loaded.configDir, agentId);
-        await logoutOfficialPiProvider(runtime, providerId);
-        transaction.commit();
-    }
-    catch (error) {
-        transaction.rollback();
-        throw error;
-    }
-    console.log(`Agent ${agentId} 已退出 ${providerId}；其他 provider 未修改`);
-}