@zhin.js/agent 0.1.25 → 0.1.26

package/lib/zhin-agent/turn-tracker.js

@@ -0,0 +1,54 @@
+import { addUsage, EMPTY_USAGE } from './turn-metrics.js';
+export class TurnTracker {
+    _lastMetrics = null;
+    activeUsage = null;
+    activeWaits = [];
+    waitMs;
+    constructor(waitMs) {
+        this.waitMs = waitMs;
+    }
+    begin() {
+        this.activeUsage = { ...EMPTY_USAGE };
+        this.activeWaits = [];
+    }
+    addSubagentUsage(usage) {
+        if (!this.activeUsage)
+            return;
+        addUsage(this.activeUsage, usage);
+    }
+    trackSubagent(done) {
+        if (!this.activeUsage)
+            return;
+        this.activeWaits.push(done);
+    }
+    async finalize(partial) {
+        if (this.activeWaits.length > 0 && this.waitMs > 0) {
+            await Promise.race([
+                Promise.allSettled(this.activeWaits),
+                new Promise(resolve => setTimeout(resolve, this.waitMs)),
+            ]);
+        }
+        const mainUsage = { ...partial.usage };
+        const subagentUsage = this.activeUsage
+            && (this.activeUsage.total_tokens > 0
+                || this.activeUsage.prompt_tokens > 0
+                || this.activeUsage.completion_tokens > 0)
+            ? { ...this.activeUsage }
+            : undefined;
+        const totalUsage = { ...mainUsage };
+        if (subagentUsage)
+            addUsage(totalUsage, subagentUsage);
+        this._lastMetrics = {
+            ...partial,
+            usage: totalUsage,
+            mainUsage,
+            ...(subagentUsage ? { subagentUsage } : {}),
+        };
+        this.activeUsage = null;
+        this.activeWaits = [];
+    }
+    get lastMetrics() {
+        return this._lastMetrics;
+    }
+}
+//# sourceMappingURL=turn-tracker.js.map

package/lib/zhin-agent/turn-tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-tracker.js","sourceRoot":"","sources":["../../src/zhin-agent/turn-tracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAA6B,MAAM,mBAAmB,CAAC;AAErF,MAAM,OAAO,WAAW;IACd,YAAY,GAAgC,IAAI,CAAC;IACjD,WAAW,GAAiB,IAAI,CAAC;IACjC,WAAW,GAAoB,EAAE,CAAC;IACzB,MAAM,CAAS;IAEhC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,OAAO;QAC9B,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,aAAa,CAAC,IAAmB;QAC/B,IAAI,CAAC,IAAI,CAAC,WAAW;YAAE,OAAO;QAC9B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,OAA+F;QAE/F,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,OAAO,CAAC,IAAI,CAAC;gBACjB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC;gBACpC,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aAC/D,CAAC,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW;eACjC,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,CAAC;mBAChC,IAAI,CAAC,WAAW,CAAC,aAAa,GAAG,CAAC;mBAClC,IAAI,CAAC,WAAW,CAAC,iBAAiB,GAAG,CAAC,CAAC;YAC5C,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE;YACzB,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,UAAU,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;QACpC,IAAI,aAAa;YAAE,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,GAAG;YAClB,GAAG,OAAO;YACV,KAAK,EAAE,UAAU;YACjB,SAAS;YACT,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5C,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF"}

package/lib/zhin-agent/web-search-locale-attach.d.ts

@@ -0,0 +1,4 @@
+import type { ToolContext } from '@zhin.js/core';
+import { UserProfileStore } from '../user-profile.js';
+export declare function attachWebSearchLocale(context: ToolContext, userId: string, userProfiles: UserProfileStore): Promise<ToolContext>;
+//# sourceMappingURL=web-search-locale-attach.d.ts.map

package/lib/zhin-agent/web-search-locale-attach.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-search-locale-attach.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/web-search-locale-attach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAMtD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,gBAAgB,GAC7B,OAAO,CAAC,WAAW,CAAC,CAgBtB"}

package/lib/zhin-agent/web-search-locale-attach.js

@@ -0,0 +1,19 @@
+import { WEB_SEARCH_LOCALE_EXTRA_KEY, normalizeWebSearchLocaleHint, } from '../builtin/web-search-locale.js';
+export async function attachWebSearchLocale(context, userId, userProfiles) {
+    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([
+        userProfiles.get(userId, 'preferred_language'),
+        userProfiles.get(userId, 'language'),
+    ]);
+    const hint = (preferred ?? language)?.trim();
+    if (hint) {
+        extra[WEB_SEARCH_LOCALE_EXTRA_KEY] = normalizeWebSearchLocaleHint(hint);
+    }
+    return { ...context, extra };
+}
+//# sourceMappingURL=web-search-locale-attach.js.map

package/lib/zhin-agent/web-search-locale-attach.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-search-locale-attach.js","sourceRoot":"","sources":["../../src/zhin-agent/web-search-locale-attach.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAoB,EACpB,MAAc,EACd,YAA8B;IAE9B,MAAM,KAAK,GAA4B,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;IACpE,MAAM,QAAQ,GAAG,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACpD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACpD,KAAK,CAAC,2BAA2B,CAAC,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;QAC5E,OAAO,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IACD,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC;QAC9C,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;KACrC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;IAC7C,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,CAAC,2BAA2B,CAAC,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC"}

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

@@ -0,0 +1,66 @@
+/**
+ * Internal surface for turn-pipeline / tool-orchestration modules.
+ * Not part of the public API.
+ */
+import type { AIProvider, AgentTool, ContentPart, Usage } from '@zhin.js/ai';
+import type { OutputElement } from '@zhin.js/ai';
+import type { ContextManager } from '@zhin.js/ai';
+import type { ModelRegistry } from '@zhin.js/ai';
+import type { Plugin } from '@zhin.js/core';
+import type { Tool, ToolContext } from '../orchestrator/types.js';
+import type { SkillRegistry } from '../orchestrator/skill-registry.js';
+import type { AgentOrchestrator } from '../orchestrator/index.js';
+import type { SubagentManager } from '../subagent.js';
+import type { UserProfileStore } from '../user-profile.js';
+import type { ConversationMemory } from '@zhin.js/ai';
+import type { SessionManager } from '@zhin.js/ai';
+import type { RateLimiter } from '@zhin.js/ai';
+import type { ZhinAgentEventEmitter } from './event-emitter.js';
+import type { TurnTracker } from './turn-tracker.js';
+import type { DeferredWorkerRunner } from '../deferred-worker-runner.js';
+import type { ZhinAgentConfig, OnChunkCallback } from './config.js';
+import type { PhaseTraceConfig } from './phase-trace.js';
+import type { ZhinAgentTurnMetrics } from './turn-metrics.js';
+export interface ZhinAgentPrivate {
+    readonly config: Required<ZhinAgentConfig>;
+    readonly provider: AIProvider;
+    readonly skillRegistry: SkillRegistry | null;
+    readonly orchestrator: AgentOrchestrator | null;
+    readonly sessions: SessionManager;
+    readonly contextManager: ContextManager | null;
+    readonly memory: ConversationMemory;
+    readonly externalTools: Map<string, AgentTool>;
+    readonly userProfiles: UserProfileStore;
+    readonly rateLimiter: RateLimiter;
+    readonly subagentManager: SubagentManager | null;
+    readonly bootstrapContext: string;
+    readonly activeSkillsContext: string;
+    readonly skillsSummaryXML: string;
+    readonly modelRegistry: ModelRegistry | null;
+    readonly phaseConfig: PhaseTraceConfig;
+    readonly emitter: ZhinAgentEventEmitter;
+    deferredCatalog: AgentTool[];
+    readonly deferredWorkerRunner: DeferredWorkerRunner;
+    lastToolSearchDeferredStats?: string;
+    readonly turnTracker: TurnTracker;
+    beginActiveTurn(): void;
+    finalizeActiveTurn(partial: Omit<ZhinAgentTurnMetrics, 'usage' | 'mainUsage' | 'subagentUsage'> & {
+        usage: Usage;
+    }): Promise<void>;
+    emitSessionNewEvent(sessionId: string, context: ToolContext, mode: 'text' | 'multimodal', content: string, reply: string): void;
+    emitSessionCompactEvent(sessionId: string, context: ToolContext, mode: 'text' | 'multimodal', info: {
+        microSavedTokens: number;
+        autoSavedTokens: number;
+        totalTokensBefore: number;
+        totalTokensAfter: number;
+    }): void;
+    buildDisciplinedPrompt(basePrompt: string): string;
+    resolveAgentToolsForTurn(allTools: AgentTool[], context: ToolContext): {
+        tools: AgentTool[];
+        deferredStats?: string;
+    };
+    runDeferredWorker(goal: string, toolQuery: string | undefined, context: ToolContext, allTools: AgentTool[]): Promise<string>;
+}
+export declare function asPrivate(agent: unknown): ZhinAgentPrivate;
+export type { OnChunkCallback, OutputElement, Tool, ToolContext, Plugin, ContentPart };
+//# sourceMappingURL=zhin-agent-private.d.ts.map

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

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

package/lib/zhin-agent/zhin-agent-private.js

@@ -0,0 +1,4 @@
+export function asPrivate(agent) {
+    return agent;
+}
+//# sourceMappingURL=zhin-agent-private.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"zhin-agent-private.js","sourceRoot":"","sources":["../../src/zhin-agent/zhin-agent-private.ts"],"names":[],"mappings":"AAkFA,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,OAAO,KAAyB,CAAC;AACnC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/agent",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Zhin AI Agent — session, ZhinAgent, init; composes @zhin.js/core providers and tools",
   "type": "module",
   "main": "./lib/index.js",
@@ -17,10 +17,10 @@
   ],
   "dependencies": {
     "he": "^1.2.0",
-    "js-yaml": "^4.1.0",
-    "@zhin.js/ai": "1.1.25",
-    "@zhin.js/core": "1.1.27",
-    "@zhin.js/logger": "0.1.67"
+    "js-yaml": "^4.2.0",
+    "@zhin.js/ai": "1.1.26",
+    "@zhin.js/logger": "0.1.68",
+    "@zhin.js/core": "1.1.28"
   },
   "peerDependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0"