ability-cli 0.3.3 → 0.3.5

package/README.md

@@ -130,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`

package/dist/index.js

@@ -135,14 +135,15 @@ function printAbilityDetail(a) {
     console.log(JSON.stringify(a.inputSchema, null, 2));
   }
 }
-function handleApiResponse(res, jsonMode, formatter) {
-  const hasStandardEnvelope = res && typeof res === "object" && Object.prototype.hasOwnProperty.call(res, "code");
-  if (hasStandardEnvelope && res.code !== 200) {
-    const msg = res.msg ?? res.message ?? JSON.stringify(res);
-    printError(`\u63A5\u53E3\u8FD4\u56DE\u9519\u8BEF: [${res.code}] ${msg}`);
-    process.exit(4);
+function extractApiPayload(res) {
+  if (res && typeof res === "object" && "data" in res) {
+    const data = res.data;
+    if (data !== void 0) return data;
   }
-  const payload = hasStandardEnvelope ? res.data : res;
+  return res;
+}
+function handleApiResponse(res, jsonMode, formatter) {
+  const payload = extractApiPayload(res);
   if (jsonMode) {
     printJson(payload);
   } else {
@@ -261,7 +262,7 @@ async function apiGet(ctx, path2, params) {
     console.error(`[verbose] Headers: ${JSON.stringify(headers, null, 2)}`);
   }
   const res = await fetch(url, { headers });
-  const body = await res.json();
+  const body = await readJsonResponse(res, ctx);
   if (ctx.verbose) console.error(`[verbose] Response: ${JSON.stringify(body, null, 2)}`);
   return body;
 }
@@ -279,10 +280,22 @@ async function apiPost(ctx, path2, data) {
     headers,
     body: JSON.stringify(data)
   });
-  const body = await res.json();
+  const body = await readJsonResponse(res, ctx);
   if (ctx.verbose) console.error(`[verbose] Response: ${JSON.stringify(body, null, 2)}`);
   return body;
 }
+async function readJsonResponse(res, ctx) {
+  const text = await res.text();
+  if (!res.ok) {
+    throw new Error(`HTTP ${res.status} ${res.statusText}: ${text.slice(0, 500)}`);
+  }
+  if (!text.trim()) return {};
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error(`\u54CD\u5E94\u4E0D\u662F\u5408\u6CD5 JSON (HTTP ${res.status}): ${text.slice(0, 200)}`);
+  }
+}
 
 // src/commands/raw.ts
 import fs3 from "fs";
@@ -362,7 +375,7 @@ 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>", "\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) => {
+  ).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();
@@ -377,18 +390,17 @@ function registerExecCommand(program2) {
       }
     }
     const body = {
-      traceId: opts.traceId ?? randomUUID().replace(/-/g, ""),
-      sessionId: opts.sessionId ?? "",
-      toolCallId: opts.toolCallId ?? "",
-      taskId: opts.taskId ?? "",
-      messageId: opts.messageId ?? "",
+      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;
-    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");

package/package.json

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