ability-cli 0.3.2 → 0.3.4

package/README.md

@@ -62,6 +62,8 @@ ability-cli inspect --ability-id 20001 --gen-template > params.json
 
 # 执行能力（对应 POST /ability-service/api/agent/v1/ability/call）
 ability-cli exec --ability-id 20001 --params '{"contact":"张三","message":"你好"}'
+# 或使用工具名（与 ability-id 二选一）
+ability-cli exec --tool-name my_tool --params '{}'
 
 # 健康检查
 ability-cli doctor
@@ -117,7 +119,8 @@ ability-cli doctor
 
 | 选项 | 说明 |
 |------|------|
-| `--ability-id <id>` | **必填**，能力 ID |
+| `--ability-id <id>` | **条件必填**：能力 ID；与 `--tool-name` **至少填其一** |
+| `--tool-name <name>` | **条件必填**：工具名；与 `--ability-id` **至少填其一**（二者同时填时仅用 `abilityId`） |
 | `--params <json>` | 参数：JSON 字符串，或指向 JSON 文件的路径 |
 | `--device-id <id>` | 设备 ID；默认可来自全局/环境变量/配置的合并结果 |
 | `--session-id <id>` | `sessionId` |
@@ -127,7 +130,6 @@ ability-cli doctor
 | `--trace-id <id>` | `traceId`；未指定时自动生成 |
 | `--timeout <ms>` | 超时（毫秒）；不传则用配置文件 `defaults.timeout`，再默认 `30000` |
 | `--response-type <type>` | `NONE` / `MCP` / `CONVERT`（可选） |
-| `--mock-token <token>` | 模拟调用 token（可选，测试） |
 | `--json` | 以 JSON 展示返回 `data` |
 
 ### 下层命令：`raw`
@@ -167,13 +169,17 @@ GET `/ability-service/api/agent/v1/ability/abilityInfo`。
 
 #### `raw call`
 
-POST `/ability-service/api/agent/v1/ability/call`（请求体由 `--file` 提供完整 JSON）。
+POST `/ability-service/api/agent/v1/ability/call`。
 
 | 选项 | 说明 |
 |------|------|
-| `--file <path>` | **必填**，请求体 JSON 文件路径 |
+| `--file <path>` | 请求体 JSON 文件（可选）；与 `--ability-id` / `--tool-name` 合并时 **CLI 优先** |
+| `--ability-id <id>` | 能力 ID；与 `--tool-name` **至少填其一**（也可仅在 JSON 内提供其一） |
+| `--tool-name <name>` | 工具名；与 `--ability-id` **至少填其一**（二者同时填时仅用 `abilityId`） |
 | `--json` | JSON 输出 |
 
+无 `--file` 时与 `exec` 类似，会组装最小请求体（含 `traceId`、`deviceId`、`timeoutMillis`、`params` 等默认值），仍须通过 CLI 或 JSON 解析出 `abilityId` / `toolName`。
+
 #### `raw category-list`
 
 GET `/ability-service/api/agent/v1/ability/category`。

package/dist/index.js

@@ -190,6 +190,9 @@ function registerConfigCommand(program2) {
   });
 }
 
+// src/commands/raw.ts
+import { randomUUID as randomUUID2 } from "crypto";
+
 // src/context.ts
 function firstNonEmpty(...vals) {
   for (const v of vals) {
@@ -282,7 +285,7 @@ async function apiPost(ctx, path2, data) {
 }
 
 // src/commands/raw.ts
-import fs2 from "fs";
+import fs3 from "fs";
 
 // src/agent-paths.ts
 var AGENT_API_PREFIX = "/ability-service/api/agent/v1";
@@ -294,6 +297,105 @@ var agentPath = {
   abilityCall: `${AGENT_API_PREFIX}/ability/call`
 };
 
+// src/commands/exec.ts
+import { randomUUID } from "crypto";
+import fs2 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 pickAbilityOrTool(opts) {
+  const rawId = opts.abilityId !== void 0 ? String(opts.abilityId).trim() : "";
+  const rawName = opts.toolName !== void 0 ? String(opts.toolName).trim() : "";
+  if (!rawId && !rawName) {
+    throw new Error(
+      "\u5FC5\u987B\u63D0\u4F9B abilityId \u6216 toolName\uFF08\u547D\u4EE4\u884C --ability-id / --tool-name\uFF0C\u6216\u8BF7\u6C42 JSON \u5185\u5B57\u6BB5\uFF09"
+    );
+  }
+  if (rawId) {
+    const n = Number(rawId);
+    if (!Number.isFinite(n)) {
+      throw new Error(`--ability-id \u4E0D\u662F\u5408\u6CD5\u6570\u5B57: ${rawId}`);
+    }
+    return { abilityId: n };
+  }
+  return { toolName: rawName };
+}
+function applyAbilityOrToolToPayload(opts, data) {
+  const cliId = opts.abilityId !== void 0 && String(opts.abilityId).trim() !== "" ? String(opts.abilityId).trim() : "";
+  const cliName = opts.toolName !== void 0 && String(opts.toolName).trim() !== "" ? String(opts.toolName).trim() : "";
+  const fileId = data.abilityId != null && String(data.abilityId).trim() !== "" ? String(data.abilityId).trim() : "";
+  const fileName = data.toolName != null && String(data.toolName).trim() !== "" ? String(data.toolName).trim() : "";
+  const rawId = cliId || fileId;
+  const rawName = cliName || fileName;
+  const target = pickAbilityOrTool({
+    abilityId: rawId || void 0,
+    toolName: rawName || void 0
+  });
+  if (target.abilityId !== void 0) {
+    data.abilityId = target.abilityId;
+    delete data.toolName;
+  } else {
+    data.toolName = target.toolName;
+    delete data.abilityId;
+  }
+}
+function registerExecCommand(program2) {
+  program2.command("exec").description("\u6267\u884C\u80FD\u529B").addHelpText(
+    "after",
+    "\n\u63D0\u793A\uFF1A\u5FC5\u987B\u63D0\u4F9B --ability-id \u4E0E --tool-name \u4E8C\u8005\u4E4B\u4E00\uFF1B\u5176\u4F59\u9009\u9879\u8BF4\u660E\u4E2D\u5E26\u300C\u3010\u5FC5\u586B\u3011\u300D\u7684\u4E5F\u5FC5\u987B\u63D0\u4F9B\u3002\n"
+  ).option("--ability-id <id>", "\u3010\u6761\u4EF6\u5FC5\u586B\u3011\u80FD\u529B ID\uFF1B\u4E0E --tool-name \u81F3\u5C11\u586B\u5176\u4E00").option("--tool-name <name>", "\u3010\u6761\u4EF6\u5FC5\u586B\u3011\u5DE5\u5177\u540D\uFF1B\u4E0E --ability-id \u81F3\u5C11\u586B\u5176\u4E00").option("--params <json>", "\u80FD\u529B\u5165\u53C2 params\uFF1AJSON \u5B57\u7B26\u4E32\u6216\u6587\u4EF6\u8DEF\u5F84").option("--device-id <id>", "\u8BF7\u6C42\u4F53 deviceId\uFF1B\u672A\u6307\u5B9A\u65F6\u7528\u5168\u5C40/\u73AF\u5883\u53D8\u91CF/\u914D\u7F6E\u89E3\u6790\u7ED3\u679C").option("--session-id <id>", "sessionId").option("--tool-call-id <id>", "toolCallId").option("--task-id <id>", "taskId").option("--message-id <id>", "messageId").option("--trace-id <id>", "traceId\uFF1B\u672A\u6307\u5B9A\u65F6\u81EA\u52A8\u751F\u6210").option("--timeout <ms>", "timeoutMillis\uFF08\u6BEB\u79D2\uFF09\uFF1B\u4E0D\u4F20\u5219\u7528 defaults.timeout\uFF0C\u9ED8\u8BA4 30000").option("--response-type <type>", "responseType\uFF1ANONE | MCP | CONVERT").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
+    const cliCfg = loadConfig();
+    const timeoutMillis = opts.timeout !== void 0 && String(opts.timeout).trim() !== "" ? Number(opts.timeout) : cliCfg.defaults.timeout ?? 3e4;
+    let params = {};
+    if (opts.params) {
+      if (fs2.existsSync(opts.params)) {
+        const text = fs2.readFileSync(opts.params, "utf-8");
+        params = parseCliJsonString(text, "\u53C2\u6570\u6587\u4EF6");
+      } else {
+        params = parseCliJsonString(opts.params, "--params");
+      }
+    }
+    const body = {
+      traceId: opts.traceId !== void 0 && String(opts.traceId).trim() !== "" ? String(opts.traceId).trim() : randomUUID().replace(/-/g, ""),
+      sessionId: opts.sessionId !== void 0 ? String(opts.sessionId) : "",
+      toolCallId: opts.toolCallId !== void 0 ? String(opts.toolCallId) : "",
+      taskId: opts.taskId !== void 0 ? String(opts.taskId) : "",
+      messageId: opts.messageId !== void 0 ? String(opts.messageId) : "",
+      deviceId: ctx.deviceId ?? "",
+      timeoutMillis,
+      params
+    };
+    applyAbilityOrToolToPayload(opts, body);
+    if (opts.responseType) body.responseType = opts.responseType;
+    const res = await apiPost(ctx, agentPath.abilityCall, body);
+    handleApiResponse(res, opts.json, (data) => {
+      printSuccess("\u80FD\u529B\u6267\u884C\u5B8C\u6210");
+      printJson(data);
+    });
+  });
+}
+
 // src/commands/raw.ts
 function registerRawCommand(program2) {
   const raw = program2.command("raw").description("\u539F\u59CB\u63A5\u53E3\u76F4\u901A\uFF08\u8054\u8C03/\u6392\u969C\uFF09");
@@ -330,11 +432,34 @@ function registerRawCommand(program2) {
   });
   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) => {
+    "\n\u63D0\u793A\uFF1A\u987B\u80FD\u901A\u8FC7\u547D\u4EE4\u884C\u6216 JSON \u89E3\u6790\u51FA abilityId / toolName\uFF08\u4E8C\u8005\u5176\u4E00\uFF09\uFF1B\u65E0 --file \u65F6\u5FC5\u987B\u63D0\u4F9B --ability-id \u6216 --tool-name\u3002\n"
+  ).option("--file <path>", "\u8BF7\u6C42\u4F53 JSON \u6587\u4EF6\uFF08\u53EF\u9009\uFF1B\u4E0E CLI \u5B57\u6BB5\u5408\u5E76\uFF0CCLI \u4F18\u5148\uFF09").option("--ability-id <id>", "\u80FD\u529B ID\uFF1B\u4E0E --tool-name \u81F3\u5C11\u5176\u4E00\uFF08\u53EF\u4E0E --file \u7EC4\u5408\uFF09").option("--tool-name <name>", "\u5DE5\u5177\u540D\uFF1B\u4E0E --ability-id \u81F3\u5C11\u5176\u4E00\uFF08\u53EF\u4E0E --file \u7EC4\u5408\uFF09").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"));
+    const cliCfg = loadConfig();
+    const timeoutMillis = cliCfg.defaults.timeout ?? 3e4;
+    let data;
+    if (opts.file) {
+      const raw2 = fs3.readFileSync(opts.file, "utf-8");
+      const parsed = JSON.parse(raw2);
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        throw new Error("\u8BF7\u6C42\u4F53\u5FC5\u987B\u662F JSON \u5BF9\u8C61");
+      }
+      data = parsed;
+      applyAbilityOrToolToPayload(opts, data);
+    } else {
+      data = {
+        traceId: randomUUID2().replace(/-/g, ""),
+        sessionId: "",
+        toolCallId: "",
+        taskId: "",
+        messageId: "",
+        deviceId: ctx.deviceId ?? "",
+        timeoutMillis,
+        params: {}
+      };
+      applyAbilityOrToolToPayload(opts, data);
+    }
     const res = await apiPost(ctx, agentPath.abilityCall, data);
     handleApiResponse(res, opts.json, (data2) => printJson(data2));
   });
@@ -416,70 +541,6 @@ 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").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();
-    const timeoutMillis = opts.timeout !== void 0 && String(opts.timeout).trim() !== "" ? Number(opts.timeout) : cliCfg.defaults.timeout ?? 3e4;
-    let params = {};
-    if (opts.params) {
-      if (fs3.existsSync(opts.params)) {
-        const text = fs3.readFileSync(opts.params, "utf-8");
-        params = parseCliJsonString(text, "\u53C2\u6570\u6587\u4EF6");
-      } else {
-        params = parseCliJsonString(opts.params, "--params");
-      }
-    }
-    const body = {
-      abilityId: Number(opts.abilityId),
-      traceId: opts.traceId ?? randomUUID().replace(/-/g, ""),
-      sessionId: opts.sessionId ?? "",
-      toolCallId: opts.toolCallId ?? "",
-      taskId: opts.taskId ?? "",
-      messageId: opts.messageId ?? "",
-      deviceId: ctx.deviceId ?? "",
-      timeoutMillis,
-      params
-    };
-    if (opts.responseType) body.responseType = opts.responseType;
-    if (opts.mockToken) body.mockToken = opts.mockToken;
-    const res = await apiPost(ctx, agentPath.abilityCall, body);
-    handleApiResponse(res, opts.json, (data) => {
-      printSuccess("\u80FD\u529B\u6267\u884C\u5B8C\u6210");
-      printJson(data);
-    });
-  });
-}
-
 // src/commands/sign.ts
 import chalk2 from "chalk";
 

package/package.json

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