@gaoding/cli 1.1.0 → 1.2.0

package/dist/src/features/update/update-service.js

@@ -22,6 +22,8 @@ export function detectInstallSource(input) {
     const cwd = normalizePath(resolve(input.cwd));
     const userAgent = input.env.npm_config_user_agent ?? "";
     const npmExecPath = normalizePath(input.env.npm_execpath ?? "");
+    const packageName = input.packageName ?? "@gaoding/cli";
+    const encodedPackage = packageName.replace("/", "+").replace("@", "@");
     if (userAgent.startsWith("yarn/") || npmExecPath.includes("/yarn/")) {
         return unsupported("Yarn 安装不支持自动更新");
     }
@@ -35,16 +37,15 @@ export function detectInstallSource(input) {
     if (!isWithin(realBinaryPath, packageRoot)) {
         return unsupported("CLI binary 与 package 不匹配");
     }
-    if (/\/global\/[^/]+\/\.pnpm\/@gaoding\+cli@[^/]+\/node_modules\/@gaoding\/cli$/u
-        .test(packageRoot)
-        || /\/v\d+\/[0-9a-f]+-[0-9a-f]+-[0-9a-f]{16}\/node_modules\/@gaoding\/cli$/u
-            .test(packageRoot)
-        || /\/v\d+\/[0-9a-f]+-[0-9a-f]+-[0-9a-f]{16}\/node_modules\/@gaoding\/cli\/dist\/bin\/gd-cli\.js$/u
-            .test(binaryPath)) {
+    if (packageRoot.includes(`/global/`) && packageRoot.includes(`/.pnpm/${encodedPackage}@`)
+        || packageRoot.includes(`/node_modules/${packageName}`)
+            && /\/v\d+\/[0-9a-f]+-[0-9a-f]+-[0-9a-f]{16}\//u.test(packageRoot)
+        || binaryPath.includes(`/node_modules/${packageName}/dist/bin/${input.binaryName ?? "gd-cli"}.js`)
+            && /\/v\d+\/[0-9a-f]+-[0-9a-f]+-[0-9a-f]{16}\//u.test(binaryPath)) {
         return { kind: "global", manager: "pnpm", packageRoot: input.packageRoot };
     }
-    if (packageRoot.endsWith("/lib/node_modules/@gaoding/cli")
-        || packageRoot.endsWith("/npm/node_modules/@gaoding/cli")) {
+    if (packageRoot.endsWith(`/lib/node_modules/${packageName}`)
+        || packageRoot.endsWith(`/npm/node_modules/${packageName}`)) {
         return { kind: "global", manager: "npm", packageRoot: input.packageRoot };
     }
     return unsupported("无法确认 npm 或 pnpm 全局安装");
@@ -55,27 +56,46 @@ export function createUpdateService(options) {
     const syncSkills = options.syncSkills ?? syncBundledSkills;
     const verifySkills = options.verifySkills ?? verifyBundledSkills;
     const env = options.env ?? process.env;
+    const packageName = options.packageName ?? "@gaoding/cli";
+    const commandName = options.commandName ?? "gd-cli";
+    const insmind = packageName === "@insmind/cli";
     return {
         async run(signal) {
             signal.throwIfAborted();
             const owner = options.installationOwner
                 ?? readInstallationOwner(options.packageRoot);
             if (owner === "workbuddy") {
-                throw new UpdateError("UPDATE_FAILED", "此 gd-cli 由 WorkBuddy 连接器管理。", ["请在 WorkBuddy 中更新「稿定」连接器。"]);
+                throw new UpdateError("UPDATE_FAILED", insmind
+                    ? "This insMind CLI installation is managed by WorkBuddy."
+                    : "此 gd-cli 由 WorkBuddy 连接器管理。", [insmind
+                        ? "Update the insMind connector in WorkBuddy."
+                        : "请在 WorkBuddy 中更新「稿定」连接器。"]);
             }
             if (owner === "invalid") {
-                throw new UpdateError("UPDATE_FAILED", "无法确认当前安装的托管信息。", ["请通过原安装渠道重新安装 gd-cli。"]);
+                throw new UpdateError("UPDATE_FAILED", insmind
+                    ? "The current installation ownership metadata is invalid."
+                    : "无法确认当前安装的托管信息。", [insmind
+                        ? "Reinstall insmind-cli through its original installation channel."
+                        : "请通过原安装渠道重新安装 gd-cli。"]);
             }
             const latest = await options.telemetry.stage("registry", async () => {
                 try {
-                    const result = await fetchLatestVersion({ fetch: fetchPackage, signal });
+                    const result = await fetchLatestVersion({
+                        fetch: fetchPackage,
+                        signal,
+                        ...(options.registryUrl ? { registryUrl: options.registryUrl } : {})
+                    });
                     if (result.status !== "modified")
                         throw new Error("Registry response not modified");
                     return result.version;
                 }
                 catch (error) {
                     rethrowAbort(signal);
-                    throw new UpdateError("UPDATE_FAILED", "无法获取 @gaoding/cli 最新版本。", ["请稍后重新执行 gd-cli update。"]);
+                    throw new UpdateError("UPDATE_FAILED", options.commandName === undefined
+                        ? "无法获取 @gaoding/cli 最新版本。"
+                        : `Unable to get the latest ${packageName} version.`, [options.commandName === undefined
+                            ? "请稍后重新执行 gd-cli update。"
+                            : `Run ${commandName} update again later.`]);
                 }
             });
             signal.throwIfAborted();
@@ -90,7 +110,11 @@ export function createUpdateService(options) {
                     }
                     catch (error) {
                         rethrowAbort(signal);
-                        throw new UpdateError("UPDATE_FAILED", `gd-cli ${options.currentVersion} 无需更新，但 Agent Skill 同步失败。`, ["请解决冲突后重新执行 gd-cli update。"]);
+                        throw new UpdateError("UPDATE_FAILED", insmind
+                            ? `${commandName} ${options.currentVersion} is current, but Agent Skill synchronization failed.`
+                            : `gd-cli ${options.currentVersion} 无需更新，但 Agent Skill 同步失败。`, [insmind
+                                ? `Resolve the conflict and run ${commandName} update again.`
+                                : "请解决冲突后重新执行 gd-cli update。"]);
                     }
                 });
                 return { version: options.currentVersion, updated: false };
@@ -101,23 +125,29 @@ export function createUpdateService(options) {
                 realBinaryPath: safeRealpath(binaryPath),
                 packageRoot: options.packageRoot,
                 cwd: options.cwd ?? process.cwd(),
-                env
+                env,
+                packageName,
+                binaryName: commandName
             });
-            const nextSteps = manualCommands(latest);
+            const nextSteps = manualCommands(latest, packageName);
             if (source.kind === "unsupported") {
-                throw new UpdateError("UPDATE_FAILED", `当前安装方式不支持自动更新：${source.reason}。`, nextSteps);
+                throw new UpdateError("UPDATE_FAILED", insmind
+                    ? "The current installation method does not support automatic updates."
+                    : `当前安装方式不支持自动更新：${source.reason}。`, nextSteps);
             }
             const command = source.manager;
             const args = source.manager === "npm"
-                ? ["install", "--global", "--allow-scripts=@gaoding/cli", `@gaoding/cli@${latest}`]
-                : ["add", "--global", "--allow-build=@gaoding/cli", `@gaoding/cli@${latest}`];
+                ? ["install", "--global", `--allow-scripts=${packageName}`, `${packageName}@${latest}`]
+                : ["add", "--global", `--allow-build=${packageName}`, `${packageName}@${latest}`];
             await options.telemetry.stage("install", async () => {
                 try {
                     await runProcess(command, args, signal);
                 }
                 catch (error) {
                     rethrowAbort(signal);
-                    throw new UpdateError("UPDATE_FAILED", `gd-cli 更新到 ${latest} 失败。`, nextSteps);
+                    throw new UpdateError("UPDATE_FAILED", insmind
+                        ? `Failed to update ${commandName} to ${latest}.`
+                        : `gd-cli 更新到 ${latest} 失败。`, nextSteps);
                 }
             });
             signal.throwIfAborted();
@@ -131,7 +161,11 @@ export function createUpdateService(options) {
                 }
                 catch (error) {
                     rethrowAbort(signal);
-                    throw new UpdateError("UPDATE_PARTIAL", `gd-cli 已更新到 ${latest}，但 Agent Skill 验收失败。`, ["请重新执行 gd-cli update。"]);
+                    throw new UpdateError("UPDATE_PARTIAL", insmind
+                        ? `${commandName} was updated to ${latest}, but Agent Skill verification failed.`
+                        : `gd-cli 已更新到 ${latest}，但 Agent Skill 验收失败。`, [insmind
+                            ? `Run ${commandName} update again.`
+                            : "请重新执行 gd-cli update。"]);
                 }
             });
             return { version: latest, updated: true };
@@ -158,10 +192,10 @@ function spawnProcess(command, args, signal) {
         });
     });
 }
-function manualCommands(version) {
+function manualCommands(version, packageName = "@gaoding/cli") {
     return [
-        `npm install --global --allow-scripts=@gaoding/cli @gaoding/cli@${version}`,
-        `pnpm add --global --allow-build=@gaoding/cli @gaoding/cli@${version}`
+        `npm install --global --allow-scripts=${packageName} ${packageName}@${version}`,
+        `pnpm add --global --allow-build=${packageName} ${packageName}@${version}`
     ];
 }
 function containsTemporaryRunner(path) {

package/dist/src/platform/signed-http-transport.js

@@ -51,6 +51,7 @@ export function createSignedHttpTransport(options) {
         url.search = query;
         const timestamp = Math.floor(options.now().getTime() / 1000);
         const headers = {
+            ...options.businessHeaders,
             Accept: accept,
             "X-AccessKey": request.credential.accessKey,
             "X-Signature": signRequest({

package/dist/src/product/billing.js

@@ -0,0 +1,45 @@
+export function withAgentBillingUnit(source, unit) {
+    if (unit === "gaodou")
+        return source;
+    return {
+        async send(input) {
+            const output = await source.send(input);
+            return {
+                ...output,
+                usage: {
+                    ...output.usage,
+                    cost: { ...output.usage.cost, unit },
+                    items: output.usage.items.map((item) => ({
+                        ...item,
+                        cost: { ...item.cost, unit }
+                    }))
+                }
+            };
+        }
+    };
+}
+export function withToolBillingUnit(source, unit) {
+    if (unit === "gaodou")
+        return source;
+    const model = (value) => (value.cost ? { ...value, cost: { ...value.cost, unit } } : value);
+    return {
+        listTools: (input) => source.listTools(input),
+        async listModels(input) {
+            const output = await source.listModels(input);
+            return { ...output, models: output.models.map(model) };
+        },
+        async getModel(input) {
+            return model(await source.getModel(input));
+        },
+        getArgumentsSchema: (input) => source.getArgumentsSchema(input),
+        async call(input) {
+            const output = await source.call(input);
+            return {
+                ...output,
+                usage: output.usage.cost
+                    ? { ...output.usage, cost: { ...output.usage.cost, unit } }
+                    : output.usage
+            };
+        }
+    };
+}

package/dist/src/product/config.js

@@ -0,0 +1,83 @@
+import { defaultToolDefinitions } from "../features/tool/catalog.js";
+function freezeProduct(config) {
+    Object.freeze(config.endpoints);
+    for (const tool of config.tools)
+        Object.freeze(tool);
+    Object.freeze(config.tools);
+    return Object.freeze(config);
+}
+const gaodingApi = new URL("https://gdcli.gaoding.com/api");
+export const gaodingProduct = freezeProduct({
+    id: "gaoding",
+    displayName: "GaoDing",
+    commandName: "gd-cli",
+    description: "稿定命令行工具",
+    npmPackage: "@gaoding/cli",
+    skillName: "gd-cli",
+    stateDirectory: ".gd",
+    billingUnit: "gaodou",
+    deviceClientId: "gdhub-cli",
+    pricingUrl: new URL("https://www.gaoding.art/pricing"),
+    telemetryUrl: new URL("https://gaoding-log-ai-gpu.cn-hangzhou.log.aliyuncs.com/logstores/gd-cli/track?APIVersion=0.6.0"),
+    defaultEditorCreateUrl: new URL("https://www.gaoding.art/editor/canvas?mode=create&type=board"),
+    editorWorkUrl: new URL("https://www.gaoding.art/editor/canvas"),
+    restrictEditorTargets: false,
+    endpoints: {
+        orgApi: gaodingApi,
+        creditsApi: gaodingApi,
+        agentApi: gaodingApi,
+        mnsApi: gaodingApi,
+        toolApi: gaodingApi,
+        damApi: gaodingApi,
+        ssoApi: new URL("https://www.gaoding.com/api/sso"),
+        authPageOrigin: new URL("https://www.gaoding.art")
+    },
+    exposesOrganizations: true,
+    tools: defaultToolDefinitions
+});
+const insmindApi = new URL("https://gdcli.insmind.com/api");
+export const insmindProduct = freezeProduct({
+    id: "insmind",
+    displayName: "insMind",
+    commandName: "insmind-cli",
+    description: "insMind command-line interface",
+    npmPackage: "@insmind/cli",
+    skillName: "insmind-cli",
+    stateDirectory: ".insmind",
+    billingUnit: "credit",
+    deviceClientId: "gdhub-cli",
+    pricingUrl: new URL("https://www.insmind.com/pricing"),
+    telemetryUrl: new URL("https://gaoding-log-ai-gpu-use.us-east-1.log.aliyuncs.com/logstores/gd-cli/track?APIVersion=0.6.0"),
+    defaultEditorCreateUrl: new URL("https://www.insmind.com/editor/canvas?mode=create&type=board"),
+    editorWorkUrl: new URL("https://www.insmind.com/editor/canvas"),
+    restrictEditorTargets: true,
+    endpoints: {
+        orgApi: insmindApi,
+        creditsApi: insmindApi,
+        agentApi: insmindApi,
+        mnsApi: insmindApi,
+        toolApi: insmindApi,
+        damApi: insmindApi,
+        ssoApi: new URL("https://www.insmind.com/api/sso"),
+        authPageOrigin: new URL("https://www.insmind.com")
+    },
+    exposesOrganizations: false,
+    localeEnvironmentVariable: "INSMIND_CLI_LOCALE",
+    tools: [
+        {
+            name: "image.generate",
+            title: "Image generation and editing",
+            description: "Generate or edit images with published image models using text and optional reference images."
+        },
+        {
+            name: "video.generate",
+            title: "Video generation",
+            description: "Generate videos with published video models using text and optional images, video, or audio."
+        },
+        {
+            name: "text.generate",
+            title: "Text generation",
+            description: "Generate text with published text models using text and optional images."
+        }
+    ]
+});

package/dist/src/product/locale.js

@@ -0,0 +1,38 @@
+const SUPPORTED_LOCALES = [
+    "de-DE", "en-US", "es-ES", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR",
+    "nl-NL", "pl-PL", "pt-BR", "ru-RU", "th-TH", "tr-TR", "vi-VN", "zh-CN", "zh-TW"
+];
+export function localeOption(argv) {
+    const index = argv.indexOf("--locale");
+    if (index >= 0)
+        return argv[index + 1];
+    return argv.find((value) => value.startsWith("--locale="))?.slice("--locale=".length);
+}
+export function resolveProductLocale(options) {
+    const requested = options.explicit ?? options.environment ?? options.system ?? "en-US";
+    let canonical;
+    try {
+        canonical = Intl.getCanonicalLocales(requested.replace(/_/gu, "-"))[0] ?? "en-US";
+    }
+    catch {
+        canonical = "en-US";
+    }
+    const exact = SUPPORTED_LOCALES.find((value) => value.toLowerCase() === canonical.toLowerCase());
+    const language = canonical.split("-")[0]?.toLowerCase() ?? "en";
+    const matched = exact ?? SUPPORTED_LOCALES.find((value) => value.toLowerCase().startsWith(`${language}-`)) ?? "en-US";
+    const [normalizedLanguage, region = "US"] = matched.split("-");
+    return {
+        locale: matched,
+        language: normalizedLanguage,
+        market: region,
+        legalRegion: region
+    };
+}
+export function systemLocale() {
+    try {
+        return Intl.DateTimeFormat().resolvedOptions().locale;
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/src/product/text.js

@@ -0,0 +1,3 @@
+export function productText(product, gaoding, insmind) {
+    return product.id === "insmind" ? insmind : gaoding;
+}

package/dist/src/telemetry/sls-sink.js

@@ -1,4 +1,3 @@
-const trackingUrl = new URL("https://gaoding-log-ai-gpu.cn-hangzhou.log.aliyuncs.com/logstores/gd-cli/track?APIVersion=0.6.0");
 const TIMEOUT_MS = 2_000;
 export function createSlsTelemetrySink(options) {
     return {
@@ -6,7 +5,7 @@ export function createSlsTelemetrySink(options) {
             if (events.length === 0)
                 return;
             try {
-                await options.fetch(trackingUrl, {
+                await options.fetch(options.trackingUrl, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ __logs__: events.map(wireEvent) }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaoding/cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Gaoding command-line interface for agents and people.",
   "type": "module",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "open": "11.0.0",
     "qrcode": "1.5.4",
     "semver": "7.8.5",
-    "sharp": "0.35.3",
+    "sharp": "0.35.4",
     "ws": "8.21.1"
   },
   "devDependencies": {
@@ -55,8 +55,8 @@
     "vitest": "4.1.10"
   },
   "gaodingRelease": {
-    "sourceCommit": "24e9f75334bea21d5d5fed4797a346c81b37c0b1",
-    "pipelineId": "173862",
-    "pipelineUrl": "https://git.intra.gaoding.com/gtt/gaoding-cli/-/pipelines/173862"
+    "sourceCommit": "b0fd52f34b217c15a54dfb8d6af44c0a5659c752",
+    "pipelineId": "180065",
+    "pipelineUrl": "https://git.intra.gaoding.com/gtt/gaoding-cli/-/pipelines/180065"
   }
 }