@arnilo/prism 0.8.0 → 0.10.0

package/dist/input.js

@@ -5,7 +5,7 @@ import { runInstructionInjectors } from "./instruction-injection.js";
 import { applyDefaultProviderRequestOptions } from "./provider-request-policy.js";
 import { redactMessage } from "./redaction.js";
 import { loadTextResource } from "./resources.js";
-import { skillMessages as buildSkillMessages } from "./skill-disclosure.js";
+import { capSkillCatalog, selectSkillsForPrompt, skillHasRenderableBody, skillMessages as buildSkillMessages, } from "./skill-disclosure.js";
 import { composeSystemPrompt } from "./system-prompts.js";
 import { foldToolResultHistory, foldToolResults } from "./tool-result-fold.js";
 import { selectDisclosedTools } from "./tool-search.js";
@@ -51,11 +51,16 @@ export function createDefaultPromptBuilder() {
             // text-only (or unknown-capability) models — duplicating it doubles tool tokens per turn.
             const tools = request.model?.capabilities?.tools === true ? undefined : request.tools;
             const context = contextMessages(request.context);
-            const skills = buildSkillMessages(request.skills, {
-                disclosure: request.skillsDisclosure,
-                loaded: request.loadedSkills,
-                demotedBodies: request.demotedSkillBodies?.length ? new Set(request.demotedSkillBodies) : undefined,
-            });
+            const skills = buildSkillMessages(request.skills, request.tailSkillBodies
+                ? {
+                    disclosure: "progressive",
+                    demotedBodies: request.demotedSkillBodies?.length ? new Set(request.demotedSkillBodies) : undefined,
+                }
+                : {
+                    disclosure: request.skillsDisclosure,
+                    loaded: request.loadedSkills,
+                    demotedBodies: request.demotedSkillBodies?.length ? new Set(request.demotedSkillBodies) : undefined,
+                });
             const declarations = toolMessages(tools);
             if ((request.inputLayout ?? "cache_aware") === "legacy") {
                 return [...context, ...skills, ...declarations, ...request.messages];
@@ -156,9 +161,11 @@ export async function assembleProviderInput(options) {
             tools,
             fold: options.toolResultFold,
             frontier: options.attentionSticky,
+            attentionFold: options.attentionFold,
             redactor: options.redactor,
             signal: options.signal,
             turn,
+            runInputTokens: options.runInputTokens,
             sessionId: options.sessionId,
             runId: options.runId,
         });
@@ -213,6 +220,14 @@ export async function assembleProviderInput(options) {
             ...baseContext,
         });
     }
+    const tailSegments = options.tailSegments;
+    const tailSkillBodies = tailSegments !== undefined;
+    if (tailSegments) {
+        const activeTailSegments = new Set();
+        messages = moveResourceMessagesToTail(messages, options, tailSegments, activeTailSegments);
+        appendSkillTailSegments(tailSegments, activeTailSegments, skills, options.skillsDisclosure, options.loadedSkills, demotedSkillBodies);
+        messages = [...messages, ...tailMessages(tailSegments, activeTailSegments)];
+    }
     const promptBuilder = options.promptBuilder ?? createDefaultPromptBuilder();
     const promptRequest = options.middleware
         ? await options.middleware.run("prompt_build", {
@@ -222,6 +237,7 @@ export async function assembleProviderInput(options) {
             skills,
             skillsDisclosure: options.skillsDisclosure,
             loadedSkills: options.loadedSkills,
+            tailSkillBodies,
             demotedSkillBodies,
             tools,
             metadata: options.metadata,
@@ -234,6 +250,7 @@ export async function assembleProviderInput(options) {
             skills,
             skillsDisclosure: options.skillsDisclosure,
             loadedSkills: options.loadedSkills,
+            tailSkillBodies,
             demotedSkillBodies,
             tools,
             metadata: options.metadata,
@@ -389,6 +406,51 @@ function textMessage(role, text, metadata) {
 function contextMessages(context) {
     return (context ?? []).map((block) => textMessage("system", `${block.title ? `${block.title}:\n` : "Context:\n"}${blockText(block)}`, block.metadata));
 }
+function moveResourceMessagesToTail(messages, options, tailSegments, activeTailSegments) {
+    const resourceUris = new Set([
+        ...(options.resourceUris ?? []),
+        ...(options.attachments ?? []).flatMap((attachment) => attachment.uri !== undefined && attachment.text === undefined && attachment.content === undefined ? [attachment.uri] : []),
+    ]);
+    if (resourceUris.size === 0)
+        return messages;
+    return messages.filter((message) => {
+        const uri = message.metadata?.uri;
+        if (message.role !== "user" || typeof uri !== "string" || !resourceUris.has(uri))
+            return true;
+        appendTailSegment(tailSegments, activeTailSegments, `resource:${uri}`, message);
+        return false;
+    });
+}
+function appendSkillTailSegments(tailSegments, activeTailSegments, skills, disclosure, loaded, demotedSkillBodies) {
+    const renderContext = {
+        disclosure,
+        loaded,
+        demotedBodies: demotedSkillBodies?.length ? new Set(demotedSkillBodies) : undefined,
+    };
+    const selected = capSkillCatalog(selectSkillsForPrompt(skills ?? [], renderContext));
+    const byName = new Map(selected.map((skill) => [skill.name, skill]));
+    const ordered = disclosure === "eager"
+        ? selected
+        : (loaded?.list() ?? []).flatMap((name) => {
+            const skill = byName.get(name);
+            return skill === undefined ? [] : [skill];
+        });
+    for (const skill of ordered) {
+        if (!skillHasRenderableBody(skill, renderContext))
+            continue;
+        const message = buildSkillMessages([skill], renderContext)[0];
+        if (message)
+            appendTailSegment(tailSegments, activeTailSegments, `skill:${skill.name}`, message);
+    }
+}
+/** Map#set retains first-insertion order, so re-derivation replaces only this segment's bytes. */
+function appendTailSegment(tailSegments, activeTailSegments, id, message) {
+    tailSegments.set(id, message);
+    activeTailSegments.add(id);
+}
+function tailMessages(tailSegments, activeTailSegments) {
+    return [...tailSegments].flatMap(([id, message]) => (activeTailSegments.has(id) ? [message] : []));
+}
 function toolMessages(tools) {
     if (!tools?.length)
         return [];

package/dist/middleware.d.ts

@@ -1,5 +1,40 @@
-import type { ExtensionEvent } from "./contracts.js";
-export type MiddlewareHookName = "provider_request" | "input_assembly" | "prompt_build" | "context" | "tool_call" | "tool_result" | "retry" | "compaction" | "session_start" | "session_shutdown";
+import type { ContentBlock, ExtensionEvent } from "./contracts.js";
+export type MiddlewareHookName = "beforeProviderTurn" | "provider_request" | "input_assembly" | "prompt_build" | "context" | "tool_call" | "tool_result" | "retry" | "compaction_request" | "compaction" | "session_start" | "session_shutdown";
+/** Provenance of a host-answered turn (plan 096). An id, never free host code. */
+export interface DeterministicTurnProvenance {
+    /** Answering middleware id; bounded, replay-stable, and auditable. */
+    readonly middleware: string;
+}
+/** Host middleware answer that completes a turn without any provider request (plan 096). */
+export interface DeterministicTurnAnswer {
+    /** Assistant content with provider content-block shape; tool calls are rejected (no provider ran). */
+    readonly content: readonly ContentBlock[];
+    /** Mandatory: a deterministic turn can never masquerade as model output. */
+    readonly provenance: DeterministicTurnProvenance;
+}
+/**
+ * Payload for the `beforeProviderTurn` hook (plan 096). Host middleware sets `answer` to complete the
+ * turn deterministically; leaving it absent/undefined sends the turn to the provider as usual.
+ */
+export interface BeforeProviderTurnPayload {
+    readonly sessionId: string;
+    readonly runId: string;
+    readonly turn: number;
+    /** Concatenated text blocks of the latest user-role message in the assembled request. */
+    readonly userText: string;
+    /** Set by host middleware to answer without a provider call. */
+    readonly answer?: DeterministicTurnAnswer;
+}
+/** Host answered with a malformed deterministic turn. Fails the run closed — never falls through. */
+export declare class DeterministicTurnError extends Error {
+    readonly code = "ERR_PRISM_DETERMINISTIC_TURN";
+    constructor(message: string);
+}
+/**
+ * Validate a host deterministic answer at the trust boundary: non-empty assistant-visible content and
+ * mandatory bounded provenance. Throws instead of degrading to a provider call.
+ */
+export declare function validateDeterministicTurnAnswer(value: unknown): DeterministicTurnAnswer;
 export type MiddlewareNext<T> = (value: T) => Promise<T>;
 export type Middleware<T = unknown> = (value: T, next: MiddlewareNext<T>) => T | Promise<T>;
 export interface MiddlewareRegistryOptions {

package/dist/middleware.js

@@ -1,4 +1,45 @@
 import { errorToErrorInfo } from "./redaction.js";
+/** Host answered with a malformed deterministic turn. Fails the run closed — never falls through. */
+export class DeterministicTurnError extends Error {
+    code = "ERR_PRISM_DETERMINISTIC_TURN";
+    constructor(message) {
+        super(message);
+        this.name = "DeterministicTurnError";
+    }
+}
+/** Provenance ids stay ids: bounded, no whitespace or separators outside the id alphabet. */
+const DETERMINISTIC_MIDDLEWARE_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,63}$/;
+// Assistant-visible blocks only: a deterministic answer cannot smuggle tool execution/authority.
+const DETERMINISTIC_BLOCK_TYPES = new Set(["text", "image", "audio", "file", "document", "video", "thinking"]);
+/**
+ * Validate a host deterministic answer at the trust boundary: non-empty assistant-visible content and
+ * mandatory bounded provenance. Throws instead of degrading to a provider call.
+ */
+export function validateDeterministicTurnAnswer(value) {
+    if (typeof value !== "object" || value === null)
+        throw new DeterministicTurnError("answer must be an object");
+    const answer = value;
+    if (!Array.isArray(answer.content) || answer.content.length === 0) {
+        throw new DeterministicTurnError("answer.content must be a non-empty content block array");
+    }
+    for (const block of answer.content) {
+        const type = block?.type;
+        if (typeof block !== "object" || block === null || typeof type !== "string" || !DETERMINISTIC_BLOCK_TYPES.has(type)) {
+            throw new DeterministicTurnError("answer.content blocks must be assistant-visible content blocks (text, image, audio, file, document, video, thinking)");
+        }
+        if (type === "text" && typeof block.text !== "string") {
+            throw new DeterministicTurnError("answer.content text blocks require a string text");
+        }
+        if (type === "thinking" && typeof block.text !== "string") {
+            throw new DeterministicTurnError("answer.content thinking blocks require a string text");
+        }
+    }
+    const middleware = answer.provenance?.middleware;
+    if (typeof middleware !== "string" || !DETERMINISTIC_MIDDLEWARE_ID.test(middleware)) {
+        throw new DeterministicTurnError("answer.provenance.middleware must be a bounded id (1-64 chars: letters, digits, . _ : -)");
+    }
+    return { content: answer.content, provenance: { middleware } };
+}
 function middlewareError(error, hook, secrets) {
     return { type: "extension_error", extension: `middleware:${hook}`, error: errorToErrorInfo(error, secrets) };
 }

package/dist/node/session-store-jsonl.js

@@ -1,6 +1,7 @@
 import { appendFile, mkdir, readFile } from "node:fs/promises";
 import { dirname } from "node:path";
-import { isSessionEntryKind, SESSION_APPEND_CONFLICT_CODE, SESSION_ENTRY_SCHEMA_VERSION, SessionAppendConflictError, SessionSearchUnsupportedError, } from "../contracts.js";
+import { isSessionEntryKind, SESSION_APPEND_CONFLICT_CODE, SESSION_ENTRY_SCHEMA_VERSION, SessionAppendConflictError, } from "../contracts.js";
+import { searchLinearSessions } from "../session-stores.js";
 import { isNodeErrorCode } from "./config.js";
 export function createJsonlSessionStore(pathOrOptions) {
     const options = typeof pathOrOptions === "string" ? { path: pathOrOptions, createDirectory: true } : pathOrOptions;
@@ -50,8 +51,22 @@ export function createJsonlSessionStore(pathOrOptions) {
         async get(id) {
             return findEntry(path, id);
         },
-        async searchSessions() {
-            throw new SessionSearchUnsupportedError("JSONL session store does not support searchSessions");
+        async searchSessions(query) {
+            // ponytail: no index - every search reads and parses the file (O(corpus) time and memory), the
+            // recommended indexed paths are the SQLite/Postgres adapters. Corrupt lines are quarantined
+            // exactly as in list()/get(), and the contract linear caps bound entries/text scanned.
+            const { entries } = await readJsonlSessionEntries(path);
+            const bySession = new Map();
+            const leafBySession = new Map();
+            for (const entry of entries) {
+                const sessionEntries = bySession.get(entry.sessionId);
+                if (sessionEntries)
+                    sessionEntries.push(entry);
+                else
+                    bySession.set(entry.sessionId, [entry]);
+                leafBySession.set(entry.sessionId, entry.id);
+            }
+            return searchLinearSessions(bySession, leafBySession, query);
         },
     };
 }

package/dist/observability.js

@@ -1,9 +1,15 @@
+import { createHash } from "node:crypto";
 export function createProviderTurnMetadata(request, providerId, fields = {}) {
+    const names = (request.tools ?? []).map((tool) => tool.name);
     return {
         providerId,
         model: request.model,
         requestId: readRequestId(request),
         ...fields,
+        tools: {
+            count: names.length,
+            idsHash: `sha256:${createHash("sha256").update(JSON.stringify(names), "utf8").digest("hex")}`,
+        },
     };
 }
 export function readProviderHttpStatus(error) {

package/dist/provider-events.d.ts

@@ -1,4 +1,4 @@
-import type { ContentBlock, JsonObject, ProviderEvent, ToolCallContent, ToolCallDeltaContent, Usage } from "./contracts.js";
+import type { ContentBlock, JsonObject, ProviderEvent, ProviderStopReason, ToolCallContent, ToolCallDeltaContent, Usage } from "./contracts.js";
 export declare function providerTextDelta(text: string): ProviderEvent;
 export declare function providerThinkingDelta(text: string, signature?: string): ProviderEvent;
 export declare function providerContentDelta(content: ContentBlock): ProviderEvent;
@@ -13,7 +13,13 @@ export declare function providerToolCallDeltaContent(delta: Omit<ToolCallDeltaCo
 export declare function providerContinuationRequired(cursor: string, reason?: string): ProviderEvent;
 export declare function reconstructToolCallDeltas(events: readonly ProviderEvent[]): readonly ToolCallContent[];
 export declare function providerUsage(usage: Usage): ProviderEvent;
-export declare function providerDone(usage?: Usage): ProviderEvent;
+/**
+ * Map a native provider stop/finish reason onto the closed taxonomy. A missing, non-string, or
+ * unmapped value returns `"unknown"` rather than throwing, so a new wire value can never fail a
+ * run (plan 087 T1).
+ */
+export declare function mapProviderStopReason(native: string | null | undefined): ProviderStopReason;
+export declare function providerDone(usage?: Usage, stopReason?: ProviderStopReason): ProviderEvent;
 export declare function providerError(error: unknown, secrets?: readonly (string | undefined)[]): Extract<ProviderEvent, {
     type: "error";
 }>;

package/dist/provider-events.js

@@ -46,8 +46,66 @@ export function reconstructToolCallDeltas(events) {
 export function providerUsage(usage) {
     return { type: "usage", usage };
 }
-export function providerDone(usage) {
-    return { type: "done", usage };
+/**
+ * One shared native → taxonomy table (plan 087 T1). Every adapter routes its wire reason
+ * through `mapProviderStopReason`, so hosts switch on one closed union instead of per-provider
+ * strings. Keys are lowercased wire values; `unknown` never appears here — it is the fallback.
+ */
+const PROVIDER_STOP_REASONS = Object.freeze({
+    // OpenAI Chat Completions (`finish_reason`) and generic OpenAI-compatible routes.
+    stop: "end_turn",
+    length: "max_output_tokens",
+    tool_calls: "tool_calls",
+    function_call: "tool_calls",
+    content_filter: "content_filter",
+    // Messages-style `stop_reason` routes and Bedrock Converse (`stopReason`).
+    end_turn: "end_turn",
+    stop_sequence: "end_turn",
+    pause_turn: "end_turn",
+    tool_use: "tool_calls",
+    max_tokens: "max_output_tokens",
+    refusal: "content_filter",
+    // Google generateContent (`finishReason`).
+    safety: "content_filter",
+    recitation: "content_filter",
+    blocklist: "content_filter",
+    prohibited_content: "content_filter",
+    spii: "content_filter",
+    image_safety: "content_filter",
+    language: "content_filter",
+    malformed_function_call: "provider_error",
+    unexpected_tool_call: "provider_error",
+    // OpenAI Responses (status / `incomplete_details.reason`).
+    completed: "end_turn",
+    failed: "provider_error",
+    cancelled: "abort",
+    canceled: "abort",
+    // Bedrock Converse guarded routes.
+    content_filtered: "content_filter",
+    guardrail_intervened: "content_filter",
+    malformed_model_output: "provider_error",
+    malformed_tool_use: "provider_error",
+    // AI SDK unified finish reasons (hyphenated).
+    "content-filter": "content_filter",
+    "tool-calls": "tool_calls",
+    error: "provider_error",
+    other: "unknown",
+    unknown: "unknown",
+    abort: "abort",
+    aborted: "abort",
+});
+/**
+ * Map a native provider stop/finish reason onto the closed taxonomy. A missing, non-string, or
+ * unmapped value returns `"unknown"` rather than throwing, so a new wire value can never fail a
+ * run (plan 087 T1).
+ */
+export function mapProviderStopReason(native) {
+    if (typeof native !== "string")
+        return "unknown";
+    return PROVIDER_STOP_REASONS[native.trim().toLowerCase()] ?? "unknown";
+}
+export function providerDone(usage, stopReason) {
+    return { type: "done", usage, ...(stopReason === undefined ? {} : { stopReason }) };
 }
 export function providerError(error, secrets = []) {
     const info = errorToErrorInfo(error, secrets);

package/dist/providers/openai-compatible.js

@@ -1,5 +1,5 @@
 import { resolveCredentialValue } from "../credentials.js";
-import { providerDone, providerError, providerTextDelta, providerThinkingDelta, providerToolCall, providerToolCallDelta, providerUsage, toolCallFromArgumentsText, } from "../provider-events.js";
+import { mapProviderStopReason, providerDone, providerError, providerTextDelta, providerThinkingDelta, providerToolCall, providerToolCallDelta, providerUsage, toolCallFromArgumentsText, } from "../provider-events.js";
 import { assertStructuredOutputRequestSupported } from "../structured-output.js";
 import { trimTrailingSlashes } from "../trim-trailing-slashes.js";
 import { applyOpenAIChatStructuredOutput, assertOpenAIChatMessage, mapOpenAIChatUsage, serializeOpenAIChatMessage, serializeOpenAITool, } from "./openai-primitives.js";
@@ -13,6 +13,7 @@ export async function* openAIChatEvents(body, options = {}) {
     let usage;
     let sawDoneMarker = false;
     let sawFinishReason = false;
+    let finishReason;
     for await (const sseEvent of readSseEvents(body, { signal: options.signal })) {
         if (options.onComment && sseEvent.comments?.length) {
             for (const text of sseEvent.comments) {
@@ -43,8 +44,10 @@ export async function* openAIChatEvents(body, options = {}) {
             yield providerUsage(mapped);
         }
         for (const choice of parsed.choices ?? []) {
-            if (choice.finish_reason)
+            if (choice.finish_reason) {
                 sawFinishReason = true;
+                finishReason = choice.finish_reason;
+            }
             const delta = choice.delta ?? {};
             if (typeof delta.content === "string" && delta.content)
                 yield providerTextDelta(delta.content);
@@ -83,7 +86,7 @@ export async function* openAIChatEvents(body, options = {}) {
     for (const call of tools.values()) {
         yield providerToolCall(toolCallFromArgumentsText(call.id, call.name, call.argumentsText));
     }
-    yield providerDone((options.strictCompletion ?? true) || options.doneUsage ? usage : undefined);
+    yield providerDone((options.strictCompletion ?? true) || options.doneUsage ? usage : undefined, finishReason === undefined ? undefined : mapProviderStopReason(finishReason));
 }
 export function createOpenAICompatibleProvider(options) {
     const providerId = options.id ?? "openai-compatible";

package/dist/run-bundle.d.ts

@@ -1,4 +1,4 @@
-import type { Agent, AgentSessionConfig, GuardrailStage, RunOptions } from "./contracts.js";
+import type { Agent, AgentSessionConfig, GuardrailPackRef, GuardrailStage, RunOptions } from "./contracts.js";
 /** Report format revision. Any shape change bumps this so pinned digests cannot compare across formats. */
 export declare const RUN_BUNDLE_SCHEMA_VERSION = 1;
 /** Inspectable projection of the inputs a run actually resolves to. Frozen JSON, safe to persist and diff. */
@@ -81,6 +81,11 @@ export interface RunBundleSnapshotInput {
     readonly run?: RunOptions;
     /** Optional memory store instance; only its kind/durability label is read, never its contents. */
     readonly memory?: unknown;
+    /**
+     * Plan 104 Task 2: effective pack refs (`session.guardrailPackRefs`) to report instead of the
+     * caller-supplied `config.guardrailPacks` — a resumed session's enforced rows.
+     */
+    readonly packs?: readonly GuardrailPackRef[];
 }
 /**
  * Snapshots the effective run bundle: synchronous, in-memory, zero network and zero store reads.

package/dist/run-bundle.js

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import { agentFingerprint, BUILT_IN_LOOP_REVISIONS } from "./agent-run-state.js";
+import { describeGuardrailPacks } from "./guardrails.js";
 import { describeStorage } from "./host-composition.js";
 import { canonicalizeJsonSchema } from "./providers/schema.js";
 import { resolveRunLimits } from "./run-limits.js";
@@ -51,7 +52,10 @@ export function snapshotRunBundle(input) {
             effect: tool.effect === undefined ? null : typeof tool.effect === "function" ? "classifier" : tool.effect.kind,
         })),
         activeSkills: run?.activeSkills ?? null,
-        guardrails: guardrailRows(config.guardrails, run?.guardrails),
+        guardrails: [
+            ...guardrailRows(config.guardrails, run?.guardrails),
+            ...describeGuardrailPacks(input.packs ?? input.config?.guardrailPacks),
+        ],
         loop: loopIdentity(effectiveLoop),
         thinkingLevel: run?.thinkingLevel ?? config.thinkingLevel ?? null,
         limits: resolveRunLimits(config.limits, run?.limits),

package/dist/run-limits.d.ts

@@ -1,4 +1,4 @@
-import type { ResolvedRunLimits, RunLimitBreach, RunLimitCounters, RunLimitName, RunLimits, Usage } from "./contracts.js";
+import type { BudgetAxisUsage, BudgetConsumedCounters, ResolvedRunLimits, RunLimitBreach, RunLimitCounters, RunLimitName, RunLimits, ToolCallSummary, Usage } from "./contracts.js";
 export declare const DEFAULT_RUN_LIMITS: Readonly<{
     maxTurns: 16;
     maxProviderAttempts: 24;
@@ -51,3 +51,13 @@ export declare class RunLimitTracker {
     private exceed;
 }
 export declare function createRunLimitTracker(limits: RunLimits | undefined, options?: RunLimitTrackerOptions): RunLimitTracker;
+/**
+ * Build the `budget_exhausted` payload (plan 087 T2): which axis fired, the counters a host reads
+ * first, the closest other axes, and the last dispatched tool calls (hashes only).
+ */
+export declare function describeBudgetExhaustion(tracker: RunLimitTracker, breach: RunLimitBreach, recentToolCalls: readonly ToolCallSummary[]): {
+    limit: RunLimitName;
+    consumed: BudgetConsumedCounters;
+    closestOtherAxes: BudgetAxisUsage[];
+    recentToolCalls: ToolCallSummary[];
+};

package/dist/run-limits.js

@@ -10,6 +10,8 @@ export const DEFAULT_RUN_LIMITS = Object.freeze({
     maxOutputTokens: 10_000,
     maxTotalTokens: 50_000,
 });
+/** Stop-hook continuation cap when no layer configures one (plan 106 R1). Not a counter axis. */
+const DEFAULT_MAX_STOP_CONTINUATIONS = 3;
 /**
  * Process-safety ceilings that exist so a bug cannot OOM the host via JSON.parse of giant
  * provider frames. Product axes (turns, wall time, tokens, …) have no hard cap: hosts set
@@ -83,8 +85,13 @@ export function resolveRunLimits(agent, run) {
             resolved.maxProviderAttempts = turns;
     }
     const maxCost = override?.maxCost ?? base?.maxCost;
+    // Stop-hook continuation cap (plan 106 R1): no counters-table row — the wrapper turns it into a
+    // clean `hook_limit` stop, not a breach — so it resolves outside the counter-backed axes and
+    // keeps the same narrowing-only law (min, `null` = uncapped).
+    const stopContinuations = minCap(base?.maxStopContinuations, override?.maxStopContinuations);
     return Object.freeze({
         ...resolved,
+        maxStopContinuations: stopContinuations !== undefined ? stopContinuations : DEFAULT_MAX_STOP_CONTINUATIONS,
         ...(maxCost
             ? {
                 maxCost: base?.maxCost && override?.maxCost
@@ -121,6 +128,12 @@ function validateLimits(input) {
         if (!Number.isFinite(amount) || amount < 0 || !currency.trim())
             throw new TypeError("maxCost requires a finite non-negative amount and currency");
     }
+    const stopContinuations = input.maxStopContinuations;
+    if (stopContinuations !== undefined &&
+        stopContinuations !== null &&
+        (!Number.isSafeInteger(stopContinuations) || stopContinuations < 0)) {
+        throw new TypeError("maxStopContinuations must be a non-negative safe integer or null to disable the cap");
+    }
     return input;
 }
 export class RunLimitTracker {
@@ -263,4 +276,50 @@ export class RunLimitTracker {
 export function createRunLimitTracker(limits, options) {
     return new RunLimitTracker(resolveRunLimits(undefined, limits), options);
 }
+/** Product axes reported as "how close was everything else" (plan 087 T2). Request/response bytes
+ *  stay out: their caps are per-frame, so a run-lifetime ratio would be meaningless. */
+const ATTRIBUTION_AXES = [
+    { axis: "maxTurns", counter: "turns" },
+    { axis: "maxProviderAttempts", counter: "providerAttempts" },
+    { axis: "maxToolRounds", counter: "toolRounds" },
+    { axis: "maxToolCalls", counter: "toolCalls" },
+    { axis: "maxWallTimeMs", counter: "wallTimeMs" },
+    { axis: "maxInputTokens", counter: "inputTokens" },
+    { axis: "maxOutputTokens", counter: "outputTokens" },
+    { axis: "maxTotalTokens", counter: "totalTokens" },
+    { axis: "maxCost", counter: "cost" },
+];
+const CLOSEST_AXIS_COUNT = 3;
+function axisCap(limits, axis) {
+    if (axis === "maxCost")
+        return limits.maxCost?.amount;
+    const value = limits[axis];
+    return typeof value === "number" ? value : null;
+}
+/**
+ * Build the `budget_exhausted` payload (plan 087 T2): which axis fired, the counters a host reads
+ * first, the closest other axes, and the last dispatched tool calls (hashes only).
+ */
+export function describeBudgetExhaustion(tracker, breach, recentToolCalls) {
+    const counters = tracker.snapshot();
+    const closestOtherAxes = ATTRIBUTION_AXES.filter(({ axis }) => axis !== breach.limit)
+        .flatMap(({ axis, counter }) => {
+        const cap = axisCap(tracker.limits, axis);
+        return typeof cap === "number" && cap > 0 ? [{ axis, cap, used: counters[counter] }] : [];
+    })
+        .map(({ axis, cap, used }) => ({ axis, usedRatio: Math.round(Math.min(1, used / cap) * 10_000) / 10_000 }))
+        .sort((a, b) => b.usedRatio - a.usedRatio)
+        .slice(0, CLOSEST_AXIS_COUNT);
+    return {
+        limit: breach.limit,
+        consumed: {
+            turns: counters.turns,
+            inputTokens: counters.inputTokens,
+            providerAttempts: counters.providerAttempts,
+            requestBytes: counters.requestBytes,
+        },
+        closestOtherAxes,
+        recentToolCalls: [...recentToolCalls],
+    };
+}
 //# sourceMappingURL=run-limits.js.map

package/dist/session-stores.d.ts

@@ -1,4 +1,4 @@
-import { type BranchReader, type Message, type SessionBranchRead, type SessionEntry, type SessionStore } from "./contracts.js";
+import { type BranchReader, type Message, type PersistencePage, type SessionBranchRead, type SessionEntry, type SessionSearchHit, type SessionSearchQuery, type SessionStore } from "./contracts.js";
 export interface CreateSessionEntryOptions extends Omit<SessionEntry, "id" | "timestamp"> {
     readonly id?: string;
     readonly timestamp?: string;
@@ -40,4 +40,15 @@ export interface CreateMemorySessionStoreOptions {
         readonly maxLinearBytes?: number;
     };
 }
+/** Resolved bounds for the capped linear session scan. */
+export interface LinearSearchCaps {
+    readonly sessions: number;
+    readonly entries: number;
+    readonly bytes: number;
+}
 export declare function createMemorySessionStore(initialEntries?: readonly SessionEntry[], options?: CreateMemorySessionStoreOptions): SessionStore;
+/**
+ * Shared linear (unindexed) session search over already-grouped entries: the memory store's default
+ * mode and the JSONL store's implementation. `caps` defaults to the contract linear caps.
+ */
+export declare function searchLinearSessions(bySession: Map<string, SessionEntry[]>, leafBySession: Map<string, string>, query: SessionSearchQuery, caps?: LinearSearchCaps): PersistencePage<SessionSearchHit>;

package/dist/session-stores.js

@@ -133,7 +133,7 @@ export function createMemorySessionStore(initialEntries = [], options = {}) {
         async searchSessions(query) {
             if (mode === "unsupported")
                 throw new SessionSearchUnsupportedError();
-            return searchMemorySessionsLinear(bySession, leafBySession, query, searchCaps);
+            return searchLinearSessions(bySession, leafBySession, query, searchCaps);
         },
     };
     function add(entry, options) {
@@ -175,7 +175,11 @@ export function createMemorySessionStore(initialEntries = [], options = {}) {
         leafBySession.set(entry.sessionId, entry.id);
     }
 }
-function searchMemorySessionsLinear(bySession, leafBySession, query, caps) {
+/**
+ * Shared linear (unindexed) session search over already-grouped entries: the memory store's default
+ * mode and the JSONL store's implementation. `caps` defaults to the contract linear caps.
+ */
+export function searchLinearSessions(bySession, leafBySession, query, caps = resolveLinearSearchCaps(undefined)) {
     const q = resolveSessionSearchQuery(query);
     q.signal?.throwIfAborted();
     let sessionsScanned = 0;
@@ -203,13 +207,20 @@ function searchMemorySessionsLinear(bySession, leafBySession, query, caps) {
         let matchedQuery = false;
         let matchedProvider = false;
         let matchedModel = false;
+        let matchedKind = false;
+        let matchedEntry;
         let snippetSource;
+        let turn = 0;
         for (const entry of entries) {
             if (entriesScanned >= caps.entries)
                 break;
             if (bytesScanned >= caps.bytes)
                 break;
             entriesScanned += 1;
+            turn += 1;
+            const kindMatches = q.kind === undefined || q.kind.includes(entry.kind);
+            if (kindMatches)
+                matchedKind = true;
             const text = entrySearchText(entry);
             bytesScanned += utf8Bytes(text) + utf8Bytes(entry.label) + utf8Bytes(entry.summary);
             if (entry.timestamp > updatedAt)
@@ -234,11 +245,12 @@ function searchMemorySessionsLinear(bySession, leafBySession, query, caps) {
                 matchedLabel = true;
             if (q.summary && entry.summary?.includes(q.summary))
                 matchedSummary = true;
-            if (q.query) {
+            if (q.query && kindMatches) {
                 const hay = `${entry.label ?? ""}\n${entry.summary ?? ""}\n${text}`;
                 if (hay.includes(q.query)) {
                     matchedQuery = true;
-                    snippetSource ??= entry.label ?? entry.summary ?? text;
+                    matchedEntry ??= { entry, turn };
+                    snippetSource ??= [entry.label, entry.summary, text].find((part) => part?.includes(q.query)) ?? hay;
                 }
             }
             if (q.provider && (entry.model?.provider === q.provider || metaProvider(entry) === q.provider))
@@ -260,6 +272,8 @@ function searchMemorySessionsLinear(bySession, leafBySession, query, caps) {
             continue;
         if (q.query && !matchedQuery)
             continue;
+        if (q.kind && (q.query ? matchedEntry === undefined : !matchedKind))
+            continue;
         if (q.provider && !matchedProvider)
             continue;
         if (q.model && !matchedModel)
@@ -271,6 +285,9 @@ function searchMemorySessionsLinear(bySession, leafBySession, query, caps) {
         matches.push({
             sessionId,
             leafId: leafBySession.get(sessionId),
+            entryId: matchedEntry?.entry.id,
+            runId: matchedEntry?.entry.runId,
+            turn: matchedEntry?.turn,
             updatedAt: updatedAt || undefined,
             label,
             summary,