ability-cli 0.3.0 → 0.3.2

package/README.md

@@ -79,7 +79,7 @@ ability-cli doctor
 
 | 选项 | 说明 |
 |------|------|
-| `--env <env>` | 环境：`test` / `prod`，选用配置文件中哪一套 `profiles`（主要影响 `baseUrl`） |
+| `--env <env>` | 环境：`test` / `stg` / `prod`，选用配置文件中哪一套 `profiles`（主要影响 `baseUrl`） |
 | `--auth-token <token>` | 授权密钥 `sk-…`，写入请求头 `Authorization` |
 | `--base-url <url>` | 网关根地址（真实路径为 `{baseUrl}/ability-service/api/agent/v1/...`） |
 | `--device-id <id>` | 设备 ID，写入请求头 `zy-device-id`，并参与部分接口 query |
@@ -213,7 +213,7 @@ GET `/ability-service/api/agent/v1/ability/category`。
 
 #### `doctor`
 
-检查配置文件路径、当前环境、解析后的 **`Authorization(sk)`** / **`zy-device-id`** / **`baseUrl`**，并请求 `{baseUrl}/time` 做网关连通性探测。
+检查配置文件路径、当前环境、解析后的 **`Authorization(sk)`** / **`zy-device-id`** / **`baseUrl`**。
 
 ---
 
@@ -223,7 +223,7 @@ GET `/ability-service/api/agent/v1/ability/category`。
 
 默认路径：**`~/.ability-cli/config.json`**。
 
-首次运行若文件不存在，会使用内置默认：当前环境 **`prod`**，`test` / `prod` 各有一套 `baseUrl`；`profiles.*.authToken`（sk）、`defaults.deviceId` 等为空字符串。
+首次运行若文件不存在，会使用内置默认：当前环境 **`prod`**，`test` / `stg` / `prod` 各有一套 `baseUrl`；`profiles.*.authToken`（sk）、`defaults.deviceId` 等为空字符串。
 
 通过 `ability-cli config set` 写入后，会按 `env` 更新对应 `profiles[env]` 下的 `baseUrl`、`authToken`（sk）等；`defaults` 下可保存默认设备 ID 等。
 
@@ -231,7 +231,7 @@ GET `/ability-service/api/agent/v1/ability/category`。
 
 | 变量 | 作用 |
 |------|------|
-| `ABILITY_CLI_ENV` | 选用 `profiles` 的环境键（如 `test` / `prod`） |
+| `ABILITY_CLI_ENV` | 选用 `profiles` 的环境键（如 `test` / `stg` / `prod`） |
 | `ABILITY_CLI_AUTH_TOKEN` | 授权密钥 `sk-…`，对应请求头 `Authorization` |
 | `ABILITY_CLI_DEVICE_ID` | 设备 ID，对应请求头 `zy-device-id`，并参与部分 query |
 | `ABILITY_CLI_BASE_URL` | 网关根地址 |
@@ -242,7 +242,7 @@ GET `/ability-service/api/agent/v1/ability/category`。
 
 对 **`authToken` / `deviceId` / `baseUrl`**：**子命令参数 > 全局参数 > 对应环境变量 > 配置文件**（子命令与全局选项先做对象合并，后者覆盖前者）。
 
-当前激活的 **profile（test 或 prod）** 由 **`ABILITY_CLI_ENV`（若设置）** 与配置文件中的 **`env`** 字段共同决定（环境变量优先）。
+当前激活的 **profile（test / stg / prod）** 由 **`ABILITY_CLI_ENV`（若设置）** 与配置文件中的 **`env`** 字段共同决定（环境变量优先）。
 
 ---
 

package/dist/index.js

@@ -17,6 +17,10 @@ var DEFAULT_CONFIG = {
       baseUrl: "https://biz-gw.zyqltest.com",
       authToken: ""
     },
+    stg: {
+      baseUrl: "https://biz-gw-in.zyql.com",
+      authToken: ""
+    },
     prod: {
       baseUrl: "https://biz-gw.zyql.com",
       authToken: ""
@@ -34,7 +38,33 @@ function loadConfig(configPath) {
   const p = configPath ?? getDefaultConfigPath();
   if (!fs.existsSync(p)) return structuredClone(DEFAULT_CONFIG);
   const raw = fs.readFileSync(p, "utf-8");
-  return { ...structuredClone(DEFAULT_CONFIG), ...JSON.parse(raw) };
+  const parsed = JSON.parse(raw);
+  const defaults = parsed.defaults ?? {};
+  const profiles = parsed.profiles ?? {};
+  const mergedProfiles = {
+    ...structuredClone(DEFAULT_CONFIG).profiles
+  };
+  for (const [name, profile] of Object.entries(profiles)) {
+    const prev = mergedProfiles[name] ?? { baseUrl: "", authToken: "" };
+    const incoming = profile ?? {};
+    const normalized = { ...incoming };
+    if (typeof incoming.baseUrl === "undefined" || incoming.baseUrl.trim() === "") {
+      normalized.baseUrl = prev.baseUrl;
+    }
+    mergedProfiles[name] = {
+      ...prev,
+      ...normalized
+    };
+  }
+  return {
+    ...structuredClone(DEFAULT_CONFIG),
+    ...parsed,
+    defaults: {
+      ...structuredClone(DEFAULT_CONFIG).defaults,
+      ...defaults
+    },
+    profiles: mergedProfiles
+  };
 }
 function saveConfig(configPath, config) {
   const dir = path.dirname(configPath);
@@ -135,7 +165,7 @@ function mergeConfigSetOpts(program2, opts) {
 }
 function registerConfigCommand(program2) {
   const cfg = program2.command("config").description("\u7BA1\u7406 CLI \u914D\u7F6E");
-  cfg.command("set").description("\u8BBE\u7F6E\u914D\u7F6E\u9879").option("--env <env>", "\u73AF\u5883 (test/prod)").option("--auth-token <token>", "Authorization token\uFF08sk\uFF09").option("--base-url <url>", "\u7F51\u5173\u5730\u5740").option("--device-id <id>", "\u9ED8\u8BA4\u8BBE\u5907ID").option("--timeout <ms>", "\u9ED8\u8BA4\u8C03\u7528\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09\uFF0C\u5199\u5165 defaults.timeout").action((opts) => {
+  cfg.command("set").description("\u8BBE\u7F6E\u914D\u7F6E\u9879").option("--env <env>", "\u73AF\u5883 (test/stg/prod)").option("--auth-token <token>", "Authorization token\uFF08sk\uFF09").option("--base-url <url>", "\u7F51\u5173\u5730\u5740").option("--device-id <id>", "\u9ED8\u8BA4\u8BBE\u5907ID").option("--timeout <ms>", "\u9ED8\u8BA4\u8C03\u7528\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09\uFF0C\u5199\u5165 defaults.timeout").action((opts) => {
     const m = mergeConfigSetOpts(program2, opts);
     const configPath = getDefaultConfigPath();
     const config = loadConfig(configPath);
@@ -278,13 +308,19 @@ function registerRawCommand(program2) {
     const res = await apiGet(ctx, agentPath.abilityList, params);
     handleApiResponse(res, opts.json, (data) => printAbilityTable(data));
   });
-  raw.command("app-info").description("GET \u5E94\u7528\u4FE1\u606F").requiredOption("--package-name <pkg>", "\u5E94\u7528\u5305\u540D").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+  raw.command("app-info").description("GET \u5E94\u7528\u4FE1\u606F").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u9009\u9879\u8BF4\u660E\u4E2D\u4EE5\u300C\u3010\u5FC5\u586B\u3011\u300D\u5F00\u5934\u7684\u5FC5\u987B\u63D0\u4F9B\uFF0C\u5176\u4F59\u5747\u4E3A\u53EF\u9009\u3002\n"
+  ).requiredOption("--package-name <pkg>", "\u3010\u5FC5\u586B\u3011\u5E94\u7528\u5305\u540D").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
     const merged = { ...program2.opts(), ...opts };
     const ctx = buildAgentRequestContext(merged);
     const res = await apiGet(ctx, agentPath.appInfo, { packageName: opts.packageName });
     handleApiResponse(res, opts.json, (data) => printJson(data));
   });
-  raw.command("ability-info").description("GET \u80FD\u529B\u8BE6\u60C5").requiredOption("--ability-id <id>", "\u80FD\u529BID").option("--device-id <id>", "\u8BBE\u5907 ID\uFF1B\u7AEF\u4FA7\u80FD\u529B\u5EFA\u8BAE\u586B\u5199").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+  raw.command("ability-info").description("GET \u80FD\u529B\u8BE6\u60C5").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u9009\u9879\u8BF4\u660E\u4E2D\u4EE5\u300C\u3010\u5FC5\u586B\u3011\u300D\u5F00\u5934\u7684\u5FC5\u987B\u63D0\u4F9B\uFF0C\u5176\u4F59\u5747\u4E3A\u53EF\u9009\u3002\n"
+  ).requiredOption("--ability-id <id>", "\u3010\u5FC5\u586B\u3011\u80FD\u529B ID").option("--device-id <id>", "\u8BBE\u5907 ID\uFF1B\u7AEF\u4FA7\u80FD\u529B\u5EFA\u8BAE\u586B\u5199").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
     const merged = { ...program2.opts(), ...opts };
     const ctx = buildAgentRequestContext(merged);
     const params = { abilityId: opts.abilityId };
@@ -292,7 +328,10 @@ function registerRawCommand(program2) {
     const res = await apiGet(ctx, agentPath.abilityInfo, params);
     handleApiResponse(res, opts.json, (data) => printJson(data));
   });
-  raw.command("call").description("POST \u6267\u884C\u80FD\u529B\uFF08Agent API\uFF09").requiredOption("--file <path>", "\u8BF7\u6C42\u4F53 JSON \u6587\u4EF6\u8DEF\u5F84").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+  raw.command("call").description("POST \u6267\u884C\u80FD\u529B\uFF08Agent API\uFF09").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u9009\u9879\u8BF4\u660E\u4E2D\u4EE5\u300C\u3010\u5FC5\u586B\u3011\u300D\u5F00\u5934\u7684\u5FC5\u987B\u63D0\u4F9B\uFF0C\u5176\u4F59\u5747\u4E3A\u53EF\u9009\u3002\n"
+  ).requiredOption("--file <path>", "\u3010\u5FC5\u586B\u3011\u8BF7\u6C42\u4F53 JSON \u6587\u4EF6\u8DEF\u5F84").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
     const merged = { ...program2.opts(), ...opts };
     const ctx = buildAgentRequestContext(merged);
     const data = JSON.parse(fs2.readFileSync(opts.file, "utf-8"));
@@ -358,7 +397,10 @@ function generateTemplate(schema) {
   return result;
 }
 function registerInspectCommand(program2) {
-  program2.command("inspect").description("\u67E5\u770B\u80FD\u529B\u8BE6\u60C5\u4E0E inputSchema").requiredOption("--ability-id <id>", "\u80FD\u529BID").option("--device-id <id>", "\u8BBE\u5907 ID\uFF1B\u7AEF\u4FA7\u80FD\u529B\u5EFA\u8BAE\u586B\u5199").option("--gen-template", "\u751F\u6210\u53C2\u6570\u6A21\u677F JSON").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+  program2.command("inspect").description("\u67E5\u770B\u80FD\u529B\u8BE6\u60C5\u4E0E inputSchema").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u9009\u9879\u8BF4\u660E\u4E2D\u4EE5\u300C\u3010\u5FC5\u586B\u3011\u300D\u5F00\u5934\u7684\u5FC5\u987B\u63D0\u4F9B\uFF0C\u5176\u4F59\u5747\u4E3A\u53EF\u9009\u3002\n"
+  ).requiredOption("--ability-id <id>", "\u3010\u5FC5\u586B\u3011\u80FD\u529B ID").option("--device-id <id>", "\u8BBE\u5907 ID\uFF1B\u7AEF\u4FA7\u80FD\u529B\u5EFA\u8BAE\u586B\u5199").option("--gen-template", "\u751F\u6210\u53C2\u6570\u6A21\u677F JSON").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
     const merged = { ...program2.opts(), ...opts };
     const ctx = buildAgentRequestContext(merged);
     const params = { abilityId: opts.abilityId };
@@ -377,8 +419,33 @@ function registerInspectCommand(program2) {
 // src/commands/exec.ts
 import { randomUUID } from "crypto";
 import fs3 from "fs";
+
+// src/parse-cli-json.ts
+function parseCliJsonString(raw, label) {
+  const s = raw.replace(/^\uFEFF/, "").trim();
+  if (!s) return {};
+  try {
+    return JSON.parse(s);
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    let hint = "";
+    if (/^\s*\{\s*'/.test(s)) {
+      hint = " JSON \u952E\u540D\u987B\u7528\u82F1\u6587\u53CC\u5F15\u53F7\uFF1B\u5F53\u524D\u5185\u5BB9\u5728 { \u540E\u51FA\u73B0\u4E86\u5355\u5F15\u53F7\u3002\u6700\u7A33\u59A5\uFF1A\u5C06 JSON \u5B58\u4E3A params.json\uFF08UTF-8\uFF09\uFF0C\u518D\u4F7F\u7528 --params params.json\u3002";
+    } else if (/[\u201c\u201d\u2018\u2019]/.test(s)) {
+      hint = ' \u68C0\u6D4B\u5230\u5F2F\u5F15\u53F7\uFF08\u201C \u201D \u2018 \u2019\uFF09\u3002\u8BF7\u6539\u4E3A ASCII \u53CC\u5F15\u53F7 " \u3002';
+    }
+    const preview = s.length > 160 ? `${s.slice(0, 160)}\u2026` : s;
+    throw new Error(`${label} \u89E3\u6790\u5931\u8D25\uFF1A${msg}.${hint}
+\u5B9E\u9645\u6536\u5230\u7684\u5F00\u5934\uFF1A${JSON.stringify(preview.slice(0, 80))}`);
+  }
+}
+
+// src/commands/exec.ts
 function registerExecCommand(program2) {
-  program2.command("exec").description("\u6267\u884C\u80FD\u529B").requiredOption("--ability-id <id>", "\u80FD\u529BID").option("--params <json>", "\u53C2\u6570 JSON \u5B57\u7B26\u4E32\u6216\u6587\u4EF6\u8DEF\u5F84").option("--device-id <id>", "\u8BBE\u5907ID").option("--message-id <id>", "messageId").option("--trace-id <id>", "traceId").option("--timeout <ms>", "\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09\uFF1B\u4E0D\u4F20\u5219\u7528\u914D\u7F6E\u6587\u4EF6 defaults.timeout\uFF0C\u9ED8\u8BA4 30000").option("--response-type <type>", "\u8FD4\u56DE\u503C\u5904\u7406\u65B9\u5F0F: NONE | MCP | CONVERT").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+  program2.command("exec").description("\u6267\u884C\u80FD\u529B").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u9009\u9879\u8BF4\u660E\u4E2D\u4EE5\u300C\u3010\u5FC5\u586B\u3011\u300D\u5F00\u5934\u7684\u5FC5\u987B\u63D0\u4F9B\uFF0C\u5176\u4F59\u5747\u4E3A\u53EF\u9009\u3002\n"
+  ).requiredOption("--ability-id <id>", "\u3010\u5FC5\u586B\u3011\u80FD\u529B ID").option("--params <json>", "\u53C2\u6570 JSON \u5B57\u7B26\u4E32\u6216\u6587\u4EF6\u8DEF\u5F84").option("--device-id <id>", "\u8BBE\u5907ID").option("--message-id <id>", "messageId").option("--trace-id <id>", "traceId").option("--timeout <ms>", "\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09\uFF1B\u4E0D\u4F20\u5219\u7528\u914D\u7F6E\u6587\u4EF6 defaults.timeout\uFF0C\u9ED8\u8BA4 30000").option("--response-type <type>", "\u8FD4\u56DE\u503C\u5904\u7406\u65B9\u5F0F: NONE | MCP | CONVERT").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
     const merged = { ...program2.opts(), ...opts };
     const ctx = buildAgentRequestContext(merged);
     const cliCfg = loadConfig();
@@ -386,9 +453,10 @@ function registerExecCommand(program2) {
     let params = {};
     if (opts.params) {
       if (fs3.existsSync(opts.params)) {
-        params = JSON.parse(fs3.readFileSync(opts.params, "utf-8"));
+        const text = fs3.readFileSync(opts.params, "utf-8");
+        params = parseCliJsonString(text, "\u53C2\u6570\u6587\u4EF6");
       } else {
-        params = JSON.parse(opts.params);
+        params = parseCliJsonString(opts.params, "--params");
       }
     }
     const body = {
@@ -455,16 +523,17 @@ function registerSignCommand(program2) {
 // src/commands/doctor.ts
 import chalk3 from "chalk";
 function registerDoctorCommand(program2) {
-  program2.command("doctor").description("\u68C0\u67E5\u914D\u7F6E\u5B8C\u6574\u6027\u548C\u7F51\u5173\u8FDE\u901A\u6027").action(async () => {
+  program2.command("doctor").description("\u68C0\u67E5\u914D\u7F6E\u5B8C\u6574\u6027").action(async () => {
     const merged = program2.opts();
     const ctx = buildAgentRequestContext(merged);
     let ok = true;
     console.log(chalk3.bold.cyan("\n\u2500\u2500 CLI \u5065\u5EB7\u68C0\u67E5 \u2500\u2500\n"));
     const configPath = getDefaultConfigPath();
     const config = loadConfig();
+    const effectiveEnv = process.env.ABILITY_CLI_ENV ?? merged.env ?? config.env;
     const checks = [
       ["\u914D\u7F6E\u6587\u4EF6", configPath, true],
-      ["\u5F53\u524D\u73AF\u5883", config.env, true],
+      ["\u5F53\u524D\u73AF\u5883", effectiveEnv, true],
       ["baseUrl", ctx.baseUrl || "(\u7A7A)", !!ctx.baseUrl],
       ["Authorization(sk)", ctx.authToken ? "******" : "(\u7A7A)", !!ctx.authToken],
       ["zy-device-id", ctx.deviceId || "(\u7A7A)", !!ctx.deviceId]
@@ -474,19 +543,6 @@ function registerDoctorCommand(program2) {
       console.log(`  ${icon} ${chalk3.gray(label + ":")} ${val}`);
       if (!pass) ok = false;
     }
-    try {
-      const res = await fetch(`${ctx.baseUrl}/time`);
-      const body = await res.json();
-      if (body.code === 200) {
-        console.log(`  ${chalk3.green("\u2714")} ${chalk3.gray("\u7F51\u5173\u8FDE\u901A(/time):")} ${body.data}`);
-      } else {
-        console.log(`  ${chalk3.red("\u2716")} ${chalk3.gray("\u7F51\u5173\u8FDE\u901A(/time):")} \u8FD4\u56DE code=${body.code}`);
-        ok = false;
-      }
-    } catch (e) {
-      console.log(`  ${chalk3.red("\u2716")} ${chalk3.gray("\u7F51\u5173\u8FDE\u901A(/time):")} ${e.message}`);
-      ok = false;
-    }
     console.log();
     if (ok) {
       console.log(chalk3.green("  \u4E00\u5207\u6B63\u5E38\uFF0C\u53EF\u4EE5\u5F00\u59CB\u4F7F\u7528\uFF01"));
@@ -504,7 +560,7 @@ function readPackageVersion() {
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   return pkg.version ?? "0.0.0";
 }
-program.name("ability-cli").description("\u539F\u5B50\u80FD\u529B\u5E73\u53F0 CLI \u5DE5\u5177").version(readPackageVersion()).option("--env <env>", "\u73AF\u5883 (test/prod)\uFF0C\u9009\u62E9 profiles \u4E2D\u54EA\u5957 baseUrl").option("--auth-token <token>", "Authorization\uFF08sk-\u2026\uFF09\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("--base-url <url>", "\u7F51\u5173\u6839\u5730\u5740\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("--device-id <id>", "\u8BBE\u5907 ID\uFF08zy-device-id \u8BF7\u6C42\u5934 / \u90E8\u5206 query\uFF09\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("-v, --verbose", "\u8BE6\u7EC6\u8F93\u51FA");
+program.name("ability-cli").description("\u539F\u5B50\u80FD\u529B\u5E73\u53F0 CLI \u5DE5\u5177").version(readPackageVersion()).option("--env <env>", "\u73AF\u5883 (test/stg/prod)\uFF0C\u9009\u62E9 profiles \u4E2D\u54EA\u5957 baseUrl").option("--auth-token <token>", "Authorization\uFF08sk-\u2026\uFF09\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("--base-url <url>", "\u7F51\u5173\u6839\u5730\u5740\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("--device-id <id>", "\u8BBE\u5907 ID\uFF08zy-device-id \u8BF7\u6C42\u5934 / \u90E8\u5206 query\uFF09\uFF0C\u8986\u76D6\u73AF\u5883\u53D8\u91CF\u4E0E\u914D\u7F6E").option("-v, --verbose", "\u8BE6\u7EC6\u8F93\u51FA");
 registerConfigCommand(program);
 registerRawCommand(program);
 registerSearchCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ability-cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "原子能力平台 CLI 工具",
   "repository": {
     "type": "git",