@theokit/sdk 4.63.3 → 5.0.0-next.1

package/dist/{chunk-25BD2R5G.js → chunk-NCGWJ3HS.js}

@@ -1,39 +1,39 @@
-import { submit, emitRunEvent } from './chunk-A46SWMIF.js';
-import { enqueueSessionWrite, hydrateSession, persistTurnToTranscript, flushSessionWrites, appendSessionMessage, getSessionMessages, discardSession, clearSession } from './chunk-4FFBAUFS.js';
-import { IndexManager } from './chunk-L3MTL4NA.js';
-import { loadHookConfig, warnOnce, currentPersonalityContext, warnPersonalitySwitchInsideFork } from './chunk-K5OJUYSZ.js';
+import { submit, emitRunEvent } from './chunk-K2VMFZQ5.js';
+import { enqueueSessionWrite, hydrateSession, persistTurnToTranscript, flushSessionWrites, appendSessionMessage, getSessionMessages, discardSession, clearSession } from './chunk-AWINL3ZC.js';
+import { IndexManager } from './chunk-2ZLVT7H3.js';
+import { loadHookConfig, warnOnce, currentPersonalityContext, warnPersonalitySwitchInsideFork } from './chunk-IJM7UGS5.js';
 import { extractCodePlugins } from './chunk-2SFBB54R.js';
-import { createOpenAiCompatibleRuntime } from './chunk-UBDMVMBZ.js';
-import { persistActiveMemoryTranscript } from './chunk-XO4SOZN6.js';
-import { resolveMemoryRoot, writeSessionSummary, MEMORY_KINDS, appendFact, readFacts, legacyMemoryJsonPath, memoryMdPath, appendFactToMarkdown } from './chunk-L4BDVXIM.js';
-import { FsSessionStore } from './chunk-BP46RJ5X.js';
-import { discoverProviderPlugins, getConfiguredBaseUrl, httpRequest, isFixtureApiKey, presentProviderCredentialEnvVars, CircuitBreaker, buildDefaultSummarizer, shouldUseRealLocalRuntime, parseSseStream, resolveProviderChain, inferProviderFromApiKey, detectPrimaryProvider, warnProviderPrecedenceOnce, tryFirstEvent, relayStream, renderToolResultContentText } from './chunk-DN2PACRI.js';
+import { createOpenAiCompatibleRuntime } from './chunk-55GB6JYQ.js';
+import { persistActiveMemoryTranscript } from './chunk-OR6XIWLB.js';
+import { writeSessionSummary, resolveMemoryRoot, MEMORY_KINDS, appendFact, readFacts, legacyMemoryJsonPath, memoryMdPath, appendFactToMarkdown } from './chunk-UNK4HNJH.js';
+import { FsSessionStore } from './chunk-AAEZSPTC.js';
+import { discoverProviderPlugins, validateApiKeyShape, getConfiguredBaseUrl, httpRequest, isFixtureApiKey, presentProviderCredentialEnvVars, buildDefaultSummarizer, shouldUseRealLocalRuntime, parseSseStream, CircuitBreaker, resolveRunProvider, mergeExplicitApiKey, resolveProviderChain, abortError, tryFirstEvent, relayStream, renderToolResultContentText } from './chunk-K3NH62DG.js';
 import { resolveChildEnv } from './chunk-HKCKOAIO.js';
-import { DEFAULT_MAX_BYTES_PER_FILE, runDiscovery, truncateWithMarker } from './chunk-SAVIWMZB.js';
-import { readVersionedJson, writeVersionedJson } from './chunk-PUAEFLYK.js';
-import { toJsonSchema } from './chunk-4VPXM6UU.js';
-import { sanitizeToolInput } from './chunk-U54XCYG3.js';
-import { withInheritedSubAgentCredentials, subAgentToolsFromDefinitions } from './chunk-RNB4APBZ.js';
+import { DEFAULT_MAX_BYTES_PER_FILE, runDiscovery, truncateWithMarker } from './chunk-ILGZ2ZZV.js';
+import { readVersionedJson, writeVersionedJson } from './chunk-SVQIW5RJ.js';
+import { toJsonSchema } from './chunk-7I5Z3UBJ.js';
+import { sanitizeToolInput } from './chunk-FJWQP6EE.js';
+import { withInheritedSubAgentCredentials, subAgentToolsFromDefinitions } from './chunk-6WAKKTBO.js';
 import { setAgentFacade } from './chunk-6X6ID4MO.js';
-import { escapeBlockBody, buildSkillsBlock, discoverSkills, stripSkillFrontmatter } from './chunk-O73J46PV.js';
-import { withToolWhitelist, checkToolWhitelist } from './chunk-7AD3ZTZL.js';
-import { validateArtifactPath, PathTraversalError, safePathJoin } from './chunk-HS7AVXTF.js';
-import { insideRoot, atOrInsideRoot } from './chunk-RIAM53CP.js';
-import { mapWithConcurrency } from './chunk-C72AZW7J.js';
-import { expandTilde, defaultBaseDir } from './chunk-UMP6OJIM.js';
-import { withFileLock } from './chunk-3O42QOMJ.js';
+import { escapeBlockBody, buildSkillsBlock, discoverSkills, stripSkillFrontmatter } from './chunk-XDANGA2C.js';
+import { withToolWhitelist, checkToolWhitelist } from './chunk-SAGRF4IB.js';
+import { validateArtifactPath, PathTraversalError, safePathJoin } from './chunk-EH6XD3FY.js';
+import { insideRoot, atOrInsideRoot } from './chunk-UKMBRMGT.js';
+import { mapWithConcurrency } from './chunk-4MMWFSCD.js';
+import { expandTilde, defaultBaseDir } from './chunk-JOFVLOFY.js';
+import { withFileLock } from './chunk-TA3K7SBK.js';
 import { withCwdMutex } from './chunk-Q5EWJPRY.js';
-import { atomicWriteJson } from './chunk-2GUYQR5P.js';
-import { loadSubagents, pluginBundleDirs } from './chunk-LXI4XZEC.js';
-import { getTheokitHome, projectConfigRoots, pluginBundleRoots } from './chunk-UFLD2HEV.js';
-import { readWorkspaceDir, parseSimpleYaml } from './chunk-LXQ6HKPS.js';
-import { resolveEffectiveContextWindow, CONTEXT_WINDOW_FLOOR, CONTEXT_WINDOW_MARGIN } from './chunk-A4JVILQU.js';
+import { sweepStaleAtomicTemps, atomicWriteJson } from './chunk-3JHIFQ4I.js';
+import { loadSubagents, pluginBundleDirs } from './chunk-XCCGNU3D.js';
+import { reportUndeclaredSources, undefinedVariablesIn, getTheokitHome, adapterForConfigPath, projectConfigRoots, pluginBundleRoots } from './chunk-JTZ74HFD.js';
+import { readWorkspaceDir, parseSimpleYaml } from './chunk-JNAA4G4H.js';
+import { resolveEffectiveContextWindow, CONTEXT_WINDOW_FLOOR, CONTEXT_WINDOW_MARGIN } from './chunk-6M2OIS4Y.js';
 import { parseModelId } from './chunk-R7WIIPUR.js';
-import { getProviderProfile } from './chunk-UTSRIDKZ.js';
-import { getCatalogModelInfo, registerBuiltins, getProviderProfile as getProviderProfile$1, registerProvider, isPatchedModelKey } from './chunk-WLQNMXQE.js';
-import { AgentRunError, coerceToKnownAgentRunErrorCode, UnknownAgentError, ConfigurationError, AuthenticationError, AgentDisposedError, UnsupportedRunOperationError, NetworkError, TheokitAgentError } from './chunk-ZZMZWBR6.js';
-import { resolveApiKey, API_KEY_ENV_VAR, redactSecrets } from './chunk-D4CUGAKZ.js';
-import { diag, diagFailure } from './chunk-XEQ3TM66.js';
+import { getProviderProfile } from './chunk-XYFGKVZ7.js';
+import { getCatalogModelInfo, isPatchedModelKey } from './chunk-VWUXIVEI.js';
+import { globalSingleton } from './chunk-AGACYRJ2.js';
+import { AgentRunError, coerceToKnownAgentRunErrorCode, UnknownAgentError, ConfigurationError, AuthenticationError, AgentDisposedError, UnsupportedRunOperationError, NetworkError, TheokitAgentError } from './chunk-ALUN2B4W.js';
+import { diag, resolveApiKey, API_KEY_ENV_VAR, redactSecrets, diagFailure } from './chunk-CZJ6Q7CW.js';
 import { stat, mkdir, readFile, readdir, access, unlink } from 'fs/promises';
 import { randomUUID, createHash } from 'crypto';
 import { join, dirname, resolve, isAbsolute } from 'path';
@@ -149,77 +149,6 @@ var AgentBuilder = class {
   }
 };
 
-// src/internal/auth/api-key-validator.ts
-var FIXTURE_KEY_PREFIX = "theo_test_";
-var LOCAL_RUNTIME_MOCK_KEY = "local";
-var MIN_KEY_LENGTH = 16;
-var KNOWN_PROVIDER_PREFIXES = [
-  { provider: "openai", prefix: "sk-" },
-  { provider: "anthropic", prefix: "sk-ant-" },
-  { provider: "openrouter", prefix: "sk-or-" }
-];
-function validateApiKeyShape(key, options = {}) {
-  const opts = typeof options === "string" ? { provider: options } : options;
-  const tier1 = checkTier1(key);
-  if (tier1.malformed) return tier1;
-  const validKey = key;
-  if (validKey.startsWith(FIXTURE_KEY_PREFIX) || validKey === LOCAL_RUNTIME_MOCK_KEY) {
-    return { malformed: false };
-  }
-  if (opts.strict === false) return { malformed: false };
-  return checkTier2(validKey, opts.provider);
-}
-function checkTier1(key) {
-  if (key === void 0 || key.length === 0) {
-    return { malformed: true, reason: "empty", message: "API key is empty." };
-  }
-  if (key.trim().length === 0) {
-    return {
-      malformed: true,
-      reason: "whitespace_only",
-      message: "API key contains only whitespace."
-    };
-  }
-  if (key.length < 4) {
-    return {
-      malformed: true,
-      reason: "too_short",
-      message: `API key must be at least 4 chars (got ${key.length}).`
-    };
-  }
-  return { malformed: false };
-}
-function checkTier2(key, provider) {
-  if (key.length < MIN_KEY_LENGTH) {
-    return {
-      malformed: true,
-      reason: "too_short",
-      message: `API key must be at least ${MIN_KEY_LENGTH} chars (got ${key.length}).`
-    };
-  }
-  if (/\s/.test(key)) {
-    return {
-      malformed: true,
-      reason: "embedded_whitespace",
-      message: "API key contains embedded whitespace."
-    };
-  }
-  return checkProviderPrefix(key, provider);
-}
-function checkProviderPrefix(key, provider) {
-  if (provider === void 0) return { malformed: false };
-  const hint = KNOWN_PROVIDER_PREFIXES.find((p) => p.provider === provider.toLowerCase());
-  if (hint === void 0) return { malformed: false };
-  if (!key.startsWith(hint.prefix)) {
-    return {
-      malformed: true,
-      reason: "missing_known_prefix",
-      message: `API key for provider "${hint.provider}" expected to start with "${hint.prefix}".`
-    };
-  }
-  return { malformed: false };
-}
-
 // src/internal/runtime/config/default-model.ts
 var DEFAULT_AGENTIC_MODEL_ID = "google/gemini-2.0-flash-001";
 
@@ -228,7 +157,7 @@ async function agentGenerate(agent, agentModel, agentApiKey, agentLocal, input,
   const { output, maxRetries, errorStrategy, ...sendOptions } = options;
   const run = await agent.send(input, sendOptions);
   const result = await run.wait();
-  const { generateObjectImpl, GenerateObjectError } = await import('./generate-object-GUNAUVBX.js');
+  const { generateObjectImpl, GenerateObjectError } = await import('./generate-object-BXV7BZRP.js');
   const answer = structurableAnswerOrThrow(result, GenerateObjectError);
   const { getAgentFacade } = await import('./agent-factory-registry-ZVTABLEY.js');
   const facade = getAgentFacade();
@@ -262,21 +191,21 @@ async function agentGenerate(agent, agentModel, agentApiKey, agentLocal, input,
 function structurableAnswerOrThrow(result, GenerateObjectError) {
   if (result.status === "error") {
     throw new GenerateObjectError(
-      "no_tool_call",
+      "upstream_run_failed",
       `Agent run failed before an answer could be structured: ${result.error?.message ?? "unknown error"} [${result.error?.code ?? "?"}]`,
       result.error
     );
   }
   if (result.status === "cancelled") {
     throw new GenerateObjectError(
-      "no_tool_call",
+      "run_cancelled",
       "Agent run was cancelled before an answer could be structured."
     );
   }
   const answer = result.result;
   if (answer === void 0 || answer.length === 0) {
     throw new GenerateObjectError(
-      "no_tool_call",
+      "no_text_answer",
       "The tool loop finished with no text answer (tool-only completion) \u2014 there is nothing to structure."
     );
   }
@@ -453,6 +382,7 @@ function registryPath(cwd) {
   return join(cwd, REGISTRY_RELATIVE_PATH);
 }
 async function loadRegistry(cwd) {
+  void sweepStaleAtomicTemps(registryPath(cwd)).catch(() => void 0);
   return readVersionedJson({
     path: registryPath(cwd),
     currentVersion: SCHEMA_VERSION,
@@ -917,7 +847,7 @@ async function migrateLegacyJson(cwd, config) {
   return writeMigratedFacts(cwd, jsonPath, facts);
 }
 
-// src/internal/runtime/memory/memory-store.ts
+// src/internal/runtime/memory-glue/memory-store.ts
 var REMEMBER_PATTERN = /^\s*Remember(?:\s+this\s+durable\s+preference)?\s*(?:\((user|feedback|project|reference)\))?\s*:\s*(.+)$/i;
 function isMemoryWritePrompt(message) {
   return REMEMBER_PATTERN.test(message) || message.includes("Remember this durable");
@@ -1813,7 +1743,28 @@ function safeParse(data2) {
 }
 
 // src/internal/cloud-agent/cloud-agent.ts
-var CloudAgent = class {
+var CloudAgent = class _CloudAgent {
+  /**
+   * Operations this runtime does not perform. See {@link SDKAgent.supports} for why asking beats
+   * catching: the members below are present on the type — some REQUIRED — and answering them by
+   * throwing is what makes a caller unable to branch without a try/catch.
+   *
+   * The cloud runtime manages continuation, forking and personality server-side, so these throw `UnsupportedRunOperationError` — except `invalidateCache`, which is a documented no-op and is the more dangerous of the two shapes: it returns as if it worked.
+   */
+  static UNSUPPORTED_OPS = /* @__PURE__ */ new Set([
+    "fork",
+    "invalidateCache",
+    "runToCompletion",
+    "runUntil",
+    "streamToCompletion",
+    "usePersonality"
+  ]);
+  supports(operation) {
+    return !_CloudAgent.UNSUPPORTED_OPS.has(operation);
+  }
+  unsupportedReason(operation) {
+    return this.supports(operation) ? void 0 : `Operation "${operation}" is not available on a cloud agent.`;
+  }
   agentId;
   model;
   /**
@@ -2256,6 +2207,18 @@ var PersonalityStore = class {
 };
 
 // src/internal/plugins/context.ts
+function makeHookDisposer(registrations, hook, handler) {
+  let detached = false;
+  return () => {
+    if (detached) return;
+    detached = true;
+    const current = registrations.hooks.get(hook);
+    if (current === void 0) return;
+    const at = current.indexOf(handler);
+    if (at !== -1) current.splice(at, 1);
+    if (current.length === 0) registrations.hooks.delete(hook);
+  };
+}
 function createPluginContext() {
   const registrations = {
     tools: [],
@@ -2276,11 +2239,12 @@ function createPluginContext() {
       if (typeof handler !== "function") {
         diag(`[theokit-sdk] ignoring non-function handler for hook "${hook}"
 `);
-        return;
+        return () => void 0;
       }
       const existing = registrations.hooks.get(hook) ?? [];
       existing.push(handler);
       registrations.hooks.set(hook, existing);
+      return makeHookDisposer(registrations, hook, handler);
     },
     injectMessage(content, role = "user") {
       registrations.injected.push({ content, role });
@@ -2595,6 +2559,8 @@ function spawnAndCollect(options) {
       settle({ stdout, stderr, exitCode: code, timedOut });
     });
     if (options.stdin !== void 0 && child.stdin !== null) {
+      child.stdin.on("error", () => {
+      });
       child.stdin.end(options.stdin);
     }
   });
@@ -2602,17 +2568,19 @@ function spawnAndCollect(options) {
 
 // src/internal/runtime/hooks/hooks-executor.ts
 var HooksExecutor = class {
-  constructor(cwd) {
+  constructor(cwd, compatSources = []) {
     this.cwd = cwd;
+    this.compatSources = compatSources;
   }
   cwd;
+  compatSources;
   config = {};
   async initialize(settingSourcesIncludeProject) {
     if (!settingSourcesIncludeProject) {
       this.config = {};
       return;
     }
-    this.config = await loadHookConfig(this.cwd);
+    this.config = await loadHookConfig(this.cwd, this.compatSources);
   }
   /** Fire every hook registered for `event` and aggregate the decisions. */
   async run(payload) {
@@ -2647,10 +2615,12 @@ var HooksExecutor = class {
   }
   async executeOne(command, payload) {
     const timeoutMs = command.timeoutMs ?? 3e4;
+    const env = runtimeEnvFor(command.sourcePath, this.cwd);
     const result = await spawnAndCollect({
       command: "sh",
       args: ["-c", command.command],
       cwd: this.cwd,
+      ...Object.keys(env).length > 0 ? { env } : {},
       timeoutMs,
       stdin: JSON.stringify(payload)
     });
@@ -2661,14 +2631,22 @@ var HooksExecutor = class {
       return { decision: "deny", reason: `Hook spawn failed: ${result.spawnError.message}` };
     }
     if (result.exitCode !== 0) {
+      const stderr = result.stderr.trim();
+      const base = stderr.length > 0 ? stderr : `Hook exited with code ${result.exitCode}`;
+      const missing = undefinedVariablesIn(command.command, env);
+      if (missing.length === 0) return { decision: "deny", reason: base };
       return {
         decision: "deny",
-        reason: result.stderr.trim().length > 0 ? result.stderr.trim() : `Hook exited with code ${result.exitCode}`
+        reason: `${base} \u2014 this hook came from ${command.sourcePath ?? "an unrecorded source"} and uses ${missing.map((n) => `$${n}`).join(", ")}, which nothing defines here. A variable this runtime does not supply expands to the empty string, so the error above names a path rather than the cause.`
       };
     }
     return parseDecisionFromStdout(result.stdout);
   }
 };
+function runtimeEnvFor(sourcePath, cwd) {
+  if (sourcePath === void 0) return {};
+  return adapterForConfigPath(sourcePath)?.runtimeEnv(cwd) ?? {};
+}
 function parseDecisionFromStdout(stdout) {
   const trimmed = stdout.trim();
   if (trimmed.length === 0) return { decision: "allow" };
@@ -2687,28 +2665,6 @@ function parseDecisionFromStdout(stdout) {
   return { decision: "allow" };
 }
 
-// src/internal/runtime/memory/memory-path-selector.ts
-var PORT_MEMORY_PATH_ENV_VAR = "THEOKIT_PORT_MEMORY_PATH";
-function shouldUsePortMemoryPath() {
-  const env = globalThis.process?.env;
-  if (env === void 0) return false;
-  const val = env[PORT_MEMORY_PATH_ENV_VAR];
-  return val === "1" || val === "true";
-}
-function resolveMemoryProviderForLoop(consumerSupplied, defaultAdapter, portPathEnabled) {
-  if (consumerSupplied !== void 0) return consumerSupplied;
-  if (portPathEnabled) return defaultAdapter;
-  return void 0;
-}
-function resolveMemoryToolsForLoop(legacyTools, portPathEnabled) {
-  if (portPathEnabled) return void 0;
-  return legacyTools;
-}
-function resolveActiveMemorySummaryForSend(legacySummary, portPathEnabled) {
-  if (portPathEnabled) return void 0;
-  return legacySummary;
-}
-
 // src/internal/runtime/lifecycle/context-budget-event.ts
 function buildContextBudgetEvent(model, resolved) {
   if (resolved.source !== "fallback") return void 0;
@@ -2739,7 +2695,6 @@ async function runPostRunLifecycle(inputs) {
     contextWindow,
     onRunEvent,
     hooksExecutor,
-    memoryGlue,
     memoryProvider
   } = inputs;
   let result;
@@ -2813,9 +2768,6 @@ async function runPostRunLifecycle(inputs) {
       } else {
         await writeSessionSummary(summaryArgs);
       }
-      if (!shouldUsePortMemoryPath()) {
-        void memoryGlue.syncIfReady();
-      }
     } catch (cause) {
       const message = cause instanceof Error ? cause.message : String(cause);
       diag(`[theokit-sdk] session summary write failed (${result.id}): ${message}
@@ -2836,10 +2788,83 @@ async function runPostRunLifecycle(inputs) {
 async function safeConversation(run) {
   try {
     return await run.conversation();
-  } catch {
+  } catch (cause) {
+    const msg = cause instanceof Error ? cause.message : String(cause);
+    diag(`[theokit-sdk] conversation() failed; persisting the user turn only: ${msg}
+`);
     return [];
   }
 }
+var SkillsManager = class {
+  constructor(cwd, _enabled, settingSourcesIncludeProject, skillsDir, inline, compatSources = []) {
+    this.cwd = cwd;
+    this.settingSourcesIncludeProject = settingSourcesIncludeProject;
+    this.skillsDir = skillsDir;
+    this.inline = inline;
+    this.compatSources = compatSources;
+  }
+  cwd;
+  settingSourcesIncludeProject;
+  skillsDir;
+  inline;
+  compatSources;
+  skills = [];
+  async initialize() {
+    if (!this.settingSourcesIncludeProject) {
+      this.skills = this.mergeInline([]);
+      return;
+    }
+    await this.refresh();
+  }
+  async refresh() {
+    const roots = this.skillsDir === void 0 ? [
+      ...projectConfigRoots(this.cwd, this.compatSources).map((root) => join(root, "skills")),
+      ...(await pluginBundleDirs(this.cwd, this.compatSources)).map((b) => join(b, "skills"))
+    ] : [this.skillsDir];
+    const discovered = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const root of roots) {
+      for (const skill of await discoverSkills(root, {
+        onInvalidSkill: (info) => {
+          diag(`[theokit-sdk] skill ${info.name} skipped (${info.code}): ${info.message}
+`);
+        }
+      })) {
+        if (seen.has(skill.name)) continue;
+        seen.add(skill.name);
+        discovered.push(skill);
+      }
+    }
+    this.skills = this.mergeInline(discovered);
+  }
+  /** M22 — merge inline skills over discovered ones; inline wins on a name conflict. */
+  mergeInline(discovered) {
+    if (this.inline === void 0 || this.inline.length === 0) return discovered;
+    const inlineNames = new Set(this.inline.map((s) => s.name));
+    return [...discovered.filter((s) => !inlineNames.has(s.name)), ...this.inline];
+  }
+  list() {
+    return Promise.resolve(this.skills);
+  }
+  /**
+   * SE20 — resolve a skill by name INCLUDING its body. Inline (`createSkill`)
+   * skills carry `instructions` on the object; filesystem skills read the body
+   * from their `source` SKILL.md (frontmatter stripped). `undefined` when no
+   * enabled skill matches (malformed skills were already excluded at discovery).
+   */
+  async get(name) {
+    const skill = this.skills.find((s) => s.name === name);
+    if (skill === void 0) return void 0;
+    const instructions = typeof skill.instructions === "string" ? skill.instructions : stripSkillFrontmatter(await readFile(skill.source, "utf8"));
+    const references = skill.references;
+    return {
+      name: skill.name,
+      description: skill.description,
+      instructions,
+      ...references !== void 0 ? { references } : {}
+    };
+  }
+};
 
 // src/define-tool.ts
 var TOOL_SPLIT_RESOLVER = /* @__PURE__ */ Symbol("theokit.toolSplitResolver");
@@ -2885,7 +2910,7 @@ function defineTool(spec) {
   return tool;
 }
 
-// src/internal/runtime/reasoning/native-reasoning.ts
+// src/internal/runtime/system-prompt/native-reasoning.ts
 var NATIVE_REASONING_PARAM_IDS = /* @__PURE__ */ new Set(["thinking", "reasoning", "reasoning_effort"]);
 var REASONING_PREAMBLE = "Think step by step before answering: use the `think` tool to reason through each step, validate your work, then answer. Reason about magnitude before comparing numbers.";
 function createThinkTool() {
@@ -2918,74 +2943,6 @@ function reasoningActive(reasoning, model) {
   }
   return true;
 }
-var SkillsManager = class {
-  constructor(cwd, _enabled, settingSourcesIncludeProject, skillsDir, inline) {
-    this.cwd = cwd;
-    this.settingSourcesIncludeProject = settingSourcesIncludeProject;
-    this.skillsDir = skillsDir;
-    this.inline = inline;
-  }
-  cwd;
-  settingSourcesIncludeProject;
-  skillsDir;
-  inline;
-  skills = [];
-  async initialize() {
-    if (!this.settingSourcesIncludeProject) {
-      this.skills = this.mergeInline([]);
-      return;
-    }
-    await this.refresh();
-  }
-  async refresh() {
-    const roots = this.skillsDir === void 0 ? [
-      ...projectConfigRoots(this.cwd).map((root) => join(root, "skills")),
-      ...(await pluginBundleDirs(this.cwd)).map((bundle) => join(bundle, "skills"))
-    ] : [this.skillsDir];
-    const discovered = [];
-    const seen = /* @__PURE__ */ new Set();
-    for (const root of roots) {
-      for (const skill of await discoverSkills(root, {
-        onInvalidSkill: (info) => {
-          diag(`[theokit-sdk] skill ${info.name} skipped (${info.code}): ${info.message}
-`);
-        }
-      })) {
-        if (seen.has(skill.name)) continue;
-        seen.add(skill.name);
-        discovered.push(skill);
-      }
-    }
-    this.skills = this.mergeInline(discovered);
-  }
-  /** M22 — merge inline skills over discovered ones; inline wins on a name conflict. */
-  mergeInline(discovered) {
-    if (this.inline === void 0 || this.inline.length === 0) return discovered;
-    const inlineNames = new Set(this.inline.map((s) => s.name));
-    return [...discovered.filter((s) => !inlineNames.has(s.name)), ...this.inline];
-  }
-  list() {
-    return Promise.resolve(this.skills);
-  }
-  /**
-   * SE20 — resolve a skill by name INCLUDING its body. Inline (`createSkill`)
-   * skills carry `instructions` on the object; filesystem skills read the body
-   * from their `source` SKILL.md (frontmatter stripped). `undefined` when no
-   * enabled skill matches (malformed skills were already excluded at discovery).
-   */
-  async get(name) {
-    const skill = this.skills.find((s) => s.name === name);
-    if (skill === void 0) return void 0;
-    const instructions = typeof skill.instructions === "string" ? skill.instructions : stripSkillFrontmatter(await readFile(skill.source, "utf8"));
-    const references = skill.references;
-    return {
-      name: skill.name,
-      description: skill.description,
-      instructions,
-      ...references !== void 0 ? { references } : {}
-    };
-  }
-};
 
 // src/internal/runtime/system-prompt/local-assembly.ts
 async function resolveSendSkills(inputs, userText, memoryFacts) {
@@ -3005,7 +2962,8 @@ async function resolveSendSkills(inputs, userText, memoryFacts) {
     settings.enabled,
     inputs.settingSourcesIncludeProject,
     settings.skillsDir,
-    settings.inline
+    settings.inline,
+    inputs.options.local?.compatSources ?? []
   );
   await manager.initialize();
   return { manager, autoInject: settings.autoInject ?? true };
@@ -3021,7 +2979,14 @@ async function buildSystemPromptContext(inputs, userText, memoryFacts, manager =
     memory: memoryFacts.map((fact) => ({ text: fact.text }))
   };
 }
-async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary, contextPaths) {
+async function buildAssemblyContext({
+  inputs,
+  userText,
+  baseSystemPrompt,
+  memoryFacts,
+  activeMemorySummary,
+  contextPaths
+}) {
   const resolved = await resolveSendSkills(inputs, userText, memoryFacts);
   const baseCtx = await buildSystemPromptContext(inputs, userText, memoryFacts, resolved.manager);
   const assemblyCtx = {
@@ -3044,16 +3009,9 @@ async function buildAssemblyContext(inputs, userText, baseSystemPrompt, memoryFa
   }
   return assemblyCtx;
 }
-async function assembleSystemPromptForSend(inputs, userText, baseSystemPrompt, memoryFacts, activeMemorySummary, contextPaths) {
-  const ctx = await buildAssemblyContext(
-    inputs,
-    userText,
-    baseSystemPrompt,
-    memoryFacts,
-    activeMemorySummary,
-    contextPaths
-  );
-  return inputs.systemPromptPipeline.assemble(ctx);
+async function assembleSystemPromptForSend(request) {
+  const ctx = await buildAssemblyContext(request);
+  return request.inputs.systemPromptPipeline.assemble(ctx);
 }
 
 // src/internal/runtime/system-prompt/safe-call.ts
@@ -3459,15 +3417,16 @@ var arizeAdapter = {
   displayName: "Arize Phoenix",
   detect: () => safeRequire("arize-phoenix-otel") !== void 0,
   register: () => {
-    if (registeredHere) return;
+    if (registeredHere) return "instrumented";
     const arize = safeRequire("arize-phoenix-otel");
     const otel = safeRequire("@opentelemetry/api");
-    if (arize === void 0 || otel === void 0) return;
+    if (arize === void 0 || otel === void 0) return "not-wired";
     const provider = otel.trace.getTracerProvider();
-    if (provider.addSpanProcessor === void 0) return;
+    if (provider.addSpanProcessor === void 0) return "not-wired";
     const processor = new arize.PhoenixSpanProcessor();
     provider.addSpanProcessor(processor);
     registeredHere = true;
+    return "instrumented";
   }
 };
 
@@ -3478,10 +3437,11 @@ var braintrustAdapter = {
   displayName: "Braintrust",
   detect: () => safeRequire("braintrust") !== void 0,
   register: () => {
-    if (registeredHere2) return;
-    const bt = safeRequire("braintrust");
-    if (bt === void 0) return;
+    if (registeredHere2) return "vendor-auto-instruments";
+    const mod = safeRequire("braintrust");
+    if (mod === void 0) return "not-wired";
     registeredHere2 = true;
+    return "vendor-auto-instruments";
   }
 };
 
@@ -3492,11 +3452,12 @@ var datadogAdapter = {
   displayName: "Datadog",
   detect: () => safeRequire("dd-trace") !== void 0,
   register: () => {
-    if (registeredHere3) return;
+    if (registeredHere3) return "instrumented";
     const dd = safeRequire("dd-trace");
-    if (dd === void 0) return;
+    if (dd === void 0) return "not-wired";
     dd.init({ logInjection: true });
     registeredHere3 = true;
+    return "instrumented";
   }
 };
 
@@ -3507,32 +3468,33 @@ var langfuseAdapter = {
   displayName: "Langfuse",
   detect: () => safeRequire("@langfuse/node") !== void 0,
   register: () => {
-    if (registeredHere4) return;
+    if (registeredHere4) return "instrumented";
     const lf = safeRequire("@langfuse/node");
     const otel = safeRequire("@opentelemetry/api");
-    if (lf === void 0 || otel === void 0) return;
+    if (lf === void 0 || otel === void 0) return "not-wired";
     const provider = otel.trace.getTracerProvider();
     if (provider.addSpanProcessor === void 0) {
-      return;
+      return "not-wired";
     }
     const existing = provider.getActiveSpanProcessor?.();
     if (typeof existing === "object" && existing !== null) {
       const ctor = existing.constructor?.name ?? "";
       if (ctor.toLowerCase().includes("langfuse")) {
         registeredHere4 = true;
-        return;
+        return "instrumented";
       }
     }
     if (lf.LangfuseSpanProcessor === void 0) {
       diag(
         "[theokit-sdk] @langfuse/node detected but LangfuseSpanProcessor not found (v2?). Use Langfuse v3+ for auto-instrumentation.\n"
       );
-      return;
+      return "not-wired";
     }
     const client = new lf.Langfuse();
     const processor = new lf.LangfuseSpanProcessor({ langfuse: client });
     provider.addSpanProcessor(processor);
     registeredHere4 = true;
+    return "instrumented";
   }
 };
 
@@ -3543,10 +3505,11 @@ var langsmithAdapter = {
   displayName: "LangSmith",
   detect: () => safeRequire("langsmith") !== void 0,
   register: () => {
-    if (registeredHere5) return;
-    const ls = safeRequire("langsmith");
-    if (ls === void 0) return;
+    if (registeredHere5) return "vendor-auto-instruments";
+    const mod = safeRequire("langsmith");
+    if (mod === void 0) return "not-wired";
     registeredHere5 = true;
+    return "vendor-auto-instruments";
   }
 };
 
@@ -3560,19 +3523,19 @@ var posthogAdapter = {
   displayName: "PostHog",
   detect: () => safeRequire("posthog-node") !== void 0,
   register: () => {
-    if (registeredHere6) return;
+    if (registeredHere6) return "instrumented";
     const ph = safeRequire("posthog-node");
     const otel = safeRequire("@opentelemetry/api");
-    if (ph === void 0 || otel === void 0) return;
+    if (ph === void 0 || otel === void 0) return "not-wired";
     const key = presentEnv(process.env.POSTHOG_API_KEY) ?? presentEnv(process.env.POSTHOG_PROJECT_API_KEY);
     if (typeof key !== "string" || key.length === 0) {
-      return;
+      return "not-wired";
     }
     const client = new ph.PostHog(key, {
       host: presentEnv(process.env.POSTHOG_HOST) ?? "https://us.i.posthog.com"
     });
     const provider = otel.trace.getTracerProvider();
-    if (provider.addSpanProcessor === void 0) return;
+    if (provider.addSpanProcessor === void 0) return "not-wired";
     const processor = {
       onStart: () => {
       },
@@ -3601,6 +3564,7 @@ var posthogAdapter = {
     };
     provider.addSpanProcessor(processor);
     registeredHere6 = true;
+    return "instrumented";
   }
 };
 
@@ -3611,11 +3575,11 @@ var sentryAdapter = {
   displayName: "Sentry",
   detect: () => safeRequire("@sentry/node") !== void 0,
   register: () => {
-    if (registeredHere7) return;
+    if (registeredHere7) return "instrumented";
     const sentry = safeRequire("@sentry/node");
-    if (sentry === void 0) return;
+    if (sentry === void 0) return "not-wired";
     if (typeof sentry.addEventProcessor !== "function") {
-      return;
+      return "not-wired";
     }
     sentry.addEventProcessor((event) => {
       const otel = safeRequire("@opentelemetry/api");
@@ -3631,10 +3595,16 @@ var sentryAdapter = {
       return event;
     });
     registeredHere7 = true;
+    return "instrumented";
   }
 };
 
 // src/internal/telemetry/adapter-registry.ts
+var WIRING_PROSE = {
+  instrumented: "auto-instrumented",
+  "vendor-auto-instruments": "loaded; the vendor instruments itself from its env var",
+  "not-wired": "detected but nothing was wired"
+};
 var ALL_ADAPTERS = [
   langfuseAdapter,
   sentryAdapter,
@@ -3644,7 +3614,7 @@ var ALL_ADAPTERS = [
   arizeAdapter,
   braintrustAdapter
 ];
-var registered = /* @__PURE__ */ new Set();
+var registered = /* @__PURE__ */ new Map();
 function tryAutoRegisterAdapters(settings) {
   if (settings?.enabled !== true) return;
   if (settings.autoDetect === false) return;
@@ -3653,18 +3623,21 @@ function tryAutoRegisterAdapters(settings) {
     if (registered.has(adapter.moduleName)) continue;
     if (disabled.has(adapter.displayName.toLowerCase())) continue;
     if (!adapter.detect()) continue;
-    try {
-      adapter.register();
-      registered.add(adapter.moduleName);
-      diag(`[theokit-sdk] telemetry: ${adapter.displayName} auto-instrumented.
+    registerOne(adapter);
+  }
+}
+function registerOne(adapter) {
+  try {
+    const wiring = adapter.register();
+    registered.set(adapter.moduleName, wiring);
+    diag(`[theokit-sdk] telemetry: ${adapter.displayName} ${WIRING_PROSE[wiring]}.
 `);
-    } catch (cause) {
-      const message = cause instanceof Error ? cause.message : String(cause);
-      diag(
-        `[theokit-sdk] telemetry: ${adapter.displayName} detected but failed to register: ${message}
+  } catch (cause) {
+    const message = cause instanceof Error ? cause.message : String(cause);
+    diag(
+      `[theokit-sdk] telemetry: ${adapter.displayName} detected but failed to register: ${message}
 `
-      );
-    }
+    );
   }
 }
 
@@ -4149,7 +4122,10 @@ async function loadContextConfig(cwd) {
   if (!existsSync(jsonPath)) return { sources: [] };
   warnOnce(
     "context-json-deprecated",
-    "[theokit-sdk] .theokit/context.json is deprecated; migrate to .theokit/context/<name>.md via theokit-migrate-config"
+    // Names no command: `theokit-migrate-config` was unpublished with the `bin` entry, and a warning
+    // that tells you to run something the package does not ship is worse than one that tells you
+    // what the target looks like.
+    "[theokit-sdk] .theokit/context.json is deprecated; move each entry to its own file under .theokit/context/<name>.md"
   );
   let raw;
   try {
@@ -4258,20 +4234,22 @@ var PluginFrontmatterSchema = z.object({
   entry: z.string().min(1).optional()
 });
 
-// src/internal/runtime/plugins/plugins-manager.ts
+// src/internal/runtime/plugin-loader/plugins-manager.ts
 var PluginsManager = class {
-  constructor(cwd, enabled, settingSourcesIncludePlugins, cloud, localPaths) {
+  constructor(cwd, enabled, settingSourcesIncludePlugins, cloud, localPaths, compatSources = []) {
     this.cwd = cwd;
     this.enabled = enabled;
     this.settingSourcesIncludePlugins = settingSourcesIncludePlugins;
     this.cloud = cloud;
     this.localPaths = localPaths;
+    this.compatSources = compatSources;
   }
   cwd;
   enabled;
   settingSourcesIncludePlugins;
   cloud;
   localPaths;
+  compatSources;
   plugins = [];
   async initialize() {
     this.assertCloudRules();
@@ -4283,7 +4261,7 @@ var PluginsManager = class {
   }
   async refresh() {
     this.plugins = [];
-    for (const pluginsRoot of pluginBundleRoots(this.cwd)) {
+    for (const pluginsRoot of pluginBundleRoots(this.cwd, this.compatSources)) {
       await this.refreshRoot(pluginsRoot);
     }
   }
@@ -4313,7 +4291,8 @@ var PluginsManager = class {
       if (!existsSync(mdPath) && existsSync(jsonPath)) {
         warnOnce(
           "plugin-json-deprecated",
-          "[theokit-sdk] plugin.json manifests are deprecated; migrate to PLUGIN.md via theokit-migrate-config"
+          // Same reason as the context.json warning: the CLI it used to name is no longer published.
+          "[theokit-sdk] plugin.json manifests are deprecated; replace each with a PLUGIN.md"
         );
       }
       if (this.enabled === void 0 || this.enabled.includes(metadata.name)) {
@@ -4450,58 +4429,96 @@ function registerLocalAgent(args) {
     status: "finished"
   });
 }
+function buildContext(args, out) {
+  if (args.options.context === void 0) return;
+  out.context = new FileContextManager(
+    args.workspaceCwd,
+    args.options.context,
+    args.settingSourcesIncludeProject
+  );
+}
+function buildProviders(args, out) {
+  const providerCount = (args.options.providers?.routes?.length ?? 0) + enabledPluginNames(args.options.plugins).length;
+  if (providerCount === 0 && args.options.providers === void 0) return;
+  out.providers = new ProvidersManagerImpl(
+    normalizeModel(args.options.model),
+    args.options.providers,
+    args.options.plugins
+  );
+}
+function buildSkills(args, out) {
+  if (args.options.skills === void 0 && !args.settingSourcesIncludeProject) return;
+  const staticSkills = typeof args.options.skills === "function" ? void 0 : args.options.skills;
+  out.skillsManager = new SkillsManager(
+    args.workspaceCwd,
+    staticSkills?.enabled,
+    args.settingSourcesIncludeProject,
+    // M22 — custom skills directory + inline (code-defined) skills.
+    staticSkills?.skillsDir,
+    staticSkills?.inline,
+    // #524 — the same declaration the per-send manager reads. Omitting it here would make
+    // `agent.skills` disagree with the system prompt about which skills exist.
+    args.options.local?.compatSources ?? []
+  );
+  const localSkills = out.skillsManager;
+  out.skills = {
+    // Project to the public shape (name + description only). Inline skills carry
+    // their body + references on the object; `list()` must never leak them —
+    // the body is reachable exclusively through `get()`.
+    list: async () => (await localSkills.list()).map((s) => ({ name: s.name, description: s.description })),
+    get: (name) => localSkills.get(name)
+  };
+}
+function buildPlugins(args, out) {
+  if (args.options.plugins === void 0 && !args.settingSourcesIncludePlugins) return;
+  out.pluginsManager = new PluginsManager(
+    args.workspaceCwd,
+    // The array (code-`Plugin`) form has no named-enable list; `undefined`
+    // here preserves "no filter / load all file-discovered plugins".
+    asPluginsSettings(args.options.plugins)?.enabled,
+    args.settingSourcesIncludePlugins,
+    false,
+    void 0,
+    args.options.local?.compatSources ?? []
+  );
+  const localPlugins = out.pluginsManager;
+  out.plugins = { list: () => localPlugins.list() };
+}
 function bootstrapSubmanagers(args) {
   const out = {};
-  if (args.options.context !== void 0) {
-    out.context = new FileContextManager(
-      args.workspaceCwd,
-      args.options.context,
-      args.settingSourcesIncludeProject
-    );
-  }
-  const providerCount = (args.options.providers?.routes?.length ?? 0) + enabledPluginNames(args.options.plugins).length;
-  if (providerCount > 0 || args.options.providers !== void 0) {
-    out.providers = new ProvidersManagerImpl(
-      normalizeModel(args.options.model),
-      args.options.providers,
-      args.options.plugins
-    );
-  }
-  if (args.options.skills !== void 0 || args.settingSourcesIncludeProject) {
-    const staticSkills = typeof args.options.skills === "function" ? void 0 : args.options.skills;
-    out.skillsManager = new SkillsManager(
-      args.workspaceCwd,
-      staticSkills?.enabled,
-      args.settingSourcesIncludeProject,
-      // M22 — custom skills directory + inline (code-defined) skills.
-      staticSkills?.skillsDir,
-      staticSkills?.inline
-    );
-    const localSkills = out.skillsManager;
-    out.skills = {
-      // Project to the public shape (name + description only). Inline skills carry
-      // their body + references on the object; `list()` must never leak them —
-      // the body is reachable exclusively through `get()`.
-      list: async () => (await localSkills.list()).map((s) => ({ name: s.name, description: s.description })),
-      get: (name) => localSkills.get(name)
-    };
-  }
-  if (args.options.plugins !== void 0 || args.settingSourcesIncludePlugins) {
-    out.pluginsManager = new PluginsManager(
-      args.workspaceCwd,
-      // The array (code-`Plugin`) form has no named-enable list; `undefined`
-      // here preserves "no filter / load all file-discovered plugins".
-      asPluginsSettings(args.options.plugins)?.enabled,
-      args.settingSourcesIncludePlugins,
-      false,
-      void 0
-    );
-    const localPlugins = out.pluginsManager;
-    out.plugins = { list: () => localPlugins.list() };
-  }
+  buildContext(args, out);
+  buildProviders(args, out);
+  buildSkills(args, out);
+  buildPlugins(args, out);
   return out;
 }
 
+// src/internal/local-agent/local-agent-capabilities.ts
+var UNSUPPORTED_OPS = /* @__PURE__ */ new Set(["downloadArtifact", "listArtifacts"]);
+function localAgentSupports(operation) {
+  return !UNSUPPORTED_OPS.has(operation);
+}
+function localAgentUnsupportedReason(operation) {
+  return localAgentSupports(operation) ? void 0 : `Operation "${operation}" is not available on a local agent.`;
+}
+function localAgentListArtifacts() {
+  return Promise.resolve([]);
+}
+function localAgentDownloadArtifact() {
+  return Promise.reject(
+    new UnsupportedRunOperationError(
+      "Artifacts are not supported for local agents",
+      "downloadArtifact"
+    )
+  );
+}
+var localAgentCapabilities = {
+  supports: localAgentSupports,
+  unsupportedReason: localAgentUnsupportedReason,
+  listArtifacts: localAgentListArtifacts,
+  downloadArtifact: localAgentDownloadArtifact
+};
+
 // src/internal/runtime/registry/run-registry.ts
 var runs = /* @__PURE__ */ new Map();
 var runsByAgent = /* @__PURE__ */ new Map();
@@ -4811,6 +4828,44 @@ var UsageAccumulator = class {
   }
 };
 
+// src/internal/agent-loop/replay-messages.ts
+function replayMessages(prior) {
+  return prior.flatMap(replayTurn);
+}
+function replayTurn(msg) {
+  if (msg.parts === void 0 || msg.parts.length === 0) {
+    return [{ role: msg.role, content: [{ type: "text", text: msg.text }] }];
+  }
+  const { own, results } = splitParts(msg.parts);
+  const out = [];
+  if (own.length > 0) out.push({ role: msg.role, content: own });
+  if (results.length > 0) out.push({ role: "user", content: results });
+  return out;
+}
+function splitParts(parts) {
+  const own = [];
+  const results = [];
+  for (const part of parts) {
+    if (part.type === "tool_result") {
+      results.push(toToolResult(part));
+      continue;
+    }
+    if (part.type === "text" && part.text.length === 0) continue;
+    own.push({ ...part });
+  }
+  return { own, results };
+}
+function toToolResult(part) {
+  return {
+    type: "tool_result",
+    toolUseId: part.toolUseId,
+    // `SessionMessagePart` holds the blocks readonly and `LlmToolResultPart` takes a mutable array:
+    // same elements, different variance, so the copy is the whole conversion.
+    content: typeof part.content === "string" ? part.content : [...part.content],
+    ...part.isError === void 0 ? {} : { isError: part.isError }
+  };
+}
+
 // src/internal/agent-loop/live-events.ts
 var LiveEventLog = class extends Array {
   /**
@@ -4899,10 +4954,7 @@ function buildUserContent(text, images) {
   return content;
 }
 function buildAgentRef(inputs) {
-  return {
-    agentId: inputs.agentId,
-    model: inputs.model
-  };
+  return { agentId: inputs.agentId, model: inputs.model };
 }
 async function initLoopContext(inputs) {
   let memoryProviderHandle;
@@ -4911,7 +4963,8 @@ async function initLoopContext(inputs) {
       memoryProviderHandle = await inputs.memoryProvider.init({
         cwd: process.cwd()
       });
-    } catch {
+    } catch (cause) {
+      reportMemoryDegraded("init", cause, inputs.runEventSink);
       memoryProviderHandle = void 0;
     }
   }
@@ -4940,7 +4993,8 @@ async function initLoopContext(inputs) {
     let providerTools = [];
     try {
       providerTools = inputs.memoryProvider.buildTools(memoryProviderHandle, buildAgentRef(inputs));
-    } catch {
+    } catch (cause) {
+      reportMemoryDegraded("buildTools", cause, inputs.runEventSink);
       providerTools = [];
     }
     for (const providerTool of providerTools) {
@@ -4962,10 +5016,7 @@ async function initLoopContext(inputs) {
     buildUserEvent(inputs)
   ]);
   if (inputs.onLoopEvent !== void 0) events.subscribe(inputs.onLoopEvent);
-  const priorMessages = (inputs.priorMessages ?? []).map((msg) => ({
-    role: msg.role,
-    content: [{ type: "text", text: msg.text }]
-  }));
+  const priorMessages = replayMessages(inputs.priorMessages ?? []);
   let memorySystemPromptAdditions;
   if (inputs.memoryProvider !== void 0 && memoryProviderHandle !== void 0) {
     try {
@@ -4980,7 +5031,8 @@ async function initLoopContext(inputs) {
       if (passResult.systemPromptAdditions !== void 0 && passResult.systemPromptAdditions.length > 0) {
         memorySystemPromptAdditions = passResult.systemPromptAdditions;
       }
-    } catch {
+    } catch (cause) {
+      reportMemoryDegraded("activePass", cause, inputs.runEventSink);
       memorySystemPromptAdditions = void 0;
     }
   }
@@ -5002,6 +5054,12 @@ async function initLoopContext(inputs) {
     ...memorySystemPromptAdditions !== void 0 ? { memorySystemPromptAdditions } : {}
   };
 }
+function reportMemoryDegraded(stage, cause, sink) {
+  const message = cause instanceof Error ? cause.message : String(cause);
+  diag(`[theokit-sdk] memory ${stage} failed \u2014 continuing without it: ${message}
+`);
+  emitRunEvent(sink, { type: "memory_degraded", stage, message });
+}
 async function safeListTools(client, serverName, sink) {
   try {
     const listed = await client.listTools();
@@ -5055,1215 +5113,1265 @@ async function collectTools(mcp, withheld, sink) {
 function sanitize(name) {
   return name.replace(/[^a-zA-Z0-9-]+/g, "_").replace(/^[_-]+|[_-]+$/g, "");
 }
-var KEY_PREFIX = "theokit-";
-var KEY_HEX_LENGTH = 32;
-function derivePromptCacheKey(sessionId) {
-  if (sessionId === void 0 || sessionId.trim().length === 0) return void 0;
-  const digest = createHash("sha256").update(sessionId, "utf8").digest("hex");
-  return `${KEY_PREFIX}${digest.slice(0, KEY_HEX_LENGTH)}`;
-}
-
-// src/internal/tool-dispatch/strip-think.ts
-var THINK_PATTERN = /<think>[\s\S]*?<\/think>\s*/g;
-function stripThinkBlocks(content) {
-  const matches = [...content.matchAll(THINK_PATTERN)];
-  const thinking = matches.length > 0 ? matches.map((m) => m[0]).join("\n").replace(/<\/?think>/g, "").trim() : null;
-  const visible = content.replace(THINK_PATTERN, "").trim();
-  return { visible, thinking };
-}
-
-// src/internal/agent-loop/loop-llm-stream.ts
-function resolveSystemPromptWithMemoryAdditions(systemPrompt, additions) {
-  if (additions === void 0 || additions.length === 0) return systemPrompt;
-  if (systemPrompt === void 0 || systemPrompt.length === 0) return additions;
-  return `${systemPrompt}
-
-${additions}`;
-}
-function toLlmTool(tool) {
-  return { name: tool.name, description: tool.description, inputSchema: tool.inputSchema };
-}
-function reasoningEffortFromParams(params) {
-  const thinking = params?.find((p) => p.id === "thinking");
-  return thinking !== void 0 && thinking.value.length > 0 ? thinking.value : void 0;
-}
-function emitLlmMetrics(inputs, result, startAt) {
-  inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.LLM_CALL_DURATION_MS, Date.now() - startAt, {
-    provider: inputs.llm.name
-  });
-  if (result.inputTokens === void 0 && result.outputTokens === void 0) {
-    inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.LLM_USAGE_MISSING, 1, {
-      provider: inputs.llm.name
-    });
-    diag(
-      `[theokit-sdk] llm usage missing from ${inputs.llm.name} finish \u2014 budget may undercount
-`
-    );
-    return;
-  }
-  inputs.telemetry?.recordHistogram(
-    HISTOGRAM_NAMES.LLM_TOKENS,
-    (result.inputTokens ?? 0) + (result.outputTokens ?? 0),
-    { provider: inputs.llm.name }
-  );
-}
-async function streamLlmTurn(inputs, ctx) {
-  const llmSpan = inputs.telemetry?.startChildSpan(ctx.sendSpan, "llm.call", {
-    "model.id": inputs.model.id ?? "auto",
-    provider: inputs.llm.name
-  });
-  const startAt = Date.now();
-  const signal = inputs.signal ?? new AbortController().signal;
-  const generator = inputs.llm.stream(
-    {
-      model: inputs.model.id ?? "auto",
-      ...(() => {
-        const effective = resolveSystemPromptWithMemoryAdditions(
-          inputs.systemPrompt,
-          ctx.memorySystemPromptAdditions
-        );
-        return effective !== void 0 ? { system: effective } : {};
-      })(),
-      // issue #47: forward the reasoning effort from ModelSelection.params (the `thinking` param)
-      // so the provider produces reasoning. Absent param ⇒ no `reasoning` field (bare request).
-      ...(() => {
-        const effort = reasoningEffortFromParams(inputs.model.params);
-        return effort !== void 0 ? { reasoning: { effort } } : {};
-      })(),
-      // Step-cap force-close: forward the per-run tool gate (`"none"` on a ceiling round forces a
-      // text close even though tools are advertised). Absent ⇒ provider default (auto).
-      ...inputs.toolChoice !== void 0 ? { toolChoice: inputs.toolChoice } : {},
-      // usetheokit/theokit-sdk#383 — the prompt-cache key, derived HERE and from `inputs.agentId`
-      // because this is the one place that sees the session identity on every round. `agentId` is
-      // the run's session identity (`Agent.getOrCreate(sessionId)`), so the derived key is identical
-      // on round 1 and round 12 of a turn, identical on turn 2 of the same session, and different
-      // for a different session. Deriving it per round from a stable input is what makes it a cache
-      // key; minting one anywhere that runs more than once per session would not be.
-      ...(() => {
-        const key = derivePromptCacheKey(inputs.agentId);
-        return key !== void 0 ? { promptCacheKey: key } : {};
-      })(),
-      messages: ctx.messages,
-      tools: ctx.tools.map(toLlmTool)
-    },
-    signal
-  );
-  const collected = await collectLlmEvents(generator, inputs, ctx);
-  if (collected.errored || collected.finishValue === void 0) {
-    llmSpan?.setAttribute("stopReason", "error");
-    llmSpan?.end();
-    return {
-      text: collected.accumulatedText,
-      toolCalls: [],
-      stopReason: "error",
-      errored: true
-    };
-  }
-  const result = collected.finishValue.value;
-  llmSpan?.setAttributes({
-    stopReason: result.stopReason,
-    inputTokens: result.inputTokens ?? 0,
-    outputTokens: result.outputTokens ?? 0
-  });
-  emitLlmMetrics(inputs, result, startAt);
-  llmSpan?.end();
-  const stripped = stripThinkBlocks(collected.accumulatedText);
-  const thinking = result.thinking ?? collected.thinking;
-  return {
-    text: stripped.visible,
-    toolCalls: result.toolCalls,
-    stopReason: result.stopReason,
-    errored: false,
-    inputTokens: result.inputTokens,
-    outputTokens: result.outputTokens,
-    cacheReadTokens: result.cacheReadTokens,
-    cacheWriteTokens: result.cacheWriteTokens,
-    reasoningTokens: result.reasoningTokens,
-    ...thinking !== void 0 ? { thinking } : {}
-  };
-}
-async function collectLlmEvents(generator, inputs, ctx) {
-  let errored = false;
-  let finishValue;
-  let thinking;
-  const partial = { text: "" };
-  try {
-    const result = await runCollectorLoop(generator, inputs, ctx, partial);
-    errored = result.errored;
-    finishValue = result.finishValue;
-    thinking = result.thinking;
-  } catch (cause) {
-    if (inputs.signal?.aborted === true) {
-      ctx.finalText = "[aborted]";
-      ctx.events.push(buildAssistantEvent(inputs, "[aborted]"));
-    } else {
-      registerLoopError(ctx, cause);
-      ctx.finalText = partial.text;
-      if (partial.text !== "") ctx.events.push(buildAssistantEvent(inputs, partial.text));
-    }
-    errored = true;
-  }
-  const accumulatedText = partial.text;
-  return {
-    accumulatedText,
-    errored,
-    finishValue,
-    ...thinking !== void 0 ? { thinking } : {}
-  };
-}
-function registerLoopError(ctx, cause) {
-  if (ctx.error !== void 0) return;
-  const rawMessage = cause?.message;
-  const message = typeof rawMessage === "string" ? rawMessage : cause instanceof Error ? cause.message : String(cause);
-  const metaCode = cause?.metadata?.code;
-  const rawCode = cause?.code;
-  const code = typeof metaCode === "string" ? metaCode : typeof rawCode === "string" ? rawCode : void 0;
-  ctx.error = code !== void 0 ? { message, code, cause } : { message, cause };
-}
-async function consumeStreamEvent(inputs, reasoning, event) {
-  if (event.type === "text_delta") {
-    const text = event.text ?? "";
-    await emitTextDeltaCallback(inputs, text);
-    return text;
-  }
-  if (event.type === "reasoning_delta") {
-    await consumeReasoningDelta(inputs, reasoning, {
-      text: event.text ?? "",
-      ...event.signature !== void 0 ? { signature: event.signature } : {}
-    });
-  }
-  return "";
-}
-async function runCollectorLoop(generator, inputs, ctx, partial) {
-  const reasoning = { text: "", startedAt: void 0, signature: void 0 };
-  let errored = false;
-  let finishValue;
-  let thinking;
-  try {
-    while (true) {
-      const next = await generator.next();
-      if (next.done === true) {
-        finishValue = next;
-        break;
-      }
-      if (next.value.type === "error") {
-        registerLoopError(ctx, next.value);
-        ctx.finalText = partial.text;
-        errored = true;
-        break;
-      }
-      partial.text += await consumeStreamEvent(inputs, reasoning, next.value);
-    }
-  } finally {
-    thinking = await finalizeReasoning(inputs, ctx, reasoning);
-  }
-  return { errored, finishValue, ...thinking !== void 0 ? { thinking } : {} };
-}
-async function consumeReasoningDelta(inputs, reasoning, delta) {
-  if (delta.signature !== void 0) reasoning.signature = delta.signature;
-  await accumulateReasoning(inputs, reasoning, delta.text);
-}
-async function accumulateReasoning(inputs, reasoning, text) {
-  if (reasoning.startedAt === void 0) reasoning.startedAt = Date.now();
-  reasoning.text += text;
-  await emitReasoningDeltaCallback(inputs, text);
-}
-async function finalizeReasoning(inputs, ctx, reasoning) {
-  if (reasoning.text.length === 0) return void 0;
-  const thinkingDurationMs = reasoning.startedAt === void 0 ? 0 : Date.now() - reasoning.startedAt;
-  ctx.events.push(
-    buildThinkingEvent(inputs, reasoning.text, thinkingDurationMs, reasoning.signature)
-  );
-  await emitThinkingCompletedCallback(inputs, thinkingDurationMs);
-  return {
-    type: "thinking",
-    text: reasoning.text,
-    ...reasoning.signature !== void 0 ? { signature: reasoning.signature } : {}
-  };
-}
-async function emitTextDeltaCallback(inputs, text) {
-  if (inputs.onDelta === void 0) return;
-  const cb = inputs.onDelta;
-  await safeCall(
-    () => cb({ update: { type: "text-delta", text } }),
-    void 0,
-    "SendOptions.onDelta"
-  );
-}
-async function emitReasoningDeltaCallback(inputs, text) {
-  if (inputs.onDelta === void 0) return;
-  const cb = inputs.onDelta;
-  await safeCall(
-    () => cb({ update: { type: "thinking-delta", text } }),
-    void 0,
-    "SendOptions.onDelta"
-  );
-}
-async function emitThinkingCompletedCallback(inputs, thinkingDurationMs) {
-  if (inputs.onDelta === void 0) return;
-  const cb = inputs.onDelta;
-  await safeCall(
-    () => cb({ update: { type: "thinking-completed", thinkingDurationMs } }),
-    void 0,
-    "SendOptions.onDelta"
-  );
-}
-
-// src/internal/agent-loop/loop-thinking-steps.ts
-function thinkingStep(thinking) {
-  return {
-    type: "thinkingMessage",
-    message: {
-      text: thinking.text,
-      ...thinking.signature !== void 0 ? { signature: thinking.signature } : {}
-    }
-  };
-}
-function recordThinkingOnSilentToolRound(ctx, text, thinking) {
-  if (text.length > 0 || thinking === void 0) return;
-  ctx.conversation.push({
-    type: "agentConversationTurn",
-    turn: { steps: [thinkingStep(thinking)] }
-  });
-}
-
-// src/internal/tool-dispatch/repair-middleware.ts
-var DECIMAL_RE = /^-?\d+(\.\d+)?$/;
-function repairToolCall(raw, registry) {
-  const repairs = [];
-  let call = { ...raw };
-  if (!registry.has(call.name)) {
-    const lower = call.name.toLowerCase();
-    let match;
-    for (const key of registry.keys()) {
-      if (key.toLowerCase() === lower) {
-        match = key;
-        break;
-      }
-    }
-    if (match !== void 0) {
-      repairs.push(`name: "${call.name}" \u2192 "${match}"`);
-      call = { ...call, name: match };
-    }
-  }
-  if (typeof call.args === "string") {
-    try {
-      const parsed = JSON.parse(call.args);
-      call = { ...call, args: parsed };
-      repairs.push("args: parsed from string");
-    } catch {
-    }
-  }
-  const tool = registry.get(call.name);
-  if (tool !== void 0 && typeof call.args === "object" && call.args !== null && !Array.isArray(call.args)) {
-    const coerced = coerceArgsToSchema(call.args, tool.inputSchema);
-    if (coerced.changed.length > 0) {
-      call = { ...call, args: coerced.value };
-      repairs.push(...coerced.changed);
-    }
-  }
-  return { call, repairs };
-}
-function coerceArgsToSchema(args, schema) {
-  const changed = [];
-  const out = { ...args };
-  const properties = schema.properties;
-  if (properties === void 0) return { value: out, changed };
-  for (const [key, propDef] of Object.entries(properties)) {
-    const val = out[key];
-    if (typeof val !== "string") continue;
-    const propType = propDef.type;
-    if (typeof propType !== "string") continue;
-    if (propType === "number" && DECIMAL_RE.test(val.trim())) {
-      out[key] = Number(val);
-      changed.push(`${key}: string\u2192number`);
-    } else if (propType === "integer" && /^-?\d+$/.test(val.trim())) {
-      out[key] = Number(val);
-      changed.push(`${key}: string\u2192integer`);
-    } else if (propType === "boolean" && (val === "true" || val === "false")) {
-      out[key] = val === "true";
-      changed.push(`${key}: string\u2192boolean`);
-    } else if (propType === "array" || propType === "object") {
-      try {
-        const parsed = JSON.parse(val);
-        if (propType === "array" && Array.isArray(parsed)) {
-          out[key] = parsed;
-          changed.push(`${key}: string\u2192array`);
-        } else if (propType === "object" && typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-          out[key] = parsed;
-          changed.push(`${key}: string\u2192object`);
-        }
-      } catch {
-      }
-    }
-  }
-  return { value: out, changed };
-}
 
-// src/tool-error.ts
-var ToolError = class extends TheokitAgentError {
-  name = "ToolError";
-  /** The error content surfaced to the model: a string, or text/image blocks. */
-  content;
-  constructor(content, options = {}) {
-    super(renderToolErrorMessage(content), { ...options, isRetryable: false });
-    this.content = content;
+// src/internal/budget/pricing-data.json
+var pricing_data_default = {
+  _meta: {
+    pricingVersion: "litellm-2026-05-snapshot"},
+  models: {
+    "anthropic/claude-opus-4-7": {
+      input: 5,
+      output: 25,
+      cacheRead: 0.5,
+      cacheWrite: 6.25
+    },
+    "anthropic/claude-opus-4-6": {
+      input: 5,
+      output: 25,
+      cacheRead: 0.5,
+      cacheWrite: 6.25
+    },
+    "anthropic/claude-opus-4-5": {
+      input: 5,
+      output: 25,
+      cacheRead: 0.5,
+      cacheWrite: 6.25
+    },
+    "anthropic/claude-sonnet-4-6": {
+      input: 3,
+      output: 15,
+      cacheRead: 0.3,
+      cacheWrite: 3.75
+    },
+    "anthropic/claude-sonnet-4-5": {
+      input: 3,
+      output: 15,
+      cacheRead: 0.3,
+      cacheWrite: 3.75
+    },
+    "anthropic/claude-haiku-4-5": {
+      input: 1,
+      output: 5,
+      cacheRead: 0.1,
+      cacheWrite: 1.25
+    },
+    "anthropic/claude-3-5-sonnet": {
+      input: 3,
+      output: 15,
+      cacheRead: 0.3,
+      cacheWrite: 3.75
+    },
+    "anthropic/claude-3-5-haiku": {
+      input: 0.8,
+      output: 4,
+      cacheRead: 0.08,
+      cacheWrite: 1
+    },
+    "anthropic/claude-3-opus": {
+      input: 15,
+      output: 75,
+      cacheRead: 1.5,
+      cacheWrite: 18.75
+    },
+    "anthropic/claude-3-haiku": {
+      input: 0.25,
+      output: 1.25,
+      cacheRead: 0.03,
+      cacheWrite: 0.3
+    },
+    "openai/gpt-4o": {
+      input: 2.5,
+      output: 10,
+      cacheRead: 1.25
+    },
+    "openai/gpt-4o-mini": {
+      input: 0.15,
+      output: 0.6,
+      cacheRead: 0.075
+    },
+    "openai/gpt-4.1": {
+      input: 2,
+      output: 8,
+      cacheRead: 0.5
+    },
+    "openai/gpt-4.1-mini": {
+      input: 0.4,
+      output: 1.6,
+      cacheRead: 0.1
+    },
+    "openai/gpt-4.1-nano": {
+      input: 0.1,
+      output: 0.4,
+      cacheRead: 0.025
+    },
+    "openai/o3": {
+      input: 2,
+      output: 8,
+      cacheRead: 0.5
+    },
+    "openai/o3-mini": {
+      input: 1.1,
+      output: 4.4,
+      cacheRead: 0.55
+    },
+    "openai/o4-mini": {
+      input: 1.1,
+      output: 4.4,
+      cacheRead: 0.275
+    },
+    "deepseek/deepseek-chat": {
+      input: 0.14,
+      output: 0.28
+    },
+    "deepseek/deepseek-reasoner": {
+      input: 0.55,
+      output: 2.19
+    },
+    "google/gemini-2.5-pro": {
+      input: 1.25,
+      output: 10
+    },
+    "google/gemini-2.5-flash": {
+      input: 0.15,
+      output: 0.6
+    },
+    "google/gemini-2.0-flash": {
+      input: 0.1,
+      output: 0.4
+    }
   }
 };
-function renderToolErrorMessage(content) {
-  if (typeof content === "string") return content;
-  return content.map((block) => block.type === "text" ? block.text : `[${block.source.media_type} image]`).join("\n");
-}
 
-// src/internal/runtime/tools/shell-tool.ts
-async function runShell(options) {
-  if (options.sandbox === true && isObviouslyUnsafe(options.command)) {
-    return {
-      stdout: "",
-      stderr: `Sandbox refused command: ${options.command}`,
-      exitCode: 126,
-      timedOut: false
-    };
-  }
-  const result = await spawnAndCollect({
-    command: "sh",
-    args: ["-c", options.command],
-    cwd: options.cwd,
-    ...options.env !== void 0 ? { env: options.env } : {},
-    ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {}
-  });
-  const stderr = result.spawnError !== void 0 ? result.stderr + result.spawnError.message : result.stderr;
+// src/internal/budget/pricing-registry.ts
+var data = pricing_data_default;
+function buildEntry(key, raw) {
+  const [provider, ...modelParts] = key.split("/");
   return {
-    stdout: result.stdout,
-    stderr,
-    exitCode: result.exitCode,
-    timedOut: result.timedOut
-  };
-}
-function isObviouslyUnsafe(command) {
-  if (/(^|\s)(rm|mv|cp)\s+[^|;]*\s+\/(etc|var|root)\b/.test(command)) return true;
-  if (/sudo\s/.test(command)) return true;
-  return false;
-}
-
-// src/internal/agent-loop/tool-executors.ts
-async function executeTool(inputs, resolved, call) {
-  if (resolved === void 0) {
-    return { stdout: "", stderr: `Unknown tool ${call.name}`, exitCode: 127 };
-  }
-  if (resolved.origin === "shell") return runShellTool(inputs, call);
-  if (resolved.origin === "memory")
-    return runMemoryTool(resolved, call, inputs.context, inputs.agentId);
-  if (resolved.origin === "custom")
-    return runCustomTool(
-      resolved,
-      call,
-      inputs.signal,
-      inputs.context,
-      inputs.messages,
-      inputs.agentId
-    );
-  return runMcpTool(inputs, resolved, call);
+    provider: provider ?? "unknown",
+    model: modelParts.join("/"),
+    inputCostPerMillion: raw.input,
+    outputCostPerMillion: raw.output,
+    ...raw.cacheRead !== void 0 ? { cacheReadCostPerMillion: raw.cacheRead } : {},
+    ...raw.cacheWrite !== void 0 ? { cacheWriteCostPerMillion: raw.cacheWrite } : {},
+    ...raw.reasoning !== void 0 ? { reasoningCostPerMillion: raw.reasoning } : {},
+    pricingVersion: data._meta.pricingVersion
+  };
 }
-async function runMemoryTool(resolved, call, context, threadId) {
-  return runHandlerTool(
-    "memory",
-    resolved.memoryHandler,
-    call,
-    void 0,
-    context,
-    void 0,
-    threadId
-  );
+function stripDateSuffix(model) {
+  return model.replace(/-\d{4}-?\d{2}-?\d{2}$/, "");
 }
-async function runCustomTool(resolved, call, signal, context, messages, threadId) {
-  return runHandlerTool(
-    "custom",
-    resolved.customHandler,
-    call,
-    signal,
-    context,
-    messages,
-    threadId
-  );
+function normalizeAnthropicDots(model) {
+  return model.replace(/(?<=\d)\.(?=\d)/g, "-");
 }
-async function runHandlerTool(kind, handler, call, signal, context, messages, threadId) {
-  if (handler === void 0) {
-    return { stdout: "", stderr: `${kind} tool ${call.name} has no handler`, exitCode: 127 };
+function stripOpenRouterPrefix(modelId) {
+  return modelId.startsWith("openrouter/") ? modelId.slice("openrouter/".length) : modelId;
+}
+function lookupRaw(key) {
+  return data.models[key];
+}
+function getPricingEntry(opts) {
+  const cleaned = stripOpenRouterPrefix(opts.model);
+  const directKey = `${opts.provider}/${cleaned}`;
+  const direct = lookupRaw(directKey);
+  if (direct !== void 0) return buildEntry(directKey, direct);
+  const noSuffix = stripDateSuffix(cleaned);
+  if (noSuffix !== cleaned) {
+    const noSuffixKey = `${opts.provider}/${noSuffix}`;
+    const found = lookupRaw(noSuffixKey);
+    if (found !== void 0) return buildEntry(noSuffixKey, found);
   }
-  try {
-    const split = handler[TOOL_SPLIT_RESOLVER];
-    if (split !== void 0) {
-      const { model, app } = await split(call.input, { signal, context, threadId });
-      const base = typeof model === "string" ? { stdout: model, stderr: "", exitCode: 0 } : { stdout: "", stderr: "", exitCode: 0, content: model };
-      return { ...base, appResult: app };
-    }
-    const out = await handler(call.input, { signal, context, messages, threadId });
-    if (typeof out !== "string") return { stdout: "", stderr: "", exitCode: 0, content: out };
-    return { stdout: out, stderr: "", exitCode: 0 };
-  } catch (cause) {
-    if (cause instanceof ToolError) {
-      return { stdout: "", stderr: cause.message, exitCode: 1, content: cause.content };
+  if (opts.provider === "anthropic") {
+    const normalized = normalizeAnthropicDots(stripDateSuffix(cleaned));
+    const normKey = `${opts.provider}/${normalized}`;
+    const found = lookupRaw(normKey);
+    if (found !== void 0) return buildEntry(normKey, found);
+  }
+  if (cleaned.includes("/")) {
+    const found = lookupRaw(cleaned);
+    if (found !== void 0) return buildEntry(cleaned, found);
+    const stripped = stripDateSuffix(cleaned);
+    if (stripped !== cleaned) {
+      const found2 = lookupRaw(stripped);
+      if (found2 !== void 0) return buildEntry(stripped, found2);
     }
-    const message = cause instanceof Error ? cause.message : String(cause);
-    return { stdout: "", stderr: message, exitCode: 1 };
   }
+  const catalogEntry = catalogCostFallback(opts.provider, cleaned);
+  if (catalogEntry !== void 0) return catalogEntry;
+  return void 0;
 }
-async function runShellTool(inputs, call) {
-  const command = typeof call.input.command === "string" ? call.input.command : JSON.stringify(call.input);
-  const shellOptions = {
-    command,
-    cwd: inputs.shellCwd,
-    sandbox: inputs.shellSandbox
-  };
-  const result = await runShell(shellOptions);
-  const final = { stdout: result.stdout, stderr: result.stderr };
-  if (result.exitCode !== null && result.exitCode !== void 0) final.exitCode = result.exitCode;
-  return final;
-}
-async function runMcpTool(inputs, resolved, call) {
-  const client = inputs.mcp.get(resolved.mcpServerName ?? "");
-  if (client === void 0 || resolved.mcpToolName === void 0) {
+function catalogCostFallback(provider, cleanedModel) {
+  const stripped = stripDateSuffix(cleanedModel);
+  const candidates = [`${provider}/${cleanedModel}`, cleanedModel];
+  if (stripped !== cleanedModel) candidates.push(`${provider}/${stripped}`, stripped);
+  for (const key of candidates) {
+    const info = getCatalogModelInfo(key);
+    const cost = info?.cost;
+    if (cost === void 0) continue;
+    const [prov, ...modelParts] = key.split("/");
     return {
-      stdout: "",
-      stderr: `MCP server ${resolved.mcpServerName ?? "?"} not connected`,
-      exitCode: 127
+      provider: prov ?? provider,
+      model: modelParts.join("/") || cleanedModel,
+      inputCostPerMillion: cost.input,
+      outputCostPerMillion: cost.output,
+      ...cost.cache_read !== void 0 ? { cacheReadCostPerMillion: cost.cache_read } : {},
+      ...cost.cache_write !== void 0 ? { cacheWriteCostPerMillion: cost.cache_write } : {},
+      // M44 M5 fix — honest provenance: a key patched by the LIVE models-dev source is not "vendored".
+      pricingVersion: isPatchedModelKey(key) ? "catalog-models-dev" : "catalog-vendored"
     };
   }
-  try {
-    const response = await client.callTool(resolved.mcpToolName, call.input);
-    const text = response.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
-    return { stdout: text, stderr: "", exitCode: response.isError === true ? 1 : 0 };
-  } catch (cause) {
-    const message = cause instanceof Error ? cause.message : String(cause);
-    return { stdout: "", stderr: message, exitCode: 1 };
-  }
-}
-function renderToolResult(result) {
-  if (result.stderr.length > 0 && (result.exitCode ?? 0) !== 0) {
-    return `${result.stdout}
-[stderr]
-${result.stderr}`.trim();
-  }
-  return result.stdout.trim();
+  return void 0;
 }
 
-// src/internal/agent-loop/tool-timeout.ts
-var TOOL_ABORTED_EXIT = 124;
-function abortedResult(signal) {
-  const reason = signal.reason;
-  const timedOut = reason?.name === "TimeoutError";
-  return {
-    stdout: "",
-    stderr: timedOut ? "tool execution timed out" : "tool execution aborted",
-    exitCode: TOOL_ABORTED_EXIT
-  };
+// src/internal/budget/compute-cost.ts
+var MICROCENT = 1e6;
+function isSubscriptionIncluded(provider) {
+  return provider === "openai-codex" || provider === "codex";
 }
-function raceToolExecution(exec, opts) {
-  const { signal, timeoutMs } = opts;
-  if (signal === void 0 && timeoutMs === void 0) return exec;
-  const signals = [];
-  if (signal !== void 0) signals.push(signal);
-  if (timeoutMs !== void 0) signals.push(AbortSignal.timeout(timeoutMs));
-  const merged = signals.length === 1 ? signals[0] : AbortSignal.any(signals);
-  if (merged.aborted) return Promise.resolve(abortedResult(merged));
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    const onAbort = () => {
-      if (settled) return;
-      settled = true;
-      resolve(abortedResult(merged));
-    };
-    merged.addEventListener("abort", onAbort, { once: true });
-    exec.then(
-      (r) => {
-        if (settled) return;
-        settled = true;
-        merged.removeEventListener("abort", onAbort);
-        resolve(r);
-      },
-      (e) => {
-        if (settled) return;
-        settled = true;
-        merged.removeEventListener("abort", onAbort);
-        reject(e);
-      }
-    );
-  });
+function pricingHasValidRates(entry) {
+  return entry.inputCostPerMillion >= 0 && entry.outputCostPerMillion >= 0 && (entry.cacheReadCostPerMillion === void 0 || entry.cacheReadCostPerMillion >= 0) && (entry.cacheWriteCostPerMillion === void 0 || entry.cacheWriteCostPerMillion >= 0) && (entry.reasoningCostPerMillion === void 0 || entry.reasoningCostPerMillion >= 0);
 }
-
-// src/internal/agent-loop/tool-dispatch.ts
-async function dispatchTools(inputs, tools, toolCalls, events, parentSpan) {
-  const maxConcurrent = inputs.maxConcurrentTools ?? 4;
-  return mapWithConcurrency(
-    toolCalls,
-    maxConcurrent,
-    (call) => dispatchSingleCall(inputs, tools, call, events, parentSpan)
-  );
+function costForTokens(tokens, perMillion) {
+  if (tokens === 0 || perMillion === 0) return 0;
+  return Math.round(tokens * perMillion * MICROCENT / 1e6) / MICROCENT;
 }
-async function dispatchSingleCall(inputs, tools, call, events, parentSpan) {
-  const { call: workingCall, repairs } = applyRepairAndExtractCall(tools, call);
-  const callId = generateCallId();
-  const forkVeto = vetoFromForkWhitelist(inputs, workingCall, callId, events);
-  if (forkVeto !== void 0) return forkVeto;
-  const resolved = tools.find((tool) => tool.name === workingCall.name);
-  const toolSpan = startToolCallSpan(inputs, workingCall, resolved, callId, repairs, parentSpan);
-  events.push(buildToolUseRunning(inputs, callId, workingCall));
-  const pluginVeto = await vetoFromPluginPreHook(inputs, workingCall, callId, events);
-  if (pluginVeto !== void 0) {
-    toolSpan?.setAttribute("tool.vetoed", true);
-    toolSpan?.setAttribute("tool.veto_source", "plugin");
-    toolSpan?.end();
-    return pluginVeto;
+function computeCost(args) {
+  if (isSubscriptionIncluded(args.provider)) {
+    return {
+      amountUsd: 0,
+      status: "included",
+      currency: "USD",
+      source: "subscription_included",
+      pricingVersion: void 0
+    };
   }
-  const fileVeto = await vetoFromFileHookPreDecision(inputs, workingCall, callId, events);
-  if (fileVeto !== void 0) {
-    toolSpan?.setAttribute("tool.vetoed", true);
-    toolSpan?.setAttribute("tool.veto_source", "file_hook");
-    toolSpan?.end();
-    return fileVeto;
+  const entry = getPricingEntry({
+    provider: args.provider,
+    model: args.model,
+    ...args.baseUrl !== void 0 ? { baseUrl: args.baseUrl } : {}
+  });
+  if (entry === void 0) {
+    return {
+      amountUsd: void 0,
+      status: "unknown",
+      currency: "USD",
+      source: "unknown",
+      pricingVersion: void 0
+    };
+  }
+  if (!pricingHasValidRates(entry)) {
+    return {
+      amountUsd: void 0,
+      status: "unknown",
+      currency: "USD",
+      source: "unknown",
+      pricingVersion: entry.pricingVersion,
+      notes: ["pricing entry has negative rates; treated as invalid"]
+    };
+  }
+  const notes = [];
+  const detail = {};
+  const u = args.usage;
+  const inputCost = costForTokens(u.inputTokens, entry.inputCostPerMillion);
+  const outputCost = costForTokens(u.outputTokens, entry.outputCostPerMillion);
+  detail.input = inputCost;
+  detail.output = outputCost;
+  let total = inputCost + outputCost;
+  if (u.cacheReadTokens !== void 0 && u.cacheReadTokens > 0) {
+    if (entry.cacheReadCostPerMillion === void 0) {
+      return {
+        amountUsd: void 0,
+        status: "unknown",
+        currency: "USD",
+        source: "litellm_snapshot",
+        pricingVersion: entry.pricingVersion,
+        notes: ["cache-read tokens present but cacheReadCostPerMillion is undefined"]
+      };
+    }
+    const c = costForTokens(u.cacheReadTokens, entry.cacheReadCostPerMillion);
+    detail.cacheRead = c;
+    total += c;
+  }
+  if (u.cacheWriteTokens !== void 0 && u.cacheWriteTokens > 0) {
+    if (entry.cacheWriteCostPerMillion === void 0) {
+      return {
+        amountUsd: void 0,
+        status: "unknown",
+        currency: "USD",
+        source: "litellm_snapshot",
+        pricingVersion: entry.pricingVersion,
+        notes: ["cache-write tokens present but cacheWriteCostPerMillion is undefined"]
+      };
+    }
+    const c = costForTokens(u.cacheWriteTokens, entry.cacheWriteCostPerMillion);
+    detail.cacheWrite = c;
+    total += c;
   }
-  emitRunEvent(inputs.runEventSink, {
-    type: "tool_progress",
-    toolName: workingCall.name,
-    toolCallId: callId
-  });
-  const result = await runToolWithLifecycle(inputs, resolved, workingCall, callId);
-  await inputs.pluginManager?.runPostToolCallHooks({
-    name: workingCall.name,
-    args: workingCall.input,
-    result: { stdout: result.stdout, stderr: result.stderr, exitCode: result.exitCode },
-    agentId: inputs.agentId,
-    runId: inputs.runId
-  });
-  return finalizeSpanAndPostHook(inputs, workingCall, callId, result, events, toolSpan);
-}
-function applyRepairAndExtractCall(tools, call) {
-  const registryMap = buildRepairRegistry(tools);
-  const repaired = repairToolCall({ name: call.name, args: call.input, id: call.id }, registryMap);
-  if (repaired.repairs.length === 0) return { call, repairs: repaired.repairs };
+  if (u.reasoningTokens !== void 0 && u.reasoningTokens > 0) {
+    const rate = entry.reasoningCostPerMillion ?? entry.outputCostPerMillion;
+    const c = costForTokens(u.reasoningTokens, rate);
+    detail.reasoning = c;
+    total += c;
+    if (entry.reasoningCostPerMillion === void 0) {
+      notes.push("reasoning tokens billed at output rate (no dedicated reasoning rate available)");
+    }
+  }
+  const amountUsd = Math.round(total * MICROCENT) / MICROCENT;
   return {
-    call: {
-      ...call,
-      name: repaired.call.name,
-      input: repaired.call.args ?? {}
-    },
-    repairs: repaired.repairs
+    amountUsd,
+    status: "estimated",
+    currency: "USD",
+    source: "litellm_snapshot",
+    pricingVersion: entry.pricingVersion,
+    ...notes.length > 0 ? { notes } : {},
+    detail
   };
 }
-function vetoFromForkWhitelist(inputs, call, callId, events) {
-  const whitelistDecision = checkToolWhitelist(call.name);
-  if (whitelistDecision.allowed) return void 0;
-  emitRunEvent(inputs.runEventSink, {
-    type: "permission_denied",
-    toolName: call.name,
-    toolCallId: callId,
-    source: "fork_whitelist",
-    message: whitelistDecision.reason ?? "tool not available in fork"
+
+// src/internal/agent-loop/usage-and-cost.ts
+function accumulateUsage(usage, turn) {
+  const hasAnyToken = turn.inputTokens !== void 0 || turn.outputTokens !== void 0 || turn.cacheReadTokens !== void 0 || turn.cacheWriteTokens !== void 0 || turn.reasoningTokens !== void 0;
+  if (!hasAnyToken) return;
+  usage.add({
+    inputTokens: turn.inputTokens,
+    outputTokens: turn.outputTokens,
+    cacheReadTokens: turn.cacheReadTokens,
+    cacheWriteTokens: turn.cacheWriteTokens,
+    reasoningTokens: turn.reasoningTokens
   });
-  events.push(buildToolUseRunning(inputs, callId, call));
-  events.push(
-    buildToolUseCompleted(inputs, callId, call, {
-      stdout: "",
-      stderr: whitelistDecision.reason ?? "tool not available in fork",
-      exitCode: 126
-    })
-  );
-  return {
-    type: "tool_result",
-    toolUseId: call.id,
-    content: `Tool blocked by fork whitelist: ${whitelistDecision.reason}`
+}
+function computeUsageCost(inputs, usage) {
+  const modelId = inputs.model.id;
+  if (modelId === void 0 || modelId === "auto") return void 0;
+  const parsed = parseModelId(modelId);
+  const provider = parsed.provider ?? inputs.llm.name;
+  const model = parsed.provider !== void 0 ? parsed.name : modelId;
+  return computeCost({ provider, model, usage });
+}
+
+// src/internal/agent-loop/loop-finalize.ts
+function diagnoseTermination(ctx, budget, lastTurnDecision) {
+  const exhausted = budget.shouldContinue() === false;
+  if (lastTurnDecision === "continue" && exhausted) ctx.stoppedAtIterationLimit = true;
+  if (!exhausted || ctx.finalStatus !== "finished" || ctx.finalText !== "") return;
+  ctx.finalStatus = "error";
+  if (ctx.error !== void 0) return;
+  ctx.error = {
+    message: `Run stopped after ${budget.total} iteration(s) without producing a reply \u2014 the model was still calling tools when the budget ran out. Raise \`SendOptions.maxIterations\` (default 8), or inspect \`RunResult.stoppedAtIterationLimit\` to continue the run.`,
+    code: "iteration_limit_reached"
   };
 }
-function startToolCallSpan(inputs, call, resolved, callId, repairs, parentSpan) {
-  const toolSpan = inputs.telemetry?.startChildSpan(parentSpan, "tool.call", {
-    "tool.name": call.name,
-    "tool.origin": resolved?.origin ?? "unknown",
-    callId
+function stampSendSpan(inputs, ctx, sendSpan, usage, cost) {
+  sendSpan?.setAttribute("status", ctx.finalStatus);
+  if (ctx.stoppedByDoomLoop === true) sendSpan?.setAttribute("stoppedByDoomLoop", true);
+  if (inputs.telemetry?.includeContent === true && ctx.finalText.length > 0) {
+    sendSpan?.addEvent("response", { content: ctx.finalText });
+  }
+  if (usage === void 0) return;
+  sendSpan?.setAttributes({
+    totalInputTokens: usage.inputTokens,
+    totalOutputTokens: usage.outputTokens,
+    ...cost?.amountUsd !== void 0 ? { totalCostUsd: cost.amountUsd } : {}
   });
-  if (repairs.length > 0 && toolSpan !== void 0) {
-    toolSpan.setAttribute("tool.repairs", repairs.join("; "));
-  }
-  if (toolSpan !== void 0 && inputs.telemetry?.includeContent === true) {
-    toolSpan.addEvent("args", { input: JSON.stringify(call.input) });
+}
+async function syncMemoryProvider(inputs, ctx, sendSpan) {
+  if (ctx.finalStatus !== "finished") return;
+  if (ctx.memoryProviderHandle === void 0 || inputs.memoryProvider?.sync === void 0) return;
+  try {
+    await inputs.memoryProvider.sync(ctx.memoryProviderHandle);
+  } catch (cause) {
+    sendSpan?.addEvent("memory.sync.failed", {
+      message: cause instanceof Error ? cause.message : String(cause)
+    });
   }
-  return toolSpan;
 }
-async function vetoFromPluginPreHook(inputs, call, callId, events) {
-  const pluginVeto = await inputs.pluginManager?.runPreToolCallHooks({
-    name: call.name,
-    args: call.input,
-    agentId: inputs.agentId,
-    runId: inputs.runId,
-    // SE1 — thread the run's permission mode so a PermissionPlugin gates per-run.
-    ...inputs.permissionMode !== void 0 ? { permissionMode: inputs.permissionMode } : {}
-  });
-  if (pluginVeto === void 0) return void 0;
-  emitRunEvent(inputs.runEventSink, {
-    type: "permission_denied",
-    toolName: call.name,
-    toolCallId: callId,
-    source: "plugin",
-    message: pluginVeto.message
-  });
-  events.push(
-    buildToolUseCompleted(inputs, callId, call, {
-      stdout: "",
-      stderr: pluginVeto.message,
-      exitCode: 126
-    })
-  );
+async function finalizeLoopOutput(inputs, ctx, budget, sendSpan, lastTurnDecision) {
+  diagnoseTermination(ctx, budget, lastTurnDecision);
+  const usage = ctx.usage.hasAny() ? ctx.usage.toTokenUsage() : void 0;
+  const cost = usage !== void 0 ? computeUsageCost(inputs, usage) : void 0;
+  stampSendSpan(inputs, ctx, sendSpan, usage, cost);
+  await syncMemoryProvider(inputs, ctx, sendSpan);
   return {
-    type: "tool_result",
-    toolUseId: call.id,
-    content: `Plugin blocked this tool call: ${pluginVeto.message}`
+    events: ctx.events,
+    finalStatus: ctx.finalStatus,
+    result: ctx.finalText,
+    conversation: ctx.conversation,
+    ...usage !== void 0 ? { usage } : {},
+    ...cost !== void 0 ? { cost } : {},
+    ...ctx.error !== void 0 ? { error: ctx.error } : {},
+    ...ctx.stoppedAtIterationLimit === true ? { stoppedAtIterationLimit: true } : {},
+    ...ctx.stoppedByDoomLoop === true ? { stoppedByDoomLoop: true } : {}
   };
 }
-async function vetoFromFileHookPreDecision(inputs, call, callId, events) {
-  const preDecision = await inputs.hooks.run({
-    event: "preToolUse",
-    tool: call.name,
-    input: call.input,
-    agentId: inputs.agentId,
-    runId: inputs.runId
-  });
-  if (!preDecision.blocked) return void 0;
-  emitRunEvent(inputs.runEventSink, {
-    type: "permission_denied",
-    toolName: call.name,
-    toolCallId: callId,
-    source: "file_hook",
-    message: preDecision.reason ?? "blocked by hook"
-  });
-  events.push(
-    buildToolUseCompleted(inputs, callId, call, {
-      stdout: "",
-      stderr: preDecision.reason ?? "blocked by hook",
-      exitCode: 126
-    })
-  );
-  return {
-    type: "tool_result",
-    toolUseId: call.id,
-    content: `Hook denied this tool call: ${preDecision.reason ?? "no reason given"}`
-  };
+var KEY_PREFIX = "theokit-";
+var KEY_HEX_LENGTH = 32;
+function derivePromptCacheKey(sessionId) {
+  if (sessionId === void 0 || sessionId.trim().length === 0) return void 0;
+  const digest = createHash("sha256").update(sessionId, "utf8").digest("hex");
+  return `${KEY_PREFIX}${digest.slice(0, KEY_HEX_LENGTH)}`;
 }
-async function runToolWithLifecycle(inputs, resolved, call, callId) {
-  const startAt = Date.now();
-  await safeEmitToolHook(inputs.onToolStart, {
-    toolName: call.name,
-    args: call.input,
-    conversationId: inputs.agentId,
-    callId
-  });
-  await emitToolLifecycleDelta(inputs, {
-    type: "tool-call-started",
-    callId,
-    toolCall: { callId, name: call.name, args: call.input },
-    modelCallId: callId
-  });
-  const result = await raceToolExecution(executeTool(inputs, resolved, call), {
-    signal: inputs.signal,
-    timeoutMs: inputs.perToolTimeoutMs
-  });
-  const durationMs = Date.now() - startAt;
-  await emitToolLifecycleDelta(inputs, {
-    type: "tool-call-completed",
-    callId,
-    toolCall: {
-      callId,
-      name: call.name,
-      args: call.input,
-      result: result.content !== void 0 ? result.content : renderToolResult(result)
-    },
-    modelCallId: callId
-  });
-  inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.TOOL_CALL_DURATION_MS, durationMs, {
-    "tool.name": call.name
-  });
-  if (result.exitCode !== void 0 && result.exitCode !== 0 && result.exitCode !== null) {
-    await safeEmitToolHook(inputs.onToolError, {
-      toolName: call.name,
-      args: call.input,
-      error: new Error(result.stderr || `tool exited with code ${result.exitCode}`),
-      conversationId: inputs.agentId,
-      callId,
-      durationMs,
-      attempt: 1
-    });
-  } else {
-    await safeEmitToolHook(inputs.onToolEnd, {
-      toolName: call.name,
-      args: call.input,
-      // SE17 — when a `toModelOutput` split is active, observability gets the FULL
-      // raw output (`appResult`), NOT the compact model-facing value. SE7 — a
-      // block-returning handler has empty `stdout`; surface its structured content
-      // to the hook instead of an empty string.
-      result: result.appResult !== void 0 ? result.appResult : result.content !== void 0 ? result.content : result.stdout,
-      conversationId: inputs.agentId,
-      callId,
-      durationMs
-    });
-  }
-  return result;
+
+// src/internal/tool-dispatch/strip-think.ts
+var THINK_PATTERN = /<think>[\s\S]*?<\/think>\s*/g;
+function stripThinkBlocks(content) {
+  const matches = [...content.matchAll(THINK_PATTERN)];
+  const thinking = matches.length > 0 ? matches.map((m) => m[0]).join("\n").replace(/<\/?think>/g, "").trim() : null;
+  const visible = content.replace(THINK_PATTERN, "").trim();
+  return { visible, thinking };
 }
-function finalizeSpanAndPostHook(inputs, call, callId, result, events, toolSpan) {
-  toolSpan?.setAttribute("exitCode", result.exitCode ?? 0);
-  if (toolSpan !== void 0 && inputs.telemetry?.includeContent === true) {
-    toolSpan.addEvent("result", { stdout: result.stdout.slice(0, 1e3) });
-  }
-  toolSpan?.end();
-  events.push(buildToolUseCompleted(inputs, callId, call, result));
-  inputs.hooks.run({
-    event: "postToolUse",
-    tool: call.name,
-    input: call.input,
-    output: {
-      stdout: result.stdout,
-      stderr: result.stderr,
-      exitCode: result.exitCode ?? 0,
-      // SE7 — structured content (text + image blocks) when the handler
-      // returned/threw blocks; absent for the string path.
-      ...result.content !== void 0 ? { content: result.content } : {}
-    },
-    agentId: inputs.agentId,
-    runId: inputs.runId
-  }).catch((err) => {
+
+// src/internal/agent-loop/loop-llm-stream.ts
+function resolveSystemPromptWithMemoryAdditions(systemPrompt, additions) {
+  if (additions === void 0 || additions.length === 0) return systemPrompt;
+  const block = `<active-memory>
+${escapeBlockBody(additions)}
+</active-memory>`;
+  if (systemPrompt === void 0 || systemPrompt.length === 0) return block;
+  return `${block}
+
+${systemPrompt}`;
+}
+function toLlmTool(tool) {
+  return { name: tool.name, description: tool.description, inputSchema: tool.inputSchema };
+}
+function reasoningEffortFromParams(params) {
+  const thinking = params?.find((p) => p.id === "thinking");
+  return thinking !== void 0 && thinking.value.length > 0 ? thinking.value : void 0;
+}
+function emitLlmMetrics(inputs, result, startAt) {
+  inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.LLM_CALL_DURATION_MS, Date.now() - startAt, {
+    provider: inputs.llm.name
+  });
+  if (result.inputTokens === void 0 && result.outputTokens === void 0) {
+    inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.LLM_USAGE_MISSING, 1, {
+      provider: inputs.llm.name
+    });
     diag(
-      `[theokit-sdk] postToolUse hook error (swallowed): ${err instanceof Error ? err.message : String(err)}
+      `[theokit-sdk] llm usage missing from ${inputs.llm.name} finish \u2014 budget may undercount
 `
     );
+    return;
+  }
+  inputs.telemetry?.recordHistogram(
+    HISTOGRAM_NAMES.LLM_TOKENS,
+    (result.inputTokens ?? 0) + (result.outputTokens ?? 0),
+    { provider: inputs.llm.name }
+  );
+}
+async function streamLlmTurn(inputs, ctx) {
+  const llmSpan = inputs.telemetry?.startChildSpan(ctx.sendSpan, "llm.call", {
+    "model.id": inputs.model.id ?? "auto",
+    provider: inputs.llm.name
+  });
+  const startAt = Date.now();
+  const signal = inputs.signal ?? new AbortController().signal;
+  const generator = inputs.llm.stream(
+    {
+      model: inputs.model.id ?? "auto",
+      ...(() => {
+        const effective = resolveSystemPromptWithMemoryAdditions(
+          inputs.systemPrompt,
+          ctx.memorySystemPromptAdditions
+        );
+        return effective !== void 0 ? { system: effective } : {};
+      })(),
+      // issue #47: forward the reasoning effort from ModelSelection.params (the `thinking` param)
+      // so the provider produces reasoning. Absent param ⇒ no `reasoning` field (bare request).
+      ...(() => {
+        const effort = reasoningEffortFromParams(inputs.model.params);
+        return effort !== void 0 ? { reasoning: { effort } } : {};
+      })(),
+      // Step-cap force-close: forward the per-run tool gate (`"none"` on a ceiling round forces a
+      // text close even though tools are advertised). Absent ⇒ provider default (auto).
+      ...inputs.toolChoice !== void 0 ? { toolChoice: inputs.toolChoice } : {},
+      // usetheokit/theokit-sdk#383 — the prompt-cache key, derived HERE and from `inputs.agentId`
+      // because this is the one place that sees the session identity on every round. `agentId` is
+      // the run's session identity (`Agent.getOrCreate(sessionId)`), so the derived key is identical
+      // on round 1 and round 12 of a turn, identical on turn 2 of the same session, and different
+      // for a different session. Deriving it per round from a stable input is what makes it a cache
+      // key; minting one anywhere that runs more than once per session would not be.
+      ...(() => {
+        const key = derivePromptCacheKey(inputs.agentId);
+        return key !== void 0 ? { promptCacheKey: key } : {};
+      })(),
+      messages: ctx.messages,
+      tools: ctx.tools.map(toLlmTool)
+    },
+    signal
+  );
+  const collected = await collectLlmEvents(generator, inputs, ctx);
+  if (collected.errored || collected.finishValue === void 0) {
+    llmSpan?.setAttribute("stopReason", "error");
+    llmSpan?.end();
+    return {
+      text: collected.accumulatedText,
+      toolCalls: [],
+      stopReason: "error",
+      errored: true
+    };
+  }
+  const result = collected.finishValue.value;
+  llmSpan?.setAttributes({
+    stopReason: result.stopReason,
+    inputTokens: result.inputTokens ?? 0,
+    outputTokens: result.outputTokens ?? 0
   });
+  emitLlmMetrics(inputs, result, startAt);
+  llmSpan?.end();
+  const stripped = stripThinkBlocks(collected.accumulatedText);
+  const thinking = result.thinking ?? collected.thinking;
   return {
-    type: "tool_result",
-    toolUseId: call.id,
-    // SE7 — structured content blocks (handler-returned or ToolError-carried)
-    // are authoritative; otherwise the legacy string rendering.
-    content: result.content !== void 0 ? result.content : renderToolResult(result),
-    ...result.exitCode !== 0 && result.exitCode !== void 0 ? { isError: true } : {}
+    text: stripped.visible,
+    toolCalls: result.toolCalls,
+    stopReason: result.stopReason,
+    errored: false,
+    inputTokens: result.inputTokens,
+    outputTokens: result.outputTokens,
+    cacheReadTokens: result.cacheReadTokens,
+    cacheWriteTokens: result.cacheWriteTokens,
+    reasoningTokens: result.reasoningTokens,
+    ...thinking !== void 0 ? { thinking } : {}
   };
 }
-async function emitToolLifecycleDelta(inputs, update) {
-  if (inputs.onDelta === void 0) return;
+async function collectLlmEvents(generator, inputs, ctx) {
+  let errored = false;
+  let finishValue;
+  let thinking;
+  const partial = { text: "" };
   try {
-    await inputs.onDelta({ update });
-  } catch (err) {
-    diag(
-      `[theokit-sdk] onDelta tool-lifecycle emit error (swallowed): ${err instanceof Error ? err.message : String(err)}
-`
-    );
+    const result = await runCollectorLoop(generator, inputs, ctx, partial);
+    errored = result.errored;
+    finishValue = result.finishValue;
+    thinking = result.thinking;
+  } catch (cause) {
+    if (inputs.signal?.aborted === true) {
+      ctx.finalText = "[aborted]";
+      ctx.events.push(buildAssistantEvent(inputs, "[aborted]"));
+    } else {
+      registerLoopError(ctx, cause);
+      ctx.finalText = partial.text;
+      if (partial.text !== "") ctx.events.push(buildAssistantEvent(inputs, partial.text));
+    }
+    errored = true;
   }
+  const accumulatedText = partial.text;
+  return {
+    accumulatedText,
+    errored,
+    finishValue,
+    ...thinking !== void 0 ? { thinking } : {}
+  };
 }
-async function safeEmitToolHook(callback, event) {
-  if (callback === void 0) return;
+function registerLoopError(ctx, cause) {
+  if (ctx.error !== void 0) return;
+  const rawMessage = cause?.message;
+  const message = typeof rawMessage === "string" ? rawMessage : cause instanceof Error ? cause.message : String(cause);
+  const metaCode = cause?.metadata?.code;
+  const rawCode = cause?.code;
+  const code = typeof metaCode === "string" ? metaCode : typeof rawCode === "string" ? rawCode : void 0;
+  ctx.error = code !== void 0 ? { message, code, cause } : { message, cause };
+}
+async function consumeStreamEvent(inputs, reasoning, event) {
+  if (event.type === "text_delta") {
+    const text = event.text ?? "";
+    await emitTextDeltaCallback(inputs, text);
+    return text;
+  }
+  if (event.type === "reasoning_delta") {
+    await consumeReasoningDelta(inputs, reasoning, {
+      text: event.text ?? "",
+      ...event.signature !== void 0 ? { signature: event.signature } : {}
+    });
+  }
+  return "";
+}
+async function runCollectorLoop(generator, inputs, ctx, partial) {
+  const reasoning = { text: "", startedAt: void 0, signature: void 0 };
+  let errored = false;
+  let finishValue;
+  let thinking;
   try {
-    await callback(event);
-  } catch (cause) {
-    const msg = cause instanceof Error ? cause.message : String(cause);
-    diag(`[theokit-sdk] tool lifecycle hook threw: ${msg}
-`);
+    while (true) {
+      const next = await generator.next();
+      if (next.done === true) {
+        finishValue = next;
+        break;
+      }
+      if (next.value.type === "error") {
+        registerLoopError(ctx, next.value);
+        ctx.finalText = partial.text;
+        errored = true;
+        break;
+      }
+      partial.text += await consumeStreamEvent(inputs, reasoning, next.value);
+    }
+  } finally {
+    thinking = await finalizeReasoning(inputs, ctx, reasoning);
   }
+  return { errored, finishValue, ...thinking !== void 0 ? { thinking } : {} };
+}
+async function consumeReasoningDelta(inputs, reasoning, delta) {
+  if (delta.signature !== void 0) reasoning.signature = delta.signature;
+  await accumulateReasoning(inputs, reasoning, delta.text);
+}
+async function accumulateReasoning(inputs, reasoning, text) {
+  if (reasoning.startedAt === void 0) reasoning.startedAt = Date.now();
+  reasoning.text += text;
+  await emitReasoningDeltaCallback(inputs, text);
 }
-function buildToolUseRunning(inputs, callId, call) {
+async function finalizeReasoning(inputs, ctx, reasoning) {
+  if (reasoning.text.length === 0) return void 0;
+  const thinkingDurationMs = reasoning.startedAt === void 0 ? 0 : Date.now() - reasoning.startedAt;
+  ctx.events.push(
+    buildThinkingEvent(inputs, reasoning.text, thinkingDurationMs, reasoning.signature)
+  );
+  await emitThinkingCompletedCallback(inputs, thinkingDurationMs);
   return {
-    type: "tool_call",
-    agent_id: inputs.agentId,
-    run_id: inputs.runId,
-    call_id: callId,
-    name: call.name,
-    status: "running",
-    args: call.input
+    type: "thinking",
+    text: reasoning.text,
+    ...reasoning.signature !== void 0 ? { signature: reasoning.signature } : {}
   };
 }
-function buildRepairRegistry(tools) {
-  const out = /* @__PURE__ */ new Map();
-  for (const t of tools) {
-    out.set(t.name, { name: t.name, inputSchema: t.inputSchema });
-  }
-  return out;
+async function emitTextDeltaCallback(inputs, text) {
+  if (inputs.onDelta === void 0) return;
+  const cb = inputs.onDelta;
+  await safeCall(
+    () => cb({ update: { type: "text-delta", text } }),
+    void 0,
+    "SendOptions.onDelta"
+  );
+}
+async function emitReasoningDeltaCallback(inputs, text) {
+  if (inputs.onDelta === void 0) return;
+  const cb = inputs.onDelta;
+  await safeCall(
+    () => cb({ update: { type: "thinking-delta", text } }),
+    void 0,
+    "SendOptions.onDelta"
+  );
+}
+async function emitThinkingCompletedCallback(inputs, thinkingDurationMs) {
+  if (inputs.onDelta === void 0) return;
+  const cb = inputs.onDelta;
+  await safeCall(
+    () => cb({ update: { type: "thinking-completed", thinkingDurationMs } }),
+    void 0,
+    "SendOptions.onDelta"
+  );
 }
-function buildToolUseCompleted(inputs, callId, call, result) {
+
+// src/internal/agent-loop/loop-thinking-steps.ts
+function thinkingStep(thinking) {
   return {
-    type: "tool_call",
-    agent_id: inputs.agentId,
-    run_id: inputs.runId,
-    call_id: callId,
-    name: call.name,
-    status: "completed",
-    args: call.input,
-    result: {
-      stdout: result.stdout,
-      stderr: result.stderr,
-      exitCode: result.exitCode ?? 0
+    type: "thinkingMessage",
+    message: {
+      text: thinking.text,
+      ...thinking.signature !== void 0 ? { signature: thinking.signature } : {}
     }
   };
 }
+function recordThinkingOnSilentToolRound(ctx, text, thinking) {
+  if (text.length > 0 || thinking === void 0) return;
+  ctx.conversation.push({
+    type: "agentConversationTurn",
+    turn: { steps: [thinkingStep(thinking)] }
+  });
+}
 
-// src/internal/agent-loop/tool-result-guard.ts
-var OPEN = "<untrusted-tool-output>";
-var CLOSE = "</untrusted-tool-output>";
-var PII_PATTERNS = [
-  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g,
-  // email
-  /\b(?:\+?\d{1,3}[-.\s]?)?\(?\d{3}\)?[-.\s]?\d{3}[-.\s]?\d{4}\b/g
-  // phone
-];
-function guardText(content, opts) {
-  let out = content;
-  if (opts.redactPii === true) {
-    for (const re of PII_PATTERNS) out = out.replace(re, "[REDACTED]");
+// src/internal/tool-dispatch/repair-middleware.ts
+var DECIMAL_RE = /^-?\d+(\.\d+)?$/;
+function repairToolCall(raw, registry) {
+  const repairs = [];
+  let call = { ...raw };
+  if (!registry.has(call.name)) {
+    const lower = call.name.toLowerCase();
+    let match;
+    for (const key of registry.keys()) {
+      if (key.toLowerCase() === lower) {
+        match = key;
+        break;
+      }
+    }
+    if (match !== void 0) {
+      repairs.push(`name: "${call.name}" \u2192 "${match}"`);
+      call = { ...call, name: match };
+    }
   }
-  if (opts.delimit === true) {
-    const safe2 = out.split(CLOSE).join("</ untrusted-tool-output>");
-    out = `${OPEN}
-${safe2}
-${CLOSE}`;
+  if (typeof call.args === "string") {
+    try {
+      const parsed = JSON.parse(call.args);
+      call = { ...call, args: parsed };
+      repairs.push("args: parsed from string");
+    } catch {
+    }
   }
-  return out;
+  const tool = registry.get(call.name);
+  if (tool !== void 0 && typeof call.args === "object" && call.args !== null && !Array.isArray(call.args)) {
+    const coerced = coerceArgsToSchema(call.args, tool.inputSchema);
+    if (coerced.changed.length > 0) {
+      call = { ...call, args: coerced.value };
+      repairs.push(...coerced.changed);
+    }
+  }
+  return { call, repairs };
 }
-function applyToolResultGuard(parts, opts) {
-  if (opts.delimit !== true && opts.redactPii !== true) return parts;
-  return parts.map(
-    (p) => (
-      // SE7 — guard the TEXT of a tool result (string or the text blocks of a
-      // structured content); image blocks pass through untouched.
-      p.type === "tool_result" ? { ...p, content: renderToolResultContentText(p.content, (t) => guardText(t, opts)) } : p
-    )
-  );
+function coerceArgsToSchema(args, schema) {
+  const changed = [];
+  const out = { ...args };
+  const properties = schema.properties;
+  if (properties === void 0) return { value: out, changed };
+  for (const [key, propDef] of Object.entries(properties)) {
+    const val = out[key];
+    if (typeof val !== "string") continue;
+    const propType = propDef.type;
+    if (typeof propType !== "string") continue;
+    if (propType === "number" && DECIMAL_RE.test(val.trim())) {
+      out[key] = Number(val);
+      changed.push(`${key}: string\u2192number`);
+    } else if (propType === "integer" && /^-?\d+$/.test(val.trim())) {
+      out[key] = Number(val);
+      changed.push(`${key}: string\u2192integer`);
+    } else if (propType === "boolean" && (val === "true" || val === "false")) {
+      out[key] = val === "true";
+      changed.push(`${key}: string\u2192boolean`);
+    } else if (propType === "array" || propType === "object") {
+      try {
+        const parsed = JSON.parse(val);
+        if (propType === "array" && Array.isArray(parsed)) {
+          out[key] = parsed;
+          changed.push(`${key}: string\u2192array`);
+        } else if (propType === "object" && typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+          out[key] = parsed;
+          changed.push(`${key}: string\u2192object`);
+        }
+      } catch {
+      }
+    }
+  }
+  return { value: out, changed };
 }
 
-// src/internal/budget/pricing-data.json
-var pricing_data_default = {
-  _meta: {
-    pricingVersion: "litellm-2026-05-snapshot"},
-  models: {
-    "anthropic/claude-opus-4-7": {
-      input: 5,
-      output: 25,
-      cacheRead: 0.5,
-      cacheWrite: 6.25
-    },
-    "anthropic/claude-opus-4-6": {
-      input: 5,
-      output: 25,
-      cacheRead: 0.5,
-      cacheWrite: 6.25
-    },
-    "anthropic/claude-opus-4-5": {
-      input: 5,
-      output: 25,
-      cacheRead: 0.5,
-      cacheWrite: 6.25
-    },
-    "anthropic/claude-sonnet-4-6": {
-      input: 3,
-      output: 15,
-      cacheRead: 0.3,
-      cacheWrite: 3.75
-    },
-    "anthropic/claude-sonnet-4-5": {
-      input: 3,
-      output: 15,
-      cacheRead: 0.3,
-      cacheWrite: 3.75
-    },
-    "anthropic/claude-haiku-4-5": {
-      input: 1,
-      output: 5,
-      cacheRead: 0.1,
-      cacheWrite: 1.25
-    },
-    "anthropic/claude-3-5-sonnet": {
-      input: 3,
-      output: 15,
-      cacheRead: 0.3,
-      cacheWrite: 3.75
-    },
-    "anthropic/claude-3-5-haiku": {
-      input: 0.8,
-      output: 4,
-      cacheRead: 0.08,
-      cacheWrite: 1
-    },
-    "anthropic/claude-3-opus": {
-      input: 15,
-      output: 75,
-      cacheRead: 1.5,
-      cacheWrite: 18.75
-    },
-    "anthropic/claude-3-haiku": {
-      input: 0.25,
-      output: 1.25,
-      cacheRead: 0.03,
-      cacheWrite: 0.3
-    },
-    "openai/gpt-4o": {
-      input: 2.5,
-      output: 10,
-      cacheRead: 1.25
-    },
-    "openai/gpt-4o-mini": {
-      input: 0.15,
-      output: 0.6,
-      cacheRead: 0.075
-    },
-    "openai/gpt-4.1": {
-      input: 2,
-      output: 8,
-      cacheRead: 0.5
-    },
-    "openai/gpt-4.1-mini": {
-      input: 0.4,
-      output: 1.6,
-      cacheRead: 0.1
-    },
-    "openai/gpt-4.1-nano": {
-      input: 0.1,
-      output: 0.4,
-      cacheRead: 0.025
-    },
-    "openai/o3": {
-      input: 2,
-      output: 8,
-      cacheRead: 0.5
-    },
-    "openai/o3-mini": {
-      input: 1.1,
-      output: 4.4,
-      cacheRead: 0.55
-    },
-    "openai/o4-mini": {
-      input: 1.1,
-      output: 4.4,
-      cacheRead: 0.275
-    },
-    "deepseek/deepseek-chat": {
-      input: 0.14,
-      output: 0.28
-    },
-    "deepseek/deepseek-reasoner": {
-      input: 0.55,
-      output: 2.19
-    },
-    "google/gemini-2.5-pro": {
-      input: 1.25,
-      output: 10
-    },
-    "google/gemini-2.5-flash": {
-      input: 0.15,
-      output: 0.6
-    },
-    "google/gemini-2.0-flash": {
-      input: 0.1,
-      output: 0.4
-    }
+// src/tool-error.ts
+var ToolError = class extends TheokitAgentError {
+  name = "ToolError";
+  /** The error content surfaced to the model: a string, or text/image blocks. */
+  content;
+  constructor(content, options = {}) {
+    super(renderToolErrorMessage(content), { ...options, isRetryable: false });
+    this.content = content;
   }
 };
+function renderToolErrorMessage(content) {
+  if (typeof content === "string") return content;
+  return content.map((block) => block.type === "text" ? block.text : `[${block.source.media_type} image]`).join("\n");
+}
 
-// src/internal/budget/pricing-registry.ts
-var data = pricing_data_default;
-function buildEntry(key, raw) {
-  const [provider, ...modelParts] = key.split("/");
+// src/internal/runtime/tools/shell-tool.ts
+async function runShell(options) {
+  if (options.sandbox === true && isObviouslyUnsafe(options.command)) {
+    return {
+      stdout: "",
+      stderr: `Sandbox refused command: ${options.command}`,
+      exitCode: 126,
+      timedOut: false
+    };
+  }
+  const result = await spawnAndCollect({
+    command: "sh",
+    args: ["-c", options.command],
+    cwd: options.cwd,
+    ...options.env !== void 0 ? { env: options.env } : {},
+    ...options.timeoutMs !== void 0 ? { timeoutMs: options.timeoutMs } : {}
+  });
+  const stderr = result.spawnError !== void 0 ? result.stderr + result.spawnError.message : result.stderr;
   return {
-    provider: provider ?? "unknown",
-    model: modelParts.join("/"),
-    inputCostPerMillion: raw.input,
-    outputCostPerMillion: raw.output,
-    ...raw.cacheRead !== void 0 ? { cacheReadCostPerMillion: raw.cacheRead } : {},
-    ...raw.cacheWrite !== void 0 ? { cacheWriteCostPerMillion: raw.cacheWrite } : {},
-    ...raw.reasoning !== void 0 ? { reasoningCostPerMillion: raw.reasoning } : {},
-    pricingVersion: data._meta.pricingVersion
+    stdout: result.stdout,
+    stderr,
+    exitCode: result.exitCode,
+    timedOut: result.timedOut
   };
 }
-function stripDateSuffix(model) {
-  return model.replace(/-\d{4}-?\d{2}-?\d{2}$/, "");
+function isObviouslyUnsafe(command) {
+  if (/(^|\s)(rm|mv|cp)\s+[^|;]*\s+\/(etc|var|root)\b/.test(command)) return true;
+  if (/sudo\s/.test(command)) return true;
+  return false;
 }
-function normalizeAnthropicDots(model) {
-  return model.replace(/(?<=\d)\.(?=\d)/g, "-");
+
+// src/internal/agent-loop/tool-executors.ts
+async function executeTool(inputs, resolved, call) {
+  if (resolved === void 0) {
+    return { stdout: "", stderr: `Unknown tool ${call.name}`, exitCode: 127 };
+  }
+  if (resolved.origin === "shell") return runShellTool(inputs, call);
+  if (resolved.origin === "memory")
+    return runHandlerTool("memory", resolved.memoryHandler, call, {
+      context: inputs.context,
+      threadId: inputs.agentId
+    });
+  if (resolved.origin === "custom")
+    return runHandlerTool("custom", resolved.customHandler, call, {
+      signal: inputs.signal,
+      context: inputs.context,
+      messages: inputs.messages,
+      threadId: inputs.agentId
+    });
+  return runMcpTool(inputs, resolved, call);
 }
-function stripOpenRouterPrefix(modelId) {
-  return modelId.startsWith("openrouter/") ? modelId.slice("openrouter/".length) : modelId;
+async function runHandlerTool(kind, handler, call, ctx) {
+  const { signal, context, messages, threadId } = ctx;
+  if (handler === void 0) {
+    return { stdout: "", stderr: `${kind} tool ${call.name} has no handler`, exitCode: 127 };
+  }
+  try {
+    const split = handler[TOOL_SPLIT_RESOLVER];
+    if (split !== void 0) {
+      const { model, app } = await split(call.input, { signal, context, threadId });
+      const base = typeof model === "string" ? { stdout: model, stderr: "", exitCode: 0 } : { stdout: "", stderr: "", exitCode: 0, content: model };
+      return { ...base, appResult: app };
+    }
+    const out = await handler(call.input, { signal, context, messages, threadId });
+    if (typeof out !== "string") return { stdout: "", stderr: "", exitCode: 0, content: out };
+    return { stdout: out, stderr: "", exitCode: 0 };
+  } catch (cause) {
+    if (cause instanceof ToolError) {
+      return { stdout: "", stderr: cause.message, exitCode: 1, content: cause.content };
+    }
+    const message = cause instanceof Error ? cause.message : String(cause);
+    return { stdout: "", stderr: message, exitCode: 1 };
+  }
 }
-function lookupRaw(key) {
-  return data.models[key];
+async function runShellTool(inputs, call) {
+  const command = typeof call.input.command === "string" ? call.input.command : JSON.stringify(call.input);
+  const shellOptions = {
+    command,
+    cwd: inputs.shellCwd,
+    sandbox: inputs.shellSandbox
+  };
+  const result = await runShell(shellOptions);
+  const final = { stdout: result.stdout, stderr: result.stderr };
+  if (result.exitCode !== null && result.exitCode !== void 0) final.exitCode = result.exitCode;
+  return final;
 }
-function getPricingEntry(opts) {
-  const cleaned = stripOpenRouterPrefix(opts.model);
-  const directKey = `${opts.provider}/${cleaned}`;
-  const direct = lookupRaw(directKey);
-  if (direct !== void 0) return buildEntry(directKey, direct);
-  const noSuffix = stripDateSuffix(cleaned);
-  if (noSuffix !== cleaned) {
-    const noSuffixKey = `${opts.provider}/${noSuffix}`;
-    const found = lookupRaw(noSuffixKey);
-    if (found !== void 0) return buildEntry(noSuffixKey, found);
+async function runMcpTool(inputs, resolved, call) {
+  const client = inputs.mcp.get(resolved.mcpServerName ?? "");
+  if (client === void 0 || resolved.mcpToolName === void 0) {
+    return {
+      stdout: "",
+      stderr: `MCP server ${resolved.mcpServerName ?? "?"} not connected`,
+      exitCode: 127
+    };
   }
-  if (opts.provider === "anthropic") {
-    const normalized = normalizeAnthropicDots(stripDateSuffix(cleaned));
-    const normKey = `${opts.provider}/${normalized}`;
-    const found = lookupRaw(normKey);
-    if (found !== void 0) return buildEntry(normKey, found);
+  try {
+    const response = await client.callTool(resolved.mcpToolName, call.input);
+    const text = response.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
+    return { stdout: text, stderr: "", exitCode: response.isError === true ? 1 : 0 };
+  } catch (cause) {
+    const message = cause instanceof Error ? cause.message : String(cause);
+    return { stdout: "", stderr: message, exitCode: 1 };
   }
-  if (cleaned.includes("/")) {
-    const found = lookupRaw(cleaned);
-    if (found !== void 0) return buildEntry(cleaned, found);
-    const stripped = stripDateSuffix(cleaned);
-    if (stripped !== cleaned) {
-      const found2 = lookupRaw(stripped);
-      if (found2 !== void 0) return buildEntry(stripped, found2);
-    }
+}
+function renderToolResult(result) {
+  if (result.stderr.length > 0 && (result.exitCode ?? 0) !== 0) {
+    return `${result.stdout}
+[stderr]
+${result.stderr}`.trim();
   }
-  const catalogEntry = catalogCostFallback(opts.provider, cleaned);
-  if (catalogEntry !== void 0) return catalogEntry;
-  return void 0;
+  return result.stdout.trim();
 }
-function catalogCostFallback(provider, cleanedModel) {
-  const stripped = stripDateSuffix(cleanedModel);
-  const candidates = [`${provider}/${cleanedModel}`, cleanedModel];
-  if (stripped !== cleanedModel) candidates.push(`${provider}/${stripped}`, stripped);
-  for (const key of candidates) {
-    const info = getCatalogModelInfo(key);
-    const cost = info?.cost;
-    if (cost === void 0) continue;
-    const [prov, ...modelParts] = key.split("/");
-    return {
-      provider: prov ?? provider,
-      model: modelParts.join("/") || cleanedModel,
-      inputCostPerMillion: cost.input,
-      outputCostPerMillion: cost.output,
-      ...cost.cache_read !== void 0 ? { cacheReadCostPerMillion: cost.cache_read } : {},
-      ...cost.cache_write !== void 0 ? { cacheWriteCostPerMillion: cost.cache_write } : {},
-      // M44 M5 fix — honest provenance: a key patched by the LIVE models-dev source is not "vendored".
-      pricingVersion: isPatchedModelKey(key) ? "catalog-models-dev" : "catalog-vendored"
+
+// src/internal/agent-loop/tool-timeout.ts
+var TOOL_ABORTED_EXIT = 124;
+function abortedResult(signal) {
+  const reason = signal.reason;
+  const timedOut = reason?.name === "TimeoutError";
+  return {
+    stdout: "",
+    stderr: timedOut ? "tool execution timed out" : "tool execution aborted",
+    exitCode: TOOL_ABORTED_EXIT
+  };
+}
+function raceToolExecution(exec, opts) {
+  const { signal, timeoutMs } = opts;
+  if (signal === void 0 && timeoutMs === void 0) return exec;
+  const signals = [];
+  if (signal !== void 0) signals.push(signal);
+  if (timeoutMs !== void 0) signals.push(AbortSignal.timeout(timeoutMs));
+  const merged = signals.length === 1 ? signals[0] : AbortSignal.any(signals);
+  if (merged.aborted) return Promise.resolve(abortedResult(merged));
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const onAbort = () => {
+      if (settled) return;
+      settled = true;
+      resolve(abortedResult(merged));
     };
+    merged.addEventListener("abort", onAbort, { once: true });
+    exec.then(
+      (r) => {
+        if (settled) return;
+        settled = true;
+        merged.removeEventListener("abort", onAbort);
+        resolve(r);
+      },
+      (e) => {
+        if (settled) return;
+        settled = true;
+        merged.removeEventListener("abort", onAbort);
+        reject(e);
+      }
+    );
+  });
+}
+
+// src/internal/agent-loop/tool-dispatch.ts
+async function dispatchTools(inputs, tools, toolCalls, events, parentSpan) {
+  const maxConcurrent = inputs.maxConcurrentTools ?? 4;
+  return mapWithConcurrency(
+    toolCalls,
+    maxConcurrent,
+    (call) => dispatchSingleCall(inputs, tools, call, events, parentSpan)
+  );
+}
+async function dispatchSingleCall(inputs, tools, call, events, parentSpan) {
+  const { call: workingCall, repairs } = applyRepairAndExtractCall(tools, call);
+  const dc = {
+    inputs,
+    call: workingCall,
+    callId: generateCallId(),
+    events,
+    parentSpan
+  };
+  const forkVeto = vetoFromForkWhitelist(dc);
+  if (forkVeto !== void 0) return forkVeto;
+  const resolved = tools.find((tool) => tool.name === workingCall.name);
+  const toolSpan = startToolCallSpan(dc, resolved, repairs);
+  events.push(buildToolUseRunning(dc));
+  const pluginVeto = await vetoFromPluginPreHook(dc);
+  if (pluginVeto !== void 0) {
+    toolSpan?.setAttribute("tool.vetoed", true);
+    toolSpan?.setAttribute("tool.veto_source", "plugin");
+    toolSpan?.end();
+    return pluginVeto;
+  }
+  const fileVeto = await vetoFromFileHookPreDecision(dc);
+  if (fileVeto !== void 0) {
+    toolSpan?.setAttribute("tool.vetoed", true);
+    toolSpan?.setAttribute("tool.veto_source", "file_hook");
+    toolSpan?.end();
+    return fileVeto;
+  }
+  emitRunEvent(inputs.runEventSink, {
+    type: "tool_progress",
+    toolName: workingCall.name,
+    toolCallId: dc.callId
+  });
+  const result = await runToolWithLifecycle(dc, resolved);
+  await inputs.pluginManager?.runPostToolCallHooks({
+    name: workingCall.name,
+    args: workingCall.input,
+    result: { stdout: result.stdout, stderr: result.stderr, exitCode: result.exitCode },
+    agentId: inputs.agentId,
+    runId: inputs.runId
+  });
+  return finalizeSpanAndPostHook(dc, result, toolSpan);
+}
+function applyRepairAndExtractCall(tools, call) {
+  const registryMap = buildRepairRegistry(tools);
+  const repaired = repairToolCall({ name: call.name, args: call.input, id: call.id }, registryMap);
+  if (repaired.repairs.length === 0) return { call, repairs: repaired.repairs };
+  return {
+    call: {
+      ...call,
+      name: repaired.call.name,
+      input: repaired.call.args ?? {}
+    },
+    repairs: repaired.repairs
+  };
+}
+function vetoFromForkWhitelist(dc) {
+  const { inputs, call, callId, events } = dc;
+  const whitelistDecision = checkToolWhitelist(call.name);
+  if (whitelistDecision.allowed) return void 0;
+  emitRunEvent(inputs.runEventSink, {
+    type: "permission_denied",
+    toolName: call.name,
+    toolCallId: callId,
+    source: "fork_whitelist",
+    message: whitelistDecision.reason ?? "tool not available in fork"
+  });
+  events.push(buildToolUseRunning(dc));
+  events.push(
+    buildToolUseCompleted(dc, {
+      stdout: "",
+      stderr: whitelistDecision.reason ?? "tool not available in fork",
+      exitCode: 126
+    })
+  );
+  return {
+    type: "tool_result",
+    toolUseId: call.id,
+    content: `Tool blocked by fork whitelist: ${whitelistDecision.reason}`
+  };
+}
+function startToolCallSpan(dc, resolved, repairs) {
+  const { inputs, call, callId, parentSpan } = dc;
+  const toolSpan = inputs.telemetry?.startChildSpan(parentSpan, "tool.call", {
+    "tool.name": call.name,
+    "tool.origin": resolved?.origin ?? "unknown",
+    callId
+  });
+  if (repairs.length > 0 && toolSpan !== void 0) {
+    toolSpan.setAttribute("tool.repairs", repairs.join("; "));
   }
-  return void 0;
-}
-
-// src/internal/budget/compute-cost.ts
-var MICROCENT = 1e6;
-function isSubscriptionIncluded(provider) {
-  return provider === "openai-codex" || provider === "codex";
+  if (toolSpan !== void 0 && inputs.telemetry?.includeContent === true) {
+    toolSpan.addEvent("args", { input: JSON.stringify(call.input) });
+  }
+  return toolSpan;
 }
-function pricingHasValidRates(entry) {
-  return entry.inputCostPerMillion >= 0 && entry.outputCostPerMillion >= 0 && (entry.cacheReadCostPerMillion === void 0 || entry.cacheReadCostPerMillion >= 0) && (entry.cacheWriteCostPerMillion === void 0 || entry.cacheWriteCostPerMillion >= 0) && (entry.reasoningCostPerMillion === void 0 || entry.reasoningCostPerMillion >= 0);
+async function vetoFromPluginPreHook(dc) {
+  const { inputs, call, callId, events } = dc;
+  const pluginVeto = await inputs.pluginManager?.runPreToolCallHooks({
+    name: call.name,
+    args: call.input,
+    agentId: inputs.agentId,
+    runId: inputs.runId,
+    // SE1 — thread the run's permission mode so a PermissionPlugin gates per-run.
+    ...inputs.permissionMode !== void 0 ? { permissionMode: inputs.permissionMode } : {}
+  });
+  if (pluginVeto === void 0) return void 0;
+  emitRunEvent(inputs.runEventSink, {
+    type: "permission_denied",
+    toolName: call.name,
+    toolCallId: callId,
+    source: "plugin",
+    message: pluginVeto.message
+  });
+  events.push(
+    buildToolUseCompleted(dc, {
+      stdout: "",
+      stderr: pluginVeto.message,
+      exitCode: 126
+    })
+  );
+  return {
+    type: "tool_result",
+    toolUseId: call.id,
+    content: `Plugin blocked this tool call: ${pluginVeto.message}`
+  };
 }
-function costForTokens(tokens, perMillion) {
-  if (tokens === 0 || perMillion === 0) return 0;
-  return Math.round(tokens * perMillion * MICROCENT / 1e6) / MICROCENT;
+async function vetoFromFileHookPreDecision(dc) {
+  const { inputs, call, callId, events } = dc;
+  const preDecision = await inputs.hooks.run({
+    event: "preToolUse",
+    tool: call.name,
+    input: call.input,
+    agentId: inputs.agentId,
+    runId: inputs.runId
+  });
+  if (!preDecision.blocked) return void 0;
+  emitRunEvent(inputs.runEventSink, {
+    type: "permission_denied",
+    toolName: call.name,
+    toolCallId: callId,
+    source: "file_hook",
+    message: preDecision.reason ?? "blocked by hook"
+  });
+  events.push(
+    buildToolUseCompleted(dc, {
+      stdout: "",
+      stderr: preDecision.reason ?? "blocked by hook",
+      exitCode: 126
+    })
+  );
+  return {
+    type: "tool_result",
+    toolUseId: call.id,
+    content: `Hook denied this tool call: ${preDecision.reason ?? "no reason given"}`
+  };
 }
-function computeCost(args) {
-  if (isSubscriptionIncluded(args.provider)) {
-    return {
-      amountUsd: 0,
-      status: "included",
-      currency: "USD",
-      source: "subscription_included",
-      pricingVersion: void 0
-    };
-  }
-  const entry = getPricingEntry({
-    provider: args.provider,
-    model: args.model,
-    ...args.baseUrl !== void 0 ? { baseUrl: args.baseUrl } : {}
+async function runToolWithLifecycle(dc, resolved) {
+  const { inputs, call, callId } = dc;
+  const startAt = Date.now();
+  await safeEmitToolHook(inputs.onToolStart, {
+    toolName: call.name,
+    args: call.input,
+    conversationId: inputs.agentId,
+    callId
   });
-  if (entry === void 0) {
-    return {
-      amountUsd: void 0,
-      status: "unknown",
-      currency: "USD",
-      source: "unknown",
-      pricingVersion: void 0
-    };
+  await emitToolLifecycleDelta(inputs, {
+    type: "tool-call-started",
+    callId,
+    toolCall: { callId, name: call.name, args: call.input },
+    modelCallId: callId
+  });
+  const result = await raceToolExecution(executeTool(inputs, resolved, call), {
+    signal: inputs.signal,
+    timeoutMs: inputs.perToolTimeoutMs
+  });
+  const durationMs = Date.now() - startAt;
+  await emitToolLifecycleDelta(inputs, {
+    type: "tool-call-completed",
+    callId,
+    toolCall: {
+      callId,
+      name: call.name,
+      args: call.input,
+      result: result.content !== void 0 ? result.content : renderToolResult(result)
+    },
+    modelCallId: callId
+  });
+  inputs.telemetry?.recordHistogram(HISTOGRAM_NAMES.TOOL_CALL_DURATION_MS, durationMs, {
+    "tool.name": call.name
+  });
+  if (result.exitCode !== void 0 && result.exitCode !== 0 && result.exitCode !== null) {
+    await safeEmitToolHook(inputs.onToolError, {
+      toolName: call.name,
+      args: call.input,
+      error: new Error(result.stderr || `tool exited with code ${result.exitCode}`),
+      conversationId: inputs.agentId,
+      callId,
+      durationMs,
+      attempt: 1
+    });
+  } else {
+    await safeEmitToolHook(inputs.onToolEnd, {
+      toolName: call.name,
+      args: call.input,
+      // SE17 — when a `toModelOutput` split is active, observability gets the FULL
+      // raw output (`appResult`), NOT the compact model-facing value. SE7 — a
+      // block-returning handler has empty `stdout`; surface its structured content
+      // to the hook instead of an empty string.
+      result: result.appResult !== void 0 ? result.appResult : result.content !== void 0 ? result.content : result.stdout,
+      conversationId: inputs.agentId,
+      callId,
+      durationMs
+    });
   }
-  if (!pricingHasValidRates(entry)) {
-    return {
-      amountUsd: void 0,
-      status: "unknown",
-      currency: "USD",
-      source: "unknown",
-      pricingVersion: entry.pricingVersion,
-      notes: ["pricing entry has negative rates; treated as invalid"]
-    };
+  return result;
+}
+function finalizeSpanAndPostHook(dc, result, toolSpan) {
+  const { inputs, call, events } = dc;
+  toolSpan?.setAttribute("exitCode", result.exitCode ?? 0);
+  if (toolSpan !== void 0 && inputs.telemetry?.includeContent === true) {
+    toolSpan.addEvent("result", { stdout: result.stdout.slice(0, 1e3) });
   }
-  const notes = [];
-  const detail = {};
-  const u = args.usage;
-  const inputCost = costForTokens(u.inputTokens, entry.inputCostPerMillion);
-  const outputCost = costForTokens(u.outputTokens, entry.outputCostPerMillion);
-  detail.input = inputCost;
-  detail.output = outputCost;
-  let total = inputCost + outputCost;
-  if (u.cacheReadTokens !== void 0 && u.cacheReadTokens > 0) {
-    if (entry.cacheReadCostPerMillion === void 0) {
-      return {
-        amountUsd: void 0,
-        status: "unknown",
-        currency: "USD",
-        source: "litellm_snapshot",
-        pricingVersion: entry.pricingVersion,
-        notes: ["cache-read tokens present but cacheReadCostPerMillion is undefined"]
-      };
-    }
-    const c = costForTokens(u.cacheReadTokens, entry.cacheReadCostPerMillion);
-    detail.cacheRead = c;
-    total += c;
+  toolSpan?.end();
+  events.push(buildToolUseCompleted(dc, result));
+  inputs.hooks.run({
+    event: "postToolUse",
+    tool: call.name,
+    input: call.input,
+    output: {
+      stdout: result.stdout,
+      stderr: result.stderr,
+      exitCode: result.exitCode ?? 0,
+      // SE7 — structured content (text + image blocks) when the handler
+      // returned/threw blocks; absent for the string path.
+      ...result.content !== void 0 ? { content: result.content } : {}
+    },
+    agentId: inputs.agentId,
+    runId: inputs.runId
+  }).catch((err) => {
+    diag(
+      `[theokit-sdk] postToolUse hook error (swallowed): ${err instanceof Error ? err.message : String(err)}
+`
+    );
+  });
+  return {
+    type: "tool_result",
+    toolUseId: call.id,
+    // SE7 — structured content blocks (handler-returned or ToolError-carried)
+    // are authoritative; otherwise the legacy string rendering.
+    content: result.content !== void 0 ? result.content : renderToolResult(result),
+    ...result.exitCode !== 0 && result.exitCode !== void 0 ? { isError: true } : {}
+  };
+}
+async function emitToolLifecycleDelta(inputs, update) {
+  if (inputs.onDelta === void 0) return;
+  try {
+    await inputs.onDelta({ update });
+  } catch (err) {
+    diag(
+      `[theokit-sdk] onDelta tool-lifecycle emit error (swallowed): ${err instanceof Error ? err.message : String(err)}
+`
+    );
   }
-  if (u.cacheWriteTokens !== void 0 && u.cacheWriteTokens > 0) {
-    if (entry.cacheWriteCostPerMillion === void 0) {
-      return {
-        amountUsd: void 0,
-        status: "unknown",
-        currency: "USD",
-        source: "litellm_snapshot",
-        pricingVersion: entry.pricingVersion,
-        notes: ["cache-write tokens present but cacheWriteCostPerMillion is undefined"]
-      };
-    }
-    const c = costForTokens(u.cacheWriteTokens, entry.cacheWriteCostPerMillion);
-    detail.cacheWrite = c;
-    total += c;
+}
+async function safeEmitToolHook(callback, event) {
+  if (callback === void 0) return;
+  try {
+    await callback(event);
+  } catch (cause) {
+    const msg = cause instanceof Error ? cause.message : String(cause);
+    diag(`[theokit-sdk] tool lifecycle hook threw: ${msg}
+`);
   }
-  if (u.reasoningTokens !== void 0 && u.reasoningTokens > 0) {
-    const rate = entry.reasoningCostPerMillion ?? entry.outputCostPerMillion;
-    const c = costForTokens(u.reasoningTokens, rate);
-    detail.reasoning = c;
-    total += c;
-    if (entry.reasoningCostPerMillion === void 0) {
-      notes.push("reasoning tokens billed at output rate (no dedicated reasoning rate available)");
-    }
+}
+function buildToolUseRunning({ inputs, callId, call }) {
+  return {
+    type: "tool_call",
+    agent_id: inputs.agentId,
+    run_id: inputs.runId,
+    call_id: callId,
+    name: call.name,
+    status: "running",
+    args: call.input
+  };
+}
+function buildRepairRegistry(tools) {
+  const out = /* @__PURE__ */ new Map();
+  for (const t of tools) {
+    out.set(t.name, { name: t.name, inputSchema: t.inputSchema });
   }
-  const amountUsd = Math.round(total * MICROCENT) / MICROCENT;
+  return out;
+}
+function buildToolUseCompleted({ inputs, callId, call }, result) {
   return {
-    amountUsd,
-    status: "estimated",
-    currency: "USD",
-    source: "litellm_snapshot",
-    pricingVersion: entry.pricingVersion,
-    ...notes.length > 0 ? { notes } : {},
-    detail
+    type: "tool_call",
+    agent_id: inputs.agentId,
+    run_id: inputs.runId,
+    call_id: callId,
+    name: call.name,
+    status: "completed",
+    args: call.input,
+    result: {
+      stdout: result.stdout,
+      stderr: result.stderr,
+      exitCode: result.exitCode ?? 0
+    }
   };
 }
 
-// src/internal/agent-loop/usage-and-cost.ts
-function accumulateUsage(usage, turn) {
-  const hasAnyToken = turn.inputTokens !== void 0 || turn.outputTokens !== void 0 || turn.cacheReadTokens !== void 0 || turn.cacheWriteTokens !== void 0 || turn.reasoningTokens !== void 0;
-  if (!hasAnyToken) return;
-  usage.add({
-    inputTokens: turn.inputTokens,
-    outputTokens: turn.outputTokens,
-    cacheReadTokens: turn.cacheReadTokens,
-    cacheWriteTokens: turn.cacheWriteTokens,
-    reasoningTokens: turn.reasoningTokens
-  });
+// src/internal/agent-loop/tool-result-guard.ts
+var OPEN = "<untrusted-tool-output>";
+var CLOSE = "</untrusted-tool-output>";
+var PII_PATTERNS = [
+  /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g,
+  // email
+  /\b(?:\+?\d{1,3}[-.\s]?)?\(?\d{3}\)?[-.\s]?\d{3}[-.\s]?\d{4}\b/g
+  // phone
+];
+function guardText(content, opts) {
+  let out = content;
+  if (opts.redactPii === true) {
+    for (const re of PII_PATTERNS) out = out.replace(re, "[REDACTED]");
+  }
+  if (opts.delimit === true) {
+    const safe2 = out.split(CLOSE).join("</ untrusted-tool-output>");
+    out = `${OPEN}
+${safe2}
+${CLOSE}`;
+  }
+  return out;
 }
-function computeUsageCost(inputs, usage) {
-  const modelId = inputs.model.id;
-  if (modelId === void 0 || modelId === "auto") return void 0;
-  const parsed = parseModelId(modelId);
-  const provider = parsed.provider ?? inputs.llm.name;
-  const model = parsed.provider !== void 0 ? parsed.name : modelId;
-  return computeCost({ provider, model, usage });
+function applyToolResultGuard(parts, opts) {
+  if (opts.delimit !== true && opts.redactPii !== true) return parts;
+  return parts.map(
+    (p) => (
+      // SE7 — guard the TEXT of a tool result (string or the text blocks of a
+      // structured content); image blocks pass through untouched.
+      p.type === "tool_result" ? { ...p, content: renderToolResultContentText(p.content, (t) => guardText(t, opts)) } : p
+    )
+  );
 }
 
 // src/internal/agent-loop/loop.ts
@@ -6327,49 +6435,7 @@ async function runAgentLoop(inputs) {
         break;
       }
     }
-    if (lastTurnDecision === "continue" && budget.shouldContinue() === false) {
-      ctx.stoppedAtIterationLimit = true;
-    }
-    if (budget.shouldContinue() === false && ctx.finalStatus === "finished" && ctx.finalText === "") {
-      ctx.finalStatus = "error";
-      if (ctx.error === void 0) {
-        ctx.error = {
-          message: `Run stopped after ${budget.total} iteration(s) without producing a reply \u2014 the model was still calling tools when the budget ran out. Raise \`SendOptions.maxIterations\` (default 8), or inspect \`RunResult.stoppedAtIterationLimit\` to continue the run.`,
-          code: "iteration_limit_reached"
-        };
-      }
-    }
-    sendSpan?.setAttribute("status", ctx.finalStatus);
-    if (ctx.stoppedByDoomLoop === true) sendSpan?.setAttribute("stoppedByDoomLoop", true);
-    if (inputs.telemetry?.includeContent === true && ctx.finalText.length > 0) {
-      sendSpan?.addEvent("response", { content: ctx.finalText });
-    }
-    const usage = ctx.usage.hasAny() ? ctx.usage.toTokenUsage() : void 0;
-    const cost = usage !== void 0 ? computeUsageCost(inputs, usage) : void 0;
-    if (usage !== void 0) {
-      sendSpan?.setAttributes({
-        totalInputTokens: usage.inputTokens,
-        totalOutputTokens: usage.outputTokens,
-        ...cost?.amountUsd !== void 0 ? { totalCostUsd: cost.amountUsd } : {}
-      });
-    }
-    if (ctx.finalStatus === "finished" && ctx.memoryProviderHandle !== void 0 && inputs.memoryProvider?.sync !== void 0) {
-      try {
-        await inputs.memoryProvider.sync(ctx.memoryProviderHandle);
-      } catch {
-      }
-    }
-    return {
-      events: ctx.events,
-      finalStatus: ctx.finalStatus,
-      result: ctx.finalText,
-      conversation: ctx.conversation,
-      ...usage !== void 0 ? { usage } : {},
-      ...cost !== void 0 ? { cost } : {},
-      ...ctx.error !== void 0 ? { error: ctx.error } : {},
-      ...ctx.stoppedAtIterationLimit === true ? { stoppedAtIterationLimit: true } : {},
-      ...ctx.stoppedByDoomLoop === true ? { stoppedByDoomLoop: true } : {}
-    };
+    return await finalizeLoopOutput(inputs, ctx, budget, sendSpan, lastTurnDecision);
   } finally {
     await inputs.pluginManager?.runOnSessionEndHooks({
       agentId: inputs.agentId,
@@ -6378,7 +6444,10 @@ async function runAgentLoop(inputs) {
     if (ctxRef !== void 0 && ctxRef.memoryProviderHandle !== void 0 && inputs.memoryProvider !== void 0) {
       try {
         await inputs.memoryProvider.dispose(ctxRef.memoryProviderHandle);
-      } catch {
+      } catch (cause) {
+        sendSpan?.addEvent("memory.dispose.failed", {
+          message: cause instanceof Error ? cause.message : String(cause)
+        });
       }
     }
     sendSpan?.end();
@@ -6606,15 +6675,20 @@ var FallbackLlmClient = class {
     });
   }
 };
-function abortError(signal) {
-  if (signal.reason instanceof Error) return signal.reason;
-  return new Error(signal.reason !== void 0 ? String(signal.reason) : "aborted");
+
+// src/internal/mcp/handshake-timeout.ts
+var DEFAULT_MCP_TIMEOUT_MS = 3e4;
+var HANDSHAKE_FLOOR_MS = 1e4;
+function handshakeAwareTimeout(input) {
+  const isReconnectHandshake = input.method === "initialize" && input.reconnecting;
+  return isReconnectHandshake ? Math.max(input.requestTimeoutMs, HANDSHAKE_FLOOR_MS) : input.requestTimeoutMs;
 }
+
+// src/internal/mcp/client.ts
 function createMcpClient(name, config, fetchImpl = fetch) {
   if (isStdio(config)) return new StdioMcpClient(name, config);
   return new HttpMcpClient(name, config, fetchImpl);
 }
-var DEFAULT_MCP_TIMEOUT_MS = 3e4;
 var MAX_STDIO_BUFFER_BYTES = 8 * 1024 * 1024;
 var RECONNECT_BASE_MS = 250;
 var MAX_RECONNECT_ATTEMPTS = 2;
@@ -6688,9 +6762,24 @@ var StdioMcpClient = class extends BaseMcpClient {
   // instead of racing (or spuriously failing with mcp_not_init).
   dropped = false;
   reconnectPromise;
+  /** True only while `reconnect()`'s handshake is in flight — see `timeoutFor`. */
+  reconnecting = false;
   get timeoutMs() {
     return this.config.requestTimeoutMs ?? DEFAULT_MCP_TIMEOUT_MS;
   }
+  /**
+   * The deadline for one RPC. The rule itself — and the reasoning behind it — lives in
+   * `handshake-timeout.ts`, where it is a pure function of three values and can be interrogated
+   * without spawning a process. It was private here, which is why the clause "a caller who sets a
+   * LARGER timeout keeps it" went four months with no test.
+   */
+  timeoutFor(method) {
+    return handshakeAwareTimeout({
+      method,
+      reconnecting: this.reconnecting,
+      requestTimeoutMs: this.timeoutMs
+    });
+  }
   /** Spawn the server child and wire stdout/stderr/error/exit handlers.
    * Shared by `initialize()` and the M2 #59 reconnect path. */
   spawnChild() {
@@ -6756,12 +6845,15 @@ var StdioMcpClient = class extends BaseMcpClient {
     for (let attempt = 0; attempt < MAX_RECONNECT_ATTEMPTS; attempt += 1) {
       await reconnectDelay(attempt);
       this.spawnChild();
+      this.reconnecting = true;
       try {
         await super.initialize();
         this.dropped = false;
         return;
       } catch (err) {
         lastErr = err;
+      } finally {
+        this.reconnecting = false;
       }
     }
     throw new NetworkError(`MCP ${this.name} reconnect exhausted`, {
@@ -6843,16 +6935,17 @@ var StdioMcpClient = class extends BaseMcpClient {
     child.stdin.write(`${JSON.stringify(payload)}
 `);
     return new Promise((resolve, reject) => {
+      const budget = this.timeoutFor(method);
       const timer = setTimeout(() => {
         this.pending.delete(id);
-        reject(mcpTimeoutError(this.name, this.timeoutMs));
+        reject(mcpTimeoutError(this.name, budget));
         this.child?.kill("SIGKILL");
         this.child = void 0;
         this.dropped = true;
         this.rejectAllPending(
           new NetworkError(`MCP ${this.name} disconnected`, { code: "mcp_disconnected" })
         );
-      }, this.timeoutMs);
+      }, budget);
       this.pending.set(id, { resolve, reject, timer });
     });
   }
@@ -6975,16 +7068,6 @@ function resolveMcpCwd(configCwd) {
   return safePathJoin(process.cwd(), configCwd);
 }
 
-// src/internal/providers/register-plugin-providers.ts
-function registerPluginProviderProfiles(entries) {
-  let registered2 = 0;
-  for (const entry of entries) {
-    registerProvider(entry.profile);
-    registered2 += 1;
-  }
-  return registered2;
-}
-
 // src/internal/local-agent/mcp-pool.ts
 var DEFAULT_IDLE_TTL_MS = 6e5;
 function configKey(config) {
@@ -7048,6 +7131,31 @@ var McpClientPool = class {
   }
 };
 
+// src/internal/local-agent/real-local-run-mcp.ts
+var sessionMcpPool = new McpClientPool();
+function disposeSessionMcpClients(agentId) {
+  sessionMcpPool.disposeSession(agentId, (client) => {
+    void client.close();
+  });
+}
+function runOwnsMcpClients(agentOptions) {
+  return agentOptions.mcpLifecycle !== "session";
+}
+function buildMcpMap(options) {
+  const map = /* @__PURE__ */ new Map();
+  const inline = options.sendOptions.mcpServers ?? options.agentOptions.mcpServers;
+  if (inline === void 0) return map;
+  const pooled = !runOwnsMcpClients(options.agentOptions);
+  if (pooled) sessionMcpPool.reapIdle((c) => void c.close());
+  for (const [name, config] of Object.entries(inline)) {
+    map.set(
+      name,
+      pooled ? sessionMcpPool.acquire(options.agentId, name, config, () => createMcpClient(name, config)) : createMcpClient(name, config)
+    );
+  }
+  return map;
+}
+
 // src/internal/tool-registry/personality-filter.ts
 function applyPersonalityFilter(exposedTools, whitelist, opts) {
   if (whitelist === void 0) return exposedTools;
@@ -7118,7 +7226,16 @@ function withheldBuiltinsInput(agentOptions) {
   if (withheld === void 0 || withheld.length === 0) return {};
   return { withheldBuiltinTools: withheld };
 }
-function buildRunToolCatalogInput(agentOptions, sendOptions, pluginManager, personalityToolWhitelist, agentId, personalityName, subagents, effectiveModel) {
+function buildRunToolCatalogInput({
+  agentOptions,
+  sendOptions,
+  pluginManager,
+  personalityToolWhitelist,
+  agentId,
+  personalityName,
+  subagents,
+  effectiveModel
+}) {
   const builtins = withheldBuiltinsInput(agentOptions);
   const baseTools = sendOptions?.tools ?? agentOptions.tools ?? [];
   const agentsForTools = subagents !== void 0 && Object.keys(subagents).length > 0 ? subagents : agentOptions.agents;
@@ -7172,32 +7289,6 @@ function createRealLocalRun(options) {
   registerRun(handle);
   return handle;
 }
-var pluginProvidersAnnounced = false;
-function resolveRunProvider(options) {
-  registerBuiltins();
-  const profiles = options.pluginManager?.aggregated.providerProfiles ?? [];
-  const registered2 = registerPluginProviderProfiles(profiles);
-  if (registered2 > 0 && !pluginProvidersAnnounced) {
-    pluginProvidersAnnounced = true;
-    const names = profiles.map((e) => e.profile.name).join(", ");
-    diag(`[theokit-sdk] registered ${registered2} plugin provider profile(s): ${names}
-`);
-  }
-  const parsedModel = parseModelId(options.model?.id);
-  const modelInferredProvider = parsedModel.provider !== void 0 && getProviderProfile$1(parsedModel.provider) !== void 0 ? parsedModel.provider : void 0;
-  const keyInferredProvider = inferProviderFromApiKey(options.agentOptions.apiKey);
-  const primary = options.agentOptions.providers?.routes?.[0]?.provider ?? keyInferredProvider ?? modelInferredProvider ?? detectPrimaryProvider();
-  warnProviderPrecedenceOnce(modelInferredProvider, primary);
-  const effectiveModelId = modelInferredProvider !== void 0 && modelInferredProvider === primary ? parsedModel.name : options.model?.id ?? "claude-sonnet-4-6";
-  return { primary, effectiveModelId };
-}
-function mergeExplicitApiKey(pools, primary, apiKey) {
-  if (apiKey === void 0 || apiKey.length === 0) return pools;
-  if (isFixtureApiKey(apiKey) || apiKey === LOCAL_RUNTIME_MOCK_KEY) return pools;
-  const existing = pools?.[primary];
-  if (existing !== void 0 && existing.length > 0) return pools;
-  return { ...pools ?? {}, [primary]: [apiKey] };
-}
 function buildLoopInputs(options, runId, userText, userImages) {
   const maxIterations = options.sendOptions.maxIterations;
   if (maxIterations !== void 0 && (!Number.isInteger(maxIterations) || maxIterations < 1)) {
@@ -7256,16 +7347,16 @@ function buildLoopInputs(options, runId, userText, userImages) {
     } : {},
     ...options.priorMessages !== void 0 ? { priorMessages: options.priorMessages } : {},
     ...options.memoryTools !== void 0 && options.memoryTools.length > 0 ? { memoryTools: options.memoryTools } : {},
-    ...buildRunToolCatalogInput(
-      options.agentOptions,
-      options.sendOptions,
-      options.pluginManager,
-      options.personalityToolWhitelist,
-      options.agentId,
-      options.personalityName,
-      options.subagents,
-      options.model
-    ),
+    ...buildRunToolCatalogInput({
+      agentOptions: options.agentOptions,
+      sendOptions: options.sendOptions,
+      pluginManager: options.pluginManager,
+      personalityToolWhitelist: options.personalityToolWhitelist,
+      agentId: options.agentId,
+      personalityName: options.personalityName,
+      subagents: options.subagents,
+      effectiveModel: options.model
+    }),
     ...options.pluginManager !== void 0 ? { pluginManager: options.pluginManager } : {},
     // D318 — forward SendOptions.signal to the agent loop so streamLlmTurn
     // can attach it to the LLM `fetch({ signal })` call.
@@ -7302,29 +7393,6 @@ function buildLoopInputs(options, runId, userText, userImages) {
     ...options.agentOptions.memoryProvider !== void 0 ? { memoryProvider: options.agentOptions.memoryProvider } : {}
   };
 }
-var sessionMcpPool = new McpClientPool();
-function disposeSessionMcpClients(agentId) {
-  sessionMcpPool.disposeSession(agentId, (client) => {
-    void client.close();
-  });
-}
-function runOwnsMcpClients(agentOptions) {
-  return agentOptions.mcpLifecycle !== "session";
-}
-function buildMcpMap(options) {
-  const map = /* @__PURE__ */ new Map();
-  const inline = options.sendOptions.mcpServers ?? options.agentOptions.mcpServers;
-  if (inline === void 0) return map;
-  const pooled = !runOwnsMcpClients(options.agentOptions);
-  if (pooled) sessionMcpPool.reapIdle((c) => void c.close());
-  for (const [name, config] of Object.entries(inline)) {
-    map.set(
-      name,
-      pooled ? sessionMcpPool.acquire(options.agentId, name, config, () => createMcpClient(name, config)) : createMcpClient(name, config)
-    );
-  }
-  return map;
-}
 var RealLocalRun = class extends FixtureRunBase {
   buildInputs;
   /** theokit#155 — whether this turn releases its MCP clients, or the session pool does. */
@@ -7746,14 +7814,16 @@ var LiveAgentRegistry = class {
     }
   }
 };
-var liveAgentRegistry = new LiveAgentRegistry();
+var liveAgentRegistry = globalSingleton(
+  "theokit-sdk.runtime.live-agents",
+  () => new LiveAgentRegistry()
+);
 
 // src/internal/local-agent/local-agent-lifecycle.ts
 async function acquireLeaseIfPossible(store, agentId) {
-  const a = store.acquire;
-  if (typeof a !== "function") return;
+  if (typeof store.acquire !== "function") return;
   try {
-    await a.call(store, agentId);
+    await store.acquire(agentId);
   } catch (err) {
     if (err instanceof Error && err.name === "SessionBusyError") throw err;
     diag(
@@ -7763,12 +7833,10 @@ async function acquireLeaseIfPossible(store, agentId) {
   }
 }
 async function releaseLeaseIfPossible(store, agentId) {
-  const r = store.release;
-  if (typeof r === "function") await r.call(store, agentId);
+  if (typeof store.release === "function") await store.release(agentId);
 }
 async function disposeSessionStore(store) {
-  const d = store.dispose;
-  if (typeof d === "function") await d.call(store);
+  if (typeof store.dispose === "function") await store.dispose();
 }
 async function disposeLocalAgentSession(agent) {
   liveAgentRegistry.forget(agent.agentId);
@@ -7791,6 +7859,111 @@ async function reloadLocalAgent(agent) {
   );
 }
 
+// src/internal/local-agent/local-agent-memory-direct.ts
+async function createAvailableAdapters(entries, workspaceCwd) {
+  const available = [];
+  for (const entry of entries) {
+    const instance = await entry.createProvider(workspaceCwd);
+    if (instance.isAvailable() === false) {
+      diag(
+        `[theokit-sdk] memory adapter "${instance.id}" reports itself unavailable (plugin "${entry.pluginName}") \u2014 skipping it. Check its credentials.
+`
+      );
+      continue;
+    }
+    available.push(instance);
+  }
+  return available;
+}
+function buildAgentMemory(pluginManager, workspaceCwd, defaultContext) {
+  let resolved;
+  async function ensure() {
+    if (resolved !== void 0) return resolved;
+    const entries = pluginManager.aggregated.memoryProviders;
+    const created = await createAvailableAdapters(entries, workspaceCwd);
+    for (const adapter of created) {
+      if (adapter.initialize !== void 0) {
+        await adapter.initialize();
+      }
+    }
+    resolved = { adapters: created, initialized: true, registered: entries.length };
+    return resolved;
+  }
+  function mergeContext(partial) {
+    const merged = {
+      userId: partial?.userId ?? defaultContext?.userId ?? "",
+      ...partial?.agentId !== void 0 ? { agentId: partial.agentId } : defaultContext?.agentId !== void 0 ? { agentId: defaultContext.agentId } : {},
+      ...partial?.sessionId !== void 0 ? { sessionId: partial.sessionId } : defaultContext?.sessionId !== void 0 ? { sessionId: defaultContext.sessionId } : {},
+      ...partial?.tenantId !== void 0 ? { tenantId: partial.tenantId } : defaultContext?.tenantId !== void 0 ? { tenantId: defaultContext.tenantId } : {},
+      ...partial?.tags !== void 0 ? { tags: partial.tags } : defaultContext?.tags !== void 0 ? { tags: defaultContext.tags } : {},
+      ...partial?.metadata !== void 0 ? { metadata: partial.metadata } : defaultContext?.metadata !== void 0 ? { metadata: defaultContext.metadata } : {}
+    };
+    if (merged.userId === "") {
+      throw new ConfigurationError(
+        "agent.memory requires a userId \u2014 either set AgentOptions.memoryContext.userId or pass ctx.userId at call time.",
+        { code: "memory_context_missing_user_id" }
+      );
+    }
+    return merged;
+  }
+  async function requireAdapters() {
+    const r = await ensure();
+    if (r.adapters.length === 0) {
+      throw new ConfigurationError(
+        r.registered === 0 ? "No memory adapter registered. Pass a memory plugin in AgentOptions.plugins (e.g. supermemoryMemory({...}))." : `All ${r.registered} registered memory adapter(s) reported themselves unavailable \u2014 see the warnings naming each one. Check their credentials.`,
+        { code: "no_memory_adapter" }
+      );
+    }
+    return r.adapters;
+  }
+  return {
+    async write(content, ctx) {
+      const adapters = await requireAdapters();
+      const merged = mergeContext(ctx);
+      const writes = await Promise.allSettled(adapters.map((a) => a.write(content, merged)));
+      const firstFulfilled = writes.find((r) => r.status === "fulfilled");
+      if (firstFulfilled === void 0) {
+        const firstReason = writes[0];
+        throw firstReason.reason;
+      }
+      return firstFulfilled.value;
+    },
+    // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: settled-promise iteration + content dedupe + graceful degrade are 3 inline concerns; helpers would obscure the merge invariant.
+    async recall(query, ctx, k) {
+      const adapters = await requireAdapters();
+      const merged = mergeContext(ctx);
+      const recalls = await Promise.allSettled(adapters.map((a) => a.recall(query, merged, k)));
+      const out = [];
+      const seen = /* @__PURE__ */ new Set();
+      for (const r of recalls) {
+        if (r.status !== "fulfilled") continue;
+        for (const fact of r.value) {
+          if (seen.has(fact.content)) continue;
+          seen.add(fact.content);
+          out.push(fact);
+        }
+      }
+      return out;
+    },
+    async delete(id) {
+      const adapters = await requireAdapters();
+      const prefix = id.split(":", 1)[0] ?? "";
+      const target = adapters.find((a) => a.id === prefix);
+      if (target === void 0) {
+        throw new ConfigurationError(
+          `No adapter found for MemoryId prefix "${prefix}" (registered: ${adapters.map((a) => a.id).join(", ")}).`,
+          { code: "no_memory_adapter" }
+        );
+      }
+      await target.delete(id);
+    },
+    adapter() {
+      if (resolved === void 0) return null;
+      return resolved.adapters[0] ?? null;
+    }
+  };
+}
+
 // src/internal/memory/active-memory.ts
 var DEFAULTS = {
   queryMode: "recent",
@@ -8014,13 +8187,36 @@ function cacheKey(userText, queryMode, ctx) {
   return createHash("sha256").update(parts.join("\0")).digest("hex");
 }
 
-// src/internal/memory/adapters/azure-openai-embedding.ts
-var DEFAULT_AZURE_OPENAI_EMBEDDING_MODEL = "text-embedding-3-small";
-var DIMENSION_BY_MODEL = {
+// src/internal/memory/adapters/openai-embedding.ts
+var DEFAULT_OPENAI_EMBEDDING_MODEL = "text-embedding-3-small";
+var OPENAI_EMBEDDING_DIMENSIONS = {
   "text-embedding-3-small": 1536,
   "text-embedding-3-large": 3072,
   "text-embedding-ada-002": 1536
 };
+var DIMENSION_BY_MODEL = { ...OPENAI_EMBEDDING_DIMENSIONS };
+var openAiMemoryEmbeddingProviderAdapter = {
+  id: "openai",
+  defaultModel: DEFAULT_OPENAI_EMBEDDING_MODEL,
+  transport: "remote",
+  authProviderId: "openai",
+  autoSelectPriority: 20,
+  create: (options) => createOpenAiCompatibleRuntime(
+    {
+      id: "openai",
+      defaultBaseUrl: "https://api.openai.com",
+      apiKeyEnv: "OPENAI_API_KEY",
+      baseUrlEnv: "OPENAI_API_BASE_URL",
+      defaultModel: DEFAULT_OPENAI_EMBEDDING_MODEL,
+      dimensionByModel: DIMENSION_BY_MODEL
+    },
+    options
+  )
+};
+
+// src/internal/memory/adapters/azure-openai-embedding.ts
+var DEFAULT_AZURE_OPENAI_EMBEDDING_MODEL = "text-embedding-3-small";
+var DIMENSION_BY_MODEL2 = { ...OPENAI_EMBEDDING_DIMENSIONS };
 var azureOpenAiMemoryEmbeddingProviderAdapter = {
   id: "azure-openai",
   defaultModel: DEFAULT_AZURE_OPENAI_EMBEDDING_MODEL,
@@ -8035,7 +8231,7 @@ var azureOpenAiMemoryEmbeddingProviderAdapter = {
       baseUrlEnv: "AZURE_OPENAI_ENDPOINT",
       defaultModel: DEFAULT_AZURE_OPENAI_EMBEDDING_MODEL,
       embeddingsPath: "/openai/deployments/{model}/embeddings?api-version=2024-02-01",
-      dimensionByModel: DIMENSION_BY_MODEL,
+      dimensionByModel: DIMENSION_BY_MODEL2,
       // theokit#159 — Azure is NOT OpenAI on the wire, despite the name. It authenticates an API
       // key with the `api-key` header (`Authorization: Bearer` is for Entra ID tokens, not for
       // AZURE_OPENAI_API_KEY), and the deployment already rides in the path, so `model` has no
@@ -8051,7 +8247,7 @@ var azureOpenAiMemoryEmbeddingProviderAdapter = {
 
 // src/internal/memory/adapters/cohere-embedding.ts
 var DEFAULT_COHERE_EMBEDDING_MODEL = "embed-english-v3.0";
-var DIMENSION_BY_MODEL2 = {
+var DIMENSION_BY_MODEL3 = {
   "embed-english-v3.0": 1024,
   "embed-multilingual-v3.0": 1024,
   "embed-english-light-v3.0": 384,
@@ -8070,7 +8266,7 @@ var cohereMemoryEmbeddingProviderAdapter = {
       apiKeyEnv: "COHERE_API_KEY",
       defaultModel: DEFAULT_COHERE_EMBEDDING_MODEL,
       embeddingsPath: "/v2/embed",
-      dimensionByModel: DIMENSION_BY_MODEL2,
+      dimensionByModel: DIMENSION_BY_MODEL3,
       // theokit#159 — `/v2/embed` diverges in BOTH directions: it names the payload `texts`, requires
       // `input_type`, and answers `{embeddings:{float:[[...]]}}` rather than `{data:[{embedding}]}`.
       // `search_document` is the right default here because this runtime embeds material for
@@ -8091,7 +8287,7 @@ var cohereMemoryEmbeddingProviderAdapter = {
 
 // src/internal/memory/adapters/deepinfra-embedding.ts
 var DEFAULT_DEEPINFRA_EMBEDDING_MODEL = "BAAI/bge-large-en-v1.5";
-var DIMENSION_BY_MODEL3 = {
+var DIMENSION_BY_MODEL4 = {
   "BAAI/bge-large-en-v1.5": 1024,
   "BAAI/bge-base-en-v1.5": 768,
   "BAAI/bge-small-en-v1.5": 384,
@@ -8116,7 +8312,7 @@ var deepinfraMemoryEmbeddingProviderAdapter = {
       apiKeyEnv: "DEEPINFRA_API_KEY",
       baseUrlEnv: "DEEPINFRA_API_BASE_URL",
       defaultModel: DEFAULT_DEEPINFRA_EMBEDDING_MODEL,
-      dimensionByModel: DIMENSION_BY_MODEL3,
+      dimensionByModel: DIMENSION_BY_MODEL4,
       embeddingsPath: "/v1/openai/embeddings"
     },
     options
@@ -8125,7 +8321,7 @@ var deepinfraMemoryEmbeddingProviderAdapter = {
 
 // src/internal/memory/adapters/gemini-embedding.ts
 var DEFAULT_GEMINI_EMBEDDING_MODEL = "text-embedding-004";
-var DIMENSION_BY_MODEL4 = {
+var DIMENSION_BY_MODEL5 = {
   "text-embedding-004": 768,
   "embedding-001": 768
 };
@@ -8144,7 +8340,7 @@ var geminiMemoryEmbeddingProviderAdapter = {
       // theokit#159 — the compat surface is under `/v1beta/openai/`, not the default
       // `/v1/embeddings`; the previous path 404'd on every call.
       embeddingsPath: "/v1beta/openai/embeddings",
-      dimensionByModel: DIMENSION_BY_MODEL4
+      dimensionByModel: DIMENSION_BY_MODEL5
     },
     options
   )
@@ -8152,7 +8348,7 @@ var geminiMemoryEmbeddingProviderAdapter = {
 
 // src/internal/memory/adapters/jina-embedding.ts
 var DEFAULT_JINA_EMBEDDING_MODEL = "jina-embeddings-v3";
-var DIMENSION_BY_MODEL5 = {
+var DIMENSION_BY_MODEL6 = {
   "jina-embeddings-v3": 1024,
   "jina-embeddings-v2-base-en": 768,
   "jina-embeddings-v2-small-en": 512
@@ -8169,7 +8365,7 @@ var jinaMemoryEmbeddingProviderAdapter = {
       defaultBaseUrl: "https://api.jina.ai",
       apiKeyEnv: "JINA_API_KEY",
       defaultModel: DEFAULT_JINA_EMBEDDING_MODEL,
-      dimensionByModel: DIMENSION_BY_MODEL5
+      dimensionByModel: DIMENSION_BY_MODEL6
     },
     options
   )
@@ -8177,7 +8373,7 @@ var jinaMemoryEmbeddingProviderAdapter = {
 
 // src/internal/memory/adapters/mistral-embedding.ts
 var DEFAULT_MISTRAL_EMBEDDING_MODEL = "mistral-embed";
-var DIMENSION_BY_MODEL6 = {
+var DIMENSION_BY_MODEL7 = {
   "mistral-embed": 1024
 };
 var mistralMemoryEmbeddingProviderAdapter = {
@@ -8193,7 +8389,7 @@ var mistralMemoryEmbeddingProviderAdapter = {
       apiKeyEnv: "MISTRAL_API_KEY",
       baseUrlEnv: "MISTRAL_API_BASE_URL",
       defaultModel: DEFAULT_MISTRAL_EMBEDDING_MODEL,
-      dimensionByModel: DIMENSION_BY_MODEL6
+      dimensionByModel: DIMENSION_BY_MODEL7
     },
     options
   )
@@ -8202,7 +8398,7 @@ var mistralMemoryEmbeddingProviderAdapter = {
 // src/internal/memory/adapters/ollama-embedding.ts
 var DEFAULT_OLLAMA_EMBEDDING_MODEL = "nomic-embed-text";
 var OLLAMA_LOCAL_SENTINEL_KEY = "ollama-local";
-var DIMENSION_BY_MODEL7 = {
+var DIMENSION_BY_MODEL8 = {
   // Nomic — local default, recommended quality/size balance.
   "nomic-embed-text": 768,
   "nomic-embed-text:latest": 768,
@@ -8235,39 +8431,13 @@ var ollamaMemoryEmbeddingProviderAdapter = {
         apiKeyEnv: "OLLAMA_API_KEY",
         baseUrlEnv: "OLLAMA_HOST",
         defaultModel: DEFAULT_OLLAMA_EMBEDDING_MODEL,
-        dimensionByModel: DIMENSION_BY_MODEL7
+        dimensionByModel: DIMENSION_BY_MODEL8
       },
       { ...options, apiKey }
     );
   }
 };
 
-// src/internal/memory/adapters/openai-embedding.ts
-var DEFAULT_OPENAI_EMBEDDING_MODEL = "text-embedding-3-small";
-var DIMENSION_BY_MODEL8 = {
-  "text-embedding-3-small": 1536,
-  "text-embedding-3-large": 3072,
-  "text-embedding-ada-002": 1536
-};
-var openAiMemoryEmbeddingProviderAdapter = {
-  id: "openai",
-  defaultModel: DEFAULT_OPENAI_EMBEDDING_MODEL,
-  transport: "remote",
-  authProviderId: "openai",
-  autoSelectPriority: 20,
-  create: (options) => createOpenAiCompatibleRuntime(
-    {
-      id: "openai",
-      defaultBaseUrl: "https://api.openai.com",
-      apiKeyEnv: "OPENAI_API_KEY",
-      baseUrlEnv: "OPENAI_API_BASE_URL",
-      defaultModel: DEFAULT_OPENAI_EMBEDDING_MODEL,
-      dimensionByModel: DIMENSION_BY_MODEL8
-    },
-    options
-  )
-};
-
 // src/internal/memory/adapters/openrouter-embedding.ts
 var DEFAULT_OPENROUTER_EMBEDDING_MODEL = "openai/text-embedding-3-small";
 var DIMENSION_BY_MODEL9 = {
@@ -8528,10 +8698,7 @@ var LocalAgentMemory = class {
       return this.toolsCache;
     } catch (cause) {
       const message = cause instanceof Error ? cause.message : String(cause);
-      const g = globalThis;
-      const sym = /* @__PURE__ */ Symbol.for("theokit-sdk.memory.warned");
-      g[sym] ??= /* @__PURE__ */ new Set();
-      const warned2 = g[sym];
+      const warned2 = globalSingleton("theokit-sdk.memory.warned", () => /* @__PURE__ */ new Set());
       if (!warned2.has(message)) {
         warned2.add(message);
         diag(`[theokit-sdk] memory tools unavailable: ${message}
@@ -8622,111 +8789,6 @@ var LocalAgentMemory = class {
   }
 };
 
-// src/internal/local-agent/local-agent-memory-direct.ts
-async function createAvailableAdapters(entries, workspaceCwd) {
-  const available = [];
-  for (const entry of entries) {
-    const instance = await entry.createProvider(workspaceCwd);
-    if (instance.isAvailable() === false) {
-      diag(
-        `[theokit-sdk] memory adapter "${instance.id}" reports itself unavailable (plugin "${entry.pluginName}") \u2014 skipping it. Check its credentials.
-`
-      );
-      continue;
-    }
-    available.push(instance);
-  }
-  return available;
-}
-function buildAgentMemory(pluginManager, workspaceCwd, defaultContext) {
-  let resolved;
-  async function ensure() {
-    if (resolved !== void 0) return resolved;
-    const entries = pluginManager.aggregated.memoryProviders;
-    const created = await createAvailableAdapters(entries, workspaceCwd);
-    for (const adapter of created) {
-      if (adapter.initialize !== void 0) {
-        await adapter.initialize();
-      }
-    }
-    resolved = { adapters: created, initialized: true, registered: entries.length };
-    return resolved;
-  }
-  function mergeContext(partial) {
-    const merged = {
-      userId: partial?.userId ?? defaultContext?.userId ?? "",
-      ...partial?.agentId !== void 0 ? { agentId: partial.agentId } : defaultContext?.agentId !== void 0 ? { agentId: defaultContext.agentId } : {},
-      ...partial?.sessionId !== void 0 ? { sessionId: partial.sessionId } : defaultContext?.sessionId !== void 0 ? { sessionId: defaultContext.sessionId } : {},
-      ...partial?.tenantId !== void 0 ? { tenantId: partial.tenantId } : defaultContext?.tenantId !== void 0 ? { tenantId: defaultContext.tenantId } : {},
-      ...partial?.tags !== void 0 ? { tags: partial.tags } : defaultContext?.tags !== void 0 ? { tags: defaultContext.tags } : {},
-      ...partial?.metadata !== void 0 ? { metadata: partial.metadata } : defaultContext?.metadata !== void 0 ? { metadata: defaultContext.metadata } : {}
-    };
-    if (merged.userId === "") {
-      throw new ConfigurationError(
-        "agent.memory requires a userId \u2014 either set AgentOptions.memoryContext.userId or pass ctx.userId at call time.",
-        { code: "memory_context_missing_user_id" }
-      );
-    }
-    return merged;
-  }
-  async function requireAdapters() {
-    const r = await ensure();
-    if (r.adapters.length === 0) {
-      throw new ConfigurationError(
-        r.registered === 0 ? "No memory adapter registered. Pass a memory plugin in AgentOptions.plugins (e.g. supermemoryMemory({...}))." : `All ${r.registered} registered memory adapter(s) reported themselves unavailable \u2014 see the warnings naming each one. Check their credentials.`,
-        { code: "no_memory_adapter" }
-      );
-    }
-    return r.adapters;
-  }
-  return {
-    async write(content, ctx) {
-      const adapters = await requireAdapters();
-      const merged = mergeContext(ctx);
-      const writes = await Promise.allSettled(adapters.map((a) => a.write(content, merged)));
-      const firstFulfilled = writes.find((r) => r.status === "fulfilled");
-      if (firstFulfilled === void 0) {
-        const firstReason = writes[0];
-        throw firstReason.reason;
-      }
-      return firstFulfilled.value;
-    },
-    // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: settled-promise iteration + content dedupe + graceful degrade are 3 inline concerns; helpers would obscure the merge invariant.
-    async recall(query, ctx, k) {
-      const adapters = await requireAdapters();
-      const merged = mergeContext(ctx);
-      const recalls = await Promise.allSettled(adapters.map((a) => a.recall(query, merged, k)));
-      const out = [];
-      const seen = /* @__PURE__ */ new Set();
-      for (const r of recalls) {
-        if (r.status !== "fulfilled") continue;
-        for (const fact of r.value) {
-          if (seen.has(fact.content)) continue;
-          seen.add(fact.content);
-          out.push(fact);
-        }
-      }
-      return out;
-    },
-    async delete(id) {
-      const adapters = await requireAdapters();
-      const prefix = id.split(":", 1)[0] ?? "";
-      const target = adapters.find((a) => a.id === prefix);
-      if (target === void 0) {
-        throw new ConfigurationError(
-          `No adapter found for MemoryId prefix "${prefix}" (registered: ${adapters.map((a) => a.id).join(", ")}).`,
-          { code: "no_memory_adapter" }
-        );
-      }
-      await target.delete(id);
-    },
-    adapter() {
-      if (resolved === void 0) return null;
-      return resolved.adapters[0] ?? null;
-    }
-  };
-}
-
 // src/internal/local-agent/local-agent-memory-provider.ts
 var INTERNAL_LAM_KEY = /* @__PURE__ */ Symbol("sdk-core.local-agent-memory-provider.glue");
 function createLocalAgentMemoryProvider(opts) {
@@ -8945,29 +9007,27 @@ function applyPersonalityOverlay(preset, base) {
 
 ${preset.systemPrompt}`;
 }
-async function localAgentUsePersonality(args) {
-  if (args.disposed) throw new Error("Agent has been disposed");
+async function localAgentUsePersonality(agent, name, opts) {
   if (currentPersonalityContext() !== void 0) {
-    warnPersonalitySwitchInsideFork(args.agentId);
+    warnPersonalitySwitchInsideFork(agent.agentId);
     return null;
   }
-  let registry = args.personalityRegistry;
-  if (registry === void 0) {
-    registry = await PersonalityRegistry.load(args.workspaceCwd);
-    args.onRegistryLoaded(registry);
+  if (agent.personalityRegistry === void 0) {
+    agent.personalityRegistry = await PersonalityRegistry.load(agent.workspaceCwd);
   }
+  const registry = agent.personalityRegistry;
   return withCwdMutex(
-    `agent-send:${args.agentId}`,
+    `agent-send:${agent.agentId}`,
     () => performPersonalitySwitch({
-      agentId: args.agentId,
-      prevSlug: args.personalityStore.active(args.agentId),
-      requestedName: args.name,
+      agentId: agent.agentId,
+      prevSlug: agent.personalityStore.active(agent.agentId),
+      requestedName: name,
       registry,
-      store: args.personalityStore,
-      invalidateCache: (reason) => args.invalidateCache(reason),
-      appendSessionMessage: (msg) => appendSessionMessage(args.agentId, msg),
-      clearSession: () => clearSession(args.agentId),
-      opts: args.opts ?? {}
+      store: agent.personalityStore,
+      invalidateCache: (reason) => agent.invalidateCache(reason),
+      appendSessionMessage: (msg) => appendSessionMessage(agent.agentId, msg),
+      clearSession: () => clearSession(agent.agentId),
+      opts: opts ?? {}
     })
   );
 }
@@ -8975,9 +9035,9 @@ async function localAgentUsePersonality(args) {
 // src/internal/local-agent/local-agent-runtime-extensions.ts
 function localAgentRunUntil(agent, goal, options) {
   async function* wrap() {
-    const { runUntilImpl } = await import('./run-until-HEQOUVU6.js');
+    const { runUntilImpl } = await import('./run-until-6D6TQ4JN.js');
     const buildDeps = async () => {
-      const { judgeCallImpl } = await import('./judge-call-LVXABPS3.js');
+      const { judgeCallImpl } = await import('./judge-call-6MVARKU2.js');
       const { getAgentFacade } = await import('./agent-factory-registry-ZVTABLEY.js');
       const create = getAgentFacade().create;
       return {
@@ -9008,9 +9068,9 @@ async function* localAgentStreamToCompletion(agent, message, options) {
   return yield* streamToCompletionImpl({ send: (m, o) => agent.send(m, o) }, message, options);
 }
 async function localAgentFork(parent, options) {
-  const { forkAgentImpl } = await import('./fork-agent-RSV4E3EA.js');
+  const { forkAgentImpl } = await import('./fork-agent-S2EPIML7.js');
   const { getAgentFacade } = await import('./agent-factory-registry-ZVTABLEY.js');
-  const { withPersonalityContext } = await import('./context-GQRFBCLP.js');
+  const { withPersonalityContext } = await import('./context-NZ2AC6S7.js');
   const create = getAgentFacade().create;
   return withPersonalityContext(
     { slug: parent.personalitySlugSnapshot, isFork: true },
@@ -9039,7 +9099,7 @@ async function persistMemoryFactIfWritePrompt(workspaceCwd, memoryConfig, userTe
   }
 }
 
-// src/internal/runtime/concurrency/abort-utils.ts
+// src/internal/concurrency/abort-utils.ts
 function anySignal(signals) {
   const filtered = signals.filter((s) => s !== void 0);
   if (filtered.length === 0) {
@@ -9103,7 +9163,7 @@ function wrapRunWithCompletionCheck(args) {
   });
 }
 
-// src/internal/runtime/memory/select-facts.ts
+// src/internal/runtime/memory-glue/select-facts.ts
 var DEFAULT_MAX_ENTRIES = 10;
 var CHARS_PER_TOKEN = 3.7;
 var DEFAULT_MAX_TOKENS = 15e3;
@@ -9505,7 +9565,12 @@ async function applyInputProcessors(inputs, message, rawUserText, options, sendM
 }
 async function executeSendLocked(inputs, message, options) {
   if (inputs.disposed) throw new AgentDisposedError(inputs.agentId);
-  await consumePending(inputs.agentId, inputs.invalidationPending, inputs.clearInvalidation, inputs.reload);
+  await consumePending(
+    inputs.agentId,
+    inputs.invalidationPending,
+    inputs.clearInvalidation,
+    inputs.reload
+  );
   const sendModel = normalizeModel(options.model);
   inputs.applyModelOverride(sendModel);
   const rawUserText = typeof message === "string" ? message : message.text;
@@ -9531,37 +9596,30 @@ async function executeSendLocked(inputs, message, options) {
   appendSessionMessage(inputs.agentId, { role: "user", text: userText });
   await persistMemoryFactIfWritePrompt(inputs.workspaceCwd, inputs.options.memory, userText);
   const memoryFacts = await readMemoryForSend(inputs.workspaceCwd, inputs.options.memory, userText);
-  const portPathActive = shouldUsePortMemoryPath();
-  const legacyTools = portPathActive ? void 0 : await inputs.memoryGlue.ensureTools();
-  const legacySummary = portPathActive ? void 0 : await inputs.memoryGlue.runActiveMemoryIfEnabled(userText, priorMessages, inputs.telemetry);
-  const memoryTools = resolveMemoryToolsForLoop(legacyTools, portPathActive);
-  const activeMemorySummary = resolveActiveMemorySummaryForSend(legacySummary, portPathActive);
-  const effectiveMemoryProvider = resolveMemoryProviderForLoop(
-    inputs.options.memoryProvider,
-    inputs.defaultMemoryProviderForLoop,
-    portPathActive
-  );
+  const memoryTools = void 0;
+  const activeMemorySummary = void 0;
+  const effectiveMemoryProvider = inputs.options.memoryProvider ?? inputs.defaultMemoryProviderForLoop;
   const baseSystemPrompt = await inputs.resolveSystemPromptForSend(userText, options, memoryFacts);
-  const assembledSystemPrompt = await inputs.assembleSystemPromptForSend(
+  const assembledSystemPrompt = await inputs.assembleSystemPromptForSend({
     userText,
     baseSystemPrompt,
     memoryFacts,
     activeMemorySummary,
-    options.contextPaths
-  );
+    contextPaths: options.contextPaths
+  });
   const composedOptions = {
     ...options,
     signal: anySignal([options.signal, inputs.lifecycleAbortController.signal])
   };
-  const run = await inputs.dispatchRun(
-    adaptedMessage,
-    composedOptions,
-    assembledSystemPrompt,
+  const run = await inputs.dispatchRun({
+    message: adaptedMessage,
+    options: composedOptions,
+    systemPrompt: assembledSystemPrompt,
     memoryFacts,
     priorMessages,
     memoryTools,
-    effectiveMemoryProvider
-  );
+    memoryProviderOverride: effectiveMemoryProvider
+  });
   const outputProcessors = inputs.options.outputProcessors;
   const processedRun = outputProcessors !== void 0 && outputProcessors.length > 0 ? wrapRunWithOutputProcessors({
     run,
@@ -9586,7 +9644,7 @@ async function executeSendLocked(inputs, message, options) {
 function buildCompletionCheckDeps() {
   return {
     judge: async (ctx, opts) => {
-      const { judgeCallImpl } = await import('./judge-call-LVXABPS3.js');
+      const { judgeCallImpl } = await import('./judge-call-6MVARKU2.js');
       const { getAgentFacade } = await import('./agent-factory-registry-ZVTABLEY.js');
       return judgeCallImpl(ctx, opts, { create: getAgentFacade().create });
     }
@@ -9649,8 +9707,77 @@ function registerRunAsTask(run, agentId, taskOpt, userText) {
   });
 }
 
+// src/internal/local-agent/local-option-keys.ts
+var KNOWN_LOCAL_OPTION_KEYS = /* @__PURE__ */ new Set([
+  "cwd",
+  "settingSources",
+  "compatSources",
+  "sandboxOptions",
+  "sessionDir",
+  "baseDir",
+  "sessionStore"
+]);
+var reported = /* @__PURE__ */ new Set();
+function distance(a, b) {
+  let previous = Array.from({ length: b.length + 1 }, (_, j) => j);
+  for (let i = 1; i <= a.length; i++) {
+    const current = [i, ...new Array(b.length).fill(0)];
+    for (let j = 1; j <= b.length; j++) {
+      const cost = a.charAt(i - 1) === b.charAt(j - 1) ? 0 : 1;
+      current[j] = Math.min(
+        (previous[j] ?? 0) + 1,
+        (current[j - 1] ?? 0) + 1,
+        (previous[j - 1] ?? 0) + cost
+      );
+    }
+    previous = current;
+  }
+  return previous[b.length] ?? 0;
+}
+function nearest(key) {
+  let best;
+  let bestDistance = 4;
+  for (const known of KNOWN_LOCAL_OPTION_KEYS) {
+    const d = distance(key.toLowerCase(), known.toLowerCase());
+    if (d < bestDistance) {
+      bestDistance = d;
+      best = known;
+    }
+  }
+  return best;
+}
+function reportUnknownLocalOptions(local) {
+  if (local === void 0) return;
+  for (const key of Object.keys(local)) {
+    if (KNOWN_LOCAL_OPTION_KEYS.has(key)) continue;
+    if (reported.has(key)) continue;
+    reported.add(key);
+    const guess = nearest(key);
+    const hint = guess === void 0 ? "" : ` Did you mean \`${guess}\`?`;
+    diag(
+      `[theokit] \`local.${key}\` is not an option this SDK version knows, so it was ignored.${hint}
+`
+    );
+  }
+}
+
 // src/internal/local-agent/local-agent.ts
 var LocalAgent = class {
+  /**
+   * Operations this runtime does not perform. See {@link SDKAgent.supports} for why asking beats
+   * catching: the members below are present on the type — `downloadArtifact` is REQUIRED — and
+   * answering them by throwing is what leaves a caller unable to branch without a try/catch.
+   *
+   * Artifacts are a cloud concept: `downloadArtifact` rejects unconditionally here, and
+   * `listArtifacts` returns `[]` for every state, so its empty array cannot be read as "this run
+   * produced none".
+   */
+  supports(operation) {
+    return localAgentCapabilities.supports(operation);
+  }
+  unsupportedReason(operation) {
+    return localAgentCapabilities.unsupportedReason(operation);
+  }
   agentId;
   model;
   context;
@@ -9687,14 +9814,14 @@ var LocalAgent = class {
   pluginsManager;
   hooksExecutor;
   systemPromptPipeline = SystemPromptPipeline.default();
-  memoryGlue;
   /**
-   * SDK 2.0 Phase 1 physical Stage 2b — iter 19+: pre-built adapter
-   * wrapping `memoryGlue` as a MemoryProvider impl. Constructed eagerly
-   * so future iters can flip `inputs.memoryProvider` to default to
-   * THIS adapter when consumer didn't supply one. NOT YET used by
-   * `send()` — the kernel flip lands in Stage 2b proper after equivalence
-   * regression coverage.
+   * The agent's memory, behind the `MemoryProvider` port — the only memory path since the kernel
+   * flip (2026-09-02). A consumer-supplied `options.memoryProvider` takes precedence; this is what
+   * runs otherwise.
+   *
+   * It used to be built ALONGSIDE a `LocalAgentMemory` this class held directly, "so future iters
+   * can flip", while `send()` used the direct one. The adapter constructs its own `LocalAgentMemory`
+   * inside `init()`, so that arrangement kept two of them per agent and the second was never read.
    *
    * Accessible to tests via `_defaultMemoryProviderForLoop()` helper.
    * @internal
@@ -9703,6 +9830,10 @@ var LocalAgent = class {
   /** T4.1 — PluginManager for code plugins (kind: general/model-provider/memory). @internal */
   pluginManagerCode = new PluginManager();
   /** Personality presets — lazy-loaded on first `usePersonality` call (ADRs D160-D164). @internal */
+  // Not private: `local-agent-personality-extensions.ts` reads both through
+  // `LocalAgentPersonalityTarget`, the same way `local-agent-lifecycle.ts` reads `sessionStore` and
+  // `lifecycleAbortController` above. A field a sibling module needs is part of this class's
+  // implementation surface, and saying so beats handing it over as a closure.
   personalityRegistry;
   personalityStore;
   /** T0.1 — telemetry handle shared with sendLocked + memory recall path. */
@@ -9729,8 +9860,10 @@ var LocalAgent = class {
     if (sub.skills !== void 0) this.skills = sub.skills;
     this.pluginsManager = sub.pluginsManager;
     if (sub.plugins !== void 0) this.plugins = sub.plugins;
-    this.hooksExecutor = new HooksExecutor(this.workspaceCwd);
-    this.memoryGlue = new LocalAgentMemory(options, this.workspaceCwd, this.agentId);
+    reportUnknownLocalOptions(options.local);
+    const compatSources = options.local?.compatSources ?? [];
+    reportUndeclaredSources(this.workspaceCwd, compatSources);
+    this.hooksExecutor = new HooksExecutor(this.workspaceCwd, compatSources);
     this.defaultMemoryProviderForLoop = createLocalAgentMemoryProvider({
       agentOptions: options,
       workspaceCwd: this.workspaceCwd,
@@ -9760,7 +9893,8 @@ var LocalAgent = class {
     this.resolvedSubagents = await loadSubagents(
       this.workspaceCwd,
       this.settingSourcesIncludeProject,
-      this.options.agents
+      this.options.agents,
+      this.options.local?.compatSources ?? []
     );
     await acquireLeaseIfPossible(this.sessionStore, this.agentId);
     try {
@@ -9826,11 +9960,6 @@ var LocalAgent = class {
     if (options.task !== void 0) registerRunAsTask(run, this.agentId, options.task, userText);
     resolve(run);
     try {
-      const postRunProvider = resolveMemoryProviderForLoop(
-        this.options.memoryProvider,
-        this.defaultMemoryProviderForLoop,
-        shouldUsePortMemoryPath()
-      );
       await runPostRunLifecycle({
         run,
         userText,
@@ -9843,10 +9972,13 @@ var LocalAgent = class {
         ...this.options.apiKey !== void 0 ? { apiKey: this.options.apiKey } : {},
         ...options.onRunEvent !== void 0 ? { onRunEvent: options.onRunEvent } : {},
         hooksExecutor: this.hooksExecutor,
-        memoryGlue: this.memoryGlue,
         // usetheokit/theokit-sdk#382 — the transcript write reads this and nothing else.
         memory: this.options.memory,
-        ...postRunProvider !== void 0 ? { memoryProvider: postRunProvider } : {}
+        // A consumer-supplied provider wins; otherwise the auto-installed adapter over
+        // `LocalAgentMemory`. Since the kernel flip there is no third case, so this is passed
+        // unconditionally — the `!== undefined` spread that used to guard it could not be false,
+        // and `recordSessionSummary` is now always reached through the port.
+        memoryProvider: this.options.memoryProvider ?? this.defaultMemoryProviderForLoop
       });
     } finally {
       sendSpan.end();
@@ -9865,24 +9997,30 @@ var LocalAgent = class {
         applyModelOverride: (m) => this.applyModelOverride(m),
         options: this.options,
         pluginManagerCode: this.pluginManagerCode,
-        memoryGlue: this.memoryGlue,
         defaultMemoryProviderForLoop: this.defaultMemoryProviderForLoop,
         workspaceCwd: this.workspaceCwd,
         telemetry: this._telemetry,
         lifecycleAbortController: this.lifecycleAbortController,
         runPreHook: (ut) => this.runPreHook(ut),
-        // biome-ignore format: G8 budget — callbacks wire to private methods.
         resolveSystemPromptForSend: (ut, o, mf) => this.resolveSystemPrompt(ut, o, mf),
-        assembleSystemPromptForSend: (ut, bp, mf, ams, cp) => assembleSystemPromptForSend(this.assemblyInputs(), ut, bp, mf, ams, cp),
-        dispatchRun: (msg, o, sp, mf, pm, mt, mp) => this.dispatchRun(msg, o, sp, mf, pm, mt, mp)
+        assembleSystemPromptForSend: (request) => assembleSystemPromptForSend({ ...request, inputs: this.assemblyInputs() }),
+        dispatchRun: (args) => this.dispatchRun(args)
       },
       message,
       options
     );
   }
-  // biome-ignore format: G8 budget — thin accessor for the assembly inputs.
   assemblyInputs() {
-    return { agentId: this.agentId, workspaceCwd: this.workspaceCwd, model: this.model, options: this.options, context: this.context, skillsManager: this.skillsManager, settingSourcesIncludeProject: this.settingSourcesIncludeProject, systemPromptPipeline: this.systemPromptPipeline };
+    return {
+      agentId: this.agentId,
+      workspaceCwd: this.workspaceCwd,
+      model: this.model,
+      options: this.options,
+      context: this.context,
+      skillsManager: this.skillsManager,
+      settingSourcesIncludeProject: this.settingSourcesIncludeProject,
+      systemPromptPipeline: this.systemPromptPipeline
+    };
   }
   async resolveSystemPrompt(userText, options, memoryFacts) {
     const base = await resolveSystemPromptForSend(
@@ -9899,9 +10037,12 @@ var LocalAgent = class {
     return applyPersonalityOverlay(this.activePreset(), base);
   }
   /** @internal — read-only personality lookup (composes the helper, honors fork ALS). */
-  // biome-ignore format: keep one-liner so the personality lookup stays under G8.
   activePreset() {
-    return resolveActivePersonalityPreset({ agentId: this.agentId, personalityStore: this.personalityStore, personalityRegistry: this.personalityRegistry });
+    return resolveActivePersonalityPreset({
+      agentId: this.agentId,
+      personalityStore: this.personalityStore,
+      personalityRegistry: this.personalityRegistry
+    });
   }
   applyModelOverride(overrideModel) {
     if (overrideModel === void 0) return;
@@ -9921,7 +10062,15 @@ var LocalAgent = class {
       );
     }
   }
-  dispatchRun(message, options, systemPrompt, memoryFacts, priorMessages, memoryTools, memoryProviderOverride) {
+  dispatchRun({
+    message,
+    options,
+    systemPrompt,
+    memoryFacts,
+    priorMessages,
+    memoryTools,
+    memoryProviderOverride
+  }) {
     const effectiveAgentOptions = memoryProviderOverride !== void 0 && this.options.memoryProvider === void 0 ? { ...this.options, memoryProvider: memoryProviderOverride } : this.options;
     return dispatchLocalRun({
       inputs: {
@@ -9957,11 +10106,17 @@ var LocalAgent = class {
   [Symbol.asyncDispose]() {
     return this.dispose();
   }
-  // biome-ignore format: multi-line layout would push file past G8 LoC cap.
   /** T3.2 / ADR D94 — public `invalidateCache` API. @internal */
-  invalidateCache = (reason, opts = {}) => invalidateCacheImpl(this.agentId, reason, opts, this.disposed, () => this.dispose(), (p) => {
-    this.invalidationPending = p;
-  });
+  invalidateCache = (reason, opts = {}) => invalidateCacheImpl(
+    this.agentId,
+    reason,
+    opts,
+    this.disposed,
+    () => this.dispose(),
+    (p) => {
+      this.invalidationPending = p;
+    }
+  );
   /**
    * Activate a personality preset (Hermes #26, ADRs D160-D164).
    *
@@ -9976,41 +10131,33 @@ var LocalAgent = class {
    * @public
    */
   usePersonality(name, opts) {
-    return localAgentUsePersonality({
-      agentId: this.agentId,
-      workspaceCwd: this.workspaceCwd,
-      disposed: this.disposed,
-      personalityStore: this.personalityStore,
-      personalityRegistry: this.personalityRegistry,
-      invalidateCache: (reason) => this.invalidateCache(reason),
-      onRegistryLoaded: (reg) => {
-        this.personalityRegistry = reg;
-      },
-      name,
-      ...opts !== void 0 ? { opts } : {}
-    });
+    if (this.disposed) throw new Error("Agent has been disposed");
+    return localAgentUsePersonality(this, name, opts);
   }
-  // biome-ignore format: G8 budget — artifact stubs (local agents have no artifacts); kept 1-line each.
+  // The two operations `local-agent-capabilities.ts` is ABOUT: their runtime answers live beside the
+  // static answer `supports()` gives, so a change to one cannot drift from the other.
   listArtifacts() {
-    return Promise.resolve([]);
+    return localAgentCapabilities.listArtifacts();
   }
-  // biome-ignore format: G8 budget — see listArtifacts.
   downloadArtifact(_path) {
-    return Promise.reject(new UnsupportedRunOperationError("Artifacts are not supported for local agents", "downloadArtifact"));
+    return localAgentCapabilities.downloadArtifact();
   }
-  // biome-ignore format: G8 budget — delegates to `local-agent-runtime-extensions.ts`; kept 1-line.
   runUntil(goal, options) {
     return localAgentRunUntil(this, goal, options);
   }
-  // biome-ignore format: G8 budget — see runUntil comment above.
   fork(options) {
-    return localAgentFork({ agentId: this.agentId, options: this.options, personalitySlugSnapshot: this.personalityStore.active(this.agentId) }, options);
+    return localAgentFork(
+      {
+        agentId: this.agentId,
+        options: this.options,
+        personalitySlugSnapshot: this.personalityStore.active(this.agentId)
+      },
+      options
+    );
   }
-  // biome-ignore format: G8 budget — see runUntil comment above.
   runToCompletion(message, options) {
     return localAgentRunToCompletion(this, message, options);
   }
-  // biome-ignore format: G8 budget — see runUntil comment above.
   streamToCompletion(message, options) {
     return localAgentStreamToCompletion(this, message, options);
   }
@@ -10023,7 +10170,7 @@ function includesSetting(options, source) {
   return sources !== void 0 && (sources.includes(source) || sources.includes("all"));
 }
 
-// src/agent-helpers.ts
+// src/internal/agent/helpers.ts
 async function runCreateUnderSpan(options, span) {
   options = { ...options, model: normalizeModel(options.model) };
   validateAgentOptions(options);
@@ -10197,17 +10344,21 @@ async function validateRehydratedAgent(agentId, entry) {
   if (entry.runtime !== "local") return;
   const candidate = entry.options.local?.cwd ?? entry.cwd;
   if (typeof candidate !== "string") return;
+  let info;
   try {
-    const info = await stat(candidate);
-    if (!info.isDirectory()) {
-      throw new Error(`Workspace path is not a directory: ${candidate}`);
-    }
+    info = await stat(candidate);
   } catch (cause) {
     throw new UnknownAgentError(
       `Agent "${agentId}" cannot be rehydrated \u2014 workspace cwd "${candidate}" is missing or inaccessible.`,
       { code: "agent_rehydration_failed", cause }
     );
   }
+  if (!info.isDirectory()) {
+    throw new UnknownAgentError(
+      `Agent "${agentId}" cannot be rehydrated \u2014 workspace cwd "${candidate}" exists but is not a directory.`,
+      { code: "agent_rehydration_failed" }
+    );
+  }
 }
 function toAgentInfo(agent) {
   return isLocalAgentId(agent.agentId) ? toLocalAgentInfo(agent) : toCloudAgentInfo(agent);
@@ -10414,7 +10565,7 @@ var Agent = class _Agent {
    * @public
    */
   static async generateObject(options) {
-    const { generateObjectImpl } = await import('./generate-object-GUNAUVBX.js');
+    const { generateObjectImpl } = await import('./generate-object-BXV7BZRP.js');
     return generateObjectImpl(options, {
       create: (opts) => _Agent.create(opts),
       delete: (agentId) => _Agent.delete(agentId)
@@ -10438,7 +10589,7 @@ var Agent = class _Agent {
       delete: (agentId) => _Agent.delete(agentId)
     };
     async function* wrapper() {
-      streamObjectImport ??= import('./stream-object-UF4QRQRU.js');
+      streamObjectImport ??= import('./stream-object-HBFMIZLD.js');
       const { streamObjectImpl } = await streamObjectImport;
       yield* streamObjectImpl(options, deps);
     }
@@ -10462,7 +10613,7 @@ var Agent = class _Agent {
    * @public
    */
   static async batch(prompts, options) {
-    const { batchImpl } = await import('./batch-L4ZXS46M.js');
+    const { batchImpl } = await import('./batch-US4F6WPK.js');
     return batchImpl(prompts, options, { create: (opts) => _Agent.create(opts) });
   }
   /**
@@ -10486,7 +10637,7 @@ var Agent = class _Agent {
    *
    *   This bullet used to say the opposite ("Disposed agents are NOT auto-deleted...
    *   call `Agent.delete(agentId)` first"). It was measured false in M91:
-   *   `tests/m91-getorcreate-after-dispose.test.ts` builds an agent, disposes it, and
+   *   `tests/agent-getorcreate-after-dispose.test.ts` builds an agent, disposes it, and
    *   gets a different instance back. The claim was about the PERSISTENT registry and
    *   read as being about the live cache — and consumers built around the wrong half.
    *   The agent-builder's M85 interrupt rotates the session id to work around a
@@ -10613,17 +10764,8 @@ var Agent = class _Agent {
    * @public
    */
   static async compact(agentId, options = {}) {
-    let reg = getRegisteredAgent(agentId);
-    if (reg === void 0) {
-      await hydrateRegistryFromDisk(process.cwd());
-      reg = getRegisteredAgent(agentId);
-    }
-    if (reg === void 0 || reg.runtime !== "local") {
-      throw new UnknownAgentError(
-        `No local agent "${agentId}" registered \u2014 compact targets local sessions.`
-      );
-    }
-    const { compactSessionTranscript, buildDefaultSummarizer: buildDefaultSummarizer2 } = await import('./compact-session-RIGOWC4Y.js');
+    const reg = await requireLocalAgent(agentId, "compact");
+    const { compactSessionTranscript, buildDefaultSummarizer: buildDefaultSummarizer2 } = await import('./compact-session-W4WLJTHA.js');
     const { cwd, model, store } = await openLocalStore(reg);
     return enqueueSessionWrite(
       cwd,
@@ -10649,17 +10791,8 @@ var Agent = class _Agent {
    * @public
    */
   static async injectSessionTurn(agentId, turn) {
-    let reg = getRegisteredAgent(agentId);
-    if (reg === void 0) {
-      await hydrateRegistryFromDisk(process.cwd());
-      reg = getRegisteredAgent(agentId);
-    }
-    if (reg === void 0 || reg.runtime !== "local") {
-      throw new UnknownAgentError(
-        `No local agent "${agentId}" registered \u2014 injectSessionTurn targets local sessions.`
-      );
-    }
-    const { injectSessionTurn } = await import('./inject-session-DAR7OUCW.js');
+    const reg = await requireLocalAgent(agentId, "injectSessionTurn");
+    const { injectSessionTurn } = await import('./inject-session-SUM6TDJF.js');
     const { cwd, model, store } = await openLocalStore(reg);
     await injectSessionTurn({
       store,
@@ -10688,17 +10821,8 @@ var Agent = class _Agent {
    * @public
    */
   static async transcript(agentId) {
-    let reg = getRegisteredAgent(agentId);
-    if (reg === void 0) {
-      await hydrateRegistryFromDisk(process.cwd());
-      reg = getRegisteredAgent(agentId);
-    }
-    if (reg === void 0 || reg.runtime !== "local") {
-      throw new UnknownAgentError(
-        `No local agent "${agentId}" registered \u2014 transcript targets local sessions.`
-      );
-    }
-    const { readSessionMessages } = await import('./agent-session-store-OPGRB4XM.js');
+    const reg = await requireLocalAgent(agentId, "transcript");
+    const { readSessionMessages } = await import('./agent-session-store-AFML3AXC.js');
     const { store } = await openLocalStore(reg);
     return readSessionMessages(store, agentId);
   }
@@ -10719,7 +10843,7 @@ var Agent = class _Agent {
    */
   static async describe(agentId) {
     const agent = await getRegisteredAgentOrThrow(agentId);
-    const { loadSubagents: loadSubagents2 } = await import('./subagents-loader-CRT5LLL3.js');
+    const { loadSubagents: loadSubagents2 } = await import('./subagents-loader-LSKM2UIK.js');
     const settingSources = agent.options.local?.settingSources;
     const subagents = await loadSubagents2(
       agent.cwd ?? process.cwd(),
@@ -10782,17 +10906,30 @@ setAgentFacade({
   resume: (agentId, options) => Agent.resume(agentId, options),
   batch: (prompts, options) => Agent.batch(prompts, options)
 });
+async function requireLocalAgent(agentId, operation) {
+  let reg = getRegisteredAgent(agentId);
+  if (reg === void 0) {
+    await hydrateRegistryFromDisk(process.cwd());
+    reg = getRegisteredAgent(agentId);
+  }
+  if (reg === void 0 || reg.runtime !== "local") {
+    throw new UnknownAgentError(
+      `No local agent "${agentId}" registered \u2014 ${operation} targets local sessions.`
+    );
+  }
+  return reg;
+}
 async function openLocalStore(reg) {
   const cwd = reg.cwd ?? process.cwd();
   const optModel = reg.options.model;
   const model = reg.model?.id ?? (typeof optModel === "string" ? optModel : optModel?.id) ?? "unknown";
-  const { FsSessionStore: FsSessionStore2 } = await import('./fs-session-store-NM6YSTE2.js');
-  const { defaultBaseDir: defaultBaseDir2, expandTilde: expandTilde2 } = await import('./session-transcript-XAEKW6P7.js');
+  const { FsSessionStore: FsSessionStore2 } = await import('./fs-session-store-77JU46UZ.js');
+  const { defaultBaseDir: defaultBaseDir2, expandTilde: expandTilde2 } = await import('./session-transcript-VTBTCGQX.js');
   const configuredSessionDir = reg.options.local?.sessionDir ?? reg.options.local?.baseDir;
   const baseDir = configuredSessionDir !== void 0 ? expandTilde2(configuredSessionDir) : defaultBaseDir2();
   return { cwd, model, store: new FsSessionStore2({ baseDir, cwd }) };
 }
 
 export { Agent, AgentBuilder, DEFAULT_AGENTIC_MODEL_ID, MEMORY_EMBEDDING_ADAPTERS, Tool, ToolError, UsageAccumulator, computeCost, generateCronId, getPricingEntry, openRouterMemoryEmbeddingProviderAdapter };
-//# sourceMappingURL=chunk-25BD2R5G.js.map
-//# sourceMappingURL=chunk-25BD2R5G.js.map
+//# sourceMappingURL=chunk-NCGWJ3HS.js.map
+//# sourceMappingURL=chunk-NCGWJ3HS.js.map