@zhin.js/agent 0.0.0 → 0.0.1

package/src/builtin-tools.ts

@@ -19,7 +19,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { exec } from 'child_process';
 import { promisify } from 'util';
-import { Logger } from '@zhin.js/logger';
+import { Logger, type PropertySchema } from '@zhin.js/core';
 import { ZhinTool } from '@zhin.js/core';
 
 // 从新模块中 re-export 向后兼容的函数
@@ -28,6 +28,10 @@ export { loadSoulPersona, loadToolsGuide, loadAgentsMemory } from './bootstrap.j
 const execAsync = promisify(exec);
 const logger = new Logger(null, 'builtin-tools');
 
+function errMsg(e: unknown): string {
+  return e instanceof Error ? e.message : String(e);
+}
+
 /**
  * 获取数据目录路径
  */
@@ -202,8 +206,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           return files.length === 0
             ? `No files matching '${args.pattern}'`
             : `Found ${files.length} files:\n${files.join('\n')}`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -227,9 +231,10 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
             { cwd: process.cwd() },
           );
           return stdout.trim() || `No matches for '${args.pattern}'`;
-        } catch (e: any) {
-          if (e.code === 1) return `No matches for '${args.pattern}'`;
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          const err = e as { code?: number; message?: string };
+          if (err.code === 1) return `No matches for '${args.pattern}'`;
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -256,8 +261,9 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           if (stdout.trim()) result += `STDOUT:\n${stdout.trim()}`;
           if (stderr.trim()) result += `${result ? '\n' : ''}STDERR:\n${stderr.trim()}`;
           return result || '(no output)';
-        } catch (e: any) {
-          return `Error (exit ${e.code || '?'}): ${e.message}\nSTDOUT:\n${e.stdout || ''}\nSTDERR:\n${e.stderr || ''}`;
+        } catch (e: unknown) {
+          const err = e as { code?: number; message?: string; stdout?: string; stderr?: string };
+          return `Error (exit ${err.code || '?'}): ${errMsg(e)}\nSTDOUT:\n${err.stdout || ''}\nSTDERR:\n${err.stderr || ''}`;
         }
       }),
   );
@@ -319,8 +325,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           return results.map((r, i) =>
             `${i + 1}. ${r.title}\n   URL: ${r.url}\n   ${r.snippet}`,
           ).join('\n\n');
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -349,8 +355,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
             .trim();
           const maxLen = 20 * 1024;
           return text.length > maxLen ? text.slice(0, maxLen) + '\n...(truncated)' : text;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -375,8 +381,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
             return `${status} ${i + 1}. ${item.title}${item.detail ? ' — ' + item.detail : ''}`;
           });
           return `📋 Tasks (${data.items.filter((i: any) => i.status === 'done').length}/${data.items.length} done):\n${lines.join('\n')}`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -388,7 +394,7 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
       .keyword('创建计划', '更新任务', '标记完成', 'todo')
       .tag('plan', 'todo')
       .kind('plan')
-      .param('items', { type: 'array', description: '任务列表 [{title, detail?, status: pending|in-progress|done}]' } as any, true)
+      .param('items', { type: 'array', description: '任务列表 [{title, detail?, status: pending|in-progress|done}]' } as PropertySchema<unknown[]>, true)
       .param('chat_id', { type: 'string', description: '聊天范围（可选）' })
       .execute(async (args) => {
         try {
@@ -399,8 +405,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           await fs.promises.writeFile(todoPath, JSON.stringify(data, null, 2), 'utf-8');
           const done = args.items.filter((i: any) => i.status === 'done').length;
           return `✅ Tasks updated (${done}/${args.items.length} done)`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -421,8 +427,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
             : path.join(DATA_DIR, 'groups', args.chat_id || 'default', 'AGENTS.md');
           if (!fs.existsSync(memPath)) return 'No memory stored yet.';
           return await fs.promises.readFile(memPath, 'utf-8');
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -445,8 +451,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           await fs.promises.mkdir(path.dirname(memPath), { recursive: true });
           await fs.promises.writeFile(memPath, args.content, 'utf-8');
           return `✅ Memory saved (${args.scope || 'chat'} scope)`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -478,8 +484,8 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
             }
           }
           return `Skill '${args.name}' not found. Check skills/ directory.`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
@@ -504,15 +510,15 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
           const fmMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
           if (!fmMatch) return 'Error: 无效的 SKILL.md 文件（缺少 frontmatter）';
 
-          let yaml: any;
+          let jsYaml: any;
           try {
-            yaml = await import('yaml');
-            if (yaml.default) yaml = yaml.default;
+            jsYaml = await import('js-yaml');
+            if (jsYaml.default) jsYaml = jsYaml.default;
           } catch {
             return 'Error: 无法加载 yaml 解析器';
           }
 
-          const metadata = yaml.parse(fmMatch[1]);
+          const metadata = jsYaml.load(fmMatch[1]);
           if (!metadata?.name) return 'Error: SKILL.md 缺少 name 字段';
 
           const skillName: string = metadata.name;
@@ -523,13 +529,12 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
 
           logger.info(`技能已安装: ${skillName} → ${skillPath}`);
           return `✅ 技能「${skillName}」已安装到 ${skillPath}。现在可以用 activate_skill("${skillName}") 激活它。`;
-        } catch (e: any) {
-          return `Error: ${e.message}`;
+        } catch (e: unknown) {
+          return `Error: ${errMsg(e)}`;
         }
       }),
   );
 
-  logger.info(`已创建 ${tools.length} 个内置系统工具`);
   return tools;
 }
 
@@ -539,14 +544,14 @@ export function createBuiltinTools(options?: BuiltinToolsOptions): ZhinTool[] {
 async function checkSkillDeps(content: string): Promise<string> {
   const fmMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
   if (!fmMatch) return '';
-  let yaml: any;
+  let jsYaml: any;
   try {
-    yaml = await import('yaml');
-    if (yaml.default) yaml = yaml.default;
+    jsYaml = await import('js-yaml');
+    if (jsYaml.default) jsYaml = jsYaml.default;
   } catch {
     return '';
   }
-  const metadata = yaml.parse(fmMatch[1]);
+  const metadata = jsYaml.load(fmMatch[1]);
   if (!metadata) return '';
   const compat = metadata.compatibility || {};
   const deps = compat.deps || metadata.deps;
@@ -708,17 +713,16 @@ export async function discoverWorkspaceSkills(): Promise<SkillMeta[]> {
           continue;
         }
 
-        // 动态导入 yaml，使用 .default 兼容 ESM 模块
-        let yaml: any;
+        let jsYaml: any;
         try {
-          yaml = await import('yaml');
-          if (yaml.default) yaml = yaml.default;
+          jsYaml = await import('js-yaml');
+          if (jsYaml.default) jsYaml = jsYaml.default;
         } catch (e) {
-          logger.warn(`Unable to import yaml module: ${e}`);
+          logger.warn(`Unable to import js-yaml module: ${e}`);
           continue;
         }
 
-        const metadata = yaml.parse(match[1]);
+        const metadata = jsYaml.load(match[1]);
         if (!metadata || !metadata.name || !metadata.description) {
           logger.debug(`Skill文件 ${skillMdPath} 缺少必需的 name/description 字段`);
           continue;

package/src/compaction.ts

@@ -12,7 +12,7 @@
  *   5. 降级策略：摘要失败时使用更粗糙的摘要
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { AIProvider, ChatMessage } from '@zhin.js/core';
 
 const logger = new Logger(null, 'Compaction');

package/src/context-manager.ts

@@ -9,7 +9,7 @@
  * - 支持多平台、多场景
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { ChatMessage, AIProvider } from '@zhin.js/core';
 
 const logger = new Logger(null, 'ContextManager');

package/src/conversation-memory.ts

@@ -30,7 +30,7 @@
  *      → 不连续：丢弃 summary，仅用 [window]
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { AIProvider, ChatMessage } from '@zhin.js/core';
 
 const logger = new Logger(null, 'ConvMemory');
@@ -316,6 +316,13 @@ export class ConversationMemory {
   private topicStates: Map<string, TopicState> = new Map();
   /** per-session 轮次缓存（避免每次查数据库） */
   private roundCache: Map<string, number> = new Map();
+  /** 各 session 最后活跃时间（用于淘汰） */
+  private lastAccess: Map<string, number> = new Map();
+
+  /** 内存缓存上限：超过此数量时淘汰过期条目 */
+  private static readonly MAX_TRACKED_SESSIONS = 5000;
+  /** 缓存过期时间：24 小时未访问即淘汰 */
+  private static readonly SESSION_CACHE_TTL = 24 * 60 * 60 * 1000;
 
   constructor(config?: ConversationMemoryConfig) {
     this.store = new MemoryStore();
@@ -345,6 +352,9 @@ export class ConversationMemory {
     userContent: string,
     assistantContent: string,
   ): Promise<void> {
+    this.lastAccess.set(sessionId, Date.now());
+    this.pruneStaleSessionCaches();
+
     // 优先用缓存，首次才查数据库
     const cached = this.roundCache.get(sessionId);
     let currentRound = cached != null ? cached + 1 : (await this.store.getMaxRound(sessionId)) + 1;
@@ -765,10 +775,42 @@ export class ConversationMemory {
 
   // ── 生命周期 ──
 
+  /**
+   * 淘汰长时间未访问的 session 缓存，防止 topicStates/roundCache 无限增长。
+   * 触发条件：Map size 超过 MAX_TRACKED_SESSIONS。
+   */
+  private pruneStaleSessionCaches(): void {
+    if (this.lastAccess.size <= ConversationMemory.MAX_TRACKED_SESSIONS) return;
+
+    const now = Date.now();
+    const ttl = ConversationMemory.SESSION_CACHE_TTL;
+    for (const [sid, ts] of this.lastAccess) {
+      if (now - ts > ttl) {
+        this.topicStates.delete(sid);
+        this.roundCache.delete(sid);
+        this.lastAccess.delete(sid);
+        this.summarizing.delete(sid);
+      }
+    }
+
+    // 如果 TTL 淘汰后仍超限，按 LRU 删除最旧的
+    if (this.lastAccess.size > ConversationMemory.MAX_TRACKED_SESSIONS) {
+      const entries = [...this.lastAccess.entries()].sort((a, b) => a[1] - b[1]);
+      const toRemove = entries.slice(0, entries.length - ConversationMemory.MAX_TRACKED_SESSIONS);
+      for (const [sid] of toRemove) {
+        this.topicStates.delete(sid);
+        this.roundCache.delete(sid);
+        this.lastAccess.delete(sid);
+        this.summarizing.delete(sid);
+      }
+    }
+  }
+
   dispose(): void {
     this.store.dispose();
     this.summarizing.clear();
     this.topicStates.clear();
     this.roundCache.clear();
+    this.lastAccess.clear();
   }
 }

package/src/cron-engine.ts

@@ -12,7 +12,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { Cron, ZhinTool } from '@zhin.js/core';
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 
 const logger = new Logger(null, 'cron-engine');
 
@@ -197,10 +197,12 @@ export class PersistentCronEngine {
    * 卸载所有由本引擎注册的定时任务（用于 dispose）
    */
   unload(): void {
-    for (const dispose of this.disposes.values()) {
+    for (const [id, dispose] of this.disposes) {
       try {
         dispose();
-      } catch (_) {}
+      } catch (e) {
+        logger.warn(`Cron dispose failed for ${id}:`, e);
+      }
     }
     this.disposes.clear();
   }

package/src/follow-up.ts

@@ -14,7 +14,7 @@
  *   └──────────────────────────────────────────────────────────────────┘
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 
 const logger = new Logger(null, 'FollowUp');
 

package/src/hooks.ts

@@ -13,7 +13,7 @@
  * 钩子按注册顺序执行，错误不会中断其他钩子。
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 
 const logger = new Logger(null, 'AI-Hooks');
 

package/src/index.ts

@@ -167,3 +167,13 @@ export {
 } from './tools.js';
 
 export { initAgentModule } from './init.js';
+
+export {
+  MemoryStorageBackend,
+  DatabaseStorageBackend,
+  createSwappableBackend,
+} from './storage.js';
+export type {
+  StorageBackend,
+  DbModel,
+} from './storage.js';

package/src/init/create-zhin-agent.ts

@@ -0,0 +1,133 @@
+/**
+ * Create ZhinAgent global brain and wire up sub-systems
+ * (follow-up sender, subagent manager, cron engine, scheduler).
+ */
+import * as path from 'path';
+import { getPlugin, Scheduler, getScheduler, setScheduler, type MessageType, type SendOptions } from '@zhin.js/core';
+import { ZhinAgent } from '../zhin-agent/index.js';
+import { createBuiltinTools } from '../builtin-tools.js';
+import { resolveSkillInstructionMaxChars, DEFAULT_CONFIG } from '../zhin-agent/config.js';
+import { PersistentCronEngine, setCronManager } from '../cron-engine.js';
+import type { AIServiceRefs } from './shared-refs.js';
+
+export function createZhinAgentContext(refs: AIServiceRefs): void {
+  const plugin = getPlugin();
+  const { useContext, root, logger } = plugin;
+
+  useContext('ai', (ai) => {
+    if (!ai.isReady()) {
+      logger.warn('AI Service not ready, ZhinAgent not created');
+      return;
+    }
+
+    const provider = ai.getProvider();
+    const agentConfig = ai.getAgentConfig();
+    const agent = new ZhinAgent(provider, agentConfig);
+    refs.zhinAgent = agent;
+
+    const skillRegistry = root.inject('skill');
+    if (skillRegistry) agent.setSkillRegistry(skillRegistry);
+
+    // Follow-up reminder sender
+    agent.setFollowUpSender(async (record) => {
+      const adapter = root.inject(record.platform) as { sendMessage?: (opts: SendOptions) => Promise<string> } | undefined;
+      if (!adapter || typeof adapter.sendMessage !== 'function') {
+        logger.warn(`[跟进提醒] 找不到适配器: ${record.platform}`);
+        return;
+      }
+      await adapter.sendMessage({
+        context: record.platform,
+        bot: record.bot_id,
+        id: record.scene_id,
+        type: record.scene_type as MessageType,
+        content: `⏰ 定时提醒：${record.message}`,
+      });
+    });
+
+    // Subagent manager for background tasks
+    agent.initSubagentManager(() => {
+      const modelName = provider.models[0] || '';
+      const fullConfig = { ...DEFAULT_CONFIG, ...agentConfig } as Required<import('../zhin-agent/config.js').ZhinAgentConfig>;
+      const zhinTools = createBuiltinTools({ skillInstructionMaxChars: resolveSkillInstructionMaxChars(fullConfig, modelName) });
+      return zhinTools.map(zt => {
+        const t = zt.toTool();
+        return {
+          name: t.name,
+          description: t.description,
+          parameters: t.parameters,
+          execute: t.execute as (args: Record<string, any>) => Promise<unknown>,
+          tags: t.tags,
+          keywords: t.keywords,
+        };
+      });
+    });
+    agent.setSubagentSender(async (origin, content) => {
+      const adapter = root.inject(origin.platform) as { sendMessage?: (opts: SendOptions) => Promise<string> } | undefined;
+      if (!adapter || typeof adapter.sendMessage !== 'function') {
+        logger.warn(`[子任务] 找不到适配器: ${origin.platform}`);
+        return;
+      }
+      await adapter.sendMessage({
+        context: origin.platform,
+        bot: origin.botId,
+        id: origin.sceneId,
+        type: origin.sceneType as MessageType,
+        content,
+      });
+    });
+
+    // Persistent cron engine
+    let cronEngine: PersistentCronEngine | null = null;
+    const cronFeature = root.inject('cron') as import('@zhin.js/core').CronFeature | undefined;
+    if (cronFeature && typeof cronFeature.add === 'function') {
+      const dataDir = path.join(process.cwd(), 'data');
+      const addCron: import('../cron-engine.js').AddCronFn = (c) => cronFeature.add(c, 'cron-engine');
+      const runner = async (prompt: string) => {
+        if (!refs.zhinAgent) return;
+        await refs.zhinAgent.process(prompt, {
+          platform: 'cron',
+          senderId: 'system',
+          sceneId: 'cron',
+        });
+      };
+      cronEngine = new PersistentCronEngine({ dataDir, addCron, runner });
+      cronEngine.load();
+      setCronManager({ cronFeature, engine: cronEngine });
+    }
+
+    // Unified scheduler (at/every/cron + Heartbeat)
+    const dataDir = path.join(process.cwd(), 'data');
+    const scheduler = new Scheduler({
+      storePath: path.join(dataDir, 'scheduler-jobs.json'),
+      workspace: process.cwd(),
+      onJob: async (job) => {
+        if (!refs.zhinAgent) return;
+        await refs.zhinAgent.process(job.payload.message, {
+          platform: 'cron',
+          senderId: 'system',
+          sceneId: 'scheduler',
+        });
+      },
+      heartbeatEnabled: true,
+      heartbeatIntervalMs: 30 * 60 * 1000,
+    });
+    setScheduler(scheduler);
+    scheduler.start().catch((e) => logger.warn('Scheduler start failed: ' + (e as Error).message));
+
+    logger.debug('ZhinAgent created');
+    return () => {
+      setCronManager(null);
+      if (cronEngine) {
+        cronEngine.unload();
+        cronEngine = null;
+      }
+      const s = getScheduler();
+      if (s) {
+        s.stop();
+        setScheduler(null);
+      }
+      agent.dispose();
+      refs.zhinAgent = null;
+    };
+  });
+}

package/src/init/register-ai-service.ts

@@ -0,0 +1,53 @@
+/**
+ * Register AIService as a plugin context.
+ */
+import './types.js';
+import { getPlugin, type Plugin } from '@zhin.js/core';
+import type { AIConfig } from '@zhin.js/core';
+import { AIService } from '../service.js';
+import type { AIServiceRefs } from './shared-refs.js';
+
+export function registerAIService(refs: AIServiceRefs): void {
+  const plugin = getPlugin();
+  const { provide, root, logger } = plugin;
+
+  provide<'ai'>({
+    name: 'ai',
+    description: 'AI Service - Multi-model LLM integration',
+    async mounted(_p: Plugin) {
+      const configService = root.inject('config');
+      const appConfig =
+        configService?.getPrimary<{ ai?: AIConfig }>() || {};
+      const config = appConfig.ai || {};
+
+      if (config.enabled === false) {
+        logger.info('AI Service is disabled');
+        return undefined as unknown as AIService;
+      }
+
+      const service = new AIService(config);
+      refs.aiService = service;
+      service.setPlugin(root);
+
+      const providers = service.listProviders();
+      if (providers.length === 0) {
+        logger.warn(
+          'No AI providers configured. Please add API keys in zhin.config (yml/json/toml)',
+        );
+      } else {
+        logger.info(
+          `AI Service started with providers: ${providers.join(', ')}`,
+        );
+      }
+
+      return service;
+    },
+    async dispose(service) {
+      if (service) {
+        service.dispose();
+        refs.aiService = null;
+        logger.info('AI Service stopped');
+      }
+    },
+  });
+}