@zhin.js/agent 0.0.0 → 0.0.1

package/src/rate-limiter.ts

@@ -8,7 +8,7 @@
  *   2. 优雅降级 — 超限时返回友好提示而非静默丢弃
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 
 const logger = new Logger(null, 'RateLimiter');
 

package/src/service.ts

@@ -3,7 +3,7 @@
  * 统一管理多个模型提供商，提供会话和 Agent 能力
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { Plugin, Tool, ToolContext, AITriggerConfig } from '@zhin.js/core';
 import type {
   AIProvider,
@@ -224,12 +224,12 @@ ${preExecutedData ? `\n已自动获取的数据：${preExecutedData}\n` : ''}
     const agentTool: AgentTool = {
       name: tool.name,
       description: tool.description,
-      parameters: tool.parameters as any,
-      execute: tool.execute,
+      parameters: tool.parameters,
+      execute: async (args) => tool.execute(args),
     };
     if (tool.tags?.length) agentTool.tags = tool.tags;
     if (tool.permissionLevel) agentTool.permissionLevel = AIService.PERM_MAP[tool.permissionLevel] ?? 0;
-    if ((tool as any).keywords?.length) agentTool.keywords = (tool as any).keywords;
+    if (tool.keywords?.length) agentTool.keywords = tool.keywords;
     return agentTool;
   }
 

package/src/session.ts

@@ -9,7 +9,7 @@
  * - 更长的上下文记忆能力
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { ChatMessage, SessionConfig, Session } from '@zhin.js/core';
 
 const logger = new Logger(null, 'AI-Session');
@@ -192,14 +192,17 @@ export class DatabaseSessionManager implements ISessionManager {
   private saveTimer?: ReturnType<typeof setTimeout>;
   private model: any; // 数据库模型
 
+  /** 内存缓存上限，超出时淘汰最久未访问的条目 */
+  private static readonly MAX_CACHE_SIZE = 2000;
+
   constructor(
     model: any,
     config: { maxHistory?: number; expireMs?: number } = {}
   ) {
     this.model = model;
     this.config = {
-      maxHistory: config.maxHistory ?? 200, // 数据库支持更长的历史
-      expireMs: config.expireMs ?? 7 * 24 * 60 * 60 * 1000, // 7 天过期
+      maxHistory: config.maxHistory ?? 200,
+      expireMs: config.expireMs ?? 7 * 24 * 60 * 60 * 1000,
     };
 
     // 定期清理过期会话（每小时）
@@ -286,7 +289,6 @@ export class DatabaseSessionManager implements ISessionManager {
       session = await this.loadSession(sessionId) ?? undefined;
 
       if (!session) {
-        // 创建新会话
         session = {
           id: sessionId,
           config: config || { provider: 'openai' },
@@ -296,6 +298,11 @@ export class DatabaseSessionManager implements ISessionManager {
         };
       }
 
+      this.evictCacheIfNeeded();
+      this.cache.set(sessionId, session);
+    } else {
+      // LRU: 重新插入以更新 Map 的迭代顺序
+      this.cache.delete(sessionId);
       this.cache.set(sessionId, session);
     }
 
@@ -305,6 +312,21 @@ export class DatabaseSessionManager implements ISessionManager {
     return session;
   }
 
+  /**
+   * 当缓存超过上限时，淘汰最久未访问的条目。
+   * 利用 Map 的插入顺序（最旧的在前）。
+   */
+  private evictCacheIfNeeded(): void {
+    while (this.cache.size >= DatabaseSessionManager.MAX_CACHE_SIZE) {
+      const oldest = this.cache.keys().next().value;
+      if (oldest !== undefined) {
+        this.cache.delete(oldest);
+      } else {
+        break;
+      }
+    }
+  }
+
   async has(sessionId: string): Promise<boolean> {
     if (this.cache.has(sessionId)) {
       return true;

package/src/storage.ts

@@ -0,0 +1,135 @@
+/**
+ * StorageBackend — Unified storage abstraction layer
+ *
+ * Provides a common interface for AI sub-systems (session, context, memory,
+ * user profile, follow-up) to switch between in-memory and database backends
+ * without changing business logic.
+ *
+ * Usage:
+ *   const backend = new MemoryStorageBackend<MyRecord>();
+ *   // ... later, when DB is ready:
+ *   const dbBackend = new DatabaseStorageBackend<MyRecord>(model, { keyField: 'session_id' });
+ *   service.upgradeBackend(dbBackend);
+ */
+
+export interface StorageBackend<T extends Record<string, any>> {
+  get(key: string): Promise<T | null>;
+  set(key: string, value: T): Promise<void>;
+  delete(key: string): Promise<boolean>;
+  list(filter?: Partial<T>): Promise<T[]>;
+  clear(): Promise<void>;
+  readonly type: 'memory' | 'database';
+}
+
+/**
+ * In-memory storage backend.
+ */
+export class MemoryStorageBackend<T extends Record<string, any>> implements StorageBackend<T> {
+  readonly type = 'memory' as const;
+  private data = new Map<string, T>();
+
+  async get(key: string): Promise<T | null> {
+    return this.data.get(key) ?? null;
+  }
+
+  async set(key: string, value: T): Promise<void> {
+    this.data.set(key, value);
+  }
+
+  async delete(key: string): Promise<boolean> {
+    return this.data.delete(key);
+  }
+
+  async list(filter?: Partial<T>): Promise<T[]> {
+    const all = Array.from(this.data.values());
+    if (!filter) return all;
+    return all.filter(item => {
+      for (const [k, v] of Object.entries(filter)) {
+        if (item[k] !== v) return false;
+      }
+      return true;
+    });
+  }
+
+  async clear(): Promise<void> {
+    this.data.clear();
+  }
+}
+
+/**
+ * Database model interface aligned with @zhin.js/database's RelatedModel API.
+ */
+export interface DbModel {
+  select(...fields: string[]): any;
+  create(data: Record<string, any>): Promise<any>;
+  update(data: Partial<any>): any;
+  delete(condition: Record<string, any>): any;
+}
+
+/**
+ * Database-backed storage backend.
+ */
+export class DatabaseStorageBackend<T extends Record<string, any>> implements StorageBackend<T> {
+  readonly type = 'database' as const;
+
+  constructor(
+    private model: DbModel,
+    private options: {
+      /** The field name used as lookup key (e.g. 'session_id', 'user_id') */
+      keyField: string;
+    },
+  ) {}
+
+  async get(key: string): Promise<T | null> {
+    const rows: T[] = await this.model
+      .select()
+      .where({ [this.options.keyField]: key });
+    return rows[0] ?? null;
+  }
+
+  async set(key: string, value: T): Promise<void> {
+    const existing = await this.get(key);
+    if (existing) {
+      await this.model
+        .update(value)
+        .where({ [this.options.keyField]: key });
+    } else {
+      await this.model.create({ ...value, [this.options.keyField]: key });
+    }
+  }
+
+  async delete(key: string): Promise<boolean> {
+    try {
+      await this.model.delete({ [this.options.keyField]: key });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async list(filter?: Partial<T>): Promise<T[]> {
+    if (filter) {
+      return this.model.select().where(filter);
+    }
+    return this.model.select();
+  }
+
+  async clear(): Promise<void> {
+    const all = await this.list();
+    for (const item of all) {
+      const key = (item as Record<string, unknown>)[this.options.keyField] as string | undefined;
+      if (key) await this.delete(key);
+    }
+  }
+}
+
+/**
+ * Helper to create a swappable backend ref.
+ * Call `swap(newBackend)` to atomically upgrade from memory to database.
+ */
+export function createSwappableBackend<T extends Record<string, any>>(
+  initial: StorageBackend<T>,
+): { backend: StorageBackend<T>; swap: (next: StorageBackend<T>) => void } {
+  const ref = { backend: initial, swap: (next: StorageBackend<T>) => { ref.backend = next; } };
+  return ref;
+}

package/src/subagent.ts

@@ -9,7 +9,7 @@
  */
 
 import { randomUUID } from 'crypto';
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { AIProvider, AgentTool } from '@zhin.js/core';
 import { createAgent } from './agent.js';
 import type { ZhinAgentConfig } from './zhin-agent/config.js';

package/src/tools.ts

@@ -3,7 +3,7 @@
  * 内置工具集合 - 使用 ZhinTool 类定义
  */
 
-import { ZhinTool, type Tool } from '@zhin.js/core';
+import { ZhinTool, type Tool, evaluate, execute } from '@zhin.js/core';
 
 /**
  * 计算器工具
@@ -16,7 +16,6 @@ export const calculatorTool = new ZhinTool('calculator')
   .param('expression', { type: 'string', description: '数学表达式，例如 "2 + 3 * 4" 或 "sqrt(16)"' }, true)
   .execute(async ({ expression }) => {
     try {
-      // 安全的数学表达式求值
       const sanitized = (expression as string)
         .replace(/[^0-9+\-*/().^eEsincosqrtabspowlogxMathPI\s]/g, '')
         .replace(/\bsqrt\b/g, 'Math.sqrt')
@@ -30,7 +29,8 @@ export const calculatorTool = new ZhinTool('calculator')
         .replace(/\bE\b(?![0-9])/g, 'Math.E')
         .replace(/\^/g, '**');
 
-      const result = new Function(`return ${sanitized}`)();
+      const result = evaluate(sanitized, { Math });
+      if (result === undefined) return { error: '无法计算表达式', expression };
       return { result, expression };
     } catch (error) {
       return { error: '无法计算表达式', expression };
@@ -104,13 +104,10 @@ export const codeRunnerTool = new ZhinTool('run_code')
   .param('code', { type: 'string', description: 'JavaScript 代码' }, true)
   .execute(async ({ code }) => {
     try {
-      // 简单的沙箱执行（生产环境应使用 vm2 或 isolated-vm）
-      const result = new Function(`
-        'use strict';
-        const console = { log: (...args) => args.join(' ') };
-        return (function() { ${code} })();
-      `)();
-      
+      const sandbox = {
+        console: { log: (...args: unknown[]) => args.map(String).join(' ') },
+      };
+      const result = execute(code as string, sandbox);
       return {
         success: true,
         result: result !== undefined ? String(result) : 'undefined',

package/src/user-profile.ts

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

package/src/zhin-agent/builtin-tools.ts

@@ -147,7 +147,7 @@ export function createScheduleFollowUpTool(
   const botId = context.botId || '';
   const senderId = context.senderId || '';
   const sceneId = context.sceneId || '';
-  const sceneType = (context.message as any)?.$channel?.type || 'private';
+  const sceneType = context.message?.$channel?.type || 'private';
 
   return {
     name: 'schedule_followup',
@@ -208,7 +208,7 @@ export function createSpawnTaskTool(
   const botId = context.botId || '';
   const senderId = context.senderId || '';
   const sceneId = context.sceneId || '';
-  const sceneType = (context.message as any)?.$channel?.type || 'private';
+  const sceneType = context.message?.$channel?.type || 'private';
 
   return {
     name: 'spawn_task',

package/src/zhin-agent/config.ts

@@ -25,7 +25,7 @@ export function inferModelSize(modelName: string): ModelSizeHint {
  * Priority: explicit config > model name inference.
  */
 export function resolveModelSize(config: Required<ZhinAgentConfig>, modelName: string): ModelSizeHint {
-  if (config.modelSizeHint && config.modelSizeHint !== ('' as any)) return config.modelSizeHint;
+  if (config.modelSizeHint && (config.modelSizeHint as string) !== '') return config.modelSizeHint as ModelSizeHint;
   return inferModelSize(modelName);
 }
 
@@ -80,7 +80,7 @@ export interface ZhinAgentConfig {
   maxSubagentIterations?: number;
   subagentTools?: string[];
   /** 模型大小提示，影响技能指令截断长度。留空则根据模型名自动推断 */
-  modelSizeHint?: 'small' | 'medium' | 'large';
+  modelSizeHint?: '' | 'small' | 'medium' | 'large';
   /** 技能指令最大字符数（覆盖 modelSizeHint 推断值） */
   skillInstructionMaxChars?: number;
 }
@@ -108,6 +108,6 @@ export const DEFAULT_CONFIG: Required<ZhinAgentConfig> = {
   execAsk: false,
   maxSubagentIterations: 15,
   subagentTools: [],
-  modelSizeHint: '' as any,
+  modelSizeHint: '',
   skillInstructionMaxChars: 0,
 };

package/src/zhin-agent/index.ts

@@ -16,7 +16,7 @@
  *  12. 多模态输入：图片/音频直接传给视觉模型
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { Tool, ToolContext, SkillFeature, AIProvider, AgentTool, ChatMessage, ContentPart } from '@zhin.js/core';
 import { createAgent } from '../agent.js';
 import { SessionManager, createMemorySessionManager } from '../session.js';

package/src/zhin-agent/tool-collector.ts

@@ -2,7 +2,7 @@
  * ZhinAgent 工具收集 — 两级过滤 (Skill → Tool) + 技能支持工具注入
  */
 
-import { Logger } from '@zhin.js/logger';
+import { Logger } from '@zhin.js/core';
 import type { Tool, ToolContext, SkillFeature } from '@zhin.js/core';
 import type { AgentTool } from '@zhin.js/core';
 import { Agent } from '../agent.js';
@@ -22,7 +22,7 @@ export function toAgentTool(tool: Tool, context?: ToolContext): AgentTool {
     contextKey: string;
     paramType: string;
   }> = [];
-  let cleanParameters: any = tool.parameters;
+  let cleanParameters: AgentTool['parameters'] = tool.parameters;
 
   if (context && tool.parameters?.properties) {
     const props = tool.parameters.properties as Record<string, any>;
@@ -30,7 +30,7 @@ export function toAgentTool(tool: Tool, context?: ToolContext): AgentTool {
     const filteredRequired: string[] = [];
 
     for (const [key, schema] of Object.entries(props)) {
-      if (schema.contextKey && (context as any)[schema.contextKey] != null) {
+      if (schema.contextKey && (context as Record<string, unknown>)[schema.contextKey] != null) {
         contextInjections.push({
           paramName: key,
           contextKey: schema.contextKey,
@@ -56,12 +56,12 @@ export function toAgentTool(tool: Tool, context?: ToolContext): AgentTool {
   const at: AgentTool = {
     name: tool.name,
     description: tool.description,
-    parameters: cleanParameters as any,
+    parameters: cleanParameters,
     execute: context
-      ? (args: Record<string, any>) => {
+      ? async (args: Record<string, any>) => {
           const enrichedArgs = { ...args };
           for (const { paramName, contextKey, paramType } of contextInjections) {
-            let value = (context as any)[contextKey];
+            let value = (context as Record<string, unknown>)[contextKey];
             if (paramType === 'number' && typeof value === 'string') {
               value = Number(value);
             } else if (paramType === 'string' && typeof value !== 'string') {
@@ -71,13 +71,13 @@ export function toAgentTool(tool: Tool, context?: ToolContext): AgentTool {
           }
           return originalExecute(enrichedArgs, context);
         }
-      : originalExecute,
+      : async (args: Record<string, any>) => originalExecute(args),
   };
   if (tool.tags?.length) at.tags = tool.tags;
   if (tool.keywords?.length) at.keywords = tool.keywords;
   if (tool.permissionLevel) at.permissionLevel = PERM_MAP[tool.permissionLevel] ?? 0;
   if (tool.preExecutable) at.preExecutable = true;
-  if ((tool as any).kind) at.kind = (tool as any).kind;
+  if (tool.kind) at.kind = tool.kind;
   return at;
 }