gaoding-cli 1.0.0-alpha.13 → 1.0.0-alpha.15

package/README.md

@@ -28,10 +28,10 @@ gd-cli org switch --org <org-id>
 gd-cli agent send --schema
 gd-cli tool list
 gd-cli model list --tool <tool>
-gd-cli tool call <tool> --schema
+gd-cli model get <model>
 ```
 
-运行 `gd-cli --help` 查看当前命令；运行任一命令的 `--help` 查看参数。`gd-cli update` 固定检查 npm `latest`，支持更新 npm、pnpm 全局安装并同步 Agent Skill。
+选定 Model 后，以 `model get` 返回的 `parameters` 与 `usageDescription` 构造实际输入；`tool call --schema` 只给出整个 Tool 的参数并集。运行 `gd-cli --help` 查看当前命令；运行任一命令的 `--help` 查看参数。`gd-cli update` 固定检查 npm `latest`，支持更新 npm、pnpm 全局安装并同步 Agent Skill。
 
 ## License
 

package/contracts/operations/agent.send/input.schema.json

@@ -123,6 +123,10 @@
             "properties": {
               "contextId": {
                 "type": "string"
+              },
+              "parts": {
+                "type": "array",
+                "maxItems": 1
               }
             },
             "required": [

package/contracts/operations/model.get/output.schema.json

@@ -127,6 +127,7 @@
           "type": "string",
           "enum": [
             "string",
+            "number",
             "uri",
             "uri[]"
           ],

package/dist/bin/gd-cli.js

@@ -1,38 +1,59 @@
 #!/usr/bin/env node
-import { createCli, executeCli } from "../src/bootstrap/create-cli.js";
-import { createProductionRuntime } from "../src/bootstrap/create-runtime.js";
-import { mapCliError } from "../src/cli/errors.js";
-import { redact } from "../src/platform/redact.js";
 const controller = new AbortController();
 const interrupt = () => controller.abort(new Error("SIGINT"));
 process.once("SIGINT", interrupt);
 let runtime;
+let mapCliError;
+let redact;
 try {
+    // Register SIGINT before loading the CLI graph so a cold-start interrupt is
+    // converted into the same abort path as an interrupt during stdin reading.
+    const [cliModule, runtimeModule, errorsModule, redactModule] = await Promise.all([
+        import("../src/bootstrap/create-cli.js"),
+        import("../src/bootstrap/create-runtime.js"),
+        import("../src/cli/errors.js"),
+        import("../src/platform/redact.js")
+    ]);
+    const { createCli, executeCli } = cliModule;
+    const { createProductionRuntime } = runtimeModule;
+    mapCliError = errorsModule.mapCliError;
+    redact = redactModule.redact;
     runtime = createProductionRuntime();
     const program = createCli(runtime, { signal: controller.signal });
     process.exitCode = await executeCli({
         program,
         argv: process.argv.slice(2),
         presenter: runtime.presenter,
-        signal: controller.signal
+        signal: controller.signal,
+        telemetry: runtime.telemetry,
+        telemetrySink: runtime.telemetrySink
     });
 }
 catch (error) {
-    const outcome = redact(mapCliError(error, { aborted: controller.signal.aborted }));
-    if (runtime) {
-        runtime.presenter.error(outcome, { json: process.argv.includes("--json") });
-    }
-    else if (outcome.kind === "interrupted") {
-        process.stderr.write("已取消。\n");
-    }
-    else if (process.argv.includes("--json")) {
-        process.stderr.write(`${JSON.stringify({ error: outcome.failure })}\n`);
+    // Dynamic module loading can fail before the error mapper is available.
+    // Keep that rare startup failure bounded and avoid an unhandled rejection.
+    if (mapCliError === undefined || redact === undefined) {
+        process.stderr.write("INTERNAL_ERROR: CLI 启动失败。\n");
+        process.exitCode = 1;
     }
     else {
-        process.stderr.write(`${outcome.failure.code}: ${outcome.failure.message}\n`);
+        const outcome = redact(mapCliError(error, { aborted: controller.signal.aborted }));
+        if (runtime) {
+            runtime.presenter.error(outcome, { json: process.argv.includes("--json") });
+        }
+        else if (outcome.kind === "interrupted") {
+            process.stderr.write("已取消。\n");
+        }
+        else if (process.argv.includes("--json")) {
+            process.stderr.write(`${JSON.stringify({ error: outcome.failure })}\n`);
+        }
+        else {
+            process.stderr.write(`${outcome.failure.code}: ${outcome.failure.message}\n`);
+        }
+        process.exitCode = outcome.exitCode;
     }
-    process.exitCode = outcome.exitCode;
 }
 finally {
     process.removeListener("SIGINT", interrupt);
 }
+export {};

package/dist/src/bootstrap/create-cli.js

@@ -1,8 +1,8 @@
-import { Command } from "commander";
+import { Command, CommanderError } from "commander";
 import { assertAllLeafCommandsBound, configureActionEnvironment } from "../cli/action-binding.js";
 import { registerAgentCommands } from "../cli/agent-commands.js";
 import { registerAuthCommands } from "../cli/auth-commands.js";
-import { isHelpOutcome, mapCliError } from "../cli/errors.js";
+import { classifyTelemetryError, isHelpOutcome, mapCliError } from "../cli/errors.js";
 import { registerOrgCommands } from "../cli/org-commands.js";
 import { registerToolCommands } from "../cli/tool-commands.js";
 import { registerModelCommands } from "../cli/model-commands.js";
@@ -27,7 +27,8 @@ export function createCli(runtime, options) {
     });
     configureActionEnvironment(program, {
         policies: runtime.accessPolicies,
-        signal: options.signal
+        signal: options.signal,
+        telemetry: runtime.telemetry
     });
     registerAuthCommands(program, runtime);
     registerOrgCommands(program, runtime);
@@ -43,13 +44,51 @@ export function createCli(runtime, options) {
 export async function executeCli(options) {
     try {
         await options.program.parseAsync(options.argv, { from: "user" });
+        await sendFinished(options, { outcome: "success" });
         return 0;
     }
     catch (error) {
         if (isHelpOutcome(error))
             return 0;
+        if (options.telemetry.selected && error instanceof CommanderError) {
+            try {
+                await options.telemetry.stage("input", () => { throw error; });
+            }
+            catch {
+                // The original Commander error is mapped and presented below.
+            }
+        }
         const outcome = redact(mapCliError(error, { aborted: options.signal.aborted }));
-        options.presenter.error(outcome, { json: options.argv.includes("--json") });
+        const telemetryError = classifyTelemetryError(error);
+        const traceId = options.telemetry.selected
+            ? options.telemetry.traceId
+            : undefined;
+        options.presenter.error(outcome, {
+            json: options.argv.includes("--json"),
+            ...(traceId ? { traceId } : {})
+        });
+        await sendFinished(options, outcome.kind === "interrupted"
+            ? { outcome: "interrupted", error }
+            : {
+                outcome: "failure",
+                error,
+                errorCode: outcome.failure.code,
+                errorMessage: outcome.failure.message,
+                ...(telemetryError.httpStatus === undefined
+                    ? {}
+                    : { httpStatus: telemetryError.httpStatus }),
+                ...(telemetryError.remoteErrorCode === undefined
+                    ? {}
+                    : { remoteErrorCode: telemetryError.remoteErrorCode }),
+                ...(telemetryError.remoteErrorBody === undefined
+                    ? {}
+                    : { remoteErrorBody: telemetryError.remoteErrorBody })
+            });
         return outcome.exitCode;
     }
 }
+async function sendFinished(options, completion) {
+    const events = options.telemetry.finish(completion);
+    if (events.length > 0)
+        await options.telemetrySink.send(events);
+}

package/dist/src/bootstrap/create-runtime.js

@@ -1,4 +1,4 @@
-import { randomUUID } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 import { dirname } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
 import { fileURLToPath } from "node:url";
@@ -30,6 +30,9 @@ import { createPresenter } from "../cli/presenter.js";
 import { createContractValidators } from "./validators.js";
 import { loadBundledSkills } from "../features/skill/bundled-skills.js";
 import { createUpdateService } from "../features/update/update-service.js";
+import { classifyTelemetryError } from "../cli/errors.js";
+import { createTelemetryInvocation } from "../telemetry/invocation.js";
+import { createSlsTelemetrySink } from "../telemetry/sls-sink.js";
 const productionEndpoints = {
     orgApi: new URL("https://gdcli.gaoding.com/api"),
     agentApi: new URL("https://gdcli.gaoding.com/api"),
@@ -47,6 +50,19 @@ export function createProductionRuntime(options = {}) {
     const endpoints = options.endpoints ?? productionEndpoints;
     const fetch = options.fetch ?? globalThis.fetch;
     const now = options.now ?? (() => new Date());
+    const telemetry = createTelemetryInvocation({
+        cliVersion: primarySkill.version,
+        now: () => now().getTime(),
+        traceIdFactory: () => randomBytes(16).toString("hex"),
+        spanIdFactory: () => randomBytes(8).toString("hex"),
+        runtime: {
+            os: process.platform,
+            arch: process.arch,
+            nodeMajor: Number.parseInt(process.versions.node, 10)
+        },
+        classifyError: classifyTelemetryError
+    });
+    const telemetrySink = createSlsTelemetrySink({ fetch });
     const rawIo = options.io ?? {
         input: process.stdin,
         stdout: process.stdout,
@@ -66,28 +82,33 @@ export function createProductionRuntime(options = {}) {
     const orgTransport = createSignedHttpTransport({
         baseUrl: endpoints.orgApi,
         fetch,
-        now
+        now,
+        traceparent: () => telemetry.traceparent()
     });
     const agentTransport = createSignedHttpTransport({
         baseUrl: endpoints.agentApi,
         fetch,
-        now
+        now,
+        traceparent: () => telemetry.traceparent()
     });
     const mnsTransport = createSignedHttpTransport({
         baseUrl: endpoints.mnsApi,
         fetch,
-        now
+        now,
+        traceparent: () => telemetry.traceparent()
     });
     const toolTransport = createSignedHttpTransport({
         baseUrl: endpoints.toolApi,
         fetch,
-        now
+        now,
+        traceparent: () => telemetry.traceparent()
     });
     const damTransport = createSignedHttpTransport({
         baseUrl: endpoints.damApi,
         fetch,
         now,
-        channelId: "32"
+        channelId: "32",
+        traceparent: () => telemetry.traceparent()
     });
     const sso = createSsoService({
         ssoApi: endpoints.ssoApi,
@@ -97,7 +118,8 @@ export function createProductionRuntime(options = {}) {
     const org = createOrgUseCases({
         store,
         org: createOrgService({ transport: orgTransport }),
-        sso
+        sso,
+        telemetry
     });
     const auth = createAuthUseCases({
         store,
@@ -105,6 +127,7 @@ export function createProductionRuntime(options = {}) {
         organizationBinder: org,
         authPageOrigin: endpoints.authPageOrigin,
         now,
+        telemetry,
         sleep: async (milliseconds, signal) => {
             await delay(milliseconds, undefined, { signal });
         }
@@ -129,7 +152,8 @@ export function createProductionRuntime(options = {}) {
             api: damApi,
             storage: storageUpload,
             warn: (message) => { presenter.warning(message); },
-            now
+            now,
+            telemetry
         }),
         validate: {
             list: validators.damListOutput,
@@ -137,20 +161,24 @@ export function createProductionRuntime(options = {}) {
             get: validators.damGetOutput,
             upload: validators.damUploadOutput,
             delete: validators.damDeleteOutput
-        }
+        },
+        telemetry
     });
     const agent = createAgentUseCases({
         uploader: transientUploader,
         completion: createCreativeAgentAdapter({
             transport: agentTransport,
-            idFactory: randomUUID
-        })
+            idFactory: randomUUID,
+            telemetry
+        }),
+        telemetry
     });
     const tool = createToolUseCases({
         catalog: createMnsCatalogAdapter({ transport: mnsTransport }),
-        execution: createToolApiAdapter({ transport: toolTransport }),
+        execution: createToolApiAdapter({ transport: toolTransport, telemetry }),
         uploader: transientUploader,
-        warn: (message) => { presenter.warning(message); }
+        warn: (message) => { presenter.warning(message); },
+        telemetry
     });
     const editor = createEditorUseCases({
         session: createEditorSession({
@@ -183,6 +211,7 @@ export function createProductionRuntime(options = {}) {
                 packageRoot,
                 bundledSkills,
                 fetch,
+                telemetry,
                 ...(process.argv[1] ? { binaryPath: process.argv[1] } : {}),
                 ...(options.homeDirectory ? { homeDirectory: options.homeDirectory } : {})
             }).run(signal);
@@ -190,6 +219,8 @@ export function createProductionRuntime(options = {}) {
     };
     return {
         version: primarySkill.version,
+        telemetry,
+        telemetrySink,
         accessPolicies: createAccessPolicies({
             store,
             now,

package/dist/src/cli/action-binding.js

@@ -3,34 +3,46 @@ const boundPolicies = new WeakMap();
 export function configureActionEnvironment(program, environment) {
     environments.set(program, environment);
 }
-export function bindAction(command, policy, handler) {
+export function bindAction(command, policy, handler, telemetry) {
     if (boundPolicies.has(command))
         throw new Error(`Action already bound: ${commandPath(command)}`);
     boundPolicies.set(command, policy);
+    bindTelemetrySelection(command, telemetry);
     command.action(async () => {
         const environment = environments.get(rootCommand(command));
         if (!environment)
             throw new Error("CLI action environment is missing.");
-        const context = await environment.policies[policy].authorize(environment.signal);
-        if (context.policy !== policy)
-            throw new Error("Access policy returned the wrong context.");
+        const context = await environment.telemetry.stage("access", async () => {
+            const authorized = await environment.policies[policy].authorize(environment.signal);
+            if (authorized.policy !== policy) {
+                throw new Error("Access policy returned the wrong context.");
+            }
+            return authorized;
+        });
+        annotateAccessContext(environment.telemetry, context);
         await handler(context, environment.signal);
     });
 }
-export function bindPreparedAction(command, policy, prepare, run) {
+export function bindPreparedAction(command, policy, prepare, run, telemetry) {
     if (boundPolicies.has(command))
         throw new Error(`Action already bound: ${commandPath(command)}`);
     boundPolicies.set(command, policy);
+    bindTelemetrySelection(command, telemetry);
     command.action(async () => {
         const environment = environments.get(rootCommand(command));
         if (!environment)
             throw new Error("CLI action environment is missing.");
-        const prepared = await prepare(environment.signal);
+        const prepared = await environment.telemetry.stage("input", () => prepare(environment.signal));
         if (prepared.handled)
             return;
-        const context = await environment.policies[policy].authorize(environment.signal);
-        if (context.policy !== policy)
-            throw new Error("Access policy returned the wrong context.");
+        const context = await environment.telemetry.stage("access", async () => {
+            const authorized = await environment.policies[policy].authorize(environment.signal);
+            if (authorized.policy !== policy) {
+                throw new Error("Access policy returned the wrong context.");
+            }
+            return authorized;
+        });
+        annotateAccessContext(environment.telemetry, context);
         await run(context, prepared.input, environment.signal);
     });
 }
@@ -52,6 +64,28 @@ function rootCommand(command) {
         current = current.parent;
     return current;
 }
+function bindTelemetrySelection(command, definition) {
+    if (!definition)
+        return;
+    if (!command.parent)
+        throw new Error(`Telemetry command has no parent: ${command.name()}`);
+    command.parent.hook("preSubcommand", (parent, selected) => {
+        if (selected !== command)
+            return;
+        const environment = environments.get(rootCommand(parent));
+        if (!environment)
+            throw new Error("CLI action environment is missing.");
+        environment.telemetry.select(definition);
+    });
+}
+function annotateAccessContext(telemetry, context) {
+    if (context.policy === "none")
+        return;
+    telemetry.annotate({
+        account_id: context.state.account?.id,
+        organization_id: context.state.organization?.id
+    });
+}
 function commandPath(command) {
     const names = [];
     let current = command;

package/dist/src/cli/agent-commands.js

@@ -18,11 +18,14 @@ export function registerAgentCommands(program, runtime) {
         if (modes !== 1)
             throw new CliUsageError();
         if (options.schema === true) {
-            runtime.io.writeOut(`${JSON.stringify(agentSendInputSchema)}\n`);
+            await runtime.telemetry.stage("output", async () => {
+                runtime.io.writeOut(`${JSON.stringify(agentSendInputSchema)}\n`);
+            });
             return { handled: true };
         }
         const input = await runtime.jsonInput.read(options.input, signal);
         runtime.validators.agentSendInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         const result = await runtime.agent.send({
@@ -33,7 +36,14 @@ export function registerAgentCommands(program, runtime) {
             },
             signal
         });
-        runtime.validators.agentSendOutput(result);
-        runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.agentSendOutput(result);
+            runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        });
+    }, {
+        operation: "agent.send",
+        mode: () => send.opts().schema === true
+            ? "schema"
+            : "execute"
     });
 }

package/dist/src/cli/auth-commands.js

@@ -8,8 +8,10 @@ export function registerAuthCommands(program, runtime) {
         .description("登录稿定")
         .option("--no-browser", "不自动打开浏览器");
     bindAction(login, "none", async (_context, signal) => {
+        const noBrowser = login.opts().browser === false;
+        runtime.telemetry.annotate({ parameters: { noBrowser } });
         const result = await runtime.auth.login({
-            noBrowser: login.opts().browser === false,
+            noBrowser,
             signal,
             interaction: {
                 showAuthorization: (url) => runtime.presenter.authorization({
@@ -20,27 +22,33 @@ export function registerAuthCommands(program, runtime) {
                 warn: (message) => runtime.presenter.warning(message)
             }
         });
-        runtime.presenter.success(result.status === "already_logged_in" ? "已登录。" : "登录成功。");
-        if (result.status === "already_logged_in" && !result.organizationSelected) {
-            runtime.presenter.warning("尚未选择组织，请执行 gd-cli org switch。");
-        }
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.success(result.status === "already_logged_in" ? "已登录。" : "登录成功。");
+            if (result.status === "already_logged_in" && !result.organizationSelected) {
+                runtime.presenter.warning("尚未选择组织，请执行 gd-cli org switch。");
+            }
+        });
+    }, { operation: "auth.login" });
     const status = leaf(auth.command("status"))
         .description("查看登录状态")
         .option("--json", "输出 JSON");
     bindAction(status, "none", async () => {
         const result = await runtime.auth.status({ now: runtime.now() });
-        runtime.validators.authStatus(result);
-        runtime.presenter.result(result, {
-            json: status.opts().json === true,
-            view: authStatusView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.authStatus(result);
+            runtime.presenter.result(result, {
+                json: status.opts().json === true,
+                view: authStatusView
+            });
         });
-    });
+    }, { operation: "auth.status" });
     const logout = leaf(auth.command("logout")).description("退出登录");
     bindAction(logout, "none", async () => {
         await runtime.auth.logout();
-        runtime.presenter.success("已退出登录。");
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.success("已退出登录。");
+        });
+    }, { operation: "auth.logout" });
 }
 function leaf(command) {
     return command.allowExcessArguments(false);

package/dist/src/cli/dam-commands.js

@@ -10,6 +10,7 @@ export function registerDamCommands(program, runtime) {
         signal.throwIfAborted();
         const input = browseInput(list);
         runtime.validators.damListInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         const result = await runtime.dam.list({
@@ -17,11 +18,13 @@ export function registerDamCommands(program, runtime) {
             access: organizationAccess(context.state),
             signal
         });
-        runtime.presenter.result(result, {
-            json: list.opts().json === true,
-            view: assetListView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.result(result, {
+                json: list.opts().json === true,
+                view: assetListView
+            });
         });
-    });
+    }, { operation: "dam.list" });
     const search = browseCommand(leaf(dam.command("search")))
         .description("按关键词搜索素材")
         .argument("<query>", "搜索关键词");
@@ -32,6 +35,7 @@ export function registerDamCommands(program, runtime) {
             ...browseInput(search)
         };
         runtime.validators.damSearchInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         const result = await runtime.dam.search({
@@ -39,11 +43,13 @@ export function registerDamCommands(program, runtime) {
             access: organizationAccess(context.state),
             signal
         });
-        runtime.presenter.result(result, {
-            json: search.opts().json === true,
-            view: assetListView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.result(result, {
+                json: search.opts().json === true,
+                view: assetListView
+            });
         });
-    });
+    }, { operation: "dam.search" });
     const get = leaf(dam.command("get"))
         .description("查看素材完整信息")
         .argument("<asset>", "素材 ID")
@@ -52,6 +58,7 @@ export function registerDamCommands(program, runtime) {
         signal.throwIfAborted();
         const input = { asset_id: position(get, 0) };
         runtime.validators.damGetInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         const result = await runtime.dam.get({
@@ -59,11 +66,13 @@ export function registerDamCommands(program, runtime) {
             access: organizationAccess(context.state),
             signal
         });
-        runtime.presenter.result(result, {
-            json: get.opts().json === true,
-            view: assetDetailView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.result(result, {
+                json: get.opts().json === true,
+                view: assetDetailView
+            });
         });
-    });
+    }, { operation: "dam.get" });
     const upload = leaf(dam.command("upload"))
         .description("上传本地文件并创建素材")
         .argument("<file>", "本地文件路径")
@@ -87,6 +96,7 @@ export function registerDamCommands(program, runtime) {
             ...(options.waitAnalysis === true ? { waitAnalysis: true } : {})
         };
         runtime.validators.damUploadInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         const result = await runtime.dam.upload({
@@ -94,11 +104,13 @@ export function registerDamCommands(program, runtime) {
             access: organizationAccess(context.state),
             signal
         });
-        runtime.presenter.result(result, {
-            json: upload.opts().json === true,
-            view: assetDetailView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.result(result, {
+                json: upload.opts().json === true,
+                view: assetDetailView
+            });
         });
-    });
+    }, { operation: "dam.upload" });
     const deleteCommand = leaf(dam.command("delete"))
         .description("删除素材")
         .argument("<asset>", "素材 ID")
@@ -113,6 +125,7 @@ export function registerDamCommands(program, runtime) {
             ...(options.permanent === true ? { permanent: true } : {})
         };
         runtime.validators.damDeleteInput(input);
+        runtime.telemetry.annotate({ parameters: { ...input } });
         return { handled: false, input };
     }, async (context, input, signal) => {
         await runtime.dam.delete({
@@ -120,10 +133,12 @@ export function registerDamCommands(program, runtime) {
             access: organizationAccess(context.state),
             signal
         });
-        runtime.presenter.success(input.permanent === true
-            ? "素材已永久删除。"
-            : "素材已移入回收站。");
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.success(input.permanent === true
+                ? "素材已永久删除。"
+                : "素材已移入回收站。");
+        });
+    }, { operation: "dam.delete" });
 }
 function leaf(command) {
     return command.allowExcessArguments(false);