@springbrand/agent-runtime 0.3.0-alpha.2 → 0.3.0-alpha.21

package/src/adapter/cloudflare/subagent/tools.ts

@@ -1,3 +1,4 @@
+import type { ToolRegistration } from "@earendil-works/pi-durable";
 import {
   DynamicWorkerExecutor,
   resolveProvider,
@@ -9,19 +10,18 @@ import {
 } from "@cloudflare/shell";
 import { stateToolsFromBackend } from "@cloudflare/shell/workers";
 import type {
-  AgentHarnessTool,
   AgentTool,
   AgentToolResult,
 } from "@earendil-works/pi-agent-core";
 import { Type } from "@earendil-works/pi-ai";
 import type { WorkspacePort } from "../../../config/ports";
-import type { AgentType } from "../../../tools/subagent-types/contract";
+import type { AgentType } from "../../../tools/subagent/types/contract";
 import {
   compileHarnessTools,
   type CompileHarnessToolsOptions,
   type PiToolCandidate,
 } from "../../../tools";
-import { workspacePiToolCandidates } from "../../../tools/workspace-sandbox";
+import { workspacePiToolCandidates } from "../../../tools/workspace";
 
 const READONLY_WORKSPACE_TOOLS = new Set([
   "read",
@@ -221,7 +221,7 @@ export function createCloudflareSubAgentTools(options: {
   loader: WorkerLoader;
   outbound: Fetcher;
   settle: NonNullable<CompileHarnessToolsOptions["onSettlement"]>;
-}): AgentHarnessTool<object | undefined>[] {
+}): ToolRegistration<any, any>[] {
   const workspace = workspacePiToolCandidates(options.workspace).filter(
     (candidate) =>
       options.profile === "capable" ||

package/src/adapter/cloudflare/universal-agent/preparation.ts

@@ -9,16 +9,16 @@ import type {
   RuntimeSubagentPort,
   WorkspacePort,
 } from "../../../config/ports";
-import { decodeSubagentCompletion } from "../../../tools/subagent-runtime";
+import { decodeSubagentCompletion } from "../../../tools/subagent/runtime";
 import type { RuntimeDegradation } from "../../../config/degradation";
 import type { RuntimeMemoryProfile } from "../../../config/profile";
-import { AGENT_TYPES } from "../../../tools/subagent-types/registry";
+import { AGENT_TYPES } from "../../../tools/subagent/types/registry";
 import type { RuntimeAgentConfigContext } from "../../../config/agent-context";
 import {
   createBrowserExecutionFactory,
   createWorkspaceCodeExecutionFactory,
   type RuntimeBrowserBinding,
-} from "../../../tools/core-host";
+} from "../../../tools/codemode/adapter";
 import {
   createCloudflareSandboxAdapter,
   type SandboxAdmission,

package/src/adapter/cloudflare/universal-agent/tools.ts

@@ -7,15 +7,13 @@ import type {
 } from "../../../config/ports";
 import type { RuntimeDegradation } from "../../../config/degradation";
 import type { RuntimeMemoryProfile } from "../../../config/profile";
-import type { WorkspaceRevisionRestorePort } from "../../../tools/workspace-versioning";
+import type { WorkspaceRevisionRestorePort } from "../../../tools/workspace/versioning";
 import { schedulePiToolCandidates } from "../../../tools/schedule";
-import { workspaceRevisionPiToolCandidate } from "../../../tools/workspace-revision";
-import {
-  sandboxPiToolCandidates,
-} from "../../../tools/workspace-sandbox";
+import { workspaceRevisionPiToolCandidate } from "../../../tools/workspace/revision";
+import { sandboxPiToolCandidates } from "../../../tools/sandbox";
 import type { RuntimeCodeExecutionFactory } from "../../../config/ports";
 import type { ToolAssemblyResult } from "../../../config/definition";
-import type { PiToolCandidate } from "../../../tools/compiler";
+import type { PiToolCandidate } from "../../../tools/runtime/contracts";
 
 export function assembleUniversalAgentTools(options: {
   hostTools?: readonly PiToolCandidate[];

package/src/adapter/cloudflare/workspace/version-control.ts

@@ -5,7 +5,7 @@ import {
   type WorkspaceRevision,
   type WorkspaceRevisionManifest,
   type WorkspaceVersionPort,
-} from "../../../tools/workspace-versioning";
+} from "../../../tools/workspace/versioning";
 import { createWorkspaceGitFs } from "./git-fs";
 
 const PAGE_SIZE = 256;

package/src/config/activation.ts

@@ -2,7 +2,7 @@ import { connectConfiguredMcpServers } from "../lib/mcp";
 import { sha256Hex } from "../lib/artifacts";
 import type { RuntimeCandidate, RuntimeSnapshot } from "./assembler";
 import type { HarnessRuntimeConfig } from "./harness-runtime";
-import type { PreparedPiRuntime, PreparePiRuntimeOptions } from "./pinning";
+import type { PreparedPiRuntime, PreparePiRuntimeOptions } from "./prepared-runtime";
 import type { RuntimeGatewaySession, RuntimeSubmissionAdmissionHook } from "./ports";
 import { withRuntimeLoadTimeout } from "./runtime-load";
 import type { RuntimeLoadPhase } from "../conversation/state";
@@ -16,6 +16,16 @@ export interface ActiveRuntime {
   readonly admission?: RuntimeSubmissionAdmissionHook;
 }
 
+/** Check the same candidate guards during admission and final activation. */
+export async function verifyRuntimeCandidateGuards(
+  candidate: RuntimeCandidate,
+  phase: "admission" | "commit",
+): Promise<void> {
+  for (const [index, guard] of candidate.commitGuards.entries()) {
+    await withRuntimeLoadTimeout(`${phase}-guard:${index}`, guard);
+  }
+}
+
 async function closeRuntimeGatewaySession(
   session: RuntimeGatewaySession | undefined,
   step: string,
@@ -33,7 +43,6 @@ interface RuntimeActivationOptions {
   readonly sessionId: string;
   readonly createExtensionHostBinding: PreparePiRuntimeOptions["createExtensionHostBinding"];
   advance(phase: RuntimeLoadPhase): void;
-  isExecuting(): boolean;
   commit(runtime: ActiveRuntime): void;
 }
 
@@ -92,19 +101,10 @@ export async function activateRuntimeCandidate(
     throw error;
   }
   const revision = await sha256Hex(prepared.revisionDescriptor);
-  const contested = Boolean(previous) &&
-    revision !== previous?.revision &&
-    options.isExecuting();
-  if (contested) {
-    await closeRuntimeGatewaySession(gatewaySession, "gateway.close.contested");
-    throw new Error(
-      "Cannot reload Runtime while a revision-pinned SpringBrand Turn is active",
-    );
-  }
   const next = Object.freeze({
     snapshot: candidateSnapshot,
     revision,
-    runtimeKey: candidate.runtimeKey ?? revision,
+    runtimeKey: candidate.runtimeKey ?? "default",
     pi: prepared,
     ...(gatewaySession ? { gatewaySession } : {}),
     ...(candidate.admission
@@ -114,9 +114,7 @@ export async function activateRuntimeCandidate(
   let activated = false;
   const previousGatewaySession = previous?.gatewaySession;
   try {
-    for (const [index, guard] of candidate.commitGuards.entries()) {
-      await withRuntimeLoadTimeout(`commit-guard:${index}`, guard);
-    }
+    await verifyRuntimeCandidateGuards(candidate, "commit");
     options.pi.activate(candidateSnapshot);
     activated = true;
     options.commit(next);

package/src/config/agent-context.ts

@@ -8,7 +8,7 @@ import type { RuntimeConfigUpdateResult } from "./runtime-config";
 import type {
   TemporaryAgentRequest,
   TemporaryAgentRunContext,
-} from "../tools/temporary-agent/core";
+} from "../tools/subagent/temporary/core";
 
 /**
  * 描述 Agent 寻址路径中的一级父子节点。

package/src/config/assembler.ts

@@ -1,3 +1,4 @@
+import { schedulePiToolCandidates } from "../tools/schedule";
 import type { SkillSource } from "agents/skills";
 import type {
   RuntimeGatewayPort,
@@ -36,10 +37,7 @@ import {
   type PiRuntimeAssembly,
 } from "./assembly-snapshot";
 import type { AgentTool } from "@earendil-works/pi-agent-core";
-import type {
-  PiToolCandidate,
-  ToolExposureMode,
-} from "../tools/compiler";
+import type { PiToolCandidate, ToolExposureMode } from "../tools/runtime/contracts";
 import type {
   AssembleRuntimeSnapshotInput,
   RuntimeSettings,
@@ -50,17 +48,11 @@ import type {
   RuntimeToolSurfacePolicy,
 } from "./definition";
 import type { RuntimeCodeExecutionFactory } from "./ports";
-import {
-  basePiToolCandidates,
-  memoryPiToolCandidate,
-} from "../tools/base";
-import {
-  BROWSER_EXECUTE_TOOL_NAME,
-  browserExecutionPiToolCandidate,
-  codeExecutionPiToolCandidate,
-} from "../tools/core";
+import { basePiToolCandidates } from "../tools/assistant";
+import { memoryPiToolCandidate } from "../tools/assistant/memory";
+import { BROWSER_EXECUTE_TOOL_NAME, browserExecutionPiToolCandidate, codeExecutionPiToolCandidate } from "../tools/codemode";
 import { skillPiToolCandidates } from "../tools/skill";
-import { createWebSearch, WEB_SEARCH_MODEL } from "../tools/web-search";
+import { createWebSearch, WEB_SEARCH_MODEL } from "../tools/web/search";
 import { subagentPiToolCandidates } from "../tools/subagent";
 import { resolvePiModel } from "../models";
 import {
@@ -264,6 +256,16 @@ async function createToolSurface(
           if (!EXECUTION_LEVELS.includes(candidate.requiredExecutionLevel)) {
             throw new Error(`SpringBrand Tool ${name} execution level is invalid`);
           }
+          if (candidate.unattendedExecution) {
+            requiredName(
+              candidate.unattendedExecution.capability,
+              `SpringBrand Tool ${name} unattended capability`,
+            );
+            requiredName(
+              candidate.unattendedExecution.operation,
+              `SpringBrand Tool ${name} unattended operation`,
+            );
+          }
           if (tools.has(name)) {
             throw new Error(`Duplicate Runtime SpringBrand Tool: ${name}`);
           }
@@ -294,17 +296,12 @@ async function createToolSurface(
             typeof candidate.tool.execute === "function",
         );
         const codeExecutionCandidates = Object.freeze([...mergeable]);
-        const codeExecutionToolNames = new Set(
-          codeExecutionCandidates.map(({ tool }) => tool.name),
-        );
         const codeExecution = input.codeExecution.create(
           codeExecutionCandidates,
         );
-        const topLevelOnly = directVisible.filter(
-          ({ tool }) => !codeExecutionToolNames.has(tool.name),
-        );
+        const directToolNames = new Set(directVisible.map(({ tool }) => tool.name));
         const routeList = (deferred: boolean) => {
-          const matches = topLevelOnly.filter((candidate) =>
+          const matches = directVisible.filter((candidate) =>
             (defersTool?.(candidate.tool.name) === true) === deferred
           );
           return matches.length > 0
@@ -316,8 +313,9 @@ async function createToolSurface(
         };
         const routeGuidance = [
           "## Tool routing",
-          "Top-level deferred Tools are not callable through `tools.*`. Use Provider Tool Search with their exact name, then call them directly.",
+          "For top-level deferred Tools, use Provider Tool Search with their exact name, then call them directly.",
           "Top-level immediate Tools are already available outside execute; call them directly.",
+          "Only Code Mode Tools listed below are callable inside execute through tools.<name>. Tools marked execute-only are not registered as top-level Tools.",
           "",
           "## Top-level deferred Tools",
           routeList(true),
@@ -325,21 +323,20 @@ async function createToolSurface(
           "## Top-level immediate Tools",
           routeList(false),
           "",
+          "## Code Mode Tools",
+          codeExecutionCandidates.length > 0
+            ? codeExecutionCandidates.map(({ tool }) =>
+                `- \`tools.${tool.name}\` — ${directToolNames.has(tool.name) ? "also available as a top-level Tool" : "execute-only"}`
+              ).join("\n")
+            : "- None.",
+          "",
         ].join("\n");
-        const materializeGuidance = codeExecutionCandidates.some(
-            ({ tool }) => tool.name === "materialize_skill_resource",
-          )
-          ? "Skill resource copying is available only inside execute through " +
-            "`tools.materialize_skill_resource({ name, path, destination })`; " +
-            "no Direct Tool is registered for it. " +
-            "Copy multiple resources sequentially in one execute so durable replay preserves call order.\n\n"
-          : "";
         return Object.freeze({
           candidates: Object.freeze([
             classify(codeExecutionPiToolCandidate({
               ...codeExecution,
               description:
-                routeGuidance + "\n" + materializeGuidance + codeExecution.description,
+                routeGuidance + "\n" + codeExecution.description,
             })),
             ...directVisible.map(classify),
           ]),
@@ -586,6 +583,9 @@ class RuntimeBuilder {
             ? { headers: Object.freeze({ ...endpoint.headers }) }
             : {}),
           models: Object.freeze([...endpoint.models]),
+          ...(endpoint.openRouterProviderPins
+            ? { openRouterProviderPins: Object.freeze({ ...endpoint.openRouterProviderPins }) }
+            : {}),
           ...(endpoint.modelInputModalities
             ? {
                 modelInputModalities: Object.freeze(Object.fromEntries(
@@ -595,6 +595,22 @@ class RuntimeBuilder {
                 )),
               }
             : {}),
+          ...(endpoint.modelMetadata
+            ? {
+                modelMetadata: Object.freeze(Object.fromEntries(
+                  Object.entries(endpoint.modelMetadata).map(([modelId, metadata]) => [
+                    modelId,
+                    Object.freeze({
+                      ...metadata,
+                      cost: Object.freeze({ ...metadata.cost }),
+                      ...(metadata.thinkingLevelMap
+                        ? { thinkingLevelMap: Object.freeze({ ...metadata.thinkingLevelMap }) }
+                        : {}),
+                    }),
+                  ]),
+                )),
+              }
+            : {}),
         }),
       )),
     });
@@ -632,6 +648,7 @@ class RuntimeBuilder {
         : {}),
       hostTools: [
         ...this.hostTools,
+        ...(this.schedule ? schedulePiToolCandidates(this.schedule) : []),
         ...subagentPiToolCandidates(
           this.subagents,
           [...this.enabledSubagents],

package/src/config/assembly-snapshot.ts

@@ -18,7 +18,7 @@ import type {
 import type { RuntimeProviderPort } from "./ports";
 import { assembleSystemPrompt } from "../lib/prompt";
 import { resolvePiModel } from "../models";
-import type { PiToolCandidate } from "../tools/compiler";
+import type { PiToolCandidate } from "../tools/runtime/contracts";
 
 /**
  * 收集完动态 Extension/MCP 候选后，一次性生成最终 Tool Surface。

package/src/config/definition.ts

@@ -17,7 +17,7 @@ import type {
 } from "./profile";
 import type { RuntimeExtensionConfig } from "../context/extension/contracts";
 import type { RuntimeDegradation } from "./degradation";
-import type { PiToolCandidate } from "../tools/compiler";
+import type { PiToolCandidate } from "../tools/runtime/contracts";
 import type {
   RuntimeAgentContext,
   RuntimeAgentPlanningContext,

package/src/config/harness-runtime.ts

@@ -1,5 +1,6 @@
 import {
   createModels,
+  lazyStream,
   type MutableModels,
 } from "@earendil-works/pi-ai";
 import {
@@ -14,18 +15,17 @@ export {
   readModelStreamStallDetails,
 } from "../models";
 import {
-  pinPiRuntime,
+  assembleCurrentPiContext,
   preparePiRuntime,
-  readPinnedPiRuntime,
   readPreparedPiRuntime,
-  type PinPiRuntimeOptions,
-  type PinnedPiRuntime,
+  type CurrentPiContextOptions,
   type PreparePiRuntimeOptions,
   type PreparedPiRuntime,
-} from "./pinning";
+} from "./prepared-runtime";
+import { refreshModelGuidance } from "./model-guidance";
 
 /**
- * Runtime 通过这个配置入口准备、固定并读取 Harness 的模型、提示和工具输入。
+ * Runtime 通过这个配置入口准备并读取当前 Harness 的模型、提示和工具输入。
  *
  * @remarks
  * Runtime、Pi、Turn、Tool Candidate 和 canonical transcript 等核心术语见包入口 `../../index.ts`。
@@ -35,9 +35,7 @@ import {
  *   它包含已加载 Extension、Tool candidate 和快照，但 Runtime 只能读取 revision descriptor 与 degradation。
  * - revision descriptor 是影响执行行为的已排序 JSON 描述。
  *   Runtime 会对它取哈希，用来识别当前 Prepared Runtime 的基础版本。
- * - Pinned Runtime 是 Submission 准入时固定的描述符。
- *   它在 Prepared Runtime 基础上加入动态 system context、approval mode 和 base revision。
- * 调用方：`AgentRuntimeKernel` 在配置加载、请求准入与打开 SessionHarness 前调用这些粗粒度能力。
+ * 调用方：`AgentRuntimeKernel` 在配置加载与打开 SessionHarness 前调用这些粗粒度能力。
  *
  * 执行位置仍由 `SessionHarness` 拥有，消息读写和投影由 `ConversationHistory` 拥有。
  */
@@ -84,39 +82,66 @@ export class HarnessRuntimeConfig {
     );
   }
 
-  /** Read the immutable inputs consumed by the Session AgentHarness. */
-  harnessInputs(
+  interaction(prepared: PreparedPiRuntime, name: string) {
+    return readPreparedPiRuntime(prepared, this.owner).candidates.find(
+      (candidate) => candidate.tool.name === name,
+    )?.interaction;
+  }
+
+  /** Read all executable inputs from the current Prepared Runtime. */
+  async harnessInputs(
     prepared: PreparedPiRuntime,
-    pinnedDescriptor: string,
     request: {
-      readonly modelSessionId?: string;
+      readonly modelSessionId?: string | (() => string);
       readonly onGeneration?: PiGenerationLifecycleObserver;
+      readonly includeMemory?: boolean;
+      readonly readExtensionContext?: CurrentPiContextOptions["readExtensionContext"];
+      readonly assertRequestAllowed?: () => void;
+      readonly onCompactionGeneration?: PiGenerationLifecycleObserver;
     } = {},
   ) {
-    const { state, descriptor } = readPinnedPiRuntime(
+    const state = readPreparedPiRuntime(prepared, this.owner);
+    const context = await assembleCurrentPiContext({
       prepared,
-      this.owner,
-      pinnedDescriptor,
-    );
-    const pinnedModel = state.snapshot.pi.model;
+      includeMemory: request.includeMemory,
+      readExtensionContext: request.readExtensionContext,
+    }, this.owner);
+    const currentModel = state.snapshot.pi.model;
     let models!: MutableModels;
+    const requestStream = (observer = request.onGeneration) => {
+      const stream = withProviderBoundary(
+        this.models.streamSimple.bind(this.models), request.modelSessionId, observer,
+      );
+      return ((model, context, options) => lazyStream(model, async () => {
+        options?.signal?.throwIfAborted();
+        request.assertRequestAllowed?.();
+        const refreshed = await refreshModelGuidance(state.candidates, context);
+        options?.signal?.throwIfAborted();
+        request.assertRequestAllowed?.();
+        return stream(model, refreshed, options);
+      })) satisfies typeof stream;
+    };
     models = new Proxy(this.models, {
       get: (target, property) => {
         if (property === "getModel") {
           return (provider: string, modelId: string) =>
-            provider === pinnedModel.provider && modelId === pinnedModel.id
-              ? pinnedModel
+            provider === currentModel.provider && modelId === currentModel.id
+              ? currentModel
               : target.getModel(provider, modelId);
         }
-        if (property === "streamSimple") {
-          return withProviderBoundary(
-            target.streamSimple.bind(target),
-            request.modelSessionId,
-            request.onGeneration,
-          );
-        }
+        if (property === "streamSimple") return requestStream();
         if (property === "completeSimple") {
-          return target.completeSimple.bind(models);
+          const compactionModels = new Proxy(models, {
+            get: (base, key) => {
+              if (key === "streamSimple") return requestStream((event) => {
+                request.onGeneration?.(event);
+                request.onCompactionGeneration?.(event);
+              });
+              const value = Reflect.get(base, key, base);
+              return typeof value === "function" ? value.bind(base) : value;
+            },
+          });
+          return target.completeSimple.bind(compactionModels);
         }
         const value = Reflect.get(target, property, target);
         return typeof value === "function" ? value.bind(target) : value;
@@ -126,16 +151,16 @@ export class HarnessRuntimeConfig {
       models,
       model: state.snapshot.pi.model,
       thinkingLevel: state.snapshot.pi.thinkingLevel,
-      systemPrompt: descriptor.systemPrompt,
+      systemPrompt: context.systemPrompt,
+      degradations: context.degradations,
       candidates: state.candidates,
       workspace: state.snapshot.bindings.workspace,
       platform: state.snapshot.bindings.platform,
       compaction: {
         enabled: true,
-        // Pi compacts above contextWindow - reserveTokens. Keep the same
-        // 15% headroom within the available input budget as the pre-Harness runtime.
-        reserveTokens: Math.ceil(state.snapshot.pi.model.contextWindow -
-          (state.snapshot.pi.model.contextWindow - state.snapshot.pi.model.maxTokens) * 0.85),
+        // Pi compacts above contextWindow - reserveTokens.
+        reserveTokens: state.snapshot.pi.model.contextWindow -
+          compactionThreshold(state.snapshot.pi.model),
         keepRecentTokens: Math.min(
           20_000,
           Math.floor(state.snapshot.pi.model.contextWindow * 0.15),
@@ -159,24 +184,27 @@ export class HarnessRuntimeConfig {
     }
   }
 
-  /**
-   * 在接受 Submission 前固定本次执行使用的动态上下文和审批模式。
-   *
-   * @remarks
-   * 调用方：Runtime 的准入流程为每个新 Submission 调用，并把 descriptor 与其哈希一起持久化。
-   *
-   * 实现理由：memory、workspace 和 Extension context 可能随时间变化，所以把准入时的 Turn 字段保存在 descriptor 中。
-   * 不要把 pin 推迟到 Turn 启动后，否则已持久化的 Submission 将失去可验证的执行基线。
-   */
-  pin(options: PinPiRuntimeOptions): Promise<PinnedPiRuntime> {
-    return pinPiRuntime(options, this.owner);
-  }
-
 }
 
 export type {
-  PinPiRuntimeOptions,
-  PinnedPiRuntime,
   PreparePiRuntimeOptions,
   PreparedPiRuntime,
-} from "./pinning";
+} from "./prepared-runtime";
+
+/**
+ * Input tokens above which a Turn compacts its history.
+ *
+ * OpenRouter rejects some requests well below a model's advertised window
+ * (seen from about 393k tokens on DeepSeek V4.1 Flash and 520k-630k on GPT-6
+ * Luna), before any provider is chosen. No model waits past this cap, so long
+ * Chats compact instead of failing.
+ */
+export const MAX_COMPACTION_THRESHOLD_TOKENS = 300_000;
+
+/** 15% headroom within the input budget, capped at {@link MAX_COMPACTION_THRESHOLD_TOKENS}. */
+export function compactionThreshold(model: { contextWindow: number; maxTokens: number }): number {
+  return Math.min(
+    Math.floor((model.contextWindow - model.maxTokens) * 0.85),
+    MAX_COMPACTION_THRESHOLD_TOKENS,
+  );
+}

package/src/config/index.ts

@@ -7,7 +7,7 @@ export * from "./assembly-view";
 export * from "./definition";
 export * from "./degradation";
 export * from "./harness-runtime";
-export * from "./pinning";
+export * from "./prepared-runtime";
 export * from "./ports";
 export * from "./profile";
 export * from "./runtime-config";

package/src/config/model-guidance.ts

@@ -0,0 +1,20 @@
+import { getCurrentTools, normalizeContext, type Context, type Tool, type TranscriptContext } from "@earendil-works/pi-ai";
+import type { PiToolCandidate } from "../tools/runtime/contracts";
+
+/** Request-only presentation; Pi remains the source of transcript and active Tool selection. */
+export async function refreshModelGuidance(candidates: readonly PiToolCandidate[], context: Context): Promise<TranscriptContext> {
+  const transcript = normalizeContext(context);
+  const active = new Set(getCurrentTools(transcript.messages).map((tool) => tool.name));
+  const byName = new Map(candidates.map((candidate) => [candidate.tool.name, candidate]));
+  const guidance = new Map(await Promise.all(candidates.filter((candidate) => active.has(candidate.tool.name) && candidate.modelGuidance)
+    .map(async (candidate) => [candidate.tool.name, await candidate.modelGuidance!()] as const)));
+  const messages = transcript.messages.map((message) => message.role !== "system" || !message.toolsAdded ? message : {
+    ...message,
+    toolsAdded: message.toolsAdded.map((tool): Tool => {
+      const candidate = byName.get(tool.name), prompt = guidance.get(tool.name);
+      return { ...tool, ...(candidate?.deferLoading ? { deferLoading: true as const } : {}), ...(prompt ? { description: prompt.description } : {}) };
+    }),
+  });
+  const sections = [...new Set([...guidance.values()].flatMap((value) => value.systemPrompt ? [value.systemPrompt] : []))];
+  return normalizeContext({ messages: sections.length ? [...messages, { role: "system", content: "", sections: { "springbrand.live-services": sections.join("\n\n") }, timestamp: 1 }] : messages });
+}