@zhin.js/agent 0.1.31 → 0.2.0

package/lib/init/register-management-tools.js

@@ -1,8 +1,17 @@
 /**
- * Register AI management tools (/models, ai.clear, ai.health).
+ * Register AI management tools (/models, /reset, ai.health).
  */
 import './types.js';
 import { getPlugin, ZhinTool, MessageCommand } from '@zhin.js/core';
+import { asPrivate } from '../zhin-agent/zhin-agent-private.js';
+import { jumpSessionTreeForContext, listSessionTreeForContext, } from '../zhin-agent/session-tree-commands.js';
+import { rejectUnlessManagementOperator, } from './management-command-guard.js';
+function guardManagementCommand(root, message, ai, run) {
+    const denied = rejectUnlessManagementOperator(message, root, ai.getTriggerConfig?.());
+    if (denied)
+        return denied;
+    return run();
+}
 export function registerManagementTools(refs) {
     const plugin = getPlugin();
     const { useContext, root, logger } = plugin;
@@ -13,31 +22,21 @@ export function registerManagementTools(refs) {
             .desc('列出所有可用的 AI 模型')
             .keyword('模型', '可用模型', 'ai模型', 'model', 'models')
             .tag('ai', 'management')
+            .requireAnyRole('trusted')
             .execute(async () => {
             const models = await ai.listModels();
             return { providers: models.map(({ provider, models: ml }) => ({ name: provider, models: ml.slice(0, 10), total: ml.length })) };
         });
-        const clearSessionTool = new ZhinTool('ai_clear')
-            .desc('归档当前对话会话（保留 im_transcripts 审计；下次 @ 开新纪元）')
-            .keyword('清除', '清空', '重置', 'clear', 'reset', 'new')
-            .tag('ai', 'session')
-            .execute(async (_args, context) => {
-            if (!context?.message)
-                return { success: false, error: '无消息上下文' };
-            if (!refs.zhinAgent)
-                return { success: false, error: 'Agent 未就绪' };
-            const ok = await refs.zhinAgent.archiveSessionForContext(context);
-            return { success: ok, message: ok ? '会话已归档，下次对话将开启新上下文' : '无活跃会话可归档' };
-        });
         const healthCheckTool = new ZhinTool('ai_health')
             .desc('检查 AI 服务的健康状态')
             .keyword('健康', '状态', '检查', 'health', 'status')
             .tag('ai', 'management')
+            .requireAnyRole('trusted')
             .execute(async () => {
             const h = await ai.healthCheck();
             return { providers: Object.entries(h).map(([n, ok]) => ({ name: n, healthy: ok })) };
         });
-        const tools = [listModelsTool, clearSessionTool, healthCheckTool];
+        const tools = [listModelsTool, healthCheckTool];
         const disposers = [];
         for (const tool of tools)
             disposers.push(toolService.addTool(tool, root.name));
@@ -45,7 +44,7 @@ export function registerManagementTools(refs) {
         const commandService = root.inject('command');
         if (commandService) {
             const modelsCmd = new MessageCommand('/models').desc('列出所有可用的 AI 模型');
-            modelsCmd.action(async () => {
+            modelsCmd.action(async (message) => guardManagementCommand(root, message, ai, async () => {
                 const models = await ai.listModels();
                 let r = '🤖 可用模型:\n';
                 for (const { provider, models: ml } of models) {
@@ -54,33 +53,55 @@ export function registerManagementTools(refs) {
                         r += `\n  ... 还有 ${ml.length - 5} 个`;
                 }
                 return r;
-            });
+            }));
             commandService.add(modelsCmd, root.name);
             disposers.push(() => commandService.remove(modelsCmd));
-            const clearCmd = new MessageCommand('ai.clear').desc('归档当前对话会话');
-            clearCmd.action(async (message) => {
+            const treeContextFrom = (message) => ({
+                platform: message.$adapter,
+                botId: message.$bot,
+                messageId: message.$id,
+                sceneId: message.$channel?.id || message.$sender.id,
+                senderId: message.$sender.id,
+                message,
+                scope: (message.$channel?.type === 'group' || message.$channel?.type === 'channel'
+                    ? message.$channel.type
+                    : 'private'),
+            });
+            const treeListCmd = new MessageCommand('/tree').desc('列出会话分支点');
+            treeListCmd.action(async (message) => guardManagementCommand(root, message, ai, async () => {
                 if (!refs.zhinAgent)
                     return '❌ Agent 未就绪';
-                const ok = await refs.zhinAgent.archiveSessionForContext({
-                    platform: message.$adapter,
-                    botId: message.$bot,
-                    messageId: message.$id,
-                    sceneId: message.$channel?.id || message.$sender.id,
-                    senderId: message.$sender.id,
-                    message,
-                    scope: (message.$channel?.type === 'group' || message.$channel?.type === 'channel'
-                        ? message.$channel.type
-                        : 'private'),
-                });
-                return ok ? '✅ 会话已归档，下次 @ 将使用新上下文' : 'ℹ️ 无活跃会话可归档';
-            });
-            commandService.add(clearCmd, root.name);
-            disposers.push(() => commandService.remove(clearCmd));
-            const newCmd = new MessageCommand('new').desc('开启新对话（归档当前 active 会话）');
-            newCmd.action(async (message) => {
+                return await listSessionTreeForContext(asPrivate(refs.zhinAgent), treeContextFrom(message));
+            }));
+            commandService.add(treeListCmd, root.name);
+            disposers.push(() => commandService.remove(treeListCmd));
+            const treeJumpCmd = new MessageCommand('/tree <index:int>').desc('跳转到第 N 个 user 消息分支点');
+            treeJumpCmd.action(async (message, matched) => guardManagementCommand(root, message, ai, async () => {
                 if (!refs.zhinAgent)
                     return '❌ Agent 未就绪';
-                const ok = await refs.zhinAgent.archiveSessionForContext({
+                const n = Number.parseInt(String(matched.params?.index ?? ''), 10);
+                if (!Number.isFinite(n) || n < 1)
+                    return 'ℹ️ 用法：/tree 2';
+                return await jumpSessionTreeForContext(asPrivate(refs.zhinAgent), treeContextFrom(message), n);
+            }));
+            commandService.add(treeJumpCmd, root.name);
+            disposers.push(() => commandService.remove(treeJumpCmd));
+            const forkCmd = new MessageCommand('/fork <index:int>').desc('从第 N 个 user 消息创建分支');
+            forkCmd.action(async (message, matched) => guardManagementCommand(root, message, ai, async () => {
+                if (!refs.zhinAgent)
+                    return '❌ Agent 未就绪';
+                const n = Number.parseInt(String(matched.params?.index ?? ''), 10);
+                if (!Number.isFinite(n) || n < 1)
+                    return 'ℹ️ 用法：/fork 2';
+                return await jumpSessionTreeForContext(asPrivate(refs.zhinAgent), treeContextFrom(message), n);
+            }));
+            commandService.add(forkCmd, root.name);
+            disposers.push(() => commandService.remove(forkCmd));
+            const compactCmd = new MessageCommand('/compact').desc('压缩当前对话上下文（保留最近 ~20k tokens）');
+            compactCmd.action(async (message) => guardManagementCommand(root, message, ai, async () => {
+                if (!refs.zhinAgent)
+                    return '❌ Agent 未就绪';
+                const result = await refs.zhinAgent.compactSessionForContext({
                     platform: message.$adapter,
                     botId: message.$bot,
                     messageId: message.$id,
@@ -91,15 +112,24 @@ export function registerManagementTools(refs) {
                         ? message.$channel.type
                         : 'private'),
                 });
-                return ok ? '✅ 已开启新对话上下文' : 'ℹ️ 无活跃会话可归档';
-            });
-            commandService.add(newCmd, root.name);
-            disposers.push(() => commandService.remove(newCmd));
+                return result.ok ? `✅ ${result.message}` : `ℹ️ ${result.message}`;
+            }));
+            commandService.add(compactCmd, root.name);
+            disposers.push(() => commandService.remove(compactCmd));
+            const resetCmd = new MessageCommand('/reset').desc('归档当前 epoch，下次 @ 开启新上下文');
+            resetCmd.action(async (message) => guardManagementCommand(root, message, ai, async () => {
+                if (!refs.zhinAgent)
+                    return '❌ Agent 未就绪';
+                const ok = await refs.zhinAgent.archiveSessionForContext(treeContextFrom(message));
+                return ok ? '✅ 已归档当前会话，下次 @ 将使用新上下文' : 'ℹ️ 无活跃会话可归档';
+            }));
+            commandService.add(resetCmd, root.name);
+            disposers.push(() => commandService.remove(resetCmd));
             const healthCmd = new MessageCommand('ai.health').desc('检查 AI 服务的健康状态');
-            healthCmd.action(async () => {
-                const h = await ai.healthCheck();
-                return ['🏥 AI 服务健康状态:'].concat(Object.entries(h).map(([p, ok]) => `  ${ok ? '✅' : '❌'} ${p}`)).join('\n');
-            });
+            healthCmd.action(async (message) => guardManagementCommand(root, message, ai, () => {
+                const h = ai.healthCheck();
+                return h.then((health) => ['🏥 AI 服务健康状态:'].concat(Object.entries(health).map(([p, ok]) => `  ${ok ? '✅' : '❌'} ${p}`)).join('\n'));
+            }));
             commandService.add(healthCmd, root.name);
             disposers.push(() => commandService.remove(healthCmd));
         }

package/lib/init/register-management-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-management-tools.js","sourceRoot":"","sources":["../../src/init/register-management-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register-management-tools.js","sourceRoot":"","sources":["../../src/init/register-management-tools.ts"],"names":[],"mappings":"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"}

package/lib/init/upgrade-agent-db-schema.d.ts

@@ -0,0 +1,41 @@
+/**
+ * ADR 0010 session-tree columns on existing SQLite DBs.
+ * CREATE TABLE IF NOT EXISTS does not add new columns to old tables.
+ */
+export type AgentDbQueryable = {
+    db?: {
+        query?<T = unknown>(sql: string, params?: unknown[]): Promise<T>;
+        dialect?: {
+            name?: string;
+        };
+    };
+    query?<T = unknown>(sql: string, params?: unknown[]): Promise<T>;
+};
+/** table → column → SQLite type for ALTER TABLE ADD COLUMN */
+export declare const AGENT_SESSION_TREE_SCHEMA_PATCHES: Record<string, Record<string, string>>;
+export declare function resolveAgentDbQuery(dbFeature: AgentDbQueryable): ((sql: string, params?: unknown[]) => Promise<unknown>) | undefined;
+export declare function resolveAgentDbDialect(dbFeature: AgentDbQueryable): string;
+export declare function listSqliteTableColumns(query: (sql: string) => Promise<unknown>, tableName: string): Promise<Set<string>>;
+export declare function upgradeAgentSessionTreeSchema(dbFeature: AgentDbQueryable): Promise<string[]>;
+/** Populate agent_messages.id from SQLite rowid after ADD COLUMN. */
+export declare function backfillAgentMessageIdsFromRowid(dbFeature: AgentDbQueryable): Promise<number>;
+export type AgentMessageBackfillRow = {
+    id: number;
+    session_id: string;
+    parent_id: number | null;
+    timestamp: number;
+};
+/** 将同 session 内 parent_id 为 null 的遗留行串成线性链（ADR 0010 迁移） */
+export declare function planLinearParentBackfill(rows: AgentMessageBackfillRow[]): Array<{
+    id: number;
+    parent_id: number | null;
+}>;
+export declare function backfillAgentMessageParentChains(dbFeature: AgentDbQueryable): Promise<number>;
+export declare function repairAgentSessionActiveLeaves(dbFeature: AgentDbQueryable): Promise<number>;
+export declare function upgradeAgentSessionTreeData(dbFeature: AgentDbQueryable): Promise<{
+    columns: string[];
+    idsBackfilled: number;
+    parentLinks: number;
+    activeLeaves: number;
+}>;
+//# sourceMappingURL=upgrade-agent-db-schema.d.ts.map

package/lib/init/upgrade-agent-db-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-agent-db-schema.d.ts","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE;QACH,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAClE,CAAC;AAIF,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYpF,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,GAC1B,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAUrE;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAEzE;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EACxC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAItB;AAED,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAED,qEAAqE;AACrE,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2DAA2D;AAC3D,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,uBAAuB,EAAE,GAC9B,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAqBjD;AAED,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC,CAMD"}

package/lib/init/upgrade-agent-db-schema.js

@@ -0,0 +1,170 @@
+/**
+ * ADR 0010 session-tree columns on existing SQLite DBs.
+ * CREATE TABLE IF NOT EXISTS does not add new columns to old tables.
+ */
+/** table → column → SQLite type for ALTER TABLE ADD COLUMN */
+export const AGENT_SESSION_TREE_SCHEMA_PATCHES = {
+    agent_messages: {
+        id: 'INTEGER',
+        parent_id: 'INTEGER',
+        extra: 'TEXT',
+    },
+    agent_sessions: {
+        active_leaf_message_id: 'INTEGER',
+    },
+    agent_summaries: {
+        branch_anchor_message_id: 'INTEGER',
+    },
+};
+export function resolveAgentDbQuery(dbFeature) {
+    const direct = dbFeature.query;
+    if (typeof direct === 'function') {
+        return (sql, params) => direct(sql, params);
+    }
+    const nested = dbFeature.db?.query;
+    if (typeof nested === 'function') {
+        return (sql, params) => nested(sql, params);
+    }
+    return undefined;
+}
+export function resolveAgentDbDialect(dbFeature) {
+    return dbFeature.db?.dialect?.name ?? '';
+}
+export async function listSqliteTableColumns(query, tableName) {
+    const rows = (await query(`PRAGMA table_info("${tableName}")`));
+    if (!Array.isArray(rows))
+        return new Set();
+    return new Set(rows.map((r) => String(r.name ?? '')).filter(Boolean));
+}
+export async function upgradeAgentSessionTreeSchema(dbFeature) {
+    const queryFn = resolveAgentDbQuery(dbFeature);
+    if (!queryFn)
+        return [];
+    const dialect = resolveAgentDbDialect(dbFeature);
+    if (dialect && dialect !== 'sqlite') {
+        return [];
+    }
+    const added = [];
+    for (const [table, columns] of Object.entries(AGENT_SESSION_TREE_SCHEMA_PATCHES)) {
+        let existing;
+        try {
+            existing = await listSqliteTableColumns((sql) => queryFn(sql), table);
+        }
+        catch {
+            continue;
+        }
+        if (existing.size === 0)
+            continue;
+        for (const [column, sqlType] of Object.entries(columns)) {
+            if (existing.has(column))
+                continue;
+            await queryFn(`ALTER TABLE "${table}" ADD COLUMN "${column}" ${sqlType}`);
+            added.push(`${table}.${column}`);
+        }
+    }
+    return added;
+}
+/** Populate agent_messages.id from SQLite rowid after ADD COLUMN. */
+export async function backfillAgentMessageIdsFromRowid(dbFeature) {
+    const queryFn = resolveAgentDbQuery(dbFeature);
+    if (!queryFn)
+        return 0;
+    const dialect = resolveAgentDbDialect(dbFeature);
+    if (dialect && dialect !== 'sqlite')
+        return 0;
+    let columns;
+    try {
+        columns = await listSqliteTableColumns((sql) => queryFn(sql), 'agent_messages');
+    }
+    catch {
+        return 0;
+    }
+    if (!columns.has('id'))
+        return 0;
+    const countRows = (await queryFn(`SELECT COUNT(*) AS c FROM agent_messages WHERE id IS NULL`));
+    const pending = Number(countRows?.[0]?.c ?? 0);
+    if (pending <= 0)
+        return 0;
+    await queryFn(`UPDATE agent_messages SET id = rowid WHERE id IS NULL`);
+    return pending;
+}
+/** 将同 session 内 parent_id 为 null 的遗留行串成线性链（ADR 0010 迁移） */
+export function planLinearParentBackfill(rows) {
+    const bySession = new Map();
+    for (const row of rows) {
+        const list = bySession.get(row.session_id) ?? [];
+        list.push(row);
+        bySession.set(row.session_id, list);
+    }
+    const updates = [];
+    for (const list of bySession.values()) {
+        const sorted = [...list].sort((a, b) => a.timestamp - b.timestamp || a.id - b.id);
+        for (let i = 1; i < sorted.length; i += 1) {
+            const row = sorted[i];
+            if (row.parent_id != null)
+                continue;
+            const prev = sorted[i - 1];
+            updates.push({ id: row.id, parent_id: prev.id });
+        }
+    }
+    return updates;
+}
+export async function backfillAgentMessageParentChains(dbFeature) {
+    const queryFn = resolveAgentDbQuery(dbFeature);
+    if (!queryFn)
+        return 0;
+    const dialect = resolveAgentDbDialect(dbFeature);
+    if (dialect && dialect !== 'sqlite')
+        return 0;
+    let rows;
+    try {
+        rows = (await queryFn(`SELECT id, session_id, parent_id, timestamp FROM agent_messages ORDER BY session_id, timestamp, id`));
+    }
+    catch {
+        return 0;
+    }
+    if (!Array.isArray(rows) || rows.length === 0)
+        return 0;
+    const updates = planLinearParentBackfill(rows);
+    for (const { id, parent_id } of updates) {
+        await queryFn(`UPDATE agent_messages SET parent_id = ? WHERE id = ?`, [parent_id, id]);
+    }
+    return updates.length;
+}
+export async function repairAgentSessionActiveLeaves(dbFeature) {
+    const queryFn = resolveAgentDbQuery(dbFeature);
+    if (!queryFn)
+        return 0;
+    const dialect = resolveAgentDbDialect(dbFeature);
+    if (dialect && dialect !== 'sqlite')
+        return 0;
+    let sessions;
+    try {
+        sessions = (await queryFn(`SELECT session_id, active_leaf_message_id FROM agent_sessions WHERE status = 'active'`));
+    }
+    catch {
+        return 0;
+    }
+    if (!Array.isArray(sessions))
+        return 0;
+    let repaired = 0;
+    for (const session of sessions) {
+        if (session.active_leaf_message_id != null)
+            continue;
+        const maxRows = (await queryFn(`SELECT MAX(id) AS max_id FROM agent_messages WHERE session_id = ?`, [session.session_id]));
+        const maxId = maxRows?.[0]?.max_id;
+        if (maxId == null)
+            continue;
+        await queryFn(`UPDATE agent_sessions SET active_leaf_message_id = ? WHERE session_id = ?`, [maxId, session.session_id]);
+        repaired += 1;
+    }
+    return repaired;
+}
+export async function upgradeAgentSessionTreeData(dbFeature) {
+    const columns = await upgradeAgentSessionTreeSchema(dbFeature);
+    const idsBackfilled = await backfillAgentMessageIdsFromRowid(dbFeature);
+    const parentLinks = await backfillAgentMessageParentChains(dbFeature);
+    const activeLeaves = await repairAgentSessionActiveLeaves(dbFeature);
+    return { columns, idsBackfilled, parentLinks, activeLeaves };
+}
+//# sourceMappingURL=upgrade-agent-db-schema.js.map

package/lib/init/upgrade-agent-db-schema.js.map

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

package/lib/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AAkBzB;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAkBtC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AAoBzB;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAoBtC"}

package/lib/init.js

@@ -22,6 +22,7 @@ import { registerDbModels } from './init/register-db-models.js';
 import { registerAIService } from './init/register-ai-service.js';
 import { createZhinAgentContext } from './init/create-zhin-agent.js';
 import { registerAITrigger } from './init/register-ai-trigger.js';
+import { registerGroupSessionPassive } from './init/register-group-session-passive.js';
 import { registerDbUpgrade } from './init/register-db-upgrade.js';
 import { registerManagementTools } from './init/register-management-tools.js';
 import { registerOwnerApproveCommands } from './init/register-owner-approve-commands.js';
@@ -29,6 +30,7 @@ import { registerIntrospectionCommands } from './init/register-introspection-com
 import { registerBuiltinTools } from './init/register-builtin-tools.js';
 import { registerHomeTools } from './init/register-home-tools.js';
 import { registerTypingIndicator } from './init/register-typing-indicator.js';
+import { registerAgentMeshMcp } from './init/register-agent-mesh-mcp.js';
 /**
  * 初始化 AI 模块
  *
@@ -41,6 +43,7 @@ import { registerTypingIndicator } from './init/register-typing-indicator.js';
 export function initAgentModule() {
     const refs = createRefs();
     registerOrchestrator();
+    registerAgentMeshMcp();
     registerMcpFromConfig();
     registerMcpMemoryDefault();
     registerToolService();
@@ -48,6 +51,7 @@ export function initAgentModule() {
     registerAIService(refs);
     createZhinAgentContext(refs);
     registerAITrigger(refs);
+    registerGroupSessionPassive(refs);
     registerDbUpgrade(refs);
     registerManagementTools(refs);
     registerOwnerApproveCommands();

package/lib/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAE1B,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,CAAC;IACxB,wBAAwB,EAAE,CAAC;IAC3B,mBAAmB,EAAE,CAAC;IACtB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7B,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC9B,4BAA4B,EAAE,CAAC;IAC/B,6BAA6B,CAAC,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3B,iBAAiB,EAAE,CAAC;IACpB,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAE1B,oBAAoB,EAAE,CAAC;IACvB,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,CAAC;IACxB,wBAAwB,EAAE,CAAC;IAC3B,mBAAmB,EAAE,CAAC;IACtB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7B,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAClC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC9B,4BAA4B,EAAE,CAAC;IAC/B,6BAA6B,CAAC,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3B,iBAAiB,EAAE,CAAC;IACpB,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}

package/lib/mcp-client/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/mcp-client/connection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAGvF,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,KAAK,CAAiB;IAC9B,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,KAAK,CAKX;gBAEU,KAAK,EAAE,cAAc;IAKjC,IAAI,WAAW,IAAI,OAAO,CAAiC;IAC3D,IAAI,KAAK,IAAI,SAAS,EAAE,CAA6B;IACrD,IAAI,SAAS,IAAI,WAAW,EAAE,CAAiC;IAC/D,IAAI,OAAO,IAAI,SAAS,EAAE,CAA+B;IAEnD,OAAO,IAAI,OAAO,CAAC,wBAAwB,CAAC;IA2B5C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQrE,0EAA0E;IACpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAOb,OAAO;YASP,eAAe;YA8Bf,oBAAoB;CAkBnC"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/mcp-client/connection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAGvF,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,KAAK,CAAiB;IAC9B,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,KAAK,CAKX;gBAEU,KAAK,EAAE,cAAc;IAKjC,IAAI,WAAW,IAAI,OAAO,CAAiC;IAC3D,IAAI,KAAK,IAAI,SAAS,EAAE,CAA6B;IACrD,IAAI,SAAS,IAAI,WAAW,EAAE,CAAiC;IAC/D,IAAI,OAAO,IAAI,SAAS,EAAE,CAA+B;IAEnD,OAAO,IAAI,OAAO,CAAC,wBAAwB,CAAC;IA4B5C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQrE,0EAA0E;IACpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAOb,OAAO;YASP,eAAe;YA8Bf,oBAAoB;CAkBnC"}

package/lib/mcp-client/connection.js

@@ -43,6 +43,7 @@ export class McpClientConnection {
         }
         catch (err) {
             this.state.error = err.message;
+            await this.disconnect();
             throw err;
         }
         return this.state;

package/lib/mcp-client/connection.js.map

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

package/lib/mcp-client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp-client/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IAEhE,OAAO,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAclE,qFAAqF;IAC/E,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAMpC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAI5D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIlC,WAAW,IAAI,SAAS,EAAE;IAQ1B,eAAe,IAAI,WAAW,EAAE;IAQhC,aAAa,IAAI,SAAS,EAAE;IAQ5B,IAAI,cAAc,IAAI,MAAM,CAM3B;CACF;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,YAAY,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACrF,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp-client/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IAEhE,OAAO,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAmBlE,qFAAqF;IAC/E,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAMpC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAI5D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIlC,WAAW,IAAI,SAAS,EAAE;IAQ1B,eAAe,IAAI,WAAW,EAAE;IAQhC,aAAa,IAAI,SAAS,EAAE;IAQ5B,IAAI,cAAc,IAAI,MAAM,CAM3B;CACF;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,YAAY,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACrF,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/lib/mcp-client/index.js

@@ -15,8 +15,14 @@ export class McpClientManager {
             await this.disconnect(entry.name);
         }
         conn = new McpClientConnection(entry);
+        try {
+            await conn.connect();
+        }
+        catch (err) {
+            this.connections.delete(entry.name);
+            throw err;
+        }
         this.connections.set(entry.name, conn);
-        await conn.connect();
         return conn;
     }
     /** Returns false when the connection is missing or the server no longer responds. */

package/lib/mcp-client/index.js.map

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

package/lib/mcp-server/agent-mesh-tools.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Agent Mesh MCP tools — agent.delegate_task / query_status / get_result / cancel_task
+ */
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { AGENT_MESH_TOOL_NAMES } from '@zhin.js/core';
+export { AGENT_MESH_TOOL_NAMES };
+export declare function registerAgentMeshTools(server: McpServer): void;
+//# sourceMappingURL=agent-mesh-tools.d.ts.map

package/lib/mcp-server/agent-mesh-tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-mesh-tools.d.ts","sourceRoot":"","sources":["../../src/mcp-server/agent-mesh-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAMtD,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAQjC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA8I9D"}