@bolloon/bolloon-agent 0.4.28 → 0.4.29

package/dist/cli-entry.js

@@ -20,6 +20,8 @@ import { fileURLToPath } from 'url';
 import { printBanner } from './cli/loading-tui.js';
 import { discoverEngines, delegateToEngine } from './external-engines/index.js';
 import { x402CheckBalance, x402Fetch } from './agents/x402/x402Pay.js';
+import { runVersionCommand, runUpdateCommand, runDoctorCommand, runRuntimeCommand, UPDATE_HELP } from './cli/update-commands.js';
+import { collectVersionInfo } from './utils/version-info.js';
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const isWindows = process.platform === 'win32';
@@ -31,18 +33,8 @@ const CYAN = _fg(0xc4, 0xd6, 0x40); // #c4d640
 const YELLOW = _fg(0xf5, 0x9e, 0x0b); // #f59e0b
 const GREEN = _fg(0x22, 0xc5, 0x5e); // #22c55e
 const MAGENTA = _fg(0xef, 0x44, 0x44); // #ef4444
-// 版本信息 — 2026-07-20 Bug 3: 从 package.json 读取, 不再硬编码
-const VERSION = (() => {
-    try {
-        const entryDir = path.dirname(fileURLToPath(import.meta.url));
-        const pkgPath = path.resolve(entryDir, '..', 'package.json');
-        const raw = fs.readFileSync(pkgPath, 'utf-8');
-        return JSON.parse(raw).version || '0.0.0';
-    }
-    catch {
-        return '0.0.0';
-    }
-})();
+// 版本信息 — 2026-09-19: 统一走 version-info 的**唯一版本解析** (不再各读一遍 package.json)
+const VERSION = collectVersionInfo({ light: true }).packageVersion;
 function log(msg, color = RESET) {
     console.log(`${color}${msg}${RESET}`);
 }
@@ -58,12 +50,14 @@ ${BOLD}选项:${RESET}
   --gui, -g           启动图形界面 (Electron)
   --web, -w           启动 Web UI (浏览器)
   --cli, -c           启动命令行界面
-  --version, -v       显示版本信息
+  --version, -v       显示版本 (bolloon --version verbose / bolloon --version json)
   --help, -h          显示帮助信息
 
 ${BOLD}命令:${RESET}
   bolloon setup                     初始化向导 (你的称呼 + 模型供应商 + API key + 连通性测试)
-  bolloon update [--now]            检查更新 / 立即更新 (bolloon update --now)
+  bolloon update [plan|status|history|now]   检查更新 / 计划 / 状态 / 历史 / 执行 (默认只检查)
+  bolloon doctor                    安装入口 + 版本事实 + 更新状态自洽性诊断
+  bolloon runtime [plan|install]    运行时 (Node/npm/Git/Python) 检查与安装
   bolloon model [name] [model]      列出 / 切换模型供应商 (如: bolloon model deepseek deepseek-v4-flash)
   bolloon model key <name>          配置某供应商的 API key (隐藏输入, 不回显)
   bolloon model test [name]         测试供应商连通性
@@ -80,9 +74,11 @@ ${BOLD}示例:${RESET}
   bolloon --web              # 启动 Web UI
   bolloon --cli              # 命令行模式
   bolloon model              # 查看当前模型供应商
-  bolloon model minimax      # 切换到 MiniMax
-  bolloon update             # 检查更新
-  bolloon update --now       # 立即更新
+  bolloon update             # 检查更新 (只读, 不改任何东西)
+  bolloon update plan        # 看更新计划与风险检查
+  bolloon update now         # 真正执行更新
+  bolloon doctor             # 我这台机器的 Bolloon 是否自洽
+${UPDATE_HELP}
 
 ${BOLD}环境变量:${RESET}
   MINIMAX_API_KEY           MiniMax API 密钥
@@ -134,7 +130,10 @@ function parseArgs() {
     switch (mode) {
         case '-v':
         case '--version':
-            return { mode: 'version', args: [] };
+            // 2026-09-19: --version 现在分三层 (普通/--verbose/--json), 参数必须往下传
+            return { mode: 'version', args: args.slice(1) };
+        case 'version':
+            return { mode: 'version', args: args.slice(1) };
         case '-h':
         case '--help':
             return { mode: 'help', args: [] };
@@ -154,6 +153,12 @@ function parseArgs() {
         // 2026-08-06: 子命令形式 (去掉 -- 前缀)
         case 'update':
             return { mode: 'update', args: args.slice(1) };
+        // 2026-09-19: 安装入口/版本事实/更新状态 自洽性诊断
+        case 'doctor':
+            return { mode: 'doctor', args: args.slice(1) };
+        // 2026-09-19: 运行时 (Node/npm/Git/Python) 检查与安装
+        case 'runtime':
+            return { mode: 'runtime', args: args.slice(1) };
         case 'model':
             return { mode: 'model', args: args.slice(1) };
         // 2026-09-18: 智能体工具执行轨迹 + 本机 P2P 连接信息 (递给名片/小工具用)
@@ -293,41 +298,8 @@ async function handleX402Command(x402Args) {
     console.error(`未知 x402 子命令: ${sub}`);
     process.exit(1);
 }
-/** update 子命令: 检查 / 执行更新 (bolloon update [--now|now] [packages]) */
-async function handleUpdateCommand(updateArgs) {
-    const { checkForUpdates, performUpdate } = await import('./utils/auto-update.js');
-    // bolloon update --now / bolloon update now [packages] — 立即更新
-    if (updateArgs[0] === '--now' || updateArgs[0] === 'now') {
-        const packages = updateArgs.slice(1).filter(a => !a.startsWith('-'));
-        console.log('🔄 正在检查并更新...');
-        const result = await performUpdate(packages.length > 0 ? packages : undefined);
-        if (result.success) {
-            console.log(`${GREEN}✅ 更新成功${result.updatedPackages ? `: ${result.updatedPackages.join(', ')}` : ''}${RESET}`);
-            if (result.updated)
-                console.log(`${YELLOW}  请重新启动应用以使用新版本${RESET}`);
-        }
-        else {
-            console.error(`${MAGENTA}❌ 更新失败: ${result.error}${RESET}`);
-            process.exit(1);
-        }
-        return;
-    }
-    // 默认: 检查更新
-    console.log('🔄 正在检查更新...');
-    const info = await checkForUpdates();
-    if (info && info.outdated) {
-        console.log(`${CYAN}📦 发现更新可用:${RESET}\n`);
-        console.log(`  当前版本: ${info.version}`);
-        console.log(`  最新版本: ${info.latest}\n`);
-        console.log(`  待更新包:`);
-        for (const p of info.packages)
-            console.log(`    - ${p.name}: ${p.current} → ${p.latest}`);
-        console.log(`\n  运行 ${GREEN}bolloon update --now${RESET} 执行更新`);
-    }
-    else {
-        console.log(`${GREEN}✅ 已是最新版本${RESET} (${info?.version || 'unknown'})`);
-    }
-}
+/** update 子命令: 2026-09-19 起统一走 src/cli/update-commands.ts 的 runUpdateCommand
+ *  (旧实现只有"检查/--now"两种行为, 且各自拼一套版本信息 —— 已删除, 避免两套事实) */
 /** model 子命令: 列出 / 切换模型供应商 (bolloon model [name] [model]) */
 /**
  * `bolloon trace [runId] [--json] [--last N]`
@@ -516,6 +488,11 @@ async function handleSetupCommand(setupArgs) {
         const i = setupArgs.indexOf(name);
         return i >= 0 && i + 1 < setupArgs.length ? setupArgs[i + 1] : undefined;
     };
+    if (setupArgs.includes('repair-runtime') || setupArgs.includes('--repair-runtime')) {
+        // Phase 7: 补装缺失运行时 (与 bolloon runtime install yes 同一实现)
+        console.log(`${BOLD}setup repair-runtime${RESET} — 检查并补装 Node/npm/Git/Python (不偷偷 sudo)`);
+        process.exit(await runRuntimeCommand(['install', 'yes']));
+    }
     if (setupArgs.includes('--help') || setupArgs.includes('-h')) {
         console.log(`${BOLD}bolloon setup${RESET} — 初始化 Bolloon (用户身份 + 模型供应商 + API key)`);
         console.log('');
@@ -525,6 +502,7 @@ async function handleSetupCommand(setupArgs) {
         console.log('  --model <名>      指定模型');
         console.log('  --name <称呼>     你的称呼 (写入 ~/.bolloon/identity/user.json)');
         console.log('  --no-test         跳过连通性测试');
+        console.log('  repair-runtime    检查并补装缺失运行时 (Node/npm/Git/Python)');
         return;
     }
     const apiKey = val('--api-key');
@@ -731,7 +709,8 @@ async function main() {
     const { mode, args } = parseArgs();
     switch (mode) {
         case 'version':
-            console.log(`Bolloon Agent v${VERSION}`);
+            // 2026-09-19: 三层版本输出 (普通/--verbose/--json) 全走同一个 VersionInfo
+            process.exit(await runVersionCommand(args));
             break;
         case 'help':
             printHelp();
@@ -755,7 +734,14 @@ async function main() {
             break;
         // 2026-08-06: 子命令 (bolloon update / bolloon model)
         case 'update':
-            await handleUpdateCommand(args);
+            process.exit(await runUpdateCommand(args));
+            break;
+        case 'doctor':
+            process.exit(await runDoctorCommand(args));
+            break;
+        // 2026-09-19: 运行时检查/安装 (与 install.sh / postinstall / doctor 同一实现)
+        case 'runtime':
+            process.exit(await runRuntimeCommand(args));
             break;
         case 'model':
             await handleModelCommand(args);

package/dist/electron-build/agents/agent-gateway.js

@@ -0,0 +1,169 @@
+"use strict";
+/**
+ * agent-gateway.ts — Agent Gateway 协调层 (2026-08-14)
+ *
+ * Agent Economy 的"经济路由器": 统一入口, 内部编排所有已有层.
+ * 定位: 入口层 + 协调层 + 安全边界 (不是新系统, 是把 Registry/DIAP/x402/Policy/Reputation/Treasury 粘起来).
+ *
+ * 简单用法 (入口要小):
+ *   gateway.registerAgent({ capability: "research", price: "0.05 USDC" })
+ *   gateway.callAgent({ task: "analyze paper", budget: 1, capability: "research" })
+ *   gateway.joinNetwork(link)   // 通过链接自动加入共享网络
+ *
+ * callAgent 自动闭环:
+ *   Discovery (registry) → Identity (DIAP) → Negotiation (价格/预算匹配)
+ *   → Policy (预算/白名单) → Payment (x402/审批) → Execution → Reputation
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gatewayRegisterAgent = gatewayRegisterAgent;
+exports.gatewayCallAgent = gatewayCallAgent;
+exports.gatewayStatus = gatewayStatus;
+const agent_registry_js_1 = require("./agent-registry.js");
+const economic_policy_js_1 = require("./economic-policy.js");
+const payment_gate_js_1 = require("./payment-gate.js");
+const payment_approval_js_1 = require("./payment-approval.js");
+const agent_reputation_js_1 = require("./agent-reputation.js");
+// ============ 协调层 ============
+/**
+ * 注册本 Agent 为服务提供者 (身份 + Registry + 信誉初始化).
+ */
+async function gatewayRegisterAgent(config, identity, deps) {
+    // 2026-08-14: 生产路径先 warm OrbitDB — 否则注册只落本地文件, 分享链接指向的 store 是空的.
+    // 离线/测试环境 warm 失败不阻塞 (注册仍落本地 fallback).
+    let registry = deps?.registry;
+    if (!registry) {
+        try {
+            await (0, agent_registry_js_1.warmAgentRegistry)();
+        }
+        catch { /* 离线模式 */ }
+        registry = (0, agent_registry_js_1.getAgentRegistry)();
+    }
+    const r = await registry.register({
+        agentId: identity.did || `did:local:${identity.name}`,
+        name: identity.name,
+        wallet: config.wallet || identity.wallet,
+        service: {
+            name: config.capability,
+            description: config.description || `${config.capability} 服务`,
+            price: {
+                amount: config.price,
+                currency: (config.currency || 'USDC').toUpperCase(),
+                per: config.per || 'query',
+            },
+        },
+        capabilities: [config.capability],
+    });
+    return { ok: r.ok, error: r.error };
+}
+/**
+ * 调用 Agent 服务 (自动闭环).
+ * Discovery → Policy → Payment gate → Approval → Execution → Reputation.
+ */
+async function gatewayCallAgent(opts) {
+    const { task, budget, capability, url, privateKey } = opts;
+    // 1. Discovery: 从 Registry 找 provider
+    const registry = (0, agent_registry_js_1.getAgentRegistry)();
+    const providers = capability ? await registry.discover(capability) : await registry.list();
+    if (providers.length === 0) {
+        return { success: false, error: `未找到能力为 '${capability || 'any'}' 的 Agent (先 joinNetwork 或注册)` };
+    }
+    const provider = providers[0]; // 简版: 取第一个 (完整版按信誉/价格排序)
+    const price = parseFloat(provider.service?.price?.amount || '0');
+    // 2. Negotiation: 预算检查
+    if (price > budget) {
+        return { success: false, error: `价格 ${price} 超预算 ${budget}`, provider: provider.agentId };
+    }
+    // 3. Payment gate (YAML 验证门): allow/confirm/deny
+    const gate = (0, payment_gate_js_1.getPaymentGate)();
+    const verdict = gate.evaluate({ service: provider.service?.name, amount: price, recipient: provider.wallet });
+    if (verdict.decision === 'deny') {
+        return { success: false, error: `[payment-gate] ${verdict.reason}`, provider: provider.agentId, decision: 'deny' };
+    }
+    // 4. Policy (预算/白名单)
+    const policy = (0, economic_policy_js_1.getEconomicPolicy)();
+    const pol = await policy.check({ payTo: provider.wallet, amount: price, service: provider.service?.name });
+    if (!pol.allowed) {
+        return { success: false, error: `[policy] ${pol.reason}`, provider: provider.agentId, decision: 'deny' };
+    }
+    // 5. confirm → 创建人工审批 (不自动执行)
+    if (verdict.decision === 'confirm') {
+        const store = (0, payment_approval_js_1.getApprovalStore)();
+        const approval = await store.create({
+            service: provider.service?.name || capability || 'service',
+            amount: price,
+            recipient: provider.wallet,
+            reason: verdict.reason,
+            retryPayload: { task, url, privateKey, serviceName: provider.service?.name, args: { task } },
+        });
+        return {
+            success: false,
+            error: `需人工确认: ${verdict.reason} (approval=${approval.id})`,
+            provider: provider.agentId,
+            decision: 'confirm',
+            requiresApproval: true,
+            approvalId: approval.id,
+        };
+    }
+    // 6. Execution (x402 支付 + 调用服务)
+    try {
+        const { serviceCall } = await Promise.resolve().then(() => __importStar(require('./agent-service-client.js')));
+        const r = await serviceCall({
+            serviceName: provider.service?.name || capability || 'service',
+            args: { task },
+            privateKey,
+            url,
+            registry,
+        });
+        if (!r.success)
+            return { success: false, error: r.error, provider: provider.agentId, decision: 'allow' };
+        // 7. Reputation: 记录成功
+        await (0, agent_reputation_js_1.recordServiceOutcome)(provider.agentId, provider.service?.name || 'service', 'success', registry).catch(() => { });
+        return { success: true, provider: provider.agentId, decision: 'allow', output: r.output };
+    }
+    catch (e) {
+        return { success: false, error: `执行失败: ${String(e?.message || e).slice(0, 200)}`, provider: provider.agentId };
+    }
+}
+/**
+ * 查询网络状态 (注册表 + 信誉概览).
+ */
+async function gatewayStatus() {
+    const registry = (0, agent_registry_js_1.getAgentRegistry)();
+    const services = await registry.list();
+    const lines = services.slice(0, 20).map((s) => `  [${s.service?.name}] ${s.name} (${s.service?.price?.amount} ${s.service?.price?.currency}/${s.service?.price?.per}) rep=${s.reputation?.score ?? 'n/a'}`);
+    return `Agent 网络 (${services.length} 服务):\n${lines.join('\n') || '  (空, 先 joinNetwork 或注册)'}`;
+}
+//# sourceMappingURL=agent-gateway.js.map

package/dist/electron-build/agents/agent-gateway.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-gateway.js","sourceRoot":"","sources":["../../../src/agents/agent-gateway.ts"],"names":[],"mappings":"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"}

package/dist/electron-build/agents/agent-identity-store.js

@@ -0,0 +1,212 @@
+"use strict";
+/**
+ * agent-identity-store.ts — 统一 Agent Identity 源 (2026-08-06)
+ *
+ * 解决 CLI 状态栏与 Web UI 智能体名称不一致的根因:
+ * 多个地方各自维护 agent 名称 → 统一从这里读。
+ *
+ * 数据流:
+ *   channels.json (唯一数据源)
+ *        │
+ *   AgentIdentityStore (读取 + active 持久化)
+ *        │
+ *   CLI 状态栏 / /channel 命令  ──  Web UI (GET /active-channel + /channels)
+ *
+ * active channel 持久化: ~/.bolloon/active-channel.json (CLI 与 Web 共用,
+ * 重启后自动恢复上次 channel / identity)。
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AgentIdentityStore = void 0;
+exports.channelsPaths = channelsPaths;
+exports.activeChannelFile = activeChannelFile;
+exports.getIdentityStore = getIdentityStore;
+const fs = __importStar(require("fs/promises"));
+const path = __importStar(require("path"));
+const HOME = () => process.env.HOME || '/tmp';
+/** channels.json 路径 (与 server-types.ts CHANNELS_PATH 对齐) */
+function channelsPaths(home = HOME()) {
+    return [
+        path.join(home, '.bolloon', 'sessions', 'channels.json'),
+        path.join(home, '.bolloon', 'channels.json'),
+    ];
+}
+function activeChannelFile(home = HOME()) {
+    return path.join(home, '.bolloon', 'active-channel.json');
+}
+class AgentIdentityStore {
+    home;
+    channels = [];
+    activeChannelId = null;
+    loaded = false;
+    constructor(home = HOME()) {
+        this.home = home;
+    }
+    /** 读 channels.json + active-channel.json (幂等, 可重复调) */
+    async load() {
+        for (const p of channelsPaths(this.home)) {
+            try {
+                const raw = JSON.parse(await fs.readFile(p, 'utf-8'));
+                if (Array.isArray(raw)) {
+                    this.channels = raw;
+                    break;
+                }
+            }
+            catch { /* 该路径不存在则试下一个 */ }
+        }
+        try {
+            const a = JSON.parse(await fs.readFile(activeChannelFile(this.home), 'utf-8'));
+            if (a && typeof a.channelId === 'string')
+                this.activeChannelId = a.channelId;
+        }
+        catch { /* 无 active 记录 */ }
+        this.loaded = true;
+    }
+    get isLoaded() { return this.loaded; }
+    get rawChannels() { return this.channels; }
+    /** channel → AgentIdentity (persona.name 优先) */
+    toIdentity(c) {
+        const name = c.persona?.name?.trim() || c.name || c.agentId || 'agent';
+        return {
+            id: c.id,
+            name,
+            channelId: c.id,
+            avatar: c.persona?.name ? undefined : undefined,
+            metadata: {
+                agentId: c.agentId,
+                did: c.did,
+                persona: c.persona,
+                publicKey: c.publicKey,
+                cid: c.cid,
+                ipnsName: c.ipnsName,
+            },
+        };
+    }
+    /** 全部智能体身份 (channel 顺序 = 索引顺序, 1-based) */
+    getIdentities() {
+        return this.channels.map(c => this.toIdentity(c));
+    }
+    /**
+     * 解析 /channel <query>:
+     *   纯数字 → number (1-based 索引)
+     *   匹配 id → id (完整或前缀)
+     *   匹配 name → name (大小写不敏感)
+     * 优先级: number > id > name
+     */
+    async resolve(query) {
+        if (!this.loaded)
+            await this.load();
+        const q = String(query || '').trim();
+        if (!q)
+            return null;
+        // 1. number: 纯数字 → 1-based 索引
+        if (/^\d+$/.test(q)) {
+            const idx = parseInt(q, 10);
+            const ch = this.channels[idx - 1];
+            if (ch)
+                return { identity: this.toIdentity(ch), channel: ch, match: 'number', index: idx };
+        }
+        // 2. id: 完整或前缀
+        let found = this.channels.find(c => c.id === q);
+        if (found) {
+            const idx = this.channels.indexOf(found) + 1;
+            return { identity: this.toIdentity(found), channel: found, match: 'id', index: idx };
+        }
+        found = this.channels.find(c => c.id.startsWith(q));
+        if (found) {
+            const idx = this.channels.indexOf(found) + 1;
+            return { identity: this.toIdentity(found), channel: found, match: 'id', index: idx };
+        }
+        // 3. name: persona.name / channel.name 大小写不敏感 (含子串)
+        const ql = q.toLowerCase();
+        found = this.channels.find(c => {
+            const names = [c.persona?.name, c.name].filter(Boolean).map(n => String(n).toLowerCase());
+            return names.some(n => n === ql || n.includes(ql));
+        });
+        if (found) {
+            const idx = this.channels.indexOf(found) + 1;
+            return { identity: this.toIdentity(found), channel: found, match: 'name', index: idx };
+        }
+        return null;
+    }
+    /** 当前 active 身份 (无 active 或找不到时 → 第一个 channel, 与 Web UI 默认一致) */
+    async getActive() {
+        if (!this.loaded)
+            await this.load();
+        if (this.activeChannelId) {
+            const ch = this.channels.find(c => c.id === this.activeChannelId);
+            if (ch)
+                return this.toIdentity(ch);
+        }
+        return this.channels.length > 0 ? this.toIdentity(this.channels[0]) : null;
+    }
+    /** 切换 active channel + 持久化 (CLI /channel 与 Web POST /active-channel 共用) */
+    async setActive(channelId) {
+        if (!this.loaded)
+            await this.load();
+        const ch = this.channels.find(c => c.id === channelId);
+        if (!ch)
+            return null;
+        this.activeChannelId = channelId;
+        try {
+            await fs.mkdir(path.dirname(activeChannelFile(this.home)), { recursive: true });
+            await fs.writeFile(activeChannelFile(this.home), JSON.stringify({ channelId, updatedAt: Date.now() }, null, 2), 'utf-8');
+        }
+        catch (e) {
+            console.warn(`[identity-store] 持久化 active channel 失败 (非致命): ${e?.message}`);
+        }
+        return this.toIdentity(ch);
+    }
+    /** 列出所有 channel 供 /channel 无参显示 */
+    async listForDisplay() {
+        if (!this.loaded)
+            await this.load();
+        const active = this.activeChannelId;
+        return this.channels.map((c, i) => ({
+            index: i + 1,
+            identity: this.toIdentity(c),
+            active: c.id === active,
+        }));
+    }
+}
+exports.AgentIdentityStore = AgentIdentityStore;
+let _store = null;
+/** 单例 (CLI / server 共用; 测试可 new AgentIdentityStore(tmpHome)) */
+function getIdentityStore() {
+    if (!_store)
+        _store = new AgentIdentityStore();
+    return _store;
+}
+//# sourceMappingURL=agent-identity-store.js.map

package/dist/electron-build/agents/agent-identity-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-identity-store.js","sourceRoot":"","sources":["../../../src/agents/agent-identity-store.ts"],"names":[],"mappings":"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"}