tyc-cli 0.3.8 → 0.3.9

package/dist/commands/capabilities.js

@@ -25,8 +25,7 @@ export function registerCompanyCapabilitiesCommand(companyCmd, program) {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.error(`请求失败: ${msg}`);
-            process.exit(1);
+            throw new Error(`请求失败: ${msg}`, { cause: err });
         }
     });
 }

package/dist/commands/category.js

@@ -36,7 +36,7 @@ function bindMethod(catCmd, tool, program) {
     // 都能直观看到分层信息；徽章不影响 Agent 对 description 的语义理解。
     let methodCmd = catCmd
         .command(tool.cliMethod)
-        .description(`[${tool.layer}] ${tool.description}`);
+        .description(`[${tool.layer}] ${tool.description} 调用额度：成功且返回有效结果计 1 次；报错、全部无结果和系统异常计 0 次。`);
     if (positional) {
         methodCmd = methodCmd.argument(`<${positional.name}>`, positional.description);
     }
@@ -63,8 +63,7 @@ function bindMethod(catCmd, tool, program) {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.error(`请求失败: ${msg}`);
-            process.exit(1);
+            throw new Error(`请求失败: ${msg}`, { cause: err });
         }
     });
 }

package/dist/commands/init.js

@@ -91,9 +91,7 @@ export function registerInitCommand(program) {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.error(`配置校验失败：${msg}`);
-            console.error("配置已保存；确认 --url 可达且 Authorization 有效后重新运行 tyc init，或加 --no-verify 跳过校验。");
-            process.exit(1);
+            throw new Error(`配置校验失败：${msg}\n配置已保存；确认 --url 可达且 Authorization 有效后重新运行 tyc init，或加 --no-verify 跳过校验。`, { cause: err });
         }
     });
 }

package/dist/commands/login.js

@@ -275,17 +275,15 @@ export function registerLoginCommand(program) {
                 state,
                 timeoutMs: 5 * 60 * 1000,
             })).redirectUri;
-        if (!clientId) {
-            if (!endpoints.registrationEndpoint) {
-                callback?.close();
-                throw new Error("OAuth metadata 未提供 registration_endpoint，请用 --client-id 指定预注册客户端。");
-            }
-            if (verbose) {
-                console.error("> registering OAuth client via Dynamic Client Registration");
-            }
-            let registeredClient;
-            try {
-                registeredClient = await registerDynamicOAuthClient({
+        try {
+            if (!clientId) {
+                if (!endpoints.registrationEndpoint) {
+                    throw new Error("OAuth metadata 未提供 registration_endpoint，请用 --client-id 指定预注册客户端。");
+                }
+                if (verbose) {
+                    console.error("> registering OAuth client via Dynamic Client Registration");
+                }
+                const registeredClient = await registerDynamicOAuthClient({
                     registrationEndpoint: endpoints.registrationEndpoint,
                     clientName: "tyc-cli",
                     redirectUris: [redirectUri],
@@ -295,97 +293,96 @@ export function registerLoginCommand(program) {
                     responseTypes: ["code"],
                     tokenEndpointAuthMethod: "none",
                 });
+                clientId = registeredClient.clientId;
+                clientSecret ||= registeredClient.clientSecret;
+                if (verbose) {
+                    console.error(`> registered client_id: ${clientId}`);
+                }
             }
-            catch (err) {
-                callback?.close();
-                throw err;
+            if (noBlock) {
+                if (!endpoints.deviceAuthorizationEndpoint) {
+                    throw new Error("OAuth metadata 未提供 device_authorization_endpoint，请升级授权服务或使用 --device-authorization-endpoint 指定。");
+                }
+                const device = await requestDeviceAuthorization({
+                    deviceAuthorizationEndpoint: endpoints.deviceAuthorizationEndpoint,
+                    clientId,
+                    clientSecret,
+                    scope,
+                    resource,
+                });
+                savePendingOAuthLogin({
+                    version: 2,
+                    flow: "device",
+                    createdAt: Date.now(),
+                    mcpURL,
+                    tokenEndpoint: endpoints.tokenEndpoint,
+                    clientId,
+                    clientSecret,
+                    deviceCode: device.device_code,
+                    userCode: device.user_code,
+                    verificationUri: device.verification_uri,
+                    expiresAt: Date.now() + device.expires_in * 1000,
+                    interval: device.interval || 5,
+                    resource,
+                    scope,
+                    verify: opts.verify !== false,
+                });
+                console.error("请在浏览器打开以下 URL 完成登录：");
+                console.error(device.verification_uri);
+                console.error("");
+                console.error(`验证码：${device.user_code}`);
+                console.error("");
+                console.error("在网页输入 6 位验证码并确认授权后，运行：");
+                console.error("tyc login --resume");
+                return;
             }
-            clientId = registeredClient.clientId;
-            clientSecret ||= registeredClient.clientSecret;
+            const authorizationURL = buildAuthorizationURL({
+                authorizationEndpoint: endpoints.authorizationEndpoint,
+                clientId,
+                redirectUri,
+                scope,
+                state,
+                codeChallenge: pkce.codeChallenge,
+                resource,
+            });
             if (verbose) {
-                console.error(`> registered client_id: ${clientId}`);
+                console.error(`> OAuth callback: ${redirectUri}`);
             }
-        }
-        if (noBlock) {
-            if (!endpoints.deviceAuthorizationEndpoint) {
-                throw new Error("OAuth metadata 未提供 device_authorization_endpoint，请升级授权服务或使用 --device-authorization-endpoint 指定。");
+            if (opts.open === false) {
+                console.error("请在浏览器打开以下 URL 完成登录：");
+                console.error(authorizationURL);
+            }
+            else {
+                console.error("正在打开浏览器完成 OAuth 登录...");
+                openBrowser(authorizationURL);
+            }
+            if (!callback) {
+                throw new Error("OAuth callback server not initialized");
+            }
+            const code = await callback.waitForCode();
+            if (verbose) {
+                console.error("> authorization code received; exchanging access token");
             }
-            const device = await requestDeviceAuthorization({
-                deviceAuthorizationEndpoint: endpoints.deviceAuthorizationEndpoint,
+            const token = await exchangeAuthorizationCode({
+                tokenEndpoint: endpoints.tokenEndpoint,
                 clientId,
                 clientSecret,
-                scope,
+                code,
+                redirectUri,
+                codeVerifier: pkce.codeVerifier,
                 resource,
             });
-            savePendingOAuthLogin({
-                version: 2,
-                flow: "device",
-                createdAt: Date.now(),
-                mcpURL,
+            saveOAuthTokenConfig(mcpURL, token, {
                 tokenEndpoint: endpoints.tokenEndpoint,
                 clientId,
                 clientSecret,
-                deviceCode: device.device_code,
-                userCode: device.user_code,
-                verificationUri: device.verification_uri,
-                expiresAt: Date.now() + device.expires_in * 1000,
-                interval: device.interval || 5,
                 resource,
-                scope,
-                verify: opts.verify !== false,
-            });
-            console.error("请在浏览器打开以下 URL 完成登录：");
-            console.error(device.verification_uri);
-            console.error("");
-            console.error(`验证码：${device.user_code}`);
-            console.error("");
-            console.error("在网页输入 6 位验证码并确认授权后，运行：");
-            console.error("tyc login --resume");
-            return;
-        }
-        const authorizationURL = buildAuthorizationURL({
-            authorizationEndpoint: endpoints.authorizationEndpoint,
-            clientId,
-            redirectUri,
-            scope,
-            state,
-            codeChallenge: pkce.codeChallenge,
-            resource,
-        });
-        if (verbose) {
-            console.error(`> OAuth callback: ${redirectUri}`);
-        }
-        if (opts.open === false) {
-            console.error("请在浏览器打开以下 URL 完成登录：");
-            console.error(authorizationURL);
-        }
-        else {
-            console.error("正在打开浏览器完成 OAuth 登录...");
-            openBrowser(authorizationURL);
+            }, verbose);
+            clearPendingOAuthLogin(verbose);
+            await verifySavedOAuthLogin(opts.verify !== false, verbose);
         }
-        if (!callback) {
-            throw new Error("OAuth callback server not initialized");
+        finally {
+            callback?.close();
         }
-        const code = await callback.waitForCode();
-        if (verbose) {
-            console.error("> authorization code received; exchanging access token");
-        }
-        const token = await exchangeAuthorizationCode({
-            tokenEndpoint: endpoints.tokenEndpoint,
-            clientId,
-            clientSecret,
-            code,
-            redirectUri,
-            codeVerifier: pkce.codeVerifier,
-            resource,
-        });
-        saveOAuthTokenConfig(mcpURL, token, {
-            tokenEndpoint: endpoints.tokenEndpoint,
-            clientId,
-            clientSecret,
-            resource,
-        }, verbose);
-        clearPendingOAuthLogin(verbose);
-        await verifySavedOAuthLogin(opts.verify !== false, verbose);
     });
 }

package/dist/commands/output.js

@@ -3,13 +3,11 @@ import { applyTruncation, resolveOptionalInt, TRUNCATE_DEFAULTS, } from "../util
 export function emitToolResult(result, opts, toolName) {
     if (result.isError) {
         const errText = extractText(result) || "未知业务错误";
-        console.error(errText);
-        process.exit(1);
+        throw new Error(errText);
     }
     const text = extractText(result);
     if (text === null) {
-        console.error("tools/call 返回无可解析内容");
-        process.exit(1);
+        throw new Error("tools/call 返回无可解析内容");
     }
     let payload;
     try {

package/dist/config.js

@@ -109,8 +109,7 @@ export function resolveConfig() {
         headers.Authorization = process.env.TYC_AUTHORIZATION;
     }
     if (!headers.Authorization) {
-        console.error("未配置 Authorization。请先运行：tyc init --authorization YOUR_API_KEY");
-        process.exit(1);
+        throw new Error("未配置 Authorization。请先运行：tyc init --authorization YOUR_API_KEY");
     }
     return { url, coreUrl, headers, oauth: cfg.oauth ? { ...cfg.oauth } : undefined };
 }

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Command } from "commander";
+import { Command, CommanderError } from "commander";
 import { registerInitCommand } from "./commands/init.js";
 import { registerLoginCommand } from "./commands/login.js";
 import { registerCategoryCommands } from "./commands/category.js";
@@ -93,6 +93,7 @@ function renderPriorityLines() {
     return lines.join("\n");
 }
 const program = new Command()
+    .exitOverride()
     .name("tyc")
     .description(`天眼查 AI CLI：${getTotalCount()} 个商业数据工具 · L0=${getLayerCount("L0")} L1=${getLayerCount("L1")} L2=${getLayerCount("L2")} L3=${getLayerCount("L3")} · 面向 Agent 的 MCP 工具网关`)
     .version(VERSION, "-V, --version", "输出版本号")
@@ -125,7 +126,14 @@ registerLoginCommand(program);
 registerLayerCommands(program);
 registerCategoryCommands(program);
 program.parseAsync(process.argv).catch((err) => {
+    // Commander has already printed help/version/argument errors. Preserve its
+    // exit status without printing twice or interrupting pending stream writes.
+    if (err instanceof CommanderError) {
+        process.exitCode = err.exitCode;
+        return;
+    }
     const msg = err instanceof Error ? err.message : String(err);
     console.error(msg);
-    process.exit(1);
+    // Let Node finish asynchronous I/O and teardown (including fetch on Windows).
+    process.exitCode = 1;
 });

package/dist/oauth.js

@@ -208,13 +208,20 @@ export async function startCallbackServer(opts) {
     let server;
     let settled = false;
     let timer;
+    const close = () => {
+        settled = true;
+        if (timer)
+            clearTimeout(timer);
+        server?.close();
+        server?.closeIdleConnections?.();
+    };
     const codePromise = new Promise((resolve, reject) => {
         timer = setTimeout(() => {
             if (settled)
                 return;
             settled = true;
             reject(new Error("等待 OAuth 回调超时"));
-            server?.close();
+            close();
         }, opts.timeoutMs);
         server = createServer((req, res) => {
             const url = new URL(req.url || "/", `http://${req.headers.host || opts.host}`);
@@ -237,7 +244,7 @@ export async function startCallbackServer(opts) {
                 res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
                 res.end(callbackHTML("OAuth 登录失败", "state 校验失败，请回到终端重新运行 tyc login。"));
                 reject(new Error("OAuth state mismatch"));
-                server?.close();
+                close();
                 return;
             }
             if (error) {
@@ -245,7 +252,7 @@ export async function startCallbackServer(opts) {
                 res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
                 res.end(callbackHTML("OAuth 登录失败", errorDescription || error));
                 reject(new Error(`OAuth error: ${errorDescription || error}`));
-                server?.close();
+                close();
                 return;
             }
             if (!code) {
@@ -253,49 +260,52 @@ export async function startCallbackServer(opts) {
                 res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
                 res.end(callbackHTML("OAuth 登录失败", "授权服务未返回 code。"));
                 reject(new Error("OAuth callback missing code"));
-                server?.close();
+                close();
                 return;
             }
             settled = true;
             res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
             res.end(callbackHTML("OAuth 登录成功", "tyc CLI 已收到授权结果，可以关闭这个窗口。"));
             resolve(code);
-            server?.close();
+            close();
         });
     });
-    await new Promise((resolve, reject) => {
-        if (!server) {
-            reject(new Error("callback server not initialized"));
-            return;
-        }
-        const onError = (err) => reject(err);
-        server.once("error", onError);
-        server.listen(opts.port, opts.host, () => {
-            server?.off("error", onError);
-            resolve();
+    // Registration/browser setup happens before waitForCode(). Keep an early
+    // callback rejection handled while preserving it for that eventual await.
+    void codePromise.catch(() => { });
+    try {
+        await new Promise((resolve, reject) => {
+            if (!server) {
+                reject(new Error("callback server not initialized"));
+                return;
+            }
+            const onError = (err) => reject(err);
+            server.once("error", onError);
+            server.listen(opts.port, opts.host, () => {
+                server?.off("error", onError);
+                resolve();
+            });
         });
-    });
+    }
+    catch (err) {
+        close();
+        throw err;
+    }
     const address = server?.address();
     if (!address || typeof address.port !== "number") {
-        server?.close();
+        close();
         throw new Error("无法启动 OAuth 本地回调服务");
     }
     const redirectUri = `http://${opts.host}:${address.port}${opts.path}`;
     return {
         redirectUri,
-        close: () => {
-            if (timer)
-                clearTimeout(timer);
-            server?.close();
-        },
+        close,
         waitForCode: async () => {
             try {
                 return await codePromise;
             }
             finally {
-                if (timer)
-                    clearTimeout(timer);
-                server?.close();
+                close();
             }
         },
     };

package/dist/registry.js

@@ -1,7 +1,7 @@
 // 从 src/catalog.json 加载命令树元数据
 //
 // catalog.json 由 apimcp 主仓 scripts/gen_cli_catalog 生成；仅包含 CLI
-// 需要的字段（name / group / layer / cliMethod / categoryNameZh /
+// 需要的字段（name / group / layer / requiredPlan / cliMethod / categoryNameZh /
 // description / params）。不含 sources / execution / summary 等服务端
 // 内部映射，服务端实现细节不泄露。
 import { readFileSync } from "node:fs";

package/dist/utils/history.js

@@ -0,0 +1,68 @@
+const object = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+const text = (v) => typeof v === "string" ? v : JSON.stringify(v) ?? "null";
+const cell = (v) => text(v).replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
+export function renderHistoryGuide(value) {
+    if (!object(value))
+        return [];
+    const lines = [`> 查询范围：${cell(value.scope)}`];
+    if (Array.isArray(value.nextTools))
+        for (const next of value.nextTools) {
+            if (object(next))
+                lines.push(`> 后续查询：\`${cell(next.toolName)}\` — ${cell(next.purpose)}`);
+        }
+    if (Array.isArray(value.notes))
+        for (const note of value.notes)
+            lines.push(`> 历史查询说明：${cell(note)}`);
+    return lines;
+}
+export function splitHistoricalPersonnel(obj, toolName) {
+    if (toolName !== "get_historical_registration" || !object(obj.sources) || !object(obj.sources.hi))
+        return undefined;
+    const hi = { ...obj.sources.hi };
+    const lines = [];
+    for (const [key, title] of [["pastLegalPersonList", "历史法定代表人"], ["pastStafferList", "历史主要人员"]]) {
+        if (!(key in hi))
+            continue;
+        const value = hi[key];
+        delete hi[key];
+        lines.push(`### ${title}\n`, "> 按来源分组完整展示；组号不代表任职阶段。\n");
+        let groups = Array.isArray(value) ? value : [value];
+        if (groups.length === 0)
+            lines.push("_(空列表)_\n");
+        if (groups.length && groups.every(object)) {
+            lines.push("单层名单：\n");
+            groups = [groups];
+        }
+        groups.forEach((group, i) => {
+            const people = Array.isArray(group) ? group : [group];
+            lines.push(`#### 第 ${i + 1} 组（${people.length} 项）\n`);
+            people.forEach((person, j) => {
+                lines.push(`人员 ${j + 1}：\n`, "| 字段 | 值 |", "|---|---|");
+                if (object(person))
+                    for (const field of Object.keys(person).sort()) {
+                        const label = field === "name" ? "名称" : field === "time" ? "变更时间" : field;
+                        lines.push(`| ${cell(label)} | ${cell(person[field])} |`);
+                    }
+                else
+                    lines.push(`| 原始项 | ${cell(person)} |`);
+                lines.push("");
+            });
+        });
+    }
+    return lines.length ? { rest: { ...obj, sources: { ...obj.sources, hi } }, markdown: lines.join("\n") } : undefined;
+}
+function changeDate(value) {
+    if (!object(value) || typeof value.changeTime !== "string")
+        return "";
+    const match = /^(\d{4}-\d{2}-\d{2})(?:$|[ T])/.exec(value.changeTime);
+    if (!match)
+        return "";
+    const day = new Date(`${match[1]}T00:00:00Z`);
+    return !Number.isNaN(day.getTime()) && day.toISOString().slice(0, 10) === match[1] ? match[1] : "";
+}
+export function changeRecordsForDisplay(records) {
+    return [...records].sort((a, b) => {
+        const x = changeDate(a), y = changeDate(b);
+        return x < y ? 1 : x > y ? -1 : 0;
+    });
+}