@theokit/sdk 5.10.0 → 5.11.1

package/dist/{chunk-RTE2DD4S.js → chunk-MHIBYKWA.js}

@@ -1,13 +1,13 @@
 import { submit, emitRunEvent } from './chunk-XKMVJ443.js';
-import { enqueueSessionWrite, hydrateSession, persistTurnToTranscript, flushSessionWrites, appendSessionMessage, getSessionMessages, discardSession, clearSession } from './chunk-EXI7EHDN.js';
+import { enqueueSessionWrite, hydrateSession, persistTurnToTranscript, flushSessionWrites, appendSessionMessage, getSessionMessages, discardSession, clearSession } from './chunk-Q34EBNYG.js';
 import { IndexManager } from './chunk-DPY2M74T.js';
 import { currentPersonalityContext, warnPersonalitySwitchInsideFork } from './chunk-ZHWKT2NI.js';
 import { extractCodePlugins } from './chunk-2SFBB54R.js';
-import { createOpenAiCompatibleRuntime } from './chunk-HI3W37FY.js';
+import { createOpenAiCompatibleRuntime } from './chunk-U27XHOEF.js';
 import { persistActiveMemoryTranscript } from './chunk-OR6XIWLB.js';
 import { resolveMaxFacts, writeSessionSummary, resolveMemoryRoot, MEMORY_KINDS, appendFact, readFacts, legacyMemoryJsonPath, memoryMdPath, appendFactToMarkdown } from './chunk-X3LOJJMO.js';
 import { FsSessionStore } from './chunk-IZDDSLL2.js';
-import { discoverProviderPlugins, validateApiKeyShape, getConfiguredBaseUrl, httpRequest, isFixtureApiKey, presentProviderCredentialEnvVars, buildDefaultSummarizer, shouldUseRealLocalRuntime, parseSseStream, CircuitBreaker, resolveRunProvider, mergeExplicitApiKey, resolveProviderChain, abortError, tryFirstEvent, relayStream, renderToolResultContentText } from './chunk-EVH3OUMY.js';
+import { discoverProviderPlugins, validateApiKeyShape, getConfiguredBaseUrl, httpRequest, isFixtureApiKey, presentProviderCredentialEnvVars, buildDefaultSummarizer, shouldUseRealLocalRuntime, parseSseStream, CircuitBreaker, resolveRunProvider, mergeExplicitApiKey, resolveProviderChain, abortError, tryFirstEvent, relayStream, renderToolResultContentText } from './chunk-BBJ77S62.js';
 import { resolveChildEnv } from './chunk-HKCKOAIO.js';
 import { DEFAULT_MAX_BYTES_PER_FILE, runDiscovery, truncateWithMarker } from './chunk-7QJYKVP6.js';
 import { warnFailureOnce, loadHookConfig, warnOnce } from './chunk-OPAKPEPG.js';
@@ -29,6 +29,7 @@ import { loadSubagents, pluginBundleDirs } from './chunk-ZDYDBXSD.js';
 import { reportUndeclaredSources, theokitConfigRoot, undefinedVariablesIn, getTheokitHome, adapterForConfigPath, adaptersForSurface, projectConfigRoots, pluginBundleRoots } from './chunk-X7EUUHXU.js';
 import { readWorkspaceDir, parseSimpleYaml } from './chunk-MQGSOKR3.js';
 import { resolveEffectiveContextWindow, CONTEXT_WINDOW_FLOOR, CONTEXT_WINDOW_MARGIN } from './chunk-GMRFAX4I.js';
+import { isAnthropicFamilyModel } from './chunk-LZJXEPEQ.js';
 import { parseModelId } from './chunk-R7WIIPUR.js';
 import { getProviderProfile } from './chunk-I2ORT6QD.js';
 import { getCatalogModelInfo, isPatchedModelKey } from './chunk-SVCPJRUB.js';
@@ -5804,14 +5805,27 @@ function stripThinkBlocks(content) {
 // 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>`;
+  const block = activeMemoryBlock(additions);
   if (systemPrompt === void 0 || systemPrompt.length === 0) return block;
   return `${block}
 
 ${systemPrompt}`;
 }
+function activeMemoryBlock(additions) {
+  return `<active-memory>
+${escapeBlockBody(additions)}
+</active-memory>`;
+}
+function buildLoopSystem(systemPrompt, additions, modelId) {
+  if (!isAnthropicFamilyModel(modelId) || systemPrompt === void 0 || systemPrompt.length === 0) {
+    return resolveSystemPromptWithMemoryAdditions(systemPrompt, additions);
+  }
+  const blocks = [{ text: systemPrompt, cacheable: true }];
+  if (additions !== void 0 && additions.length > 0) {
+    blocks.push({ text: activeMemoryBlock(additions) });
+  }
+  return blocks;
+}
 function toLlmTool(tool) {
   return { name: tool.name, description: tool.description, inputSchema: tool.inputSchema };
 }
@@ -5850,9 +5864,10 @@ async function streamLlmTurn(inputs, ctx) {
     {
       model: inputs.model.id ?? "auto",
       ...(() => {
-        const effective = resolveSystemPromptWithMemoryAdditions(
+        const effective = buildLoopSystem(
           inputs.systemPrompt,
-          ctx.memorySystemPromptAdditions
+          ctx.memorySystemPromptAdditions,
+          inputs.model.id
         );
         return effective !== void 0 ? { system: effective } : {};
       })(),
@@ -5955,6 +5970,7 @@ function registerLoopError(ctx, cause) {
 async function consumeStreamEvent(inputs, reasoning, event) {
   if (event.type === "text_delta") {
     const text = event.text ?? "";
+    if (text.length > 0) await closeReasoningOnce(inputs, reasoning);
     await emitTextDeltaCallback(inputs, text);
     return text;
   }
@@ -5967,7 +5983,14 @@ async function consumeStreamEvent(inputs, reasoning, event) {
   return "";
 }
 async function runCollectorLoop(generator, inputs, ctx, partial) {
-  const reasoning = { text: "", startedAt: void 0, signature: void 0 };
+  const reasoning = {
+    text: "",
+    startedAt: void 0,
+    lastAt: void 0,
+    signature: void 0,
+    closed: false,
+    durationMs: 0
+  };
   let errored = false;
   let finishValue;
   let thinking;
@@ -5996,17 +6019,24 @@ async function consumeReasoningDelta(inputs, reasoning, delta) {
   await accumulateReasoning(inputs, reasoning, delta.text);
 }
 async function accumulateReasoning(inputs, reasoning, text) {
-  if (reasoning.startedAt === void 0) reasoning.startedAt = Date.now();
+  const now = Date.now();
+  if (reasoning.startedAt === void 0) reasoning.startedAt = now;
+  if (!reasoning.closed) reasoning.lastAt = now;
   reasoning.text += text;
   await emitReasoningDeltaCallback(inputs, text);
 }
+async function closeReasoningOnce(inputs, reasoning) {
+  if (reasoning.closed || reasoning.text.length === 0) return;
+  reasoning.closed = true;
+  reasoning.durationMs = (reasoning.lastAt ?? 0) - (reasoning.startedAt ?? 0);
+  await emitThinkingCompletedCallback(inputs, reasoning.durationMs);
+}
 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;
+  await closeReasoningOnce(inputs, reasoning);
   ctx.events.push(
-    buildThinkingEvent(inputs, reasoning.text, thinkingDurationMs, reasoning.signature)
+    buildThinkingEvent(inputs, reasoning.text, reasoning.durationMs, reasoning.signature)
   );
-  await emitThinkingCompletedCallback(inputs, thinkingDurationMs);
   return {
     type: "thinking",
     text: reasoning.text,
@@ -6839,29 +6869,32 @@ async function runIteration(inputs, ctx) {
   const llmOutput = await streamLlmTurn(inputs, ctx);
   await inputs.pluginManager?.runPostLlmCallHooks(hookCtx);
   accumulateUsage(ctx.usage, llmOutput);
-  if (inputs.budgetTracker !== void 0) {
-    const modelId = inputs.model.id ?? "auto";
-    const inputT = llmOutput.inputTokens ?? 0;
-    const outputT = llmOutput.outputTokens ?? 0;
-    try {
-      if (inputT > 0) {
-        inputs.budgetTracker.track({
-          tokens: inputT,
-          model: modelId,
-          type: "input"
-        });
-      }
-      if (outputT > 0) {
-        inputs.budgetTracker.track({
-          tokens: outputT,
-          model: modelId,
-          type: "output"
-        });
-      }
-    } catch {
+  trackTurnUsage(inputs, llmOutput);
+  return continueOrTerminate(inputs, ctx, llmOutput);
+}
+function trackTurnUsage(inputs, llmOutput) {
+  const tracker = inputs.budgetTracker;
+  if (tracker === void 0) return;
+  const modelId = inputs.model.id ?? "auto";
+  const inputT = (llmOutput.inputTokens ?? 0) + (llmOutput.cacheReadTokens ?? 0) + (llmOutput.cacheWriteTokens ?? 0);
+  const outputT = llmOutput.outputTokens ?? 0;
+  try {
+    if (inputT > 0) {
+      tracker.track({
+        tokens: inputT,
+        model: modelId,
+        type: "input"
+      });
+    }
+    if (outputT > 0) {
+      tracker.track({
+        tokens: outputT,
+        model: modelId,
+        type: "output"
+      });
     }
+  } catch {
   }
-  return continueOrTerminate(inputs, ctx, llmOutput);
 }
 async function transformLlmOutputText(inputs, text, ctx) {
   return inputs.pluginManager !== void 0 ? inputs.pluginManager.runTransformLlmOutputHooks(text, ctx) : text;
@@ -6933,6 +6966,32 @@ async function inspectDoomLoop(inputs, ctx, toolCalls) {
   return "continue";
 }
 
+// src/internal/concurrency/abort-utils.ts
+function anySignal(signals) {
+  const filtered = signals.filter((s) => s !== void 0);
+  if (filtered.length === 0) {
+    return new AbortController().signal;
+  }
+  if (filtered.length === 1) {
+    return filtered[0];
+  }
+  if (typeof AbortSignal.any === "function") {
+    return AbortSignal.any(filtered);
+  }
+  return ponyfillAny(filtered);
+}
+function ponyfillAny(signals) {
+  const ctrl = new AbortController();
+  for (const s of signals) {
+    if (s.aborted) {
+      ctrl.abort(s.reason);
+      return ctrl.signal;
+    }
+    s.addEventListener("abort", () => ctrl.abort(s.reason), { once: true });
+  }
+  return ctrl.signal;
+}
+
 // src/internal/llm/fallback-client.ts
 var FallbackLlmClient = class {
   constructor(clients) {
@@ -7687,6 +7746,13 @@ var RealLocalRun = class extends FixtureRunBase {
   ownsMcpClients;
   /** theokit#148 — what a delegated child inherits from this parent, scoped to the loop. */
   inheritedCredentials;
+  /**
+   * B-495 — the run's own abort, composed into the signal the loop hands to the LLM fetch and the
+   * tool executors, so `cancel()` stops the request and not only the status. A TypeScript `private`
+   * field, never a JS `#private` one: the run wrappers are Proxies that call `cancel()` with `this`
+   * bound to the Proxy, where reading a `#private` field throws.
+   */
+  cancelController = new AbortController();
   constructor(options, buildInputs, ownsMcpClients, inheritedCredentials) {
     super(options);
     this.buildInputs = buildInputs;
@@ -7698,6 +7764,11 @@ var RealLocalRun = class extends FixtureRunBase {
       void this.driveLoop();
     }, 0);
   }
+  cancel() {
+    if (this.terminated) return Promise.resolve();
+    this.cancelController.abort();
+    return super.cancel();
+  }
   notifyImmediately() {
     return true;
   }
@@ -7741,7 +7812,9 @@ var RealLocalRun = class extends FixtureRunBase {
   liveDelivered = /* @__PURE__ */ new Set();
   async executeAgentLoop(inputs) {
     let textStreamedSinceLastMessage = false;
+    inputs.signal = anySignal([inputs.signal, this.cancelController.signal]);
     inputs.onLoopEvent = (event) => {
+      if (this.terminated) return;
       this.liveDelivered.add(event);
       this.script.events.push(event);
       const carriesText = event.type === "assistant" && event.message.content.some((b) => b.type === "text");
@@ -7757,11 +7830,13 @@ var RealLocalRun = class extends FixtureRunBase {
     };
     const callerOnDelta = inputs.onDelta;
     inputs.onDelta = (delta) => {
+      if (this.terminated) return;
       callerOnDelta?.(delta);
       if (delta.update.type === "text-delta") textStreamedSinceLastMessage = true;
       this.pushTimeline({ kind: "delta", update: delta.update });
     };
     try {
+      if (this.terminated) return;
       const runLoop = () => inputs.activeTools !== void 0 ? withToolWhitelist(new Set(inputs.activeTools), () => runAgentLoop(inputs)) : runAgentLoop(inputs);
       const output = await withInheritedSubAgentCredentials(this.inheritedCredentials, runLoop);
       this.applyAgentLoopOutput(output);
@@ -7770,11 +7845,7 @@ var RealLocalRun = class extends FixtureRunBase {
       this.emitErrorEvent(cause, "Agent loop failed", "", "agent_loop_failed");
       this.transitionTo("error");
     } finally {
-      if (this.ownsMcpClients) {
-        for (const client of inputs.mcp.values()) {
-          await client.close().catch(() => void 0);
-        }
-      }
+      if (this.ownsMcpClients) await closeOwnedMcpClients(inputs);
     }
   }
   /**
@@ -7786,6 +7857,7 @@ var RealLocalRun = class extends FixtureRunBase {
    * Finding-B fix (sdk-error-packaging v1.1): set-once errorDetail copy.
    */
   applyAgentLoopOutput(output) {
+    if (this.terminated) return;
     this.deliverUndeliveredEvents(output.events);
     this.script.conversation.push(...output.conversation);
     if (output.result.length > 0) this.script.result = output.result;
@@ -7833,6 +7905,18 @@ var RealLocalRun = class extends FixtureRunBase {
     this.notifyNewEvents();
   }
 };
+async function closeOwnedMcpClients(inputs) {
+  for (const [name, client] of inputs.mcp.entries()) {
+    try {
+      await client.close();
+    } catch (cause) {
+      const why = cause instanceof Error ? cause.message : String(cause);
+      diagFailure(
+        `[theokit-sdk] MCP server ${name} failed to close; its process may still be running: ${why}`
+      );
+    }
+  }
+}
 
 // src/internal/local-agent/local-agent-dispatch.ts
 function buildRealRunOptions(args) {
@@ -9387,32 +9471,6 @@ async function persistMemoryFactIfWritePrompt(workspaceCwd, memoryConfig, userTe
   }
 }
 
-// src/internal/concurrency/abort-utils.ts
-function anySignal(signals) {
-  const filtered = signals.filter((s) => s !== void 0);
-  if (filtered.length === 0) {
-    return new AbortController().signal;
-  }
-  if (filtered.length === 1) {
-    return filtered[0];
-  }
-  if (typeof AbortSignal.any === "function") {
-    return AbortSignal.any(filtered);
-  }
-  return ponyfillAny(filtered);
-}
-function ponyfillAny(signals) {
-  const ctrl = new AbortController();
-  for (const s of signals) {
-    if (s.aborted) {
-      ctrl.abort(s.reason);
-      return ctrl.signal;
-    }
-    s.addEventListener("abort", () => ctrl.abort(s.reason), { once: true });
-  }
-  return ctrl.signal;
-}
-
 // src/internal/runtime/lifecycle/wrap-completion-check-run.ts
 function wrapRunWithCompletionCheck(args) {
   const check = args.completionCheck;
@@ -11066,7 +11124,7 @@ var Agent = class _Agent {
    */
   static async compact(agentId, options = {}) {
     const reg = await requireLocalAgent(agentId, "compact");
-    const { compactSessionTranscript, buildDefaultSummarizer: buildDefaultSummarizer2 } = await import('./compact-session-PVAWTKKL.js');
+    const { compactSessionTranscript, buildDefaultSummarizer: buildDefaultSummarizer2 } = await import('./compact-session-4HAUP3HK.js');
     const { cwd, model, store } = await openLocalStore(reg);
     return enqueueSessionWrite(
       cwd,
@@ -11096,7 +11154,7 @@ var Agent = class _Agent {
    */
   static async injectSessionTurn(agentId, turn) {
     const reg = await requireLocalAgent(agentId, "injectSessionTurn");
-    const { injectSessionTurn } = await import('./inject-session-O24XGRR6.js');
+    const { injectSessionTurn } = await import('./inject-session-LJX5JGV5.js');
     const { cwd, model, store } = await openLocalStore(reg);
     await injectSessionTurn({
       store,
@@ -11254,5 +11312,5 @@ async function openLocalStore(reg) {
 }
 
 export { Agent, AgentBuilder, DEFAULT_AGENTIC_MODEL_ID, MEMORY_EMBEDDING_ADAPTERS, Tool, ToolError, UsageAccumulator, computeCost, generateCronId, getPricingEntry, managedSettingsPathFor, openRouterMemoryEmbeddingProviderAdapter, readManagedSettings, resolveSessionDir };
-//# sourceMappingURL=chunk-RTE2DD4S.js.map
-//# sourceMappingURL=chunk-RTE2DD4S.js.map
+//# sourceMappingURL=chunk-MHIBYKWA.js.map
+//# sourceMappingURL=chunk-MHIBYKWA.js.map