stitchkit 0.63.0 → 0.65.0

package/dist/agent-runtime.d.ts

@@ -4,13 +4,13 @@ export { AgentAdmissionEventSchema, AgentCheckpointEventSchema, AgentReasoningDe
 export { type AgentHistoryProjectionDecision, type AgentHistoryProjectionOptions, type AgentHistoryProjectionResult, projectAgentHistory, projectAgentHistoryDetailed, } from './agent-runtime/history';
 export { type AgentToolFenceConfig, type AgentToolFenceContext, createAgentToolFenceLifecycle, } from './agent-runtime/managed-tools';
 export { type AgentLanguageModelProvider, type AgentModelCapability, AgentModelCapabilitySchema, type AgentModelDescriptor, AgentModelDescriptorSchema, type AgentModelRegistry, type AgentModelRegistryConfig, type AgentModelRegistrySnapshot, AgentModelRegistrySnapshotSchema, type AgentModelSnapshotPolicy, type AgentResolvedModel, defineModelRegistry, validateAgentModelSnapshot, } from './agent-runtime/models';
-export { type AgentObservability, type AgentRunEvent, AgentRunEventSchema, type AgentRunSinkConfig, type AgentRunSinkDrop, type AgentRunSinkError, createAgentObservability, } from './agent-runtime/observability';
+export { type AgentObservability, type AgentRunEvent, AgentRunEventSchema, type AgentRunSinkConfig, type AgentRunSinkDrop, type AgentRunSinkError, type AgentRunStartedEvent, AgentRunStartedEventSchema, type AgentRunTerminalEvent, AgentRunTerminalEventSchema, type AgentStepFinishedEvent, AgentStepFinishedEventSchema, createAgentObservability, } from './agent-runtime/observability';
 export { type AgentHistoryBudgetDecision, type AgentHistoryBudgetResult, type AgentPromptBudget, type AgentPromptSection, type AgentPromptSectionContext, type AgentTokenCount, AgentTokenCountSchema, type ComposeAgentPromptOptions, type ComposedAgentPrompt, composeAgentPrompt, type SelectAgentHistoryOptions, selectAgentHistory, } from './agent-runtime/prompt';
 export { type AgentProtocol, type AgentProtocolConfig, defineAgentProtocol, } from './agent-runtime/protocol';
 export { type AgentRuntime, type AgentRuntimeAdmission, type AgentRuntimeConfig, type AgentRuntimeInput, type AgentRuntimeInterruptInput, type AgentRuntimePrepareStep, type AgentRuntimeProtocolInput, type AgentRuntimeRecordIds, type AgentRuntimeRecoverOptions, type AgentRuntimeRecoveryDecision, type AgentRuntimeRecoveryInput, type AgentRuntimeRecoveryOutcome, type AgentRuntimeRunContext, type AgentRuntimeStopPolicy, createAgentRuntime, } from './agent-runtime/runtime';
 export type { AgentRuntimeResult } from './agent-runtime/runtime-result';
 export * from './agent-runtime/schemas';
-export { type AbsorbQueuedRun, AbsorbQueuedRunSchema, type AcceptInputAndAssignRun, AcceptInputAndAssignRunSchema, type AcquireAgentRun, AcquireAgentRunSchema, type AgentRuntimeStore, AgentStoreAppliedSchema, AgentStoreConflictSchema, AgentStoreDuplicateSchema, type AgentStoreMutationResult, AgentStoreMutationResultSchema, AgentStoreNotFoundSchema, type CheckpointRunAssistant, CheckpointRunAssistantSchema, type CommitRunTerminal, CommitRunTerminalSchema, type RecoverAgentRun, RecoverAgentRunSchema, type ReplaceCompactedRange, ReplaceCompactedRangeSchema, type RequestRunInterrupt, RequestRunInterruptSchema, } from './agent-runtime/store';
+export { type AcceptInputAndAssignRun, AcceptInputAndAssignRunSchema, type AcquireAgentRun, AcquireAgentRunSchema, type AgentRuntimeStore, AgentStoreAppliedSchema, AgentStoreConflictSchema, AgentStoreDuplicateSchema, type AgentStoreMutationResult, AgentStoreMutationResultSchema, AgentStoreNotFoundSchema, type CheckpointRunAssistant, CheckpointRunAssistantSchema, type CommitRunTerminal, CommitRunTerminalSchema, type RecoverAgentRun, RecoverAgentRunSchema, type ReplaceCompactedRange, ReplaceCompactedRangeSchema, type RequestRunInterrupt, RequestRunInterruptSchema, } from './agent-runtime/store';
 export { type AgentAdmissionReceipt, AgentAdmissionReceiptSchema, type AgentHistoryMutation, AgentHistoryMutationSchema, type AgentRecoverableDescriptor, AgentRecoverableDescriptorSchema, type AgentRecoverablePage, AgentRecoverablePageSchema, type AgentRuntimeHead, AgentRuntimeHeadSchema, type AgentRuntimeStoreDriver, type AgentStoreCompareAndSwapResult, type AgentStoredRun, AgentStoredRunSchema, createAgentRuntimeStore, createMemoryAgentRuntimeStore, } from './agent-runtime/store-driver';
 export { AgentRuntimeConflictError } from './agent-runtime/terminal-commit';
 //# sourceMappingURL=agent-runtime.d.ts.map

package/dist/agent-runtime.d.ts.map

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

package/dist/agent-runtime.js

@@ -28,8 +28,9 @@ import {
   AgentToolCallPartSchema,
   AgentToolResultPartSchema,
   AgentUsageSchema,
-  AgentUsageValueSchema
-} from "./index-b1k33127.js";
+  AgentUsageValueSchema,
+  runStateForTerminalReason
+} from "./index-sbkyvacf.js";
 import"./index-6djpbnda.js";
 import"./index-cby4ar3v.js";
 import {
@@ -395,7 +396,7 @@ function advanceAgentRuntimeEventCursor(rawCursor, event) {
       return { status: "duplicate", cursor };
     }
     return {
-      status: previous !== undefined && event.snapshotVersion > previous + 1 ? "gap" : "accepted",
+      status: "accepted",
       cursor: {
         ...cursor,
         snapshotVersion: event.snapshotVersion,
@@ -561,13 +562,7 @@ function interruptedSystemNote(message) {
     return { rendered };
   rendered.add("text");
   rendered.add("control");
-  return {
-    message: modelMessageSchema.parse({
-      role: "system",
-      content: `[interrupted] partial response: ${text}`
-    }),
-    rendered
-  };
+  return { text: `[interrupted] partial response: ${text}`, rendered };
 }
 function completeToolChronology(message) {
   const calls = new Set(message.parts.filter((part) => part.type === "tool-call").map((part) => part.callId));
@@ -576,12 +571,13 @@ function completeToolChronology(message) {
 }
 async function projectAgentHistoryDetailed(messages, options = {}) {
   const projected = [];
+  const system = [];
   const decisions = [];
   const interruptedRule = options.interruptedAssistant ?? "assistant-marked";
   let observedUser = false;
   for (const message of messages) {
-    if (message.status === "superseded") {
-      decisions.push(decide(message, "omitted", "superseded"));
+    if (message.role === "assistant" && !isSpeakableAssistantStatus(message.status)) {
+      decisions.push(decide(message, "omitted", message.status === "superseded" ? "superseded" : "draft-or-failed"));
       continue;
     }
     if (message.status === "streaming" || message.status === "failed") {
@@ -602,7 +598,7 @@ async function projectAgentHistoryDetailed(messages, options = {}) {
     if (message.role === "system" || message.role === "summary") {
       const content = textContent(message.parts);
       if (content) {
-        projected.push(modelMessageSchema.parse({ role: "system", content }));
+        system.push(content);
         decisions.push(decide(message, "projected", "projected", new Set(["text"])));
       } else {
         decisions.push(decide(message, "omitted", "empty"));
@@ -623,8 +619,8 @@ async function projectAgentHistoryDetailed(messages, options = {}) {
     }
     if (interrupted && interruptedRule === "system-note") {
       const note = interruptedSystemNote(message);
-      if (note.message) {
-        projected.push(note.message);
+      if (note.text) {
+        system.push(note.text);
         decisions.push(decide(message, "projected", "projected", note.rendered));
       } else {
         decisions.push(decide(message, "omitted", "empty"));
@@ -642,7 +638,7 @@ async function projectAgentHistoryDetailed(messages, options = {}) {
     projected.push(...assistant.messages);
     decisions.push(assistant.messages.length > 0 ? decide(message, "projected", "projected", assistant.rendered) : decide(message, "omitted", "empty"));
   }
-  return { messages: projected, decisions };
+  return { messages: projected, decisions, system };
 }
 async function projectAgentHistory(messages, options = {}) {
   return [...(await projectAgentHistoryDetailed(messages, options)).messages];
@@ -758,26 +754,41 @@ function validateAgentModelSnapshot(input, policy) {
 }
 // src/agent-runtime/observability.ts
 import { z as z3 } from "zod";
-var AgentRunEventSchema = z3.object({
+var AgentRunEventBaseSchema = z3.object({
   schemaVersion: z3.literal(1),
   eventId: AgentRecordIdSchema,
-  type: z3.enum(["run-started", "step-finished", "run-terminal"]),
   conversationId: AgentRecordIdSchema,
   runId: AgentRecordIdSchema,
   traceId: z3.string().min(1),
   spanId: z3.string().min(1),
   parentSpanId: z3.string().min(1).optional(),
   state: AgentRunStateSchema,
-  terminalReason: AgentTerminalReasonSchema.optional(),
   modelId: z3.string().min(1).optional(),
-  step: z3.int().nonnegative().optional(),
-  queueWaitMs: z3.number().nonnegative().optional(),
   durationMs: z3.number().nonnegative().optional(),
+  emittedAt: AgentTimestampSchema
+});
+var AgentRunStartedEventSchema = AgentRunEventBaseSchema.extend({
+  type: z3.literal("run-started"),
+  queueWaitMs: z3.number().nonnegative().optional()
+});
+var AgentStepFinishedEventSchema = AgentRunEventBaseSchema.extend({
+  type: z3.literal("step-finished"),
+  step: z3.int().nonnegative(),
+  ttftMs: z3.number().nonnegative().optional(),
+  usage: AgentUsageSchema
+});
+var AgentRunTerminalEventSchema = AgentRunEventBaseSchema.extend({
+  type: z3.literal("run-terminal"),
+  terminalReason: AgentTerminalReasonSchema,
   ttftMs: z3.number().nonnegative().optional(),
-  usage: AgentUsageSchema.optional(),
   internalCause: z3.unknown().optional(),
-  emittedAt: AgentTimestampSchema
+  usage: AgentUsageSchema
 });
+var AgentRunEventSchema = z3.discriminatedUnion("type", [
+  AgentRunStartedEventSchema,
+  AgentStepFinishedEventSchema,
+  AgentRunTerminalEventSchema
+]);
 function createAgentObservability(config) {
   const manager = createBoundedSinkManager({
     write: config.write,
@@ -808,7 +819,13 @@ function createAgentObservability(config) {
       if ((config.deduplicate ?? true) && emitted.has(parsed.eventId))
         return;
       remember(parsed.eventId);
-      manager.submit(() => config.includeInternalCause ? parsed : AgentRunEventSchema.omit({ internalCause: true }).parse(parsed));
+      manager.submit(() => {
+        if (config.includeInternalCause)
+          return parsed;
+        if (parsed.type !== "run-terminal")
+          return parsed;
+        return AgentRunTerminalEventSchema.omit({ internalCause: true }).parse(parsed);
+      });
     },
     flush: () => manager.flush(),
     getStatus: () => manager.getStatus(),
@@ -861,7 +878,7 @@ async function selectAgentHistory(options) {
   if (!Number.isSafeInteger(keepRecentTurns) || keepRecentTurns < 0) {
     throw new TypeError("keepRecentTurns must be a non-negative safe integer");
   }
-  const spoken = options.messages.filter((message) => message.status !== "superseded");
+  const spoken = options.messages.filter((message) => message.role !== "assistant" || isSpeakableAssistantStatus(message.status));
   const counts = new Map;
   let total = 0;
   let estimated = false;
@@ -874,8 +891,8 @@ async function selectAgentHistory(options) {
         messages: [...spoken],
         decisions: options.messages.map((candidate) => ({
           messageId: candidate.id,
-          action: candidate.status === "superseded" ? "removed" : "kept",
-          reason: candidate.status === "superseded" ? "superseded" : "token-count-unavailable",
+          action: candidate.role === "assistant" && !isSpeakableAssistantStatus(candidate.status) ? "removed" : "kept",
+          reason: candidate.role === "assistant" && !isSpeakableAssistantStatus(candidate.status) ? "unspeakable" : "token-count-unavailable",
           tokens: counts.get(candidate.id) ?? { provenance: "unavailable" }
         })),
         totalTokens: { provenance: "unavailable" },
@@ -901,11 +918,11 @@ async function selectAgentHistory(options) {
   }
   const messages = spoken.filter((message) => !removed.has(message.id));
   const decisions = options.messages.map((message) => {
-    if (message.status === "superseded") {
+    if (message.role === "assistant" && !isSpeakableAssistantStatus(message.status)) {
       return {
         messageId: message.id,
         action: "removed",
-        reason: "superseded",
+        reason: "unspeakable",
         tokens: { provenance: "unavailable" }
       };
     }
@@ -1105,6 +1122,7 @@ function interruptedCandidate(candidate, run, now) {
     AgentMessagePartSchema.parse({ type: "control", reason: "run-interrupted" })
   ];
   return {
+    ...candidate.usage && { usage: candidate.usage },
     run,
     assistant: AgentMessageSchema.parse({
       ...candidate.assistant,
@@ -1373,6 +1391,7 @@ function createRunExecutor(dependencies) {
     let terminalReason = "success";
     let usage = input.acceptedRun.usage;
     let sawProviderFinish = false;
+    let contextRefusal = false;
     let step = 0;
     let selectedModel;
     let internalCause;
@@ -1489,56 +1508,38 @@ function createRunExecutor(dependencies) {
         config.tools(runtimeContext)
       ]);
       if (prompt.contextDecision === "oversized") {
+        contextRefusal = true;
         throw new Error("Agent context exceeds the configured model budget");
       }
       if (prompt.contextDecision === "requires-compaction") {
+        contextRefusal = true;
         throw new Error("Agent context still exceeds the model budget after compaction");
       }
-      const projectHistory = (source) => config.history?.project ? config.history.project(source.messages) : projectAgentHistory(source.messages, {
-        ...config.history?.resolveFile && { resolveFile: config.history.resolveFile },
-        ...config.history?.unresolvedFile && {
-          unresolvedFile: config.history.unresolvedFile
-        },
-        ...config.history?.interruptedAssistant && {
-          interruptedAssistant: config.history.interruptedAssistant
-        }
-      });
-      const history = await projectHistory(snapshot);
-      const absorbPending = async () => {
-        if (!input.absorbable?.size || executionSignal.aborted)
-          return;
-        const latest = await config.store.loadSnapshot(run.conversationId);
-        const current = latest.runs.find((candidate) => candidate.id === run.id);
-        if (current?.state !== "running" || current.ownerId !== runtimeEpoch) {
-          return;
-        }
-        const pending = latest.runs.find((candidate) => candidate.state === "queued" && input.absorbable?.has(candidate.id));
-        if (!pending)
-          return;
-        const absorbed = await config.store.absorbQueuedRun({
-          conversationId: run.conversationId,
-          runningRunId: current.id,
-          runningExpectedRevision: current.revision,
-          ownerId: runtimeEpoch,
-          ...current.fencingToken !== undefined && { fencingToken: current.fencingToken },
-          queuedRunId: pending.id,
-          queuedExpectedRevision: pending.revision
-        });
-        if (absorbed.outcome !== "applied")
-          return;
-        input.onAbsorbed?.(pending.id);
-        snapshot = absorbed.snapshot;
-        run = findRun(snapshot.runs, run.id);
-        await publish({
-          type: "run-state",
-          eventId: agentDurableEventId("run-state", run.id, snapshot.version),
-          conversationId: run.conversationId,
-          runId: run.id,
-          snapshotVersion: snapshot.version,
-          state: run.state,
-          emittedAt: now().toISOString()
+      let carriedSystem = [];
+      const projectHistory = async (source) => {
+        if (config.history?.project)
+          return config.history.project(source.messages);
+        const detailed = await projectAgentHistoryDetailed(source.messages, {
+          ...config.history?.resolveFile && { resolveFile: config.history.resolveFile },
+          ...config.history?.unresolvedFile && {
+            unresolvedFile: config.history.unresolvedFile
+          },
+          ...config.history?.interruptedAssistant && {
+            interruptedAssistant: config.history.interruptedAssistant
+          }
         });
-        return [...await projectHistory(snapshot)];
+        carriedSystem = detailed.system;
+        return [...detailed.messages];
+      };
+      const history = await projectHistory(snapshot);
+      const withCarriedSystem = (instructions) => {
+        if (carriedSystem.length === 0)
+          return instructions;
+        const composed = typeof instructions === "string" ? [{ role: "system", content: instructions }] : Array.isArray(instructions) ? instructions : [instructions];
+        return [
+          ...composed,
+          ...carriedSystem.map((content) => ({ role: "system", content }))
+        ];
       };
       const maxStepCondition = stepCountIs(maxSteps);
       const stopConditions = [
@@ -1560,15 +1561,13 @@ function createRunExecutor(dependencies) {
       const result = streamText({
         model: selectedModel.model,
         tools,
-        instructions: prompt.instructions,
+        instructions: withCarriedSystem(prompt.instructions),
         messages: history,
         abortSignal: executionSignal,
         maxRetries: 0,
         stopWhen: stopConditions,
-        prepareStep: async (options) => {
-          const absorbed = await absorbPending();
-          const prepared = await config.loop?.prepareStep?.({ ...options, ...runtimeContext }) ?? {};
-          return absorbed && !prepared.messages ? { ...prepared, messages: absorbed } : prepared;
+        ...config.loop?.prepareStep && {
+          prepareStep: (options) => config.loop?.prepareStep?.({ ...options, ...runtimeContext })
         }
       });
       for await (const part of result.stream) {
@@ -1833,7 +1832,7 @@ function createRunExecutor(dependencies) {
           reason: isToolExecutionControlError(error) && error.reason === "stale_run" ? "stale-run" : "run-interrupted"
         }));
       } else {
-        terminalReason = "provider_failure";
+        terminalReason = contextRefusal ? "context_overflow" : "provider_failure";
       }
     } finally {
       idleDeadline.dispose();
@@ -1942,7 +1941,8 @@ function createAgentRuntime(config) {
   const waitForAdmissionAcceptances = admissionLanes.waitForAcceptances;
   const checkpointEveryEvents = config.loop?.checkpointEveryEvents ?? 20;
   const maxSteps = config.loop?.maxSteps ?? 50;
-  const idleTimeoutMs = config.loop?.idleTimeoutMs;
+  const declaredIdleTimeoutMs = config.loop?.idleTimeoutMs;
+  const idleTimeoutMs = declaredIdleTimeoutMs === null ? undefined : declaredIdleTimeoutMs ?? 60000;
   if (!Number.isSafeInteger(checkpointEveryEvents) || checkpointEveryEvents < 1) {
     throw new TypeError("checkpointEveryEvents must be a positive safe integer");
   }
@@ -1952,9 +1952,6 @@ function createAgentRuntime(config) {
   if (idleTimeoutMs !== undefined && (!Number.isSafeInteger(idleTimeoutMs) || idleTimeoutMs < 1)) {
     throw new TypeError("idleTimeoutMs must be a positive safe integer");
   }
-  const absorbable = new Set;
-  const absorbedInto = new Map;
-  const runResults = new Map;
   const policyNames = new Set(["max-steps"]);
   for (const policy of config.loop?.stopPolicies ?? []) {
     if (!policy.name || policyNames.has(policy.name)) {
@@ -2087,8 +2084,7 @@ function createAgentRuntime(config) {
       if (existingTicket)
         return existingTicket;
       const key = config.runs?.key?.(input) ?? input.conversationId;
-      const declaredPolicy = typeof config.runs?.inputPolicy === "function" ? config.runs.inputPolicy(input) : config.runs?.inputPolicy ?? "queue";
-      const policy = declaredPolicy === "inject" ? "queue" : declaredPolicy;
+      const policy = typeof config.runs?.inputPolicy === "function" ? config.runs.inputPolicy(input) : config.runs?.inputPolicy ?? "queue";
       const nowIso = now().toISOString();
       const inputMessageId = rawInput.recordIds?.inputMessageId ?? generateId();
       const runId = rawInput.recordIds?.runId ?? generateId();
@@ -2214,8 +2210,6 @@ function createAgentRuntime(config) {
             state: acceptedRun.state,
             emittedAt: now().toISOString()
           });
-          if (declaredPolicy === "inject")
-            absorbable.add(acceptedRun.id);
           outerAccepted.resolve();
           if (acceptance.outcome === "duplicate") {
             if (!acceptedRun.terminalReason) {
@@ -2264,25 +2258,7 @@ function createAgentRuntime(config) {
                 await waitForAdmissionAcceptances(reservation.lane);
               return {
                 runId: acceptedRun.id,
-                execute: () => {
-                  const answeredBy = absorbedInto.get(acceptedRun.id);
-                  const answer = answeredBy ? runResults.get(answeredBy) : undefined;
-                  if (answer)
-                    return answer;
-                  const running = executeRun({
-                    acceptedRun,
-                    context,
-                    signal,
-                    absorbable,
-                    onAbsorbed: (absorbedRunId) => {
-                      absorbedInto.set(absorbedRunId, acceptedRun.id);
-                    }
-                  });
-                  runResults.set(acceptedRun.id, running);
-                  return running.finally(() => {
-                    absorbable.delete(acceptedRun.id);
-                  });
-                }
+                execute: () => executeRun({ acceptedRun, context, signal })
               };
             }
           });
@@ -2529,15 +2505,6 @@ var CommitRunTerminalSchema = z6.object({
   policyName: z6.string().min(1).optional(),
   usage: AgentUsageSchema.optional()
 });
-var AbsorbQueuedRunSchema = z6.object({
-  conversationId: AgentRecordIdSchema,
-  runningRunId: AgentRecordIdSchema,
-  runningExpectedRevision: AgentRecordVersionSchema,
-  ownerId: z6.string().min(1),
-  fencingToken: AgentRecordVersionSchema.optional(),
-  queuedRunId: AgentRecordIdSchema,
-  queuedExpectedRevision: AgentRecordVersionSchema
-});
 var RequestRunInterruptSchema = z6.object({
   conversationId: AgentRecordIdSchema,
   runId: AgentRecordIdSchema,
@@ -2678,24 +2645,17 @@ function replaceRun(runs, next) {
 function replaceMessage(messages, next) {
   return messages.some((message) => message.id === next.id) ? messages.map((message) => message.id === next.id ? next : message) : [...messages, next];
 }
+var ACTIVE_AGENT_RUN_STATES = [
+  "queued",
+  "running",
+  "interrupt_requested"
+];
+function isActiveRunState(state) {
+  return ACTIVE_AGENT_RUN_STATES.includes(state);
+}
 function conflict(actualVersion) {
   return { outcome: "conflict", actualVersion };
 }
-function terminalState(reason) {
-  if (reason === "success" || reason === "policy_stop" || reason === "provider_stop") {
-    return "completed";
-  }
-  if (reason === "interrupted")
-    return "interrupted";
-  if (reason === "superseded")
-    return "superseded";
-  if (reason === "cancelled" || reason === "shutdown" || reason === "timeout") {
-    return "cancelled";
-  }
-  if (reason === "abandoned")
-    return "abandoned";
-  return "failed";
-}
 function applied(current, input, effects) {
   return {
     outcome: "applied",
@@ -2706,7 +2666,6 @@ function applied(current, input, effects) {
       messages: input.messages ?? current.messages
     }),
     ...effects?.runRecord && { runRecord: effects.runRecord },
-    ...effects?.secondaryRunRecord && { secondaryRunRecord: effects.secondaryRunRecord },
     ...effects?.admissionReceipt && { admissionReceipt: effects.admissionReceipt },
     ...effects?.historyMutation && { historyMutation: effects.historyMutation }
   };
@@ -2750,39 +2709,6 @@ function reduceStore(current, operation) {
       historyMutation: { type: "admit", input: input.input }
     });
   }
-  if (operation.type === "absorb") {
-    const input = operation.input;
-    if (current.conversationId !== input.conversationId)
-      return { outcome: "not_found" };
-    const running = current.runs.find((candidate) => candidate.id === input.runningRunId);
-    const queued = current.runs.find((candidate) => candidate.id === input.queuedRunId);
-    if (!running || !queued)
-      return { outcome: "not_found" };
-    if (running.revision !== input.runningExpectedRevision || running.state !== "running" || running.ownerId !== input.ownerId || input.fencingToken !== undefined && running.fencingToken !== input.fencingToken) {
-      return conflict(running.revision);
-    }
-    if (queued.revision !== input.queuedExpectedRevision || queued.state !== "queued" || queued.ownerId !== undefined || queued.terminalReason !== undefined || queued.id === running.id) {
-      return conflict(queued.revision);
-    }
-    const stamp = new Date().toISOString();
-    const grown = AgentRunSchema.parse({
-      ...running,
-      inputMessageIds: [...running.inputMessageIds, ...queued.inputMessageIds],
-      revision: running.revision + 1,
-      updatedAt: stamp
-    });
-    const emptied = AgentRunSchema.parse({
-      ...queued,
-      state: "absorbed",
-      absorbedIntoRunId: running.id,
-      revision: queued.revision + 1,
-      updatedAt: stamp
-    });
-    return applied(current, { runs: replaceRun(replaceRun(current.runs, grown), emptied) }, {
-      runRecord: AgentStoredRunSchema.parse({ schemaVersion: 1, run: grown }),
-      secondaryRunRecord: AgentStoredRunSchema.parse({ schemaVersion: 1, run: emptied })
-    });
-  }
   const conversationId = operation.input.conversationId;
   const run = operation.type === "compact" ? undefined : current.runs.find((candidate) => candidate.id === operation.input.runId);
   if (operation.type !== "compact" && !run)
@@ -2840,22 +2766,18 @@ function reduceStore(current, operation) {
   }
   if (operation.type === "recover" && run) {
     const input = operation.input;
-    if (run.revision !== input.expectedRevision || !["queued", "running", "interrupt_requested"].includes(run.state)) {
+    if (run.revision !== input.expectedRevision || !isActiveRunState(run.state)) {
       return conflict(run.revision);
     }
     if (input.action === "requeue" && run.state !== "queued" && input.replaySafe !== true) {
       throw new TypeError("Recovering an acquired run requires explicit replaySafe evidence");
     }
+    const { ownerId: _released, ...carried } = run;
     const next = AgentRunSchema.parse({
-      schemaVersion: 1,
-      id: run.id,
-      conversationId: run.conversationId,
-      inputMessageIds: run.inputMessageIds,
-      assistantMessageId: run.assistantMessageId,
+      ...carried,
       state: input.action === "requeue" ? "queued" : "abandoned",
       revision: run.revision + 1,
       ...input.action === "abandon" && { terminalReason: "abandoned" },
-      createdAt: run.createdAt,
       updatedAt: new Date().toISOString()
     });
     if (input.action === "abandon") {
@@ -2896,7 +2818,7 @@ function reduceStore(current, operation) {
     }
     const next = AgentRunSchema.parse({
       ...run,
-      state: terminalState(input.reason),
+      state: runStateForTerminalReason(input.reason),
       terminalReason: input.reason,
       ...input.policyName && { terminalPolicyName: input.policyName },
       ...input.usage && { usage: input.usage },
@@ -2925,6 +2847,10 @@ function reduceStore(current, operation) {
     if (!input.replacedMessageIds.every((id) => current.messages.some((m) => m.id === id))) {
       return { outcome: "not_found" };
     }
+    const liveAssistant = current.runs.find((candidate) => isActiveRunState(candidate.state) && replaced.has(candidate.assistantMessageId));
+    if (liveAssistant) {
+      throw new TypeError(`Compaction may not replace the assistant message of run ${liveAssistant.id}, which has not finished`);
+    }
     const positions = current.messages.map((message, index) => replaced.has(message.id) ? index : undefined).filter((index) => index !== undefined);
     const first = positions[0];
     if (first === undefined || positions.some((position, offset) => position !== first + offset) || input.summary.conversationId !== input.conversationId || input.summary.runId !== undefined || input.summary.role !== "summary" || input.summary.status !== "committed" || current.messages.some((message) => message.id === input.summary.id) || current.runs.some((candidate) => candidate.assistantMessageId === input.summary.id)) {
@@ -2988,7 +2914,7 @@ function createAgentRuntimeStore(driver) {
   });
   const mutate = (operation) => driver.transaction(async (transaction) => {
     const conversationId = operationConversationId(operation);
-    const operationRunId = operation.type === "accept" ? operation.input.coalesceIntoRunId : operation.type === "compact" ? undefined : operation.type === "absorb" ? operation.input.queuedRunId : operation.input.runId;
+    const operationRunId = operation.type === "accept" ? operation.input.coalesceIntoRunId : operation.type === "compact" ? undefined : operation.input.runId;
     const [stored, messages, activeRecords, operationRecord, duplicateReceipt] = await Promise.all([
       driver.head.load(transaction, conversationId),
       driver.history.load(transaction, conversationId),
@@ -3069,9 +2995,6 @@ function createAgentRuntimeStore(driver) {
       return conflict(outcome.actualVersion);
     if (reduced.runRecord)
       await driver.runs.save(transaction, reduced.runRecord);
-    if (reduced.secondaryRunRecord) {
-      await driver.runs.save(transaction, reduced.secondaryRunRecord);
-    }
     if (reduced.admissionReceipt) {
       await driver.admissions.create(transaction, reduced.admissionReceipt);
     }
@@ -3095,7 +3018,6 @@ function createAgentRuntimeStore(driver) {
       type: "interrupt",
       input: RequestRunInterruptSchema.parse(input)
     }),
-    absorbQueuedRun: (input) => mutate({ type: "absorb", input: AbsorbQueuedRunSchema.parse(input) }),
     recoverRun: (input) => mutate({ type: "recover", input: RecoverAgentRunSchema.parse(input) }),
     commitRunTerminal: (input) => mutate({ type: "terminal", input: CommitRunTerminalSchema.parse(input) }),
     replaceCompactedRange: (input) => mutate({
@@ -3191,7 +3113,7 @@ function createMemoryAgentRuntimeStore() {
         });
       },
       async listActive(transaction, conversationId) {
-        return [...transaction.runs.get(conversationId)?.values() ?? []].filter((record) => ["queued", "running", "interrupt_requested"].includes(record.run.state)).map((record) => AgentStoredRunSchema.parse(structuredClone(record)));
+        return [...transaction.runs.get(conversationId)?.values() ?? []].filter((record) => isActiveRunState(record.run.state)).map((record) => AgentStoredRunSchema.parse(structuredClone(record)));
       },
       async save(transaction, rawRecord) {
         const record = AgentStoredRunSchema.parse(structuredClone(rawRecord));
@@ -3253,9 +3175,12 @@ function createMemoryAgentRuntimeStore() {
       }
     },
     async scanRecoverable(input) {
-      const descriptors = [...runs].flatMap(([conversationId, conversationRuns]) => [...conversationRuns.values()].filter((record) => ["queued", "running", "interrupt_requested"].includes(record.run.state)).map((record) => ({ conversationId, run: record.run }))).sort((left, right) => left.conversationId.localeCompare(right.conversationId) || left.run.id.localeCompare(right.run.id));
+      const descriptors = [...runs].flatMap(([conversationId, conversationRuns]) => [...conversationRuns.values()].filter((record) => isActiveRunState(record.run.state)).map((record) => ({ conversationId, run: record.run }))).sort((left, right) => left.conversationId.localeCompare(right.conversationId) || left.run.id.localeCompare(right.run.id));
       const cursorTuple = input.cursor ? parseRecoverableCursor(input.cursor) : undefined;
-      const start = cursorTuple ? descriptors.findIndex((item) => item.conversationId === cursorTuple[0] && item.run.id === cursorTuple[1]) + 1 : 0;
+      const start = cursorTuple ? descriptors.findIndex((item) => item.conversationId.localeCompare(cursorTuple[0]) > 0 || item.conversationId === cursorTuple[0] && item.run.id.localeCompare(cursorTuple[1]) > 0) : 0;
+      if (start === -1) {
+        return AgentRecoverablePageSchema.parse({ items: [] });
+      }
       const items = descriptors.slice(start, start + input.limit);
       const last = items.at(-1);
       const hasMore = start + items.length < descriptors.length;
@@ -3268,7 +3193,6 @@ function createMemoryAgentRuntimeStore() {
   return createAgentRuntimeStore(driver);
 }
 export {
-  AbsorbQueuedRunSchema,
   AcceptInputAndAssignRunSchema,
   AcquireAgentRunSchema,
   AgentAdmissionEventSchema,
@@ -3300,14 +3224,17 @@ export {
   AgentRunEventSchema,
   AgentRunMetricsSchema,
   AgentRunSchema,
+  AgentRunStartedEventSchema,
   AgentRunStateEventSchema,
   AgentRunStateSchema,
+  AgentRunTerminalEventSchema,
   AgentRuntimeConflictError,
   AgentRuntimeEventCursorSchema,
   AgentRuntimeEventSchema,
   AgentRuntimeHeadSchema,
   AgentSnapshotSchema,
   AgentSourcePartSchema,
+  AgentStepFinishedEventSchema,
   AgentStoreAppliedSchema,
   AgentStoreConflictSchema,
   AgentStoreDuplicateSchema,
@@ -3344,6 +3271,7 @@ export {
   defineModelRegistry,
   projectAgentHistory,
   projectAgentHistoryDetailed,
+  runStateForTerminalReason,
   selectAgentHistory,
   structuredCompaction,
   validateAgentModelSnapshot