@kvell007/embed-labs-cli 0.1.0-alpha.89 → 0.1.0-alpha.90

package/dist/embed-labs-mcp-bridge.mjs

@@ -12,7 +12,7 @@ const DEFAULT_HOST = "198.19.77.2";
 const DEFAULT_PORTS = "22,15301";
 const DEFAULT_STATUS_PORTS = "22";
 const TOOL_INTEGRITY_RELOGIN_MESSAGE = "工具完整性校验失败，请在当前电脑重新执行 embedlabs auth login --token <key>";
-const MCP_SERVER_VERSION = "0.2.40";
+const MCP_SERVER_VERSION = "0.2.41";
 const MCP_ICON_FILES = [
   { fileName: "embed-labs-icon-dark.png", theme: "dark" },
   { fileName: "embed-labs-icon-light.png", theme: "light" }
@@ -150,8 +150,8 @@ const tools = [
   },
   {
     name: "dbt_rp2350_uart_write",
-    description: "Send text or HEX data over the current/default RP2350 UART channel, with optional tx/rx/baud override. Requires approved=true.",
-    inputSchema: { type: "object", properties: { id: { type: "number" }, instance: { type: "number" }, tx: { type: "number" }, rx: { type: "number" }, baud: { type: "number" }, text: { type: "string" }, hex: { type: "string" }, data_hex: { type: "string" }, line_ending: { type: "string" }, approved: { type: "boolean" }, approve: { type: "boolean" }, transport: { type: "string" }, local_device_id: { type: "string" }, monitor_bridge_url: { type: "string" }, serial_path: { type: "string" }, tcp: { type: "string" }, tcp_endpoint: { type: "string" }, host: { type: "string" }, port: { type: "number" }, timeout_ms: { type: "number" } } }
+    description: "Send text or HEX data over a configurable RP2350 UART channel, with optional tx/rx/baud override. Accepts uart_id such as uart1 and data/data_format aliases. Requires approved=true.",
+    inputSchema: { type: "object", properties: { id: { type: "number" }, instance: { type: "number" }, uart_id: { type: "string", description: "Alias such as uart0 or uart1; normalized to instance." }, tx: { type: "number" }, rx: { type: "number" }, baud: { type: "number" }, text: { type: "string" }, hex: { type: "string" }, data: { type: "string", description: "Text or hex payload depending on data_format." }, data_format: { type: "string", description: "hex, text, string, utf8, or ascii." }, data_hex: { type: "string" }, line_ending: { type: "string" }, approved: { type: "boolean" }, approve: { type: "boolean" }, transport: { type: "string" }, local_device_id: { type: "string" }, monitor_bridge_url: { type: "string" }, serial_path: { type: "string" }, tcp: { type: "string" }, tcp_endpoint: { type: "string" }, host: { type: "string" }, port: { type: "number" }, timeout_ms: { type: "number" } } }
   },
   {
     name: "dbt_rp2350_i2c_transfer",
@@ -163,7 +163,6 @@ const tools = [
     description: "Capture a compact RP2350-Monitor logic-analyzer JSONL file and optionally generate UART/SPI/I2C stimulus in the same operation. Requires approved=true because it arms local hardware. For closed-loop validation, do not call uart/spi write separately; pass stimulus here. UART/SPI/I2C/GPIO/logic functions may be combined freely when their GPIO sets do not overlap; only overlapping pins conflict. Example UART loopback: UART1 GP8/GP9 wired to logic GP16/GP17. Supports USB serial or board LAN IP/TCP transport.",
     inputSchema: {
       type: "object",
-      required: ["pin_base", "pin_count"],
       properties: {
         transport: { type: "string" },
         local_device_id: { type: "string" },
@@ -173,10 +172,14 @@ const tools = [
         tcp_endpoint: { type: "string" },
         host: { type: "string", description: "Board LAN IP/hostname for network mode. Defaults to RP2350 Monitor TCP port 4242." },
         port: { type: "number", description: "Network-mode RP2350 Monitor TCP port. Defaults to 4242." },
-        pin_base: { type: "number" },
-        pin_count: { type: "number" },
+        pin_base: { type: "number", description: "First contiguous analyzer GPIO. Optional when channels/pins is provided." },
+        pin_count: { type: "number", description: "Number of contiguous analyzer GPIOs. Optional when channels/pins is provided." },
+        channels: { type: "array", items: { anyOf: [{ type: "number" }, { type: "string" }] }, description: "Analyzer GPIO aliases such as [\"gpio8\",\"gpio9\"]. The bridge derives pin_base/pin_count when possible." },
+        pins: { type: "array", items: { anyOf: [{ type: "number" }, { type: "string" }] }, description: "Alias for channels." },
         sample_rate: { type: "number" },
+        sample_rate_hz: { type: "number", description: "Alias for sample_rate." },
         samples: { type: "number" },
+        duration_ms: { type: "number", description: "Alias that computes samples from sample_rate/sample_rate_hz." },
         output_path: { type: "string" },
         decoder: { type: "string", description: "Optional decoder hint such as uart, spi, summary, or structure. If provided with decode=true/default, the bridge decodes the generated capture file." },
         decode: { type: "boolean" },
@@ -210,14 +213,14 @@ const tools = [
     description: "Decode a local RP2350-Monitor logic JSONL capture without touching hardware. Supported decoders: summary, bursts, edges, uart, spi, and structure/auto/unknown. The result includes summary_for_user, decoded_preview, protocol_data, and analysis so the AI can report actual sampled data; use structure/unknown when the protocol is not known.",
     inputSchema: {
       type: "object",
-      required: ["input_path"],
       properties: {
         local_device_id: { type: "string" },
-        input_path: { type: "string" },
+        input_path: { type: "string", description: "Preferred capture file path from logic-capture output_path." },
+        capture_id: { type: "number", description: "Optional capture id; when input_path is omitted, the bridge searches the default capture directory." },
         decoder: { type: "string", description: "summary, bursts, edges, uart, spi, structure, auto, or unknown." },
         output_path: { type: "string" },
         preview_limit: { type: "number" },
-        pins: { type: "array", items: { type: "number" } },
+        pins: { type: "array", items: { anyOf: [{ type: "number" }, { type: "string" }] }, description: "GPIO aliases such as [\"gpio8\",\"gpio9\"]." },
         rx_pin: { type: "number" },
         baud: { type: "number" },
         data_bits: { type: "number" },
@@ -1549,8 +1552,24 @@ async function boardControl(args) {
 
 function normalizeRp2350Input(args) {
   const input = compactObject({ ...args });
+  if (input.local_device_id == null && input.device_id != null) {
+    input.local_device_id = input.device_id;
+  }
+  if (input.sample_rate == null && input.sample_rate_hz != null) {
+    input.sample_rate = input.sample_rate_hz;
+  }
+  if (input.hex == null && input.data != null && ["hex", "data_hex", ""].includes(asString(input.data_format).toLowerCase())) {
+    input.hex = input.data;
+  } else if (input.text == null && input.data != null && ["text", "string", "utf8", "ascii"].includes(asString(input.data_format).toLowerCase())) {
+    input.text = input.data;
+  }
+  if (input.instance == null && typeof input.uart_id === "string") {
+    const match = input.uart_id.match(/\d+/);
+    if (match) input.instance = Number(match[0]);
+  }
+  normalizeRp2350LogicChannels(input);
   for (const key of [
-    "port", "baud", "timeout_ms", "pin_base", "pin_count", "sample_rate", "samples",
+    "port", "baud", "timeout_ms", "duration_ms", "sample_rate_hz", "pin_base", "pin_count", "sample_rate", "samples",
     "wait_timeout_ms", "read_timeout_ms", "pre_samples", "post_samples", "search_samples",
     "burst_count", "trigger_pin", "trigger_mask", "trigger_value", "capture_id",
     "start_sample", "end_sample", "preview_limit", "rx_pin", "data_bits", "sck_pin", "mosi_pin",
@@ -1564,14 +1583,22 @@ function normalizeRp2350Input(args) {
       input[key] = Number(value);
     }
   }
-  for (const key of ["include_caps", "release", "trigger_level", "invert", "cs_active_high", "level", "save", "use_current_channel", "decode", "strict_pins"]) {
+  for (const key of ["include_caps", "release", "release_after", "trigger_level", "invert", "cs_active_high", "level", "save", "use_current_channel", "decode", "strict_pins"]) {
     if (typeof input[key] === "string") {
       input[key] = boolValue(input[key]);
     }
   }
   if (typeof input.pins === "string") {
-    input.pins = input.pins.split(/[,\s]+/g).map((item) => Number(item)).filter((item) => Number.isFinite(item));
+    input.pins = parseGPIOList(input.pins);
+  }
+  normalizeRp2350LogicChannels(input);
+  if (input.samples == null && Number.isFinite(input.duration_ms) && Number.isFinite(input.sample_rate)) {
+    input.samples = Math.max(1, Math.round(input.sample_rate * input.duration_ms / 1000));
   }
+  delete input.sample_rate_hz;
+  delete input.data;
+  delete input.data_format;
+  delete input.uart_id;
   for (const key of ["channel_names", "pin_pulls", "stimulus", "params"]) {
     const parsed = objectValue(input[key]);
     if (parsed) input[key] = parsed;
@@ -1580,6 +1607,31 @@ function normalizeRp2350Input(args) {
   return input;
 }
 
+function normalizeRp2350LogicChannels(input) {
+  const pins = parseGPIOList(input.channels ?? input.channel ?? input.pins);
+  if (pins.length === 0) return;
+  input.pins = pins;
+  if (input.pin_base == null || input.pin_count == null) {
+    const min = Math.min(...pins);
+    const max = Math.max(...pins);
+    input.pin_base = min;
+    input.pin_count = max - min + 1;
+    input.channel_names ??= Object.fromEntries(pins.map((pin) => [String(pin), `gpio${pin}`]));
+  }
+}
+
+function parseGPIOList(value) {
+  if (value == null) return [];
+  const raw = Array.isArray(value) ? value : String(value).split(/[,\s]+/g);
+  return raw
+    .map((item) => {
+      if (typeof item === "number") return item;
+      const match = String(item).trim().toLowerCase().match(/^(?:gp|gpio|pin)?\s*(\d+)$/);
+      return match ? Number(match[1]) : Number.NaN;
+    })
+    .filter((item) => Number.isInteger(item) && item >= 0 && item <= 47);
+}
+
 async function rp2350MonitorStatus(args) {
   return await rp2350MonitorTool("dbt_rp2350_monitor_status", "rp2350.monitor.status", args);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kvell007/embed-labs-cli",
-  "version": "0.1.0-alpha.89",
+  "version": "0.1.0-alpha.90",
   "description": "Command-line interface for Embed Labs Cloud. Experimental npm publish.",
   "private": false,
   "type": "module",
@@ -18,8 +18,8 @@
     "embedlabs": "dist/index.js"
   },
   "dependencies": {
-    "@embed-labs/local-bridge": "npm:@kvell007/embed-labs-local-bridge@0.1.0-alpha.89",
-    "@embed-labs/protocol": "npm:@kvell007/embed-labs-protocol@0.1.0-alpha.89",
+    "@embed-labs/local-bridge": "npm:@kvell007/embed-labs-local-bridge@0.1.0-alpha.90",
+    "@embed-labs/protocol": "npm:@kvell007/embed-labs-protocol@0.1.0-alpha.90",
     "qrcode-terminal": "^0.12.0"
   },
   "publishConfig": {