@bolloon/bolloon-agent 0.3.46 → 0.3.47

package/dist/agents/pi-sdk-tools.js

@@ -1776,7 +1776,8 @@ export function registerBuiltinTools(ctx) {
         execute: async () => {
             try {
                 const { readContextAssets, formatLayerListing } = await import('../bootstrap/context-os.js');
-                const listings = await readContextAssets();
+                // 2026-08-09: 按 agentId 分区读取 (每个智能体独立 Context OS)
+                const listings = await readContextAssets(undefined, undefined, undefined, ctx.agentId || '');
                 const total = listings.reduce((s, l) => s + l.fileCount, 0);
                 if (total === 0)
                     return { success: true, output: '📂 Context OS 资产层已就绪 (12+3 层), 当前暂无资产. 有价值的内容用 write_context_asset 写入对应层.' };
@@ -1816,7 +1817,7 @@ export function registerBuiltinTools(ctx) {
                         tags = t.map(String);
                 }
                 catch { /* tags 解析失败 */ }
-                const r = await writeContextAsset({ layer, title, content, tags, domain: args.domain ? String(args.domain) : undefined });
+                const r = await writeContextAsset({ layer, title, content, tags, domain: args.domain ? String(args.domain) : undefined }, undefined, ctx.agentId || '');
                 if (!r.ok)
                     return { success: false, error: r.error };
                 if (r.skipped)
@@ -1840,7 +1841,8 @@ export function registerBuiltinTools(ctx) {
                 const { readContextAssets, formatLayerListing } = await import('../bootstrap/context-os.js');
                 const layer = args.layer ? String(args.layer) : undefined;
                 const kw = args.keyword ? String(args.keyword) : undefined;
-                const listings = await readContextAssets(layer, kw);
+                // 2026-08-09: 按 agentId 分区读取 (每个智能体独立 Context OS)
+                const listings = await readContextAssets(layer, kw, undefined, ctx.agentId || '');
                 if (listings.every((l) => l.fileCount === 0)) {
                     return { success: true, output: layer ? `📂 资产层 ${layer} 暂无资产` : '📂 资产层暂无资产' };
                 }

package/dist/bootstrap/context-os.js

@@ -48,7 +48,16 @@ const LAYER_KEYS = new Set(CONTEXT_OS_LAYERS.map((l) => l.key));
 export function getContextOsRoot(home = os.homedir()) {
     return path.join(home, '.bolloon', 'context-os');
 }
-export function getLayerDir(layer, home = os.homedir()) {
+/**
+ * 2026-08-09: 层目录 — 支持按 agentId 分区 (每个智能体独立 Context OS).
+ *   agentId 有值 → ~/.bolloon/context-os/<sanitizeAgentId>/<layer>
+ *   agentId 空   → ~/.bolloon/context-os/<layer> (旧全局路径, 兼容)
+ */
+export function getLayerDir(layer, home = os.homedir(), agentId) {
+    const safeId = String(agentId || '').replace(/[^a-zA-Z0-9_-]/g, '_').slice(0, 64);
+    if (safeId) {
+        return path.join(getContextOsRoot(home), safeId, layer);
+    }
     return path.join(getContextOsRoot(home), layer);
 }
 /** 校验 layer 合法; 非法返回 null */
@@ -86,11 +95,11 @@ ${l.usage}
 → 阶段2 固化 (本层唯一位置) → 阶段3 索引化 (高频引用) → 阶段4 归档/删除.
 `;
 }
-export async function ensureContextOsDirs(home) {
+export async function ensureContextOsDirs(home, agentId) {
     const root = getContextOsRoot(home);
     await fs.mkdir(root, { recursive: true });
     for (const l of CONTEXT_OS_LAYERS) {
-        const dir = getLayerDir(l.key, home);
+        const dir = getLayerDir(l.key, home, agentId);
         await fs.mkdir(dir, { recursive: true });
         const readmePath = path.join(dir, 'README.md');
         try {
@@ -106,7 +115,7 @@ export async function ensureContextOsDirs(home) {
  * 文件名: <ts>-<slug>.md; frontmatter v2 (stage0 = 临时价值点, 待验证).
  * 幂等: 同层同 slug 已存在 → 跳过 (不重复造文件, Context OS §6 Step3).
  */
-export async function writeContextAsset(input, home) {
+export async function writeContextAsset(input, home, agentId) {
     const layer = resolveLayer(input.layer);
     if (!layer) {
         return { ok: false, error: `layer 非法: '${input.layer}'. 合法: ${CONTEXT_OS_LAYERS.map((l) => l.key).join(' / ')}` };
@@ -117,15 +126,15 @@ export async function writeContextAsset(input, home) {
     const content = String(input.content || '').trim();
     if (!content)
         return { ok: false, error: 'content 必填' };
-    await ensureContextOsDirs(home);
+    await ensureContextOsDirs(home, agentId);
     const now = new Date().toISOString();
     const ts = Date.now();
     const slug = slugify(title);
     const fileName = `${ts}-${slug}.md`;
-    const filePath = path.join(getLayerDir(layer.key, home), fileName);
+    const filePath = path.join(getLayerDir(layer.key, home, agentId), fileName);
     // 幂等: 同 slug 已存在 → 跳过
     try {
-        const files = await fs.readdir(getLayerDir(layer.key, home));
+        const files = await fs.readdir(getLayerDir(layer.key, home, agentId));
         if (files.some((f) => f.endsWith(`-${slug}.md`))) {
             return { ok: true, skipped: true, error: `同标题资产已存在 (${slug}.md), 未重复写入` };
         }
@@ -157,7 +166,7 @@ export async function writeContextAsset(input, home) {
     }
 }
 /** 列出层资产; layer 为空 → 全层汇总 */
-export async function readContextAssets(layer, keyword, home) {
+export async function readContextAssets(layer, keyword, home, agentId) {
     const root = getContextOsRoot(home);
     const kw = String(keyword || '').trim().toLowerCase();
     const wanted = layer ? [resolveLayer(layer)].filter(Boolean).map((l) => l.key) : CONTEXT_OS_LAYERS.map((l) => l.key);
@@ -165,11 +174,11 @@ export async function readContextAssets(layer, keyword, home) {
     for (const key of wanted) {
         const l = resolveLayer(key);
         try {
-            const files = (await fs.readdir(getLayerDir(key, home))).filter((f) => f.endsWith('.md') && f !== 'README.md');
+            const files = (await fs.readdir(getLayerDir(key, home, agentId))).filter((f) => f.endsWith('.md') && f !== 'README.md');
             const entries = [];
             for (const f of files) {
                 try {
-                    const raw = await fs.readFile(path.join(getLayerDir(key, home), f), 'utf-8');
+                    const raw = await fs.readFile(path.join(getLayerDir(key, home, agentId), f), 'utf-8');
                     const titleM = raw.match(/^title:\s*(.+)$/m);
                     const createdM = raw.match(/^created:\s*(.+)$/m);
                     const title = titleM ? titleM[1].trim() : f.replace(/\.md$/, '');

package/dist/cli/loading-tui.js

@@ -45,14 +45,20 @@ function getPackageVersion() {
     }
 }
 const BOLLOON_VERSION = getPackageVersion();
-// ── 品牌图标: 顶部带圆标注的 0 (气球) ──────────────
+// ── 品牌图标: 笑脸机器人 (2026-08-09, bolloon 色系填充) ──────
+//   头: 主色边框 + 亮绿填充 (C_ACCENT_BG); 眼睛 ◉ / 嘴 ◡ 用亮色填充;
+//   末行 BOLLOON 主色艺术字 (仅 printBanner 用, brandArtLines 会裁掉避免双 logo).
+const ROBOT_HEAD = [
+    `${C_ACCENT}   ╭───────╮${RESET}`,
+    `${C_ACCENT} ╭─╯${C_ACCENT_BG}  ${C_WHITE}◉${C_ACCENT_BG} ${C_WHITE}◉${C_ACCENT_BG}  ${RESET}${C_ACCENT}╰─╮${RESET}`,
+    `${C_ACCENT} │${C_ACCENT_BG}     ${C_WHITE}◡${C_ACCENT_BG}     ${RESET}${C_ACCENT}│${RESET}`,
+    `${C_ACCENT} ╰─╮${C_ACCENT_BG}       ${RESET}${C_ACCENT}╭─╯${RESET}`,
+    `${C_ACCENT}   ╰───┬───╯${RESET}`,
+    `${C_ACCENT}       │${RESET}`,
+];
 export const BOLLOON_ICON = [
-    `${C_ACCENT}        ✦${RESET}`,
-    `${C_ACCENT}      ╱ ╲${RESET}`,
-    `${C_ACCENT}  ════◆════${RESET}`,
-    `${C_ACCENT}      ╲ ╱${RESET}`,
-    `${C_ACCENT}       ╲${RESET}`,
-    `${C_ACCENT}    ✦  ╲${RESET}`,
+    ...ROBOT_HEAD,
+    `${C_ACCENT}${BOLD}     BOLLOON${RESET}`,
 ].join('\n');
 // ── 艺术字: BOLLOON (box 字体) + Bolloon Agent 副标题 ──
 export const BOLLOON_BANNER = [
@@ -64,9 +70,10 @@ export const BOLLOON_BANNER = [
     `${C_TEXT}${BOLD}╚═════╝  ╚═════╝ ╚══════╝╚══════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═══╝${RESET}`,
     `${C_DIM}Bolloon Agent v${BOLLOON_VERSION}${RESET}`,
 ].join('\n');
-/** 艺术字全部行 (图标在左, BOLLOON 艺术字在右), 供框内渲染 */
+/** 艺术字全部行 (机器人头在左, BOLLOON 艺术字在右), 供框内渲染 */
 export function brandArtLines() {
-    const icon = BOLLOON_ICON.split('\n');
+    // 2026-08-09: icon 只取机器人头 (裁掉末行 BOLLOON 文字), 避免和右侧 banner 双 logo
+    const icon = ROBOT_HEAD;
     const banner = BOLLOON_BANNER.split('\n');
     const gap = 2;
     const iconW = Math.max(1, ...icon.map(l => dispWidth(l)));
@@ -81,8 +88,9 @@ export function brandArtLines() {
     return rows;
 }
 export function printBanner(version) {
+    // 2026-08-09: 新品牌 logo = 笑脸机器人 (BOLLOON_ICON 自带 BOLLOON 文字),
+    //   不再叠加旧 box 字体 banner (避免双 logo)
     console.log(BOLLOON_ICON);
-    console.log(BOLLOON_BANNER);
     if (version)
         console.log(`${C_DIM}  Bolloon Agent v${version}${RESET}`);
     console.log(`${C_DIM}  P2P AI Agent · 文档智能体${RESET}`);

package/dist/index.js

@@ -271,12 +271,44 @@ async function bootstrapIroh(keypair, name) {
 // Agent 懒加载
 // ---------------------------------------------------------------------------
 let agent = null;
+/** 2026-08-09: agent 当前绑定的 channel id (null = 默认 harness 身份) — 切换时据此重建 */
+let agentBoundChannelId = null;
 let harness = null;
 let hybridMessenger = null;
 let agentIdentity = null;
 async function getAgent() {
-    if (!agent) {
-        const identityDoc = agentIdentity ? {
+    // 2026-08-09: agent 身份绑定当前 active channel — 切换 / 新建 channel 后重建.
+    //   旧实现: agent 全局单例 + peerId:'harness' 固定, 切 channel 身份不变 (bug).
+    //   新实现: channel 有 agentId/did/publicKey/persona 时按 channel 建 session,
+    //   agentIdentity 同步更新, loadSessionKey 回灌该 channel 的历史.
+    const targetChannelId = cliActiveChannelId || null;
+    if (agent && agentBoundChannelId === targetChannelId)
+        return agent;
+    // 读取当前 active channel 的持久身份
+    let chIdentity = null;
+    if (targetChannelId) {
+        try {
+            const { getIdentityStore } = await import('./agents/agent-identity-store.js');
+            const store = getIdentityStore();
+            await store.load();
+            const ch = store.rawChannels.find((c) => c.id === targetChannelId);
+            if (ch)
+                chIdentity = ch;
+        }
+        catch { /* 读不到就退默认 */ }
+    }
+    let identityDoc;
+    if (chIdentity?.did && chIdentity.publicKey) {
+        // channel 已有持久 DID → 用 channel 身份
+        identityDoc = {
+            did: chIdentity.did,
+            name: chIdentity.persona?.name || chIdentity.name || 'agent',
+            publicKey: chIdentity.publicKey,
+            createdAt: Date.now(),
+        };
+    }
+    else if (agentIdentity) {
+        identityDoc = {
             did: agentIdentity.did,
             name: agentIdentity.name,
             publicKey: agentIdentity.publicKey,
@@ -285,15 +317,39 @@ async function getAgent() {
             p2pChannel: agentIdentity.p2pChannel,
             cid: agentIdentity.cid,
             ipnsName: agentIdentity.ipnsName
-        } : undefined;
-        agent = await createAgentSession({
-            cwd: process.cwd(),
-            peerId: 'harness',
-            identityDoc
-        });
+        };
+    }
+    else {
+        identityDoc = undefined;
+    }
+    const loadSessionKey = targetChannelId
+        ? `${targetChannelId}:${chIdentity?.currentSessionId || 'default'}`
+        : undefined;
+    agent = await createAgentSession({
+        cwd: process.cwd(),
+        peerId: targetChannelId ?? 'harness',
+        identityDoc,
+        // 2026-08-09: 透传 channel.agentId → persona docs 按 agent 加载 (身份真正变化)
+        agentId: chIdentity?.agentId || (targetChannelId ? undefined : agentIdentity?.name),
+        loadSessionKey,
+    });
+    agentBoundChannelId = targetChannelId;
+    // 同步 agentIdentity (状态栏 / 身份引用)
+    if (chIdentity) {
+        agentIdentity = {
+            did: chIdentity.did || agentIdentity?.did || '',
+            name: chIdentity.persona?.name || chIdentity.name || 'agent',
+            publicKey: chIdentity.publicKey || agentIdentity?.publicKey || '',
+            peerId: targetChannelId ?? undefined,
+        };
     }
     return agent;
 }
+/** 强制重建 agent (切 channel / 新建 agent 后调用) */
+function invalidateAgent() {
+    agent = null;
+    agentBoundChannelId = null;
+}
 // ---------------------------------------------------------------------------
 // Dispatch
 // ---------------------------------------------------------------------------
@@ -575,6 +631,13 @@ async function processInput(input, comm) {
             await store.setActive(r.channel.id);
             cliAgentName = r.identity.name;
             cliActiveChannelId = r.channel.id;
+            // 2026-08-09: 切 channel 必须重建 agent session — 否则身份/记忆停留在旧 channel (bug 修复)
+            invalidateAgent();
+            // 立即重建 (提前建好, 避免下次输入才卡顿; 失败不阻塞切换)
+            try {
+                await getAgent();
+            }
+            catch { /* 非致命, 下次输入时再试 */ }
             inkSetStatus(getStatus()); // 触发状态栏立即重绘 (无需等 1s 定时器)
             const extra = prev && prev.name !== r.identity.name ? ` (从 ${prev.name} 切换)` : '';
             appendLine(`${C_ACCENT}→ 当前智能体: ${r.identity.name}${RESET}${extra}`);
@@ -599,38 +662,47 @@ async function processInput(input, comm) {
             const { getIdentityStore } = await import('./agents/agent-identity-store.js');
             const store = getIdentityStore();
             await store.load();
-            const { readFile, writeFile, mkdir } = await import('fs/promises');
-            const { join } = await import('path');
-            const home = process.env.HOME || '/tmp';
-            const channelsPath = join(home, '.bolloon', 'sessions', 'channels.json');
-            let channels = [];
-            try {
-                const parsed = JSON.parse(await readFile(channelsPath, 'utf-8'));
-                channels = Array.isArray(parsed) ? parsed : parsed?.channels || [];
-            }
-            catch { /* 首次无文件 */ }
-            const dupName = channels.find((c) => c.name === name.trim());
+            // 2026-08-09: 复用 server-storage updateChannels 原子写 (互斥锁) — 旧实现裸 readFile→push→writeFile
+            //   与 Web server 并发写 channels.json 互相覆盖 → 创建的 agent 重启后丢失 (bug 修复)
+            const { updateChannels } = await import('./web/server-storage.js');
+            const dupName = store.rawChannels.find((c) => c.name === name.trim());
             if (dupName) {
                 appendLine(`${C_ERROR}同名智能体已存在: '${dupName.name}' (id=${dupName.id})${RESET}`);
                 return;
             }
             const id = `ch_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+            const agentId = `agent-${name.trim().toLowerCase().replace(/\s+/g, '-')}`;
             const ch = {
                 id,
                 name: name.trim(),
-                agentId: `agent-${name.trim().toLowerCase().replace(/\s+/g, '-')}`,
+                agentId,
                 createdAt: new Date().toISOString(),
                 updatedAt: new Date().toISOString(),
                 currentSessionId: 'default',
             };
             if (personaHint)
                 ch.persona = { name: name.trim(), description: personaHint };
-            channels.push(ch);
-            await mkdir(join(home, '.bolloon', 'sessions'), { recursive: true });
-            await writeFile(channelsPath, JSON.stringify(channels, null, 2), 'utf-8');
+            // 2026-08-09: 立即生成该 agent 的持久 DID 身份 (agent-keys/<agentId>.json) —
+            //   与 server fixOneChannelDID 对齐, 保证 CLI 新建的 agent 身份稳定且归属用户 DID
+            try {
+                const { loadOrCreateAgentIdentity } = await import('./agents/agent-identity.js');
+                const idt = loadOrCreateAgentIdentity(agentId);
+                ch.did = idt.did;
+                ch.publicKey = idt.publicKey;
+            }
+            catch { /* DID 生成失败不阻塞创建 */ }
+            const channels = await updateChannels((chs) => [...chs, ch]);
+            // 刷新 store 缓存 (updateChannels 走了 server-storage, store 内存还是旧的)
+            await store.load();
             await store.setActive(id);
             cliAgentName = name.trim();
             cliActiveChannelId = id;
+            // 2026-08-09: 新建 agent 后立即重建 session — 否则新 agent 身份不加载 (bug 修复)
+            invalidateAgent();
+            try {
+                await getAgent();
+            }
+            catch { /* 非致命 */ }
             inkSetStatus(getStatus());
             appendLine(`${C_OK}✓ 已创建智能体 channel: ${name.trim()}${RESET} (${C_DIM}${id}${RESET})${personaHint ? `\n  ${C_DIM}persona: ${personaHint}${RESET}` : ''}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.46",
+  "version": "0.3.47",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",