newmark-agent 0.5.14 → 0.5.15

package/dist/core/agentKernel/agent.d.ts

@@ -50,6 +50,7 @@ export declare class Agent {
         message: AgentMessage;
         queueMode: 'steer' | 'followUp';
     }>;
+    removeQueuedMessages(predicate: (message: unknown, queueMode: 'steer' | 'followUp') => boolean): number;
     waitForIdle(): Promise<void>;
     abort(): void;
     prompt(message: string | AgentMessage | AgentMessage[], images?: ImageContent[]): Promise<void>;

package/dist/core/agentKernel/agent.js

@@ -54,6 +54,11 @@ class PendingMessageQueue {
         this.messages = [];
         return all;
     }
+    removeWhere(predicate) {
+        const before = this.messages.length;
+        this.messages = this.messages.filter(message => !predicate(message));
+        return before - this.messages.length;
+    }
     clear() { this.messages = []; }
     open() { this.accepting = true; }
     closeAndDrain() {
@@ -121,6 +126,10 @@ class Agent {
             ...this.followUpQueue.drainAll().map(message => ({ message, queueMode: 'followUp' })),
         ];
     }
+    removeQueuedMessages(predicate) {
+        return this.steeringQueue.removeWhere(message => predicate(message, 'steer'))
+            + this.followUpQueue.removeWhere(message => predicate(message, 'followUp'));
+    }
     waitForIdle() { return this.activeRun?.promise || Promise.resolve(); }
     abort() { this.activeRun?.abortController.abort(); }
     async prompt(message, images) {

package/dist/core/agentKernelDiagnostics.d.ts

@@ -1,3 +1,5 @@
+import { type UsageNormalizationOptions } from '../providers/provider-events';
+import type { StreamToken } from './types';
 export type AgentKernelDiagnosticEvent = {
     type: 'request_context';
     at: string;
@@ -22,6 +24,7 @@ export type AgentKernelDiagnosticEvent = {
 };
 export declare function setAgentKernelDiagnosticSink(sink: ((event: AgentKernelDiagnosticEvent) => void) | null): void;
 export declare function agentKernelDiagnosticsEnabled(): boolean;
+export declare function agentKernelDiagnosticsRequested(): boolean;
 export declare function emitRequestContextDiagnostic(input: {
     conversationId?: string;
     systemPrompt?: string;
@@ -39,10 +42,5 @@ export declare function emitProviderUsageDiagnostic(input: {
 }): Extract<AgentKernelDiagnosticEvent, {
     type: 'provider_usage';
 }>;
-export declare function extractProviderUsage(payload: unknown): {
-    input: number;
-    output: number;
-    cacheRead: number;
-    cacheWrite: number;
-};
+export declare function extractProviderUsage(payload: unknown, options?: UsageNormalizationOptions): NonNullable<StreamToken['usage']>;
 //# sourceMappingURL=agentKernelDiagnostics.d.ts.map

package/dist/core/agentKernelDiagnostics.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setAgentKernelDiagnosticSink = setAgentKernelDiagnosticSink;
 exports.agentKernelDiagnosticsEnabled = agentKernelDiagnosticsEnabled;
+exports.agentKernelDiagnosticsRequested = agentKernelDiagnosticsRequested;
 exports.emitRequestContextDiagnostic = emitRequestContextDiagnostic;
 exports.emitProviderUsageDiagnostic = emitProviderUsageDiagnostic;
 exports.extractProviderUsage = extractProviderUsage;
 const crypto_1 = require("crypto");
+const provider_events_1 = require("../providers/provider-events");
 let diagnosticSink = null;
 function setAgentKernelDiagnosticSink(sink) {
     diagnosticSink = sink;
@@ -13,6 +15,9 @@ function setAgentKernelDiagnosticSink(sink) {
 function agentKernelDiagnosticsEnabled() {
     return process.env.NEWMARK_KERNEL_DIAGNOSTICS === '1';
 }
+function agentKernelDiagnosticsRequested() {
+    return diagnosticSink !== null || agentKernelDiagnosticsEnabled();
+}
 function emitRequestContextDiagnostic(input) {
     const systemPrompt = String(input.systemPrompt || '');
     const messages = Array.isArray(input.messages) ? input.messages : [];
@@ -55,16 +60,14 @@ function emitProviderUsageDiagnostic(input) {
         console.error(`[NewmarkKernelDiagnostic] ${JSON.stringify(event)}`);
     return event;
 }
-function extractProviderUsage(payload) {
-    const root = payload && typeof payload === 'object' ? payload : {};
-    const usage = root.usage && typeof root.usage === 'object' ? root.usage : root;
-    const inputDetails = usage.input_tokens_details || usage.prompt_tokens_details || {};
-    const cacheCreation = usage.cache_creation_input_tokens ?? usage.cache_write_input_tokens ?? inputDetails.cache_write_tokens;
+function extractProviderUsage(payload, options = {}) {
+    const usage = (0, provider_events_1.normalizeProviderUsage)(payload, options);
     return {
-        input: boundedCount(usage.input_tokens ?? usage.prompt_tokens ?? usage.input),
-        output: boundedCount(usage.output_tokens ?? usage.completion_tokens ?? usage.output),
-        cacheRead: boundedCount(usage.cache_read_input_tokens ?? usage.cached_input_tokens ?? inputDetails.cached_tokens ?? inputDetails.cache_read_tokens),
-        cacheWrite: boundedCount(cacheCreation),
+        input: usage?.inputTokens ?? 0,
+        output: usage?.outputTokens ?? 0,
+        cacheRead: usage?.cacheReadTokens ?? 0,
+        cacheWrite: usage?.cacheWriteTokens ?? 0,
+        reported: usage?.reported ?? { input: false, output: false, cacheRead: false, cacheWrite: false },
     };
 }
 function fingerprint(value) {

package/dist/core/agentKernelRunner.d.ts

@@ -120,6 +120,11 @@ declare class ToolProvisionSession {
     constructor(catalog: unknown[], initial: unknown[]);
     reconcile(catalog: unknown[], initial: unknown[]): void;
     currentDefinitions(): unknown[];
+    snapshot(): {
+        initialTools: string[];
+        provisionedTools: string[];
+    };
+    restore(initial: string[], provisioned: string[]): void;
     metrics(): ToolProvisionMetrics;
     provision(params: unknown): ToolProvisionResult;
     private search;