larkin 0.4.9 → 0.4.11

package/dist/setup/setup-bind.mjs

@@ -9,12 +9,12 @@ 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 { discoverPiModelCatalog } from "../runtime/pi-model-catalog.mjs";
 import { configureBuiltinPiProviderModel } from "../runtime/pi-provider-config.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";
 const larkinConfig = larkinConfigImport;
 const layout = TargetRootLayout.fromConfigDir(larkinConfig.resolveConfigDir(process.env));
 const CFG_DIR = layout.root;
@@ -72,20 +72,49 @@ function openAuthUrl(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 });
+    try {
+        const parsed = JSON.parse(result.stdout || "[]");
+        return Array.isArray(parsed) ? parsed : [];
+    }
+    catch {
+        return [];
+    }
+}
 function listProfiles() {
-    const result = larkJson(["profile", "list"]);
-    if (!result.ok || !Array.isArray(result.json)) {
-        die("读取 lark-cli profile 失败；未修改 Agent 配置，请检查隔离 profile 后重试 setup");
+    const isolated = listProfilesFromEnv(larkEnv());
+    const globalEnv = { ...process.env };
+    delete globalEnv.LARKSUITE_CLI_CONFIG_DIR;
+    const global = listProfilesFromEnv(globalEnv);
+    const seen = new Set();
+    const merged = [];
+    for (const profile of [...isolated, ...global]) {
+        const key = `${String(profile.name || "")}\0${String(profile.appId || "")}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        merged.push(profile);
     }
-    return result.json;
+    return merged;
+}
+function resolveProfile(requested, profiles) {
+    return profiles.find((profile) => profile.name === requested)
+        || profiles.find((profile) => profile.appId === requested);
 }
 async function pickProfile() {
-    if (options.profile) {
-        if (!APP_ID.test(options.profile))
-            die(`profile ${options.profile} 不是合法 App ID`);
+    if (options.profile && APP_ID.test(options.profile)) {
         return { name: options.profile, appId: options.profile, active: true };
     }
     const profiles = listProfiles();
+    if (options.profile) {
+        const matched = resolveProfile(options.profile, profiles);
+        if (matched && typeof matched.appId === "string" && APP_ID.test(matched.appId)) {
+            return { name: String(matched.name || matched.appId), appId: matched.appId, active: matched.active };
+        }
+        die(`找不到 lark-cli profile ${options.profile}（可用名字或 App ID，不要求名字等于 App ID）`);
+    }
     if (profiles.length === 0)
         die("lark-cli 里还没有 bot profile。请运行 larkin setup 创建或连接机器人");
     say("\n可复用的飞书（Lark）机器人（lark-cli profiles）：");
@@ -96,7 +125,19 @@ async function pickProfile() {
     const selected = answer === "" ? activeIndex : Number(answer) - 1;
     if (!(selected >= 0 && selected < profiles.length))
         die("无效的 profile 选择");
-    return profiles[selected];
+    const picked = profiles[selected];
+    if (typeof picked.appId !== "string" || !APP_ID.test(picked.appId)) {
+        die(`profile ${picked.name || "?"} 没有合法 App ID`);
+    }
+    return picked;
+}
+function requireUsableBotCredential(appId) {
+    try {
+        loadValidatedBotCredential(path.join(CFG_DIR, "bots"), appId);
+    }
+    catch {
+        die(`没有可用的 bot 凭证 ${appId}（bots/${appId}.json）；未修改 Agent 配置，请先运行 larkin setup 完成扫码授权`);
+    }
 }
 function verifyBot(profile) {
     const result = larkJson(["--profile", profile.name, "im", "+chat-list", "--as", "bot", "--json"]);
@@ -210,9 +251,11 @@ export async function main() {
     }
     say("=== larkin 多 Agent onboarding ===");
     const profile = await pickProfile();
-    if (typeof profile?.appId !== "string" || !APP_ID.test(profile.appId) || profile.name !== profile.appId) {
-        die("profile name 与合法 App ID 必须完全一致；未修改 Agent 配置，请重新运行 larkin setup 刷新 profile");
+    if (typeof profile.appId !== "string" || !APP_ID.test(profile.appId)) {
+        die(`profile ${profile.name || "?"} 没有合法 App ID；未修改 Agent 配置`);
     }
+    say(`使用 profile ${profile.name} → App ID ${profile.appId}`);
+    requireUsableBotCredential(profile.appId);
     if (!options.profile)
         verifyBot(profile);
     const requestedAgent = options.agent || profile.appId;
@@ -226,16 +269,11 @@ export async function main() {
     const selectedModel = selection?.runtime === "pi" && selection.distribution === "builtin" ? selection.model : undefined;
     const targetModelId = selectedModel || (prior?.runtime === runtime ? prior.model : defaultModel);
     let runtimeModels = larkinConfig.loadRuntimeModels()[runtime];
-    if (runtime === "pi" && piDistribution === "builtin") {
-        runtimeModels = [{ id: targetModelId, supportedReasoningEfforts: [] }];
-    }
-    else if (runtime === "pi") {
-        const piCatalog = await discoverPiModelCatalog({
-            cwd: layout.workspaceDir(profile.appId),
-            ...(process.env.PI_CODING_AGENT_DIR ? { agentDir: process.env.PI_CODING_AGENT_DIR } : {}),
-        });
-        const effective = piCatalog.models.find((model) => model.id === piCatalog.effectiveModel);
-        runtimeModels = [{ id: "default", supportedReasoningEfforts: effective?.supportedReasoningEfforts || [] }, ...piCatalog.models];
+    if (runtime === "pi") {
+        const preservedEffort = prior?.runtime === "pi" && typeof prior.effort === "string" && prior.effort.trim()
+            ? [prior.effort]
+            : [];
+        runtimeModels = [{ id: targetModelId, supportedReasoningEfforts: preservedEffort }];
     }
     const targetModel = runtimeModels.find((model) => model.id === targetModelId);
     if (!targetModel)
@@ -245,7 +283,7 @@ export async function main() {
         profile,
         requestedAgent,
         runtime: selection?.runtime || options.runtime,
-        ...(selection?.runtime === "pi" ? { piDistribution: selection.distribution } : {}),
+        ...(runtime === "pi" && piDistribution ? { piDistribution } : {}),
         ...(selectedModel ? { model: selectedModel } : {}),
         defaultModel,
         supportedReasoningEfforts: targetModel.supportedReasoningEfforts || [],

package/dist/setup/setup-official-cli-register.mjs

@@ -0,0 +1,74 @@
+import { spawn as systemSpawn } from "node:child_process";
+const APP_ID = /^cli_[A-Za-z0-9]+$/;
+const SETUP_URL = /https:\/\/open\.(?:larksuite\.com|feishu\.cn)\/page\/cli\?[^\s]+/;
+export function parseOfficialCliAuthorizationUrl(text) {
+    return text.match(SETUP_URL)?.[0] ?? null;
+}
+export function parseOfficialCliInitOutput(text) {
+    const authorizationUrl = parseOfficialCliAuthorizationUrl(text);
+    const appId = text.match(/App ID:\s*(cli_[A-Za-z0-9]+)/)?.[1]
+        || text.match(/"appId"\s*:\s*"(cli_[A-Za-z0-9]+)"/)?.[1];
+    const brand = text.match(/"brand"\s*:\s*"(lark|feishu)"/)?.[1];
+    if (!authorizationUrl)
+        throw new Error("官方 lark-cli init 未返回 /page/cli 授权链接");
+    if (!appId || !APP_ID.test(appId))
+        throw new Error("官方 lark-cli init 未返回合法 App ID");
+    if (brand !== "lark" && brand !== "feishu")
+        throw new Error("官方 lark-cli init 未返回合法 brand");
+    return { appId, authorizationUrl, brand };
+}
+export function officialCliInitArgs(tenant, profileName) {
+    if (!/^[A-Za-z0-9._-]{1,64}$/.test(profileName))
+        throw new Error("lark-cli profile name 非法");
+    return ["config", "init", "--new", "--brand", tenant, "--name", profileName];
+}
+export async function runOfficialCliAppInit(input) {
+    const args = [...input.official.argsPrefix, ...officialCliInitArgs(input.tenant, input.profileName)];
+    const child = (input.spawnImpl ?? systemSpawn)(input.official.command, args, {
+        env: input.env,
+        stdio: ["ignore", "pipe", "pipe"],
+    });
+    input.onChild?.(child);
+    let output = "";
+    let presented = false;
+    const consume = (chunk) => {
+        output += String(chunk);
+        if (presented)
+            return;
+        const url = parseOfficialCliAuthorizationUrl(output);
+        if (!url)
+            return;
+        presented = true;
+        input.onAuthorizationUrl(url);
+    };
+    child.stdout?.on("data", consume);
+    child.stderr?.on("data", consume);
+    const abort = () => {
+        child.kill("SIGTERM");
+        const killTimer = setTimeout(() => {
+            if (child.exitCode === null && child.signalCode === null)
+                child.kill("SIGKILL");
+        }, 1_000);
+        killTimer.unref?.();
+    };
+    if (input.signal?.aborted)
+        abort();
+    else
+        input.signal?.addEventListener("abort", abort, { once: true });
+    try {
+        const status = await new Promise((resolve, reject) => {
+            child.once("error", reject);
+            child.once("exit", (code) => resolve(code));
+        });
+        if (input.signal?.aborted)
+            throw new Error("官方 lark-cli init 已取消");
+        const parsed = parseOfficialCliInitOutput(output);
+        if (status !== 0)
+            throw new Error(`官方 lark-cli init 失败（exit=${status ?? "none"}）`);
+        return parsed;
+    }
+    finally {
+        input.signal?.removeEventListener("abort", abort);
+        input.onChild?.(null);
+    }
+}

package/package.json

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