veryfront 0.1.1237 → 0.1.1239

package/esm/src/agent/runtime/call-context.js

@@ -2,8 +2,8 @@
  * Agent Call Context
  *
  * Assembles the complete system-message set for one provider call. Every
- * caller that talks to a model — the hosted cloud runtime, the project
- * runtime's internal agent runs, and the `agent()` factory — gathers its own
+ * caller that talks to a model, the hosted cloud runtime, the project
+ * runtime's internal agent runs, and the `agent()` factory, gathers its own
  * inputs and hands them here, so ordering, block tags, marker splitting,
  * deduplication, and skill rendering live in exactly one place.
  *
@@ -13,27 +13,39 @@
  *
  * Layout of the returned messages:
  *
- * 1. One cached system message holding, in order, the instructions before the
- *    runtime-context marker, `<project_instructions>`, `<project_context>`,
- *    any caller-supplied extra blocks, the instructions after the marker, and
- *    `<available_skills>`.
- * 2. An uncached `<environment_context>` message.
+ * 1. One cached system message holding only the instructions before the
+ *    runtime-context marker (or all instructions when the marker is absent).
+ * 2. One optional uncached system message holding, in order,
+ *    `<project_instructions>`, `<project_context>`, any caller-supplied extra
+ *    blocks, `<available_skills>` or an `<authorized_skill_ids>`
+ *    fallback, `<environment_context>`, and the instructions after the marker.
  *
  * Only the instructions are unconditional: each block appears only when the
  * caller supplied its input and the instructions do not already carry that tag
  * as a complete element, so message 2 can be absent and message 1 can be the
- * instructions alone. Callers compose in layers — the factory's output is later
- * re-composed by a project-runtime run — and skipping already-present elements
+ * instructions alone. Callers compose in layers: the factory's output is later
+ * re-composed by a project-runtime run, and skipping already-present elements
  * keeps that idempotent instead of repeating a project reference or catalog.
  *
  * @module
  */
+import { isProxyWithoutHooks } from "../../platform/compat/error-introspection.js";
 import { createRuntimePromptBlock } from "./prompt-block.js";
-import { buildRuntimeAvailableSkillsPromptBlock } from "./skill-prompt.js";
+import { buildRuntimeAuthorizedSkillIdsPromptBlock, buildRuntimeAvailableSkillsPromptBlock, RUNTIME_GENERATED_SKILL_CATALOG_MARKER, } from "./skill-prompt.js";
+import { flattenSystemInstructions } from "./tool-inventory.js";
+import { isOwnDataPropertyDescriptor, readOwnDataProperty } from "./data-property-descriptor.js";
+const ObjectDefineProperty = Object.defineProperty;
+const ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+const ObjectGetOwnPropertyDescriptors = Object.getOwnPropertyDescriptors;
+const ReflectApply = Reflect.apply;
+const ReflectDeleteProperty = Reflect.deleteProperty;
+const ReflectOwnKeys = Reflect.ownKeys;
 /** Marker authored instructions use to place runtime blocks mid-prompt. */
 export const DEFAULT_RUNTIME_AGENT_CONTEXT_MARKER = "<!-- veryfront-runtime-context -->";
 const ENVIRONMENT_CONTEXT_BLOCK_NAME = "environment_context";
 const AVAILABLE_SKILLS_BLOCK_NAME = "available_skills";
+const AUTHORIZED_SKILL_IDS_BLOCK_NAME = "authorized_skill_ids";
+const AUTHORIZED_SKILL_ID_DISCOVERY_BLOCK_NAME = "authorized_skill_id_discovery";
 /** Builds the shared project-context prompt block (project reference + branch). */
 export function buildProjectContextPromptBlock(input) {
     const branchLine = input.branchId
@@ -59,11 +71,12 @@ export function buildProjectInstructionsPromptBlock(instructions) {
 function splitInstructionsAtMarker(input) {
     const markerIndex = input.instructions.indexOf(input.runtimeContextMarker);
     if (markerIndex < 0) {
-        return { before: input.instructions, after: null };
+        return { before: input.instructions, after: null, hasMarker: false };
     }
     return {
         before: input.instructions.slice(0, markerIndex).trim(),
         after: input.instructions.slice(markerIndex + input.runtimeContextMarker.length).trim() || null,
+        hasMarker: true,
     };
 }
 function getBlockName(block) {
@@ -82,58 +95,483 @@ function hasBlock(instructions, blockName) {
     }
     return instructions.indexOf(`</${blockName}>`, openIndex) > openIndex;
 }
-/** Builds the complete system-message set for one provider call. */
+function removeCompleteBlocks(instructions, blockName) {
+    const openTag = `<${blockName}>`;
+    const closeTag = `</${blockName}>`;
+    let result = instructions;
+    let openIndex = result.indexOf(openTag);
+    while (openIndex >= 0) {
+        const closeIndex = result.indexOf(closeTag, openIndex + openTag.length);
+        if (closeIndex < 0) {
+            break;
+        }
+        const before = result.slice(0, openIndex).trimEnd();
+        const after = result.slice(closeIndex + closeTag.length).trimStart();
+        result = before.length > 0 && after.length > 0 ? `${before}\n\n${after}` : `${before}${after}`;
+        openIndex = result.indexOf(openTag);
+    }
+    return result;
+}
+function removeGeneratedSkillCatalogBlocks(instructions) {
+    const openTag = `<${AVAILABLE_SKILLS_BLOCK_NAME}>`;
+    const closeTag = `</${AVAILABLE_SKILLS_BLOCK_NAME}>`;
+    let result = instructions;
+    let searchIndex = 0;
+    while (searchIndex < result.length) {
+        const openIndex = result.indexOf(openTag, searchIndex);
+        if (openIndex < 0) {
+            break;
+        }
+        const closeIndex = result.indexOf(closeTag, openIndex + openTag.length);
+        if (closeIndex < 0) {
+            break;
+        }
+        const content = result.slice(openIndex + openTag.length, closeIndex).trimStart();
+        if (!content.startsWith(RUNTIME_GENERATED_SKILL_CATALOG_MARKER)) {
+            searchIndex = closeIndex + closeTag.length;
+            continue;
+        }
+        const before = result.slice(0, openIndex).trimEnd();
+        const after = result.slice(closeIndex + closeTag.length).trimStart();
+        result = before.length > 0 && after.length > 0 ? `${before}\n\n${after}` : `${before}${after}`;
+        searchIndex = 0;
+    }
+    return result;
+}
+function snapshotOwnEnumerableDataRecord(value, label, options = {}) {
+    if (!isRecord(value)) {
+        return {};
+    }
+    if (isProxyWithoutHooks(value)) {
+        throw new TypeError(`${label} must not be a Proxy`);
+    }
+    let descriptors;
+    try {
+        descriptors = ReflectApply(ObjectGetOwnPropertyDescriptors, undefined, [
+            value,
+        ]);
+    }
+    catch {
+        throw new TypeError(`${label} must expose data properties`);
+    }
+    const snapshot = {};
+    const keys = ReflectApply(ReflectOwnKeys, undefined, [descriptors]);
+    for (const key of keys) {
+        const descriptorEntry = ReflectApply(ObjectGetOwnPropertyDescriptor, undefined, [
+            descriptors,
+            key,
+        ]);
+        const descriptor = isOwnDataPropertyDescriptor(descriptorEntry)
+            ? descriptorEntry.value
+            : undefined;
+        if (!descriptor?.enumerable) {
+            continue;
+        }
+        if (!isOwnDataPropertyDescriptor(descriptor)) {
+            if (options.ignoreUnsafeDataKeys?.includes(key)) {
+                continue;
+            }
+            throw new TypeError(`${label}.${String(key)} must be an own enumerable data property`);
+        }
+        ReflectApply(ObjectDefineProperty, undefined, [snapshot, key, {
+                configurable: true,
+                enumerable: true,
+                value: descriptor.value,
+                writable: true,
+            }]);
+    }
+    return snapshot;
+}
+function prepareStructuredInstructionMessages(input) {
+    return input.instructions.flatMap((message, index) => {
+        const label = `Structured system message ${index}`;
+        const contentValue = readOwnDataProperty(message, "content", label);
+        if (typeof contentValue !== "string") {
+            throw new TypeError(`${label}.content must be a string data property`);
+        }
+        const providerOptionsValue = readOwnDataProperty(message, "providerOptions", label, false);
+        const providerOptions = isRecord(providerOptionsValue)
+            ? snapshotOwnEnumerableDataRecord(providerOptionsValue, `${label} providerOptions`)
+            : undefined;
+        const withoutGeneratedSkillContext = input.removeGeneratedSkillContext
+            ? removeCompleteBlocks(removeCompleteBlocks(removeGeneratedSkillCatalogBlocks(contentValue), AUTHORIZED_SKILL_IDS_BLOCK_NAME), AUTHORIZED_SKILL_ID_DISCOVERY_BLOCK_NAME)
+            : contentValue;
+        return withoutGeneratedSkillContext.length > 0
+            ? [{
+                    role: "system",
+                    content: withoutGeneratedSkillContext,
+                    ...(providerOptions ? { providerOptions } : {}),
+                }]
+            : [];
+    });
+}
+function splitStructuredInstructionMessages(messages, runtimeContextMarker) {
+    const before = [];
+    const after = [];
+    let foundMarker = false;
+    for (const message of messages) {
+        if (foundMarker) {
+            after.push(message);
+            continue;
+        }
+        const split = splitInstructionsAtMarker({
+            instructions: message.content,
+            runtimeContextMarker,
+        });
+        if (!split.hasMarker) {
+            before.push(message);
+            continue;
+        }
+        foundMarker = true;
+        if (split.before.length > 0) {
+            before.push({ ...message, content: split.before });
+        }
+        if (split.after !== null) {
+            after.push({ ...message, content: split.after });
+        }
+    }
+    return { before, after, hasMarker: foundMarker };
+}
+/**
+ * Renders the Anthropic `cacheControl` for the static system message. The
+ * default (`"5m"`) omits `ttl` to preserve the standard 5-minute ephemeral
+ * breakpoint byte-for-byte; `"1h"` requests the 1-hour cache.
+ */
+function buildCacheControl(cacheTtl) {
+    return cacheTtl === "1h" ? { type: "ephemeral", ttl: "1h" } : { type: "ephemeral" };
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isAnthropicCacheProviderKey(key) {
+    const normalized = key.toLowerCase();
+    return normalized === "bedrock" || normalized === "veryfront-cloud" ||
+        normalized.includes("anthropic");
+}
+function getAnthropicCacheProviderAlias(input) {
+    const alias = input.anthropicProviderAlias;
+    return alias && alias.trim().length > 0 ? alias : "veryfront-cloud";
+}
+function isAnthropicCacheControl(value) {
+    if (!isRecord(value) || isProxyWithoutHooks(value)) {
+        return false;
+    }
+    try {
+        const descriptor = ReflectApply(ObjectGetOwnPropertyDescriptor, undefined, [
+            value,
+            "type",
+        ]);
+        return descriptor !== undefined && descriptor.enumerable === true &&
+            isOwnDataPropertyDescriptor(descriptor) && descriptor.value === "ephemeral";
+    }
+    catch {
+        return false;
+    }
+}
+function getStructuredCacheProviderBuckets(providerOptions, anthropicProviderAlias) {
+    const buckets = [];
+    const keys = ReflectApply(ReflectOwnKeys, undefined, [providerOptions]);
+    for (const key of keys) {
+        if (key !== "anthropic" && key !== anthropicProviderAlias) {
+            continue;
+        }
+        let bucketDescriptor;
+        try {
+            bucketDescriptor = ReflectApply(ObjectGetOwnPropertyDescriptor, undefined, [
+                providerOptions,
+                key,
+            ]);
+        }
+        catch {
+            throw new TypeError(`Structured system message providerOptions.${String(key)} must be inspectable`);
+        }
+        if (!bucketDescriptor?.enumerable || !isOwnDataPropertyDescriptor(bucketDescriptor)) {
+            continue;
+        }
+        const value = bucketDescriptor.value;
+        if (!isRecord(value)) {
+            continue;
+        }
+        if (isProxyWithoutHooks(value)) {
+            throw new TypeError(`Structured system message providerOptions.${String(key)} must not be a Proxy`);
+        }
+        let descriptor;
+        try {
+            descriptor = ReflectApply(ObjectGetOwnPropertyDescriptor, undefined, [
+                value,
+                "cacheControl",
+            ]);
+        }
+        catch {
+            throw new TypeError(`Structured system message providerOptions.${String(key)}.cacheControl must be inspectable`);
+        }
+        const cacheControl = descriptor?.enumerable && isOwnDataPropertyDescriptor(descriptor)
+            ? descriptor.value
+            : undefined;
+        if (typeof key === "string" && !isAnthropicCacheProviderKey(key) &&
+            !isAnthropicCacheControl(cacheControl)) {
+            continue;
+        }
+        buckets.push({
+            key,
+            cacheControl,
+            value: snapshotOwnEnumerableDataRecord(value, `Structured system message providerOptions.${String(key)}`, { ignoreUnsafeDataKeys: ["cacheControl"] }),
+        });
+    }
+    return buckets;
+}
+function removeStructuredCacheControls(messages, anthropicProviderAlias) {
+    return messages.map((message) => {
+        const providerOptions = snapshotOwnEnumerableDataRecord(message.providerOptions, "Structured system message providerOptions");
+        const cacheProviderBuckets = getStructuredCacheProviderBuckets(providerOptions, anthropicProviderAlias);
+        if (cacheProviderBuckets.length === 0) {
+            return message;
+        }
+        const nextProviderOptions = { ...providerOptions };
+        for (const bucket of cacheProviderBuckets) {
+            const nextBucket = { ...bucket.value };
+            ReflectApply(ReflectDeleteProperty, undefined, [nextBucket, "cacheControl"]);
+            if (ReflectOwnKeys(nextBucket).length > 0) {
+                ReflectApply(ObjectDefineProperty, undefined, [nextProviderOptions, bucket.key, {
+                        configurable: true,
+                        enumerable: true,
+                        value: nextBucket,
+                        writable: true,
+                    }]);
+            }
+            else {
+                ReflectApply(ReflectDeleteProperty, undefined, [nextProviderOptions, bucket.key]);
+            }
+        }
+        return ReflectOwnKeys(nextProviderOptions).length > 0
+            ? { ...message, providerOptions: nextProviderOptions }
+            : { role: "system", content: message.content };
+    });
+}
+function hasStructuredCacheControl(messages, anthropicProviderAlias) {
+    for (const message of messages) {
+        const providerOptions = snapshotOwnEnumerableDataRecord(message.providerOptions, "Structured system message providerOptions");
+        if (getStructuredCacheProviderBuckets(providerOptions, anthropicProviderAlias).some((bucket) => bucket.cacheControl !== undefined)) {
+            return true;
+        }
+    }
+    return false;
+}
+const ANTHROPIC_MAX_CACHE_BREAKPOINTS = 4;
+function applyStructuredCacheTtl(messages, cacheTtl, anthropicProviderAlias) {
+    if (messages.length === 0) {
+        return messages;
+    }
+    if (cacheTtl === undefined && hasStructuredCacheControl(messages, anthropicProviderAlias)) {
+        return messages;
+    }
+    const breakpointIndex = messages.length - 1;
+    const cacheMetadata = messages.map((message) => {
+        const providerOptions = snapshotOwnEnumerableDataRecord(message.providerOptions, "Structured system message providerOptions");
+        const structuredCacheProviderBuckets = getStructuredCacheProviderBuckets(providerOptions, anthropicProviderAlias);
+        const cacheProviderBuckets = structuredCacheProviderBuckets.filter((bucket) => bucket.cacheControl !== undefined);
+        const undefinedCacheProviderBuckets = structuredCacheProviderBuckets.filter((bucket) => bucket.cacheControl === undefined);
+        return {
+            providerOptions,
+            cacheProviderBuckets,
+            undefinedCacheProviderBuckets,
+        };
+    });
+    const breakpointIndexes = [];
+    for (const [index, { cacheProviderBuckets }] of cacheMetadata.entries()) {
+        if (cacheProviderBuckets.length > 0) {
+            breakpointIndexes.push(index);
+        }
+    }
+    const addCanonicalBreakpoint = cacheMetadata[breakpointIndex].cacheProviderBuckets.length === 0;
+    if (addCanonicalBreakpoint) {
+        breakpointIndexes.push(breakpointIndex);
+    }
+    const retainedBreakpointIndexes = new Set(breakpointIndexes.slice(-ANTHROPIC_MAX_CACHE_BREAKPOINTS));
+    return messages.map((message, index) => {
+        const { providerOptions, cacheProviderBuckets, undefinedCacheProviderBuckets } = cacheMetadata[index];
+        const shouldAddCanonicalBreakpoint = addCanonicalBreakpoint && index === breakpointIndex;
+        if (cacheProviderBuckets.length === 0 && undefinedCacheProviderBuckets.length === 0 &&
+            !shouldAddCanonicalBreakpoint) {
+            return message;
+        }
+        const nextProviderOptions = { ...providerOptions };
+        for (const bucket of undefinedCacheProviderBuckets) {
+            const nextBucket = { ...bucket.value };
+            ReflectApply(ReflectDeleteProperty, undefined, [nextBucket, "cacheControl"]);
+            if (ReflectOwnKeys(nextBucket).length > 0) {
+                ReflectApply(ObjectDefineProperty, undefined, [nextProviderOptions, bucket.key, {
+                        configurable: true,
+                        enumerable: true,
+                        value: nextBucket,
+                        writable: true,
+                    }]);
+            }
+            else {
+                ReflectApply(ReflectDeleteProperty, undefined, [nextProviderOptions, bucket.key]);
+            }
+        }
+        for (const bucket of cacheProviderBuckets) {
+            if (retainedBreakpointIndexes.has(index)) {
+                ReflectApply(ObjectDefineProperty, undefined, [nextProviderOptions, bucket.key, {
+                        configurable: true,
+                        enumerable: true,
+                        value: {
+                            ...bucket.value,
+                            cacheControl: buildCacheControl(cacheTtl),
+                        },
+                        writable: true,
+                    }]);
+                continue;
+            }
+            const nextBucket = { ...bucket.value };
+            ReflectApply(ReflectDeleteProperty, undefined, [nextBucket, "cacheControl"]);
+            if (ReflectOwnKeys(nextBucket).length > 0) {
+                ReflectApply(ObjectDefineProperty, undefined, [nextProviderOptions, bucket.key, {
+                        configurable: true,
+                        enumerable: true,
+                        value: nextBucket,
+                        writable: true,
+                    }]);
+            }
+            else {
+                ReflectApply(ReflectDeleteProperty, undefined, [nextProviderOptions, bucket.key]);
+            }
+        }
+        if (shouldAddCanonicalBreakpoint) {
+            const anthropic = snapshotOwnEnumerableDataRecord(nextProviderOptions.anthropic, "Structured system message providerOptions.anthropic", { ignoreUnsafeDataKeys: ["cacheControl"] });
+            ReflectApply(ObjectDefineProperty, undefined, [nextProviderOptions, "anthropic", {
+                    configurable: true,
+                    enumerable: true,
+                    value: {
+                        ...anthropic,
+                        cacheControl: buildCacheControl(cacheTtl),
+                    },
+                    writable: true,
+                }]);
+        }
+        const nextMessage = { ...message };
+        if (ReflectOwnKeys(nextProviderOptions).length > 0) {
+            nextMessage.providerOptions = nextProviderOptions;
+        }
+        else {
+            ReflectApply(ReflectDeleteProperty, undefined, [nextMessage, "providerOptions"]);
+        }
+        return nextMessage;
+    });
+}
+/**
+ * Builds the layered system-message set for one provider call (RFC 0001).
+ *
+ * Layer 0 (cached, shared across runs): the agent prompt only, with nothing
+ * project- or turn-specific. Its `cacheControl` breakpoint is the sole shared
+ * cache key, so it must be byte-identical across projects.
+ *
+ * Dynamic tail (uncached): project context/instructions, extra blocks, the
+ * skills catalog, and host environment facts. This includes everything that varies by
+ * project, session, or turn. Kept out of the cached prefix so a fresh project
+ * or session still reads the shared Layer 0 instead of paying full price.
+ */
 export function buildAgentCallContext(input) {
+    const preserveRuntimeContextMarker = input[PRESERVE_RUNTIME_CONTEXT_MARKER] === true;
     const runtimeContextMarker = input.runtimeContextMarker ?? DEFAULT_RUNTIME_AGENT_CONTEXT_MARKER;
+    const anthropicProviderAlias = getAnthropicCacheProviderAlias(input);
+    if (Array.isArray(input.instructions)) {
+        const preparedMessages = prepareStructuredInstructionMessages({
+            instructions: input.instructions,
+            removeGeneratedSkillContext: input.skills !== undefined,
+        });
+        const splitMessages = splitStructuredInstructionMessages(preparedMessages, runtimeContextMarker);
+        const staticMessages = applyStructuredCacheTtl(splitMessages.before, input.cacheTtl, anthropicProviderAlias);
+        const flattenedInstructions = flattenSystemInstructions([
+            ...splitMessages.before,
+            ...splitMessages.after,
+        ]);
+        const generatedMessages = buildAgentCallContext({
+            ...input,
+            instructions: flattenedInstructions,
+        });
+        const dynamicMessage = generatedMessages[flattenedInstructions.length > 0 ? 1 : 0];
+        return [
+            ...staticMessages,
+            ...(preserveRuntimeContextMarker && splitMessages.hasMarker
+                ? [{ role: "system", content: runtimeContextMarker }]
+                : []),
+            ...(dynamicMessage ? [dynamicMessage] : []),
+            ...removeStructuredCacheControls(splitMessages.after, anthropicProviderAlias),
+        ];
+    }
+    const sourceInstructions = input.skills === undefined ? input.instructions : removeCompleteBlocks(removeCompleteBlocks(removeGeneratedSkillCatalogBlocks(input.instructions), AUTHORIZED_SKILL_IDS_BLOCK_NAME), AUTHORIZED_SKILL_ID_DISCOVERY_BLOCK_NAME);
     const instructions = splitInstructionsAtMarker({
-        instructions: input.instructions,
+        instructions: sourceInstructions,
         runtimeContextMarker,
     });
-    const blocks = [];
+    // Layer 0 contains only the static prompt before the marker. When no marker
+    // exists, `before` contains the complete instructions.
+    const staticPrompt = instructions.before;
+    // The dynamic tail contains project blocks, extra blocks, skills, and environment. Each is
+    // dropped if the agent's instructions already carry the same block (dedup).
+    const dynamicParts = [];
+    if (preserveRuntimeContextMarker && instructions.hasMarker) {
+        dynamicParts.push(runtimeContextMarker);
+    }
+    const projectBlocks = [];
     if (input.projectInstructions) {
-        blocks.push(buildProjectInstructionsPromptBlock(input.projectInstructions));
+        projectBlocks.push(buildProjectInstructionsPromptBlock(input.projectInstructions));
     }
     if (input.projectContext) {
-        blocks.push(buildProjectContextPromptBlock(input.projectContext));
+        projectBlocks.push(buildProjectContextPromptBlock(input.projectContext));
     }
-    blocks.push(...(input.extraBlocks ?? []));
-    const staticParts = [];
-    if (instructions.before) {
-        staticParts.push(instructions.before);
-    }
-    for (const block of blocks) {
+    projectBlocks.push(...(input.extraBlocks ?? []));
+    for (const block of projectBlocks) {
         if (block.length === 0) {
             continue;
         }
         const blockName = getBlockName(block);
-        if (blockName !== null && hasBlock(input.instructions, blockName)) {
+        if (blockName !== null && hasBlock(sourceInstructions, blockName)) {
             continue;
         }
-        staticParts.push(block);
+        dynamicParts.push(block);
     }
-    if (instructions.after) {
-        staticParts.push(instructions.after);
+    if (input.skills !== undefined) {
+        const hasAuthoredSkillCatalog = hasBlock(sourceInstructions, AVAILABLE_SKILLS_BLOCK_NAME);
+        if (input.skills.length > 0 || hasAuthoredSkillCatalog) {
+            dynamicParts.push(hasAuthoredSkillCatalog
+                ? buildRuntimeAuthorizedSkillIdsPromptBlock(input.skills)
+                : buildRuntimeAvailableSkillsPromptBlock(input.skills));
+        }
     }
-    if (input.skills?.length && !hasBlock(input.instructions, AVAILABLE_SKILLS_BLOCK_NAME)) {
-        staticParts.push(buildRuntimeAvailableSkillsPromptBlock(input.skills));
+    if (input.environmentContext && !hasBlock(sourceInstructions, ENVIRONMENT_CONTEXT_BLOCK_NAME)) {
+        dynamicParts.push(createRuntimePromptBlock({
+            name: ENVIRONMENT_CONTEXT_BLOCK_NAME,
+            content: input.environmentContext,
+        }));
     }
-    const messages = [
-        {
-            role: "system",
-            content: staticParts.join("\n\n"),
-            providerOptions: {
-                anthropic: { cacheControl: { type: "ephemeral" } },
-            },
-        },
-    ];
-    if (input.environmentContext && !hasBlock(input.instructions, ENVIRONMENT_CONTEXT_BLOCK_NAME)) {
+    if (instructions.after) {
+        dynamicParts.push(instructions.after);
+    }
+    const messages = staticPrompt.length > 0
+        ? [{
+                role: "system",
+                content: staticPrompt,
+                providerOptions: {
+                    anthropic: { cacheControl: buildCacheControl(input.cacheTtl) },
+                },
+            }]
+        : [];
+    if (dynamicParts.length > 0) {
         messages.push({
             role: "system",
-            content: createRuntimePromptBlock({
-                name: ENVIRONMENT_CONTEXT_BLOCK_NAME,
-                content: input.environmentContext,
-            }),
+            content: dynamicParts.join("\n\n"),
         });
     }
     return messages;
 }
+const PRESERVE_RUNTIME_CONTEXT_MARKER = Symbol("preserveRuntimeContextMarker");
+/** Keeps the marker so another internal context composer can consume it. */
+export function buildAgentCallContextPreservingRuntimeMarker(input) {
+    return buildAgentCallContext({
+        ...input,
+        [PRESERVE_RUNTIME_CONTEXT_MARKER]: true,
+    });
+}

package/esm/src/agent/runtime/chat-stream-handler.d.ts

@@ -32,6 +32,24 @@ export interface StreamingToolResult {
     dynamic?: boolean;
     preliminary?: boolean;
 }
+/**
+ * Flush a tool call's buffered `tool-input-start` and input deltas to the
+ * client.
+ *
+ * The start event is withheld until the call commits — `tool-input-end`,
+ * `tool-input-available` or `tool-call`. `tool-call` rebuilds the entry from
+ * its own `toolName` and announces from there, so a name that supersedes the
+ * one seen at `tool-input-start` is the one the client is given, and the
+ * superseded name never reaches the wire.
+ *
+ * Idempotent via `inputAnnounced`, which is also what gates the terminal
+ * `tool-output-error`. A call whose stream ended before any commit event was
+ * never announced, so it must be announced here before its failure can
+ * render. Such a call has no superseding name to wait for: the event that
+ * would carry one never arrived, and `inputAvailable` stays false, which is
+ * what makes that terminal path reachable at all.
+ */
+export declare function announceStreamedToolCallInput(controller: ReadableStreamDefaultController, encoder: TextEncoder, toolCall: StreamingToolCall): void;
 export interface StreamingReasoningPart {
     id: string;
     text: string;

package/esm/src/agent/runtime/chat-stream-handler.d.ts.map

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