@framers/agentos 0.10.22 → 0.10.23

package/README.md

@@ -78,7 +78,7 @@ await session.send('Can you expand on that?'); // remembers context
 
 [Full quickstart](https://docs.agentos.sh/getting-started) * [Examples cookbook](https://docs.agentos.sh/getting-started/examples) * [API reference](https://docs.agentos.sh/api)
 
-**Sessions.** A session keeps the whole conversation, including tool calls and their results, whether memory is on or off. History is capped at about 120K tokens by default. Set `history: false` for a stateless session, set `history: { maxTokens }` to change the cap, and call `reseed()` to replace the history with a shorter set of messages you build yourself.
+**Sessions.** A session keeps the whole conversation whether memory is on or off: each `send()` records its tool calls, their results and the model's signed thinking, and every later request replays them. `stream()` records its turn as the prompt and the final text. History is capped at about 120K tokens by default. Set `history: false` for a stateless session, set `history: { maxTokens }` to change the cap, and call `reseed()` to replace the history with a shorter set of messages you build yourself.
 
 ```ts
 const stateless = agent({ model, memory: false, history: false }).session('job-1');

package/dist/api/generateText.d.ts

@@ -5,7 +5,7 @@ import type { AgentOSUsageLedgerOptions } from './runtime/usageLedger.js';
 import type { ITool } from '../core/tools/ITool.js';
 import type { AgentCallRecord, AgencyTraceEvent } from './types.js';
 import type { IModelRouter, ModelRouteParams } from '../core/llm/routing/IModelRouter.js';
-import type { SessionTranscriptMessage } from './sessionTranscript.js';
+import { type SessionTranscriptMessage } from './sessionTranscript.js';
 import type { MessageContent, MessageContentPart, CacheDiagnostics } from '../core/llm/providers/IProvider.js';
 export type { MessageContent, MessageContentPart };
 export type { HostLLMPolicy } from './runtime/hostPolicy.js';
@@ -643,6 +643,19 @@ export interface GenerateTextOptions {
      * captured positionally). Not part of the public API.
      */
     _transcriptIncludeTrailingCallerMessages?: number;
+    /**
+     * INTERNAL (failover): the call a fallback leg continues. The leg keeps
+     * the call's tool run id, so tool execution contexts carry the same
+     * session, numbers its steps from `stepOffset` in hooks, synthetic tool
+     * call ids and tool contexts, and reports the call's original `prompt` to
+     * hooks (a leg that continues after tool rounds receives it inside
+     * `messages` instead). Not part of the public API.
+     */
+    _continuation?: {
+        helperToolRunId: string;
+        stepOffset: number;
+        prompt?: string;
+    };
 }
 /**
  * The completed result returned by {@link generateText}.

package/dist/api/generateText.d.ts.map

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

package/dist/api/generateText.js

@@ -17,7 +17,7 @@ import { attachGenAiAttributes, attachUsageAttributes, toTurnMetricUsage } from
 import { fireLlmUsageObserver } from './observers.js';
 import { hostPolicyToRouteParams, mergeRequiredCapabilities, } from './runtime/hostPolicy.js';
 import { adaptTools } from './runtime/toolAdapter.js';
-import { runEmulatedToolLoop } from './runtime/tool-emulation/index.js';
+import { runEmulatedToolLoop, toShimMessages } from './runtime/tool-emulation/index.js';
 import { resolveDynamicToolCalls } from './runtime/dynamicToolCalling.js';
 import { recordAgentOSTurnMetrics, withAgentOSSpan } from '../safety/evaluation/observability/otel.js';
 import { createLogger } from '../core/logging/loggerFactory.js';
@@ -66,6 +66,7 @@ class LLMProviderCircuitOpenError extends Error {
         this.name = 'LLMProviderCircuitOpenError';
     }
 }
+import { toProviderReplayMessage } from './sessionTranscript.js';
 async function recordAgentOSUsageLazy(input) {
     const { recordAgentOSUsage } = await import('./runtime/usageLedger.js');
     return recordAgentOSUsage(input);
@@ -252,6 +253,60 @@ function formatPlanForPrompt(plan) {
  * @internal
  */
 const RETRYABLE_HTTP_STATUSES = new Set([401, 402, 403, 429, 500, 502, 503, 504]);
+/**
+ * Whether the tool round a continuation answers was requested without
+ * thinking blocks, as it is when another provider's model ran it.
+ */
+function toolTurnLacksThinking(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const message = messages[i];
+        if (message.role !== 'assistant' || !Array.isArray(message.tool_calls) || message.tool_calls.length === 0) {
+            continue;
+        }
+        return !Array.isArray(message.thinkingBlocks) || message.thinkingBlocks.length === 0;
+    }
+    return false;
+}
+/** Property key that marks an error thrown after the call's tools ran. */
+const TOOLS_RAN = Symbol.for('agentos.generateText.toolsRan');
+/**
+ * Marks `error` as thrown after the call's tools ran, so a fallback walker
+ * that called this call as a leg stops instead of restarting on another
+ * provider, which would run the tools again. A non-object is wrapped in an
+ * Error first.
+ *
+ * @returns The marked error.
+ */
+function markToolsRan(error) {
+    const target = error !== null && typeof error === 'object' ? error : new Error(String(error));
+    try {
+        Object.defineProperty(target, TOOLS_RAN, { value: true, configurable: true });
+    }
+    catch {
+        // A frozen error cannot carry the mark.
+    }
+    return target;
+}
+/** Whether `error` was marked by {@link markToolsRan}. */
+function toolsRanBefore(error) {
+    return (error !== null &&
+        typeof error === 'object' &&
+        error[TOOLS_RAN] === true);
+}
+/**
+ * Provider error codes for request-level failures that another provider may
+ * not share: unreachable endpoints, request timeouts, and retries exhausted
+ * inside the provider. Mid-stream codes (STREAM_IDLE_TIMEOUT,
+ * STREAM_INCOMPLETE) are left out, because a stream that already delivered
+ * text must not be restarted on another provider.
+ */
+const RETRYABLE_PROVIDER_ERROR_CODES = new Set([
+    'NETWORK_ERROR',
+    'REQUEST_TIMEOUT',
+    'REQUEST_HARD_TIMEOUT',
+    'TIMEOUT',
+    'MAX_RETRIES_REACHED',
+]);
 /**
  * Detect content-policy refusals across providers so the fallback chain
  * can route them to a more permissive model (typically uncensored
@@ -325,19 +380,29 @@ export function isContentPolicyRefusal(error) {
 export function isRetryableError(error) {
     if (!(error instanceof Error))
         return false;
+    // A primary that cannot initialize (rejected key, unreachable endpoint)
+    // is unusable for this call whatever the cause; the next provider may not be.
+    if (error.name === 'ProviderInitializationError')
+        return true;
     // Typed provider errors carry the HTTP status as a numeric field. Prefer that
     // over message-grepping, since providers often substitute the body description
     // (e.g. "This request requires more credits...") for the status code.
     const status = error.httpStatus;
     if (typeof status === 'number' && RETRYABLE_HTTP_STATUSES.has(status))
         return true;
+    // Typed provider errors name request-level network failures and timeouts
+    // by code; their messages vary by provider (OpenAIProvider rewrites an
+    // exhausted network failure as "Network error: unable to reach ...").
+    const code = error.code;
+    if (typeof code === 'string' && RETRYABLE_PROVIDER_ERROR_CODES.has(code))
+        return true;
     const msg = error.message;
     // HTTP status codes that warrant a provider switch (string-grepped fallback
     // when the error type is not a typed provider error).
     if (/\b(402|429|500|502|503|504|401|403)\b/.test(msg))
         return true;
     // Network-level failures
-    if (/fetch failed|ECONNREFUSED|ETIMEDOUT|ENOTFOUND/i.test(msg))
+    if (/fetch failed|ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENOTFOUND|EAI_AGAIN|socket hang up|network error/i.test(msg))
         return true;
     // Provider-specific phrases that always imply a retryable condition.
     // `credit balance` covers Anthropic's billing message ("Your credit
@@ -597,6 +662,15 @@ export async function generateText(opts) {
     let metricUsage;
     let metricProviderId;
     let metricModelId;
+    // What this attempt did that a failover must not repeat. Written inside
+    // the span callback and read by the fallback walk below, so it lives on an
+    // object rather than in narrowed locals.
+    const toolProgress = { shimRanTool: false };
+    // The tool run this call's tool execution contexts belong to, and the
+    // step it starts at. A fallback leg that continues the call keeps both,
+    // so tools see one session across providers and steps keep counting.
+    const helperToolRunId = opts._continuation?.helperToolRunId ?? randomUUID();
+    const stepOffset = opts._continuation?.stepOffset ?? 0;
     try {
         const successResult = await withAgentOSSpan('agentos.api.generate_text', async (span) => {
             let { providerId, modelId } = resolveModelOption(opts, 'text');
@@ -668,7 +742,6 @@ export async function generateText(opts) {
             const toolMap = new Map();
             for (const t of tools)
                 toolMap.set(t.name, t);
-            const helperToolRunId = randomUUID();
             // Build messages
             const messages = [];
             // --- Chain-of-thought injection ---
@@ -705,15 +778,27 @@ export async function generateText(opts) {
                 }
                 messages.push({ role: 'system', content: parts });
             }
+            // Everything above is built from opts (system prompt, chain-of-thought
+            // instruction); a failover continuation rebuilds it, so it is left out
+            // of the conversation a continuation carries.
+            const generatedSystemCount = messages.length;
             if (opts.messages) {
+                // Session history replays through here, so keep the tool pairing
+                // and thinking fields (see toProviderReplayMessage).
                 for (const m of opts.messages)
-                    messages.push({ role: m.role, content: m.content });
+                    messages.push(toProviderReplayMessage(m));
             }
             // Transcript delta capture (sessions, spec 2026-07-20 §1b): everything
             // from here on is THIS call's contribution. Callers that carry their
             // new user turn inside opts.messages mark how many trailing caller
             // messages belong to the delta.
-            const transcriptDeltaStart = messages.length - (opts._transcriptIncludeTrailingCallerMessages ?? 0);
+            let transcriptDeltaStart = messages.length - (opts._transcriptIncludeTrailingCallerMessages ?? 0);
+            // Caller history (its system messages included) that precedes this
+            // call's contribution.
+            const callerHistoryCount = Math.max(0, transcriptDeltaStart - generatedSystemCount);
+            // The plan's system message, when planning adds one; a continuation
+            // leaves it out (the fallback plans again if planning is on).
+            let planMessage;
             if (opts.prompt)
                 messages.push({ role: 'user', content: opts.prompt });
             span?.setAttribute('agentos.api.tool_count', tools.length);
@@ -762,7 +847,12 @@ export async function generateText(opts) {
                     const planPrompt = formatPlanForPrompt(resolvedPlan);
                     const firstNonSystem = messages.findIndex((m) => m.role !== 'system');
                     const insertIdx = firstNonSystem === -1 ? messages.length : firstNonSystem;
-                    messages.splice(insertIdx, 0, { role: 'system', content: planPrompt });
+                    planMessage = { role: 'system', content: planPrompt };
+                    messages.splice(insertIdx, 0, planMessage);
+                    // The plan lands ahead of this call's transcript delta; keep the
+                    // delta starting at the same message.
+                    if (insertIdx <= transcriptDeltaStart)
+                        transcriptDeltaStart += 1;
                     span?.setAttribute('agentos.api.plan_steps', resolvedPlan.steps.length);
                 }
             }
@@ -776,10 +866,12 @@ export async function generateText(opts) {
             const runShim = async () => {
                 const loopResult = await runEmulatedToolLoop({
                     tools: Array.from(toolMap.values()),
-                    messages: messages.map((m) => ({
-                        role: String(m.role),
-                        content: typeof m.content === 'string' ? m.content : JSON.stringify(m.content ?? ''),
-                    })),
+                    onToolExecute: () => {
+                        toolProgress.shimRanTool = true;
+                    },
+                    // Native tool turns (session history, a failover continuation)
+                    // become the shim's own <tool_call> / <tool_response> text.
+                    messages: toShimMessages(messages),
                     maxRoundtrips: shimMaxRoundtrips,
                     callModel: async (msgs) => {
                         const r = await provider.generateCompletion(resolved.modelId, msgs, {
@@ -917,6 +1009,9 @@ export async function generateText(opts) {
             let lastCacheDiagnostics;
             try {
                 for (let step = 0; step < maxSteps; step++) {
+                    // The step's index in the whole call: a fallback leg that continues
+                    // after completed tool rounds numbers on from them.
+                    const runStep = stepOffset + step;
                     // --- onBeforeGeneration hook ---
                     let effectiveMessages = messages;
                     if (opts.onBeforeGeneration) {
@@ -927,8 +1022,8 @@ export async function generateText(opts) {
                                 tools: Array.from(toolMap.values()),
                                 model: resolved.modelId,
                                 provider: resolved.providerId,
-                                step,
-                                prompt: opts.prompt,
+                                step: runStep,
+                                prompt: opts.prompt ?? opts._continuation?.prompt,
                             };
                             const modified = await opts.onBeforeGeneration(hookCtx);
                             if (modified) {
@@ -942,7 +1037,7 @@ export async function generateText(opts) {
                     const response = await withAgentOSSpan('agentos.api.generate_text.step', async (stepSpan) => {
                         stepSpan?.setAttribute('llm.provider', resolved.providerId);
                         stepSpan?.setAttribute('llm.model', resolved.modelId);
-                        stepSpan?.setAttribute('agentos.api.step', step + 1);
+                        stepSpan?.setAttribute('agentos.api.step', runStep + 1);
                         stepSpan?.setAttribute('agentos.api.tool_count', tools.length);
                         const stepResponse = await provider.generateCompletion(resolved.modelId, effectiveMessages, {
                             tools: toolSchemas,
@@ -1069,7 +1164,7 @@ export async function generateText(opts) {
                     let textContent = typeof content === 'string' ? content : (content?.text ?? '');
                     let toolCallsInChoice = resolveDynamicToolCalls(choice.message?.tool_calls, {
                         text: textContent,
-                        step,
+                        step: runStep,
                         toolsAvailable: tools.length > 0,
                     });
                     // --- onAfterGeneration hook ---
@@ -1091,7 +1186,7 @@ export async function generateText(opts) {
                                 text: textContent,
                                 toolCalls: toolCallRecords,
                                 usage: stepUsage,
-                                step,
+                                step: runStep,
                                 ...(response.cacheDiagnostics !== undefined
                                     ? { cacheDiagnostics: response.cacheDiagnostics }
                                     : {}),
@@ -1139,6 +1234,9 @@ export async function generateText(opts) {
                             ...((choice.message?.thinking) !== undefined
                                 ? { thinking: choice.message.thinking }
                                 : {}),
+                            ...(choice.message?.thinkingBlocks?.length
+                                ? { thinkingBlocks: choice.message.thinkingBlocks }
+                                : {}),
                         });
                         return {
                             transcriptDelta: messages.slice(transcriptDeltaStart),
@@ -1208,7 +1306,7 @@ export async function generateText(opts) {
                                         name: fnName,
                                         args: parsedArgs,
                                         id: tcId || '',
-                                        step,
+                                        step: runStep,
                                     };
                                     const hookResult = await opts.onBeforeToolExecution(hookInfo);
                                     if (hookResult === null) {
@@ -1229,7 +1327,7 @@ export async function generateText(opts) {
                             }
                             if (tool) {
                                 try {
-                                    const result = await tool.execute(parsedArgs, buildHelperToolExecutionContext('generateText', helperToolRunId, step, tcId || undefined));
+                                    const result = await tool.execute(parsedArgs, buildHelperToolExecutionContext('generateText', helperToolRunId, runStep, tcId || undefined));
                                     record.result = result.output;
                                     record.error = result.success ? undefined : result.error;
                                     messages.push({
@@ -1257,6 +1355,12 @@ export async function generateText(opts) {
                             }
                             allToolCalls.push(record);
                         }
+                        toolProgress.completedToolRounds = {
+                            messages: messages.slice(generatedSystemCount).filter((m) => m !== planMessage),
+                            callerHistoryCount,
+                            toolCalls: [...allToolCalls],
+                            steps: step + 1,
+                        };
                         continue;
                     }
                     metricUsage = totalUsage;
@@ -1285,6 +1389,9 @@ export async function generateText(opts) {
                         ...((choice.message?.thinking) !== undefined
                             ? { thinking: choice.message.thinking }
                             : {}),
+                        ...(choice.message?.thinkingBlocks?.length
+                            ? { thinkingBlocks: choice.message.thinkingBlocks }
+                            : {}),
                     });
                     return {
                         transcriptDelta: messages.slice(transcriptDeltaStart),
@@ -1390,8 +1497,11 @@ export async function generateText(opts) {
         const effectiveFallbacks = opts.fallbackProviders === undefined
             ? buildPolicyAwareFallbackChain(opts.policyTier, metricProviderId)
             : opts.fallbackProviders;
+        // A call whose prompt-shim tools already ran cannot be continued, and a
+        // restart would run them again; it surfaces the error instead.
         if (effectiveFallbacks.length &&
-            isRetryableError(error)) {
+            isRetryableError(error) &&
+            !toolProgress.shimRanTool) {
             let lastError = error;
             let attempt = 0;
             for (const fb of effectiveFallbacks) {
@@ -1482,6 +1592,33 @@ export async function generateText(opts) {
                         // end-to-end. The final entry passes [] -> explicit opt-out -> throw.
                         fallbackProviders: effectiveFallbacks.slice(attempt),
                         onFallback: undefined,
+                        // Continue after the tool rounds this attempt completed: the leg
+                        // receives the conversation so far (prompt included, so no new
+                        // prompt), counts all of it as this call's transcript delta, and
+                        // keeps the steps that remain.
+                        _continuation: {
+                            helperToolRunId,
+                            stepOffset: stepOffset + (toolProgress.completedToolRounds?.steps ?? 0),
+                            prompt: opts.prompt ?? opts._continuation?.prompt,
+                        },
+                        ...(toolProgress.completedToolRounds
+                            ? {
+                                messages: toolProgress.completedToolRounds.messages,
+                                prompt: undefined,
+                                _transcriptIncludeTrailingCallerMessages: toolProgress.completedToolRounds.messages.length - toolProgress.completedToolRounds.callerHistoryCount,
+                                maxSteps: Math.max(1, (opts.maxSteps ?? 1) - toolProgress.completedToolRounds.steps),
+                                // Claude's budgeted thinking requires the tool turn being
+                                // answered to open with its signed thinking, and a turn
+                                // another model ran has none, so the continuation runs
+                                // without a thinking budget. Adaptive thinking turns itself
+                                // off for such a turn.
+                                ...(opts.thinking !== undefined &&
+                                    (fb.provider === 'anthropic' || /claude/i.test(fb.model ?? '')) &&
+                                    toolTurnLacksThinking(toolProgress.completedToolRounds.messages)
+                                    ? { thinking: undefined }
+                                    : {}),
+                            }
+                            : {}),
                     });
                     fallbackLogger.info('provider fallback succeeded', {
                         event: 'fallback_succeeded',
@@ -1500,6 +1637,9 @@ export async function generateText(opts) {
                     ]));
                     return {
                         ...fallbackResult,
+                        ...(toolProgress.completedToolRounds
+                            ? { toolCalls: [...toolProgress.completedToolRounds.toolCalls, ...fallbackResult.toolCalls] }
+                            : {}),
                         fallback: {
                             fired: true,
                             finalProvider: fallbackResult.provider,
@@ -1511,6 +1651,10 @@ export async function generateText(opts) {
                 catch (fbError) {
                     lastError = fbError;
                     fallbackHops.push({ provider: fb.provider, model: fb.model, ok: false });
+                    // The leg ran tools before it failed. A later leg would start
+                    // from a conversation that does not show them and run them again.
+                    if (toolsRanBefore(fbError))
+                        break;
                 }
             }
             // All fallbacks exhausted: fall through to throw
@@ -1524,10 +1668,11 @@ export async function generateText(opts) {
                 errorMessage: lastErr.message.slice(0, 200),
             });
             metricStatus = 'error';
-            throw lastError;
+            throw toolProgress.shimRanTool || toolProgress.completedToolRounds ? markToolsRan(lastError) : lastError;
         }
         metricStatus = 'error';
-        throw error;
+        // Marked so a walker that called this one as a fallback leg stops too.
+        throw toolProgress.shimRanTool || toolProgress.completedToolRounds ? markToolsRan(error) : error;
     }
     finally {
         try {