larkin 0.4.10 → 0.4.11

package/dist/app/setup.mjs

@@ -82,11 +82,10 @@ Options:
   --base-url <url>                      custom 端点（provider=custom 时必填；也可覆盖 preset 默认端点）
   --model <id>                          模型 ID；默认取 provider 预设。不同 runtime 的模型可用
                                           \`larkin model\` 查看 / 切换
-  --tenant feishu|lark                  授权二维码之前选择品牌。默认 feishu（accounts.feishu.cn /
-                                          https://open.feishu.cn）。Lark 用 --tenant lark
-                                          （accounts.larksuite.com / https://open.larksuite.com）。
-                                          交互式未指定时会先询问。飞书与 Lark 是不同平台，
-                                          Lark 租户不得使用 feishu.cn 主机。
+  --from-cli-profile <name>            可选：复用已有官方 lark-cli profile（需 LARKIN_SETUP_APP_SECRET）
+  --tenant feishu|lark                  授权二维码之前选择品牌。默认 feishu（扫码 /page/launcher）。
+                                          Lark 用 --tenant lark：扫码 /page/cli，完成后凭证回传，
+                                          不要打开 /page/launcher。交互式未指定时会先询问。
 
 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
@@ -163,12 +162,13 @@ 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"]) {
+    for (const name of ["--provider", "--api-key", "--base-url", "--model", "--from-cli-profile"]) {
         const value = flag(name);
         if (value)
             registerArgs.push(name, value);
     }
     const result = await runForeground("bot-register", registerArgs);
+    delete process.env.LARKIN_SETUP_APP_SECRET;
     if (result.code !== 0)
         die("机器人授权或 Agent 配置未完成");
     let agentId;

package/dist/setup/bot-register.mjs

@@ -18,6 +18,7 @@ import { configureBuiltinPiProviderModel, stageBuiltinPiProvider, validatePiBase
 import { beginBuiltinPiCredentialTransaction, createOfficialPiCredentialRuntime, createOfficialPiAuthInteraction, createOfficialPiModelRuntime, createOfficialPiLogoutRuntime, createOfficialPiRegistryRuntime, listOfficialPiAuthProviders, logoutOfficialPiProvider, officialPiAuthStatus, runOfficialPiLogin, verifyOfficialPiProviderTurn, } from "../runtime/pi-official-auth.mjs";
 import { documentCommentSubscriptionCapability, markDocumentCommentSubscriptionVerified, } from "../platform/callback-capability.mjs";
 import { openPlatformHost, parseLarkinTenant, registerAppAccountsHost, } from "../feishu/platform-hosts.mjs";
+import { authorizationUrlFailureMessage, presentAuthorizationUrl } from "./setup-authorization-url.mjs";
 // qrcode-terminal does not publish TypeScript declarations.
 // @ts-expect-error bundled CommonJS dependency
 import qrcodePackage from "qrcode-terminal";
@@ -466,8 +467,10 @@ export async function main() {
 用法:
   bun bot-register.mjs --auto [--tenant feishu|lark]
 
---tenant 在授权二维码之前选择品牌。默认 feishu（accounts.feishu.cn）；
-Lark 必须用 --tenant lark 或交互选择，授权主机是 accounts.larksuite.com。
+--tenant 在授权二维码之前选择品牌。默认 feishu（accounts.feishu.cn /page/launcher）。
+Lark 必须用 --tenant lark：授权二维码是官方 /page/cli（begin 仍走飞书 accounts，
+打开 open.larksuite.com），不要打开 /page/launcher（ack 10074 / 链接已失效）。
+扫码完成后凭证回传，无需手抄 App Secret。
 
 完成后自动：按返回 appId 判定新旧 → 同步并校验 lark-cli bot 凭证 →
   原子写 bots/<appId>.json（0600）→ 绑定 Agent。`);
@@ -486,11 +489,14 @@ Lark 必须用 --tenant lark 或交互选择，授权主机是 accounts.larksuit
         die("--result-file 必须是配置根目录内的 .setup-result-<pid>.json");
     }
     if (argv.some((arg) => arg === "--app-id" || arg.startsWith("--app-id="))) {
-        die("不支持 --app-id；机器人必须在飞书（Lark）网页中选择");
+        die("不支持 --app-id；机器人必须在飞书（Lark）网页中选择。已有官方 lark-cli profile 时用 --from-cli-profile");
     }
+    const fromCliProfile = flag("--from-cli-profile") || "";
+    if (fromCliProfile && !/^[A-Za-z0-9._-]{1,64}$/.test(fromCliProfile))
+        die("--from-cli-profile 非法");
     if (!autoSelect)
         die("setup 注册阶段必须由交互式选择流程启动");
-    const selectedTenant = await resolveSelectedTenant();
+    let selectedTenant = await resolveSelectedTenant();
     say(`[setup 1/5] 在${selectedTenant === "lark" ? " International Lark" : "中国飞书 Feishu"}网页选择已有机器人或创建新机器人`);
     if (commentSubscription === "application") {
         say(`! 已显式选择 ${commentSubscription} 维度评论订阅：一旦平台状态验证为已订阅，Bot 可见文档中实际送达的每条支持评论都会进入 Inbox 并唤醒 Agent，不要求 @Bot。`);
@@ -524,30 +530,91 @@ Lark 必须用 --tenant lark 或交互选择，授权主机是 accounts.larksuit
         "docs:document.comment:create",
     ];
     const TENANT_EVENTS = ["im.message.receive_v1", "im.message.message_read_v1", "drive.notice.comment_add_v1"];
+    const LARKIN_REGISTER_ADDONS = {
+        scopes: { tenant: TENANT_SCOPES },
+        events: { items: { tenant: TENANT_EVENTS } },
+        callbacks: { items: ["card.action.trigger"] },
+    };
     let pollingCount = 0;
-    const result = await registerApp({
-        source: "larkin",
-        domain: registerAppAccountsHost(selectedTenant),
-        larkDomain: registerAppAccountsHost("lark"),
-        addons: {
-            scopes: { tenant: TENANT_SCOPES },
-            events: { items: { tenant: TENANT_EVENTS } },
-            callbacks: { items: ["card.action.trigger"] },
-        },
-        onQRCodeReady: ({ url, expireIn }) => {
-            qrcode.generate(url, { small: true }, (code) => say(code));
-            say(`\n打开以下链接（或扫码），${Math.round(expireIn / 60)} 分钟内有效：\n\n  ${url}\n\n[setup 2/5] 等待飞书（Lark）网页完成授权并回传凭证…`);
-            say(openBrowser(url) ? "[setup] 已在默认浏览器打开授权页" : "[setup] 未能自动打开浏览器，请手动打开上面的链接");
-        },
-        onStatusChange: ({ status, interval }) => {
-            if (status === "domain_switched")
-                say("[setup] 已切换到 Lark 域名");
-            if (status === "slow_down")
-                say(`[setup] 飞书（Lark）要求降低轮询频率，${interval || "稍后"}秒后继续`);
-            if (status === "polling" && ++pollingCount % 12 === 0)
-                say(`[setup] 仍在等待飞书（Lark）回传凭证（约 ${pollingCount / 12} 分钟）…`);
-        },
-    }).catch(() => die("网页授权失败；未执行凭证同步、文件写入或 Agent 绑定，请重试 setup"));
+    const presentUrl = (url, expireIn) => {
+        qrcode.generate(url, { small: true }, (code) => say(code));
+        say(`\n打开以下链接（或扫码），${Math.round(expireIn / 60)} 分钟内有效：\n\n  ${url}\n\n[setup 2/5] 等待飞书（Lark）网页完成授权并回传凭证…`);
+        say(openBrowser(url) ? "[setup] 已在默认浏览器打开授权页" : "[setup] 未能自动打开浏览器，请手动打开上面的链接");
+    };
+    const importedSecret = typeof process.env.LARKIN_SETUP_APP_SECRET === "string"
+        ? process.env.LARKIN_SETUP_APP_SECRET.trim() : "";
+    delete process.env.LARKIN_SETUP_APP_SECRET;
+    let result = null;
+    if (fromCliProfile) {
+        if (!importedSecret)
+            die("--from-cli-profile 需要环境变量 LARKIN_SETUP_APP_SECRET（App Secret 不进 argv）");
+        const official = officialCliForProfile(process.env);
+        const listed = spawnSync(official.command, [...official.argsPrefix, "profile", "list"], { encoding: "utf8", env: process.env });
+        let profiles = [];
+        try {
+            profiles = JSON.parse(listed.stdout || "[]");
+        }
+        catch {
+            die("读取 lark-cli profile list 失败");
+        }
+        const matched = profiles.find((profile) => profile.name === fromCliProfile);
+        if (matched == null || typeof matched.appId !== "string" || !APP_ID.test(matched.appId)) {
+            die(`找不到 lark-cli profile ${fromCliProfile}`);
+        }
+        else {
+            const brand = matched.brand === "lark" || matched.brand === "feishu" ? matched.brand : selectedTenant;
+            selectedTenant = brand;
+            result = { client_id: matched.appId, client_secret: importedSecret, user_info: { tenant_brand: brand } };
+            say(`[setup 1/5] 复用官方 lark-cli profile ${fromCliProfile} → ${matched.appId}`);
+        }
+    }
+    else if (selectedTenant === "lark") {
+        // Official lark-cli always begins on Feishu accounts, then presents
+        // open.larksuite.com/page/cli. Beginning on Lark accounts yields /page/launcher
+        // codes that open.larksuite.com ack rejects with 10074.
+        say("[setup 1/5] Lark 租户走官方 /page/cli 扫码授权；扫码完成后凭证回传，不要打开 /page/launcher");
+        const official = officialCliForProfile(process.env);
+        result = await registerApp({
+            source: "larkin",
+            domain: registerAppAccountsHost("feishu"),
+            larkDomain: registerAppAccountsHost("lark"),
+            addons: LARKIN_REGISTER_ADDONS,
+            onQRCodeReady: ({ url, expireIn }) => {
+                const presented = presentAuthorizationUrl(url, { tenant: "lark", larkCliVersion: official.version });
+                if (/\/page\/launcher(?:\?|$)/.test(presented)) {
+                    throw new Error("Lark 租户拒绝把 /page/launcher 交给浏览器");
+                }
+                presentUrl(presented, expireIn);
+            },
+            onStatusChange: ({ status, interval }) => {
+                if (status === "domain_switched")
+                    say("[setup] 已切换到 Lark 域名");
+                if (status === "slow_down")
+                    say(`[setup] 飞书（Lark）要求降低轮询频率，${interval || "稍后"}秒后继续`);
+                if (status === "polling" && ++pollingCount % 12 === 0)
+                    say(`[setup] 仍在等待飞书（Lark）回传凭证（约 ${pollingCount / 12} 分钟）…`);
+            },
+        }).catch((error) => die(authorizationUrlFailureMessage(error)));
+    }
+    else {
+        result = await registerApp({
+            source: "larkin",
+            domain: registerAppAccountsHost(selectedTenant),
+            larkDomain: registerAppAccountsHost("lark"),
+            addons: LARKIN_REGISTER_ADDONS,
+            onQRCodeReady: ({ url, expireIn }) => {
+                presentUrl(url, expireIn);
+            },
+            onStatusChange: ({ status, interval }) => {
+                if (status === "domain_switched")
+                    say("[setup] 已切换到 Lark 域名");
+                if (status === "slow_down")
+                    say(`[setup] 飞书（Lark）要求降低轮询频率，${interval || "稍后"}秒后继续`);
+                if (status === "polling" && ++pollingCount % 12 === 0)
+                    say(`[setup] 仍在等待飞书（Lark）回传凭证（约 ${pollingCount / 12} 分钟）…`);
+            },
+        }).catch((error) => die(authorizationUrlFailureMessage(error)));
+    }
     const { client_id: rawId, client_secret: rawSecret, user_info: userInfo } = result || {};
     if (typeof rawId !== "string" || !APP_ID.test(rawId))
         die("授权返回的 App ID 格式非法；未执行凭证同步、文件写入或 Agent 绑定");

package/dist/setup/setup-authorization-url.mjs

@@ -0,0 +1,50 @@
+import { openPlatformHost } from "../feishu/platform-hosts.mjs";
+// Official lark-cli presents /page/cli. node-sdk registerApp returns /page/launcher,
+// which open.larksuite.com ack rejects with 10074 ("链接已失效") for Lark tenants.
+export function officialCliSetupUrl(input) {
+    const userCode = input.userCode.trim();
+    if (!/^[A-Z0-9]{4}-[A-Z0-9]{4}$/.test(userCode))
+        throw new Error("setup user_code 格式非法");
+    const version = input.larkCliVersion.trim();
+    if (!/^\d+\.\d+\.\d+$/.test(version))
+        throw new Error("lark-cli version 格式非法");
+    const url = new URL(`${openPlatformHost(input.tenant)}/page/cli`);
+    url.searchParams.set("user_code", userCode);
+    url.searchParams.set("lpv", version);
+    url.searchParams.set("ocv", version);
+    url.searchParams.set("from", "cli");
+    return url.toString();
+}
+export function presentAuthorizationUrl(rawUrl, input) {
+    let parsed;
+    try {
+        parsed = new URL(rawUrl);
+    }
+    catch {
+        throw new Error("授权 URL 非法");
+    }
+    const userCode = parsed.searchParams.get("user_code") || "";
+    // Feishu China still authorizes on /page/launcher. Only International Lark
+    // must leave launcher (open.larksuite.com ack 10074 / 链接已失效).
+    if (input.tenant === "lark" && parsed.pathname === "/page/launcher") {
+        if (!userCode)
+            throw new Error("Lark 租户拒绝把 /page/launcher 交给浏览器");
+        const presented = new URL(officialCliSetupUrl({ tenant: "lark", userCode, larkCliVersion: input.larkCliVersion }));
+        // node-sdk registerApp encodes scopes/events/callbacks only on the landing URL
+        // (`addons=`). Keep that payload when rewriting launcher → /page/cli so Lark
+        // still requests the same Larkin addons Feishu already sends.
+        const addons = parsed.searchParams.get("addons");
+        if (addons)
+            presented.searchParams.set("addons", addons);
+        return presented.toString();
+    }
+    return parsed.toString();
+}
+export function authorizationUrlFailureMessage(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const code = error && typeof error === "object" && "code" in error ? String(error.code) : "";
+    const description = error && typeof error === "object" && "description" in error
+        ? String(error.description) : "";
+    const detail = [code, description, message].filter(Boolean).join(": ");
+    return `网页授权失败（${detail || "unknown"}）；未执行凭证同步、文件写入或 Agent 绑定。Lark 租户不要使用 /page/launcher（ack 10074 / 链接已失效），应走官方 lark-cli 的 /page/cli。`;
+}

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.10",
+  "version": "0.4.11",
   "private": false,
   "larkinPackageRole": "npm-published",
   "files": [