larkin 0.4.29 → 0.5.0

package/dist/runtime/runtime-readiness.cjs

@@ -38,25 +38,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimePrerequisiteError = void 0;
 exports.safeProviderId = safeProviderId;
-exports.isBuiltinPiDistribution = isBuiltinPiDistribution;
 exports.configuredProviderId = configuredProviderId;
 exports.parsePersistedAuthFailure = parsePersistedAuthFailure;
 exports.authFailureAppliesTo = authFailureAppliesTo;
 exports.readinessForPersistedAuthFailure = readinessForPersistedAuthFailure;
 exports.classifyPiMissingCredentialRejection = classifyPiMissingCredentialRejection;
+exports.runtimeInstallNextAction = runtimeInstallNextAction;
+exports.runtimeLoginNextAction = runtimeLoginNextAction;
 exports.providerAuthenticationFailureReadiness = providerAuthenticationFailureReadiness;
 exports.missingProviderCredentialReadiness = missingProviderCredentialReadiness;
 exports.resolveRuntimeExecutable = resolveRuntimeExecutable;
 exports.classifyRuntimePrerequisite = classifyRuntimePrerequisite;
 exports.probeNativeRuntimeReadiness = probeNativeRuntimeReadiness;
 const node_fs_1 = __importDefault(require("node:fs"));
-const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
-const root_layout_js_1 = require("../platform/root-layout.cjs");
-const builtin_pi_assets_js_1 = require("./builtin-pi-assets.cjs");
-const pi_provider_config_js_1 = require("./pi-provider-config.cjs");
-const process_boundary_trace_js_1 = require("../platform/process-boundary-trace.cjs");
 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;
@@ -64,9 +60,6 @@ function safeProviderId(value) {
 function safeProviderLabel(value) {
     return safeProviderId(value);
 }
-function isBuiltinPiDistribution(value) {
-    return value === "builtin";
-}
 /** Model ids are `provider/model`; only the provider prefix is used for scope. */
 function configuredProviderId(model) {
     const value = typeof model === "string" ? model.trim() : "";
@@ -89,53 +82,20 @@ 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);
+    return current.adapterId ?? current.runtime;
 }
-function currentIsBuiltinPi(current) {
-    return currentAdapterId(current) === "pi"
-        && (isBuiltinPiDistribution(current.piDistribution) || current.runtime === "builtin-pi");
-}
-/**
- * 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.
- */
 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;
 }
 function readinessForPersistedAuthFailure(failure) {
@@ -154,6 +114,20 @@ function classifyPiMissingCredentialRejection(message) {
     const provider = match ? safeProviderLabel(match[2]) : null;
     return provider && match ? { provider, diagnostic: `${match[1]} ${provider}` } : null;
 }
+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.";
+}
+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.";
+}
 function providerAuthenticationFailureReadiness(runtime, provider) {
     const label = safeProviderLabel(provider);
     return {
@@ -162,23 +136,20 @@ 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。 */
 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"
-            ? (0, pi_provider_config_js_1.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),
     };
 }
 class RuntimePrerequisiteError extends Error {
@@ -211,27 +182,29 @@ 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: runtime === "pi"
-                ? "Run the official `pi` login flow, then retry."
-                : `Authenticate ${runtime}, then retry.`,
+            nextAction: runtimeLoginNextAction(runtime),
         };
-    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.`,
@@ -254,44 +227,15 @@ function executableVersion(executable, env, commandArgs = []) {
 }
 /** Resolve and handshake through each runtime's structured native control protocol. */
 async function probeNativeRuntimeReadiness(options) {
-    let env = { ...process.env, ...options.env };
-    const piDistribution = options.runtime === "pi" ? (0, builtin_pi_assets_js_1.piChildDistributionFromOverrides)(options.env) : "external";
-    if (options.runtime === "pi" && piDistribution !== "builtin") {
-        if (env.LARKIN_PI_DISTRIBUTION === "builtin")
-            delete env.LARKIN_PI_DISTRIBUTION;
-        env = (0, builtin_pi_assets_js_1.applyPiPackageDirForChild)(env, { distribution: "external" });
-    }
-    if (options.runtime === "pi" && piDistribution === "builtin") {
-        try {
-            if (!options.agentId || !env.LARKIN_CONFIG_DIR)
-                throw new Error("内置 Pi readiness 缺少 Agent/config identity");
-            (0, pi_provider_config_js_1.assertBuiltinPiAgentDirectory)((0, pi_provider_config_js_1.piAgentDirectory)(env.LARKIN_CONFIG_DIR, options.agentId));
-            return { runtime: "pi", state: "ready", executable: process.execPath, version: `official-pi ${pi_provider_config_js_1.BUNDLED_PI_VERSION} (bundled)` };
-        }
-        catch (error) {
-            (0, process_boundary_trace_js_1.traceProcessBoundary)(env, "readiness:builtin-pi-failure", { configDir: env.LARKIN_CONFIG_DIR, agentId: options.agentId, targetDir: options.agentId && env.LARKIN_CONFIG_DIR ? (0, pi_provider_config_js_1.piAgentDirectory)(env.LARKIN_CONFIG_DIR, options.agentId) : undefined, error });
-            return { runtime: "pi", state: "unauthenticated", reason: error instanceof Error ? error.message : String(error),
-                nextAction: (0, pi_provider_config_js_1.builtinPiProviderRecoveryNextAction)({ agentId: options.agentId }) };
-        }
-    }
+    const env = { ...process.env, ...options.env };
     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) {
+    if (!executable) {
         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.",
+            runtime: options.runtime,
+            state: "missing",
+            reason: `${options.runtime} is not installed`,
+            nextAction: runtimeInstallNextAction(options.runtime),
         };
     }
     const version = executableVersion(executable, env, options.commandArgs);
@@ -303,7 +247,6 @@ async function probeNativeRuntimeReadiness(options) {
                 command: executable,
                 commandArgs: options.commandArgs,
                 env,
-                agentDir: (0, pi_provider_config_js_1.ownedPiCatalogAgentDir)((0, root_layout_js_1.resolveConfigDir)(env, node_os_1.default.homedir()), piAgentId),
             });
         }
         else if (options.runtime === "codex") {

package/dist/runtime/runtime-readiness.mjs

@@ -1,11 +1,6 @@
 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";
 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 +8,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 +30,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);
+    return current.adapterId ?? current.runtime;
 }
-function currentIsBuiltinPi(current) {
-    return currentAdapterId(current) === "pi"
-        && (isBuiltinPiDistribution(current.piDistribution) || current.runtime === "builtin-pi");
-}
-/**
- * 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 +62,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 +84,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 +129,29 @@ 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: runtime === "pi"
-                ? "Run the official `pi` login flow, then retry."
-                : `Authenticate ${runtime}, then retry.`,
+            nextAction: runtimeLoginNextAction(runtime),
         };
-    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,44 +174,15 @@ 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" });
-    }
-    if (options.runtime === "pi" && piDistribution === "builtin") {
-        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)` };
-        }
-        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 env = { ...process.env, ...options.env };
     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) {
+    if (!executable) {
         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.",
+            runtime: options.runtime,
+            state: "missing",
+            reason: `${options.runtime} is not installed`,
+            nextAction: runtimeInstallNextAction(options.runtime),
         };
     }
     const version = executableVersion(executable, env, options.commandArgs);
@@ -251,7 +194,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}`);
-}