@zhin.js/agent 0.1.15 → 0.1.16

package/lib/zhin-agent/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAKzD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAI/D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,CAGpG;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5G;AAED,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,sBAAsB,wDAAwD,CAAC;AAC5F,eAAO,MAAM,sBAAsB,wCAAwC,CAAC;AAE5E,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAM3C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAEpE,wBAAwB;AACxB,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC7C,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC/D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,aAAa,CAAC,EAAE,EAAE,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IAClD,sCAAsC;IACtC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,eAAe,CA2BpD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAKzD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,CAI/D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,CAGpG;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5G;AAED,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,sBAAsB,wDAAwD,CAAC;AAC5F,eAAO,MAAM,sBAAsB,wCAAwC,CAAC;AAE5E,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAA6B,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAGpE,wBAAwB;AACxB,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC7C,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC/D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,aAAa,CAAC,EAAE,EAAE,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IAClD,sCAAsC;IACtC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,iDAAiD;IACjD,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,yDAAyD;IACzD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,eAAe,CA6BpD,CAAC;AAEF,8CAA8C;AAC9C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAIpH"}

package/lib/zhin-agent/config.js

@@ -2,6 +2,7 @@
  * ZhinAgent 配置、常量、类型定义
  */
 import { DEFAULT_CONTEXT_TOKENS } from '@zhin.js/ai';
+import { PERMISSION_LEVEL_PRIORITY } from '../orchestrator/tool-selection.js';
 const SMALL_MODEL_RE = /[:\-_](0\.5|1\.?[58]?|[3-8])b\b/i;
 const MEDIUM_MODEL_RE = /[:\-_](14|[12][0-9]|32)b\b/i;
 /**
@@ -40,13 +41,8 @@ export function resolveSkillInstructionMaxChars(config, modelName) {
 export const SECTION_SEP = '\n\n---\n\n';
 export const HISTORY_CONTEXT_MARKER = '[Chat messages since your last reply - for context]';
 export const CURRENT_MESSAGE_MARKER = '[Current message - respond to this]';
-export const PERM_MAP = {
-    user: 0,
-    group_admin: 1,
-    group_owner: 2,
-    bot_admin: 3,
-    owner: 4,
-};
+export const PERM_MAP = PERMISSION_LEVEL_PRIORITY;
+const TRUE_VALUES = new Set(['1', 'true', 'yes', 'on']);
 /** 上下文感知内置工具的关键词触发正则 */
 export const KEYWORD_TRIGGERS = {
     chatHistory: /之前|上次|历史|回忆|聊过|记录|还记得|曾经/i,
@@ -80,5 +76,14 @@ export const DEFAULT_CONFIG = {
     subagentTools: [],
     modelSizeHint: '',
     skillInstructionMaxChars: 0,
+    modelHarness: {},
+    phaseTrace: false,
 };
+/** `env` 参数主要用于测试注入，运行时默认读取 `process.env`。 */
+export function isPhaseTraceEnabled(config, env = process.env) {
+    if (config.phaseTrace)
+        return true;
+    const raw = env.ZHIN_AGENT_PHASE_TRACE?.trim().toLowerCase();
+    return !!raw && TRUE_VALUES.has(raw);
+}
 //# sourceMappingURL=config.js.map

package/lib/zhin-agent/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAIrD,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAC1D,MAAM,eAAe,GAAG,6BAA6B,CAAC;AAEtD;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,OAAO,CAAC;IACnD,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,QAAQ,CAAC;IACrD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAiC,EAAE,SAAiB;IACnF,IAAI,MAAM,CAAC,aAAa,IAAK,MAAM,CAAC,aAAwB,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,aAA8B,CAAC;IAClH,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAAC,MAAiC,EAAE,SAAiB;IAClG,IAAI,MAAM,CAAC,wBAAwB,IAAI,MAAM,CAAC,wBAAwB,GAAG,CAAC;QAAE,OAAO,MAAM,CAAC,wBAAwB,CAAC;IACnH,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;QAC1B,KAAK,QAAQ,CAAC,CAAC,OAAO,IAAI,CAAC;QAC3B,KAAK,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;AACzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,qDAAqD,CAAC;AAC5F,MAAM,CAAC,MAAM,sBAAsB,GAAG,qCAAqC,CAAC;AAE5E,MAAM,CAAC,MAAM,QAAQ,GAA2B;IAC9C,IAAI,EAAE,CAAC;IACP,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC;IACd,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,CAAC;CACT,CAAC;AAIF,wBAAwB;AACxB,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW,EAAE,2BAA2B;IACxC,WAAW,EAAE,kDAAkD;IAC/D,SAAS,EAAE,qCAAqC;CACxC,CAAC;AAmCX,MAAM,CAAC,MAAM,cAAc,GAA8B;IACvD,OAAO,EAAE,0RAA0R;IACnS,aAAa,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM;IACf,cAAc,EAAE,MAAM;IACtB,SAAS,EAAE,CAAC;IACZ,QAAQ,EAAE,CAAC;IACX,cAAc,EAAE,CAAC;IACjB,iBAAiB,EAAE,CAAC;IACpB,oBAAoB,EAAE,IAAI;IAC1B,SAAS,EAAE,EAAE;IACb,aAAa,EAAE,IAAI;IACnB,SAAS,EAAE,EAAE;IACb,aAAa,EAAE,EAAE;IACjB,WAAW,EAAE,EAAE;IACf,aAAa,EAAE,sBAAsB;IACrC,eAAe,EAAE,GAAG;IACpB,aAAa,EAAE,EAAE;IACjB,YAAY,EAAE,EAAE;IAChB,YAAY,EAAE,MAAM;IACpB,UAAU,EAAE,QAAQ;IACpB,aAAa,EAAE,EAAE;IACjB,OAAO,EAAE,KAAK;IACd,qBAAqB,EAAE,EAAE;IACzB,aAAa,EAAE,EAAE;IACjB,aAAa,EAAE,EAAE;IACjB,wBAAwB,EAAE,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/zhin-agent/config.ts"],"names":[],"mappings":"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"}

package/lib/zhin-agent/context-budget.d.ts

@@ -0,0 +1,27 @@
+import type { AIProvider, ChatMessage, PruneResult } from '@zhin.js/ai';
+import type { ModelRegistry } from '@zhin.js/ai';
+import type { ZhinAgentConfig } from './config.js';
+export interface ResolvedContextBudget {
+    contextWindow: number;
+    maxHistoryShare: number;
+    source: 'config' | 'model-registry' | 'provider' | 'default';
+}
+export interface PrunedHistory {
+    messages: ChatMessage[];
+    result: PruneResult;
+    budget: ResolvedContextBudget;
+}
+export declare function resolveContextBudget(params: {
+    config: Required<ZhinAgentConfig>;
+    provider: AIProvider;
+    modelRegistry?: ModelRegistry | null;
+    model?: string;
+}): ResolvedContextBudget;
+export declare function pruneHistoryWithBudget(params: {
+    messages: ChatMessage[];
+    config: Required<ZhinAgentConfig>;
+    provider: AIProvider;
+    modelRegistry?: ModelRegistry | null;
+    model?: string;
+}): PrunedHistory;
+//# sourceMappingURL=context-budget.d.ts.map

package/lib/zhin-agent/context-budget.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-budget.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/context-budget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAKxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,QAAQ,GAAG,gBAAgB,GAAG,UAAU,GAAG,SAAS,CAAC;CAC9D;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;CAC/B;AAWD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,QAAQ,EAAE,UAAU,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,qBAAqB,CAgCxB;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,QAAQ,EAAE,UAAU,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,aAAa,CAYhB"}

package/lib/zhin-agent/context-budget.js

@@ -0,0 +1,50 @@
+import { DEFAULT_CONTEXT_TOKENS, pruneHistoryForContext, } from '@zhin.js/ai';
+function resolveRegistryWindow(registry, provider, model) {
+    if (!registry || !model)
+        return undefined;
+    return registry.getModel(provider.name, model)?.contextWindow;
+}
+export function resolveContextBudget(params) {
+    const configured = params.config.contextTokens;
+    if (configured && configured > 0 && configured !== DEFAULT_CONTEXT_TOKENS) {
+        return {
+            contextWindow: configured,
+            maxHistoryShare: params.config.maxHistoryShare ?? 0.5,
+            source: 'config',
+        };
+    }
+    const registryWindow = resolveRegistryWindow(params.modelRegistry, params.provider, params.model);
+    if (registryWindow && registryWindow > 0) {
+        return {
+            contextWindow: registryWindow,
+            maxHistoryShare: params.config.maxHistoryShare ?? 0.5,
+            source: 'model-registry',
+        };
+    }
+    if (params.provider.contextWindow && params.provider.contextWindow > 0) {
+        return {
+            contextWindow: params.provider.contextWindow,
+            maxHistoryShare: params.config.maxHistoryShare ?? 0.5,
+            source: 'provider',
+        };
+    }
+    return {
+        contextWindow: configured || DEFAULT_CONTEXT_TOKENS,
+        maxHistoryShare: params.config.maxHistoryShare ?? 0.5,
+        source: 'default',
+    };
+}
+export function pruneHistoryWithBudget(params) {
+    const budget = resolveContextBudget(params);
+    const result = pruneHistoryForContext({
+        messages: params.messages,
+        maxContextTokens: budget.contextWindow,
+        maxHistoryShare: budget.maxHistoryShare,
+    });
+    return {
+        messages: result.messages,
+        result,
+        budget,
+    };
+}
+//# sourceMappingURL=context-budget.js.map

package/lib/zhin-agent/context-budget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-budget.js","sourceRoot":"","sources":["../../src/zhin-agent/context-budget.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,aAAa,CAAC;AAgBrB,SAAS,qBAAqB,CAC5B,QAA0C,EAC1C,QAAoB,EACpB,KAAc;IAEd,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAKpC;IACC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;IAC/C,IAAI,UAAU,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,KAAK,sBAAsB,EAAE,CAAC;QAC1E,OAAO;YACL,aAAa,EAAE,UAAU;YACzB,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,GAAG;YACrD,MAAM,EAAE,QAAQ;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAClG,IAAI,cAAc,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO;YACL,aAAa,EAAE,cAAc;YAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,GAAG;YACrD,MAAM,EAAE,gBAAgB;SACzB,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC;QACvE,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa;YAC5C,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,GAAG;YACrD,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,aAAa,EAAE,UAAU,IAAI,sBAAsB;QACnD,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,GAAG;QACrD,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAMtC;IACC,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,sBAAsB,CAAC;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB,EAAE,MAAM,CAAC,aAAa;QACtC,eAAe,EAAE,MAAM,CAAC,eAAe;KACxC,CAAC,CAAC;IACH,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,MAAM;QACN,MAAM;KACP,CAAC;AACJ,CAAC"}

package/lib/zhin-agent/index.d.ts

@@ -41,6 +41,7 @@ export declare class ZhinAgent {
     private activeSkillsContext;
     private skillsSummaryXML;
     private modelRegistry;
+    private phaseTraceEnabled;
     constructor(provider: AIProvider, config?: ZhinAgentConfig);
     setSkillRegistry(registry: SkillRegistry): void;
     setSessionManager(manager: SessionManager): void;
@@ -64,7 +65,16 @@ export declare class ZhinAgent {
     setActiveSkillsContext(content: string): void;
     setSkillsSummaryXML(xml: string): void;
     process(content: string, context: ToolContext, externalTools?: Tool[], onChunk?: OnChunkCallback): Promise<OutputElement[]>;
+    private buildDisciplinedPrompt;
+    private logPhase;
     processMultimodal(parts: ContentPart[], context: ToolContext, onChunk?: OnChunkCallback): Promise<OutputElement[]>;
+    /**
+     * 为内置工具注入 `extra.web_search_locale`：
+     * - 若调用方已在 `context.extra.web_search_locale` 中设置，则规范化后沿用；
+     * - 否则读取用户档案 `preferred_language` / `language`；
+     * - 均未设置时不在 extra 中写入，web_search 默认使用中文市场。
+     */
+    private attachWebSearchLocale;
     private buildHistoryMessages;
     private streamChatWithHistory;
     private saveToSession;

package/lib/zhin-agent/index.d.ts.map

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

package/lib/zhin-agent/index.js

@@ -21,44 +21,22 @@ import { SessionManager, createMemorySessionManager } from '@zhin.js/ai';
 import { ConversationMemory } from '@zhin.js/ai';
 import { parseOutput } from '@zhin.js/ai';
 import { UserProfileStore } from '../user-profile.js';
+import { WEB_SEARCH_LOCALE_EXTRA_KEY, normalizeWebSearchLocaleHint, } from '../builtin/web-search-locale.js';
 import { RateLimiter } from '@zhin.js/ai';
 import { detectTone } from '@zhin.js/ai';
 import { SubagentManager } from '../subagent.js';
-import { pruneHistoryForContext, DEFAULT_CONTEXT_TOKENS, } from '@zhin.js/ai';
 import { triggerAIHook, createAIHookEvent } from '../hooks.js';
 // ── Sub-modules ─────────────────────────────────────────────────────
-import { DEFAULT_CONFIG, KEYWORD_TRIGGERS, } from './config.js';
+import { DEFAULT_CONFIG, isPhaseTraceEnabled, } from './config.js';
 import { applyExecPolicyToTools } from '../security/exec-policy.js';
-import { collectRelevantTools } from './tool-collector.js';
-import { buildEnhancedPersona, buildContextHint, buildRichSystemPrompt, buildUserMessageWithHistory, } from './prompt.js';
-import { createChatHistoryTool, createUserProfileTool, createSpawnTaskTool, } from './builtin-tools.js';
+import { buildEnhancedPersona, buildContextHint, buildRichSystemPrompt, buildUserMessageWithHistory, FIXED_DISCIPLINE_RULES, } from './prompt.js';
+import { buildPreExecFastPathPrompt, collectRuntimeTools, planToolRun, } from './tool-runtime.js';
+import { stripHallucinatedToolCalls, stripThinkBlocks } from './text-sanitize.js';
+import { pruneHistoryWithBudget } from './context-budget.js';
+import { resolveModelHarness } from './model-harness.js';
+import { RESERVED_TOOL_NAMES, RESERVED_TOOL_NAME_PREFIXES } from '../reserved-tools.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) {
-    return text.replace(/<think>[\s\S]*?<\/think>\s*/g, '').trim();
-}
-/**
- * Strip hallucinated tool-call markup that some models emit as plain text
- * (e.g. `<tool_call …/>`, `<function=xxx>…</function>`, `<|plugin|>…`).
- * Only removes the markup; any surrounding real text is preserved.
- */
-function stripHallucinatedToolCalls(text) {
-    let cleaned = text;
-    // <tool_call …/> or <tool_call …>…</tool_call>
-    cleaned = cleaned.replace(/<tool_call\b[\s\S]*?(?:\/>|<\/tool_call>)/gi, '');
-    // <tool_result …/> or <tool_result …>…</tool_result>
-    cleaned = cleaned.replace(/<tool_result\b[\s\S]*?(?:\/>|<\/tool_result>)/gi, '');
-    // <function=name>…</function>
-    cleaned = cleaned.replace(/<function=[^>]*>[\s\S]*?<\/function>/gi, '');
-    // {tool_result} / {tool_call} bare placeholders
-    cleaned = cleaned.replace(/\{tool_(?:result|call)\}/gi, '');
-    // <|plugin|>…<|/plugin|>  (some Chinese models)
-    cleaned = cleaned.replace(/<\|plugin\|>[\s\S]*?<\|\/plugin\|>/gi, '');
-    // <<<tool_call>>> … <<<end>>> style
-    cleaned = cleaned.replace(/<<<tool_call>>>[\s\S]*?<<<end>>>/gi, '');
-    return cleaned.trim();
-}
 // ============================================================================
 // ZhinAgent
 // ============================================================================
@@ -77,9 +55,11 @@ export class ZhinAgent {
     activeSkillsContext = '';
     skillsSummaryXML = '';
     modelRegistry = null;
+    phaseTraceEnabled;
     constructor(provider, config) {
         this.provider = provider;
         this.config = { ...DEFAULT_CONFIG, ...config };
+        this.phaseTraceEnabled = isPhaseTraceEnabled(this.config);
         this.sessions = createMemorySessionManager();
         this.memory = new ConversationMemory({
             minTopicRounds: this.config.minTopicRounds,
@@ -105,6 +85,7 @@ export class ZhinAgent {
     }
     setModelRegistry(registry) {
         this.modelRegistry = registry;
+        this.subagentManager?.setModelRegistry(registry);
     }
     upgradeMemoryToDatabase(msgModel, sumModel) {
         this.memory.upgradeToDatabase(msgModel, sumModel);
@@ -117,8 +98,10 @@ export class ZhinAgent {
             provider: this.provider,
             workspace: process.cwd(),
             createTools,
+            subagentTools: this.config.subagentTools,
             maxIterations: this.config.maxSubagentIterations,
             execPolicyConfig: this.config,
+            modelRegistry: this.modelRegistry,
         });
         logger.debug('SubagentManager initialized');
     }
@@ -185,12 +168,19 @@ export class ZhinAgent {
         const { senderId, sceneId, platform } = context;
         const sessionId = SessionManager.generateId(platform || '', senderId || '', sceneId);
         const userId = senderId || 'unknown';
+        this.logPhase('turn.start', sessionId, {
+            mode: 'text',
+            provider: this.provider.name,
+        });
         // 0. Rate limit
         const rateCheck = this.rateLimiter.check(userId);
         if (!rateCheck.allowed) {
+            this.logPhase('turn.rate_limited', sessionId, { userId });
             logger.debug(`[速率限制] 用户 ${userId} 被限制: ${rateCheck.message}`);
             return parseOutput(rateCheck.message || '请稍后再试');
         }
+        // 0.5 工具上下文：web_search 语言（档案 preferred_language / language，否则默认中文）
+        const contextForTools = await this.attachWebSearchLocale(context, userId);
         triggerAIHook(createAIHookEvent('message', 'received', sessionId, {
             userId,
             content,
@@ -198,22 +188,21 @@ export class ZhinAgent {
         })).catch(() => { });
         // 1. Collect tools
         const tFilter = now();
-        const allTools = collectRelevantTools(content, context, externalTools, {
+        const allTools = collectRuntimeTools({
+            content,
+            context: contextForTools,
+            externalTools,
             config: this.config,
             skillRegistry: this.skillRegistry,
             externalRegistered: this.externalTools,
+            sessionId,
+            userId,
+            memory: this.memory,
+            userProfiles: this.userProfiles,
+            subagentManager: this.subagentManager,
         });
-        // Inject context-aware built-in tools on keyword match
-        if (KEYWORD_TRIGGERS.chatHistory.test(content)) {
-            allTools.push(createChatHistoryTool(sessionId, this.memory));
-        }
-        if (KEYWORD_TRIGGERS.userProfile.test(content)) {
-            allTools.push(createUserProfileTool(userId, this.userProfiles));
-        }
-        if (this.subagentManager && KEYWORD_TRIGGERS.spawnTask.test(content)) {
-            allTools.push(createSpawnTaskTool(context, this.subagentManager));
-        }
         const filterMs = (now() - tFilter).toFixed(0);
+        this.logPhase('tools.collected', sessionId, { count: allTools.length });
         logger.info(`[工具过滤] ${allTools.length} 个工具: ${allTools.map(t => t.name).join(', ') || '(无)'}`);
         // 2. History + profile (parallel)
         const tMem = now();
@@ -221,82 +210,71 @@ export class ZhinAgent {
             this.buildHistoryMessages(sessionId),
             this.userProfiles.buildProfileSummary(userId),
         ]);
-        const contextTokens = this.config.contextTokens ?? DEFAULT_CONTEXT_TOKENS;
-        const maxHistoryShare = this.config.maxHistoryShare ?? 0.5;
-        const pruneResult = pruneHistoryForContext({
+        const chatCandidates = this.resolveModelCandidates('chat');
+        const { messages: historyMessages, result: pruneResult, budget: contextBudget, } = pruneHistoryWithBudget({
             messages: rawHistoryMessages,
-            maxContextTokens: contextTokens,
-            maxHistoryShare,
+            config: this.config,
+            provider: this.provider,
+            modelRegistry: this.modelRegistry,
+            model: chatCandidates[0],
         });
-        let historyMessages = pruneResult.messages;
         if (pruneResult.droppedCount > 0) {
             logger.debug(`[上下文窗口] 丢弃 ${pruneResult.droppedCount} 条历史消息 (${pruneResult.droppedTokens} tokens)`);
         }
         const memMs = (now() - tMem).toFixed(0);
+        this.logPhase('context.ready', sessionId, { historyCount: historyMessages.length });
         // 2.5 Tone + persona
         const toneHint = this.config.toneAwareness ? detectTone(content).hint : '';
         const personaEnhanced = buildEnhancedPersona(this.config, profileSummary, toneHint);
         // 3. No tools → chat path (prefer per-session model, then lightweight model)
         if (allTools.length === 0) {
+            this.logPhase('path.chat', sessionId, { toolCount: 0 });
             const liteModel = this.config.chatLiteModel || undefined;
-            logger.info(`[System Prompt] chat-path: ${personaEnhanced.length} chars${liteModel ? `, model=${liteModel}` : ''}`);
+            const chatSystemPrompt = this.buildDisciplinedPrompt(personaEnhanced);
+            logger.info(`[System Prompt] chat-path: ${chatSystemPrompt.length} chars${liteModel ? `, model=${liteModel}` : ''}`);
             logger.debug(`[闲聊路径] 过滤=${filterMs}ms, 记忆=${memMs}ms (${historyMessages.length}条), 0 工具`);
             const tLLM = now();
-            let reply = await this.streamChatWithHistory(content, personaEnhanced, historyMessages, onChunk, liteModel);
+            this.logPhase('chat.llm.start', sessionId, { model: liteModel || chatCandidates[0] || '' });
+            let reply = await this.streamChatWithHistory(content, chatSystemPrompt, historyMessages, onChunk, liteModel);
             reply = stripHallucinatedToolCalls(reply);
             const llmMs = (now() - tLLM).toFixed(0);
+            this.logPhase('chat.llm.end', sessionId, { durationMs: Number(llmMs) });
             logger.info(`[闲聊路径] 过滤=${filterMs}ms, 记忆=${memMs}ms, LLM=${llmMs}ms, 总=${(now() - t0).toFixed(0)}ms`);
             await this.saveToSession(sessionId, content, reply, sceneId);
+            this.logPhase('turn.end', sessionId, { path: 'chat' });
             return parseOutput(reply);
         }
         logger.debug(`[工具路径] 过滤=${filterMs}ms, 记忆=${memMs}ms, ${allTools.length} 工具 (${allTools.map(t => t.name).join(', ')})`);
         // 4. Pre-executable tools
-        const preExecTools = [];
-        for (const tool of allTools) {
-            if (tool.preExecutable)
-                preExecTools.push(tool);
+        const preExecCandidates = allTools.filter(tool => tool.preExecutable);
+        const tPre = preExecCandidates.length > 0 ? now() : 0;
+        if (preExecCandidates.length > 0) {
+            logger.debug(`预执行: ${preExecCandidates.map(t => t.name).join(', ')}`);
         }
-        // 5. Pre-execution
-        let preData = '';
-        if (preExecTools.length > 0) {
-            const tPre = now();
-            logger.debug(`预执行: ${preExecTools.map(t => t.name).join(', ')}`);
-            const results = await Promise.allSettled(preExecTools.map(async (tool) => {
-                const result = await Promise.race([
-                    tool.execute({}),
-                    new Promise((_, rej) => setTimeout(() => rej(new Error('超时')), this.config.preExecTimeout)),
-                ]);
-                return { name: tool.name, result };
-            }));
-            for (const r of results) {
-                if (r.status === 'fulfilled') {
-                    let s = typeof r.value.result === 'string' ? r.value.result : JSON.stringify(r.value.result);
-                    if (s.length > 500) {
-                        s = s.slice(0, 500) + `\n... (truncated, ${s.length} chars total)`;
-                    }
-                    preData += `\n【${r.value.name}】${s}`;
-                }
-            }
+        const toolRun = await planToolRun(allTools, this.config.preExecTimeout);
+        this.logPhase('preexec.done', sessionId, {
+            mode: toolRun.mode,
+            preExecutedTools: toolRun.preExecution.tools.length,
+        });
+        const preData = toolRun.preExecution.data;
+        if (tPre > 0) {
             logger.debug(`预执行耗时: ${(now() - tPre).toFixed(0)}ms`);
         }
         // 6. Path selection
         let reply;
-        const hasNonPreExecTools = allTools.some(t => !t.preExecutable);
-        if (!hasNonPreExecTools && preData) {
+        if (toolRun.mode === 'pre-exec-fast-path') {
+            this.logPhase('path.pre_exec_fast', sessionId, { toolCount: allTools.length });
             // Fast path
             const tLLM = now();
-            const prompt = `${personaEnhanced}
-
-Pre-fetched data (from user's question):
-${preData}
-
-Answer the user's question based on the data above. Be clear and concise; use emoji when appropriate.`;
+            const prompt = this.buildDisciplinedPrompt(buildPreExecFastPathPrompt(personaEnhanced, preData));
             logger.info(`[System Prompt] fast-path: ${prompt.length} chars`);
+            this.logPhase('fast.llm.start', sessionId, { model: chatCandidates[0] || '' });
             reply = await this.streamChatWithHistory(content, prompt, historyMessages, onChunk);
+            this.logPhase('fast.llm.end', sessionId, { durationMs: Math.round(now() - tLLM) });
             logger.info(`[快速路径] 过滤=${filterMs}ms, 记忆=${memMs}ms, LLM=${(now() - tLLM).toFixed(0)}ms, 总=${(now() - t0).toFixed(0)}ms`);
         }
         else {
-            // Agent path
+            this.logPhase('path.agent', sessionId, { toolCount: allTools.length });
             const tAgent = now();
             logger.debug(`Agent 路径: ${allTools.length} 个工具`);
             const contextHint = buildContextHint(context, content);
@@ -316,10 +294,16 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
             // Adaptive maxIterations: boost when skills are active (multi-step skill flows)
             const SKILL_ITERATION_BOOST = 3;
             const hasSkillActivation = agentTools.some(t => t.name === 'activate_skill' || t.name === 'install_skill');
+            const harness = resolveModelHarness(this.provider.name, chatCandidates[0] || '', this.config.modelHarness);
+            const baseIterations = harness.maxIterations ?? this.config.maxIterations;
             const effectiveMaxIterations = hasSkillActivation
-                ? this.config.maxIterations + SKILL_ITERATION_BOOST
-                : this.config.maxIterations;
-            const chatCandidates = this.resolveModelCandidates('chat');
+                ? baseIterations + SKILL_ITERATION_BOOST
+                : baseIterations;
+            this.logPhase('harness.resolved', sessionId, {
+                model: chatCandidates[0] || '',
+                harnessMaxIterations: harness.maxIterations ?? null,
+                effectiveMaxIterations,
+            });
             const agent = createAgent(this.provider, {
                 model: chatCandidates[0],
                 modelFallbacks: chatCandidates.slice(1),
@@ -327,11 +311,16 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
                 tools: agentTools,
                 maxIterations: effectiveMaxIterations,
                 turnTimeout: this.config.timeout,
+                contextWindow: contextBudget.contextWindow,
+                reservedToolNames: RESERVED_TOOL_NAMES,
+                reservedToolNamePrefixes: RESERVED_TOOL_NAME_PREFIXES,
             });
             const userMessageWithHistory = buildUserMessageWithHistory(historyMessages, content);
             let result;
             try {
+                this.logPhase('agent.run.start', sessionId, { model: chatCandidates[0] || '' });
                 result = await agent.run(userMessageWithHistory, []);
+                this.logPhase('agent.run.end', sessionId, { iterations: result.iterations });
             }
             finally {
                 agent.dispose();
@@ -345,8 +334,18 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
             content: reply,
             platform: platform || '',
         })).catch(() => { });
+        this.logPhase('turn.end', sessionId, { path: toolRun.mode === 'pre-exec-fast-path' ? 'fast' : 'agent' });
         return parseOutput(reply);
     }
+    buildDisciplinedPrompt(basePrompt) {
+        const discipline = `# Discipline\n${FIXED_DISCIPLINE_RULES.map(rule => `- ${rule}`).join('\n')}`;
+        return `${discipline}\n\n${basePrompt}`;
+    }
+    logPhase(phase, sessionId, extra = {}) {
+        if (!this.phaseTraceEnabled)
+            return;
+        logger.info({ phase, sessionId, ...extra }, '[AGENT_PHASE]');
+    }
     async processMultimodal(parts, context, onChunk) {
         const { senderId, sceneId, platform } = context;
         const sessionId = SessionManager.generateId(platform || '', senderId || '', sceneId);
@@ -355,9 +354,9 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
         if (!rateCheck.allowed) {
             return parseOutput(rateCheck.message || '请稍后再试');
         }
-        const historyMessages = await this.buildHistoryMessages(sessionId);
+        const rawHistoryMessages = await this.buildHistoryMessages(sessionId);
         const profileSummary = await this.userProfiles.buildProfileSummary(userId);
-        const personaEnhanced = buildEnhancedPersona(this.config, profileSummary, '');
+        const personaEnhanced = this.buildDisciplinedPrompt(buildEnhancedPersona(this.config, profileSummary, ''));
         // Build text summary describing the multimodal content
         const textFragments = [];
         const llmParts = [];
@@ -388,6 +387,16 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
         }
         const textContent = textFragments.join(' ') || '[多模态消息]';
         const visionCandidates = this.resolveModelCandidates('vision');
+        const { messages: historyMessages, result: pruneResult } = pruneHistoryWithBudget({
+            messages: rawHistoryMessages,
+            config: this.config,
+            provider: this.provider,
+            modelRegistry: this.modelRegistry,
+            model: visionCandidates[0],
+        });
+        if (pruneResult.droppedCount > 0) {
+            logger.debug(`[多模态上下文窗口] 丢弃 ${pruneResult.droppedCount} 条历史消息 (${pruneResult.droppedTokens} tokens)`);
+        }
         const messages = [
             { role: 'system', content: personaEnhanced },
             ...historyMessages,
@@ -441,6 +450,29 @@ ${preData ? `\nPre-fetched data:\n${preData}\n` : ''}`;
         return parseOutput(reply);
     }
     // ── Internal helpers ────────────────────────────────────────────────
+    /**
+     * 为内置工具注入 `extra.web_search_locale`：
+     * - 若调用方已在 `context.extra.web_search_locale` 中设置，则规范化后沿用；
+     * - 否则读取用户档案 `preferred_language` / `language`；
+     * - 均未设置时不在 extra 中写入，web_search 默认使用中文市场。
+     */
+    async attachWebSearchLocale(context, userId) {
+        const extra = { ...(context.extra ?? {}) };
+        const existing = extra[WEB_SEARCH_LOCALE_EXTRA_KEY];
+        if (typeof existing === 'string' && existing.trim()) {
+            extra[WEB_SEARCH_LOCALE_EXTRA_KEY] = normalizeWebSearchLocaleHint(existing);
+            return { ...context, extra };
+        }
+        const [preferred, language] = await Promise.all([
+            this.userProfiles.get(userId, 'preferred_language'),
+            this.userProfiles.get(userId, 'language'),
+        ]);
+        const hint = (preferred ?? language)?.trim();
+        if (hint) {
+            extra[WEB_SEARCH_LOCALE_EXTRA_KEY] = normalizeWebSearchLocaleHint(hint);
+        }
+        return { ...context, extra };
+    }
     async buildHistoryMessages(sessionId) {
         return this.memory.buildContext(sessionId);
     }