@modelprofile.com/flexharness-agent 10.12.0 → 10.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts_agent/classes.sessionengine.d.ts +7 -0
- package/dist_ts_agent/classes.sessionengine.js +55 -5
- package/dist_ts_agent/index.d.ts +1 -1
- package/dist_ts_agent/index.js +1 -1
- package/dist_ts_agent/plugins.d.ts +5 -5
- package/dist_ts_agent/plugins.js +5 -5
- package/dist_ts_agent/smartagent.context.js +19 -19
- package/dist_ts_agent/smartagent.interfaces.d.ts +28 -7
- package/dist_ts_agent/smartagent.interfaces.js +1 -1
- package/package.json +2 -2
- package/readme.md +3 -2
- package/ts_agent/classes.sessionengine.ts +66 -7
- package/ts_agent/index.ts +2 -0
- package/ts_agent/plugins.ts +9 -2
- package/ts_agent/readme.md +3 -2
- package/ts_agent/smartagent.context.ts +17 -20
- package/ts_agent/smartagent.interfaces.ts +24 -4
package/dist_ts_agent/index.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export { AgentModelCallUsageRecorder } from './smartagent.usage.js';
|
|
|
10
10
|
export type { IAgentModelCallUsageRecorderModel } from './smartagent.usage.js';
|
|
11
11
|
export { AgentGenerationLeaseCleanupError, ContextOverflowError, } from './smartagent.interfaces.js';
|
|
12
12
|
export { AGENT_TOOL_RESULT_FILE_MAX_BYTES, AgentEventStoreConflictError, InMemoryAgentEventStore, isAgentEventStoreV2, validateAgentEventArchiveV2, validateAgentEventSnapshotV2, } from './smartagent.persistence.js';
|
|
13
|
-
export type { IAgentCacheOptions, ISmartAiCacheDispatch, IAgentContextOverflowInvocationOptions, IAgentContextBuildOptions, IAgentContextCompactionOptions, IAgentCompactOptions, IAgentEventRetentionOptions, IAgentBeginGenerationOptions, IAgentFinalizeGenerationOptions, IAgentGenerateOptions, IAgentGenerateResult, IAgentGenerationHandle, IAgentGenerationLease, IAgentGenerationPreparationContext, IAgentRunOptions, IAgentRunResult, IAgentSession, IAgentSessionAbortOptions, IAgentSessionChange, IAgentSessionOptions, IAgentScheduleGenerateOptions, IAgentToolCallRecord, IAgentToolCallStartEvent, IAgentToolCallUpdateEvent, IAgentUsage, ProviderOptions, TAgentCacheRetention, TAgentCacheSetting, TAgentPrompt, TAgentContextBuilder, TAgentContextCompactor, TAgentGenerationPrepare, TAgentModelCallUnreportedReason, TAgentModelCallUsage, TAgentModelCallUsageEvent, TAgentModelCallUsageReporter, TAgentSessionChangeListener, TAgentToolCallFinishEvent, TAgentToolExecutionReconciliationOptions, } from './smartagent.interfaces.js';
|
|
13
|
+
export type { IAgentCacheOptions, ISmartAiCacheDispatch, IAgentContextOverflowInvocationOptions, IAgentContextBuildOptions, IAgentContextCompactionOptions, IAgentCompactOptions, IAgentEventRetentionOptions, IAgentBeginGenerationOptions, IAgentFinalizeGenerationOptions, IAgentGenerateOptions, IAgentGenerateResult, IAgentGenerationHandle, IAgentGenerationLease, IAgentGenerationPreparationContext, IAgentRunOptions, IAgentRunResult, IAgentSession, IAgentSessionAbortOptions, IAgentSessionChange, IAgentSessionOptions, IAgentScheduleGenerateOptions, IAgentToolCallRecord, IAgentToolCallStartEvent, IAgentToolCallUpdateEvent, IAgentUsage, ProviderOptions, TAgentCacheRetention, TAgentCacheSetting, TAgentPrompt, TAgentContextBuilder, TAgentContextCompactor, TAgentGenerationPrepare, TAgentModelCallUnreportedReason, TAgentModelCallUsage, TAgentModelCallUsageEvent, TAgentModelCallUsageReporter, TAgentModelCallUsageSource, TAgentObservedModelCallUsage, TAgentSessionChangeListener, TAgentToolCallFinishEvent, TAgentToolExecutionReconciliationOptions, } from './smartagent.interfaces.js';
|
|
14
14
|
export type { IAgentEventArchive, IAgentEventArchiveV2, IAgentEventSnapshot, IAgentEventSnapshotV2, IAgentEventStore, IAgentEventStoreV2, TAgentEventArchive, TAgentEventSnapshot, TAgentEventStore, } from './smartagent.persistence.js';
|
|
15
15
|
export type { IAgentEventBase, IAgentRuntimeEventPayload, IArchivedAgentGenerationTransaction, IAssistantMessageEvent, IContextCompactionEvent, IGenerationBegunEvent, IGenerationExecutionCompletedEvent, IGenerationExecutionStartedEvent, IGenerationOutcomeEvent, IModelMessageEvent, IModelMessagesToEventsOptions, IModelMessageEventIdentityCoordinates, IRuntimeEvent, ISystemMessageEvent, IToolCallEvent, IToolExecutionIntentEvent, IToolExecutionReconciliationEvent, IToolResultEvent, IUserMessageEvent, TAgentAssistantMessage, TAgentConversationEvent, TAgentControlEvent, TAgentEvent, TAgentEventInput, TAgentSystemMessage, TAgentGenerationOutcome, TAgentToolCallPart, TAgentToolMessage, TAgentToolResultOutput, TAgentToolResultPart, TAgentUserMessage, TModelMessageEmittedEventKind, TModelMessageEventIdentityFactory, TToolExecutionReconciliation, } from './smartagent.events.js';
|
|
16
16
|
export type { IAgentGenerationTransaction, TAgentGenerationTransactionState, } from './smartagent.transactions.js';
|
package/dist_ts_agent/index.js
CHANGED
|
@@ -13,4 +13,4 @@ export * from './tool.persistence.js';
|
|
|
13
13
|
export * from './tool.adapter.js';
|
|
14
14
|
export { tool, jsonSchema, stepCountIs, z } from './plugins.js';
|
|
15
15
|
export { FileAgentEventStore } from './persistence.file.js';
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19hZ2VudC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzdELE9BQU8sRUFDTCw2QkFBNkIsRUFDN0IsOEJBQThCLEVBQzlCLGtDQUFrQyxFQUNsQyxnQ0FBZ0MsRUFDaEMsMEJBQTBCLEVBQzFCLHlCQUF5QixHQUMxQixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sRUFDTCxnQkFBZ0IsRUFDaEIsa0JBQWtCLEVBQ2xCLDBCQUEwQixHQUMzQixNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsOEJBQThCLEdBQy9CLE1BQU0sOEJBQThCLENBQUM7QUFNdEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBFLE9BQU8sRUFDTCxnQ0FBZ0MsRUFDaEMsb0JBQW9CLEdBQ3JCLE1BQU0sNEJBQTRCLENBQUM7QUFDcEMsT0FBTyxFQUNMLGdDQUFnQyxFQUNoQyw0QkFBNEIsRUFDNUIsdUJBQXVCLEVBQ3ZCLG1CQUFtQixFQUNuQiwyQkFBMkIsRUFDM0IsNEJBQTRCLEdBQzdCLE1BQU0sNkJBQTZCLENBQUM7QUFnR3JDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFvQyxNQUFNLHVCQUF1QixDQUFDIn0=
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
2
|
-
export { streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
1
|
+
import { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
2
|
+
export { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
3
3
|
export type { AssistantModelMessage, LanguageModelUsage, ModelMessage, StepResult, SystemModelMessage, ToolSet, ToolModelMessage, ToolExecutionOptions, StreamTextResult, UserModelMessage, } from 'ai';
|
|
4
|
-
import { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, jsonSchema, ModelLimitError, readRetryAfterMs, resolveSmartAiCacheProvider, tool } from '@modelprofile.com/flexharness-models';
|
|
5
|
-
export { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, ModelLimitError, readRetryAfterMs, resolveSmartAiCacheProvider, tool, jsonSchema, };
|
|
6
|
-
export type { ISmartAiCacheOptions, ISmartAiCacheDispatch, TSmartAiLanguageModel, TSmartAiCacheRetention, TSmartAiCacheSetting, TSmartAiProviderOptions as ProviderOptions, } from '@modelprofile.com/flexharness-models';
|
|
4
|
+
import { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, deriveSmartAiPromptCacheKey, getSmartAiCacheProviderOptions, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, jsonSchema, ModelLimitError, openAiRoutesPromptCacheAutomatically, readRetryAfterMs, resolveSmartAiCacheProvider, tool } from '@modelprofile.com/flexharness-models';
|
|
5
|
+
export { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, deriveSmartAiPromptCacheKey, getSmartAiCacheProviderOptions, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, ModelLimitError, openAiRoutesPromptCacheAutomatically, readRetryAfterMs, resolveSmartAiCacheProvider, tool, jsonSchema, };
|
|
6
|
+
export type { ISmartAiCacheOptions, ISmartAiCacheDispatch, ISmartAiPromptCacheTool, TSmartAiLanguageModel, TSmartAiCacheRetention, TSmartAiCacheSetting, TSmartAiProviderOptions as ProviderOptions, } from '@modelprofile.com/flexharness-models';
|
|
7
7
|
export type { IToolExecutionContext, IToolJobState, } from './tool.contracts.js';
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
export { z };
|
package/dist_ts_agent/plugins.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// ai-sdk core
|
|
2
|
-
import { streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
3
|
-
export { streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
2
|
+
import { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
3
|
+
export { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
4
4
|
// model contracts and AI SDK
|
|
5
|
-
import { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, jsonSchema, ModelLimitError, readRetryAfterMs, resolveSmartAiCacheProvider, tool, } from '@modelprofile.com/flexharness-models';
|
|
6
|
-
export { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, ModelLimitError, readRetryAfterMs, resolveSmartAiCacheProvider, tool, jsonSchema, };
|
|
5
|
+
import { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, deriveSmartAiPromptCacheKey, getSmartAiCacheProviderOptions, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, jsonSchema, ModelLimitError, openAiRoutesPromptCacheAutomatically, readRetryAfterMs, resolveSmartAiCacheProvider, tool, } from '@modelprofile.com/flexharness-models';
|
|
6
|
+
export { applySmartAiCacheProviderOptions, bindSmartAiCachePolicyObserver, createModelLimitInfo, createSmartAiCachingMiddleware, deriveSmartAiPromptCacheKey, getSmartAiCacheProviderOptions, getSmartAiCacheWaitMs, observeSmartAiCacheDispatch, isModelLimitError, isModelLimitInfo, ModelLimitError, openAiRoutesPromptCacheAutomatically, readRetryAfterMs, resolveSmartAiCacheProvider, tool, jsonSchema, };
|
|
7
7
|
// zod
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
export { z };
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX2FnZW50L3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFeEYsT0FBTyxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxpQkFBaUIsRUFBRSxDQUFDO0FBZTlFLDZCQUE2QjtBQUM3QixPQUFPLEVBQ0wsZ0NBQWdDLEVBQ2hDLDhCQUE4QixFQUM5QixvQkFBb0IsRUFDcEIsOEJBQThCLEVBQzlCLDJCQUEyQixFQUMzQiw4QkFBOEIsRUFDOUIscUJBQXFCLEVBQ3JCLDJCQUEyQixFQUMzQixpQkFBaUIsRUFDakIsZ0JBQWdCLEVBQ2hCLFVBQVUsRUFDVixlQUFlLEVBQ2Ysb0NBQW9DLEVBQ3BDLGdCQUFnQixFQUNoQiwyQkFBMkIsRUFDM0IsSUFBSSxHQUNMLE1BQU0sc0NBQXNDLENBQUM7QUFFOUMsT0FBTyxFQUNMLGdDQUFnQyxFQUNoQyw4QkFBOEIsRUFDOUIsb0JBQW9CLEVBQ3BCLDhCQUE4QixFQUM5QiwyQkFBMkIsRUFDM0IsOEJBQThCLEVBQzlCLHFCQUFxQixFQUNyQiwyQkFBMkIsRUFDM0IsaUJBQWlCLEVBQ2pCLGdCQUFnQixFQUNoQixlQUFlLEVBQ2Ysb0NBQW9DLEVBQ3BDLGdCQUFnQixFQUNoQiwyQkFBMkIsRUFDM0IsSUFBSSxFQUNKLFVBQVUsR0FDWCxDQUFDO0FBa0JGLE1BQU07QUFDTixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQyJ9
|
|
@@ -185,18 +185,26 @@ export function buildModelMessages(events) {
|
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
const messages = [];
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
let
|
|
192
|
-
|
|
188
|
+
// Background job updates render where they happened: each run of consecutive updates becomes one
|
|
189
|
+
// message at its end. A later update never moves or rewrites an earlier message, so the context
|
|
190
|
+
// only grows and keeps the provider's cached prefix.
|
|
191
|
+
let jobRuntimeRun = [];
|
|
192
|
+
const flushJobRuntimeRun = () => {
|
|
193
|
+
if (jobRuntimeRun.length === 0)
|
|
194
|
+
return;
|
|
195
|
+
const runtimeUpdate = renderJobRuntimeEvents(jobRuntimeRun);
|
|
196
|
+
if (runtimeUpdate)
|
|
197
|
+
messages.push({ role: 'user', content: runtimeUpdate });
|
|
198
|
+
jobRuntimeRun = [];
|
|
199
|
+
};
|
|
200
|
+
for (const event of orderedEvents) {
|
|
193
201
|
if (event.type === 'runtime-event'
|
|
194
202
|
&& typeof event.event.executionId === 'string'
|
|
195
203
|
&& event.modelVisible !== false) {
|
|
196
|
-
|
|
204
|
+
jobRuntimeRun.push(event);
|
|
205
|
+
continue;
|
|
197
206
|
}
|
|
198
|
-
|
|
199
|
-
for (const [index, event] of orderedEvents.entries()) {
|
|
207
|
+
flushJobRuntimeRun();
|
|
200
208
|
switch (event.type) {
|
|
201
209
|
case 'system-message':
|
|
202
210
|
messages.push({ role: 'system', content: event.content, providerOptions: event.providerOptions });
|
|
@@ -227,21 +235,13 @@ export function buildModelMessages(events) {
|
|
|
227
235
|
case 'runtime-event':
|
|
228
236
|
if (event.modelVisible === false || event.event.type === 'inference-started')
|
|
229
237
|
break;
|
|
230
|
-
|
|
231
|
-
if (index === latestJobRuntimeIndex) {
|
|
232
|
-
const runtimeUpdate = renderJobRuntimeEvents(jobRuntimeEvents);
|
|
233
|
-
if (runtimeUpdate)
|
|
234
|
-
messages.push({ role: 'user', content: runtimeUpdate });
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
else {
|
|
238
|
-
messages.push({ role: 'user', content: renderExternalRuntimeEvent(event.event) });
|
|
239
|
-
}
|
|
238
|
+
messages.push({ role: 'user', content: renderExternalRuntimeEvent(event.event) });
|
|
240
239
|
break;
|
|
241
240
|
case 'context-compaction':
|
|
242
241
|
break;
|
|
243
242
|
}
|
|
244
243
|
}
|
|
244
|
+
flushJobRuntimeRun();
|
|
245
245
|
return messages;
|
|
246
246
|
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.context.js","sourceRoot":"","sources":["../ts_agent/smartagent.context.ts"],"names":[],"mappings":"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"}
|
|
247
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.context.js","sourceRoot":"","sources":["../ts_agent/smartagent.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,19 +79,33 @@ export type TAgentModelCallUsage = (IAgentModelCallIdentity & {
|
|
|
79
79
|
});
|
|
80
80
|
/** Receives the usage outcome of each model call. Must not throw. */
|
|
81
81
|
export type TAgentModelCallUsageReporter = (call: TAgentModelCallUsage) => void;
|
|
82
|
+
/** A model call's usage as the session delivers it: a reported call also states its cache hit ratio. */
|
|
83
|
+
export type TAgentObservedModelCallUsage = (Extract<TAgentModelCallUsage, {
|
|
84
|
+
status: 'reported';
|
|
85
|
+
}> & {
|
|
86
|
+
/**
|
|
87
|
+
* The share of the call's input the provider read from its prompt cache:
|
|
88
|
+
* `usage.cacheReadTokens / usage.inputTokens`, 0 for a call without input tokens.
|
|
89
|
+
*/
|
|
90
|
+
cacheHitRatio: number;
|
|
91
|
+
}) | Extract<TAgentModelCallUsage, {
|
|
92
|
+
status: 'unreported';
|
|
93
|
+
}>;
|
|
94
|
+
/** Where a call's usage belongs: a generation's model step, or a compaction. */
|
|
95
|
+
export type TAgentModelCallUsageSource = {
|
|
96
|
+
source: 'generation';
|
|
97
|
+
generationId: string;
|
|
98
|
+
} | {
|
|
99
|
+
source: 'compaction';
|
|
100
|
+
generationId?: string;
|
|
101
|
+
};
|
|
82
102
|
/**
|
|
83
103
|
* The usage outcome of one model call of a session, reported once per call through `onUsage`.
|
|
84
104
|
* `source: 'generation'`: a model step of the generation `generationId`.
|
|
85
105
|
* `source: 'compaction'`: a model call of a context compaction. `generationId` names the generation
|
|
86
106
|
* whose context overflow caused it; it is absent for `compact()` and event retention.
|
|
87
107
|
*/
|
|
88
|
-
export type TAgentModelCallUsageEvent =
|
|
89
|
-
source: 'generation';
|
|
90
|
-
generationId: string;
|
|
91
|
-
} | {
|
|
92
|
-
source: 'compaction';
|
|
93
|
-
generationId?: string;
|
|
94
|
-
});
|
|
108
|
+
export type TAgentModelCallUsageEvent = TAgentObservedModelCallUsage & TAgentModelCallUsageSource;
|
|
95
109
|
export interface IAgentContextOverflowInvocationOptions {
|
|
96
110
|
abortSignal?: AbortSignal;
|
|
97
111
|
/**
|
|
@@ -119,6 +133,13 @@ export interface IAgentContextCompactionOptions {
|
|
|
119
133
|
* applied. Send the compaction's model call with them.
|
|
120
134
|
*/
|
|
121
135
|
providerOptions?: ProviderOptions;
|
|
136
|
+
/**
|
|
137
|
+
* The tools the served generation's turns are sent with, on a `context-budget` compaction whose
|
|
138
|
+
* provider caches the prefix. Send the compaction's model call with their definitions, so it
|
|
139
|
+
* repeats the turns' cached prefix; it never runs them. A `context-overflow` compaction carries
|
|
140
|
+
* none: its summary needs the room they take.
|
|
141
|
+
*/
|
|
142
|
+
tools?: ToolSet;
|
|
122
143
|
/**
|
|
123
144
|
* Reports the usage of each model call the compactor makes, into the session's `onUsage` as
|
|
124
145
|
* `source: 'compaction'`. The session always supplies it. Report every call before the returned
|
|
@@ -21,4 +21,4 @@ export class ContextOverflowError extends Error {
|
|
|
21
21
|
this.name = 'ContextOverflowError';
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfYWdlbnQvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQStWQSxNQUFNLE9BQU8sZ0NBQWlDLFNBQVEsS0FBSztJQUN6QyxLQUFLLENBQXdCO0lBQzdCLFlBQVksQ0FBVTtJQUNyQixvQkFBb0IsQ0FBc0I7SUFFM0QsWUFDRSxLQUE0QixFQUM1QixZQUFxQixFQUNyQixvQkFBeUM7UUFFekMsS0FBSyxDQUNILG9DQUFvQyxZQUFZLFlBQVksS0FBSztZQUMvRCxDQUFDLENBQUMsWUFBWSxDQUFDLE9BQU87WUFDdEIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUMzQixDQUFDO1FBQ0YsSUFBSSxDQUFDLElBQUksR0FBRyxrQ0FBa0MsQ0FBQztRQUMvQyxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNuQixJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztRQUNqQyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsb0JBQW9CLENBQUM7SUFDbkQsQ0FBQztJQUVNLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0NBQ0Y7QUE4SkQsTUFBTSxPQUFPLG9CQUFxQixTQUFRLEtBQUs7SUFDN0MsWUFBWSxPQUFPLEdBQUcsdUVBQXVFO1FBQzNGLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxJQUFJLEdBQUcsc0JBQXNCLENBQUM7SUFDckMsQ0FBQztDQUNGIn0=
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness-agent",
|
|
5
|
-
"version": "10.
|
|
5
|
+
"version": "10.14.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Standalone event-driven agent runtime with generation transactions, context and tool execution contracts.",
|
|
8
8
|
"main": "./dist_ts_agent/index.js",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
}
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@modelprofile.com/flexharness-models": "10.
|
|
21
|
+
"@modelprofile.com/flexharness-models": "10.14.0",
|
|
22
22
|
"ai": "^7.0.111",
|
|
23
23
|
"zod": "^4.6.5",
|
|
24
24
|
"@noble/hashes": "^2.4.0",
|
package/readme.md
CHANGED
|
@@ -193,6 +193,7 @@ try {
|
|
|
193
193
|
| `generationId` | The generation the call belongs to. A compaction carries the generation whose context overflow caused it; a compaction by `compact()` or event retention has none. |
|
|
194
194
|
| `provider`, `requestedModelId` | The model the call was made with: the language model's `provider` and `modelId`. Every event carries both, whatever its status, so key usage caps on them. |
|
|
195
195
|
| `status: 'reported'`, `usage`, `responseModelId` | The provider reported the call's usage. A count the provider leaves out is zero. `responseModelId` is the model id the provider's response named (a provider may answer with a dated model version), or `requestedModelId` when it named none. |
|
|
196
|
+
| `cacheHitRatio` | On a reported call: the share of its input the provider read from its prompt cache, `usage.cacheReadTokens / usage.inputTokens`, 0 for a call without input. |
|
|
196
197
|
| `usageComplete: false` | A reported call omitted its input or output total. The zero-filled aggregate preserves the known counts as a lower bound, not proof that missing counts were zero. Absence of cache-detail counts alone does not make the input/output total incomplete. |
|
|
197
198
|
| `status: 'unreported'`, `reason` | The call ended before the provider reported its usage: `aborted` (the call was aborted), `failed` (the call or its response failed) or `missing` (the response carried no usage). The provider may still have consumed tokens for it; their number is unknown. |
|
|
198
199
|
|
|
@@ -214,7 +215,7 @@ When a run returns, its reported calls sum to `result.usage`; count one or the o
|
|
|
214
215
|
});
|
|
215
216
|
```
|
|
216
217
|
|
|
217
|
-
A compaction the session starts during a generation (`context-overflow`, `context-budget`) also passes `system` and `providerOptions` to `contextCompactor`: the instructions and the provider options
|
|
218
|
+
A compaction the session starts during a generation (`context-overflow`, `context-budget`) also passes `system` and `providerOptions` to `contextCompactor`: the instructions and the provider options (cache options applied) the generation's turns are sent with. A `context-budget` compaction on a provider the cache setting gives cache hints also passes `tools`, the tools the turns are sent with; a `context-overflow` compaction does not, since its summary needs the room they take. `compactMessages()` sends its call with them, streamed like every turn, and with the tools' definitions but none of their code, so passing the options through makes the compaction repeat the turns' prefix and read it from the provider's prompt cache; definitions that outweigh the history nine times are left out, since reading them would cost more than the history saves. A model that answers with a tool call instead of a summary is asked once more with tool use turned off, and with a provider-executed tool in the set tool use is off from the start.
|
|
218
219
|
|
|
219
220
|
A handler that makes its own model calls reports each one through `reportUsage` before its promise settles, a call that fails or is aborted as `unreported`. `AgentModelCallUsageRecorder` does the bookkeeping for one language model: call `start()` when a call begins, `end(responseModelId, usage)` with the AI SDK's `onLanguageModelCallEnd` values, and `settle(reason)` when a call ends otherwise.
|
|
220
221
|
|
|
@@ -365,7 +366,7 @@ Model transports, tools and resource callbacks must observe their supplied abort
|
|
|
365
366
|
|
|
366
367
|
The runtime retries a model call that failed with a rate limit (429), an overloaded provider (529) or an unavailable one (503) at most 8 times, waiting for the provider's `retry-after` delay but at least the backoff that doubles from 2 s to 30 s. A requested delay beyond 60 s, or one that would take the call's retries past 150 s in total, fails the generation: a rate limit (429) as a `ModelLimitError` of kind `rate_limit` carrying that retry time, a 503 or 529 with the provider error. A `ModelLimitError` of kind `usage_limit`, which the provider adapters raise for a spent quota, is never retried. Completed tool results are preserved during a generation's retry sequence. A ledger reuses an already observed execution for the same tool-call identity. Applications still need their own idempotency and recovery rules for external side effects.
|
|
367
368
|
|
|
368
|
-
`maxSteps` defaults to `20` and limits completed model steps per generation. Prompt-cache handling defaults to `cache: 'auto'`; use `cache: false` to disable the runtime's cache defaults, or pass an explicit cache policy
|
|
369
|
+
`maxSteps` defaults to `20` and limits completed model steps per generation. Prompt-cache handling defaults to `cache: 'auto'`; use `cache: false` to disable the runtime's cache defaults, or pass an explicit cache policy (`ISmartAiCacheOptions` of `@modelprofile.com/flexharness-models`). On OpenAI a generation's `prompt_cache_key` is derived from its instructions and tool definitions, so sessions with one prefix share the provider's cache; `keyScope`, `keyBuckets` and `key` adjust it.
|
|
369
370
|
|
|
370
371
|
## Portable runner in the browser
|
|
371
372
|
|
|
@@ -49,8 +49,10 @@ import {
|
|
|
49
49
|
type TAgentSessionChangeListener,
|
|
50
50
|
type TAgentCacheSetting,
|
|
51
51
|
type TAgentGenerationPrepare,
|
|
52
|
+
type TAgentModelCallUsage,
|
|
52
53
|
type TAgentModelCallUsageEvent,
|
|
53
54
|
type TAgentModelCallUsageReporter,
|
|
55
|
+
type TAgentModelCallUsageSource,
|
|
54
56
|
type TAgentPrompt,
|
|
55
57
|
type TAgentToolCallFinishEvent,
|
|
56
58
|
type TAgentToolExecutionReconciliationOptions,
|
|
@@ -130,6 +132,8 @@ interface IEffectiveGenerationRuntime {
|
|
|
130
132
|
tools: plugins.ToolSet;
|
|
131
133
|
providerOptions?: plugins.ProviderOptions;
|
|
132
134
|
maxSteps: number;
|
|
135
|
+
/** The generation's cache setting gives this provider cache hints: its prefix may be read back. */
|
|
136
|
+
cachesPrefix: boolean;
|
|
133
137
|
}
|
|
134
138
|
|
|
135
139
|
interface IGenerationBackgroundJob {
|
|
@@ -612,7 +616,10 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
612
616
|
this.platform.reportListenerError(error);
|
|
613
617
|
}
|
|
614
618
|
|
|
615
|
-
private reportModelCallUsage(
|
|
619
|
+
private reportModelCallUsage(call: TAgentModelCallUsage & TAgentModelCallUsageSource): void {
|
|
620
|
+
const event: TAgentModelCallUsageEvent = call.status === 'reported'
|
|
621
|
+
? { ...call, cacheHitRatio: call.usage.inputTokens > 0 ? call.usage.cacheReadTokens / call.usage.inputTokens : 0 }
|
|
622
|
+
: call;
|
|
616
623
|
try {
|
|
617
624
|
this.options.onUsage?.(event);
|
|
618
625
|
} catch (error) {
|
|
@@ -1323,7 +1330,7 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
1323
1330
|
reason: 'context-overflow' | 'context-budget' | 'retention' | 'manual',
|
|
1324
1331
|
reportUsage: TAgentModelCallUsageReporter,
|
|
1325
1332
|
abortSignal?: AbortSignal,
|
|
1326
|
-
servedCall?: Pick<IAgentContextCompactionOptions, 'system' | 'providerOptions'>,
|
|
1333
|
+
servedCall?: Pick<IAgentContextCompactionOptions, 'system' | 'providerOptions' | 'tools'>,
|
|
1327
1334
|
): Promise<IContextCompactionEvent | undefined> {
|
|
1328
1335
|
abortSignal?.throwIfAborted();
|
|
1329
1336
|
await this.flushPersistence();
|
|
@@ -1368,6 +1375,7 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
1368
1375
|
...(servedCall?.providerOptions === undefined
|
|
1369
1376
|
? {}
|
|
1370
1377
|
: { providerOptions: servedCall.providerOptions }),
|
|
1378
|
+
...(servedCall?.tools === undefined ? {} : { tools: servedCall.tools }),
|
|
1371
1379
|
},
|
|
1372
1380
|
),
|
|
1373
1381
|
)
|
|
@@ -1912,11 +1920,11 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
1912
1920
|
: waitWithAbort(run, [options.abort, this.sessionAbortController.signal]);
|
|
1913
1921
|
}
|
|
1914
1922
|
|
|
1915
|
-
private resolveEffectiveGenerationRuntime(
|
|
1923
|
+
private async resolveEffectiveGenerationRuntime(
|
|
1916
1924
|
options: IAgentGenerateOptions,
|
|
1917
1925
|
lease: IAgentGenerationLease | undefined,
|
|
1918
1926
|
onDispatch: (dispatch: plugins.ISmartAiCacheDispatch) => void,
|
|
1919
|
-
): IEffectiveGenerationRuntime {
|
|
1927
|
+
): Promise<IEffectiveGenerationRuntime> {
|
|
1920
1928
|
const model = lease?.model ?? options.model ?? this.options.model;
|
|
1921
1929
|
if (!model) {
|
|
1922
1930
|
throw new Error(
|
|
@@ -1941,8 +1949,10 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
1941
1949
|
? undefined
|
|
1942
1950
|
: configuredCacheProvider
|
|
1943
1951
|
?? plugins.resolveSmartAiCacheProvider(model.provider, model.modelId);
|
|
1952
|
+
const promptCacheKey = await this.routedPromptCacheKey(model, cache, system, tools);
|
|
1944
1953
|
const effectiveProviderOptions = plugins.applySmartAiCacheProviderOptions({
|
|
1945
1954
|
provider: model.provider, modelId: model.modelId, providerOptions, cache,
|
|
1955
|
+
...(promptCacheKey === undefined ? {} : { promptCacheKey }),
|
|
1946
1956
|
sessionId: this.options.sessionId,
|
|
1947
1957
|
});
|
|
1948
1958
|
const observedModel = plugins.bindSmartAiCachePolicyObserver(model, ({ dispatchedAt, policy }) => {
|
|
@@ -1973,9 +1983,51 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
1973
1983
|
tools,
|
|
1974
1984
|
providerOptions: effectiveProviderOptions,
|
|
1975
1985
|
maxSteps,
|
|
1986
|
+
cachesPrefix: messageCacheProvider !== undefined
|
|
1987
|
+
|| plugins.getSmartAiCacheProviderOptions({ provider: model.provider, modelId: model.modelId, cache }) !== undefined,
|
|
1976
1988
|
};
|
|
1977
1989
|
}
|
|
1978
1990
|
|
|
1991
|
+
/**
|
|
1992
|
+
* The OpenAI `prompt_cache_key` of a generation: derived from the instructions and tool definitions
|
|
1993
|
+
* every turn repeats, the configured `keyScope`, and on models that route by key the session's
|
|
1994
|
+
* bucket of `keyBuckets`. Undefined where caching is off, a key is configured, or the model is not
|
|
1995
|
+
* OpenAI's.
|
|
1996
|
+
*/
|
|
1997
|
+
private async routedPromptCacheKey(
|
|
1998
|
+
model: plugins.TSmartAiLanguageModel,
|
|
1999
|
+
cache: plugins.TSmartAiCacheSetting,
|
|
2000
|
+
system: string | undefined,
|
|
2001
|
+
tools: plugins.ToolSet,
|
|
2002
|
+
): Promise<string | undefined> {
|
|
2003
|
+
if (cache === false || (typeof cache === 'object' && cache.key !== undefined)) return undefined;
|
|
2004
|
+
if (!plugins.getSmartAiCacheProviderOptions({ provider: model.provider, modelId: model.modelId, cache })) {
|
|
2005
|
+
return undefined;
|
|
2006
|
+
}
|
|
2007
|
+
const definitions: plugins.ISmartAiPromptCacheTool[] = [];
|
|
2008
|
+
for (const [name, definition] of Object.entries(tools)) {
|
|
2009
|
+
if (definition.type === 'provider') {
|
|
2010
|
+
definitions.push({ type: 'provider', name, inputSchema: { id: definition.id, args: definition.args } });
|
|
2011
|
+
continue;
|
|
2012
|
+
}
|
|
2013
|
+
definitions.push({
|
|
2014
|
+
name,
|
|
2015
|
+
...(typeof definition.description === 'string' ? { description: definition.description } : {}),
|
|
2016
|
+
inputSchema: await plugins.asSchema(definition.inputSchema).jsonSchema,
|
|
2017
|
+
...(definition.strict === undefined ? {} : { strict: definition.strict }),
|
|
2018
|
+
});
|
|
2019
|
+
}
|
|
2020
|
+
const options = typeof cache === 'object' ? cache : {};
|
|
2021
|
+
return plugins.deriveSmartAiPromptCacheKey({
|
|
2022
|
+
system,
|
|
2023
|
+
tools: definitions,
|
|
2024
|
+
...(options.keyScope === undefined ? {} : { scope: options.keyScope }),
|
|
2025
|
+
...(options.keyBuckets === undefined || plugins.openAiRoutesPromptCacheAutomatically(model.modelId)
|
|
2026
|
+
? {}
|
|
2027
|
+
: { buckets: options.keyBuckets, affinity: this.options.sessionId }),
|
|
2028
|
+
});
|
|
2029
|
+
}
|
|
2030
|
+
|
|
1979
2031
|
private async generateLocked(options: IAgentGenerateOptions): Promise<IAgentGenerateResult> {
|
|
1980
2032
|
await this.flushPersistence();
|
|
1981
2033
|
const maxContextOverflowRetries = this.options.maxContextOverflowRetries ?? 3;
|
|
@@ -2022,7 +2074,7 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
2022
2074
|
leaseCleanupOwnership = this.ownGenerationLeaseCleanup(lease);
|
|
2023
2075
|
combinedAbort.signal.throwIfAborted();
|
|
2024
2076
|
let cacheDispatch: plugins.ISmartAiCacheDispatch | undefined;
|
|
2025
|
-
const runtime = this.resolveEffectiveGenerationRuntime(options, lease, (dispatch) => {
|
|
2077
|
+
const runtime = await this.resolveEffectiveGenerationRuntime(options, lease, (dispatch) => {
|
|
2026
2078
|
cacheDispatch = dispatch;
|
|
2027
2079
|
try { options.onCacheDispatch?.(dispatch); } catch (error) { this.reportListenerError(error); }
|
|
2028
2080
|
});
|
|
@@ -2046,7 +2098,7 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
2046
2098
|
let totalOutput = 0;
|
|
2047
2099
|
let totalCacheRead = 0;
|
|
2048
2100
|
let totalCacheWrite = 0;
|
|
2049
|
-
const recordModelCallUsage = (event:
|
|
2101
|
+
const recordModelCallUsage = (event: TAgentModelCallUsage & TAgentModelCallUsageSource): void => {
|
|
2050
2102
|
if (event.status === 'reported') {
|
|
2051
2103
|
totalInput += event.usage.inputTokens;
|
|
2052
2104
|
totalOutput += event.usage.outputTokens;
|
|
@@ -2261,11 +2313,17 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
2261
2313
|
automaticCompactionChecked = true;
|
|
2262
2314
|
const bytes = new TextEncoder().encode(JSON.stringify(this.getModelMessages())).byteLength;
|
|
2263
2315
|
if (bytes > (this.options.contextCompactionBytes ?? 256 * 1024)) {
|
|
2316
|
+
// The turns' tools let the summary call read the cached prefix; without a
|
|
2317
|
+
// cache they would only add input.
|
|
2264
2318
|
await this.performCompaction(
|
|
2265
2319
|
'context-budget',
|
|
2266
2320
|
reportCompactionUsage,
|
|
2267
2321
|
combinedAbort.signal,
|
|
2268
|
-
{
|
|
2322
|
+
{
|
|
2323
|
+
system: runtime.system,
|
|
2324
|
+
providerOptions: runtime.providerOptions,
|
|
2325
|
+
...(runtime.cachesPrefix ? { tools: allTools } : {}),
|
|
2326
|
+
},
|
|
2269
2327
|
);
|
|
2270
2328
|
}
|
|
2271
2329
|
}
|
|
@@ -2636,6 +2694,7 @@ export class AgentSessionEngine implements IAgentSession {
|
|
|
2636
2694
|
}
|
|
2637
2695
|
combinedAbort.signal.throwIfAborted();
|
|
2638
2696
|
contextOverflowRetries++;
|
|
2697
|
+
// No tools: the summary of an overflowing context needs the room they take.
|
|
2639
2698
|
await this.performCompaction(
|
|
2640
2699
|
'context-overflow',
|
|
2641
2700
|
reportCompactionUsage,
|
package/ts_agent/index.ts
CHANGED
|
@@ -75,6 +75,8 @@ export type {
|
|
|
75
75
|
TAgentModelCallUsage,
|
|
76
76
|
TAgentModelCallUsageEvent,
|
|
77
77
|
TAgentModelCallUsageReporter,
|
|
78
|
+
TAgentModelCallUsageSource,
|
|
79
|
+
TAgentObservedModelCallUsage,
|
|
78
80
|
TAgentSessionChangeListener,
|
|
79
81
|
TAgentToolCallFinishEvent,
|
|
80
82
|
TAgentToolExecutionReconciliationOptions,
|
package/ts_agent/plugins.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// ai-sdk core
|
|
2
|
-
import { streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
2
|
+
import { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel } from 'ai';
|
|
3
3
|
|
|
4
|
-
export { streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
4
|
+
export { asSchema, streamText, generateText, stepCountIs, wrapLanguageModel };
|
|
5
5
|
|
|
6
6
|
export type {
|
|
7
7
|
AssistantModelMessage,
|
|
@@ -22,12 +22,15 @@ import {
|
|
|
22
22
|
bindSmartAiCachePolicyObserver,
|
|
23
23
|
createModelLimitInfo,
|
|
24
24
|
createSmartAiCachingMiddleware,
|
|
25
|
+
deriveSmartAiPromptCacheKey,
|
|
26
|
+
getSmartAiCacheProviderOptions,
|
|
25
27
|
getSmartAiCacheWaitMs,
|
|
26
28
|
observeSmartAiCacheDispatch,
|
|
27
29
|
isModelLimitError,
|
|
28
30
|
isModelLimitInfo,
|
|
29
31
|
jsonSchema,
|
|
30
32
|
ModelLimitError,
|
|
33
|
+
openAiRoutesPromptCacheAutomatically,
|
|
31
34
|
readRetryAfterMs,
|
|
32
35
|
resolveSmartAiCacheProvider,
|
|
33
36
|
tool,
|
|
@@ -38,11 +41,14 @@ export {
|
|
|
38
41
|
bindSmartAiCachePolicyObserver,
|
|
39
42
|
createModelLimitInfo,
|
|
40
43
|
createSmartAiCachingMiddleware,
|
|
44
|
+
deriveSmartAiPromptCacheKey,
|
|
45
|
+
getSmartAiCacheProviderOptions,
|
|
41
46
|
getSmartAiCacheWaitMs,
|
|
42
47
|
observeSmartAiCacheDispatch,
|
|
43
48
|
isModelLimitError,
|
|
44
49
|
isModelLimitInfo,
|
|
45
50
|
ModelLimitError,
|
|
51
|
+
openAiRoutesPromptCacheAutomatically,
|
|
46
52
|
readRetryAfterMs,
|
|
47
53
|
resolveSmartAiCacheProvider,
|
|
48
54
|
tool,
|
|
@@ -52,6 +58,7 @@ export {
|
|
|
52
58
|
export type {
|
|
53
59
|
ISmartAiCacheOptions,
|
|
54
60
|
ISmartAiCacheDispatch,
|
|
61
|
+
ISmartAiPromptCacheTool,
|
|
55
62
|
TSmartAiLanguageModel,
|
|
56
63
|
TSmartAiCacheRetention,
|
|
57
64
|
TSmartAiCacheSetting,
|
package/ts_agent/readme.md
CHANGED
|
@@ -193,6 +193,7 @@ try {
|
|
|
193
193
|
| `generationId` | The generation the call belongs to. A compaction carries the generation whose context overflow caused it; a compaction by `compact()` or event retention has none. |
|
|
194
194
|
| `provider`, `requestedModelId` | The model the call was made with: the language model's `provider` and `modelId`. Every event carries both, whatever its status, so key usage caps on them. |
|
|
195
195
|
| `status: 'reported'`, `usage`, `responseModelId` | The provider reported the call's usage. A count the provider leaves out is zero. `responseModelId` is the model id the provider's response named (a provider may answer with a dated model version), or `requestedModelId` when it named none. |
|
|
196
|
+
| `cacheHitRatio` | On a reported call: the share of its input the provider read from its prompt cache, `usage.cacheReadTokens / usage.inputTokens`, 0 for a call without input. |
|
|
196
197
|
| `usageComplete: false` | A reported call omitted its input or output total. The zero-filled aggregate preserves the known counts as a lower bound, not proof that missing counts were zero. Absence of cache-detail counts alone does not make the input/output total incomplete. |
|
|
197
198
|
| `status: 'unreported'`, `reason` | The call ended before the provider reported its usage: `aborted` (the call was aborted), `failed` (the call or its response failed) or `missing` (the response carried no usage). The provider may still have consumed tokens for it; their number is unknown. |
|
|
198
199
|
|
|
@@ -214,7 +215,7 @@ When a run returns, its reported calls sum to `result.usage`; count one or the o
|
|
|
214
215
|
});
|
|
215
216
|
```
|
|
216
217
|
|
|
217
|
-
A compaction the session starts during a generation (`context-overflow`, `context-budget`) also passes `system` and `providerOptions` to `contextCompactor`: the instructions and the provider options
|
|
218
|
+
A compaction the session starts during a generation (`context-overflow`, `context-budget`) also passes `system` and `providerOptions` to `contextCompactor`: the instructions and the provider options (cache options applied) the generation's turns are sent with. A `context-budget` compaction on a provider the cache setting gives cache hints also passes `tools`, the tools the turns are sent with; a `context-overflow` compaction does not, since its summary needs the room they take. `compactMessages()` sends its call with them, streamed like every turn, and with the tools' definitions but none of their code, so passing the options through makes the compaction repeat the turns' prefix and read it from the provider's prompt cache; definitions that outweigh the history nine times are left out, since reading them would cost more than the history saves. A model that answers with a tool call instead of a summary is asked once more with tool use turned off, and with a provider-executed tool in the set tool use is off from the start.
|
|
218
219
|
|
|
219
220
|
A handler that makes its own model calls reports each one through `reportUsage` before its promise settles, a call that fails or is aborted as `unreported`. `AgentModelCallUsageRecorder` does the bookkeeping for one language model: call `start()` when a call begins, `end(responseModelId, usage)` with the AI SDK's `onLanguageModelCallEnd` values, and `settle(reason)` when a call ends otherwise.
|
|
220
221
|
|
|
@@ -365,7 +366,7 @@ Model transports, tools and resource callbacks must observe their supplied abort
|
|
|
365
366
|
|
|
366
367
|
The runtime retries a model call that failed with a rate limit (429), an overloaded provider (529) or an unavailable one (503) at most 8 times, waiting for the provider's `retry-after` delay but at least the backoff that doubles from 2 s to 30 s. A requested delay beyond 60 s, or one that would take the call's retries past 150 s in total, fails the generation: a rate limit (429) as a `ModelLimitError` of kind `rate_limit` carrying that retry time, a 503 or 529 with the provider error. A `ModelLimitError` of kind `usage_limit`, which the provider adapters raise for a spent quota, is never retried. Completed tool results are preserved during a generation's retry sequence. A ledger reuses an already observed execution for the same tool-call identity. Applications still need their own idempotency and recovery rules for external side effects.
|
|
367
368
|
|
|
368
|
-
`maxSteps` defaults to `20` and limits completed model steps per generation. Prompt-cache handling defaults to `cache: 'auto'`; use `cache: false` to disable the runtime's cache defaults, or pass an explicit cache policy
|
|
369
|
+
`maxSteps` defaults to `20` and limits completed model steps per generation. Prompt-cache handling defaults to `cache: 'auto'`; use `cache: false` to disable the runtime's cache defaults, or pass an explicit cache policy (`ISmartAiCacheOptions` of `@modelprofile.com/flexharness-models`). On OpenAI a generation's `prompt_cache_key` is derived from its instructions and tool definitions, so sessions with one prefix share the provider's cache; `keyScope`, `keyBuckets` and `key` adjust it.
|
|
369
370
|
|
|
370
371
|
## Portable runner in the browser
|
|
371
372
|
|
|
@@ -215,24 +215,27 @@ export function buildModelMessages(events: readonly TAgentEvent[]): plugins.Mode
|
|
|
215
215
|
}
|
|
216
216
|
|
|
217
217
|
const messages: plugins.ModelMessage[] = [];
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
218
|
+
// Background job updates render where they happened: each run of consecutive updates becomes one
|
|
219
|
+
// message at its end. A later update never moves or rewrites an earlier message, so the context
|
|
220
|
+
// only grows and keeps the provider's cached prefix.
|
|
221
|
+
let jobRuntimeRun: IRuntimeEvent[] = [];
|
|
222
|
+
const flushJobRuntimeRun = (): void => {
|
|
223
|
+
if (jobRuntimeRun.length === 0) return;
|
|
224
|
+
const runtimeUpdate = renderJobRuntimeEvents(jobRuntimeRun);
|
|
225
|
+
if (runtimeUpdate) messages.push({ role: 'user', content: runtimeUpdate });
|
|
226
|
+
jobRuntimeRun = [];
|
|
227
|
+
};
|
|
228
|
+
|
|
229
|
+
for (const event of orderedEvents) {
|
|
226
230
|
if (
|
|
227
231
|
event.type === 'runtime-event'
|
|
228
232
|
&& typeof event.event.executionId === 'string'
|
|
229
233
|
&& event.modelVisible !== false
|
|
230
234
|
) {
|
|
231
|
-
|
|
235
|
+
jobRuntimeRun.push(event);
|
|
236
|
+
continue;
|
|
232
237
|
}
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
for (const [index, event] of orderedEvents.entries()) {
|
|
238
|
+
flushJobRuntimeRun();
|
|
236
239
|
switch (event.type) {
|
|
237
240
|
case 'system-message':
|
|
238
241
|
messages.push({ role: 'system', content: event.content, providerOptions: event.providerOptions });
|
|
@@ -262,19 +265,13 @@ export function buildModelMessages(events: readonly TAgentEvent[]): plugins.Mode
|
|
|
262
265
|
break;
|
|
263
266
|
case 'runtime-event':
|
|
264
267
|
if (event.modelVisible === false || event.event.type === 'inference-started') break;
|
|
265
|
-
|
|
266
|
-
if (index === latestJobRuntimeIndex) {
|
|
267
|
-
const runtimeUpdate = renderJobRuntimeEvents(jobRuntimeEvents);
|
|
268
|
-
if (runtimeUpdate) messages.push({ role: 'user', content: runtimeUpdate });
|
|
269
|
-
}
|
|
270
|
-
} else {
|
|
271
|
-
messages.push({ role: 'user', content: renderExternalRuntimeEvent(event.event) });
|
|
272
|
-
}
|
|
268
|
+
messages.push({ role: 'user', content: renderExternalRuntimeEvent(event.event) });
|
|
273
269
|
break;
|
|
274
270
|
case 'context-compaction':
|
|
275
271
|
break;
|
|
276
272
|
}
|
|
277
273
|
}
|
|
274
|
+
flushJobRuntimeRun();
|
|
278
275
|
|
|
279
276
|
return messages;
|
|
280
277
|
}
|