stitchkit 0.68.4 → 0.68.6

package/dist/agent-runtime.js

@@ -23,6 +23,7 @@ import {
   AgentRecordIdSchema,
   AgentRecordVersionSchema,
   AgentRunMetricsSchema,
+  AgentRunQueuePrioritySchema,
   AgentRunSchema,
   AgentRunStateSchema,
   AgentSnapshotSchema,
@@ -35,7 +36,7 @@ import {
   AgentUsageSchema,
   AgentUsageValueSchema,
   runStateForTerminalReason
-} from "./index-fhsmrzj7.js";
+} from "./index-ysphyxax.js";
 import"./index-6djpbnda.js";
 import"./index-cby4ar3v.js";
 import {
@@ -227,6 +228,7 @@ function createAgentSessionCoordinator() {
       }
       const lane = laneFor(input.key);
       const pending = {
+        priority: input.policy === "interrupt-next",
         reject(reason) {
           accepted.reject(reason);
           result.reject(reason);
@@ -249,11 +251,20 @@ function createAgentSessionCoordinator() {
           }
         }
       };
-      if (input.policy === "interrupt")
+      if (input.policy === "interrupt" || input.policy === "interrupt-next") {
         lane.active?.controller.abort("user-interrupt");
+      }
       if (input.policy === "supersede")
         lane.active?.controller.abort("supersede");
-      lane.queue.push(pending);
+      if (pending.priority) {
+        const firstOrdinary = lane.queue.findIndex((queued) => !queued.priority);
+        if (firstOrdinary === -1)
+          lane.queue.push(pending);
+        else
+          lane.queue.splice(firstOrdinary, 0, pending);
+      } else {
+        lane.queue.push(pending);
+      }
       startNext(input.key, lane);
       return { accepted: accepted.promise, result: result.promise };
     },
@@ -305,7 +316,7 @@ function createAgentSessionCoordinator() {
     }
   };
 }
-// src/agent-runtime/events.ts
+// src/agent-runtime/event-schema.ts
 import { z } from "zod";
 var AgentAdmissionEventSchema = z.object({
   type: z.literal("admission"),
@@ -422,6 +433,11 @@ function advanceAgentRuntimeEventCursor(rawCursor, event) {
     cursor: { ...cursor, runtimeEpoch: event.runtimeEpoch, sequence: event.sequence }
   };
 }
+function agentDurableEventId(type, runId, snapshotVersion) {
+  return `${runId}:${type}:${snapshotVersion}`;
+}
+
+// src/agent-runtime/events.ts
 function createAgentRuntimeEventSink(config) {
   const manager = createBoundedSinkManager({
     write: config.write,
@@ -441,9 +457,6 @@ function createAgentRuntimeEventSink(config) {
     close: () => manager.close()
   };
 }
-function agentDurableEventId(type, runId, snapshotVersion) {
-  return `${runId}:${type}:${snapshotVersion}`;
-}
 // src/agent-runtime/history.ts
 import { modelMessageSchema } from "ai";
 function providerOptions(envelope) {
@@ -1493,6 +1506,7 @@ function createRunExecutor(dependencies) {
       if (!absorbing?.assistant || !absorbing.run.terminalReason) {
         throw new AgentRuntimeConflictError("absorbed run resolution");
       }
+      input.onAcquired?.();
       return {
         run: absorbing.run,
         message: absorbing.assistant,
@@ -1511,6 +1525,7 @@ function createRunExecutor(dependencies) {
       ownerId: runtimeEpoch
     }), "run acquisition");
     let run = findRun(acquired.runs, input.acceptedRun.id);
+    input.onAcquired?.();
     await publish({
       type: "run-state",
       eventId: agentDurableEventId("run-state", run.id, acquired.version),
@@ -2281,6 +2296,15 @@ function createAgentRuntime(config) {
     const context = config.protocol.parseContext(rawInput.context);
     const accepted = Promise.withResolvers();
     const result = Promise.withResolvers();
+    let acquisitionSettled = false;
+    const resolveAcquisition = () => {
+      acquisitionSettled = true;
+      accepted.resolve();
+    };
+    const rejectAcquisition = (error) => {
+      if (!acquisitionSettled)
+        accepted.reject(error);
+    };
     const handedOff = beginAdmission();
     (async () => {
       try {
@@ -2294,7 +2318,6 @@ function createAgentRuntime(config) {
         if (recoveredRun.state !== "queued") {
           throw new Error("Only a queued recovered agent run can be resumed");
         }
-        accepted.resolve();
         const ticket = coordinator.submit({
           key: rawInput.conversationKey ?? rawInput.conversationId,
           policy: "queue",
@@ -2304,16 +2327,20 @@ function createAgentRuntime(config) {
               acceptedRun: recoveredRun,
               context,
               signal,
-              key: rawInput.conversationKey ?? rawInput.conversationId
+              key: rawInput.conversationKey ?? rawInput.conversationId,
+              onAcquired: resolveAcquisition
             })
           })
         });
         ticket.accepted.catch(() => {
           return;
         });
-        ticket.result.then(result.resolve, result.reject);
+        ticket.result.then(result.resolve, (error) => {
+          rejectAcquisition(error);
+          result.reject(error);
+        });
       } catch (error) {
-        accepted.reject(error);
+        rejectAcquisition(error);
         result.reject(error);
       } finally {
         handedOff();
@@ -2369,6 +2396,7 @@ function createAgentRuntime(config) {
         assistantMessageId,
         state: "queued",
         revision: 0,
+        ...policy === "interrupt-next" && { queuePriority: "interrupt-next" },
         createdAt: nowIso,
         updatedAt: nowIso
       });
@@ -2378,7 +2406,7 @@ function createAgentRuntime(config) {
         return;
       });
       const outerResult = Promise.withResolvers();
-      const reservation = config.runs?.coalescePending ? reserveAdmission(key, runId) : undefined;
+      const reservation = config.runs?.coalescePending && policy !== "interrupt-next" ? reserveAdmission(key, runId) : undefined;
       const previousAcceptance = reservation?.lane.acceptanceTail ?? Promise.resolve();
       const acceptanceDone = Promise.withResolvers();
       if (reservation) {
@@ -2599,101 +2627,129 @@ function createAgentRuntime(config) {
       if (!Number.isSafeInteger(maxRuns) || maxRuns < 1) {
         throw new TypeError("Recovery maxRuns must be a positive safe integer");
       }
-      const outcomes = [];
+      const recoverable = [];
       let cursor;
-      while (outcomes.length < maxRuns && !options.signal?.aborted && !admissionClosed) {
+      while (recoverable.length < maxRuns && !options.signal?.aborted && !admissionClosed) {
         const page = await config.store.scanRecoverable({
           ...cursor && { cursor },
-          limit: Math.min(pageSize, maxRuns - outcomes.length)
+          limit: Math.min(pageSize, maxRuns - recoverable.length)
         });
-        for (const item of page.items) {
-          if (options.signal?.aborted)
-            break;
+        recoverable.push(...page.items);
+        cursor = page.nextCursor;
+        if (!cursor || page.items.length === 0)
+          break;
+      }
+      const grouped = new Map;
+      for (const item of recoverable) {
+        const items = grouped.get(item.conversationId) ?? [];
+        items.push(item);
+        grouped.set(item.conversationId, items);
+      }
+      const ordered = [];
+      for (const [conversationId, items] of grouped) {
+        const active = await config.store.listActiveRuns(conversationId);
+        const position = new Map(active.map((run, index) => [run.id, index]));
+        ordered.push(...items.sort((left, right) => {
+          const leftPosition = position.get(left.run.id);
+          const rightPosition = position.get(right.run.id);
+          if (leftPosition === undefined && rightPosition === undefined)
+            return 0;
+          if (leftPosition === undefined)
+            return 1;
+          if (rightPosition === undefined)
+            return -1;
+          return leftPosition - rightPosition;
+        }));
+      }
+      const outcomes = [];
+      const scheduledRuns = new Map;
+      for (const item of ordered) {
+        if (options.signal?.aborted)
+          break;
+        if (admissionClosed)
+          break;
+        const releaseAdmission = beginAdmission();
+        try {
+          const active = await config.store.listActiveRuns(item.conversationId);
+          const position = active.findIndex((run) => run.id === item.run.id);
+          const scheduled = scheduledRuns.get(item.conversationId) ?? new Set;
+          const blockedByUnscheduledPredecessor = position > 0 && active.slice(0, position).some((run) => !scheduled.has(run.id));
+          if (blockedByUnscheduledPredecessor) {
+            outcomes.push({
+              conversationId: item.conversationId,
+              runId: item.run.id,
+              outcome: "skipped"
+            });
+            continue;
+          }
+          const decision = await options.decide?.(item) ?? (item.run.state === "queued" ? { action: "resume" } : { action: "skip" });
           if (admissionClosed)
-            break;
-          const handedOff = beginAdmission();
-          try {
-            if (item.run.state === "queued") {
-              const active = await config.store.listActiveRuns(item.conversationId);
-              const blockedByAcquiredPredecessor = active.some((run) => run.id !== item.run.id && (run.state === "running" || run.state === "interrupt_requested"));
-              if (blockedByAcquiredPredecessor) {
-                outcomes.push({
-                  conversationId: item.conversationId,
-                  runId: item.run.id,
-                  outcome: "skipped"
-                });
-                continue;
-              }
-            }
-            const decision = await options.decide?.(item) ?? (item.run.state === "queued" ? { action: "resume" } : { action: "skip" });
-            if (admissionClosed)
-              throw closedError();
-            if (decision.action === "skip") {
-              outcomes.push({
-                conversationId: item.conversationId,
-                runId: item.run.id,
-                outcome: "skipped"
-              });
-              continue;
-            }
-            if (decision.action === "abandon") {
-              const abandoned = await config.store.recoverRun({
-                conversationId: item.conversationId,
-                runId: item.run.id,
-                expectedRevision: item.run.revision,
-                action: "abandon"
-              });
-              if (abandoned.outcome !== "applied") {
-                throw new AgentRuntimeConflictError("recovery abandon");
-              }
-              outcomes.push({
-                conversationId: item.conversationId,
-                runId: item.run.id,
-                outcome: "abandoned"
-              });
-              continue;
-            }
-            if (decision.action === "requeue") {
-              const requeued = await config.store.recoverRun({
-                conversationId: item.conversationId,
-                runId: item.run.id,
-                expectedRevision: item.run.revision,
-                action: "requeue",
-                replaySafe: true
-              });
-              if (requeued.outcome !== "applied") {
-                throw new AgentRuntimeConflictError("recovery requeue");
-              }
-            }
-            const context = await options.resolveContext(item);
-            const resumed = resume({
+            throw closedError();
+          if (decision.action === "skip") {
+            outcomes.push({
               conversationId: item.conversationId,
               runId: item.run.id,
-              context
+              outcome: "skipped"
             });
-            resumed.result.catch(() => {
-              return;
+            continue;
+          }
+          if (decision.action === "abandon") {
+            const abandoned = await config.store.recoverRun({
+              conversationId: item.conversationId,
+              runId: item.run.id,
+              expectedRevision: item.run.revision,
+              action: "abandon"
             });
-            await resumed.accepted;
+            if (abandoned.outcome !== "applied") {
+              throw new AgentRuntimeConflictError("recovery abandon");
+            }
             outcomes.push({
               conversationId: item.conversationId,
               runId: item.run.id,
-              outcome: decision.action === "requeue" ? "requeued" : "resumed"
+              outcome: "abandoned"
             });
-          } catch (error) {
-            outcomes.push({
+            continue;
+          }
+          if (decision.action === "requeue") {
+            const requeued = await config.store.recoverRun({
               conversationId: item.conversationId,
               runId: item.run.id,
-              outcome: "failed",
-              error
+              expectedRevision: item.run.revision,
+              action: "requeue",
+              replaySafe: true
             });
-          } finally {
-            handedOff();
+            if (requeued.outcome !== "applied") {
+              throw new AgentRuntimeConflictError("recovery requeue");
+            }
           }
+          const context = await options.resolveContext(item);
+          const resumed = resume({
+            conversationId: item.conversationId,
+            runId: item.run.id,
+            context
+          });
+          resumed.result.catch(() => {
+            return;
+          });
+          await resumed.accepted;
+          scheduled.add(item.run.id);
+          scheduledRuns.set(item.conversationId, scheduled);
+          outcomes.push({
+            conversationId: item.conversationId,
+            runId: item.run.id,
+            outcome: decision.action === "requeue" ? "requeued" : "resumed",
+            result: resumed.result
+          });
+        } catch (error) {
+          outcomes.push({
+            conversationId: item.conversationId,
+            runId: item.run.id,
+            outcome: "failed",
+            error
+          });
+        } finally {
+          releaseAdmission();
         }
-        cursor = page.nextCursor;
-        if (!cursor || page.items.length === 0)
-          break;
       }
       return outcomes;
     },
@@ -2874,7 +2930,22 @@ function historyPositions(messages) {
 }
 function orderRuns(messages, runs) {
   const positionOf = historyPositions(messages);
-  return [...runs].sort((left, right) => left.createdAt.localeCompare(right.createdAt) || positionOf(left) - positionOf(right) || left.id.localeCompare(right.id));
+  const fallback = (left, right) => left.createdAt.localeCompare(right.createdAt) || positionOf(left) - positionOf(right) || left.id.localeCompare(right.id);
+  return [...runs].sort((left, right) => {
+    if (left.executionSequence !== undefined && right.executionSequence !== undefined && left.executionSequence !== right.executionSequence) {
+      return left.executionSequence - right.executionSequence;
+    }
+    const leftStarted = left.executionSequence !== undefined || left.state !== "queued";
+    const rightStarted = right.executionSequence !== undefined || right.state !== "queued";
+    if (leftStarted !== rightStarted)
+      return leftStarted ? -1 : 1;
+    if (!leftStarted && !rightStarted) {
+      const priority = Number(right.queuePriority !== undefined) - Number(left.queuePriority !== undefined);
+      if (priority !== 0)
+        return priority;
+    }
+    return fallback(left, right);
+  });
 }
 function orderRunMessages(messages, runs) {
   const byId = new Map(messages.map((message) => [message.id, message]));
@@ -2986,7 +3057,7 @@ function reduceStore(current, operation) {
     if (input.coalesceIntoRunId !== undefined && (!coalescedRun || coalescedRun.conversationId !== input.input.conversationId || coalescedRun.state !== "queued" || coalescedRun.ownerId !== undefined || coalescedRun.terminalReason !== undefined)) {
       return coalescedRun ? conflict(coalescedRun.revision) : { outcome: "not_found" };
     }
-    if (input.run.conversationId !== input.input.conversationId || input.run.inputMessageIds.length !== 1 || input.run.inputMessageIds[0] !== input.input.id || input.run.state !== "queued" || input.run.revision !== 0 || input.run.ownerId !== undefined || input.run.terminalReason !== undefined || input.run.terminalPolicyName !== undefined || input.input.role !== "user" || input.input.status !== "committed" || input.input.runId !== undefined || current.messages.some((message) => message.id === input.input.id) || coalescedRun !== undefined && input.input.id === coalescedRun.assistantMessageId || !coalescedRun && (input.run.assistantMessageId === input.input.id || current.runs.some((candidate) => candidate.id === input.run.id) || current.runs.some((candidate) => candidate.assistantMessageId === input.run.assistantMessageId) || current.messages.some((message) => message.id === input.run.assistantMessageId))) {
+    if (input.run.conversationId !== input.input.conversationId || input.run.inputMessageIds.length !== 1 || input.run.inputMessageIds[0] !== input.input.id || input.run.state !== "queued" || input.run.revision !== 0 || input.run.executionSequence !== undefined || input.run.ownerId !== undefined || input.run.terminalReason !== undefined || input.run.terminalPolicyName !== undefined || input.input.role !== "user" || input.input.status !== "committed" || input.input.runId !== undefined || current.messages.some((message) => message.id === input.input.id) || coalescedRun !== undefined && input.input.id === coalescedRun.assistantMessageId || !coalescedRun && (input.run.assistantMessageId === input.input.id || current.runs.some((candidate) => candidate.id === input.run.id) || current.runs.some((candidate) => candidate.assistantMessageId === input.run.assistantMessageId) || current.messages.some((message) => message.id === input.run.assistantMessageId))) {
       throw new TypeError("Input and queued run do not form one valid assignment");
     }
     const assignedRun = coalescedRun ? AgentRunSchema.parse({
@@ -3025,6 +3096,7 @@ function reduceStore(current, operation) {
     const next = AgentRunSchema.parse({
       ...run,
       state: "running",
+      executionSequence: run.executionSequence ?? current.version + 1,
       ownerId: operation.input.ownerId,
       fencingToken: (run.fencingToken ?? 0) + 1,
       revision: run.revision + 1,
@@ -3276,7 +3348,10 @@ function createAgentRuntimeStore(driver) {
     });
   });
   const listActiveRuns = (conversationId) => driver.transaction(async (transaction) => {
-    const records = await driver.runs.listActive(transaction, conversationId);
+    const [records, messages] = await Promise.all([
+      driver.runs.listActive(transaction, conversationId),
+      driver.history.load(transaction, conversationId)
+    ]);
     const runs = records.map((record) => AgentStoredRunSchema.parse(record).run);
     for (const run of runs) {
       if (run.conversationId !== conversationId) {
@@ -3286,7 +3361,7 @@ function createAgentRuntimeStore(driver) {
         throw new TypeError("Active run listing returned a terminal run");
       }
     }
-    return runs.sort((left, right) => left.createdAt === right.createdAt ? left.id.localeCompare(right.id) : left.createdAt < right.createdAt ? -1 : 1);
+    return orderRuns(messages, runs);
   });
   const mutate = (operation) => driver.transaction(async (transaction) => {
     const conversationId = operationConversationId(operation);
@@ -3613,6 +3688,7 @@ export {
   AgentRecoverablePageSchema,
   AgentRunEventSchema,
   AgentRunMetricsSchema,
+  AgentRunQueuePrioritySchema,
   AgentRunSchema,
   AgentRunStartedEventSchema,
   AgentRunStateEventSchema,

package/dist/browser/cancellation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../../src/browser/cancellation.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE9C,4EAA4E;AAC5E,qBAAa,wBAAyB,SAAQ,KAAK;aACrB,KAAK,EAAE,iBAAiB;IAApD,YAA4B,KAAK,EAAE,iBAAiB,EAGnD;CACF;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACrE;AAED,gFAAgF;AAChF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,mBAAmB,CAqCrB"}
+{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../../src/browser/cancellation.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE9C,4EAA4E;AAC5E,qBAAa,wBAAyB,SAAQ,KAAK;aACrB,KAAK,EAAE,iBAAiB;IAApD,YAA4B,KAAK,EAAE,iBAAiB,EAGnD;CACF;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACrE;AAED,gFAAgF;AAChF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,mBAAmB,CAwCrB"}

package/dist/{index-thcy3w8c.js → index-n34x0q5e.js}

@@ -28,34 +28,34 @@ function createRequestCancellation(caller, timeoutMs) {
   if (!caller && timeoutMs === undefined) {
     return { signal: undefined, run: (operation) => operation() };
   }
-  const controller = new AbortController;
+  const timeoutController = timeoutMs === undefined ? undefined : new AbortController;
+  const signal = caller && timeoutController ? AbortSignal.any([caller, timeoutController.signal]) : caller ?? timeoutController?.signal;
   let cause;
   let timer;
   const abortFromCaller = () => {
     if (cause)
       return;
     cause = "caller";
-    controller.abort(caller?.reason);
   };
   if (caller?.aborted)
     abortFromCaller();
   else
     caller?.addEventListener("abort", abortFromCaller, { once: true });
-  if (timeoutMs !== undefined) {
+  if (timeoutMs !== undefined && timeoutController) {
     timer = setTimeout(() => {
       if (cause)
         return;
       cause = "timeout";
-      controller.abort(new DOMException("Request timed out", "TimeoutError"));
+      timeoutController.abort(new DOMException("Request timed out", "TimeoutError"));
     }, timeoutMs);
   }
   return {
-    signal: controller.signal,
+    signal,
     async run(operation) {
       try {
         if (cause === "caller")
           throw cancellationError(cause);
-        return await operation(controller.signal);
+        return await operation(signal);
       } catch (error) {
         if (cause)
           throw cancellationError(cause);

package/dist/{index-fhsmrzj7.js → index-ysphyxax.js}

@@ -103,6 +103,7 @@ var AgentRunStateSchema = z.enum([
   "cancelled",
   "abandoned"
 ]);
+var AgentRunQueuePrioritySchema = z.enum(["interrupt-next"]);
 var AgentTerminalReasonSchema = z.enum([
   "success",
   "policy_stop",
@@ -174,6 +175,8 @@ var AgentRunFieldsSchema = z.object({
   assistantMessageId: AgentRecordIdSchema,
   state: AgentRunStateSchema,
   revision: AgentRecordVersionSchema,
+  queuePriority: AgentRunQueuePrioritySchema.optional(),
+  executionSequence: AgentRecordVersionSchema.optional(),
   ownerId: z.string().min(1).optional(),
   fencingToken: AgentRecordVersionSchema.optional(),
   terminalReason: AgentTerminalReasonSchema.optional(),
@@ -253,4 +256,4 @@ var AgentRunMetricsSchema = z.object({
   ttftMs: z.number().nonnegative().optional()
 });
 
-export { AgentRecordIdSchema, AgentRecordVersionSchema, AgentTimestampSchema, AgentJsonObjectSchema, AgentProviderEnvelopeSchema, AgentTextPartSchema, AgentReasoningPartSchema, AgentFilePartSchema, AgentSourcePartSchema, AgentToolCallPartSchema, AgentToolResultPartSchema, AgentOpaquePartSchema, AgentControlPartSchema, AgentMessagePartSchema, AgentMessageRoleSchema, AgentMessageStatusSchema, AgentMessageSchema, AgentAssistantPlaceholderSchema, AgentRunStateSchema, AgentTerminalReasonSchema, runStateForTerminalReason, AgentProvenanceSchema, AgentUsageValueSchema, AgentCostValueSchema, AgentUsageSchema, AgentRunSchema, AgentSnapshotSchema, AgentRunMetricsSchema };
+export { AgentRecordIdSchema, AgentRecordVersionSchema, AgentTimestampSchema, AgentJsonObjectSchema, AgentProviderEnvelopeSchema, AgentTextPartSchema, AgentReasoningPartSchema, AgentFilePartSchema, AgentSourcePartSchema, AgentToolCallPartSchema, AgentToolResultPartSchema, AgentOpaquePartSchema, AgentControlPartSchema, AgentMessagePartSchema, AgentMessageRoleSchema, AgentMessageStatusSchema, AgentMessageSchema, AgentAssistantPlaceholderSchema, AgentRunStateSchema, AgentRunQueuePrioritySchema, AgentTerminalReasonSchema, runStateForTerminalReason, AgentProvenanceSchema, AgentUsageValueSchema, AgentCostValueSchema, AgentUsageSchema, AgentRunSchema, AgentSnapshotSchema, AgentRunMetricsSchema };

package/dist/index.js

@@ -42,34 +42,34 @@ function createRequestCancellation(caller, timeoutMs) {
   if (!caller && timeoutMs === undefined) {
     return { signal: undefined, run: (operation) => operation() };
   }
-  const controller = new AbortController;
+  const timeoutController = timeoutMs === undefined ? undefined : new AbortController;
+  const signal = caller && timeoutController ? AbortSignal.any([caller, timeoutController.signal]) : caller ?? timeoutController?.signal;
   let cause;
   let timer;
   const abortFromCaller = () => {
     if (cause)
       return;
     cause = "caller";
-    controller.abort(caller?.reason);
   };
   if (caller?.aborted)
     abortFromCaller();
   else
     caller?.addEventListener("abort", abortFromCaller, { once: true });
-  if (timeoutMs !== undefined) {
+  if (timeoutMs !== undefined && timeoutController) {
     timer = setTimeout(() => {
       if (cause)
         return;
       cause = "timeout";
-      controller.abort(new DOMException("Request timed out", "TimeoutError"));
+      timeoutController.abort(new DOMException("Request timed out", "TimeoutError"));
     }, timeoutMs);
   }
   return {
-    signal: controller.signal,
+    signal,
     async run(operation) {
       try {
         if (cause === "caller")
           throw cancellationError(cause);
-        return await operation(controller.signal);
+        return await operation(signal);
       } catch (error) {
         if (cause)
           throw cancellationError(cause);

package/dist/remote.js

@@ -1,7 +1,7 @@
 import {
   ApiError,
   createClient
-} from "./index-thcy3w8c.js";
+} from "./index-n34x0q5e.js";
 import"./index-r5s4wqb5.js";
 import {
   mergeMeta

package/dist/testing/agent-store-conformance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-store-conformance.d.ts","sourceRoot":"","sources":["../../src/testing/agent-store-conformance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE;;;;;;;;;GASG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,WAAW,CACT,OAAO,EAAE,4BAA4B,GACpC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClD;;;;;;;;OAQG;IACH,OAAO,CAAC,CAAC,OAAO,EAAE,4BAA4B,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAwCD,gFAAgF;AAChF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
+{"version":3,"file":"agent-store-conformance.d.ts","sourceRoot":"","sources":["../../src/testing/agent-store-conformance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE;;;;;;;;;GASG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,WAAW,CACT,OAAO,EAAE,4BAA4B,GACpC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClD;;;;;;;;OAQG;IACH,OAAO,CAAC,CAAC,OAAO,EAAE,4BAA4B,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAwCD,gFAAgF;AAChF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,IAAI,CAAC,CAkCf"}