ability-cli 0.2.1 → 0.3.0

package/README.md

@@ -2,7 +2,7 @@
 
 ## 1. 项目简介
 
-**ability-cli** 是面向原子能力平台的命令行工具，用于在终端中搜索能力、查看详情、执行调用，以及直接访问底层 HTTP 接口。
+**ability-cli** 是面向原子能力平台的命令行工具，用于在终端中搜索能力、查看详情、执行调用，以及直接访问 **Agent API**（路径前缀 `/ability-service/api/agent/v1`）。
 
 采用**双层设计**：
 
@@ -48,20 +48,20 @@ pnpm link --global
 ## 3. 快速上手
 
 ```bash
-# 配置（首次使用）
-ability-cli config set --app-id <your-app-id> --app-secret <your-secret>
+# 配置授权密钥（sk）与默认设备 ID（也可改用环境变量，见下文）
+ability-cli config set --auth-token sk-xxxx --device-id <device-id>
 
-# 搜索能力
-ability-cli search "帮我导航回家" --device-id abc123
+# 搜索能力（请求头：Authorization + zy-device-id，不发网关 zy-sign）
+ability-cli search --natural-lang "发送一条微信消息"
 
-# 查看能力详情（端侧能力需带设备 ID，也可用 config 里的 defaults.deviceId）
-ability-cli inspect --ability-id 20001 --device-id <device-id>
+# 查看能力详情（端侧能力建议带设备 ID）
+ability-cli inspect --ability-id 20001
 
 # 生成参数模板
 ability-cli inspect --ability-id 20001 --gen-template > params.json
 
-# 执行能力
-ability-cli exec --ability-id 20001 --params params.json --device-id abc123
+# 执行能力（对应 POST /ability-service/api/agent/v1/ability/call）
+ability-cli exec --ability-id 20001 --params '{"contact":"张三","message":"你好"}'
 
 # 健康检查
 ability-cli doctor
@@ -73,16 +73,16 @@ ability-cli doctor
 
 ### 全局选项
 
-下列选项可写在任意子命令**之前**，作用于本次整条命令（例如 `ability-cli --env prod search "查询天气"`）。
+下列选项可写在任意子命令**之前**，作用于本次整条命令（例如 `ability-cli --auth-token sk-xxx search --natural-lang "查询"`）。
+
+同一字段的优先级为：**子命令参数 > 全局参数 > 环境变量 > 配置文件**（合并后的命令行优先于 `ABILITY_CLI_*` 与 `~/.ability-cli/config.json`）。
 
 | 选项 | 说明 |
 |------|------|
-| `--env <env>` | 环境：`test` / `prod`，决定使用配置文件中哪一套 `profiles` |
-| `--app-id <id>` | `zy-app-id` |
-| `--app-secret <secret>` | `appSecret` |
-| `--auth-token <token>` | `Authorization` 请求头 |
-| `--base-url <url>` | 网关根地址 |
-| `--magic-sign` | 测试环境跳过验签（`zy-sign` 固定为测试用魔数） |
+| `--env <env>` | 环境：`test` / `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 |
 | `-v, --verbose` | 详细输出（请求 URL、头、体与响应等） |
 
 ### 上层命令
@@ -113,28 +113,30 @@ ability-cli doctor
 
 #### `exec`
 
-执行能力（异步 `call-tool`）。
+执行能力（`POST /ability-service/api/agent/v1/ability/call`，同步等待结果）。
 
 | 选项 | 说明 |
 |------|------|
 | `--ability-id <id>` | **必填**，能力 ID |
 | `--params <json>` | 参数：JSON 字符串，或指向 JSON 文件的路径 |
-| `--device-id <id>` | 设备 ID；默认可来自 `defaults.deviceId` |
+| `--device-id <id>` | 设备 ID；默认可来自全局/环境变量/配置的合并结果 |
 | `--session-id <id>` | `sessionId` |
 | `--tool-call-id <id>` | `toolCallId` |
 | `--task-id <id>` | `taskId` |
 | `--message-id <id>` | `messageId` |
 | `--trace-id <id>` | `traceId`；未指定时自动生成 |
-| `--timeout <ms>` | 超时（毫秒），默认 `30000` |
+| `--timeout <ms>` | 超时（毫秒）；不传则用配置文件 `defaults.timeout`，再默认 `30000` |
+| `--response-type <type>` | `NONE` / `MCP` / `CONVERT`（可选） |
+| `--mock-token <token>` | 模拟调用 token（可选，测试） |
 | `--json` | 以 JSON 展示返回 `data` |
 
 ### 下层命令：`raw`
 
-`raw` 子命令与网关路径一一对应，适合精确控制请求参数。
+`raw` 子命令与 **Agent API** 路径一一对应（前缀 `/ability-service/api/agent/v1`）。
 
 #### `raw ability-list`
 
-GET 能力列表。
+GET `/ability-service/api/agent/v1/ability/list`。
 
 | 选项 | 说明 |
 |------|------|
@@ -144,18 +146,9 @@ GET 能力列表。
 | `--natural-lang <text>` | 自然语言筛选 |
 | `--json` | JSON 输出 |
 
-#### `raw ability-record`
-
-POST 能力上报。
-
-| 选项 | 说明 |
-|------|------|
-| `--file <path>` | **必填**，请求体 JSON 文件路径 |
-| `--json` | JSON 输出 |
-
 #### `raw app-info`
 
-GET 应用信息。
+GET `/ability-service/api/agent/v1/ability/appInfo`。
 
 | 选项 | 说明 |
 |------|------|
@@ -164,7 +157,7 @@ GET 应用信息。
 
 #### `raw ability-info`
 
-GET 能力详情。
+GET `/ability-service/api/agent/v1/ability/abilityInfo`。
 
 | 选项 | 说明 |
 |------|------|
@@ -172,9 +165,9 @@ GET 能力详情。
 | `--device-id <id>` | 设备 ID；**端侧能力**时通常必填；未指定时可使用 `defaults.deviceId` |
 | `--json` | JSON 输出 |
 
-#### `raw call-tool`
+#### `raw call`
 
-POST 执行能力。
+POST `/ability-service/api/agent/v1/ability/call`（请求体由 `--file` 提供完整 JSON）。
 
 | 选项 | 说明 |
 |------|------|
@@ -183,7 +176,7 @@ POST 执行能力。
 
 #### `raw category-list`
 
-GET 全量分类。
+GET `/ability-service/api/agent/v1/ability/category`。
 
 | 选项 | 说明 |
 |------|------|
@@ -198,13 +191,10 @@ GET 全量分类。
 | 选项 | 说明 |
 |------|------|
 | `--env <env>` | 目标环境；影响写入哪一段 `profiles`，并更新当前 `env` |
-| `--app-id <id>` | `zy-app-id` |
-| `--app-secret <secret>` | `appSecret` |
-| `--auth-token <token>` | Authorization token |
+| `--auth-token <token>` | 授权密钥 `sk-…`（写入 `profiles.*.authToken`） |
 | `--base-url <url>` | 网关地址 |
 | `--device-id <id>` | 默认设备 ID（`defaults.deviceId`） |
-| `--device-model <model>` | 默认设备型号 |
-| `--os-version <ver>` | 默认系统版本 |
+| `--timeout <ms>` | 默认调用超时毫秒数（`defaults.timeout`）；`exec` 未带 `--timeout` 时使用 |
 
 #### `config show`
 
@@ -216,14 +206,14 @@ GET 全量分类。
 
 | 选项 | 说明 |
 |------|------|
-| `--app-id <id>` | 覆盖 `zy-app-id`（默认取自当前上下文） |
-| `--app-secret <secret>` | 覆盖密钥 |
+| `--app-id <id>` | 覆盖 `zy-app-id`（或环境变量 `ABILITY_CLI_APP_ID`） |
+| `--app-secret <secret>` | 覆盖密钥（或环境变量 `ABILITY_CLI_APP_SECRET`） |
 | `--nonce <nonce>` | 固定 nonce |
 | `--timestamp <ts>` | 固定时间戳 |
 
 #### `doctor`
 
-检查配置文件路径、当前环境、`zy-app-id` / `appSecret` / `baseUrl` 是否已配置，并请求 `{baseUrl}/time` 做网关连通性探测。
+检查配置文件路径、当前环境、解析后的 **`Authorization(sk)`** / **`zy-device-id`** / **`baseUrl`**，并请求 `{baseUrl}/time` 做网关连通性探测。
 
 ---
 
@@ -233,39 +223,39 @@ GET 全量分类。
 
 默认路径：**`~/.ability-cli/config.json`**。
 
-首次运行若文件不存在，会使用内置默认：当前环境 `test`，`test` / `prod` 各有一套 `baseUrl`（测试/生产网关），`zy-appId`、`appSecret` 等为空；`defaults` 中可存默认设备信息等。
+首次运行若文件不存在，会使用内置默认：当前环境 **`prod`**，`test` / `prod` 各有一套 `baseUrl`；`profiles.*.authToken`（sk）、`defaults.deviceId` 等为空字符串。
 
-通过 `ability-cli config set` 写入后，会按 `env` 更新对应 `profiles[env]` 下的 `baseUrl`、`zyAppId`、`appSecret`、`authToken` 等。
+通过 `ability-cli config set` 写入后，会按 `env` 更新对应 `profiles[env]` 下的 `baseUrl`、`authToken`（sk）等；`defaults` 下可保存默认设备 ID 等。
 
 ### 环境变量
 
 | 变量 | 作用 |
 |------|------|
 | `ABILITY_CLI_ENV` | 选用 `profiles` 的环境键（如 `test` / `prod`） |
-| `ABILITY_CLI_APP_ID` | 覆盖 `zy-app-id` |
-| `ABILITY_CLI_APP_SECRET` | 覆盖 `appSecret` |
-| `ABILITY_CLI_AUTH_TOKEN` | 覆盖 Authorization |
-| `ABILITY_CLI_BASE_URL` | 覆盖网关根地址 |
+| `ABILITY_CLI_AUTH_TOKEN` | 授权密钥 `sk-…`，对应请求头 `Authorization` |
+| `ABILITY_CLI_DEVICE_ID` | 设备 ID，对应请求头 `zy-device-id`，并参与部分 query |
+| `ABILITY_CLI_BASE_URL` | 网关根地址 |
+| `ABILITY_CLI_APP_ID` | 仅用于 `sign debug`（网关 zy-sign 调试） |
+| `ABILITY_CLI_APP_SECRET` | 仅用于 `sign debug`（网关 zy-sign 调试） |
 
 ### 优先级
 
-对 **appId / appSecret / authToken / baseUrl** 等请求上下文：**命令行全局选项 > 对应环境变量 > 配置文件当前 profile > 内置默认值**。
+对 **`authToken` / `deviceId` / `baseUrl`**：**子命令参数 > 全局参数 > 对应环境变量 > 配置文件**（子命令与全局选项先做对象合并，后者覆盖前者）。
 
 当前激活的 **profile（test 或 prod）** 由 **`ABILITY_CLI_ENV`（若设置）** 与配置文件中的 **`env`** 字段共同决定（环境变量优先）。
 
 ---
 
-## 6. 签名机制
+## 6. 鉴权说明（Agent API）
 
-请求头中的 `zy-sign` 使用 **HMAC-SHA256** 计算：
+调用 **`/ability-service/api/agent/v1/**`** 时，CLI 仅发送：
 
-1. 拼接**原串**（字符串直接相连，无分隔符）：  
-   `zy-app-id` + `zy-nonce` + `zy-timestamp` + `appSecret`
-2. 以 **`appSecret` 作为 HMAC 密钥**，对原串做 UTF-8 编码后的 HMAC-SHA256，结果取 **hex** 字符串，作为 `zy-sign`。
+- `Authorization`：`sk-…`（由 `--auth-token` / `ABILITY_CLI_AUTH_TOKEN` / 配置文件 `authToken` 解析）
+- `zy-device-id`：设备 ID（由 `--device-id` / `ABILITY_CLI_DEVICE_ID` / `defaults.deviceId` 解析）
 
-同时会带上 `zy-app-id`、`zy-nonce`、`zy-timestamp`。
+**不发送**网关侧的 `zy-app-id`、`zy-nonce`、`zy-timestamp`、`zy-sign`。
 
-在**测试环境**下，若使用全局选项 **`--magic-sign`**，则跳过上述计算，`zy-sign` 使用固定测试值（便于跳过网关验签联调）。
+如需调试历史网关 **HMAC 签名字段**，可使用 `ability-cli sign debug`（凭据为命令行 `--app-id` / `--app-secret` 或环境变量 `ABILITY_CLI_APP_ID` / `ABILITY_CLI_APP_SECRET`，与 Agent API 请求无关）。
 
 ---
 
@@ -284,7 +274,7 @@ GET 全量分类。
 | 0 | 成功 |
 | 1 | 参数错误或未捕获的运行时错误 |
 | 2 | 网络错误（如连接被拒绝、DNS 失败等） |
-| 3 | 签名/认证失败 |
+| 3 | 认证失败（保留码位；Agent API 常见错误见服务端 `code`） |
 | 4 | 业务错误（接口返回 `code !== 200`） |
 
 ---

package/dist/index.js

@@ -2,6 +2,9 @@
 
 // src/index.ts
 import { Command } from "commander";
+import { readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
 
 // src/config.ts
 import fs from "fs";
@@ -12,22 +15,16 @@ var DEFAULT_CONFIG = {
   profiles: {
     test: {
       baseUrl: "https://biz-gw.zyqltest.com",
-      zyAppId: "",
-      appSecret: "",
       authToken: ""
     },
     prod: {
       baseUrl: "https://biz-gw.zyql.com",
-      zyAppId: "",
-      appSecret: "",
       authToken: ""
     }
   },
   defaults: {
     deviceId: "",
-    deviceModel: "",
-    osVersion: "",
-    timeout: 30
+    timeout: 3e4
   }
 };
 function getDefaultConfigPath() {
@@ -98,7 +95,7 @@ function printAbilityDetail(a) {
   console.log(`  ${chalk.gray("\u5E94\u7528:")}       ${a.appName} (${a.packageName})`);
   console.log(`  ${chalk.gray("\u63CF\u8FF0:")}       ${a.description}`);
   console.log(`  ${chalk.gray("\u8C03\u7528\u65B9\u5F0F:")}   ${a.callingMethod}`);
-  console.log(`  ${chalk.gray("\u8D85\u65F6:")}       ${a.timeout}s`);
+  console.log(`  ${chalk.gray("\u8D85\u65F6:")}       ${a.timeout ?? ""} \u6BEB\u79D2`);
   console.log(`  ${chalk.gray("\u6743\u9650:")}       ${a.permission}`);
   console.log(`  ${chalk.gray("\u8BBE\u5907\u7C7B\u578B:")}   ${a.deviceType}`);
   if (a.inputSchema) {
@@ -124,24 +121,36 @@ function handleApiResponse(res, jsonMode, formatter) {
 }
 
 // src/commands/config.ts
+function mergeConfigSetOpts(program2, opts) {
+  const g = program2.opts();
+  return {
+    ...g,
+    ...opts,
+    env: opts.env ?? g.env,
+    authToken: opts.authToken ?? g.authToken,
+    baseUrl: opts.baseUrl ?? g.baseUrl,
+    deviceId: opts.deviceId ?? g.deviceId,
+    timeout: opts.timeout
+  };
+}
 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("--app-id <id>", "zy-app-id").option("--app-secret <secret>", "appSecret").option("--auth-token <token>", "Authorization token").option("--base-url <url>", "\u7F51\u5173\u5730\u5740").option("--device-id <id>", "\u9ED8\u8BA4\u8BBE\u5907ID").option("--device-model <model>", "\u9ED8\u8BA4\u8BBE\u5907\u578B\u53F7").option("--os-version <ver>", "\u9ED8\u8BA4\u7CFB\u7EDF\u7248\u672C").action((opts) => {
+  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) => {
+    const m = mergeConfigSetOpts(program2, opts);
     const configPath = getDefaultConfigPath();
     const config = loadConfig(configPath);
-    const env = opts.env ?? config.env;
+    const env = m.env ?? config.env;
     config.env = env;
     if (!config.profiles[env]) {
-      config.profiles[env] = { baseUrl: "", zyAppId: "", appSecret: "", authToken: "" };
+      config.profiles[env] = { baseUrl: "", authToken: "" };
     }
     const p = config.profiles[env];
-    if (opts.appId) p.zyAppId = opts.appId;
-    if (opts.appSecret) p.appSecret = opts.appSecret;
-    if (opts.authToken) p.authToken = opts.authToken;
-    if (opts.baseUrl) p.baseUrl = opts.baseUrl;
-    if (opts.deviceId) config.defaults.deviceId = opts.deviceId;
-    if (opts.deviceModel) config.defaults.deviceModel = opts.deviceModel;
-    if (opts.osVersion) config.defaults.osVersion = opts.osVersion;
+    if (m.authToken) p.authToken = m.authToken;
+    if (m.baseUrl) p.baseUrl = m.baseUrl;
+    if (m.deviceId) config.defaults.deviceId = m.deviceId;
+    if (m.timeout !== void 0 && String(m.timeout).trim() !== "") {
+      config.defaults.timeout = Number(m.timeout);
+    }
     saveConfig(configPath, config);
     printSuccess(`\u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230 ${configPath}`);
   });
@@ -152,38 +161,38 @@ function registerConfigCommand(program2) {
 }
 
 // src/context.ts
-function buildContext(opts) {
+function firstNonEmpty(...vals) {
+  for (const v of vals) {
+    if (v !== void 0 && v !== null && String(v).trim() !== "") return String(v).trim();
+  }
+  return "";
+}
+function buildAgentRequestContext(merged) {
   const config = loadConfig();
-  if (opts.env) config.env = opts.env;
+  if (merged.env) config.env = merged.env;
   const profile = getActiveProfile(config);
-  profile.zyAppId = resolveOption(opts.appId, process.env.ABILITY_CLI_APP_ID, profile.zyAppId, "");
-  profile.appSecret = resolveOption(opts.appSecret, process.env.ABILITY_CLI_APP_SECRET, profile.appSecret, "");
-  profile.authToken = resolveOption(opts.authToken, process.env.ABILITY_CLI_AUTH_TOKEN, profile.authToken, "");
-  profile.baseUrl = resolveOption(opts.baseUrl, process.env.ABILITY_CLI_BASE_URL, profile.baseUrl, "https://biz-gw.zyql.com");
-  return {
-    profile,
-    signOpts: { magicSign: opts.magicSign },
-    verbose: opts.verbose
-  };
-}
-function getDefaults() {
-  return loadConfig().defaults;
-}
-
-// src/signer.ts
-import { createHmac, randomBytes } from "crypto";
-function sign(message, secret) {
-  return createHmac("sha256", secret).update(message, "utf8").digest("hex");
-}
-function buildSignHeaders(appId, appSecret, opts = {}) {
-  const nonce = opts.nonce ?? randomBytes(8).toString("hex");
-  const timestamp = opts.timestamp ?? Date.now().toString();
-  const zySign = opts.magicSign ? "123456" : sign(`${appId}${nonce}${timestamp}${appSecret}`, appSecret);
+  const defaults = config.defaults;
+  const authToken = firstNonEmpty(
+    merged.authToken,
+    process.env.ABILITY_CLI_AUTH_TOKEN,
+    profile.authToken
+  );
+  const deviceId = firstNonEmpty(
+    merged.deviceId,
+    process.env.ABILITY_CLI_DEVICE_ID,
+    defaults.deviceId
+  );
+  const baseUrl = resolveOption(
+    merged.baseUrl,
+    process.env.ABILITY_CLI_BASE_URL,
+    profile.baseUrl,
+    "https://biz-gw.zyql.com"
+  );
   return {
-    "zy-app-id": appId,
-    "zy-nonce": nonce,
-    "zy-timestamp": timestamp,
-    "zy-sign": zySign
+    baseUrl,
+    authToken,
+    deviceId,
+    verbose: merged.verbose
   };
 }
 
@@ -197,15 +206,23 @@ function buildUrl(base, path2, params) {
   }
   return url.toString();
 }
-function buildRequestHeaders(signHeaders, authToken) {
-  const headers = { ...signHeaders };
-  if (authToken) headers["Authorization"] = authToken;
+function normalizeAuthorization(token) {
+  const t = token.trim();
+  return t;
+}
+function buildAgentHeaders(authToken, deviceId) {
+  const headers = {};
+  if (authToken) {
+    headers["Authorization"] = normalizeAuthorization(authToken);
+  }
+  if (deviceId) {
+    headers["zy-device-id"] = deviceId;
+  }
   return headers;
 }
 async function apiGet(ctx, path2, params) {
-  const signHeaders = buildSignHeaders(ctx.profile.zyAppId, ctx.profile.appSecret, ctx.signOpts);
-  const headers = buildRequestHeaders(signHeaders, ctx.profile.authToken);
-  const url = buildUrl(ctx.profile.baseUrl, path2, params);
+  const headers = buildAgentHeaders(ctx.authToken, ctx.deviceId);
+  const url = buildUrl(ctx.baseUrl, path2, params);
   if (ctx.verbose) {
     console.error(`[verbose] GET ${url}`);
     console.error(`[verbose] Headers: ${JSON.stringify(headers, null, 2)}`);
@@ -216,10 +233,9 @@ async function apiGet(ctx, path2, params) {
   return body;
 }
 async function apiPost(ctx, path2, data) {
-  const signHeaders = buildSignHeaders(ctx.profile.zyAppId, ctx.profile.appSecret, ctx.signOpts);
-  const headers = buildRequestHeaders(signHeaders, ctx.profile.authToken);
+  const headers = buildAgentHeaders(ctx.authToken, ctx.deviceId);
   headers["Content-Type"] = "application/json";
-  const url = buildUrl(ctx.profile.baseUrl, path2);
+  const url = buildUrl(ctx.baseUrl, path2);
   if (ctx.verbose) {
     console.error(`[verbose] POST ${url}`);
     console.error(`[verbose] Headers: ${JSON.stringify(headers, null, 2)}`);
@@ -237,53 +253,56 @@ async function apiPost(ctx, path2, data) {
 
 // src/commands/raw.ts
 import fs2 from "fs";
+
+// src/agent-paths.ts
+var AGENT_API_PREFIX = "/ability-service/api/agent/v1";
+var agentPath = {
+  abilityList: `${AGENT_API_PREFIX}/ability/list`,
+  abilityCategory: `${AGENT_API_PREFIX}/ability/category`,
+  appInfo: `${AGENT_API_PREFIX}/ability/appInfo`,
+  abilityInfo: `${AGENT_API_PREFIX}/ability/abilityInfo`,
+  abilityCall: `${AGENT_API_PREFIX}/ability/call`
+};
+
+// 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");
   raw.command("ability-list").description("GET \u80FD\u529B\u5217\u8868").option("--device-id <id>", "\u8BBE\u5907ID").option("--app-name <name>", "\u5E94\u7528\u540D\u79F0").option("--category <category>", "\u4E09\u7EA7\u5206\u7C7B").option("--natural-lang <text>", "\u81EA\u7136\u8BED\u8A00\u7B5B\u9009").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
     const params = {};
-    if (opts.deviceId) params.deviceId = opts.deviceId;
+    if (ctx.deviceId) params.deviceId = ctx.deviceId;
     if (opts.appName) params.appName = opts.appName;
     if (opts.category) params.category = opts.category;
     if (opts.naturalLang) params.naturalLang = opts.naturalLang;
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/list", params);
+    const res = await apiGet(ctx, agentPath.abilityList, params);
     handleApiResponse(res, opts.json, (data) => printAbilityTable(data));
   });
-  raw.command("ability-record").description("POST \u80FD\u529B\u4E0A\u62A5").requiredOption("--file <path>", "JSON \u6587\u4EF6\u8DEF\u5F84").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const data = JSON.parse(fs2.readFileSync(opts.file, "utf-8"));
-    const res = await apiPost(ctx, "/ability-service/api/v1/ability/record", data);
-    handleApiResponse(res, opts.json, () => printSuccess("\u80FD\u529B\u4E0A\u62A5\u6210\u529F"));
-  });
   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) => {
-    const ctx = buildContext(program2.opts());
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/appInfo", { packageName: opts.packageName });
+    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\u5F53\u80FD\u529B\u4E3A\u7AEF\u4FA7\u80FD\u529B\u65F6\u5FC5\u586B").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const defaults = getDefaults();
+  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) => {
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
     const params = { abilityId: opts.abilityId };
-    const deviceId = opts.deviceId ?? defaults.deviceId;
-    if (deviceId) params.deviceId = deviceId;
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/abilityInfo", params);
+    if (ctx.deviceId) params.deviceId = ctx.deviceId;
+    const res = await apiGet(ctx, agentPath.abilityInfo, params);
     handleApiResponse(res, opts.json, (data) => printJson(data));
   });
-  raw.command("call-tool").description("POST \u6267\u884C\u80FD\u529B").requiredOption("--file <path>", "JSON \u6587\u4EF6\u8DEF\u5F84").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const data = JSON.parse(fs2.readFileSync(opts.file, "utf-8"));
-    const res = await apiPost(ctx, "/ability-service/api/mcp/async/call-tool", data);
-    handleApiResponse(res, opts.json, (data2) => printJson(data2));
-  });
-  raw.command("ability-callback").description("POST \u4E0A\u62A5\u80FD\u529B\u6267\u884C\u7ED3\u679C").requiredOption("--file <path>", "JSON \u6587\u4EF6\u8DEF\u5F84\uFF0C\u9700\u5305\u542B requestId\uFF0Cbody \u53EF\u9009").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
+  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) => {
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
     const data = JSON.parse(fs2.readFileSync(opts.file, "utf-8"));
-    const res = await apiPost(ctx, "/ability-service/api/v1/ability/callback", data);
+    const res = await apiPost(ctx, agentPath.abilityCall, data);
     handleApiResponse(res, opts.json, (data2) => printJson(data2));
   });
   raw.command("category-list").description("GET \u5168\u91CF\u5206\u7C7B").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/category");
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
+    const res = await apiGet(ctx, agentPath.abilityCategory);
     handleApiResponse(res, opts.json, (data) => printJson(data));
   });
 }
@@ -291,16 +310,15 @@ function registerRawCommand(program2) {
 // src/commands/search.ts
 function registerSearchCommand(program2) {
   program2.command("search [query]").description("\u641C\u7D22\u80FD\u529B\uFF08\u652F\u6301\u81EA\u7136\u8BED\u8A00\uFF09").option("--device-id <id>", "\u8BBE\u5907ID").option("--app-name <name>", "\u5E94\u7528\u540D\u79F0").option("--category <category>", "\u4E09\u7EA7\u5206\u7C7B").option("--natural-lang <text>", "\u81EA\u7136\u8BED\u8A00\uFF08\u4F18\u5148\u4E8E query\uFF09").option("--json", "JSON \u8F93\u51FA").action(async (query, opts) => {
-    const ctx = buildContext(program2.opts());
-    const defaults = getDefaults();
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
     const params = {};
-    const deviceId = opts.deviceId ?? defaults.deviceId;
-    if (deviceId) params.deviceId = deviceId;
+    if (ctx.deviceId) params.deviceId = ctx.deviceId;
     const naturalLang = opts.naturalLang ?? query;
     if (naturalLang) params.naturalLang = naturalLang;
     if (opts.appName) params.appName = opts.appName;
     if (opts.category) params.category = opts.category;
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/list", params);
+    const res = await apiGet(ctx, agentPath.abilityList, params);
     handleApiResponse(res, opts.json, (data) => {
       const list = Array.isArray(data) ? data : [];
       if (list.length === 0) {
@@ -340,13 +358,12 @@ 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\u5F53\u80FD\u529B\u4E3A\u7AEF\u4FA7\u80FD\u529B\u65F6\u5FC5\u586B").option("--gen-template", "\u751F\u6210\u53C2\u6570\u6A21\u677F JSON").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const defaults = getDefaults();
+  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) => {
+    const merged = { ...program2.opts(), ...opts };
+    const ctx = buildAgentRequestContext(merged);
     const params = { abilityId: opts.abilityId };
-    const deviceId = opts.deviceId ?? defaults.deviceId;
-    if (deviceId) params.deviceId = deviceId;
-    const res = await apiGet(ctx, "/ability-service/api/v1/ability/abilityInfo", params);
+    if (ctx.deviceId) params.deviceId = ctx.deviceId;
+    const res = await apiGet(ctx, agentPath.abilityInfo, params);
     handleApiResponse(res, opts.json, (data) => {
       if (opts.genTemplate && data.inputSchema) {
         printJson(generateTemplate(data.inputSchema));
@@ -361,9 +378,11 @@ function registerInspectCommand(program2) {
 import { randomUUID } from "crypto";
 import fs3 from "fs";
 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("--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").option("--timeout <ms>", "\u8D85\u65F6\u65F6\u95F4(\u6BEB\u79D2)", "30000").option("--json", "JSON \u8F93\u51FA").action(async (opts) => {
-    const ctx = buildContext(program2.opts());
-    const defaults = getDefaults();
+  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) => {
+    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)) {
@@ -379,11 +398,13 @@ function registerExecCommand(program2) {
       toolCallId: opts.toolCallId ?? "",
       taskId: opts.taskId ?? "",
       messageId: opts.messageId ?? "",
-      deviceId: opts.deviceId ?? defaults.deviceId ?? "",
-      timeoutMillis: Number(opts.timeout),
+      deviceId: ctx.deviceId ?? "",
+      timeoutMillis,
       params
     };
-    const res = await apiPost(ctx, "/ability-service/api/mcp/async/call-tool", 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");
       printJson(data);
@@ -393,18 +414,36 @@ function registerExecCommand(program2) {
 
 // src/commands/sign.ts
 import chalk2 from "chalk";
+
+// src/signer.ts
+import { createHmac, randomBytes } from "crypto";
+function sign(message, secret) {
+  return createHmac("sha256", secret).update(message, "utf8").digest("hex");
+}
+function buildSignHeaders(appId, appSecret, opts = {}) {
+  const nonce = opts.nonce ?? randomBytes(8).toString("hex");
+  const timestamp = opts.timestamp ?? Date.now().toString();
+  const zySign = opts.magicSign ? "123456" : sign(`${appId}${nonce}${timestamp}${appSecret}`, appSecret);
+  return {
+    "zy-app-id": appId,
+    "zy-nonce": nonce,
+    "zy-timestamp": timestamp,
+    "zy-sign": zySign
+  };
+}
+
+// src/commands/sign.ts
 function registerSignCommand(program2) {
-  const signCmd = program2.command("sign").description("\u7B7E\u540D\u5DE5\u5177");
-  signCmd.command("debug").description("\u8C03\u8BD5\u7B7E\u540D\uFF08\u6253\u5370\u539F\u4E32\u548C\u7ED3\u679C\uFF09").option("--app-id <id>", "zy-app-id").option("--app-secret <secret>", "appSecret").option("--nonce <nonce>", "\u6307\u5B9A nonce").option("--timestamp <ts>", "\u6307\u5B9A timestamp").action((opts) => {
-    const ctx = buildContext(program2.opts());
-    const appId = opts.appId ?? ctx.profile.zyAppId;
-    const secret = opts.appSecret ?? ctx.profile.appSecret;
+  const signCmd = program2.command("sign").description("\u7B7E\u540D\u5DE5\u5177\uFF08\u7F51\u5173 zy-sign \u8C03\u8BD5\uFF0C\u975E Agent API \u8BF7\u6C42\uFF09");
+  signCmd.command("debug").description("\u8C03\u8BD5\u7F51\u5173\u7B7E\u540D\uFF08\u6253\u5370\u539F\u4E32\u548C zy-sign\uFF09\uFF1B\u51ED\u636E\u6765\u81EA\u53C2\u6570\u6216\u73AF\u5883\u53D8\u91CF").option("--app-id <id>", "zy-app-id").option("--app-secret <secret>", "appSecret").option("--nonce <nonce>", "\u6307\u5B9A nonce").option("--timestamp <ts>", "\u6307\u5B9A timestamp").action((opts) => {
+    const appId = opts.appId ?? process.env.ABILITY_CLI_APP_ID ?? "";
+    const secret = opts.appSecret ?? process.env.ABILITY_CLI_APP_SECRET ?? "";
     const headers = buildSignHeaders(appId, secret, {
       nonce: opts.nonce,
       timestamp: opts.timestamp
     });
     const rawStr = `${appId}${headers["zy-nonce"]}${headers["zy-timestamp"]}${secret}`;
-    console.log(chalk2.bold.cyan("\n\u2500\u2500 \u7B7E\u540D\u8C03\u8BD5 \u2500\u2500\n"));
+    console.log(chalk2.bold.cyan("\n\u2500\u2500 \u7F51\u5173\u7B7E\u540D\u8C03\u8BD5 \u2500\u2500\n"));
     console.log(`  ${chalk2.gray("appId:")}     ${appId}`);
     console.log(`  ${chalk2.gray("nonce:")}     ${headers["zy-nonce"]}`);
     console.log(`  ${chalk2.gray("timestamp:")} ${headers["zy-timestamp"]}`);
@@ -417,16 +456,18 @@ function registerSignCommand(program2) {
 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 () => {
-    const config = loadConfig();
-    const profile = getActiveProfile(config);
+    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 checks = [
-      ["\u914D\u7F6E\u6587\u4EF6", getDefaultConfigPath(), true],
+      ["\u914D\u7F6E\u6587\u4EF6", configPath, true],
       ["\u5F53\u524D\u73AF\u5883", config.env, true],
-      ["zy-app-id", profile.zyAppId || "(\u7A7A)", !!profile.zyAppId],
-      ["appSecret", profile.appSecret ? "******" : "(\u7A7A)", !!profile.appSecret],
-      ["baseUrl", profile.baseUrl || "(\u7A7A)", !!profile.baseUrl]
+      ["baseUrl", ctx.baseUrl || "(\u7A7A)", !!ctx.baseUrl],
+      ["Authorization(sk)", ctx.authToken ? "******" : "(\u7A7A)", !!ctx.authToken],
+      ["zy-device-id", ctx.deviceId || "(\u7A7A)", !!ctx.deviceId]
     ];
     for (const [label, val, pass] of checks) {
       const icon = pass ? chalk3.green("\u2714") : chalk3.red("\u2716");
@@ -434,21 +475,16 @@ function registerDoctorCommand(program2) {
       if (!pass) ok = false;
     }
     try {
-      const res = await fetch(`${profile.baseUrl}/time`);
+      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:")} ${body.data}`);
-        const serverTs = Number(String(body.data).slice(0, -1) + "0");
-        const drift = Math.abs(Date.now() - serverTs);
-        if (drift > 3e4) {
-          console.log(`  ${chalk3.yellow("\u26A0")} ${chalk3.gray("\u65F6\u949F\u504F\u5DEE:")} ${drift}ms\uFF08\u5EFA\u8BAE\u4F7F\u7528 --sync-time\uFF09`);
-        }
+        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:")} \u8FD4\u56DE code=${body.code}`);
+        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:")} ${e.message}`);
+      console.log(`  ${chalk3.red("\u2716")} ${chalk3.gray("\u7F51\u5173\u8FDE\u901A(/time):")} ${e.message}`);
       ok = false;
     }
     console.log();
@@ -462,7 +498,13 @@ function registerDoctorCommand(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("ability-cli").description("\u539F\u5B50\u80FD\u529B\u5E73\u53F0 CLI \u5DE5\u5177").version("0.2.0").option("--env <env>", "\u73AF\u5883 (test/prod)").option("--app-id <id>", "zy-app-id").option("--app-secret <secret>", "appSecret").option("--auth-token <token>", "Authorization").option("--base-url <url>", "\u7F51\u5173\u5730\u5740").option("--magic-sign", "\u6D4B\u8BD5\u73AF\u5883\u8DF3\u8FC7\u9A8C\u7B7E").option("-v, --verbose", "\u8BE6\u7EC6\u8F93\u51FA");
+function readPackageVersion() {
+  const here = dirname(fileURLToPath(import.meta.url));
+  const pkgPath = join(here, "..", "package.json");
+  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");
 registerConfigCommand(program);
 registerRawCommand(program);
 registerSearchCommand(program);

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "ability-cli",
-  "version": "0.2.1",
-  "description": "原子能力平台 CLI 工具",
-  "repository": {
-    "type": "git",
-    "url": "<repo-url>"
-  },
-  "homepage": "<repo-url>",
-  "bugs": {
-    "url": "<repo-url>/issues"
-  },
-  "type": "module",
-  "bin": {
-    "ability-cli": "./dist/index.js"
-  },
-  "files": [
-    "dist",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "tsup src/index.ts --format esm --dts --clean",
-    "dev": "tsup src/index.ts --format esm --watch",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "prepublishOnly": "npm run build && npm test"
-  },
-  "keywords": [
-    "ability",
-    "cli",
-    "atomic-ability",
-    "mcp",
-    "zyql"
-  ],
-  "author": "",
-  "license": "ISC",
-  "packageManager": "pnpm@10.28.2",
-  "dependencies": {
-    "chalk": "^5.6.2",
-    "cli-table3": "^0.6.5",
-    "commander": "^14.0.3"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": ["esbuild"]
-  },
-  "devDependencies": {
-    "@types/node": "^25.5.2",
-    "tsup": "^8.5.1",
-    "typescript": "^6.0.2",
-    "vitest": "^4.1.3"
-  }
-}
+{
+  "name": "ability-cli",
+  "version": "0.3.0",
+  "description": "原子能力平台 CLI 工具",
+  "repository": {
+    "type": "git",
+    "url": "<repo-url>"
+  },
+  "homepage": "<repo-url>",
+  "bugs": {
+    "url": "<repo-url>/issues"
+  },
+  "type": "module",
+  "bin": {
+    "ability-cli": "./dist/index.js"
+  },
+  "files": [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsup src/index.ts --format esm --dts --clean",
+    "dev": "tsup src/index.ts --format esm --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "prepublishOnly": "npm run build && npm test"
+  },
+  "keywords": [
+    "ability",
+    "cli",
+    "atomic-ability",
+    "mcp",
+    "zyql"
+  ],
+  "author": "",
+  "license": "ISC",
+  "packageManager": "pnpm@10.28.2",
+  "dependencies": {
+    "chalk": "^5.6.2",
+    "cli-table3": "^0.6.5",
+    "commander": "^14.0.3"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": ["esbuild"]
+  },
+  "devDependencies": {
+    "@types/node": "^25.5.2",
+    "tsup": "^8.5.1",
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.3"
+  }
+}