@zhin.js/agent 0.0.16 → 0.0.18

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

@@ -7,7 +7,7 @@
 
 import type { ToolContext } from '@zhin.js/core';
 import type { AgentTool } from '@zhin.js/core';
-import type { ConversationMemory } from '../conversation-memory.js';
+import type { ConversationMemory } from '@zhin.js/ai';
 import type { UserProfileStore } from '../user-profile.js';
 import type { FollowUpManager } from '../follow-up.js';
 import type { SubagentManager, SubagentOrigin } from '../subagent.js';

package/src/zhin-agent/config.ts

@@ -2,8 +2,8 @@
  * ZhinAgent 配置、常量、类型定义
  */
 
-import type { RateLimitConfig } from '../rate-limiter.js';
-import { DEFAULT_CONTEXT_TOKENS } from '../compaction.js';
+import type { RateLimitConfig } from '@zhin.js/ai';
+import { DEFAULT_CONTEXT_TOKENS } from '@zhin.js/ai';
 
 export type ModelSizeHint = 'small' | 'medium' | 'large';
 
@@ -56,6 +56,14 @@ export const PERM_MAP: Record<string, number> = {
 
 export type OnChunkCallback = (chunk: string, full: string) => void;
 
+/** 上下文感知内置工具的关键词触发正则 */
+export const KEYWORD_TRIGGERS = {
+  chatHistory: /之前|上次|历史|回忆|聊过|记录|还记得|曾经/i,
+  userProfile: /偏好|设置|配置|档案|资料|时区|timezone|profile|喜好|我叫|叫我|记住我/i,
+  scheduleFollowUp: /提醒|定时|过一会|跟进|别忘|取消提醒|reminder|分钟后|小时后/i,
+  spawnTask: /后台|子任务|spawn|异步|background|并行|独立处理/i,
+} as const;
+
 export interface ZhinAgentConfig {
   persona?: string;
   maxIterations?: number;

package/src/zhin-agent/index.ts

@@ -18,21 +18,21 @@
 
 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';
-import type { ContextManager } from '../context-manager.js';
-import { ConversationMemory } from '../conversation-memory.js';
-import type { OutputElement } from '../output.js';
-import { parseOutput } from '../output.js';
+import { createAgent } from '@zhin.js/ai';
+import { SessionManager, createMemorySessionManager } from '@zhin.js/ai';
+import type { ContextManager } from '@zhin.js/ai';
+import { ConversationMemory } from '@zhin.js/ai';
+import type { OutputElement } from '@zhin.js/ai';
+import { parseOutput } from '@zhin.js/ai';
 import { UserProfileStore } from '../user-profile.js';
-import { RateLimiter } from '../rate-limiter.js';
-import { detectTone } from '../tone-detector.js';
+import { RateLimiter } from '@zhin.js/ai';
+import { detectTone } from '@zhin.js/ai';
 import { FollowUpManager, type FollowUpSender } from '../follow-up.js';
 import { SubagentManager, type SubagentResultSender } from '../subagent.js';
 import {
   pruneHistoryForContext,
   DEFAULT_CONTEXT_TOKENS,
-} from '../compaction.js';
+} from '@zhin.js/ai';
 import { triggerAIHook, createAIHookEvent } from '../hooks.js';
 
 // ── Sub-modules ─────────────────────────────────────────────────────
@@ -40,6 +40,7 @@ import {
   type ZhinAgentConfig,
   type OnChunkCallback,
   DEFAULT_CONFIG,
+  KEYWORD_TRIGGERS,
 } from './config.js';
 import { applyExecPolicyToTools } from './exec-policy.js';
 import { collectRelevantTools } from './tool-collector.js';
@@ -62,6 +63,11 @@ export type { ZhinAgentConfig, OnChunkCallback } from './config.js';
 const logger = new Logger(null, 'ZhinAgent');
 const now = () => performance.now();
 
+/** Strip `<think>…</think>` blocks that some reasoning models embed in content. */
+function stripThinkBlocks(text: string): string {
+  return text.replace(/<think>[\s\S]*?<\/think>\s*/g, '').trim();
+}
+
 // ============================================================================
 // ZhinAgent
 // ============================================================================
@@ -212,16 +218,16 @@ export class ZhinAgent {
     });
 
     // Inject context-aware built-in tools on keyword match
-    if (/之前|上次|历史|回忆|聊过|记录|还记得|曾经/i.test(content)) {
+    if (KEYWORD_TRIGGERS.chatHistory.test(content)) {
       allTools.push(createChatHistoryTool(sessionId, this.memory));
     }
-    if (/偏好|设置|配置|档案|资料|时区|timezone|profile|喜好|我叫|叫我|记住我/i.test(content)) {
+    if (KEYWORD_TRIGGERS.userProfile.test(content)) {
       allTools.push(createUserProfileTool(userId, this.userProfiles));
     }
-    if (/提醒|定时|过一会|跟进|别忘|取消提醒|reminder|分钟后|小时后/i.test(content)) {
+    if (KEYWORD_TRIGGERS.scheduleFollowUp.test(content)) {
       allTools.push(createScheduleFollowUpTool(sessionId, context, this.followUps));
     }
-    if (this.subagentManager && /后台|子任务|spawn|异步|background|并行|独立处理/i.test(content)) {
+    if (this.subagentManager && KEYWORD_TRIGGERS.spawnTask.test(content)) {
       allTools.push(createSpawnTaskTool(context, this.subagentManager));
     }
 
@@ -352,7 +358,7 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
 
       const userMessageWithHistory = buildUserMessageWithHistory(historyMessages, content);
       const result = await agent.run(userMessageWithHistory, []);
-      reply = result.content || this.fallbackFormat(result.toolCalls);
+      reply = stripThinkBlocks(result.content) || this.fallbackFormat(result.toolCalls);
       logger.info(`[Agent 路径] 过滤=${filterMs}ms, 记忆=${memMs}ms, Agent=${(now() - tAgent).toFixed(0)}ms, 总=${(now() - t0).toFixed(0)}ms`);
     }
 
@@ -433,16 +439,25 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
     let reply = '';
     try {
       for await (const chunk of this.provider.chatStream({ model: visionModel, messages })) {
-        const delta = chunk.choices?.[0]?.delta?.content;
-        if (delta && typeof delta === 'string') {
-          reply += delta;
-          if (onChunk) onChunk(delta, reply);
+        const delta = chunk.choices?.[0]?.delta;
+        if (!delta) continue;
+        const text = typeof delta.content === 'string' ? delta.content : '';
+        if (text) {
+          reply += text;
+          if (onChunk) onChunk(text, reply);
         }
       }
+      reply = stripThinkBlocks(reply);
+      if (!reply) {
+        logger.warn('[processMultimodal] 流式响应内容为空，尝试非流式回退');
+        const response = await this.provider.chat({ model: visionModel, messages });
+        const msg = response.choices[0]?.message?.content;
+        reply = stripThinkBlocks(typeof msg === 'string' ? msg : '');
+      }
     } catch {
       const response = await this.provider.chat({ model: visionModel, messages });
       const msg = response.choices[0]?.message?.content;
-      reply = typeof msg === 'string' ? msg : '';
+      reply = stripThinkBlocks(typeof msg === 'string' ? msg : '');
     }
 
     if (!reply) reply = '抱歉，我无法理解这条消息。';
@@ -474,20 +489,27 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
     try {
       let result = '';
       for await (const chunk of this.provider.chatStream({ model, messages })) {
-        const delta = chunk.choices?.[0]?.delta?.content;
-        if (delta && typeof delta === 'string') {
-          result += delta;
-          if (onChunk) onChunk(delta, result);
+        const delta = chunk.choices?.[0]?.delta;
+        if (!delta) continue;
+        const text = typeof delta.content === 'string' ? delta.content : '';
+        if (text) {
+          result += text;
+          if (onChunk) onChunk(text, result);
         }
       }
-      return result;
+      result = stripThinkBlocks(result);
+      if (result) return result;
+      // Streaming returned empty content — fall back to non-streaming
+      logger.warn('[streamChat] 流式响应内容为空，尝试非流式回退');
     } catch {
-      const response = await this.provider.chat({ model, messages });
-      const msg = response.choices[0]?.message?.content;
-      const result = typeof msg === 'string' ? msg : '';
-      if (onChunk && result) onChunk(result, result);
-      return result;
+      // Stream failed — fall back to non-streaming
     }
+    const response = await this.provider.chat({ model, messages });
+    const msg = response.choices[0]?.message?.content;
+    let result = typeof msg === 'string' ? msg : '';
+    result = stripThinkBlocks(result);
+    if (onChunk && result) onChunk(result, result);
+    return result;
   }
 
   private async saveToSession(

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

@@ -5,7 +5,7 @@
 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';
+import { Agent } from '@zhin.js/ai';
 import type { ZhinAgentConfig } from './config.js';
 import { PERM_MAP } from './config.js';