gaoding-cli 1.0.0-alpha.12 → 1.0.0-alpha.14

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.invocationId
+                            ? { invocation_id: presentation.invocationId }
+                            : {})
+                    }
+                })}\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.invocationId) {
+                options.writeError(`诊断 ID: ${presentation.invocationId}\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({

package/dist/src/features/auth/sso-service.js

@@ -24,11 +24,11 @@ export function createSsoService(options) {
     const baseUrl = new URL(options.ssoApi);
     if (!baseUrl.pathname.endsWith("/"))
         baseUrl.pathname += "/";
-    async function request(relativeUrl, signal) {
+    async function request(relativeUrl, signal, method = "POST") {
         signal.throwIfAborted();
         try {
             return await options.fetch(new URL(relativeUrl, baseUrl), {
-                method: "POST",
+                method,
                 headers: { Accept: "application/json" },
                 signal: AbortSignal.any([
                     signal,
@@ -98,6 +98,21 @@ export function createSsoService(options) {
                 result.organizationId = organizationId;
             return result;
         },
+        async getIdentity(accessKey, signal) {
+            const query = new URLSearchParams({ ak: accessKey });
+            const response = await request(`oauth/device/identity?${query}`, signal, "GET");
+            if (!response.ok)
+                throw new SsoRequestError(response.status);
+            const body = await responseRecord(response);
+            const result = {};
+            const userId = identifier(body.userId);
+            if (userId)
+                result.account = { id: userId, name: userId };
+            const organizationId = identifier(body.orgId);
+            if (organizationId)
+                result.organizationId = organizationId;
+            return result;
+        },
         async bindOrganization(input, signal) {
             const timestamp = Math.floor(options.now().getTime() / 1000);
             const query = new URLSearchParams({

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

@@ -7,9 +7,13 @@ export class DeviceAuthorizationExpiredError extends Error {
 export function createAuthUseCases(dependencies) {
     return {
         async status(input) {
-            const state = await dependencies.store.read();
+            const state = await dependencies.telemetry.stage("state", () => dependencies.store.read());
             if (!state)
                 return { logged_in: false, next_steps: ["gd-cli auth login"] };
+            dependencies.telemetry.annotate({
+                account_id: state.account?.id,
+                organization_id: state.organization?.id
+            });
             const valid = Date.parse(state.credential.expiresAt) > input.now.getTime();
             return {
                 logged_in: true,
@@ -33,73 +37,99 @@ export function createAuthUseCases(dependencies) {
             };
         },
         async logout() {
-            await dependencies.store.remove();
+            await dependencies.telemetry.stage("state", () => dependencies.store.remove());
         },
         async login(input) {
             input.signal.throwIfAborted();
-            const existing = await dependencies.store.read();
+            const existing = await dependencies.telemetry.stage("state", () => dependencies.store.read());
             if (existing && Date.parse(existing.credential.expiresAt) > dependencies.now().getTime()) {
+                dependencies.telemetry.annotate({
+                    account_id: existing.account?.id,
+                    organization_id: existing.organization?.id
+                });
                 return {
                     status: "already_logged_in",
                     organizationSelected: existing.organization !== undefined
                 };
             }
-            const authorization = await dependencies.sso.startDeviceAuthorization(input.signal);
-            const deadline = dependencies.now().getTime() + authorization.expiresInSeconds * 1000;
-            const authorizationUrl = new URL("/cli/device-authorization", dependencies.authPageOrigin);
-            authorizationUrl.searchParams.set("code", authorization.authorizeCode);
-            await input.interaction.showAuthorization(authorizationUrl);
-            if (!input.noBrowser) {
-                try {
-                    await input.interaction.openBrowser(authorizationUrl);
-                }
-                catch {
-                    input.interaction.warn("无法自动打开浏览器，请手动访问授权链接。");
+            const authorization = await dependencies.telemetry.stage("authorize", async () => {
+                const authorization = await dependencies.sso.startDeviceAuthorization(input.signal);
+                const authorizationUrl = new URL("/cli/device-authorization", dependencies.authPageOrigin);
+                authorizationUrl.searchParams.set("code", authorization.authorizeCode);
+                await input.interaction.showAuthorization(authorizationUrl);
+                if (!input.noBrowser) {
+                    try {
+                        await input.interaction.openBrowser(authorizationUrl);
+                    }
+                    catch {
+                        input.interaction.warn("无法自动打开浏览器，请手动访问授权链接。");
+                    }
                 }
-            }
+                return authorization;
+            });
+            const deadline = dependencies.now().getTime() + authorization.expiresInSeconds * 1000;
             let interval = authorization.intervalSeconds * 1000;
-            while (true) {
-                if (dependencies.now().getTime() + interval > deadline) {
-                    throw new DeviceAuthorizationExpiredError();
+            const token = await dependencies.telemetry.stage("wait", async () => {
+                while (true) {
+                    if (dependencies.now().getTime() + interval > deadline) {
+                        throw new DeviceAuthorizationExpiredError();
+                    }
+                    await dependencies.sleep(interval, input.signal);
+                    input.signal.throwIfAborted();
+                    const result = await dependencies.sso.pollDeviceToken(authorization.deviceCode, input.signal);
+                    if (result.status === "pending")
+                        continue;
+                    if (result.status === "slow_down") {
+                        interval += 5_000;
+                        continue;
+                    }
+                    return result;
                 }
-                await dependencies.sleep(interval, input.signal);
-                input.signal.throwIfAborted();
-                const token = await dependencies.sso.pollDeviceToken(authorization.deviceCode, input.signal);
-                if (token.status === "pending")
-                    continue;
-                if (token.status === "slow_down") {
-                    interval += 5_000;
-                    continue;
+            });
+            let state = {
+                version: 1,
+                credential: token.credential,
+                ...(token.account ? { account: token.account } : {})
+            };
+            await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+            dependencies.telemetry.annotate({ account_id: state.account?.id });
+            let organizationId = token.organizationId;
+            try {
+                const identity = await dependencies.telemetry.stage("identity", () => (dependencies.sso.getIdentity(token.credential.accessKey, input.signal)));
+                organizationId = identity.organizationId ?? organizationId;
+                if (!state.account && identity.account) {
+                    state = { ...state, account: identity.account };
+                    await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+                    dependencies.telemetry.annotate({ account_id: identity.account.id });
                 }
-                const state = {
-                    version: 1,
+            }
+            catch {
+                if (input.signal.aborted)
+                    throw input.signal.reason;
+            }
+            if (!organizationId) {
+                input.interaction.warn("登录成功，请执行 gd-cli org switch 选择组织。");
+                return { status: "logged_in", organizationSelected: false };
+            }
+            try {
+                const organization = await dependencies.telemetry.stage("bind", () => (dependencies.organizationBinder.bindAuthorizedOrganization({
                     credential: token.credential,
-                    ...(token.account ? { account: token.account } : {})
-                };
-                await dependencies.store.write(state);
-                if (!token.organizationId) {
-                    input.interaction.warn("登录成功，请执行 gd-cli org switch 选择组织。");
-                    return { status: "logged_in", organizationSelected: false };
-                }
-                try {
-                    const organization = await dependencies.organizationBinder.bindAuthorizedOrganization({
-                        credential: token.credential,
-                        organizationId: token.organizationId,
-                        signal: input.signal
-                    });
-                    if (!organization) {
-                        input.interaction.warn("登录成功，但未能选择组织；请执行 gd-cli org switch。");
-                        return { status: "logged_in", organizationSelected: false };
-                    }
-                    await dependencies.store.write({ ...state, organization });
-                    return { status: "logged_in", organizationSelected: true };
-                }
-                catch {
-                    if (input.signal.aborted)
-                        throw input.signal.reason;
-                    input.interaction.warn("登录成功，但组织绑定失败；请执行 gd-cli org switch。");
+                    organizationId,
+                    signal: input.signal
+                })));
+                if (!organization) {
+                    input.interaction.warn("登录成功，但未能选择组织；请执行 gd-cli org switch。");
                     return { status: "logged_in", organizationSelected: false };
                 }
+                await dependencies.telemetry.stage("state", () => dependencies.store.write({ ...state, organization }));
+                dependencies.telemetry.annotate({ organization_id: organization.id });
+                return { status: "logged_in", organizationSelected: true };
+            }
+            catch {
+                if (input.signal.aborted)
+                    throw input.signal.reason;
+                input.interaction.warn("登录成功，但组织绑定失败；请执行 gd-cli org switch。");
+                return { status: "logged_in", organizationSelected: false };
             }
         }
     };

package/dist/src/features/dam/asset-projection.js

@@ -8,6 +8,16 @@ const publicAssetTypes = new Set([
     "template",
     "file"
 ]);
+const internalAssetTypes = new Map([
+    ["gdpic", "image"],
+    ["gdimage", "image"],
+    ["gdvideo", "video"],
+    ["gdaudio", "audio"],
+    ["gdfont", "font"],
+    ["gdtemplate", "template"],
+    ["gdfile", "file"],
+    ["gdslide", "file"]
+]);
 const recognizableAssetKeys = new Set([
     "asset_id",
     "id",
@@ -39,6 +49,12 @@ function record(value) {
 function nonblank(value) {
     return typeof value === "string" && value.trim() !== "" ? value : undefined;
 }
+function publicSourceFormat(value) {
+    const format = nonblank(value);
+    return format !== undefined && !internalAssetTypes.has(format.toLowerCase())
+        ? format
+        : undefined;
+}
 function finiteNumber(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
@@ -114,19 +130,11 @@ function assetType(item, format, mediaType) {
     const explicit = nonblank(item.type)?.toLowerCase();
     if (explicit !== undefined && publicAssetTypes.has(explicit))
         return explicit;
-    const contentFormat = (nonblank(item.content_format) ?? nonblank(item.storage_format))?.toLowerCase();
-    if (contentFormat === "gdpic" || contentFormat === "gdimage")
-        return "image";
-    if (contentFormat === "gdvideo")
-        return "video";
-    if (contentFormat === "gdaudio")
-        return "audio";
-    if (contentFormat === "gdfont")
-        return "font";
-    if (contentFormat === "gdtemplate")
-        return "template";
-    if (contentFormat === "gdfile" || contentFormat === "gdslide")
-        return "file";
+    for (const candidate of [item.content_format, item.storage_format, item.format]) {
+        const internalType = internalAssetTypes.get(nonblank(candidate)?.toLowerCase() ?? "");
+        if (internalType !== undefined)
+            return internalType;
+    }
     const mediaCategory = mediaType?.split("/", 1)[0]?.toLowerCase();
     if (mediaCategory !== undefined && publicAssetTypes.has(mediaCategory))
         return mediaCategory;
@@ -160,7 +168,7 @@ function normalizeAsset(value, fallback) {
         ?? record(item.cover);
     const repository = record(item.repository_info) ?? record(item.repositoryInfo);
     const folder = record(item.folder_info) ?? record(item.folderInfo);
-    const format = nonblank(origin?.format) ?? nonblank(item.format);
+    const format = publicSourceFormat(origin?.format) ?? publicSourceFormat(item.format);
     const mediaType = nonblank(origin?.mime_type)
         ?? nonblank(item.mime_type)
         ?? nonblank(item.mimeType);