larkin 0.4.25 → 0.4.27

package/dist/runtime/pi-distribution-label.cjs

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.piDistributionLabel = piDistributionLabel;
+function piDistributionLabel(distribution) {
+    return distribution === "builtin" ? "内置 Pi" : "用户安装的 Pi";
+}

package/dist/runtime/pi-distribution-label.mjs

@@ -0,0 +1,3 @@
+export function piDistributionLabel(distribution) {
+    return distribution === "builtin" ? "内置 Pi" : "用户安装的 Pi";
+}

package/dist/runtime/pi-provider-config.cjs

@@ -3,19 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PI_PROVIDER_PRESETS = exports.BUNDLED_PI_VERSION = void 0;
+exports.PI_PROVIDER_PRESETS = exports.BUNDLED_PI_VERSION = exports.piDistributionLabel = void 0;
 exports.validatePiBaseUrl = validatePiBaseUrl;
 exports.listProviderModels = listProviderModels;
 exports.resolveBuiltinPiProviderSetupSelection = resolveBuiltinPiProviderSetupSelection;
 exports.validateBuiltinPiProviderSelection = validateBuiltinPiProviderSelection;
 exports.piAgentDirectory = piAgentDirectory;
+exports.ownedPiCatalogAgentDir = ownedPiCatalogAgentDir;
+exports.piCatalogCommandSpec = piCatalogCommandSpec;
 exports.assertBuiltinPiAgentDirectory = assertBuiltinPiAgentDirectory;
 exports.configureBuiltinPiProviderModel = configureBuiltinPiProviderModel;
 exports.stageBuiltinPiProvider = stageBuiltinPiProvider;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const internal_command_js_1 = require("../app/internal-command.cjs");
 const secure_metadata_js_1 = require("../platform/secure-metadata.cjs");
+var pi_distribution_label_js_1 = require("./pi-distribution-label.cjs");
+Object.defineProperty(exports, "piDistributionLabel", { enumerable: true, get: function () { return pi_distribution_label_js_1.piDistributionLabel; } });
 exports.BUNDLED_PI_VERSION = "0.84.2";
 // These values mirror the catalog shipped by the pinned official Pi distribution.
 // Keeping the user-facing defaults here makes endpoint changes reviewable in Larkin.
@@ -137,6 +142,20 @@ function piAgentDirectory(configDir, agentId) {
         throw new Error("Pi Agent ID 格式无效");
     return node_path_1.default.join(node_path_1.default.resolve(configDir), "providers", "pi", agentId);
 }
+/** Catalog/CLI/dashboard must use the Agent-owned provider dir, never host ~/.pi. */
+function ownedPiCatalogAgentDir(configDir, agentId) {
+    return piAgentDirectory(configDir, agentId);
+}
+function piCatalogCommandSpec(distribution, env = process.env) {
+    if (distribution === "builtin") {
+        const spec = (0, internal_command_js_1.internalCommandSpec)("pi-rpc", [], env);
+        return { command: spec.command, commandArgs: spec.args };
+    }
+    return {
+        command: env.LARKIN_PI_COMMAND ?? process.env.LARKIN_PI_COMMAND ?? "pi",
+        commandArgs: [],
+    };
+}
 function assertPrivateDirectory(directory) {
     if (secure_metadata_js_1.isWindows) {
         // Windows 无 POSIX 权限位：icacls 收紧为「当前用户 + SYSTEM」并回读校验。

package/dist/runtime/pi-provider-config.mjs

@@ -1,7 +1,9 @@
 import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { internalCommandSpec } from "../app/internal-command.mjs";
 import { isWindows, secureWindowsDirectoryAcl } from "../platform/secure-metadata.mjs";
+export { piDistributionLabel } from "./pi-distribution-label.mjs";
 export const BUNDLED_PI_VERSION = "0.84.2";
 // These values mirror the catalog shipped by the pinned official Pi distribution.
 // Keeping the user-facing defaults here makes endpoint changes reviewable in Larkin.
@@ -123,6 +125,20 @@ export function piAgentDirectory(configDir, agentId) {
         throw new Error("Pi Agent ID 格式无效");
     return path.join(path.resolve(configDir), "providers", "pi", agentId);
 }
+/** Catalog/CLI/dashboard must use the Agent-owned provider dir, never host ~/.pi. */
+export function ownedPiCatalogAgentDir(configDir, agentId) {
+    return piAgentDirectory(configDir, agentId);
+}
+export function piCatalogCommandSpec(distribution, env = process.env) {
+    if (distribution === "builtin") {
+        const spec = internalCommandSpec("pi-rpc", [], env);
+        return { command: spec.command, commandArgs: spec.args };
+    }
+    return {
+        command: env.LARKIN_PI_COMMAND ?? process.env.LARKIN_PI_COMMAND ?? "pi",
+        commandArgs: [],
+    };
+}
 function assertPrivateDirectory(directory) {
     if (isWindows) {
         // Windows 无 POSIX 权限位：icacls 收紧为「当前用户 + SYSTEM」并回读校验。

package/dist/runtime/runtime-readiness.cjs

@@ -42,8 +42,10 @@ 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");
@@ -162,11 +164,27 @@ async function probeNativeRuntimeReadiness(options) {
                 ? "Install Pi and ensure `pi` is on PATH, or set LARKIN_PI_COMMAND."
                 : `Install ${options.runtime} and ensure it is on PATH.`,
         };
+    const piAgentId = options.agentId;
+    if (options.runtime === "pi" && !piAgentId) {
+        return {
+            runtime: "pi",
+            state: "unavailable",
+            executable,
+            reason: "Pi catalog readiness requires Agent ID",
+            nextAction: "Retry setup or start so Larkin can probe the Agent-owned Pi provider directory.",
+        };
+    }
     const version = executableVersion(executable, env, options.commandArgs);
     try {
         if (options.runtime === "pi") {
             const { discoverPiModelCatalog } = await Promise.resolve().then(() => __importStar(require("./pi-model-catalog.cjs")));
-            await discoverPiModelCatalog({ cwd: options.cwd, command: executable, commandArgs: options.commandArgs, env });
+            await discoverPiModelCatalog({
+                cwd: options.cwd,
+                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") {
             const { discoverCodexModelCatalog } = await Promise.resolve().then(() => __importStar(require("./codex-model-catalog.cjs")));

package/dist/runtime/runtime-readiness.mjs

@@ -1,8 +1,10 @@
 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, piAgentDirectory } from "./pi-provider-config.mjs";
+import { assertBuiltinPiAgentDirectory, BUNDLED_PI_VERSION, ownedPiCatalogAgentDir, piAgentDirectory } from "./pi-provider-config.mjs";
 import { traceProcessBoundary } from "../platform/process-boundary-trace.mjs";
 function safeProviderLabel(value) {
     const provider = typeof value === "string" ? value.trim() : "";
@@ -118,11 +120,27 @@ export async function probeNativeRuntimeReadiness(options) {
                 ? "Install Pi and ensure `pi` is on PATH, or set LARKIN_PI_COMMAND."
                 : `Install ${options.runtime} and ensure it is on PATH.`,
         };
+    const piAgentId = options.agentId;
+    if (options.runtime === "pi" && !piAgentId) {
+        return {
+            runtime: "pi",
+            state: "unavailable",
+            executable,
+            reason: "Pi catalog readiness requires Agent ID",
+            nextAction: "Retry setup or start so Larkin can probe the Agent-owned Pi provider directory.",
+        };
+    }
     const version = executableVersion(executable, env, options.commandArgs);
     try {
         if (options.runtime === "pi") {
             const { discoverPiModelCatalog } = await import("./pi-model-catalog.mjs");
-            await discoverPiModelCatalog({ cwd: options.cwd, command: executable, commandArgs: options.commandArgs, env });
+            await discoverPiModelCatalog({
+                cwd: options.cwd,
+                command: executable,
+                commandArgs: options.commandArgs,
+                env,
+                agentDir: ownedPiCatalogAgentDir(resolveRootConfigDir(env, os.homedir()), piAgentId),
+            });
         }
         else if (options.runtime === "codex") {
             const { discoverCodexModelCatalog } = await import("./codex-model-catalog.mjs");

package/dist/setup/bot-register.mjs

@@ -666,7 +666,8 @@ Lark 必须用 --tenant lark：授权二维码是官方 /page/cli（begin 仍走
             const choice = injectedAgentChoice
                 ? requested
                 : await recoverUnavailableExternalPi(requested, questioner, () => probeNativeRuntimeReadiness({
-                    runtime: "pi", agentId: id, cwd: path.join(CFG_DIR, "agents", id), env: process.env,
+                    runtime: "pi", agentId: id, cwd: path.join(CFG_DIR, "agents", id),
+                    env: { ...process.env, LARKIN_CONFIG_DIR: CFG_DIR, LARKIN_PI_DISTRIBUTION: "external" },
                 }), (message) => say(`! ${message}`), authServices);
             if (choice) {
                 let serializedChoice = choice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkin",
-  "version": "0.4.25",
+  "version": "0.4.27",
   "private": false,
   "larkinPackageRole": "npm-published",
   "files": [