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

package/dist/src/cli/errors.js

@@ -5,11 +5,14 @@ import { SsoRequestError } from "../features/auth/sso-service.js";
 import { DeviceAuthorizationExpiredError } from "../features/auth/use-cases.js";
 import { AgentInputError } from "../features/agent/use-cases.js";
 import { ToolInputError } from "../features/tool/catalog.js";
+import { ToolTaskFailedError } from "../features/tool/tool-api-adapter.js";
 import { ObjectStorageUploadError } from "../features/dam/object-storage.js";
+import { DamAssetNotFoundError } from "../features/dam/dam-api-adapter.js";
 import { DamInputError } from "../features/dam/use-cases.js";
 import { OrganizationResponseError } from "../features/org/org-service.js";
 import { OrganizationBindFailedError, OrganizationInvalidError, OrgUsageError } from "../features/org/use-cases.js";
 import { RemoteRequestError } from "../platform/signed-http-transport.js";
+import { RemoteProtocolError } from "../platform/remote-protocol.js";
 import { InputContractError, OutputContractError } from "../bootstrap/validators.js";
 import { JsonInputError } from "../platform/json-input.js";
 import { LocalFileInputError } from "../platform/safe-upload-file.js";
@@ -59,13 +62,22 @@ export function mapCliError(error, options) {
         || error instanceof CommanderError) {
         return failure("USAGE_ERROR", "命令或参数无效，请查看 --help。", 2);
     }
+    if (error instanceof RemoteProtocolError) {
+        return failure("REMOTE_PROTOCOL_INCOMPATIBLE", "稿定服务返回了当前 CLI 无法安全处理的结果；为避免重复创作，已停止处理。", 1);
+    }
+    if (error instanceof ToolTaskFailedError) {
+        return failure("TOOL_TASK_FAILED", "稿定工具任务执行失败。", 1);
+    }
+    if (error instanceof DamAssetNotFoundError) {
+        return failure("DAM_ASSET_NOT_FOUND", "未找到指定的 DAM 素材。", 1);
+    }
     if (error instanceof RemoteRequestError
         || error instanceof SsoRequestError
         || error instanceof DeviceAuthorizationExpiredError
         || error instanceof OrganizationResponseError
         || error instanceof OrganizationBindFailedError
         || error instanceof ObjectStorageUploadError) {
-        return failure("REMOTE_REQUEST_FAILED", "稿定服务请求失败，请稍后重试。", 1);
+        return failure("REMOTE_REQUEST_FAILED", "稿定服务请求失败。", 1);
     }
     if (error instanceof OutputContractError) {
         return failure("INTERNAL_ERROR", "CLI 内部结果校验失败。", 1);
@@ -77,6 +89,27 @@ export function mapCliError(error, options) {
     }
     return failure("INTERNAL_ERROR", "CLI 发生内部错误。", 1);
 }
+export function classifyTelemetryError(error) {
+    const outcome = mapCliError(error, { aborted: false });
+    const remoteError = error instanceof RemoteRequestError
+        || error instanceof RemoteProtocolError
+        || error instanceof ToolTaskFailedError
+        ? error
+        : undefined;
+    return {
+        outcome: outcome.kind === "interrupted" ? "interrupted" : "failure",
+        ...(outcome.kind === "failure" ? { errorCode: outcome.failure.code } : {}),
+        ...(error instanceof RemoteRequestError && error.status !== undefined
+            ? { httpStatus: error.status }
+            : {}),
+        ...(remoteError?.remoteCode === undefined
+            ? {}
+            : { remoteErrorCode: remoteError.remoteCode }),
+        ...(remoteError?.remoteBody === undefined
+            ? {}
+            : { remoteErrorBody: remoteError.remoteBody })
+    };
+}
 function failure(code, message, exitCode, nextSteps) {
     return {
         kind: "failure",

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

@@ -11,7 +11,9 @@ export function registerModelCommands(program, runtime) {
     bindAction(list, "organization", async (context, signal) => {
         const selectedTool = list.opts().tool;
         const input = selectedTool === undefined ? {} : { tool: selectedTool };
-        runtime.validators.modelListInput(input);
+        await runtime.telemetry.stage("input", async () => {
+            runtime.validators.modelListInput(input);
+        });
         const result = await runtime.tool.listModels({
             input,
             access: {
@@ -20,9 +22,13 @@ export function registerModelCommands(program, runtime) {
             },
             signal
         });
-        runtime.validators.modelListOutput(result);
-        runtime.io.writeOut(`${JSON.stringify(result)}\n`);
-    });
+        if (selectedTool !== undefined)
+            runtime.telemetry.annotate({ tool_name: selectedTool });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.modelListOutput(result);
+            runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        });
+    }, { operation: "model.list" });
     const get = model.command("get")
         .description("查看模型完整信息")
         .argument("<model>", "模型机器标识")
@@ -32,16 +38,24 @@ export function registerModelCommands(program, runtime) {
         if (typeof modelName !== "string" || modelName.trim() === "")
             throw new CliUsageError();
         const input = { model: modelName };
-        runtime.validators.modelGetInput(input);
+        await runtime.telemetry.stage("input", async () => {
+            runtime.validators.modelGetInput(input);
+        });
+        const access = {
+            credential: context.state.credential,
+            organizationId: context.state.organization.id
+        };
         const result = await runtime.tool.getModel({
             input,
-            access: {
-                credential: context.state.credential,
-                organizationId: context.state.organization.id
-            },
+            access,
             signal
         });
-        runtime.validators.modelGetOutput(result);
-        runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        runtime.telemetry.annotate({ model_id: modelName });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.modelGetOutput(result);
+            runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        });
+    }, {
+        operation: "model.get"
     });
 }

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

@@ -10,23 +10,27 @@ export function registerOrgCommands(program, runtime) {
         .option("--json", "输出 JSON");
     bindAction(list, "credential", async (context, signal) => {
         const result = await runtime.org.list({ state: context.state, signal });
-        runtime.validators.orgList(result);
-        runtime.presenter.result(result, {
-            json: list.opts().json === true,
-            view: orgListView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.orgList(result);
+            runtime.presenter.result(result, {
+                json: list.opts().json === true,
+                view: orgListView
+            });
         });
-    });
+    }, { operation: "org.list" });
     const current = leaf(org.command("current"))
         .description("查看当前组织")
         .option("--json", "输出 JSON");
     bindAction(current, "none", async () => {
         const result = await runtime.org.current();
-        runtime.validators.orgCurrent(result);
-        runtime.presenter.result(result, {
-            json: current.opts().json === true,
-            view: orgCurrentView
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.orgCurrent(result);
+            runtime.presenter.result(result, {
+                json: current.opts().json === true,
+                view: orgCurrentView
+            });
         });
-    });
+    }, { operation: "org.current" });
     const switchCommand = leaf(org.command("switch"))
         .description("切换当前组织")
         .option("--org <org-id>", "指定组织 ID");
@@ -41,8 +45,10 @@ export function registerOrgCommands(program, runtime) {
                 : { organizationId }),
             signal
         });
-        runtime.presenter.success(`已切换到${record.publicName} (${record.id})。`);
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.success(`已切换到${record.publicName} (${record.id})。`);
+        });
+    }, { operation: "org.switch" });
 }
 function leaf(command) {
     return command.allowExcessArguments(false);

package/dist/src/cli/presenter.js

@@ -27,7 +27,14 @@ export function createPresenter(options) {
                 return;
             }
             if (presentation.json) {
-                options.writeError(`${JSON.stringify({ error: outcome.failure })}\n`);
+                options.writeError(`${JSON.stringify({
+                    error: {
+                        ...outcome.failure,
+                        ...(presentation.traceId
+                            ? { trace_id: presentation.traceId }
+                            : {})
+                    }
+                })}\n`);
                 return;
             }
             options.writeError(`${outcome.failure.code}: ${outcome.failure.message}\n`);
@@ -35,6 +42,9 @@ export function createPresenter(options) {
             if (nextSteps.length > 0) {
                 options.writeError(`下一步: ${nextSteps.join("，")}\n`);
             }
+            if (presentation.traceId) {
+                options.writeError(`诊断 ID: ${presentation.traceId}\n`);
+            }
         }
     };
 }

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

@@ -15,13 +15,15 @@ export function registerToolCommands(program, runtime) {
             },
             signal
         });
-        runtime.validators.toolListOutput(result);
-        runtime.io.writeOut(`${JSON.stringify(result)}\n`);
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.toolListOutput(result);
+            runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        });
+    }, { operation: "tool.list" });
     const call = tool.command("call")
         .description("调用创作工具")
         .argument("<tool>", "工具机器标识")
-        .option("--schema", "输出当前工具的输入 Schema")
+        .option("--schema", "输出当前工具所有模型参数并集的输入 Schema")
         .option("--input <file|->", "从文件或标准输入读取参数 JSON")
         .allowExcessArguments(false);
     bindPreparedAction(call, "organization", async (signal) => {
@@ -51,7 +53,10 @@ export function registerToolCommands(program, runtime) {
                 access,
                 signal
             });
-            runtime.io.writeOut(`${JSON.stringify(schema)}\n`);
+            runtime.telemetry.annotate({ tool_name: prepared.name });
+            await runtime.telemetry.stage("output", async () => {
+                runtime.io.writeOut(`${JSON.stringify(schema)}\n`);
+            });
             return;
         }
         const result = await runtime.tool.call({
@@ -59,7 +64,14 @@ export function registerToolCommands(program, runtime) {
             access,
             signal
         });
-        runtime.validators.toolCallOutput(result);
-        runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        await runtime.telemetry.stage("output", async () => {
+            runtime.validators.toolCallOutput(result);
+            runtime.io.writeOut(`${JSON.stringify(result)}\n`);
+        });
+    }, {
+        operation: "tool.call",
+        mode: () => call.opts().schema === true
+            ? "schema"
+            : "execute"
     });
 }

package/dist/src/cli/update-command.js

@@ -5,8 +5,10 @@ export function registerUpdateCommand(program, runtime) {
         .allowExcessArguments(false);
     bindAction(update, "none", async (_context, signal) => {
         const result = await runtime.update.run(signal);
-        runtime.presenter.success(result.updated
-            ? `gd-cli 已更新到 ${result.version}，Agent Skill 已同步。`
-            : `gd-cli ${result.version} 已是最新版本，Agent Skill 已同步。`);
-    });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.success(result.updated
+                ? `gd-cli 已更新到 ${result.version}，Agent Skill 已同步。`
+                : `gd-cli ${result.version} 已是最新版本，Agent Skill 已同步。`);
+        });
+    }, { operation: "update" });
 }

package/dist/src/features/agent/creative-agent-adapter.js

@@ -10,22 +10,27 @@ export function createCreativeAgentAdapter(dependencies) {
                     localMessageId: dependencies.idFactory()
                 }
                 : { localMessageId: dependencies.idFactory() };
-            const stream = await dependencies.transport.postStream({
-                path: "/ai-agent/v1/thread/completion",
-                body: buildCreativeRequest(message, ids),
-                accept: "text/event-stream",
-                credential: access.credential,
-                organizationId: access.organizationId,
-                signal
+            const streamed = await dependencies.telemetry.stage("execute", async () => {
+                const stream = await dependencies.transport.postStream({
+                    path: "/ai-agent/v1/thread/completion",
+                    body: buildCreativeRequest(message, ids),
+                    accept: "text/event-stream",
+                    credential: access.credential,
+                    organizationId: access.organizationId,
+                    signal
+                });
+                return parseCreativeStream(stream, signal);
             });
-            const contextId = creativeContextId(await parseCreativeStream(stream, signal));
-            const messages = await dependencies.transport.getJson({
-                path: `/ai-agent/v1/thread/${encodeURIComponent(contextId)}/messages`,
-                credential: access.credential,
-                organizationId: access.organizationId,
-                signal
+            const contextId = creativeContextId(streamed);
+            return dependencies.telemetry.stage("result", async () => {
+                const messages = await dependencies.transport.getJson({
+                    path: `/ai-agent/v1/thread/${encodeURIComponent(contextId)}/messages`,
+                    credential: access.credential,
+                    organizationId: access.organizationId,
+                    signal
+                });
+                return normalizeCreativeMessages(creativeTurnMessages(messages, ids.localMessageId));
             });
-            return normalizeCreativeMessages(creativeTurnMessages(messages, ids.localMessageId));
         }
     };
 }

package/dist/src/features/agent/creative-protocol.js

@@ -1,4 +1,4 @@
-import { RemoteRequestError } from "../../platform/signed-http-transport.js";
+import { RemoteProtocolError } from "../../platform/remote-protocol.js";
 export function buildCreativeRequest(message, ids) {
     const prompt = [];
     const textParts = [];
@@ -110,7 +110,7 @@ function nonEmptyString(value) {
     return typeof value === "string" && value.trim() !== "" ? value : undefined;
 }
 function fail() {
-    throw new RemoteRequestError();
+    throw new RemoteProtocolError();
 }
 export function creativeContextId(messages) {
     if (messages.some((message) => message.event === "system_error"))
@@ -125,7 +125,11 @@ export function creativeTurnMessages(value, localMessageId) {
         return fail();
     }
     const messages = value;
-    const start = messages.findIndex((message) => message.role === "user" && message.local_message_id === localMessageId);
+    const start = messages.findIndex((message) => {
+        if (message.local_message_id !== localMessageId)
+            return false;
+        return message.role === "user" || contentOf(message)?.type === "function_response";
+    });
     if (start < 0)
         return fail();
     return messages.slice(start);

package/dist/src/features/agent/use-cases.js

@@ -37,69 +37,78 @@ export function createAgentUseCases(dependencies) {
         async send({ input, access, signal }) {
             signal.throwIfAborted();
             const prepared = [];
-            for (const part of input.message.parts) {
-                signal.throwIfAborted();
-                if ("text" in part) {
-                    prepared.push({ kind: "text", text: part.text });
-                    continue;
-                }
-                if ("url" in part) {
-                    const role = part.metadata?.role ?? "reference";
-                    if (part.url.startsWith("file:")) {
-                        const uploadInput = {
-                            url: part.url,
-                            ...(part.mediaType === undefined ? {} : { mediaType: part.mediaType }),
-                            ...(part.filename === undefined ? {} : { filename: part.filename })
-                        };
-                        const asset = await dependencies.uploader.upload(uploadInput, access, signal);
-                        prepared.push({ kind: "asset", asset, role });
+            const prepare = async () => {
+                for (const part of input.message.parts) {
+                    signal.throwIfAborted();
+                    if ("text" in part) {
+                        prepared.push({ kind: "text", text: part.text });
                         continue;
                     }
-                    let url;
-                    try {
-                        url = parseSafeRemoteAssetUrl(part.url);
+                    if ("url" in part) {
+                        const role = part.metadata?.role ?? "reference";
+                        if (part.url.startsWith("file:")) {
+                            const uploadInput = {
+                                url: part.url,
+                                ...(part.mediaType === undefined ? {} : { mediaType: part.mediaType }),
+                                ...(part.filename === undefined ? {} : { filename: part.filename })
+                            };
+                            const asset = await dependencies.uploader.upload(uploadInput, access, signal);
+                            prepared.push({ kind: "asset", asset, role });
+                            continue;
+                        }
+                        let url;
+                        try {
+                            url = parseSafeRemoteAssetUrl(part.url);
+                        }
+                        catch (error) {
+                            if (error instanceof UrlSafetyError)
+                                throw new AgentInputError();
+                            throw error;
+                        }
+                        const filename = part.filename ?? pathnameFilename(url);
+                        prepared.push({
+                            kind: "asset",
+                            asset: {
+                                url: part.url,
+                                mediaType: part.mediaType ?? inferMediaType(filename),
+                                filename,
+                                fromUserUpload: false
+                            },
+                            role
+                        });
+                        continue;
                     }
-                    catch (error) {
-                        if (error instanceof UrlSafetyError)
-                            throw new AgentInputError();
-                        throw error;
+                    if ("questionMessageId" in part.data) {
+                        prepared.push({
+                            kind: "answers",
+                            data: {
+                                questionMessageId: part.data.questionMessageId,
+                                answers: part.data.answers.map((answer) => ({
+                                    question: answer.question,
+                                    values: [...answer.values]
+                                }))
+                            }
+                        });
+                        continue;
                     }
-                    const filename = part.filename ?? pathnameFilename(url);
                     prepared.push({
-                        kind: "asset",
-                        asset: {
-                            url: part.url,
-                            mediaType: part.mediaType ?? inferMediaType(filename),
-                            filename,
-                            fromUserUpload: false
-                        },
-                        role
-                    });
-                    continue;
-                }
-                if ("questionMessageId" in part.data) {
-                    prepared.push({
-                        kind: "answers",
+                        kind: "parameters",
                         data: {
-                            questionMessageId: part.data.questionMessageId,
-                            answers: part.data.answers.map((answer) => ({
-                                question: answer.question,
-                                values: [...answer.values]
-                            }))
+                            ...(part.data.ratio === undefined ? {} : { ratio: part.data.ratio }),
+                            ...(part.data.resolution === undefined ? {} : { resolution: part.data.resolution }),
+                            ...(part.data.durationSeconds === undefined
+                                ? {}
+                                : { durationSeconds: part.data.durationSeconds })
                         }
                     });
-                    continue;
                 }
-                prepared.push({
-                    kind: "parameters",
-                    data: {
-                        ...(part.data.ratio === undefined ? {} : { ratio: part.data.ratio }),
-                        ...(part.data.resolution === undefined ? {} : { resolution: part.data.resolution }),
-                        ...(part.data.durationSeconds === undefined
-                            ? {}
-                            : { durationSeconds: part.data.durationSeconds })
-                    }
-                });
+            };
+            if (input.message.parts.some((part) => (typeof part === "object" && part !== null
+                && "url" in part && typeof part.url === "string" && part.url.startsWith("file:")))) {
+                await dependencies.telemetry.stage("upload", prepare);
+            }
+            else {
+                await prepare();
             }
             signal.throwIfAborted();
             return dependencies.completion.complete({