@gaoding/cli 1.1.0 → 1.2.0

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

@@ -1,15 +1,25 @@
 export class DeviceAuthorizationExpiredError extends Error {
-    constructor() {
-        super("授权码已过期，请重新执行 gd-cli auth login。");
+    constructor(commandName = "gd-cli") {
+        super(`Authorization expired. Run ${commandName} auth login again.`);
         this.name = "DeviceAuthorizationExpiredError";
     }
 }
+export class AuthorizedAccountContextMissingError extends Error {
+    constructor() {
+        super("The authorized insMind account did not provide its account context.");
+        this.name = "AuthorizedAccountContextMissingError";
+    }
+}
 export function createAuthUseCases(dependencies) {
+    const insmind = dependencies.commandName === "insmind-cli";
     return {
         async status(input) {
             const state = await dependencies.telemetry.stage("state", () => dependencies.store.read());
             if (!state)
-                return { logged_in: false, next_steps: ["gd-cli auth login"] };
+                return {
+                    logged_in: false,
+                    next_steps: [`${dependencies.commandName ?? "gd-cli"} auth login`]
+                };
             dependencies.telemetry.annotate({
                 account_id: state.account?.id,
                 organization_id: state.organization?.id
@@ -21,7 +31,7 @@ export function createAuthUseCases(dependencies) {
                     user_id: state.account?.id ?? null,
                     name: state.account?.name ?? null
                 },
-                organization: state.organization
+                organization: !dependencies.requireOrganization && state.organization
                     ? { id: state.organization.id, name: state.organization.name }
                     : null,
                 credential: {
@@ -30,10 +40,12 @@ export function createAuthUseCases(dependencies) {
                     scope: [...state.credential.scope]
                 },
                 next_steps: !valid
-                    ? ["gd-cli auth logout", "gd-cli auth login"]
-                    : state.organization
+                    ? [`${dependencies.commandName ?? "gd-cli"} auth logout`, `${dependencies.commandName ?? "gd-cli"} auth login`]
+                    : dependencies.requireOrganization
                         ? []
-                        : ["gd-cli org list", "gd-cli org switch"]
+                        : state.organization
+                            ? []
+                            : ["gd-cli org list", "gd-cli org switch"]
             };
         },
         async logout() {
@@ -42,7 +54,9 @@ export function createAuthUseCases(dependencies) {
         async login(input) {
             input.signal.throwIfAborted();
             const existing = await dependencies.telemetry.stage("state", () => dependencies.store.read());
-            if (existing && Date.parse(existing.credential.expiresAt) > dependencies.now().getTime()) {
+            if (existing
+                && Date.parse(existing.credential.expiresAt) > dependencies.now().getTime()
+                && (!dependencies.requireOrganization || existing.organization !== undefined)) {
                 dependencies.telemetry.annotate({
                     account_id: existing.account?.id,
                     organization_id: existing.organization?.id
@@ -62,7 +76,9 @@ export function createAuthUseCases(dependencies) {
                         await input.interaction.openBrowser(authorizationUrl);
                     }
                     catch {
-                        input.interaction.warn("无法自动打开浏览器，请手动访问授权链接。");
+                        input.interaction.warn(insmind
+                            ? "Could not open the browser. Open the authorization URL manually."
+                            : "无法自动打开浏览器，请手动访问授权链接。");
                     }
                 }
                 return authorization;
@@ -72,7 +88,7 @@ export function createAuthUseCases(dependencies) {
             const token = await dependencies.telemetry.stage("wait", async () => {
                 while (true) {
                     if (dependencies.now().getTime() + interval > deadline) {
-                        throw new DeviceAuthorizationExpiredError();
+                        throw new DeviceAuthorizationExpiredError(dependencies.commandName);
                     }
                     await dependencies.sleep(interval, input.signal);
                     input.signal.throwIfAborted();
@@ -91,7 +107,9 @@ export function createAuthUseCases(dependencies) {
                 credential: token.credential,
                 ...(token.account ? { account: token.account } : {})
             };
-            await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+            if (!dependencies.requireOrganization) {
+                await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+            }
             dependencies.telemetry.annotate({ account_id: state.account?.id });
             let organizationId = token.organizationId;
             try {
@@ -99,7 +117,9 @@ export function createAuthUseCases(dependencies) {
                 organizationId = identity.organizationId ?? organizationId;
                 if (!state.account && identity.account) {
                     state = { ...state, account: identity.account };
-                    await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+                    if (!dependencies.requireOrganization) {
+                        await dependencies.telemetry.stage("state", () => dependencies.store.write(state));
+                    }
                     dependencies.telemetry.annotate({ account_id: identity.account.id });
                 }
             }
@@ -108,6 +128,8 @@ export function createAuthUseCases(dependencies) {
                     throw input.signal.reason;
             }
             if (!organizationId) {
+                if (dependencies.requireOrganization)
+                    throw new AuthorizedAccountContextMissingError();
                 input.interaction.warn("登录成功，请执行 gd-cli org switch 选择组织。");
                 return { status: "logged_in", organizationSelected: false };
             }
@@ -118,6 +140,8 @@ export function createAuthUseCases(dependencies) {
                     signal: input.signal
                 })));
                 if (!organization) {
+                    if (dependencies.requireOrganization)
+                        throw new AuthorizedAccountContextMissingError();
                     input.interaction.warn("登录成功，但未能选择组织；请执行 gd-cli org switch。");
                     return { status: "logged_in", organizationSelected: false };
                 }
@@ -128,6 +152,8 @@ export function createAuthUseCases(dependencies) {
             catch {
                 if (input.signal.aborted)
                     throw input.signal.reason;
+                if (dependencies.requireOrganization)
+                    throw new AuthorizedAccountContextMissingError();
                 input.interaction.warn("登录成功，但组织绑定失败；请执行 gd-cli org switch。");
                 return { status: "logged_in", organizationSelected: false };
             }

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

@@ -0,0 +1,52 @@
+import { RemoteProtocolError } from "../../platform/remote-protocol.js";
+export function createCreditsUseCases(options) {
+    return {
+        async get(input) {
+            const body = await options.transport.getJson({
+                path: "/trade/rights-overview",
+                query: { goods_type_enums: "GAODOU" },
+                credential: input.credential,
+                organizationId: input.organizationId,
+                signal: input.signal
+            });
+            const source = findCreditsRecord(body);
+            const total = number(source.total);
+            const used = number(source.used);
+            const pending = number(source.wait);
+            if (total === undefined || used === undefined || pending === undefined) {
+                throw new RemoteProtocolError();
+            }
+            return {
+                credits: {
+                    unit: options.billingUnit,
+                    total,
+                    used,
+                    pending,
+                    available: Math.max(0, total - used)
+                }
+            };
+        }
+    };
+}
+function findCreditsRecord(value) {
+    if (Array.isArray(value)) {
+        const record = value.find((candidate) => (isRecord(candidate) && candidate.goods_type_enum === "GAODOU"));
+        if (!record)
+            throw new RemoteProtocolError();
+        return record;
+    }
+    if (!isRecord(value))
+        throw new RemoteProtocolError();
+    const candidates = [value.GAODOU, value.data, isRecord(value.data) ? value.data.GAODOU : undefined];
+    const record = candidates.find(isRecord);
+    if (!record)
+        throw new RemoteProtocolError();
+    return record;
+}
+function number(value) {
+    const parsed = typeof value === "number" ? value : Number(value);
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : undefined;
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/src/features/dam/storage-upload.js

@@ -11,7 +11,7 @@ function requiredString(record, key) {
 }
 function optionalString(record, key) {
     const value = record[key];
-    if (value === undefined)
+    if (value === undefined || value === null)
         return undefined;
     if (typeof value !== "string" || value.trim() === "")
         throw new RemoteRequestError();

package/dist/src/features/editor/bridge-process.js

@@ -9,7 +9,10 @@ export async function runEditorBridgeProcess(targetOrigin, options = {}) {
     const store = createEditorSessionStateStore({
         ...(options.homeDirectory === undefined
             ? {}
-            : { homeDirectory: options.homeDirectory })
+            : { homeDirectory: options.homeDirectory }),
+        ...(options.stateDirectory === undefined
+            ? {}
+            : { stateDirectory: options.stateDirectory })
     });
     const bridge = await (options.startBridge ?? startEditorBridge)({ targetOrigin });
     const shutdown = () => {
@@ -52,7 +55,9 @@ export function startEditorBridgeProcess(input) {
         child = (input.spawn ?? nodeSpawn)(process.execPath, [
             fileURLToPath(new URL("./bridge-process.js", import.meta.url)),
             input.targetOrigin,
-            ...(input.homeDirectory === undefined ? [] : [input.homeDirectory])
+            ...(input.stateDirectory === undefined
+                ? (input.homeDirectory === undefined ? [] : [input.homeDirectory])
+                : [input.homeDirectory ?? "", input.stateDirectory])
         ], {
             detached: true,
             stdio: ["ignore", "ignore", "ignore", "ipc"]
@@ -208,13 +213,15 @@ function hasExactKeys(value, keys) {
 const ownPath = fileURLToPath(import.meta.url);
 if (process.argv[1] && resolve(process.argv[1]) === resolve(ownPath)) {
     const targetOrigin = process.argv[2];
-    const homeDirectory = process.argv[3];
+    const homeDirectory = process.argv[3] || undefined;
+    const stateDirectory = process.argv[4];
     if (!targetOrigin) {
         process.exitCode = 1;
     }
     else {
         void runEditorBridgeProcess(targetOrigin, {
-            ...(homeDirectory === undefined ? {} : { homeDirectory })
+            ...(homeDirectory === undefined ? {} : { homeDirectory }),
+            ...(stateDirectory === undefined ? {} : { stateDirectory })
         }).catch(() => {
             process.exitCode = 1;
         });

package/dist/src/features/editor/session-state.js

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { createLocalJsonFile } from "../../platform/local-json-file.js";
 export function createEditorSessionStateStore(options = {}) {
     const file = options.file ?? createLocalJsonFile({
-        directory: join(options.homeDirectory ?? homedir(), ".gd"),
+        directory: join(options.homeDirectory ?? homedir(), options.stateDirectory ?? ".gd"),
         filename: "editor-session.json"
     });
     const read = async () => {

package/dist/src/features/editor/session.js

@@ -14,8 +14,8 @@ export class EditorTargetError extends Error {
 }
 export class EditorSessionNotFoundError extends Error {
     code = "EDITOR_SESSION_NOT_FOUND";
-    constructor() {
-        super("当前没有可用的 Editor 会话，请重新执行 gd-cli editor connect [target]。");
+    constructor(commandName = "gd-cli") {
+        super(`当前没有可用的 Editor 会话，请重新执行 ${commandName} editor connect [target]。`);
         this.name = "EditorSessionNotFoundError";
     }
 }
@@ -27,7 +27,7 @@ export class EditorNotReadyError extends Error {
     }
 }
 export function resolveEditorTarget(value) {
-    return resolveTarget(value, DEFAULT_CREATE_URL, DEFAULT_WORK_URL).href;
+    return resolveTarget(value, DEFAULT_CREATE_URL, DEFAULT_WORK_URL, false).href;
 }
 export function createEditorSession(dependencies) {
     const startProcess = dependencies.startProcess ?? startEditorBridgeProcess;
@@ -37,7 +37,7 @@ export function createEditorSession(dependencies) {
     return {
         async connect(target, signal) {
             signal.throwIfAborted();
-            const targetUrl = resolveTarget(target, dependencies.defaultCreateUrl, dependencies.workUrl);
+            const targetUrl = resolveTarget(target, dependencies.defaultCreateUrl, dependencies.workUrl, dependencies.restrictTargets === true);
             await replaceCurrentSession(signal);
             signal.throwIfAborted();
             const state = await startProcess({
@@ -45,6 +45,9 @@ export function createEditorSession(dependencies) {
                 ...(dependencies.homeDirectory === undefined
                     ? {}
                     : { homeDirectory: dependencies.homeDirectory }),
+                ...(dependencies.stateDirectory === undefined
+                    ? {}
+                    : { stateDirectory: dependencies.stateDirectory }),
                 signal
             });
             const handoffUrl = buildHandoffUrl(targetUrl, state);
@@ -82,7 +85,7 @@ export function createEditorSession(dependencies) {
             signal.throwIfAborted();
             const state = await dependencies.store.read();
             if (state === null)
-                throw new EditorSessionNotFoundError();
+                throw new EditorSessionNotFoundError(dependencies.commandName);
             try {
                 return await createClient(state).rpc(method, payload, signal);
             }
@@ -96,7 +99,7 @@ export function createEditorSession(dependencies) {
         if (!(cause instanceof EditorBridgeUnavailableError))
             throw cause;
         await dependencies.store.removeIfOwned(state.token);
-        throw new EditorSessionNotFoundError();
+        throw new EditorSessionNotFoundError(dependencies.commandName);
     }
     async function replaceCurrentSession(signal) {
         const current = await dependencies.store.read();
@@ -154,7 +157,7 @@ export function createEditorSession(dependencies) {
         }
     }
 }
-function resolveTarget(value, createUrl, workUrl) {
+function resolveTarget(value, createUrl, workUrl, restrictTargets) {
     if (value === undefined)
         return new URL(createUrl.href);
     if (/^\d+$/.test(value)) {
@@ -176,7 +179,10 @@ function resolveTarget(value, createUrl, workUrl) {
     }
     if ((url.protocol !== "http:" && url.protocol !== "https:") ||
         url.username !== "" ||
-        url.password !== "") {
+        url.password !== "" ||
+        (restrictTargets && (url.protocol !== "https:" ||
+            url.origin !== workUrl.origin ||
+            url.pathname !== workUrl.pathname))) {
         throw new EditorTargetError();
     }
     return url;

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

@@ -98,6 +98,13 @@ export function createOrgUseCases(dependencies) {
             if (!organizationId)
                 return null;
             try {
+                if (dependencies.singleOrganizationName !== undefined) {
+                    return await bind(input.credential, {
+                        id: organizationId,
+                        publicName: dependencies.singleOrganizationName,
+                        realName: dependencies.singleOrganizationName
+                    }, input.signal);
+                }
                 const records = await dependencies.org.list(input.credential, input.signal);
                 const record = records.find((candidate) => candidate.id === organizationId);
                 if (!record?.realName)

package/dist/src/features/skill/bundled-skills.js

@@ -14,16 +14,17 @@ export function loadBundledSkills(startFile) {
             catch (error) {
                 throw new SkillSyncError(`无法读取 @gaoding/cli package metadata: ${message(error)}`, []);
             }
-            if (metadata.name === "@gaoding/cli") {
+            const product = packageProduct(metadata.name);
+            if (product) {
                 if (typeof metadata.version !== "string" || !metadata.version.trim()) {
-                    throw new SkillSyncError("@gaoding/cli package version 无效。", []);
+                    throw new SkillSyncError(`${product.packageName} package version is invalid.`, []);
                 }
-                const sourceDirectory = join(directory, "skills", "gd-cli");
+                const sourceDirectory = join(directory, "skills", product.skillName);
                 if (!isFile(join(sourceDirectory, "SKILL.md"))) {
                     throw new SkillSyncError(`Agent Skill source 不存在: ${sourceDirectory}`, []);
                 }
                 return [{
-                        skill: "gd-cli",
+                        skill: product.skillName,
                         version: metadata.version,
                         sourceDirectory
                     }];
@@ -31,7 +32,14 @@ export function loadBundledSkills(startFile) {
         }
         directory = dirname(directory);
     }
-    throw new SkillSyncError("无法定位 @gaoding/cli package root。", []);
+    throw new SkillSyncError("Unable to locate a supported CLI package root.", []);
+}
+function packageProduct(name) {
+    if (name === "@gaoding/cli")
+        return { packageName: name, skillName: "gd-cli" };
+    if (name === "@insmind/cli")
+        return { packageName: name, skillName: "insmind-cli" };
+    return null;
 }
 function directoryFrom(path) {
     const absolute = resolve(path);

package/dist/src/features/tool/catalog.js

@@ -1,10 +1,4 @@
-export class ToolInputError extends Error {
-    constructor() {
-        super("Tool 输入不可用。");
-        this.name = "ToolInputError";
-    }
-}
-const tools = [
+export const defaultToolDefinitions = [
     {
         name: "image.generate",
         title: "图片生成与编辑",
@@ -21,11 +15,17 @@ const tools = [
         description: "使用已发布的文本模型，根据文本和可选图片生成文本。"
     }
 ];
-function toolIndex(tool) {
+export class ToolInputError extends Error {
+    constructor() {
+        super("Tool 输入不可用。");
+        this.name = "ToolInputError";
+    }
+}
+function toolIndex(tool, tools) {
     return tools.findIndex((candidate) => candidate.name === tool);
 }
-function compareModels(left, right) {
-    return toolIndex(left.tool) - toolIndex(right.tool)
+function compareModels(left, right, tools) {
+    return toolIndex(left.tool, tools) - toolIndex(right.tool, tools)
         || left.sceneSort - right.sceneSort
         || left.modelSort - right.modelSort
         || (left.model < right.model ? -1 : left.model > right.model ? 1 : 0);
@@ -40,19 +40,19 @@ function summary(model) {
         ...(model.estimatedTime === undefined ? {} : { estimatedTime: model.estimatedTime })
     };
 }
-export function projectToolList(catalog) {
+export function projectToolList(catalog, tools = defaultToolDefinitions) {
     return {
         tools: tools.filter((tool) => catalog.models.some((model) => model.tool === tool.name))
     };
 }
-export function projectModelList(catalog, tool) {
+export function projectModelList(catalog, tool, tools = defaultToolDefinitions) {
     if (tool !== undefined && !catalog.models.some((model) => model.tool === tool)) {
         throw new ToolInputError();
     }
     return {
         models: catalog.models
             .filter((model) => tool === undefined || model.tool === tool)
-            .toSorted(compareModels)
+            .toSorted((left, right) => compareModels(left, right, tools))
             .map(summary)
     };
 }

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

@@ -1,5 +1,5 @@
 import { parseSafeRemoteAssetUrl, UrlSafetyError } from "../../platform/url-safety.js";
-import { findToolModel, projectModelDetail, projectModelList, projectToolList, ToolInputError } from "./catalog.js";
+import { findToolModel, defaultToolDefinitions, projectModelDetail, projectModelList, projectToolList, ToolInputError } from "./catalog.js";
 import { assertModelArguments, buildToolArgumentsSchema } from "./dynamic-schema.js";
 const mediaTypes = {
     avif: "image/avif",
@@ -56,10 +56,10 @@ export function createToolUseCases(dependencies) {
     }
     return {
         async listTools({ access, signal }) {
-            return projectToolList(await load(access, signal));
+            return projectToolList(await load(access, signal), dependencies.tools ?? defaultToolDefinitions);
         },
         async listModels({ input, access, signal }) {
-            return projectModelList(await load(access, signal), input.tool);
+            return projectModelList(await load(access, signal), input.tool, dependencies.tools ?? defaultToolDefinitions);
         },
         async getModel({ input, access, signal }) {
             return projectModelDetail(await load(access, signal), input.model);

package/dist/src/features/update/latest-version.js

@@ -1,12 +1,12 @@
 import { valid } from "semver";
-const REGISTRY_DIST_TAGS_URL = "https://registry.npmjs.org/@gaoding%2fcli";
+export const GAODING_REGISTRY_DIST_TAGS_URL = "https://registry.npmjs.org/@gaoding%2fcli";
 export async function fetchLatestVersion(options) {
     const headers = new Headers({
         Accept: "application/vnd.npm.install-v1+json"
     });
     if (options.etag)
         headers.set("If-None-Match", options.etag);
-    const response = await options.fetch(REGISTRY_DIST_TAGS_URL, {
+    const response = await options.fetch(options.registryUrl ?? GAODING_REGISTRY_DIST_TAGS_URL, {
         headers,
         redirect: "error",
         signal: options.signal

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

@@ -13,7 +13,7 @@ export function createUpdateNotificationService(options) {
     const fetchPackage = options.fetch ?? globalThis.fetch;
     const now = options.now ?? (() => new Date());
     const env = options.env ?? process.env;
-    const stateDirectory = join(options.homeDirectory ?? homedir(), ".gd");
+    const stateDirectory = join(options.homeDirectory ?? homedir(), options.stateDirectoryName ?? ".gd");
     const stateFile = options.stateFile ?? createLocalJsonFile({
         directory: stateDirectory,
         filename: "update-check.json"
@@ -52,6 +52,7 @@ export function createUpdateNotificationService(options) {
                     latestResult = await fetchLatestVersion({
                         fetch: fetchPackage,
                         signal: timeout.signal,
+                        ...(options.registryUrl ? { registryUrl: options.registryUrl } : {}),
                         ...(state.etag ? { etag: state.etag } : {})
                     });
                 }
@@ -231,8 +232,14 @@ function withReminder(state, today, version) {
     };
 }
 function notify(options, latest) {
-    options.notify(`gd-cli 有新版本 ${latest}，当前版本为 ${options.currentVersion}。` +
-        "运行 gd-cli update 即可更新。");
+    if (options.commandName && options.commandName !== "gd-cli") {
+        options.notify(`${options.commandName} ${latest} is available; current version is ` +
+            `${options.currentVersion}. Run ${options.commandName} update to update.`);
+    }
+    else {
+        options.notify(`gd-cli 有新版本 ${latest}，当前版本为 ${options.currentVersion}。` +
+            "运行 gd-cli update 即可更新。");
+    }
 }
 function isNewer(version, currentVersion) {
     return version !== undefined && valid(version) !== null && gt(version, currentVersion);