@gaoding/cli 1.1.0 → 1.2.0

package/dist/bin/gd-cli.js

@@ -27,7 +27,8 @@ try {
         signal: controller.signal,
         telemetry: runtime.telemetry,
         telemetrySink: runtime.telemetrySink,
-        updateNotification: runtime.updateNotification
+        updateNotification: runtime.updateNotification,
+        product: runtime.product
     });
 }
 catch (error) {

package/dist/bin/insmind-cli.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+import { insmindProduct } from "../src/product/config.js";
+import { localeOption } from "../src/product/locale.js";
+const controller = new AbortController();
+const interrupt = () => controller.abort(new Error("SIGINT"));
+process.once("SIGINT", interrupt);
+let runtime;
+let mapCliError;
+let redact;
+try {
+    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")
+    ]);
+    mapCliError = errorsModule.mapCliError;
+    redact = redactModule.redact;
+    const selectedLocale = localeOption(process.argv.slice(2));
+    runtime = runtimeModule.createProductionRuntime({
+        product: insmindProduct,
+        ...(selectedLocale === undefined ? {} : { locale: selectedLocale })
+    });
+    const program = cliModule.createCli(runtime, { signal: controller.signal });
+    process.exitCode = await cliModule.executeCli({
+        program,
+        argv: process.argv.slice(2),
+        presenter: runtime.presenter,
+        signal: controller.signal,
+        telemetry: runtime.telemetry,
+        telemetrySink: runtime.telemetrySink,
+        updateNotification: runtime.updateNotification,
+        product: runtime.product
+    });
+}
+catch (error) {
+    if (mapCliError === undefined || redact === undefined) {
+        process.stderr.write("INTERNAL_ERROR: CLI failed to start.\n");
+        process.exitCode = 1;
+    }
+    else {
+        const outcome = redact(mapCliError(error, { aborted: controller.signal.aborted, product: insmindProduct }));
+        if (runtime) {
+            runtime.presenter.error(outcome, { json: process.argv.includes("--json") });
+        }
+        else if (outcome.kind === "interrupted") {
+            process.stderr.write("Cancelled.\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;
+    }
+}
+finally {
+    process.removeListener("SIGINT", interrupt);
+}

package/dist/bin/postinstall.js

@@ -12,7 +12,7 @@ export function isSupportedGlobalLifecycle(env) {
     return userAgent.startsWith("pnpm/")
         && env.npm_command === "add"
         && env.npm_lifecycle_event === "postinstall"
-        && env.npm_package_name === "@gaoding/cli"
+        && (env.npm_package_name === "@gaoding/cli" || env.npm_package_name === "@insmind/cli")
         && /\/v\d+\/[0-9a-f]+-[0-9a-f]+-[0-9a-f]{16}$/u.test(initialDirectory);
 }
 export async function runPostinstall(options = {}) {

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

@@ -9,12 +9,13 @@ import { registerModelCommands } from "../cli/model-commands.js";
 import { registerEditorCommands } from "../cli/editor-commands.js";
 import { registerDamCommands } from "../cli/dam-commands.js";
 import { registerUpdateCommand } from "../cli/update-command.js";
+import { registerCreditsCommand } from "../cli/credits-command.js";
 import { redact } from "../platform/redact.js";
 export { assertAllLeafCommandsBound, bindAction } from "../cli/action-binding.js";
 export function createCli(runtime, options) {
     const program = new Command()
-        .name("gd-cli")
-        .description("稿定命令行工具")
+        .name(runtime.product.commandName)
+        .description(runtime.product.description)
         .version(runtime.version)
         .helpCommand(false)
         .showHelpAfterError(false)
@@ -25,6 +26,9 @@ export function createCli(runtime, options) {
         writeOut: runtime.io.writeOut,
         writeErr: () => undefined
     });
+    if (runtime.product.id === "insmind") {
+        program.option("--locale <locale>", "locale for service-owned business descriptions");
+    }
     configureActionEnvironment(program, {
         policies: runtime.accessPolicies,
         signal: options.signal,
@@ -32,7 +36,10 @@ export function createCli(runtime, options) {
         updateNotification: runtime.updateNotification
     });
     registerAuthCommands(program, runtime);
-    registerOrgCommands(program, runtime);
+    if (runtime.product.exposesOrganizations)
+        registerOrgCommands(program, runtime);
+    else
+        registerCreditsCommand(program, runtime);
     registerAgentCommands(program, runtime);
     registerToolCommands(program, runtime);
     registerModelCommands(program, runtime);
@@ -68,7 +75,10 @@ export async function executeCli(options) {
                 // The original Commander error is mapped and presented below.
             }
         }
-        const outcome = redact(mapCliError(error, { aborted: options.signal.aborted }));
+        const outcome = redact(mapCliError(error, {
+            aborted: options.signal.aborted,
+            ...(options.product ? { product: options.product } : {})
+        }));
         const telemetryError = classifyTelemetryError(error);
         const traceId = options.telemetry.selected
             ? options.telemetry.traceId

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

@@ -25,6 +25,7 @@ import { createToolApiAdapter } from "../features/tool/tool-api-adapter.js";
 import { createToolUseCases } from "../features/tool/use-cases.js";
 import { createOrgUseCases } from "../features/org/use-cases.js";
 import { createOrgService } from "../features/org/org-service.js";
+import { createCreditsUseCases } from "../features/credits/use-cases.js";
 import { createBrowserOpener } from "../platform/open-browser.js";
 import { createSignedHttpTransport } from "../platform/signed-http-transport.js";
 import { createJsonInputReader } from "../platform/json-input.js";
@@ -37,25 +38,36 @@ import { createUpdateNotificationService } from "../features/update/update-notif
 import { classifyTelemetryError } from "../cli/errors.js";
 import { createTelemetryInvocation } from "../telemetry/invocation.js";
 import { createSlsTelemetrySink } from "../telemetry/sls-sink.js";
+import { gaodingProduct } from "../product/config.js";
+import { resolveProductLocale, systemLocale } from "../product/locale.js";
+import { withAgentBillingUnit, withToolBillingUnit } from "../product/billing.js";
 import { readInstallationOwner } from "../platform/installation-owner.js";
-const productionEndpoints = {
-    orgApi: new URL("https://gdcli.gaoding.com/api"),
-    agentApi: new URL("https://gdcli.gaoding.com/api"),
-    mnsApi: new URL("https://gdcli.gaoding.com/api"),
-    toolApi: new URL("https://gdcli.gaoding.com/api"),
-    damApi: new URL("https://gdcli.gaoding.com/api"),
-    ssoApi: new URL("https://www.gaoding.com/api/sso"),
-    authPageOrigin: new URL("https://www.gaoding.art")
-};
 export function createProductionRuntime(options = {}) {
+    const product = options.product ?? gaodingProduct;
     const bundledSkills = loadBundledSkills(fileURLToPath(import.meta.url));
-    const primarySkill = bundledSkills.find((skill) => skill.skill === "gd-cli");
+    const primarySkill = bundledSkills.find((skill) => skill.skill === product.skillName);
     if (!primarySkill)
-        throw new Error("Bundled gd-cli Skill is missing.");
+        throw new Error(`Bundled ${product.skillName} Skill is missing.`);
     const packageRoot = dirname(dirname(primarySkill.sourceDirectory));
     const installationOwner = readInstallationOwner(packageRoot);
-    const endpoints = options.endpoints ?? productionEndpoints;
+    const endpoints = options.endpoints ?? product.endpoints;
     const fetch = options.fetch ?? globalThis.fetch;
+    const env = options.env ?? process.env;
+    const environmentLocale = product.localeEnvironmentVariable
+        ? env[product.localeEnvironmentVariable]
+        : undefined;
+    const localSystemLocale = systemLocale();
+    const locale = resolveProductLocale({
+        ...(options.locale === undefined ? {} : { explicit: options.locale }),
+        ...(environmentLocale === undefined ? {} : { environment: environmentLocale }),
+        ...(localSystemLocale === undefined ? {} : { system: localSystemLocale })
+    });
+    const businessHeaders = product.id === "insmind" ? {
+        "X-Locale": locale.locale,
+        "X-Language": locale.language,
+        "X-Market": locale.market,
+        "X-Legal-Region": locale.legalRegion
+    } : undefined;
     const now = options.now ?? (() => new Date());
     const telemetry = createTelemetryInvocation({
         cliVersion: primarySkill.version,
@@ -69,7 +81,10 @@ export function createProductionRuntime(options = {}) {
         },
         classifyError: classifyTelemetryError
     });
-    const telemetrySink = createSlsTelemetrySink({ fetch });
+    const telemetrySink = createSlsTelemetrySink({
+        fetch,
+        trackingUrl: product.telemetryUrl
+    });
     const rawIo = options.io ?? {
         input: process.stdin,
         stdout: process.stdout,
@@ -84,41 +99,55 @@ export function createProductionRuntime(options = {}) {
         stderrTerminal: rawIo.stderrTerminal ?? hasTerminal(rawIo.stderr)
     };
     const store = createLocalCredentialStore({
-        ...(options.homeDirectory ? { homeDirectory: options.homeDirectory } : {})
+        ...(options.homeDirectory ? { homeDirectory: options.homeDirectory } : {}),
+        stateDirectory: product.stateDirectory
     });
     const orgTransport = createSignedHttpTransport({
         baseUrl: endpoints.orgApi,
         fetch,
         now,
-        traceparent: () => telemetry.traceparent()
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
+    });
+    const creditsTransport = createSignedHttpTransport({
+        baseUrl: endpoints.creditsApi,
+        fetch,
+        now,
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
     });
     const agentTransport = createSignedHttpTransport({
         baseUrl: endpoints.agentApi,
         fetch,
         now,
-        traceparent: () => telemetry.traceparent()
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
     });
     const mnsTransport = createSignedHttpTransport({
         baseUrl: endpoints.mnsApi,
         fetch,
         now,
-        traceparent: () => telemetry.traceparent()
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
     });
     const toolTransport = createSignedHttpTransport({
         baseUrl: endpoints.toolApi,
         fetch,
         now,
-        traceparent: () => telemetry.traceparent()
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
     });
     const damTransport = createSignedHttpTransport({
         baseUrl: endpoints.damApi,
         fetch,
         now,
         channelId: "32",
-        traceparent: () => telemetry.traceparent()
+        traceparent: () => telemetry.traceparent(),
+        ...(businessHeaders ? { businessHeaders } : {})
     });
     const sso = createSsoService({
         ssoApi: endpoints.ssoApi,
+        clientId: product.deviceClientId,
         fetch,
         now
     });
@@ -126,13 +155,18 @@ export function createProductionRuntime(options = {}) {
         store,
         org: createOrgService({ transport: orgTransport }),
         sso,
-        telemetry
+        telemetry,
+        ...(product.exposesOrganizations
+            ? {}
+            : { singleOrganizationName: product.displayName })
     });
     const auth = createAuthUseCases({
         store,
         sso,
         organizationBinder: org,
         authPageOrigin: endpoints.authPageOrigin,
+        commandName: product.commandName,
+        requireOrganization: !product.exposesOrganizations,
         now,
         telemetry,
         sleep: async (milliseconds, signal) => {
@@ -140,6 +174,10 @@ export function createProductionRuntime(options = {}) {
         }
     });
     const storage = options.objectStorage ?? createObjectStorageUploader({ fetch, now });
+    const credits = createCreditsUseCases({
+        transport: creditsTransport,
+        billingUnit: product.billingUnit
+    });
     const storageUpload = createDamStorageUploader({
         transport: damTransport,
         storage
@@ -147,10 +185,13 @@ export function createProductionRuntime(options = {}) {
     const transientUploader = createDamTransientUploader({ storageUpload });
     const presenter = createPresenter({
         writeOut: io.writeOut,
-        writeError: io.writeError
+        writeError: io.writeError,
+        product
     });
     const browser = createBrowserOpener();
-    const validators = createContractValidators();
+    const validators = createContractValidators({
+        organizations: product.exposesOrganizations
+    });
     const modelCatalog = createMnsCatalogAdapter({ transport: mnsTransport });
     const damApi = createDamApiAdapter({ transport: damTransport });
     const damRepositories = createDamRepositoryCatalog({ transport: damTransport });
@@ -193,7 +234,7 @@ export function createProductionRuntime(options = {}) {
         },
         telemetry
     });
-    const agent = createAgentUseCases({
+    const agent = withAgentBillingUnit(createAgentUseCases({
         catalog: modelCatalog,
         uploader: transientUploader,
         completion: createCreativeAgentAdapter({
@@ -203,24 +244,29 @@ export function createProductionRuntime(options = {}) {
         }),
         warn: (message) => { presenter.warning(message); },
         telemetry
-    });
-    const tool = createToolUseCases({
+    }), product.billingUnit);
+    const tool = withToolBillingUnit(createToolUseCases({
         catalog: modelCatalog,
+        tools: product.tools,
         execution: createToolApiAdapter({ transport: toolTransport, telemetry }),
         uploader: transientUploader,
         warn: (message) => { presenter.warning(message); },
         telemetry
-    });
+    }), product.billingUnit);
     const editor = createEditorUseCases({
         session: createEditorSession({
             store: createEditorSessionStateStore({
                 ...(options.homeDirectory === undefined
                     ? {}
-                    : { homeDirectory: options.homeDirectory })
+                    : { homeDirectory: options.homeDirectory }),
+                stateDirectory: product.stateDirectory
             }),
             browser,
-            defaultCreateUrl: new URL("https://www.gaoding.art/editor/canvas?mode=create&type=board"),
-            workUrl: new URL("https://www.gaoding.art/editor/canvas"),
+            defaultCreateUrl: product.defaultEditorCreateUrl,
+            workUrl: product.editorWorkUrl,
+            commandName: product.commandName,
+            restrictTargets: product.restrictEditorTargets,
+            stateDirectory: product.stateDirectory,
             ...(options.homeDirectory === undefined
                 ? {}
                 : { homeDirectory: options.homeDirectory })
@@ -242,6 +288,11 @@ export function createProductionRuntime(options = {}) {
                 bundledSkills,
                 fetch,
                 telemetry,
+                ...(product.id === "insmind" ? {
+                    packageName: product.npmPackage,
+                    commandName: product.commandName,
+                    registryUrl: `https://registry.npmjs.org/${encodeURIComponent(product.npmPackage)}`
+                } : {}),
                 installationOwner,
                 ...(process.argv[1] ? { binaryPath: process.argv[1] } : {}),
                 ...(options.homeDirectory ? { homeDirectory: options.homeDirectory } : {})
@@ -255,9 +306,15 @@ export function createProductionRuntime(options = {}) {
         installationOwner,
         ...(options.homeDirectory ? { homeDirectory: options.homeDirectory } : {}),
         ...(options.env ? { env: options.env } : {}),
-        notify: (message) => { presenter.notice(message); }
+        notify: (message) => { presenter.notice(message); },
+        ...(product.id === "insmind" ? {
+            stateDirectoryName: product.stateDirectory,
+            registryUrl: `https://registry.npmjs.org/${encodeURIComponent(product.npmPackage)}`,
+            commandName: product.commandName
+        } : {})
     });
     return {
+        product,
         version: primarySkill.version,
         telemetry,
         telemetrySink,
@@ -272,6 +329,7 @@ export function createProductionRuntime(options = {}) {
         editor,
         dam,
         tool,
+        credits,
         update,
         updateNotification,
         jsonInput: createJsonInputReader({

package/dist/src/bootstrap/validators.js

@@ -35,8 +35,6 @@ const editorDisconnectOutputSchema = contractSchema("editor.disconnect", "output
 const editorSaveOutputSchema = contractSchema("editor.save", "output");
 const editorScreenshotOutputSchema = contractSchema("editor.screenshot", "output");
 const editorSnapshotOutputSchema = contractSchema("editor.snapshot", "output");
-const orgCurrentSchema = contractSchema("org.current", "output");
-const orgListSchema = contractSchema("org.list", "output");
 const modelGetInputSchema = contractSchema("model.get", "input");
 const modelGetOutputSchema = contractSchema("model.get", "output");
 const modelListInputSchema = contractSchema("model.list", "input");
@@ -56,7 +54,7 @@ export class OutputContractError extends Error {
         this.name = "OutputContractError";
     }
 }
-export function createContractValidators() {
+export function createContractValidators(options = {}) {
     const ajv = new Ajv2020({ allErrors: true, strict: true });
     const addFormats = addFormatsImport;
     addFormats(ajv);
@@ -94,8 +92,13 @@ export function createContractValidators() {
     const editorApplyOutput = ajv.compile(editorApplyOutputSchema);
     const editorScreenshotOutput = ajv.compile(editorScreenshotOutputSchema);
     const editorSaveOutput = ajv.compile(editorSaveOutputSchema);
-    const orgList = ajv.compile(orgListSchema);
-    const orgCurrent = ajv.compile(orgCurrentSchema);
+    const organizations = options.organizations !== false;
+    const orgList = organizations
+        ? ajv.compile(contractSchema("org.list", "output"))
+        : unavailableValidator;
+    const orgCurrent = organizations
+        ? ajv.compile(contractSchema("org.current", "output"))
+        : unavailableValidator;
     const toolListOutput = ajv.compile(toolListOutputSchema);
     const modelListInput = ajv.compile(modelListInputSchema);
     const modelListOutput = ajv.compile(modelListOutputSchema);
@@ -149,6 +152,7 @@ export function createContractValidators() {
         toolCallOutput: assertion(toolCallOutput, OutputContractError)
     };
 }
+const unavailableValidator = Object.assign(() => false, { errors: null, schema: false, schemaEnv: undefined });
 function assertion(validate, ErrorType) {
     return (value) => {
         if (!validate(value))

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

@@ -1,15 +1,16 @@
 import { contractSchema } from "../contracts/schema.js";
 import { bindPreparedAction } from "./action-binding.js";
 import { CliUsageError } from "./errors.js";
+import { productText as text } from "../product/text.js";
 const agentSendInputSchema = contractSchema("agent.send", "input");
 export function registerAgentCommands(program, runtime) {
     const agent = program.command("agent")
-        .description("稿定 Agent")
+        .description(text(runtime.product, "稿定 Agent", "insMind Agent"))
         .helpCommand(false);
     const send = agent.command("send")
-        .description("发送结构化创作消息")
-        .option("--schema", "输出输入 Schema")
-        .option("--input <file|->", "从文件或标准输入读取 JSON")
+        .description(text(runtime.product, "发送结构化创作消息", "Send a structured creation message"))
+        .option("--schema", text(runtime.product, "输出输入 Schema", "output the input Schema"))
+        .option("--input <file|->", text(runtime.product, "从文件或标准输入读取 JSON", "read JSON from a file or stdin"))
         .allowExcessArguments(false);
     bindPreparedAction(send, "organization", async (signal) => {
         signal.throwIfAborted();

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

@@ -1,12 +1,13 @@
 import { bindAction } from "./action-binding.js";
-import { authStatusView } from "./presenter.js";
+import { authStatusViewFor } from "./presenter.js";
+import { productText as text } from "../product/text.js";
 export function registerAuthCommands(program, runtime) {
     const auth = program.command("auth")
-        .description("登录与本机凭证")
+        .description(text(runtime.product, "登录与本机凭证", "Authentication and local credentials"))
         .helpCommand(false);
     const login = leaf(auth.command("login"))
-        .description("登录稿定")
-        .option("--no-browser", "不自动打开浏览器");
+        .description(text(runtime.product, "登录稿定", "Sign in to insMind"))
+        .option("--no-browser", text(runtime.product, "不自动打开浏览器", "do not open a browser automatically"));
     bindAction(login, "none", async (_context, signal) => {
         const noBrowser = login.opts().browser === false;
         runtime.telemetry.annotate({ parameters: { noBrowser } });
@@ -23,30 +24,32 @@ export function registerAuthCommands(program, runtime) {
             }
         });
         await runtime.telemetry.stage("output", async () => {
-            runtime.presenter.success(result.status === "already_logged_in" ? "已登录。" : "登录成功。");
+            runtime.presenter.success(result.status === "already_logged_in"
+                ? text(runtime.product, "已登录。", "Already signed in.")
+                : text(runtime.product, "登录成功。", "Signed in successfully."));
             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");
+        .description(text(runtime.product, "查看登录状态", "Show authentication status"))
+        .option("--json", text(runtime.product, "输出 JSON", "output JSON"));
     bindAction(status, "none", async () => {
         const result = await runtime.auth.status({ now: runtime.now() });
         await runtime.telemetry.stage("output", async () => {
             runtime.validators.authStatus(result);
             runtime.presenter.result(result, {
                 json: status.opts().json === true,
-                view: authStatusView
+                view: authStatusViewFor(runtime.product)
             });
         });
     }, { operation: "auth.status" });
-    const logout = leaf(auth.command("logout")).description("退出登录");
+    const logout = leaf(auth.command("logout")).description(text(runtime.product, "退出登录", "Sign out"));
     bindAction(logout, "none", async () => {
         await runtime.auth.logout();
         await runtime.telemetry.stage("output", async () => {
-            runtime.presenter.success("已退出登录。");
+            runtime.presenter.success(text(runtime.product, "已退出登录。", "Signed out."));
         });
     }, { operation: "auth.logout" });
 }

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

@@ -0,0 +1,23 @@
+import { bindAction } from "./action-binding.js";
+export function registerCreditsCommand(program, runtime) {
+    const credits = program.command("credits")
+        .description("Show the current insMind credits balance")
+        .option("--json", "output JSON")
+        .allowExcessArguments(false);
+    bindAction(credits, "organization", async (context, signal) => {
+        const result = await runtime.credits.get({
+            credential: context.state.credential,
+            organizationId: context.state.organization.id,
+            signal
+        });
+        await runtime.telemetry.stage("output", async () => {
+            runtime.presenter.result(result, {
+                json: credits.opts().json === true,
+                view: (value) => {
+                    const balance = value;
+                    return `${balance.credits.available} insMind credits available`;
+                }
+            });
+        });
+    }, { operation: "credits.get" });
+}