@kvell007/embed-labs-cli 0.1.0-alpha.60 → 0.1.0-alpha.61

package/dist/index.js

@@ -33,6 +33,7 @@ const DEFAULT_PLUGIN_RELEASE_URL = process.env.EMBED_PLUGIN_RELEASE_URL?.trim()
 const PLUGIN_LIST_USAGE = "Usage: embed plugin list [--release-dir <dir>] [--release-url <url>] [--json]";
 const CODEX_PLUGIN_NAME = "embed-labs";
 const CODEX_MARKETPLACE_NAME = "embed-labs";
+const MCP_START_USAGE = "Usage: embed mcp start [--bridge-path <path>]";
 const LEGACY_CODEX_PLUGIN_NAMES = [
     "dbt-agent",
     "Dbt Agent",
@@ -180,6 +181,12 @@ async function main(argv) {
         if (area === "bridge" && action === "status") {
             return output(parsed, await bridgeGet("/healthz"), renderBridgeStatus);
         }
+        if (area === "mcp" && action === "start") {
+            return await runMcpStart(parsed);
+        }
+        if (area === "mcp") {
+            return output(parsed, fail("invalid_args", MCP_START_USAGE), undefined, 2);
+        }
         if (area === "cloud" && action === "status") {
             return output(parsed, await cloudGet("/healthz"), renderCloudStatus);
         }
@@ -411,6 +418,9 @@ async function main(argv) {
                 ACCOUNT_KEY_REVOKE_USAGE
             ].join("\n")), undefined, 2);
         }
+        if (area === "usage" || area === "billing") {
+            return output(parsed, quotaAndBillingDisabled(), undefined, 2);
+        }
         if (area === "usage") {
             if (action === "record") {
                 const body = usageRecordBody(parsed);
@@ -2774,7 +2784,7 @@ async function maybeRegisterCodexMcp(parsed, targetRoot, targetPath) {
     if (explicitTarget && process.env.EMBED_CODEX_MCP_REGISTER !== "1") {
         return {
             registered: false,
-            hint: `Installed into a custom target. Register manually with: codex mcp add embed-labs -- node ${join(targetPath, "scripts", "embed-labs-mcp-bridge.mjs")}`
+            hint: "Installed into a custom target. Register manually with: codex mcp add embed-labs -- embedlabs mcp start"
         };
     }
     const bridgePath = join(targetPath, "scripts", "embed-labs-mcp-bridge.mjs");
@@ -2793,11 +2803,12 @@ async function maybeRegisterCodexMcp(parsed, targetRoot, targetPath) {
         };
     }
     const embedCliBin = process.env.EMBED_CLI_BIN?.trim() || await resolveExecutableOnPath("embedlabs") || await resolveExecutableOnPath("embed") || "";
+    const mcpLauncher = await resolveEmbedCliMcpLauncher(embedCliBin);
     const authFile = resolve(process.env.EMBED_AUTH_FILE?.trim() || DEFAULT_AUTH_FILE);
     const cloudUrl = pluginMcpCloudApiUrl(parsed);
     const existing = await runLocalProcess(codexBin, ["mcp", "get", "embed-labs", "--json"]);
-    if (existing.code === 0 && codexMcpAlreadyRegistered(existing.stdout, bridgePath, cloudUrl, authFile, embedCliBin)) {
-        const warning = await upsertCodexMcpRuntimeConfig(bridgePath);
+    if (existing.code === 0 && codexMcpAlreadyRegistered(existing.stdout, bridgePath, cloudUrl, authFile, embedCliBin, mcpLauncher.command, mcpLauncher.args)) {
+        const warning = await upsertCodexMcpRuntimeConfig(mcpLauncher.command, mcpLauncher.args);
         if (warning) {
             return { registered: true, warning };
         }
@@ -2811,21 +2822,23 @@ async function maybeRegisterCodexMcp(parsed, targetRoot, targetPath) {
         "--env",
         `EMBED_CLOUD_API_URL=${cloudUrl}`,
         "--env",
-        `EMBED_AUTH_FILE=${authFile}`
+        `EMBED_AUTH_FILE=${authFile}`,
+        "--env",
+        `EMBED_MCP_BRIDGE_PATH=${bridgePath}`
     ];
     if (embedCliBin) {
         args.push("--env", `EMBED_CLI_BIN=${embedCliBin}`);
     }
-    args.push("--", process.execPath, bridgePath);
+    args.push("--", mcpLauncher.command, ...mcpLauncher.args);
     const addResult = await runLocalProcess(codexBin, args);
     if (addResult.code !== 0) {
         return {
             registered: false,
-            hint: `Codex plugin installed. Register manually with: codex mcp add embed-labs -- ${process.execPath} ${bridgePath}`,
+            hint: "Codex plugin installed. Register manually with: codex mcp add embed-labs -- embedlabs mcp start",
             warning: `codex mcp add failed: ${addResult.stderr.trim() || addResult.stdout.trim() || `exit ${addResult.code}`}`
         };
     }
-    const warning = await upsertCodexMcpRuntimeConfig(bridgePath);
+    const warning = await upsertCodexMcpRuntimeConfig(mcpLauncher.command, mcpLauncher.args);
     return warning ? { registered: true, warning } : { registered: true };
 }
 async function maybeRegisterCodexMarketplace(parsed, targetRoot, targetPath) {
@@ -2937,14 +2950,24 @@ async function upsertCodexPluginMarketplaceConfig(marketplacePath) {
         return `${configPath} could not be updated with the Embed Labs plugin marketplace entry: ${error instanceof Error ? error.message : String(error)}`;
     }
 }
-function codexMcpAlreadyRegistered(stdout, bridgePath, cloudUrl, authFile, embedCliBin) {
+async function resolveEmbedCliMcpLauncher(embedCliBin) {
+    const explicit = embedCliBin?.trim();
+    if (explicit) {
+        return { command: explicit, args: ["mcp", "start"] };
+    }
+    const pathBin = await resolveExecutableOnPath("embedlabs") || await resolveExecutableOnPath("embed");
+    if (pathBin) {
+        return { command: pathBin, args: ["mcp", "start"] };
+    }
+    return { command: process.execPath, args: [join(CLI_MODULE_DIR, "index.js"), "mcp", "start"] };
+}
+function codexMcpAlreadyRegistered(stdout, bridgePath, cloudUrl, authFile, embedCliBin, mcpCommand, mcpArgs) {
     try {
         const parsed = JSON.parse(stdout);
         const transport = parsed.transport;
-        if (transport?.type !== "stdio" || transport.command !== process.execPath)
-            return false;
-        if (!transport.args?.includes(bridgePath))
+        if (transport?.type !== "stdio")
             return false;
+        const args = transport.args || [];
         const env = transport.env || {};
         if (env.EMBED_CLOUD_API_URL !== cloudUrl)
             return false;
@@ -2952,13 +2975,16 @@ function codexMcpAlreadyRegistered(stdout, bridgePath, cloudUrl, authFile, embed
             return false;
         if (embedCliBin && env.EMBED_CLI_BIN !== embedCliBin)
             return false;
-        return true;
+        const directBridge = transport.command === process.execPath && args.includes(bridgePath);
+        const cliMcp = transport.command === mcpCommand
+            && mcpArgs.every((arg, index) => args[index] === arg);
+        return directBridge || cliMcp;
     }
     catch {
         return false;
     }
 }
-async function upsertCodexMcpRuntimeConfig(bridgePath) {
+async function upsertCodexMcpRuntimeConfig(command, args) {
     const configPath = join(process.env.CODEX_HOME?.trim() || join(homedir(), ".codex"), "config.toml");
     try {
         await mkdir(dirname(configPath), { recursive: true });
@@ -2970,8 +2996,8 @@ async function upsertCodexMcpRuntimeConfig(bridgePath) {
             text = "";
         }
         const updated = upsertTomlTableKeys(text, "mcp_servers.embed-labs", {
-            command: tomlString(process.execPath),
-            args: `[${tomlString(bridgePath)}]`,
+            command: tomlString(command),
+            args: `[${args.map(tomlString).join(", ")}]`,
             startup_timeout_sec: "120"
         });
         if (updated !== text) {
@@ -3094,6 +3120,75 @@ async function runBridgeStart(parsed) {
         });
     });
 }
+async function runMcpStart(parsed) {
+    const unknownFlag = firstUnknownFlag(parsed, ["bridge-path"]);
+    const unexpected = parsed.command.slice(2);
+    if (unknownFlag || unexpected.length > 0) {
+        console.error(unknownFlag ? `Unknown flag --${unknownFlag}. ${MCP_START_USAGE}` : MCP_START_USAGE);
+        return 2;
+    }
+    const bridge = await resolveMcpBridgeLauncher(stringFlag(parsed, "bridge-path"));
+    if (!bridge) {
+        console.error([
+            "Embed Labs MCP bridge was not found.",
+            "Run npm run build in the source checkout, reinstall the embedlabs npm package, or set EMBED_MCP_BRIDGE_PATH to the bridge script.",
+            "Expected command shape for MCP clients: embedlabs mcp start"
+        ].join("\n"));
+        return 1;
+    }
+    const child = spawn(bridge.command, bridge.args, {
+        stdio: "inherit",
+        env: {
+            ...process.env,
+            EMBED_CLIENT_KIND: process.env.EMBED_CLIENT_KIND || "mcp_client",
+            EMBED_MCP_BRIDGE_PATH: bridge.bridgePath
+        }
+    });
+    const forwardSignal = (signal) => {
+        if (!child.killed) {
+            child.kill(signal);
+        }
+    };
+    process.once("SIGINT", forwardSignal);
+    process.once("SIGTERM", forwardSignal);
+    return await new Promise((resolveCode) => {
+        child.on("error", (error) => {
+            process.off("SIGINT", forwardSignal);
+            process.off("SIGTERM", forwardSignal);
+            console.error(error instanceof Error ? error.message : String(error));
+            resolveCode(1);
+        });
+        child.on("close", (code, signal) => {
+            process.off("SIGINT", forwardSignal);
+            process.off("SIGTERM", forwardSignal);
+            if (signal === "SIGINT" || signal === "SIGTERM") {
+                resolveCode(0);
+            }
+            else {
+                resolveCode(code ?? 0);
+            }
+        });
+    });
+}
+async function resolveMcpBridgeLauncher(overridePath) {
+    const explicitPath = overridePath?.trim() || process.env.EMBED_MCP_BRIDGE_PATH?.trim();
+    const candidates = [
+        explicitPath ? resolve(explicitPath) : "",
+        join(CLI_MODULE_DIR, "embed-labs-mcp-bridge.mjs"),
+        sourceCheckoutPath("platform_plugins", "codex_plugin", "plugins", "embed-labs", "scripts", "embed-labs-mcp-bridge.mjs"),
+        join(defaultCodexPluginRoot(), CODEX_PLUGIN_NAME, "scripts", "embed-labs-mcp-bridge.mjs")
+    ].filter(Boolean);
+    for (const candidate of candidates) {
+        try {
+            await access(candidate, constants.R_OK);
+            return { command: process.execPath, args: [candidate], bridgePath: candidate };
+        }
+        catch {
+            // Keep looking.
+        }
+    }
+    return undefined;
+}
 async function resolveBridgeLauncher() {
     const explicitBinary = process.env.EMBED_LOCAL_BRIDGE_BINARY?.trim();
     if (explicitBinary) {
@@ -3387,9 +3482,16 @@ async function naturalLanguageQuery(parsed) {
     }
     const text = parsed.command.slice(1).join(" ").trim();
     if (!text) {
-        return { response: fail("invalid_args", QUERY_USAGE, { remediation: "Try: embed query \"查一下我的额度\"." }) };
+        return { response: fail("invalid_args", QUERY_USAGE, { remediation: "Try: embed query \"当前支持哪些开发板\"." }) };
     }
     const normalized = text.toLowerCase();
+    if (isQuotaOrBillingIntent(normalized)) {
+        return {
+            response: fail("quota_not_supported", "当前 Embed Labs 服务器只提供 MCP 服务，不提供额度、充值、余额、账本或存储配额功能。", {
+                remediation: "请使用 embedlabs auth status 查看登录和设备绑定状态，或在 MCP 客户端中直接调用开发板、工具链、知识库和本地硬件相关工具。"
+            })
+        };
+    }
     const accountId = await queryAccountId(parsed);
     const needsAccount = queryNeedsAccount(normalized);
     if (needsAccount && !accountId.ok) {
@@ -3408,7 +3510,7 @@ async function naturalLanguageQuery(parsed) {
         if (!amountUsd) {
             return {
                 response: fail("amount_required", "Recharge requests need an amount.", {
-                    remediation: "Try: embed query \"用 USDC 链上充值 100 美元\"."
+                    remediation: "当前 MCP 服务不提供充值流程。"
                 })
             };
         }
@@ -3501,13 +3603,8 @@ async function naturalLanguageQuery(parsed) {
         response: fail("query_intent_unknown", "I could not map that request to a stable CLI action yet.", {
             remediation: [
                 "Supported examples:",
-                "embed query \"查一下我的额度\"",
-                "embed query \"用 USDC 链上充值 100 美元\"",
-                "embed query \"看一下 token 用量\"",
-                "embed query \"看一下磁盘空间\"",
                 "embed query \"列出我的 API key\"",
                 "embed query \"有哪些开发板模板\"",
-                "embed query \"当前可以用哪些模型\"",
                 "embed query \"本地有哪些工具能力\""
             ].join("\n")
         })
@@ -3858,13 +3955,15 @@ async function queryAccountId(parsed) {
     return { ok: true, value: auth.data.account_id };
 }
 function queryNeedsAccount(normalized) {
+    return isApiKeyIntent(normalized);
+}
+function isQuotaOrBillingIntent(normalized) {
     return isRechargeIntent(normalized)
         || isBalanceIntent(normalized)
         || isUsageIntent(normalized)
         || isBillingStatementIntent(normalized)
         || isStorageSettlementIntent(normalized)
-        || isStorageIntent(normalized)
-        || isApiKeyIntent(normalized);
+        || isStorageIntent(normalized);
 }
 function isRechargeIntent(normalized) {
     return /(充值|充钱|续费|购买额度|买额度|top\s*up|recharge|add credits|buy credits)/i.test(normalized);
@@ -7157,7 +7256,7 @@ function renderLocalToolchainList(result) {
             }
             lines.push(`  mode_downloads=${localToolchainModeSummaries(environment.install_modes, environment.components).join("; ")}`);
             lines.push(`  package_groups=${localToolchainComponentGroups(environment.components).join(", ")}`);
-            lines.push(`  detail_command=embedlabs local toolchain latest --board ${environment.board_id}`);
+            lines.push(`  detail_command=embedlabs local toolchain latest --board ${environment.board_id}${result.channel === "stable" ? "" : ` --channel ${result.channel}`}`);
         }
         if (environment.notes.length > 0) {
             for (const note of environment.notes) {
@@ -8196,12 +8295,17 @@ async function waitForever() {
     });
     return 0;
 }
+function quotaAndBillingDisabled() {
+    return fail("quota_not_supported", "当前 Embed Labs 服务器只提供 MCP 服务，不提供额度、充值、余额、账本、存储配额或用量计费功能。", {
+        remediation: "请使用 auth、plugin、board、local toolchain、mcp start、device 和 Local Bridge 相关命令。"
+    });
+}
 function printHelp() {
     printCliHelp(`embed CLI
 
 Usage:
   embed <command> [options]
-  embed query "查一下我的额度"
+  embed query "当前支持哪些开发板"
   embed help getting-started
   embed help commands
 
@@ -8211,13 +8315,10 @@ Main workflow:
   2. Sign in with a token:
      embed auth login --token <token>
      # or set EMBED_API_TOKEN / create an account API key for automation.
-  3. Inspect server model routing:
+  3. Install or update local AI client plugins:
      embed plugin install codex
      embed plugin install opencode
      embed plugin update check
-     embed service modes
-     embed model list
-     embed model default
   4. Run a natural-language local tool loop:
      embed agent run --prompt "验证开发板状态"
   5. Validate or use the local TaishanPi toolchain:
@@ -8242,16 +8343,9 @@ Main workflow:
      embed image boot-logo compose --package ./boot-logo-package.json --base-image ./boot.img --output ./boot-logo.img
      embed cloud task artifacts <task_id>
      embed artifact download <artifact_id> --output ./artifact.bin
-  8. Check credits or create a recharge QR:
-     embed billing balance --account <account_id>
-     embed billing tokens --account <account_id>
-     embed billing ledger --account <account_id>
-     embed billing storage --account <account_id>
-     embed billing storage settle --account <account_id> --dry-run
-     embed billing recharge create --account <account_id> --amount-usd 10 --provider onchain --qr
-
 Local hardware:
   embed bridge start
+  embed mcp start
   embed agent run --prompt "验证开发板状态"
   embed agent run --prompt "部署泰山派应用" --host 198.19.77.2 --artifact ./artifact.bin --remote-path /userdata/embed-labs/apps/app --approve --run
   embed agent run --prompt "部署生成的泰山派应用" --host 198.19.77.2 --artifact-task <task_id> --remote-path /userdata/embed-labs/apps/app --approve --run
@@ -8287,11 +8381,9 @@ Environment:
   CODEX_HOME=~/.codex
 
 Natural language:
-  embed query "查一下我的额度"
-  embed query "用 USDC 链上充值 100 美元"
-  embed query "看一下 token 用量"
-  embed query "看一下磁盘空间"
-  embed query "结算磁盘空间扣费"
+  embed query "当前支持哪些开发板"
+  embed query "验证开发板状态"
+  embed query "安装泰山派本地开发环境"
 `);
 }
 function printHelpTopic(topic) {
@@ -8340,11 +8432,8 @@ Install local AI client plugins explicitly:
   embed plugin update check
   embed plugin update all
 
-Cloud build path:
+Local MCP service path:
 
-  embed service modes
-  embed model list
-  embed model default
   embed agent run --prompt "验证开发板状态"
   embed local toolchain validate
   embed local compile taishanpi --source ./main.c --output ./.embed-labs/build/main
@@ -8373,25 +8462,14 @@ Cloud build path:
 
 Natural language shortcuts:
 
-  embed query "查一下我的额度"
-  embed query "用 USDC 链上充值 100 美元"
-  embed query "看一下 token 用量"
-  embed query "看一下磁盘空间"
-
-Billing path:
-
-  embed billing balance --account <account_id>
-  embed billing tokens --account <account_id>
-  embed billing ledger --account <account_id>
-  embed billing storage --account <account_id>
-  embed billing storage settle --account <account_id> --dry-run
-  embed billing recharge create --account <account_id> --amount-usd 10 --provider onchain --qr
-  embed billing recharge submit-tx <recharge_session_id> --tx-hash <hash>
-  embed billing recharge list --account <account_id>
+  embed query "当前支持哪些开发板"
+  embed query "验证开发板状态"
+  embed query "安装泰山派本地开发环境"
 
 Local hardware path:
 
   embed bridge start
+  embed mcp start
   embed run "验证开发板状态"
   embed tool list
   embed tool call debug.tools.scan
@@ -8411,6 +8489,7 @@ Usage:
   embed query <natural language request> [--account <account_id>] [--qr] [--json]
   embed bridge start [--host 127.0.0.1] [--port 18083]
   embed bridge status [--json]
+  embed mcp start [--bridge-path <path>]
   embed auth login --token <token> [--profile default] [--json]
   embed auth status [--json]
   embed auth logout [--json]
@@ -8436,23 +8515,6 @@ Usage:
   embed account keys create --account <account_id> [--name <name>] [--json]
   embed account keys list --account <account_id> [--json]
   embed account keys revoke <api_key_id> [--json]
-  embed usage record [--api-key <key>|--api-key-id <api_key_id>] --model <model> --input-tokens <n> --output-tokens <n> [--provider <name>] [--operation <name>] [--task <task_id>] [--request-id <id>] [--json]
-  embed usage summary --account <account_id>|--api-key-id <api_key_id> [--from <iso>] [--to <iso>] [--json]
-  embed usage events --account <account_id> [--api-key-id <api_key_id>] [--from <iso>] [--to <iso>] [--limit 100] [--json]
-  embed billing statement --account <account_id> [--from <iso>] [--to <iso>] [--json]
-  embed billing balance --account <account_id> [--json]
-  embed billing tokens --account <account_id> [--json]
-  embed billing ledger --account <account_id> [--json]
-  embed billing storage --account <account_id> [--json]
-  embed billing storage settle --account <account_id> [--dry-run] [--json]
-  embed billing recharge create --account <account_id> --amount-usd <amount> [--provider mock|stripe|onchain] [--chain <chain>] [--token <symbol>] [--success-url <url>] [--cancel-url <url>] [--qr] [--json]
-  embed billing recharge list --account <account_id> [--json]
-  embed billing recharge show <recharge_session_id> [--json]
-  embed billing recharge submit-tx <recharge_session_id> --tx-hash <hash> [--json]
-  embed billing recharge confirm <recharge_session_id> [--json]
-  embed billing snapshot create --account <account_id> [--from <iso>] [--to <iso>] [--json]
-  embed billing snapshot list --account <account_id> [--json]
-  embed billing snapshot show <billing_snapshot_id> [--json]
   embed service modes [--json]
   embed build template list [--json]
   embed build template show <template_id> [--json]