@atel-ai/agent 0.2.23 → 0.2.28

package/dist/cli.js

@@ -15,6 +15,8 @@ import crypto from 'node:crypto';
 import { execFileSync, spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 const require = createRequire(import.meta.url);
 const __cliPath = fileURLToPath(import.meta.url);
 // AC-11:打印实际版本,便于测试追踪(`@latest` 解析到的具体版本)。
@@ -25,12 +27,14 @@ catch {
     return 'unknown';
 } })();
 import { defaultConfig, PROD_DEFAULTS, newIdentity, loadIdentity, serializeIdentity, AuthManager, Companion, spineWalletBalance, spineIdentityVerify, registryRemoteRegister, registryHeartbeat, postSigned, relayPoll, relayAck, detectAll, getAdapter, ADAPTERS, } from '@atel-ai/runtime-core';
+import { assertBindingCompatible, bindingPath, machineFingerprint, readBinding, writeBinding, } from './binding.js';
 import { runMcpShim } from './mcp-shim.js';
 // ── arg parsing ────────────────────────────────────────────────
 function parseArgs(argv) {
     const [cmd = 'help', ...rest] = argv;
     const flags = {};
     const bools = new Set();
+    const positionals = [];
     for (let i = 0; i < rest.length; i++) {
         const a = rest[i];
         if (a.startsWith('--')) {
@@ -44,14 +48,20 @@ function parseArgs(argv) {
                 bools.add(key);
             }
         }
+        else {
+            positionals.push(a);
+        }
     }
-    return { cmd, flags, bools };
+    return { cmd, positionals, flags, bools };
 }
 const log = (m) => console.log(m);
 const err = (m) => console.error(m);
 function configPath(dataDir) {
     return path.join(dataDir, 'config.json');
 }
+function runtimeEnvPath(dataDir) {
+    return path.join(dataDir, 'runtime.env');
+}
 function loadConfig(dataDir) {
     try {
         return JSON.parse(fs.readFileSync(configPath(dataDir), 'utf8'));
@@ -64,6 +74,115 @@ function saveConfig(cfg) {
     fs.mkdirSync(cfg.dataDir, { recursive: true });
     fs.writeFileSync(configPath(cfg.dataDir), JSON.stringify(cfg, null, 2));
 }
+const COMMON_RUNTIME_ENV_KEYS = [
+    'HTTP_PROXY',
+    'HTTPS_PROXY',
+    'ALL_PROXY',
+    'NO_PROXY',
+    'http_proxy',
+    'https_proxy',
+    'all_proxy',
+    'no_proxy',
+];
+const RUNTIME_ENV_KEYS = {
+    codex: ['OPENAI_API_KEY', 'CODEX_HOME'],
+    'claude-code': ['ANTHROPIC_BASE_URL', 'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY', 'API_TIMEOUT_MS', 'CLAUDE_CONFIG_DIR'],
+    'gemini-cli': ['GOOGLE_GEMINI_BASE_URL', 'GEMINI_API_KEY', 'GEMINI_MODEL', 'ATEL_GEMINI_MODEL', 'GEMINI_CLI_TRUST_WORKSPACE'],
+    hermes: ['ATEL_HERMES_MODEL', 'OPENAI_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_MODEL'],
+    'qwen-agent': ['ATEL_PYTHON', 'ATEL_QWEN_MODEL', 'ATEL_QWEN_BASE_URL', 'ATEL_QWEN_API_KEY', 'OPENAI_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_MODEL', 'DASHSCOPE_BASE_URL', 'DASHSCOPE_API_KEY'],
+    openclaw: ['OPENAI_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_MODEL'],
+};
+function shellQuoteEnv(value) {
+    return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '\\$').replace(/`/g, '\\`')}"`;
+}
+function parseRuntimeEnvFile(dataDir) {
+    const out = {};
+    try {
+        const body = fs.readFileSync(runtimeEnvPath(dataDir), 'utf8');
+        for (const line of body.split(/\r?\n/)) {
+            const trimmed = line.trim();
+            if (!trimmed || trimmed.startsWith('#'))
+                continue;
+            const m = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
+            if (!m)
+                continue;
+            let value = m[2] || '';
+            if (value.startsWith('"') && value.endsWith('"')) {
+                value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\$/g, '$').replace(/\\`/g, '`').replace(/\\\\/g, '\\');
+            }
+            out[m[1]] = value;
+        }
+    }
+    catch {
+        /* no runtime env yet */
+    }
+    return out;
+}
+function loadRuntimeEnv(dataDir) {
+    return parseRuntimeEnvFile(dataDir);
+}
+function cleanEnv(env) {
+    const out = {};
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === 'string')
+            out[key] = value;
+    }
+    return out;
+}
+function captureRuntimeEnv(cfg) {
+    const keys = [...COMMON_RUNTIME_ENV_KEYS, ...(RUNTIME_ENV_KEYS[cfg.runtime] || [])];
+    const seen = new Set();
+    const lines = [
+        '# Generated by atel connect. Contains runtime model credentials/env needed by companion.',
+        '# Keep this file private.',
+    ];
+    const captured = [];
+    for (const key of keys) {
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        const value = process.env[key];
+        if (!value || !value.trim())
+            continue;
+        lines.push(`${key}=${shellQuoteEnv(value)}`);
+        captured.push(key);
+    }
+    if (cfg.runtime === 'gemini-cli' && !captured.includes('GEMINI_CLI_TRUST_WORKSPACE')) {
+        lines.push('GEMINI_CLI_TRUST_WORKSPACE="true"');
+        captured.push('GEMINI_CLI_TRUST_WORKSPACE');
+    }
+    if (cfg.runtime === 'hermes' && !captured.includes('ATEL_HERMES_MODEL')) {
+        lines.push('ATEL_HERMES_MODEL="gpt-5.5"');
+        captured.push('ATEL_HERMES_MODEL');
+    }
+    if (captured.length === 0)
+        return [];
+    fs.mkdirSync(cfg.dataDir, { recursive: true });
+    fs.writeFileSync(runtimeEnvPath(cfg.dataDir), `${lines.join('\n')}\n`, { mode: 0o600 });
+    return captured;
+}
+function runtimeEnvReadiness(cfg) {
+    const env = { ...loadRuntimeEnv(cfg.dataDir), ...process.env };
+    if (cfg.runtime === 'claude-code') {
+        return {
+            ok: !!(env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY),
+            detail: env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY ? 'Claude 模型凭据已可用' : '缺 ANTHROPIC_AUTH_TOKEN/ANTHROPIC_API_KEY',
+        };
+    }
+    if (cfg.runtime === 'gemini-cli') {
+        return {
+            ok: !!env.GEMINI_API_KEY,
+            detail: env.GEMINI_API_KEY ? 'Gemini 模型凭据已可用' : '缺 GEMINI_API_KEY',
+        };
+    }
+    if (cfg.runtime === 'qwen-agent') {
+        return {
+            ok: !!(env.ATEL_QWEN_API_KEY || env.OPENAI_API_KEY || env.DASHSCOPE_API_KEY),
+            detail: env.ATEL_QWEN_API_KEY || env.OPENAI_API_KEY || env.DASHSCOPE_API_KEY ? 'Qwen 模型凭据已可用' : '缺 ATEL_QWEN_API_KEY/OPENAI_API_KEY/DASHSCOPE_API_KEY',
+        };
+    }
+    return { ok: true, detail: fs.existsSync(runtimeEnvPath(cfg.dataDir)) ? `已保存 ${runtimeEnvPath(cfg.dataDir)}` : '无需额外 runtime env' };
+}
 // 身份绑定在 data-dir(identity.json),与 --name 无关。返回 reused 让 cmdInstall 决定
 // 是否对"复用 + 传了 --name"硬闸(A2:避免静默把同一 DID 改名)。
 function ensureIdentity(cfg) {
@@ -182,6 +301,12 @@ function reconcileOpenclawIdentity(cfg) {
     return 'none'; // 已是同一身份
 }
 const VALID_CAPABILITIES = ['coding', 'writing', 'translation', 'art', 'data', 'automation'];
+function parseCapabilities(value) {
+    return (value || 'writing')
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
 // A6:拒绝文档占位符 / 空 / 非法 capability,避免 <CODEX>、<coding,writing> 被字面注册。
 function validateInputs(flags) {
     const name = flags['name'];
@@ -285,9 +410,7 @@ function interactiveMcpConfigured(runtime) {
 }
 function writeSkill(cfg, adapter) {
     try {
-        // SKILL.md 随 runtime-core 包发布
-        const src = require.resolve('@atel-ai/runtime-core/skill/SKILL.md');
-        const skillBody = fs.readFileSync(src, 'utf8');
+        const skillBody = readPackagedSkill();
         const dest = path.join(cfg.dataDir, 'SKILL.md');
         fs.writeFileSync(dest, skillBody);
         log(`📖 SKILL.md → ${dest}`);
@@ -306,6 +429,12 @@ function writeSkill(cfg, adapter) {
         err(`⚠️ 复制 SKILL.md 失败: ${e.message}`);
     }
 }
+function readPackagedSkill() {
+    // SKILL.md 随 runtime-core 包发布。`atel skill` 暴露这个本地副本,让 agent
+    // 在 DNS/公网不可用时仍可零网络读取接入说明。
+    const src = require.resolve('@atel-ai/runtime-core/skill/SKILL.md');
+    return fs.readFileSync(src, 'utf8');
+}
 // A8:--profile <别名> → ~/.atel/agents/<别名>,一机多 agent 各自独立 data-dir(单 agent 仍默认 ~/.atel,非破坏)。
 function profileDir(alias) {
     return path.join(os.homedir(), '.atel', 'agents', alias);
@@ -332,6 +461,12 @@ function upsertAgent(alias, e) {
     fs.mkdirSync(path.dirname(agentsRegistryPath()), { recursive: true });
     fs.writeFileSync(agentsRegistryPath(), JSON.stringify({ agents: all }, null, 2));
 }
+function removeAgent(alias) {
+    const all = readAgents();
+    delete all[alias];
+    fs.mkdirSync(path.dirname(agentsRegistryPath()), { recursive: true });
+    fs.writeFileSync(agentsRegistryPath(), JSON.stringify({ agents: all }, null, 2));
+}
 function aliasFromFlags(flags) {
     if (flags['profile'])
         return flags['profile'];
@@ -339,6 +474,29 @@ function aliasFromFlags(flags) {
         return path.basename(path.resolve(flags['data-dir']));
     return 'default';
 }
+function withConnectDefaults(flags) {
+    const out = { ...flags };
+    if (out['auto'] === 'true' || out['auto'] === '1') {
+        delete out['auto'];
+    }
+    if (!out['profile'] && !out['data-dir']) {
+        out['profile'] = out['runtime'] || process.env.ATEL_RUNTIME || 'default';
+    }
+    return out;
+}
+function singleAgentDataDirOrNull() {
+    const all = readAgents();
+    const entries = Object.values(all);
+    if (entries.length === 1 && entries[0]?.dataDir)
+        return entries[0].dataDir;
+    return null;
+}
+function describeProfileSelectionError() {
+    const aliases = Object.keys(readAgents());
+    if (aliases.length === 0)
+        return '本机还没有 ATEL profile,请先跑 atel connect。';
+    return `本机有多个 ATEL profile: ${aliases.join(', ')}。请加 --profile <别名> 或 --agent <别名>。`;
+}
 // --agent <alias> 把后续命令(whoami/doctor)解析到该 agent 的 data-dir。
 function resolveDataDir(flags) {
     if (flags['agent']) {
@@ -348,6 +506,14 @@ function resolveDataDir(flags) {
         err(`❌ agents.json 里没有 alias "${flags['agent']}"。用 \`atel-agent list\` 看已有的。`);
         process.exit(1);
     }
+    if (!flags['profile'] && !flags['data-dir']) {
+        const legacy = path.join(os.homedir(), '.atel');
+        if (fs.existsSync(configPath(legacy)))
+            return legacy;
+        const only = singleAgentDataDirOrNull();
+        if (only)
+            return only;
+    }
     return dataDirFrom(flags);
 }
 // A10:扫描已知 identity 路径,非 0600 自动收紧 + 同 DID 多份私钥副本告警。
@@ -392,11 +558,13 @@ function auditIdentityPerms() {
  *   atel-mcp-openclaw 插件提供(本接入器不装)。SKILL 仅落在
  *   dataDir,普通 cwd 不自动加载 —— 所以交互态要让 agent 先读 dataDir/SKILL.md。
  */
-function printUsageModes(cfg, adapter) {
+function printUsageModes(cfg, adapter, passiveStarted = true) {
     const skillPath = path.join(cfg.dataDir, 'SKILL.md');
     log('');
     log('📌 两种使用模式(请知悉,避免"新会话里找不到 ATEL"):');
-    log('   ① 被动·自动接单:companion 守护已起,无人值守自动推进 A2A/A2B —— 这半不需要你干预。');
+    log(passiveStarted
+        ? '   ① 被动·自动接单:companion 守护已起,无人值守自动推进 A2A/A2B —— 这半不需要你干预。'
+        : `   ① 被动·自动接单:本次使用了 --no-start,companion 尚未启动。需要被动接单时运行 atel run --data-dir ${cfg.dataDir} 或重新 connect 不带 --no-start。`);
     log('   ② 主动·你自己新开会话直接用 ATEL:新会话默认不一定带上身份/工具,按 runtime:');
     if (adapter.id === 'openclaw') {
         log('      • OpenClaw:交互态 atel_* 工具由 atel-mcp-openclaw 插件提供(本接入器只装被动 companion + 身份)。');
@@ -414,7 +582,14 @@ function printUsageModes(cfg, adapter) {
 }
 function buildConfig(flags, bools, runtime) {
     const testnet = bools.has('server') || flags['env'] === 'testnet';
+    const now = new Date().toISOString();
     const base = {
+        schemaVersion: 2,
+        profile: aliasFromFlags(flags),
+        agentName: flags['name'],
+        capabilities: parseCapabilities(flags['capabilities']),
+        createdAt: now,
+        updatedAt: now,
         runtime,
         runtimeAgentId: flags['runtime-agent-id'], // A9:openclaw 多 agent 隔离(默认 main)
         dataDir: dataDirFrom(flags),
@@ -470,6 +645,25 @@ function codexHomeWritable() {
         return false;
     }
 }
+function isCodexSandbox() {
+    if (process.env.CODEX_SANDBOX_NETWORK_DISABLED || process.env.CODEX_THREAD_ID)
+        return true;
+    try {
+        const cmdline = fs.readFileSync('/proc/1/cmdline', 'utf8');
+        return /codex-linux-sandbox|bwrap/.test(cmdline);
+    }
+    catch {
+        return false;
+    }
+}
+function requireOutsideCodexSandbox(action) {
+    if (!isCodexSandbox())
+        return;
+    err(`❌ ${action} 需要访问 ATEL 远端 MCP/写宿主配置,当前正在 Codex 沙箱内执行。`);
+    err('   请让 Codex 以“沙箱外/提升权限”重跑同一条命令,或由人类在普通终端执行。');
+    err('   在 Codex 里应请求授权运行该命令,不要继续重试普通沙箱命令。');
+    process.exit(7);
+}
 async function cmdInstall(flags, bools) {
     log(`▶ @atel-ai/agent v${VERSION}`); // AC-11:打印实际版本
     validateInputs(flags); // A6:拦截文档占位符 / 空 / 非法 capability
@@ -528,12 +722,26 @@ async function cmdInstall(flags, bools) {
     }
     const cfg = buildConfig(flags, bools, adapter.id);
     saveConfig(cfg);
+    const capturedEnv = captureRuntimeEnv(cfg);
+    if (capturedEnv.length) {
+        log(`🔐 已保存 runtime 环境到 ${runtimeEnvPath(cfg.dataDir)}(${capturedEnv.join(', ')})`);
+    }
     // 双身份统一(openclaw):被动 companion 必须与插件交互用**同一个 DID** —— 一个 agent 不能两个身份
     // (否则接单收益记在 onboard 的 DID、聊天里主动操作记在插件的 DID,钱/声誉算两处)。onboard 时若插件
     // 已有身份,**复用它**而不是新建。只在 data-dir 还没身份时 adopt(re-onboard 不动)。
     const preExisted = fs.existsSync(cfg.identityPath);
     const reconcile = reconcileOpenclawIdentity(cfg); // adopted(新装复用)| migrated(存量迁移)| none
     const { identity } = ensureIdentity(cfg);
+    const alias = aliasFromFlags(flags);
+    const capabilities = parseCapabilities(flags['capabilities']);
+    const existingBinding = readBinding(cfg.dataDir);
+    try {
+        assertBindingCompatible(existingBinding, { profile: alias, runtime: cfg.runtime, did: identity.did });
+    }
+    catch (e) {
+        err(`❌ 身份绑定冲突:${e.message}`);
+        process.exit(1);
+    }
     // A2:真 re-onboard(已有**同一**身份)+ 传 --name → 硬闸,避免静默改名。迁移(身份已换成插件的)不触发。
     if (preExisted && reconcile !== 'migrated') {
         log(`♻️ 复用 data-dir(${cfg.dataDir})已有身份 ${identity.did}`);
@@ -589,10 +797,6 @@ async function cmdInstall(flags, bools) {
     }
     // 注册/更新本 agent 到 registry(可被发现 + 可作为 A2A 接活方/雇主目标)
     if (flags['name']) {
-        const capabilities = (flags['capabilities'] || 'writing')
-            .split(',')
-            .map((s) => s.trim())
-            .filter(Boolean);
         try {
             const r = await registryRemoteRegister(cfg.platformBaseUrl, jwt, {
                 name: flags['name'],
@@ -616,6 +820,25 @@ async function cmdInstall(flags, bools) {
     else {
         log('ℹ️ 未传 --name,跳过 registry 注册(仅主动调工具不需要;要被搜到/当接活方目标则需注册)');
     }
+    const now = new Date().toISOString();
+    writeBinding(cfg.dataDir, {
+        schemaVersion: 1,
+        profile: alias,
+        runtime: cfg.runtime,
+        runtimeAgentId: cfg.runtimeAgentId,
+        did: identity.did,
+        agentName: flags['name'],
+        capabilities,
+        runtimeFingerprint: {
+            version: chosen.result.version,
+            binPath: chosen.result.binPath,
+        },
+        machineFingerprint: machineFingerprint(),
+        createdAt: existingBinding?.createdAt || now,
+        updatedAt: now,
+        lastVerifiedAt: now,
+    });
+    log(`🔗 身份绑定已写入 ${bindingPath(cfg.dataDir)}`);
     writeSkill(cfg, adapter);
     // 一次性安装步骤(如 hermes 必须 mcp add 启用工具)
     if (adapter.onInstall) {
@@ -636,11 +859,13 @@ async function cmdInstall(flags, bools) {
     // 否则同一个 DID 有两个 relay 消费者(插件 listener + 我的 companion),订单会被随机分走/重复 ack。
     const openclawPluginActive = cfg.runtime === 'openclaw'
         && fs.existsSync(path.join(os.homedir(), '.openclaw', 'extensions', 'atel-mcp-openclaw'));
+    let passiveStarted = true;
     if (openclawPluginActive) {
         log('   OpenClaw 被动接单由 atel-mcp-openclaw 插件 listener 负责(DID-Sig,已确保在跑)。');
         log('   ✅ 不另起 companion —— 避免同一 DID 两个消费者抢同一 relay 队列(被动与交互统一一个身份)。');
     }
     else if (bools.has('no-start')) {
+        passiveStarted = false;
         log(`   (--no-start)请自行启动并守护: npx @atel-ai/agent run --data-dir ${cfg.dataDir}`);
     }
     else {
@@ -650,15 +875,23 @@ async function cmdInstall(flags, bools) {
         }
     }
     // A8:写入 ~/.atel/agents.json 映射(供 `atel-agent list` / `--agent <alias>`)。
-    upsertAgent(aliasFromFlags(flags), {
+    const existingAgent = readAgents()[alias];
+    upsertAgent(alias, {
+        schemaVersion: 2,
+        profile: alias,
         did: identity.did,
         runtime: cfg.runtime,
         runtimeAgentId: cfg.runtimeAgentId,
+        name: flags['name'] || existingAgent?.name,
+        capabilities,
         dataDir: cfg.dataDir,
+        identityPath: cfg.identityPath,
+        bindingPath: bindingPath(cfg.dataDir),
         service: systemdUnitName(cfg.dataDir),
+        createdAt: existingAgent?.createdAt || now,
         updatedAt: new Date().toISOString(),
     });
-    printUsageModes(cfg, adapter);
+    printUsageModes(cfg, adapter, passiveStarted);
 }
 /**
  * 收单回路自检(②):平台能不能把订单真的投递给本 agent?
@@ -670,7 +903,7 @@ async function cmdInstall(flags, bools) {
  * 探针 → 用 companion 同款的 relayPoll 取回 → ack。取不回 = 收单回路不通,当场报红。
  */
 async function checkReceivePath(platformBaseUrl, identity) {
-    const nonce = `doctor-probe-${globalThis.crypto.randomUUID()}`;
+    const nonce = `doctor-probe-${crypto.randomUUID()}`;
     const send = await postSigned(platformBaseUrl, '/relay/v1/send', identity, { target: identity.did, message: { kind: 'delivery_probe', nonce } }, 'relay/send');
     if (!send.ok)
         return { ok: false, detail: `探针发送失败 HTTP ${send.status}: ${send.body.slice(0, 120)}` };
@@ -698,11 +931,16 @@ async function checkReceivePath(platformBaseUrl, identity) {
 }
 async function cmdDoctor(flags, bools) {
     const dataDir = resolveDataDir(flags); // 支持 --agent <alias>
+    Object.assign(process.env, loadRuntimeEnv(dataDir));
     const cfg = loadConfig(dataDir);
     if (!cfg) {
         err('❌ 未找到配置,先跑 install。');
         process.exit(1);
     }
+    if (bools.has('json')) {
+        await cmdDoctorJson(dataDir, cfg, bools);
+        return;
+    }
     let allGreen = true;
     let anyYellow = false;
     // AC-16:把检查归到 6 大接入面,末尾给"完整接入"硬门。worst-status wins(红>黄>绿)。
@@ -737,6 +975,18 @@ async function cmdDoctor(flags, bools) {
     if (!identity) {
         process.exit(1);
     }
+    const binding = readBinding(dataDir);
+    if (!binding) {
+        softCheck(false, '身份绑定(binding.json)', `缺 ${bindingPath(dataDir)} —— 旧安装可用,但产品级强绑定需要重新 connect`, '身份绑定');
+    }
+    else if (binding.did !== identity.did || binding.runtime !== cfg.runtime) {
+        check(false, '身份绑定(binding.json)', `不一致:binding did=${binding.did},runtime=${binding.runtime};当前 did=${identity.did},runtime=${cfg.runtime}`, '身份绑定');
+    }
+    else {
+        softCheck(true, '身份绑定(binding.json)', `profile=${binding.profile},runtime=${binding.runtime},did=${binding.did}`, '身份绑定');
+    }
+    const envReady = runtimeEnvReadiness(cfg);
+    softCheck(envReady.ok, '模型环境(runtime.env)', envReady.detail, '模型环境');
     // 适配器在场
     const adapter = getAdapter(cfg.runtime);
     let det = adapter ? await adapter.detect() : { present: false };
@@ -883,6 +1133,99 @@ async function cmdDoctor(flags, bools) {
         ? '✅ 完整接入成功(被动接单 + 交互态新会话都就绪)。'
         : '🟢 核心通过(被动接单可用);⚠️ 交互态见上方 🟡 —— 自己开新会话用 ATEL 需按提示处理。');
 }
+async function cmdDoctorJson(dataDir, cfg, bools) {
+    const checks = {};
+    let ok = true;
+    let identity = null;
+    try {
+        identity = loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8')));
+        checks.identity = { ok: true, did: identity.did, identityPath: cfg.identityPath };
+    }
+    catch (e) {
+        ok = false;
+        checks.identity = { ok: false, error: e.message, identityPath: cfg.identityPath };
+    }
+    const binding = readBinding(dataDir);
+    checks.binding = {
+        ok: !!binding && !!identity && binding.did === identity.did && binding.runtime === cfg.runtime,
+        path: bindingPath(dataDir),
+        binding,
+    };
+    if (!checks.binding.ok)
+        ok = false;
+    const envReady = runtimeEnvReadiness(cfg);
+    checks.runtimeEnv = envReady;
+    if (!envReady.ok)
+        ok = false;
+    const adapter = getAdapter(cfg.runtime);
+    let det = null;
+    try {
+        det = adapter ? await adapter.detect() : null;
+        checks.adapter = { ok: !!adapter && !!det?.present, runtime: cfg.runtime, detect: det };
+        if (!adapter || !det?.present)
+            ok = false;
+    }
+    catch (e) {
+        ok = false;
+        checks.adapter = { ok: false, runtime: cfg.runtime, error: e.message };
+    }
+    if (identity) {
+        try {
+            const r = await spineIdentityVerify(cfg.spineBaseUrl, identity);
+            checks.jwt = { ok: !!r.token, expiresAt: new Date(r.expiresAt).toISOString() };
+            if (!r.token)
+                ok = false;
+        }
+        catch (e) {
+            ok = false;
+            checks.jwt = { ok: false, error: e.message };
+        }
+        try {
+            const b = await spineWalletBalance(cfg.spineBaseUrl, identity);
+            checks.balance = { ok: b.ok, status: b.status, json: b.json };
+            if (!b.ok)
+                ok = false;
+        }
+        catch (e) {
+            ok = false;
+            checks.balance = { ok: false, error: e.message };
+        }
+        try {
+            const rp = await checkReceivePath(cfg.platformBaseUrl, identity);
+            checks.receivePath = rp;
+            if (!rp.ok)
+                ok = false;
+        }
+        catch (e) {
+            ok = false;
+            checks.receivePath = { ok: false, detail: e.message };
+        }
+        if (bools.has('probe') && adapter && det?.present) {
+            try {
+                const waker = adapter.createWaker({ config: cfg, identity, log: () => { } });
+                const res = await waker.wake({ prompt: '调用 ATEL MCP 工具 atel_whoami,只回复返回的 did 字符串本身,别的都不要说。' });
+                checks.agentProbe = { ok: (res.output || '').includes(identity.did), output: res.output, error: res.error, durationMs: res.durationMs };
+                if (!checks.agentProbe.ok)
+                    ok = false;
+            }
+            catch (e) {
+                ok = false;
+                checks.agentProbe = { ok: false, error: e.message };
+            }
+        }
+    }
+    checks.companion = companionStatus(dataDir);
+    const result = {
+        ok,
+        profile: cfg.profile || path.basename(dataDir),
+        runtime: cfg.runtime,
+        dataDir,
+        checks,
+    };
+    log(JSON.stringify(result, null, 2));
+    if (!ok)
+        process.exit(1);
+}
 /** onboard = install + 后台起 companion(一步到位,喂给 agent 一句话即可)。 */
 async function cmdOnboard(flags, bools) {
     // cmdInstall 末尾已 superviseCompanion 守护 companion(systemd --user 或 detached)。
@@ -890,23 +1233,71 @@ async function cmdOnboard(flags, bools) {
     await cmdInstall(flags, bools);
     const dataDir = dataDirFrom(flags);
     log('');
-    log('🚀 onboard 完成:companion 已守护启动,正在无人值守自动推进 A2A/A2B。');
+    if (bools.has('no-start')) {
+        log('🚀 onboard 完成:本次 --no-start,companion 未启动。');
+    }
+    else {
+        log('🚀 onboard 完成:companion 已守护启动,正在无人值守自动推进 A2A/A2B。');
+    }
     log(`   日志:${path.join(dataDir, 'companion.log')}`);
     log(`   状态:systemctl --user status 'atel-agent*'  或  ps aux | grep "run.*${dataDir}"`);
 }
+async function cmdConnect(flags, bools) {
+    const next = withConnectDefaults(flags);
+    if (bools.has('auto') && !next['runtime']) {
+        const caller = detectCallerRuntime();
+        if (!caller) {
+            err('❌ --auto 无法判断当前 runtime。');
+            err('   请明确选择一个 runtime 重跑:');
+            for (const a of ADAPTERS) {
+                const profile = a.id === 'claude-code' ? 'claude'
+                    : a.id === 'gemini-cli' ? 'gemini'
+                        : a.id === 'qwen-agent' ? 'qwen'
+                            : a.id;
+                err(`   atel connect --runtime ${a.id} --profile ${profile} --name "${next['name'] || 'my-agent'}" --capabilities ${next['capabilities'] || 'writing'}`);
+            }
+            process.exit(1);
+        }
+        next['runtime'] = caller;
+    }
+    if (bools.has('auto') && !flags['profile'] && !flags['data-dir'] && next['runtime']) {
+        next['profile'] = next['runtime'] === 'claude-code' ? 'claude'
+            : next['runtime'] === 'gemini-cli' ? 'gemini'
+                : next['runtime'] === 'qwen-agent' ? 'qwen'
+                    : next['runtime'];
+    }
+    await cmdOnboard(next, bools);
+}
 /** companion 自报 pid 的文件:cmdRun(companion 本体)写入,doctor 读它判活。 */
 function companionPidPath(dataDir) {
     return path.join(dataDir, 'companion.pid');
 }
 /** 后台拉起 companion(detached,父进程退出后存活;跨平台,不依赖 systemd)。 */
+function waitForCompanionRunning(dataDir, expectedPid) {
+    for (let i = 0; i < 20; i++) {
+        const st = companionStatus(dataDir);
+        if (st.state === 'running' && (!expectedPid || st.pid === expectedPid))
+            return;
+        try {
+            execFileSync('sleep', ['0.25'], { stdio: 'ignore' });
+        }
+        catch { /* ignore */ }
+    }
+    const st = companionStatus(dataDir);
+    throw new Error(`companion 未保持运行:${st.detail}`);
+}
 function startCompanionDetached(dataDir) {
     const logPath = path.join(dataDir, 'companion.log');
     fs.mkdirSync(dataDir, { recursive: true });
     const out = fs.openSync(logPath, 'a');
     const cli = resolveStableCliPath(); // 不能把 npx 临时缓存路径喂给长期 detached 进程
-    const child = spawn(cli ? process.execPath : 'npx', cli ? [cli, 'run', '--data-dir', dataDir] : ['-y', `@atel-ai/agent@${VERSION}`, 'run', '--data-dir', dataDir], { detached: true, stdio: ['ignore', out, out], env: process.env });
+    const childEnv = { ...process.env, ...loadRuntimeEnv(dataDir) };
+    const child = spawn(cli ? process.execPath : 'npx', cli ? [cli, 'run', '--data-dir', dataDir] : ['-y', `@atel-ai/agent@${VERSION}`, 'run', '--data-dir', dataDir], { detached: true, stdio: ['ignore', out, out], env: childEnv });
     child.unref();
     log(`▶️ companion 后台运行 pid=${child.pid}`);
+    if (!child.pid)
+        throw new Error('companion 子进程未返回 pid');
+    return child.pid;
 }
 /**
  * 让 companion 无人值守长活。Linux 上装 systemd --user 单元(Restart=always,崩溃/
@@ -917,16 +1308,19 @@ function startCompanionDetached(dataDir) {
  * 重启带走 companion 后再没收单。守护是收单可靠性的前提,不能依赖人记得做。
  */
 function superviseCompanion(dataDir) {
+    requireOutsideCodexSandbox('启动 ATEL companion');
     if (process.platform === 'linux' && hasSystemctlUser()) {
         try {
             installSystemdUserUnit(dataDir);
+            waitForCompanionRunning(dataDir);
             return 'systemd';
         }
         catch (e) {
             err(`⚠️ systemd 守护安装失败(${e.message}),回退后台进程。`);
         }
     }
-    startCompanionDetached(dataDir);
+    const pid = startCompanionDetached(dataDir);
+    waitForCompanionRunning(dataDir, pid);
     return 'detached';
 }
 /**
@@ -1015,6 +1409,37 @@ async function cmdMcp(flags) {
     await runMcpShim(dataDir, VERSION);
     await new Promise(() => { }); // 保活(stdio server 由宿主 CLI 生命周期驱动)
 }
+async function withLocalMcp(dataDir, fn) {
+    requireOutsideCodexSandbox('ATEL MCP 工具调用');
+    const launcher = mcpLauncher(dataDir);
+    const transport = new StdioClientTransport({
+        command: launcher.command,
+        args: launcher.args,
+        env: { ...cleanEnv(process.env), ...loadRuntimeEnv(dataDir) },
+        cwd: dataDir,
+        stderr: 'pipe',
+    });
+    let stderr = '';
+    transport.stderr?.on('data', (d) => {
+        stderr += d.toString();
+    });
+    const client = new Client({ name: 'atel-cli-probe', version: VERSION }, { capabilities: {} });
+    try {
+        await client.connect(transport);
+        return await fn(client);
+    }
+    catch (e) {
+        const detail = stderr.trim();
+        const msg = e.message;
+        const hint = /Connection closed|ECONN|fetch failed|network/i.test(`${msg}\n${detail}`) && isCodexSandbox()
+            ? '\n提示:当前在 Codex 沙箱内,请授权沙箱外执行同一条 atel 命令。'
+            : '';
+        throw new Error(`${msg}${hint}${detail ? `\nMCP stderr:\n${detail.slice(-1500)}` : ''}`);
+    }
+    finally {
+        await client.close().catch(() => { });
+    }
+}
 function installSystemdUserUnit(dataDir) {
     const unitName = systemdUnitName(dataDir);
     const unitDir = path.join(os.homedir(), '.config', 'systemd', 'user');
@@ -1029,6 +1454,7 @@ function installSystemdUserUnit(dataDir) {
         }
     }
     const logPath = path.join(dataDir, 'companion.log');
+    const envPath = runtimeEnvPath(dataDir);
     const cliPath = resolveStableCliPath(); // 不能把 npx 临时缓存路径写进 systemd 单元
     // systemd 默认 PATH 很窄(/usr/bin:/bin),companion 要 spawn 底座 CLI(openclaw/claude/
     // codex/gemini/hermes)就会 ENOENT(2026-06-12 BigBaby:openclaw 在 pnpm 全局 bin,不在
@@ -1051,6 +1477,7 @@ function installSystemdUserUnit(dataDir) {
         '[Service]',
         'Type=simple',
         `Environment=PATH=${fullPath}`,
+        `EnvironmentFile=-${envPath}`,
         `ExecStart=${cliPath ? `${process.execPath} ${cliPath}` : `npx -y @atel-ai/agent@${VERSION}`} run --data-dir ${dataDir}`,
         'Restart=always',
         'RestartSec=5',
@@ -1077,6 +1504,7 @@ function installSystemdUserUnit(dataDir) {
 }
 async function cmdRun(flags) {
     const dataDir = dataDirFrom(flags);
+    Object.assign(process.env, loadRuntimeEnv(dataDir));
     const cfg = loadConfig(dataDir);
     if (!cfg) {
         err('❌ 未找到配置,先跑 install。');
@@ -1137,6 +1565,306 @@ function cmdUpdate() {
         process.exit(1);
     }
 }
+async function rewriteRuntimeConfig(dataDir) {
+    Object.assign(process.env, loadRuntimeEnv(dataDir));
+    const cfg = loadConfig(dataDir);
+    if (!cfg)
+        throw new Error('未找到 config.json');
+    const adapter = getAdapter(cfg.runtime);
+    if (!adapter)
+        throw new Error(`未知 runtime ${cfg.runtime}`);
+    const identity = loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8')));
+    const auth = new AuthManager(identity, cfg.spineBaseUrl, {
+        onToken: (token) => adapter.writeMcpConfig({ mcpUrl: cfg.mcpUrl, token, identity, config: cfg, mcpCommand: mcpLauncher(cfg.dataDir) }),
+        log,
+    });
+    await auth.start();
+    auth.stop();
+    writeSkill(cfg, adapter);
+}
+async function cmdRepair(flags) {
+    const dataDir = resolveDataDir(flags);
+    try {
+        await rewriteRuntimeConfig(dataDir);
+        log('🟢 repair 完成:MCP 配置与 SKILL 已重写。');
+    }
+    catch (e) {
+        err(`❌ repair 失败:${e.message}`);
+        process.exit(1);
+    }
+}
+function removeTomlSection(file, section, mustContain) {
+    let content = '';
+    try {
+        content = fs.readFileSync(file, 'utf8');
+    }
+    catch {
+        return false;
+    }
+    const header = `[${section}]`;
+    const lines = content.split(/\r?\n/);
+    const out = [];
+    let changed = false;
+    for (let i = 0; i < lines.length;) {
+        if (lines[i].trim() === header) {
+            let j = i + 1;
+            while (j < lines.length && !/^\[.+\]\s*$/.test(lines[j].trim()))
+                j++;
+            const block = lines.slice(i, j).join('\n');
+            if (!mustContain || block.includes(mustContain)) {
+                changed = true;
+                i = j;
+                continue;
+            }
+        }
+        out.push(lines[i++]);
+    }
+    if (changed)
+        fs.writeFileSync(file, out.join('\n').replace(/\n{3,}/g, '\n\n'));
+    return changed;
+}
+function removeJsonMcpServer(file, serverName, mustContain) {
+    let j = {};
+    try {
+        j = JSON.parse(fs.readFileSync(file, 'utf8'));
+    }
+    catch {
+        return false;
+    }
+    const server = j.mcpServers?.[serverName];
+    if (!server)
+        return false;
+    if (mustContain && !JSON.stringify(server).includes(mustContain))
+        return false;
+    delete j.mcpServers[serverName];
+    fs.writeFileSync(file, JSON.stringify(j, null, 2));
+    return true;
+}
+function removeYamlMcpServer(file, serverName, mustContain) {
+    let lines;
+    try {
+        lines = fs.readFileSync(file, 'utf8').split(/\r?\n/);
+    }
+    catch {
+        return false;
+    }
+    const parent = lines.findIndex((line) => line.trim() === 'mcp_servers:');
+    if (parent < 0)
+        return false;
+    let serverStart = -1;
+    for (let i = parent + 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (line && !line.startsWith(' ') && !line.startsWith('\t'))
+            break;
+        if (new RegExp(`^\\s{2}${serverName}:\\s*$`).test(line)) {
+            serverStart = i;
+            break;
+        }
+    }
+    if (serverStart < 0)
+        return false;
+    let serverEnd = lines.length;
+    for (let i = serverStart + 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (line && !line.startsWith(' ') && !line.startsWith('\t')) {
+            serverEnd = i;
+            break;
+        }
+        if (/^\s{2}\S[^:]*:\s*$/.test(line)) {
+            serverEnd = i;
+            break;
+        }
+    }
+    const block = lines.slice(serverStart, serverEnd).join('\n');
+    if (mustContain && !block.includes(mustContain))
+        return false;
+    const next = [...lines.slice(0, serverStart), ...lines.slice(serverEnd)];
+    let parentStillHasChild = false;
+    for (let i = parent + 1; i < next.length; i++) {
+        const line = next[i];
+        if (!line.trim() || line.trim().startsWith('#'))
+            continue;
+        if (!line.startsWith(' ') && !line.startsWith('\t'))
+            break;
+        if (/^\s{2}\S[^:]*:/.test(line)) {
+            parentStillHasChild = true;
+            break;
+        }
+    }
+    if (!parentStillHasChild)
+        next.splice(parent, 1);
+    fs.writeFileSync(file, next.join('\n').replace(/\n{3,}/g, '\n\n'));
+    return true;
+}
+function removeRuntimeMcpConfig(cfg) {
+    const removed = [];
+    const marker = cfg.dataDir;
+    if (cfg.runtime === 'codex') {
+        const f = path.join(os.homedir(), '.codex', 'config.toml');
+        if (removeTomlSection(f, 'mcp_servers.atel', marker))
+            removed.push(f);
+    }
+    else if (cfg.runtime === 'claude-code') {
+        const global = path.join(os.homedir(), '.claude.json');
+        const local = path.join(cfg.dataDir, 'claude-mcp.json');
+        if (removeJsonMcpServer(global, 'atel', marker))
+            removed.push(global);
+        if (fs.existsSync(local)) {
+            fs.rmSync(local, { force: true });
+            removed.push(local);
+        }
+    }
+    else if (cfg.runtime === 'gemini-cli') {
+        const f = path.join(os.homedir(), '.gemini', 'settings.json');
+        if (removeJsonMcpServer(f, 'atel', marker))
+            removed.push(f);
+    }
+    else if (cfg.runtime === 'qwen-agent') {
+        const f = path.join(cfg.dataDir, 'qwen-mcp.json');
+        if (fs.existsSync(f)) {
+            fs.rmSync(f, { force: true });
+            removed.push(f);
+        }
+    }
+    else if (cfg.runtime === 'hermes') {
+        const token = path.join(cfg.dataDir, 'hermes-mcp-token.txt');
+        const envPath = path.join(os.homedir(), '.hermes', '.env');
+        const yamlPath = path.join(os.homedir(), '.hermes', 'config.yaml');
+        if (fs.existsSync(token)) {
+            fs.rmSync(token, { force: true });
+            removed.push(token);
+        }
+        if (removeYamlMcpServer(yamlPath, 'atel', cfg.mcpUrl))
+            removed.push(yamlPath);
+        try {
+            let s = fs.readFileSync(envPath, 'utf8');
+            if (s.includes('MCP_ATEL_API_KEY=')) {
+                s = s.split(/\r?\n/).filter((line) => !line.startsWith('MCP_ATEL_API_KEY=')).join('\n');
+                fs.writeFileSync(envPath, `${s.replace(/\n*$/, '')}\n`);
+                removed.push(envPath);
+            }
+        }
+        catch { /* ignore */ }
+    }
+    else if (cfg.runtime === 'openclaw') {
+        const f = path.join(os.homedir(), '.openclaw', 'openclaw.json');
+        if (removeJsonMcpServer(f, 'atel', cfg.mcpUrl))
+            removed.push(f);
+    }
+    return removed;
+}
+async function cmdDisconnect(flags, bools) {
+    const dataDir = resolveDataDir(flags);
+    const cfg = loadConfig(dataDir);
+    if (!cfg) {
+        err('❌ 未找到配置。');
+        process.exit(1);
+    }
+    stopCompanion(dataDir);
+    const removedConfigs = removeRuntimeMcpConfig(cfg);
+    const alias = cfg.profile || aliasFromFlags(flags);
+    removeAgent(alias);
+    if (bools.has('delete-data')) {
+        fs.rmSync(dataDir, { recursive: true, force: true });
+        log(`🟡 已断开并删除 profile 数据:${dataDir}`);
+    }
+    else {
+        log(`🟡 已断开 profile=${alias};身份文件仍保留在 ${dataDir}`);
+        log('   如需删除本地身份与配置,重跑: atel disconnect --profile <profile> --delete-data');
+    }
+    if (removedConfigs.length)
+        log(`   已移除 runtime MCP 配置:${removedConfigs.join(', ')}`);
+}
+async function cmdUninstall(flags, bools) {
+    if (flags['profile'] || flags['agent'] || flags['data-dir']) {
+        await cmdDisconnect(flags, new Set([...bools, 'delete-data']));
+        return;
+    }
+    if (!bools.has('confirm')) {
+        err('❌ 这会删除本机 ~/.atel 下的 ATEL profiles。确认请加 --confirm。');
+        process.exit(1);
+    }
+    const all = readAgents();
+    for (const e of Object.values(all))
+        stopCompanion(e.dataDir);
+    fs.rmSync(path.join(os.homedir(), '.atel'), { recursive: true, force: true });
+    log('🟡 已删除 ~/.atel 本地数据。全局 atel 程序请用 npm uninstall -g @atel-ai/agent 或安装器卸载。');
+}
+function stopCompanion(dataDir) {
+    const unit = systemdUnitName(dataDir);
+    const env = userSystemctlEnv();
+    try {
+        execFileSync('systemctl', ['--user', 'stop', unit], { stdio: 'ignore', timeout: 10_000, env });
+    }
+    catch { /* not systemd or not running */ }
+    const st = companionStatus(dataDir);
+    if (st.pid) {
+        try {
+            process.kill(st.pid, 'SIGTERM');
+        }
+        catch { /* already gone */ }
+    }
+    try {
+        fs.rmSync(companionPidPath(dataDir), { force: true });
+    }
+    catch { /* ignore */ }
+}
+function cmdService(flags, positionals) {
+    const action = positionals[0] || 'status';
+    const dataDir = resolveDataDir(flags);
+    const cfg = loadConfig(dataDir);
+    if (!cfg) {
+        err('❌ 未找到配置,先跑 connect。');
+        process.exit(1);
+    }
+    if (action === 'status') {
+        const s = companionStatus(dataDir);
+        log(`${s.state === 'running' ? '🟢' : s.state === 'stale' ? '🔴' : '🟡'} companion ${s.state} — ${s.detail}`);
+        log(`   service=${s.service}`);
+        log(`   log=${path.join(dataDir, 'companion.log')}`);
+        return;
+    }
+    if (action === 'start') {
+        try {
+            const mode = superviseCompanion(dataDir);
+            log(`🟢 companion start requested (${mode})`);
+        }
+        catch (e) {
+            err(`❌ companion 启动失败:${e.message}`);
+            process.exit(1);
+        }
+        return;
+    }
+    if (action === 'stop') {
+        stopCompanion(dataDir);
+        log('🟡 companion stopped');
+        return;
+    }
+    if (action === 'restart') {
+        stopCompanion(dataDir);
+        try {
+            const mode = superviseCompanion(dataDir);
+            log(`🟢 companion restarted (${mode})`);
+        }
+        catch (e) {
+            err(`❌ companion 重启失败:${e.message}`);
+            process.exit(1);
+        }
+        return;
+    }
+    if (action === 'logs' || action === 'log') {
+        const logPath = path.join(dataDir, 'companion.log');
+        if (!fs.existsSync(logPath)) {
+            log(`(暂无日志 ${logPath})`);
+            return;
+        }
+        const out = execFileSync('tail', ['-n', flags['lines'] || '80', logPath], { encoding: 'utf8' });
+        process.stdout.write(out);
+        return;
+    }
+    err(`❌ 未知 service 子命令:${action}。可用: status/start/stop/restart/logs`);
+    process.exit(1);
+}
 function cmdList() {
     const all = readAgents();
     const aliases = Object.keys(all);
@@ -1147,7 +1875,75 @@ function cmdList() {
     log('本机 ATEL agents:');
     for (const a of aliases) {
         const e = all[a];
-        log(`  • ${a}  ${e.did}  [${e.runtime}${e.runtimeAgentId ? '/' + e.runtimeAgentId : ''}]  dataDir=${e.dataDir}`);
+        const name = e.name ? `  name=${e.name}` : '';
+        const caps = e.capabilities?.length ? `  capabilities=${e.capabilities.join(',')}` : '';
+        log(`  • ${a}  ${e.did}  [${e.runtime}${e.runtimeAgentId ? '/' + e.runtimeAgentId : ''}]${name}${caps}  dataDir=${e.dataDir}`);
+    }
+}
+function companionStatus(dataDir) {
+    const service = systemdUnitName(dataDir);
+    const pidPath = companionPidPath(dataDir);
+    if (!fs.existsSync(pidPath))
+        return { state: 'stopped', detail: '无 companion.pid', service };
+    const pid = parseInt(fs.readFileSync(pidPath, 'utf8').trim(), 10);
+    if (!Number.isFinite(pid))
+        return { state: 'stale', detail: `pid 文件无效:${pidPath}`, service };
+    try {
+        process.kill(pid, 0);
+        return { state: 'running', detail: `pid=${pid}`, pid, service };
+    }
+    catch (e) {
+        if (e.code === 'EPERM')
+            return { state: 'running', detail: `pid=${pid}(EPERM)`, pid, service };
+        return { state: 'stale', detail: `pid=${pid} 已退出`, pid, service };
+    }
+}
+function statusFor(dataDir) {
+    const cfg = loadConfig(dataDir);
+    const binding = readBinding(dataDir);
+    let did = '';
+    try {
+        if (cfg && fs.existsSync(cfg.identityPath))
+            did = loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8'))).did;
+    }
+    catch { /* ignore */ }
+    const svc = companionStatus(dataDir);
+    return {
+        ok: !!cfg && !!did && !!binding && binding.did === did && binding.runtime === cfg.runtime,
+        profile: cfg?.profile || binding?.profile || path.basename(dataDir),
+        runtime: cfg?.runtime || binding?.runtime || null,
+        did: did || binding?.did || null,
+        dataDir,
+        binding: binding ? 'present' : 'missing',
+        companion: svc.state,
+        companionDetail: svc.detail,
+        service: svc.service,
+    };
+}
+function cmdStatus(flags, bools) {
+    if (flags['profile'] || flags['data-dir'] || flags['agent']) {
+        const s = statusFor(resolveDataDir(flags));
+        if (bools.has('json'))
+            log(JSON.stringify(s, null, 2));
+        else {
+            log(`${s.ok ? '🟢' : '🟡'} ${s.profile} [${s.runtime}] ${s.did || '(no did)'}`);
+            log(`   dataDir=${s.dataDir}`);
+            log(`   binding=${s.binding}, companion=${s.companion} (${s.companionDetail})`);
+        }
+        return;
+    }
+    const all = readAgents();
+    const statuses = Object.values(all).map((e) => statusFor(e.dataDir));
+    if (bools.has('json')) {
+        log(JSON.stringify({ agents: statuses }, null, 2));
+        return;
+    }
+    if (!statuses.length) {
+        log('(还没有 agent;用 atel connect --runtime <id> --profile <profile> 接入)');
+        return;
+    }
+    for (const s of statuses) {
+        log(`${s.ok ? '🟢' : '🟡'} ${s.profile} [${s.runtime}] ${s.did || '(no did)'} companion=${s.companion}`);
     }
 }
 function cmdWhoami(flags) {
@@ -1160,6 +1956,386 @@ function cmdWhoami(flags) {
     const id = loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8')));
     log(id.did);
 }
+async function cmdBalance(flags) {
+    const dataDir = resolveDataDir(flags); // 支持 --agent <alias>
+    const cfg = loadConfig(dataDir);
+    if (!cfg || !fs.existsSync(cfg.identityPath)) {
+        err('❌ 未接入,先跑 connect。');
+        process.exit(1);
+    }
+    const id = loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8')));
+    try {
+        const b = await spineWalletBalance(cfg.spineBaseUrl, id);
+        if (!b.ok) {
+            err(`❌ 余额查询失败 HTTP ${b.status}: ${b.body.slice(0, 200)}`);
+            process.exit(1);
+        }
+        log(typeof b.json === 'object' ? JSON.stringify(b.json, null, 2) : String(b.body));
+    }
+    catch (e) {
+        err(`❌ 余额查询失败:${e.message}`);
+        process.exit(1);
+    }
+}
+async function cmdTools(flags, bools) {
+    const dataDir = resolveDataDir(flags);
+    if (!loadConfig(dataDir)) {
+        err('❌ 未找到配置,先跑 connect。');
+        process.exit(1);
+    }
+    const tools = await withLocalMcp(dataDir, async (client) => (await client.listTools()).tools || []);
+    if (bools.has('json')) {
+        log(JSON.stringify({ tools }, null, 2));
+        return;
+    }
+    log(`ATEL tools (${tools.length}):`);
+    for (const t of tools) {
+        const name = t.name;
+        const desc = t.description;
+        if (typeof name === 'string')
+            log(`  • ${name}${typeof desc === 'string' && desc ? ` — ${desc}` : ''}`);
+    }
+}
+async function cmdMcpProbe(flags, bools) {
+    const dataDir = resolveDataDir(flags);
+    const cfg = loadConfig(dataDir);
+    if (!cfg) {
+        err('❌ 未找到配置,先跑 connect。');
+        process.exit(1);
+    }
+    const id = fs.existsSync(cfg.identityPath)
+        ? loadIdentity(JSON.parse(fs.readFileSync(cfg.identityPath, 'utf8')))
+        : null;
+    const result = await withLocalMcp(dataDir, async (client) => {
+        const tools = (await client.listTools()).tools || [];
+        const who = await client.callTool({ name: 'atel_whoami', arguments: {} });
+        const text = JSON.stringify(who);
+        return {
+            ok: !!id && text.includes(id.did),
+            did: id?.did || null,
+            toolCount: tools.length,
+            hasWhoami: tools.some((t) => t.name === 'atel_whoami'),
+            whoami: who,
+        };
+    });
+    if (bools.has('json')) {
+        log(JSON.stringify(result, null, 2));
+        return;
+    }
+    if (!result.ok) {
+        err(`🔴 MCP probe 失败: whoami 未返回当前 DID ${result.did || '(unknown)'}`);
+        process.exit(1);
+    }
+    log(`🟢 MCP probe 通过 — tools=${result.toolCount}, did=${result.did}`);
+}
+function parseJsonArg(flags) {
+    const raw = flags['args'] || flags['json-args'] || '{}';
+    if (raw.startsWith('@')) {
+        return JSON.parse(fs.readFileSync(raw.slice(1), 'utf8'));
+    }
+    return JSON.parse(raw);
+}
+const READONLY_TOOLS = new Set([
+    'atel_whoami',
+    'atel_balance',
+    'atel_deposit_info',
+    'atel_agent_search',
+    'atel_inbox_list',
+    'atel_order_get',
+    'atel_milestone_list',
+    'atel_a2b_countries',
+    'atel_a2b_search',
+    'atel_a2b_quote',
+    'atel_a2b_purchase_get',
+    'atel_fm_browse',
+    'atel_fm_listing_get',
+    'atel_fm_delivery_get',
+    'atel_fm_deal_list',
+    'atel_fm_deal_get',
+    'atel_fm_negotiate_get',
+]);
+async function callAtelTool(flags, bools, tool, args) {
+    const dataDir = resolveDataDir(flags);
+    if (!loadConfig(dataDir)) {
+        err(`❌ 未找到配置。${describeProfileSelectionError()}`);
+        process.exit(1);
+    }
+    if (!READONLY_TOOLS.has(tool) && !bools.has('confirm')) {
+        err(`❌ ${tool} 是写操作。确认执行请加 --confirm。`);
+        process.exit(1);
+    }
+    return withLocalMcp(dataDir, async (client) => client.callTool({ name: tool, arguments: args }));
+}
+function printToolResult(result, bools) {
+    if (bools.has('json')) {
+        log(JSON.stringify(result, null, 2));
+        return;
+    }
+    const content = result?.content;
+    const text = Array.isArray(content) ? content.find((c) => c.type === 'text' && typeof c.text === 'string')?.text : '';
+    log(text || JSON.stringify(result, null, 2));
+}
+async function cmdInvoke(flags, bools) {
+    const tool = flags['tool'];
+    if (!tool) {
+        err('❌ 缺 --tool <工具名>,例如 --tool atel_whoami');
+        process.exit(1);
+    }
+    let args;
+    try {
+        args = parseJsonArg(flags);
+    }
+    catch (e) {
+        err(`❌ --args 不是合法 JSON:${e.message}`);
+        process.exit(1);
+    }
+    const result = await callAtelTool(flags, bools, tool, args);
+    printToolResult(result, bools);
+}
+function requireFlag(flags, key, example) {
+    const v = flags[key];
+    if (v === undefined || v.trim() === '') {
+        err(`❌ 缺 --${key}。例:${example}`);
+        process.exit(1);
+    }
+    return v;
+}
+function numFlag(flags, key, required = false) {
+    const raw = flags[key];
+    if (raw === undefined || raw === '') {
+        if (required) {
+            err(`❌ 缺 --${key}`);
+            process.exit(1);
+        }
+        return undefined;
+    }
+    const n = Number(raw);
+    if (!Number.isFinite(n)) {
+        err(`❌ --${key} 必须是数字,当前是 ${raw}`);
+        process.exit(1);
+    }
+    return n;
+}
+async function cmdFm(positionals, flags, bools) {
+    const sub = positionals[0] || 'help';
+    let tool = '';
+    let args = {};
+    if (sub === 'sell') {
+        const title = flags['title'] || flags['sku'] || flags['sku-text'] || flags['name'];
+        if (!title) {
+            err('❌ 缺 --title。例: atel fm sell --title "codex哆啦卡" --price 10 --min-price 0.001 --confirm');
+            process.exit(1);
+        }
+        const mandate = {
+            category: flags['category'] || 'voucher/generic-redemption-code',
+            price_usdc: numFlag(flags, 'price', true),
+            min_price_usdc: numFlag(flags, 'min-price'),
+            sku_text: title,
+            chain: flags['chain'] || 'base',
+        };
+        tool = 'atel_fm_sell';
+        args = { mandateText: JSON.stringify(mandate) };
+    }
+    else if (sub === 'browse' || sub === 'search') {
+        tool = 'atel_fm_browse';
+        args = { query: flags['query'] || positionals.slice(1).join(' ') || '' };
+    }
+    else if (sub === 'get') {
+        tool = 'atel_fm_listing_get';
+        args = { listingId: requireFlag(flags, 'listing-id', 'atel fm get --listing-id <id>') };
+    }
+    else if (sub === 'buy') {
+        tool = 'atel_fm_buy';
+        args = {
+            listingId: requireFlag(flags, 'listing-id', 'atel fm buy --listing-id <id> --price 10 --confirm'),
+            offerPrice: numFlag(flags, 'price', true),
+        };
+    }
+    else if (sub === 'deliver') {
+        tool = 'atel_fm_deliver';
+        args = {
+            dealId: requireFlag(flags, 'deal-id', 'atel fm deliver --deal-id <id> --content "..." --confirm'),
+            content: requireFlag(flags, 'content', 'atel fm deliver --deal-id <id> --content "..." --confirm'),
+        };
+    }
+    else if (sub === 'delivery' || sub === 'get-delivery') {
+        tool = 'atel_fm_delivery_get';
+        args = { dealId: requireFlag(flags, 'deal-id', 'atel fm delivery --deal-id <id>') };
+    }
+    else if (sub === 'confirm') {
+        tool = 'atel_fm_confirm';
+        args = { dealId: requireFlag(flags, 'deal-id', 'atel fm confirm --deal-id <id> --confirm') };
+    }
+    else if (sub === 'dispute') {
+        tool = 'atel_fm_dispute';
+        args = {
+            dealId: requireFlag(flags, 'deal-id', 'atel fm dispute --deal-id <id> --reason "..." --confirm'),
+            reason: requireFlag(flags, 'reason', 'atel fm dispute --deal-id <id> --reason "..." --confirm'),
+        };
+    }
+    else if (sub === 'deals') {
+        tool = 'atel_fm_deal_list';
+        args = {};
+    }
+    else if (sub === 'deal') {
+        tool = 'atel_fm_deal_get';
+        args = { dealId: requireFlag(flags, 'deal-id', 'atel fm deal --deal-id <id>') };
+    }
+    else {
+        log('用法: atel fm sell|browse|get|buy|deliver|delivery|confirm|dispute|deals|deal [...]');
+        return;
+    }
+    printToolResult(await callAtelTool(flags, bools, tool, args), bools);
+}
+async function cmdA2b(positionals, flags, bools) {
+    const sub = positionals[0] || 'help';
+    let tool = '';
+    let args = {};
+    if (sub === 'countries') {
+        tool = 'atel_a2b_countries';
+    }
+    else if (sub === 'search') {
+        tool = 'atel_a2b_search';
+        args = { query: flags['query'] || positionals.slice(1).join(' ') || '', country: flags['country'] || 'US' };
+    }
+    else if (sub === 'quote') {
+        tool = 'atel_a2b_quote';
+        args = {
+            query: flags['query'] || '',
+            productId: requireFlag(flags, 'product-id', 'atel a2b quote --product-id <id> --value 10'),
+            value: numFlag(flags, 'value', true),
+            country: flags['country'] || 'US',
+        };
+    }
+    else if (sub === 'buy' || sub === 'purchase') {
+        tool = 'atel_a2b_purchase';
+        args = {
+            query: flags['query'] || '',
+            productId: requireFlag(flags, 'product-id', 'atel a2b buy --product-id <id> --value 10 --max-usdc 10.5 --confirm'),
+            value: numFlag(flags, 'value', true),
+            country: flags['country'] || 'US',
+            maxAmountUsdc: numFlag(flags, 'max-usdc', true),
+            autoReveal: !bools.has('no-reveal'),
+        };
+    }
+    else if (sub === 'get') {
+        tool = 'atel_a2b_purchase_get';
+        args = { intentId: requireFlag(flags, 'intent-id', 'atel a2b get --intent-id intent_...') };
+    }
+    else {
+        log('用法: atel a2b countries|search|quote|buy|get [...]');
+        return;
+    }
+    printToolResult(await callAtelTool(flags, bools, tool, args), bools);
+}
+async function cmdOrder(positionals, flags, bools) {
+    const sub = positionals[0] || 'help';
+    let tool = '';
+    let args = {};
+    if (sub === 'create') {
+        tool = 'atel_order_create';
+        args = {
+            chain: flags['chain'] || 'base',
+            executorDid: requireFlag(flags, 'executor-did', 'atel order create --executor-did did:atel:... --capability coding --description "..." --price 1 --confirm'),
+            capabilityType: flags['capability'] || 'coding',
+            description: requireFlag(flags, 'description', 'atel order create --description "..."'),
+            priceUsdc: numFlag(flags, 'price', true),
+        };
+    }
+    else if (sub === 'get') {
+        tool = 'atel_order_get';
+        args = { orderId: requireFlag(flags, 'order-id', 'atel order get --order-id ord-...') };
+    }
+    else if (sub === 'accept') {
+        tool = 'atel_order_accept';
+        args = { orderId: requireFlag(flags, 'order-id', 'atel order accept --order-id ord-... --confirm') };
+    }
+    else {
+        log('用法: atel order create|get|accept [...]');
+        return;
+    }
+    printToolResult(await callAtelTool(flags, bools, tool, args), bools);
+}
+async function cmdWallet(positionals, flags, bools) {
+    const sub = positionals[0] || 'balance';
+    let tool = '';
+    let args = {};
+    if (sub === 'balance') {
+        tool = 'atel_balance';
+    }
+    else if (sub === 'deposit-info') {
+        tool = 'atel_deposit_info';
+    }
+    else if (sub === 'transfer') {
+        tool = 'atel_wallet_transfer';
+        args = {
+            chain: flags['chain'] || 'base',
+            address: requireFlag(flags, 'address', 'atel wallet transfer --address 0x... --amount 1 --confirm'),
+            amount: numFlag(flags, 'amount', true),
+        };
+    }
+    else {
+        log('用法: atel wallet balance|deposit-info|transfer [...]');
+        return;
+    }
+    printToolResult(await callAtelTool(flags, bools, tool, args), bools);
+}
+async function cmdSmoke(flags, bools) {
+    const dataDir = resolveDataDir(flags);
+    if (!loadConfig(dataDir)) {
+        err('❌ 未找到配置,先跑 connect。');
+        process.exit(1);
+    }
+    const checks = await withLocalMcp(dataDir, async (client) => {
+        const tools = (await client.listTools()).tools || [];
+        const toolNames = new Set(tools.map((t) => t.name));
+        const call = async (name, args = {}) => {
+            if (!toolNames.has(name))
+                return { ok: false, skipped: true, reason: 'tool_missing' };
+            try {
+                const result = await client.callTool({ name, arguments: args });
+                return { ok: true, result };
+            }
+            catch (e) {
+                return { ok: false, error: e.message };
+            }
+        };
+        const readonly = {
+            whoami: await call('atel_whoami'),
+            balance: await call('atel_balance'),
+            agentSearch: await call('atel_agent_search', {}),
+            inboxList: await call('atel_inbox_list', {}),
+        };
+        const prepare = {
+            orderCreate: toolNames.has('atel_order_create') ? 'available_requires_user_confirm' : 'missing',
+            fmSell: toolNames.has('atel_fm_sell') ? 'available_requires_user_confirm' : 'missing',
+            walletTransfer: toolNames.has('atel_wallet_transfer') ? 'available_requires_user_confirm' : 'missing',
+            a2bSearch: toolNames.has('atel_a2b_search') ? 'available_readonly_search' : 'missing',
+        };
+        return { toolCount: tools.length, readonly, prepare };
+    });
+    const readonlyOk = Object.values(checks.readonly).every((v) => v.ok === true);
+    const requiredToolsPresent = checks.toolCount >= 10
+        && checks.prepare.orderCreate !== 'missing'
+        && checks.prepare.fmSell !== 'missing'
+        && checks.prepare.walletTransfer !== 'missing'
+        && checks.prepare.a2bSearch !== 'missing';
+    const ok = readonlyOk && requiredToolsPresent;
+    const result = { ok, ...checks };
+    if (bools.has('json')) {
+        log(JSON.stringify(result, null, 2));
+    }
+    else {
+        log(`${ok ? '🟢' : '🔴'} smoke ${ok ? '通过' : '有失败'} — tools=${checks.toolCount}`);
+        for (const [k, v] of Object.entries(checks.readonly)) {
+            const item = v;
+            log(`  • ${k}: ${item.ok ? 'ok' : item.skipped ? `skipped(${item.reason})` : `fail(${item.error})`}`);
+        }
+        log(`  • writes: order=${checks.prepare.orderCreate}, fm=${checks.prepare.fmSell}, transfer=${checks.prepare.walletTransfer}, a2b=${checks.prepare.a2bSearch}`);
+    }
+    if (!ok)
+        process.exit(1);
+}
 async function cmdDetect() {
     const all = await detectAll();
     if (all.length === 0) {
@@ -1170,10 +2346,54 @@ async function cmdDetect() {
         log(`🟢 ${adapter.displayName} (${adapter.id}) ${result.version || ''} ${result.detail || ''}`);
     }
 }
+function cmdPrompt(flags) {
+    const dataDir = resolveDataDir(flags);
+    const cfg = loadConfig(dataDir);
+    const binding = readBinding(dataDir);
+    if (!cfg || !binding) {
+        err('❌ 未接入或缺 binding.json,先跑 connect。');
+        process.exit(1);
+    }
+    const toolPrefix = cfg.runtime === 'codex' || cfg.runtime === 'gemini-cli' || cfg.runtime === 'claude-code'
+        ? 'atel__atel_whoami'
+        : 'atel_whoami';
+    log(`你已经接入 ATEL。profile=${binding.profile}, runtime=${binding.runtime}, DID=${binding.did}。读取本机 ${path.join(dataDir, 'SKILL.md')}；使用已配置的 ATEL MCP 工具处理 ATEL 请求。先调用 ${toolPrefix} 验证身份,确认返回 DID=${binding.did}。`);
+}
+function cmdSkill(flags) {
+    const outPath = flags['out'];
+    const body = readPackagedSkill();
+    if (outPath) {
+        fs.mkdirSync(path.dirname(path.resolve(outPath)), { recursive: true });
+        fs.writeFileSync(outPath, body);
+        log(path.resolve(outPath));
+        return;
+    }
+    log(body.trimEnd());
+}
 function help() {
-    log(`@atel-ai/agent — ATEL 一键接入器
+    log(`atel — ATEL 产品级 CLI
 
 用法:
+  atel connect [--runtime <id>] [--name <agent名>] [--capabilities coding,writing]
+               [--profile <别名>] [--runtime-agent-id <id>] [--update-existing] [...]   # 推荐入口:接入 + 起 companion
+  atel status  [--profile <别名> | --agent <别名>] [--json]
+  atel service status|start|stop|restart|logs [--profile <别名> | --agent <别名>]
+  atel tools   [--profile <别名> | --agent <别名>] [--json]
+  atel mcp-probe [--profile <别名> | --agent <别名>] [--json]
+  atel invoke  [--profile <别名> | --agent <别名>] --tool atel_whoami [--args '{}'] [--json] [--confirm]
+  atel fm sell --title "codex哆啦卡" --price 10 --min-price 0.001 [--category voucher/generic-redemption-code] [--confirm]
+  atel fm browse --query "gift card"
+  atel fm get --listing-id <id> | buy --listing-id <id> --price <USDC> --confirm
+  atel fm delivery --deal-id <id> | deal --deal-id <id> | deals
+  atel a2b search --query amazon --country US | quote --product-id <id> --value 10 | buy ... --max-usdc 10.5 --confirm
+  atel order create --executor-did did:atel:... --capability coding --description "..." --price 1 --confirm
+  atel wallet balance | deposit-info | transfer --address 0x... --amount 1 --confirm
+  atel smoke   [--profile <别名> | --agent <别名>] [--json]                 # 只读/安全业务验活
+  atel skill   [--out ./SKILL.md]                                            # 输出 npm 包内置 SKILL.md(离线可用)
+  atel prompt  [--profile <别名> | --agent <别名>]
+  atel repair  [--profile <别名> | --agent <别名>]                         # 重写 MCP 配置与 SKILL
+  atel disconnect [--profile <别名> | --agent <别名>] [--delete-data]       # 断开一个 profile
+  atel uninstall [--confirm]                                                # 删除本机 ATEL profile 数据
   npx @atel-ai/agent onboard [--runtime <id>] [--name <agent名>] [--capabilities coding,writing]
                              [--profile <别名>] [--runtime-agent-id <id>] [--update-existing] [...]   # install + 起 companion(推荐)
   npx @atel-ai/agent install [--runtime <id>] [--name <agent名>] [--capabilities coding,writing]
@@ -1185,28 +2405,62 @@ function help() {
   npx @atel-ai/agent doctor  [--data-dir D | --profile <别名> | --agent <别名>] [--probe]
   npx @atel-ai/agent list                          # 列出本机所有 ATEL agent(~/.atel/agents.json)
   npx @atel-ai/agent whoami  [--data-dir D | --profile <别名> | --agent <别名>]
+  npx @atel-ai/agent balance [--data-dir D | --profile <别名> | --agent <别名>]
   npx @atel-ai/agent detect
   npx @atel-ai/agent update
 
 说明:
   • 多 runtime 同机时不传 --runtime 会安全失败 —— 用 --runtime <id> 或环境变量 ATEL_RUNTIME。
-  • 一机多 agent:用 --profile <别名>(→ ~/.atel/agents/<别名>);openclaw 多 agent 再加 --runtime-agent-id。
+  • 多 profile 同用户时业务命令需 --profile/--agent;只有一个 profile 时会自动选择。
+  • Codex 沙箱内写操作/远端 MCP 会要求授权沙箱外执行,这是正常安全边界。
+  • 通用接入句可用:先执行 atel skill 读取本机说明,再按说明执行 atel connect --auto。
+  • 产品级 connect 默认使用 --profile 隔离(→ ~/.atel/agents/<别名>);openclaw 多 agent 再加 --runtime-agent-id。
   • 同 data-dir 改名需 --update-existing(否则拒绝,防静默改同一 DID 的名)。
 
 支持的 runtime: ${ADAPTERS.map((a) => a.id).join(', ')}
 `);
 }
 async function main() {
-    const { cmd, flags, bools } = parseArgs(process.argv.slice(2));
+    const { cmd, positionals, flags, bools } = parseArgs(process.argv.slice(2));
     switch (cmd) {
+        case '--version':
+        case '-v':
+        case 'version':
+            log(VERSION);
+            return;
+        case 'connect': return cmdConnect(flags, bools);
         case 'install': return cmdInstall(flags, bools);
         case 'onboard': return cmdOnboard(flags, bools);
         case 'run': return cmdRun(flags);
         case 'mcp': return cmdMcp(flags);
         case 'doctor': return cmdDoctor(flags, bools);
+        case 'status':
+            cmdStatus(flags, bools);
+            return;
+        case 'service':
+            cmdService(flags, positionals);
+            return;
+        case 'tools': return cmdTools(flags, bools);
+        case 'mcp-probe': return cmdMcpProbe(flags, bools);
+        case 'invoke': return cmdInvoke(flags, bools);
+        case 'fm': return cmdFm(positionals, flags, bools);
+        case 'a2b': return cmdA2b(positionals, flags, bools);
+        case 'order': return cmdOrder(positionals, flags, bools);
+        case 'wallet': return cmdWallet(positionals, flags, bools);
+        case 'smoke': return cmdSmoke(flags, bools);
+        case 'skill':
+            cmdSkill(flags);
+            return;
+        case 'prompt':
+            cmdPrompt(flags);
+            return;
+        case 'repair': return cmdRepair(flags);
+        case 'disconnect': return cmdDisconnect(flags, bools);
+        case 'uninstall': return cmdUninstall(flags, bools);
         case 'detect': return cmdDetect();
         case 'update': return cmdUpdate();
         case 'whoami': return cmdWhoami(flags);
+        case 'balance': return cmdBalance(flags);
         case 'list':
             cmdList();
             return;