@zhin.js/agent 0.1.23 → 0.1.25

package/lib/zhin-agent/tool-calls-user-format.js

@@ -0,0 +1,122 @@
+/**
+ * Format orchestrator tool-call history for end users (IM reply).
+ * Avoids dumping raw JSON / internal meta-tool noise.
+ */
+import { sanitizeToolResult } from '@zhin.js/ai';
+const INTERNAL_META_TOOLS = new Set(['activate_skill', 'install_skill', 'tool_search']);
+function asString(result) {
+    if (result == null)
+        return '';
+    if (typeof result === 'string')
+        return result;
+    try {
+        return JSON.stringify(result);
+    }
+    catch {
+        return String(result);
+    }
+}
+function parseRunDeferredPayload(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed.startsWith('{'))
+        return null;
+    try {
+        const obj = JSON.parse(trimmed);
+        return {
+            status: typeof obj.status === 'string' ? obj.status : undefined,
+            summary: typeof obj.summary === 'string' ? obj.summary : undefined,
+            error: typeof obj.error === 'string' ? obj.error : undefined,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function formatRunDeferredTaskResult(result) {
+    const raw = asString(result);
+    const parsed = parseRunDeferredPayload(raw);
+    if (parsed) {
+        if (parsed.status === 'error') {
+            return parsed.error || '子任务执行失败。';
+        }
+        const summary = parsed.summary?.trim();
+        if (summary) {
+            return sanitizeToolResult(summary, { maxChars: 4000 });
+        }
+        return '子任务已完成，但没有可展示的文本摘要。';
+    }
+    const cleaned = sanitizeToolResult(raw, { maxChars: 4000 });
+    return cleaned || undefined;
+}
+function formatGenericToolResult(tool, result) {
+    const raw = asString(result);
+    const cleaned = sanitizeToolResult(raw, { maxChars: 2000 });
+    if (!cleaned)
+        return '';
+    if (INTERNAL_META_TOOLS.has(tool))
+        return cleaned;
+    return cleaned;
+}
+/**
+ * Build a single user-facing message from tool call history.
+ */
+export function formatToolCallsForUser(toolCalls) {
+    if (toolCalls.length === 0) {
+        return '任务已结束，但没有可展示的结果。';
+    }
+    const deferredSummaries = [];
+    const otherParts = [];
+    let toolSearchNote;
+    for (const tc of toolCalls) {
+        if (tc.tool === 'run_deferred_task') {
+            const block = formatRunDeferredTaskResult(tc.result);
+            if (block)
+                deferredSummaries.push(block);
+            continue;
+        }
+        if (tc.tool === 'tool_search') {
+            toolSearchNote = formatGenericToolResult(tc.tool, tc.result);
+            continue;
+        }
+        if (INTERNAL_META_TOOLS.has(tc.tool))
+            continue;
+        const block = formatGenericToolResult(tc.tool, tc.result);
+        if (block)
+            otherParts.push(block);
+    }
+    if (deferredSummaries.length > 0) {
+        const last = deferredSummaries[deferredSummaries.length - 1];
+        if (deferredSummaries.length > 1) {
+            return [
+                `（共执行 ${deferredSummaries.length} 次子任务，以下为最后一次结果）`,
+                '',
+                last,
+            ].join('\n');
+        }
+        return last;
+    }
+    if (otherParts.length > 0) {
+        return otherParts.join('\n\n');
+    }
+    if (toolSearchNote) {
+        return toolSearchNote;
+    }
+    return '未能从工具结果中提取有效信息，请换一种说法或缩小问题范围后重试。';
+}
+/** Agent 内置兜底正文（如 max-iter / error recover）是否应改用 formatToolCallsForUser */
+export function looksLikeInternalToolDump(text) {
+    const t = text.trim();
+    if (!t)
+        return false;
+    if (/^Done\.\s+Information retrieved:/i.test(t))
+        return true;
+    if (/^Something went wrong:/i.test(t) && /【\w+】/.test(t))
+        return true;
+    const blocks = t.match(/【[^】]+】/g);
+    if ((blocks?.length ?? 0) >= 2)
+        return true;
+    if (/【run_deferred_task】[\s\S]*"status"\s*:/i.test(t))
+        return true;
+    return false;
+}
+//# sourceMappingURL=tool-calls-user-format.js.map

package/lib/zhin-agent/tool-calls-user-format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-calls-user-format.js","sourceRoot":"","sources":["../../src/zhin-agent/tool-calls-user-format.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/agent",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Zhin AI Agent — session, ZhinAgent, init; composes @zhin.js/core providers and tools",
   "type": "module",
   "main": "./lib/index.js",
@@ -18,9 +18,9 @@
   "dependencies": {
     "he": "^1.2.0",
     "js-yaml": "^4.1.0",
-    "@zhin.js/ai": "1.1.23",
-    "@zhin.js/core": "1.1.25",
-    "@zhin.js/logger": "0.1.65"
+    "@zhin.js/ai": "1.1.25",
+    "@zhin.js/core": "1.1.27",
+    "@zhin.js/logger": "0.1.67"
   },
   "peerDependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0"
@@ -34,7 +34,7 @@
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@types/he": "^1.2.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^25.8.0",
+    "@types/node": "^25.9.1",
     "rimraf": "^6.0.0",
     "typescript": "^6.0.3"
   },