gaoding-cli 1.0.0-alpha.8 → 1.0.0-alpha.9

package/dist/src/commands/org.js

@@ -3,28 +3,25 @@ import { withErrorHandler } from "../middleware/error-handler.js";
 import { setAuthRequirement } from "../middleware/auth.js";
 import { OrgManager } from "../core/auth/org-manager.js";
 import { formatOutput } from "../middleware/output.js";
-import { resolveInvokeOutputFormat, resolveListOutputFormat, } from "../utils/list-output-format.js";
 import { getIO } from "../io.js";
 import { emitJson, wrapEnvelope } from "../core/output/envelope.js";
-import { setStaticHelp } from "../utils/static-help.js";
+import { CliUsageError } from "../core/output/cli-error.js";
 import { registerUsageCommand } from "./usage.js";
 export function registerOrgCommand(program) {
     const org = program
         .command("org")
         .usage("<command> [options]")
-        .description("查看与切换当前组织")
-        .configureHelp({ showGlobalOptions: true });
-    setStaticHelp(org, ORG_HELP);
+        .description("查看与切换当前组织");
     const list = org
         .command("list")
-        .alias("ls")
         .description("列出可用组织")
+        .option("--json", "输出机器可读 JSON")
         .action(withErrorHandler(async (_opts, command) => {
         const cmd = command;
         const manager = new OrgManager();
         const orgs = await manager.listOrgs();
         const current = manager.getCurrentOrgId();
-        const format = resolveListOutputFormat(cmd);
+        const json = cmd.opts().json === true;
         const rows = orgs.map((o) => ({
             current: o.id === current ? "yes" : "",
             name: o.name,
@@ -34,21 +31,17 @@ export function registerOrgCommand(program) {
             status: o.status ?? "",
             expires: formatExpireDate(o.expire_date),
         }));
-        if (getIO().prefersJsonOutput(format)) {
+        if (json) {
             emitJson(wrapEnvelope({ orgs, current_org_id: current }, { command: "org list" }));
             return;
         }
-        if (format === "json") {
-            formatOutput({ orgs, current_org_id: current }, format);
-        }
-        else {
-            formatOutput(rows, format === "table" ? "table" : "text");
-        }
+        formatOutput(rows, "table");
     }));
     setAuthRequirement(list, "credential");
     const current = org
         .command("current")
         .description("快速查询当前组织")
+        .option("--json", "输出机器可读 JSON")
         .action(withErrorHandler(async (_opts, command) => {
         const cmd = command;
         const manager = new OrgManager();
@@ -59,9 +52,8 @@ export function registerOrgCommand(program) {
             current_org: current ?? null,
             next_command: current ? undefined : "gd-cli org list",
         };
-        const format = resolveInvokeOutputFormat(cmd);
-        if (getIO().prefersJsonOutput(format) || format === "json") {
-            formatOutput(payload, "json");
+        if (cmd.opts().json === true) {
+            emitJson(wrapEnvelope(payload, { command: "org current" }));
             return;
         }
         if (!current) {
@@ -76,9 +68,7 @@ export function registerOrgCommand(program) {
         .command("switch")
         .description("切换当前 CLI 组织（TTY 下可交互选择）")
         .option("--org <org-id>", "组织 ID")
-        .action(withErrorHandler(async (options, command) => {
-        const cmd = command;
-        const format = resolveListOutputFormat(cmd);
+        .action(withErrorHandler(async (options) => {
         const manager = new OrgManager();
         let orgId = options.org;
         if (!orgId) {
@@ -100,34 +90,22 @@ export function registerOrgCommand(program) {
                 });
             }
             else {
-                const orgs = await manager.listOrgs();
-                emitJson(wrapEnvelope({ error: "org_selection_required", orgs }, { command: "org switch" }));
-                process.exitCode = 1;
-                return;
+                throw new CliUsageError({
+                    code: "ORG_SELECTION_REQUIRED",
+                    type: "validation",
+                    message: "非交互环境请通过 --org <org-id> 指定要切换的组织。",
+                    hint: "先执行 gd-cli org list 查看可用组织。",
+                    retryable: false,
+                });
             }
         }
         const result = await manager.switchOrg(orgId);
-        if (getIO().prefersJsonOutput(format)) {
-            emitJson(wrapEnvelope({ org: result }, { command: "org switch" }));
-            return;
-        }
         console.log(chalk.green(`\n✓ 已切换到组织: ${result.name} (${result.id})`));
         console.log(chalk.yellow("\n请 60s 后再调用能力，即可按新组织的权益执行～\n"));
     }));
     setAuthRequirement(switchCommand, "credential");
     registerUsageCommand(org);
 }
-const ORG_HELP = `
-Usage: gd-cli org <command> [options]
-
-用于查看和切换当前组织
-
-常用命令:
-  list/ls              列出可用组织
-  current              查询当前组织
-  switch               切换当前组织
-  credits              查询当前组织的稿豆余额
-`;
 function formatOrgChoice(org, currentOrgId) {
     const product = org.product_name ? ` · ${org.product_name}` : "";
     const current = org.id === currentOrgId ? " ← 当前" : "";

package/dist/src/commands/skills.js

@@ -1,12 +1,9 @@
 import { CliUsageError } from "../core/output/cli-error.js";
-import { emitJson, shouldEmitEnvelope, wrapEnvelope, } from "../core/output/envelope.js";
-import { Prompt } from "../core/prompt/index.js";
+import { emitJson, wrapEnvelope, } from "../core/output/envelope.js";
 import { withErrorHandler } from "../middleware/error-handler.js";
 import { formatOutput } from "../middleware/output.js";
 import { AgentSkillInstaller, AgentSkillOperationError, } from "../utils/agent-skill-installer.js";
 import { collectArg } from "../utils/input-json.js";
-import { resolveInvokeOutputFormat } from "../utils/list-output-format.js";
-import { setStaticHelp } from "../utils/static-help.js";
 import { setAuthRequirement } from "../middleware/auth.js";
 const TARGET_IDS = [
     "universal",
@@ -21,109 +18,73 @@ export function registerSkillsCommand(program) {
     const skills = program
         .command("skills")
         .description("安装和管理 gd-cli Agent Skill");
-    setStaticHelp(skills, SKILLS_HELP);
     const install = skills
         .command("install")
         .description("安装 gd-cli Agent Skill")
-        .option("-a, --agent <id>", "目标 Agent，可重复", collectArg, [])
+        .option("--agent <id>", "目标 Agent，可重复", collectArg, [])
         .option("--all", "安装到全部已知 Agent")
-        .option("-y, --yes", "跳过确认")
         .allowExcessArguments(false)
-        .action(withErrorHandler(async (options, command) => {
+        .action(withErrorHandler(async (options) => {
         const installer = new AgentSkillInstaller();
-        const agents = await resolveMutationTargets("install", installer, options, command);
-        await confirmMutation("install", options, command);
+        const agents = resolveMutationTargets(options);
         const result = runInstaller(() => installer.install(agents));
-        emitResult(result, command, "skills install");
+        printMutationResult(result);
     }));
     setAuthRequirement(install, "none");
     const status = skills
         .command("status")
         .description("查看七个固定 Agent target 的安装状态")
+        .option("--json", "输出机器可读 JSON")
         .allowExcessArguments(false)
         .action(withErrorHandler(async (_options, command) => {
-        emitResult(new AgentSkillInstaller().status(), command, "skills status");
+        const result = new AgentSkillInstaller().status();
+        if (command.opts().json === true) {
+            emitJson(wrapEnvelope(result, { command: "skills status" }));
+            return;
+        }
+        printMutationResult(result);
     }));
     setAuthRequirement(status, "none");
     const update = skills
         .command("update")
         .description("刷新已安装的 gd-cli Agent Skill")
         .allowExcessArguments(false)
-        .action(withErrorHandler(async (_options, command) => {
+        .action(withErrorHandler(async (_options) => {
         const installer = new AgentSkillInstaller();
         const result = runInstaller(() => installer.update());
-        emitResult(result, command, "skills update");
+        printMutationResult(result);
     }));
     setAuthRequirement(update, "none");
     const uninstall = skills
         .command("uninstall")
         .description("卸载 gd-cli 托管的 Agent Skill")
-        .option("-a, --agent <id>", "目标 Agent，可重复", collectArg, [])
+        .option("--agent <id>", "目标 Agent，可重复", collectArg, [])
         .option("--all", "卸载全部已知 Agent target")
-        .option("-y, --yes", "跳过确认")
         .allowExcessArguments(false)
-        .action(withErrorHandler(async (options, command) => {
+        .action(withErrorHandler(async (options) => {
         const installer = new AgentSkillInstaller();
-        const agents = await resolveMutationTargets("uninstall", installer, options, command);
+        const agents = resolveMutationTargets(options);
         if (agents.length === 0) {
-            emitResult(installer.uninstall([]), command, "skills uninstall");
+            printMutationResult(installer.uninstall([]));
             return;
         }
-        await confirmMutation("uninstall", options, command);
         const result = runInstaller(() => installer.uninstall(agents));
-        emitResult(result, command, "skills uninstall");
+        printMutationResult(result);
     }));
     setAuthRequirement(uninstall, "none");
 }
-async function resolveMutationTargets(operation, installer, options, command) {
+function resolveMutationTargets(options) {
     const explicit = Array.isArray(options.agent)
         ? options.agent.map(String)
         : [];
     if (options.all && explicit.length > 0) {
         throw usageError("--all 与 --agent 不能同时使用");
     }
-    if (options.all)
+    if (options.all || explicit.length === 0)
         return [...TARGET_IDS];
     if (explicit.length > 0)
         return validateTargets(explicit);
-    if (!canPrompt(command)) {
-        throw usageError(`非交互环境必须通过 --agent <id> 或 --all 指定目标，并使用 --yes；例如 gd-cli skills ${operation} --agent codex --yes`);
-    }
-    if (operation === "install") {
-        const detected = new Set(installer.detectedTargets());
-        const selected = await Prompt.multiSelect({
-            message: "选择要安装 gd-cli Skill 的 Agent",
-            choices: installer.listTargets().map((target) => ({
-                name: `${target.name}  ${target.path}`,
-                value: target.id,
-                description: target.id === "universal"
-                    ? "canonical copy"
-                    : "链接到 canonical copy",
-                checked: target.id === "universal" || detected.has(target.id),
-                disabled: target.id === "universal" ? "始终安装" : false,
-            })),
-        });
-        return validateTargets(selected.filter((target) => target !== "universal"));
-    }
-    const status = installer.status();
-    const installed = new Set(status.targets
-        .filter((target) => target.status === "installed" || target.status === "outdated")
-        .map((target) => target.agent));
-    if (installed.size === 0)
-        return [];
-    const selected = await Prompt.multiSelect({
-        message: "选择要卸载 gd-cli Skill 的 Agent",
-        choices: installer.listTargets()
-            .filter((target) => installed.has(target.id))
-            .map((target) => ({
-            name: `${target.name}  ${target.path}`,
-            value: target.id,
-            description: target.id === "universal"
-                ? "仅当没有其他 Agent 依赖时可删除"
-                : "只删除该 Agent target",
-        })),
-    });
-    return validateTargets(selected);
+    return [];
 }
 function validateTargets(values) {
     const targets = [];
@@ -137,18 +98,6 @@ function validateTargets(values) {
     }
     return targets;
 }
-async function confirmMutation(operation, options, command) {
-    if (options.yes || rootYes(command))
-        return;
-    if (!canPrompt(command)) {
-        throw usageError(`非交互环境必须使用 --yes 确认 gd-cli skills ${operation}`);
-    }
-    const accepted = await Prompt.confirm(operation === "install"
-        ? "是否安装 gd-cli Agent Skill？"
-        : "是否卸载所选 gd-cli Agent Skill？", false);
-    if (!accepted)
-        throw usageError("已取消，未修改任何文件");
-}
 function runInstaller(operation) {
     try {
         return operation();
@@ -166,14 +115,8 @@ function runInstaller(operation) {
         throw error;
     }
 }
-function emitResult(result, command, commandName) {
-    const format = resolveInvokeOutputFormat(command);
-    if (shouldEmitEnvelope(format)) {
-        emitJson(wrapEnvelope(result, { command: commandName }));
-    }
-    else {
-        formatOutput(result, format);
-    }
+function printMutationResult(result) {
+    formatOutput(result, "human");
 }
 function usageError(message) {
     return new CliUsageError({
@@ -183,36 +126,3 @@ function usageError(message) {
         retryable: false,
     });
 }
-function canPrompt(command) {
-    const options = rootOptions(command);
-    return options.noInput !== true
-        && options.input !== false
-        && Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
-function rootYes(command) {
-    return Boolean(rootOptions(command).yes);
-}
-function rootOptions(command) {
-    let current = command;
-    while (current.parent)
-        current = current.parent;
-    return current.opts();
-}
-const SKILLS_HELP = `
-gd-cli skills <command> [options]
-
-安装和管理随 gaoding-cli 发布的 gd-cli Agent Skill。
-
-命令:
-  install      安装 canonical Skill，并连接所选 Agent
-  status       查看七个固定 Agent target
-  update       刷新已安装的 canonical 和 fallback copy
-  uninstall    删除所选 gd-cli 托管 target
-
-示例:
-  gd-cli skills install
-  gd-cli skills install --agent codex --yes --format json
-  gd-cli skills status --format json
-  gd-cli skills update
-  gd-cli skills uninstall --all --yes
-`;

package/dist/src/commands/update.js

@@ -1,108 +1,42 @@
 import { spawn } from "node:child_process";
 import chalk from "chalk";
-import { confirm } from "@inquirer/prompts";
 import { withErrorHandler } from "../middleware/error-handler.js";
 import { buildUpdateCommand, detectInstallSource } from "../update/install-source.js";
-import { checkForUpdate, clearUpdateCache } from "../update/update-checker.js";
+import { checkForUpdate } from "../update/update-checker.js";
 import { AgentSkillInstaller } from "../utils/agent-skill-installer.js";
 import { setAuthRequirement } from "../middleware/auth.js";
 export function registerUpdateCommand(program) {
     const update = program
         .command("update")
         .description("检查并升级 gd-cli")
-        .option("--channel <tag>", "npm dist-tag: latest / next / alpha", "latest")
-        .option("--manager <name>", "指定包管理器: npm / pnpm / yarn / brew")
-        .option("--dry-run", "只显示升级命令，不执行")
-        .option("-y, --yes", "跳过确认直接升级")
-        .action(withErrorHandler(async (options, command) => {
-        await runUpdate(options, command);
-    }));
-    setAuthRequirement(update, "none");
-    const check = update
-        .command("check")
-        .description("检查是否有新版本")
-        .option("--channel <tag>", "npm dist-tag: latest / next / alpha", "latest")
-        .option("--force", "忽略 24 小时缓存，强制请求 registry")
-        .action(withErrorHandler(async (options, command) => {
-        const info = await checkForUpdate({
-            channel: options.channel,
-            force: options.force,
-        });
-        printUpdateInfo(info, outputFormat(command));
-    }));
-    setAuthRequirement(check, "none");
-    const clearCache = update
-        .command("clear-cache")
-        .description("清除本地升级检查缓存")
         .action(withErrorHandler(async () => {
-        clearUpdateCache();
-        console.log(chalk.green("✓ 已清除升级检查缓存"));
+        await runUpdate();
     }));
-    setAuthRequirement(clearCache, "none");
+    setAuthRequirement(update, "none");
 }
-async function runUpdate(options, command) {
+async function runUpdate() {
     const info = await checkForUpdate({
-        channel: options.channel,
+        channel: "latest",
         force: true,
     });
-    const source = detectInstallSource(options.manager);
+    const source = detectInstallSource();
     const updateCommand = buildUpdateCommand(info.latest_version, source);
-    const format = outputFormat(command);
     if (!info.update_available) {
-        printUpdateInfo({ ...info, install_source: source }, format);
+        printUpdateInfo({ ...info, install_source: source });
         return;
     }
     if (source.kind !== "global") {
-        const payload = {
-            ...info,
-            install_source: source,
-            update_command: updateCommand.display,
-            blocked: true,
-            reason: source.reason,
-        };
-        if (format === "json") {
-            console.log(JSON.stringify(payload, null, 2));
-        }
-        else {
-            console.log(chalk.yellow(`${source.reason}，gd-cli update 不会修改全局环境。`));
-            console.log(`如需升级全局安装，请手动执行: ${chalk.cyan(updateCommand.display)}`);
-        }
-        return;
-    }
-    if (options.dryRun) {
-        printUpdateInfo({
-            ...info,
-            install_source: source,
-        }, format, updateCommand.display);
+        console.log(chalk.yellow(`${source.reason}，gd-cli update 不会修改全局环境。`));
+        console.log(`如需升级全局安装，请手动执行: ${chalk.cyan(updateCommand.display)}`);
         return;
     }
-    if (!options.yes && process.stdin.isTTY) {
-        const ok = await confirm({
-            message: `将执行 ${updateCommand.display}，是否继续？`,
-            default: true,
-        });
-        if (!ok) {
-            console.log("已取消升级。");
-            return;
-        }
-    }
-    else if (!options.yes && !process.stdin.isTTY) {
-        throw new Error(`非交互环境请加 --yes，或手动执行: ${updateCommand.display}`);
-    }
     const shouldRefreshAgentSkill = hasInstalledCanonicalSkill();
     await spawnUpdate(updateCommand.command, updateCommand.args);
     if (shouldRefreshAgentSkill) {
         await refreshAgentSkillAfterUpdate();
     }
 }
-function printUpdateInfo(info, format, updateCommand) {
-    if (format === "json") {
-        console.log(JSON.stringify({
-            ...info,
-            update_command: updateCommand ?? buildUpdateCommand(info.latest_version, info.install_source).display,
-        }, null, 2));
-        return;
-    }
+function printUpdateInfo(info, updateCommand) {
     console.log(chalk.bold("\ngd-cli 版本检查\n"));
     console.log(`  当前版本: ${chalk.cyan(info.current_version)}`);
     console.log(`  最新版本: ${chalk.cyan(info.latest_version)} (${info.channel})`);
@@ -123,15 +57,6 @@ function printUpdateInfo(info, format, updateCommand) {
     }
     console.log("");
 }
-function outputFormat(command) {
-    return rootCommand(command).opts().format ?? "human";
-}
-function rootCommand(command) {
-    let cur = command;
-    while (cur.parent)
-        cur = cur.parent;
-    return cur;
-}
 function spawnUpdate(command, args) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, {

package/dist/src/commands/usage.js

@@ -1,18 +1,18 @@
 import chalk from "chalk";
 import { UsageClient } from "../api/usage-client.js";
 import { withErrorHandler } from "../middleware/error-handler.js";
-import { formatOutput } from "../middleware/output.js";
 import { setAuthRequirement } from "../middleware/auth.js";
+import { emitJson, wrapEnvelope } from "../core/output/envelope.js";
 export function registerUsageCommand(org, deps = {}) {
     const credits = org
         .command("credits")
         .description("查询当前组织的稿豆余额")
+        .option("--json", "输出机器可读 JSON")
         .action(withErrorHandler(async (_options, command) => {
         const client = deps.createClient?.() ?? new UsageClient();
         const payload = await client.getCreditsOverview();
-        const format = outputFormat(command);
-        if (format === "json") {
-            formatOutput(payload, "json");
+        if (command.opts().json === true) {
+            emitJson(wrapEnvelope(payload, { command: "org credits" }));
             return;
         }
         printUsageHuman(payload);
@@ -30,16 +30,3 @@ function printUsageHuman(payload) {
         console.log(`  待生效:   ${credits.wait}`);
     console.log("");
 }
-function outputFormat(command) {
-    const root = rootCommand(command);
-    const opts = root.opts();
-    if (opts.json)
-        return "json";
-    return opts.format ?? "human";
-}
-function rootCommand(command) {
-    let current = command;
-    while (current.parent)
-        current = current.parent;
-    return current;
-}

package/dist/src/commands/workflows.d.ts

@@ -1,3 +1,3 @@
 import { Command } from "commander";
 export declare function registerWorkflowsCommand(program: Command): void;
-export declare function runAppCall(appId: string, inputRef: string | undefined, opts: Record<string, unknown>, cmd: Command): Promise<void>;
+export declare function runAppCall(appId: string, opts: Record<string, unknown>): Promise<void>;