@bastani/atomic 0.9.44-alpha.1 → 0.9.44-alpha.2

package/dist/builtin/workflows/src/extension/local-worker-entry.mjs

@@ -1661,6 +1661,13 @@ function removeProcessExitCleanup(cleanup) {
   if (processExitCleanups.delete(cleanup) && processExitCleanups.size === 0)
     process.off("exit", runProcessExitCleanups);
 }
+function snapshotNeedsHistory(tail) {
+  const event = tail.snapshot.event;
+  if (event.type !== RUN_EVENT_TYPES.messageQueued)
+    return false;
+  const payload = event.payload;
+  return hasPendingStageDeliveryDelta(payload.pendingStageMessages);
+}
 function* invoke(action) {
   try {
     const result = action();
@@ -1776,8 +1783,11 @@ class JournalDurableBackend {
       this.projection.applyWorkflowSnapshot(event.payload.handle);
       this.prompts.set(entry.runId, new PromptReservationState(event.payload.handle.pendingPrompts, event.payload.prompts));
     } else {
-      const handle = event.payload;
       const previous = this.projection.getWorkflow(entry.runId);
+      const handle = event.type === RUN_EVENT_TYPES.messageQueued && hasPendingStageDeliveryDelta(event.payload.pendingStageMessages) ? {
+        ...event.payload,
+        pendingStageMessages: decodePendingStageDeliveries(previous?.pendingStageMessages ?? [], event.payload.pendingStageMessages ?? [])
+      } : event.payload;
       this.projection.applyWorkflowSnapshot(handle);
       if (event.type === RUN_EVENT_TYPES.runStarted || previous?.pendingPrompts !== handle.pendingPrompts)
         this.prompts.delete(entry.runId);
@@ -2073,11 +2083,23 @@ class JournalDurableBackend {
     for (const message of messages)
       if (message.runId !== logicalRunId)
         throw new JournalMessageScopeError(logicalRunId, message.runId);
-    yield* this.snapshot({
+    const next = {
       ...handle,
       pendingStageMessages: replacePendingStageMessagesForRun(handle.pendingStageMessages ?? [], logicalRunId, messages),
       updatedAt: Math.max(Date.now(), handle.updatedAt + 1)
-    }, RUN_EVENT_TYPES.messageQueued);
+    };
+    const encoded = encodePendingStageDeliveries(handle.pendingStageMessages ?? [], next.pendingStageMessages ?? []);
+    const base = this.sequences.get(runId);
+    if (encoded !== undefined && base !== undefined) {
+      try {
+        yield* this.append(runId, { type: RUN_EVENT_TYPES.messageQueued, payload: { ...next, pendingStageMessages: encoded } }, { expectSeq: base });
+        return true;
+      } catch (error) {
+        if (!(error instanceof JournalCasConflictError))
+          throw error;
+      }
+    }
+    yield* this.snapshot(next, RUN_EVENT_TYPES.messageQueued);
     return true;
   }
   async archivePendingStageMessage(runId, message) {
@@ -2171,7 +2193,7 @@ class JournalDurableBackend {
       if (summarized !== undefined && summarized.seq === version.seq && summarized.at === version.at)
         return;
       const tail = yield* invoke(() => journal.snapshotTail(runId));
-      if (tail !== undefined)
+      if (tail !== undefined && !snapshotNeedsHistory(tail))
         return this.summarize(runId, tail);
       if (summarized === undefined && version.seq === 0)
         return;
@@ -2397,6 +2419,69 @@ class JournalDurableBackend {
     }
   }
 }
+function identity(message) {
+  return JSON.stringify([message.runId, message.id]);
+}
+function uniqueByIdentity(messages) {
+  const result = new Map;
+  const repeated = new Set;
+  for (const message of messages) {
+    const key = identity(message);
+    if (result.has(key))
+      repeated.add(key);
+    result.set(key, message);
+  }
+  for (const key of repeated)
+    result.delete(key);
+  return result;
+}
+function isDeltaEncoded(message) {
+  return message.deliveryDelta !== undefined;
+}
+function encodePendingStageDeliveries(previous, next) {
+  const bases = uniqueByIdentity(previous);
+  const nextIdentities = uniqueByIdentity(next);
+  let encodedAny = false;
+  const encoded = next.map((message) => {
+    const base = bases.get(identity(message))?.deliveries;
+    const deliveries = message.deliveries;
+    if (base === undefined || deliveries === undefined || !nextIdentities.has(identity(message)))
+      return message;
+    const drop = [];
+    let kept = 0;
+    base.forEach((delivery, index) => {
+      if (kept < deliveries.length && JSON.stringify(delivery) === JSON.stringify(deliveries[kept]))
+        kept++;
+      else
+        drop.push(index);
+    });
+    const add = deliveries.slice(kept);
+    if (drop.length + add.length >= deliveries.length)
+      return message;
+    encodedAny = true;
+    const { deliveries: _full, ...rest } = message;
+    return { ...rest, deliveryDelta: drop.length === 0 ? { add } : { drop, add } };
+  });
+  return encodedAny ? encoded : undefined;
+}
+function decodePendingStageDeliveries(previous, messages) {
+  if (!messages.some(isDeltaEncoded))
+    return messages;
+  const bases = uniqueByIdentity(previous);
+  return messages.map((message) => {
+    if (!isDeltaEncoded(message))
+      return message;
+    const base = bases.get(identity(message))?.deliveries;
+    if (base === undefined)
+      throw new Error(`atomic-workflows: journal delivery change for ${identity(message)} has no base entry`);
+    const { deliveryDelta, ...rest } = message;
+    const dropped = new Set(deliveryDelta.drop ?? []);
+    return { ...rest, deliveries: [...base.filter((_, index) => !dropped.has(index)), ...deliveryDelta.add] };
+  });
+}
+function hasPendingStageDeliveryDelta(messages) {
+  return messages?.some(isDeltaEncoded) === true;
+}
 var PROCESS_HOLDER_ID, processExitCleanups, JournalOwnershipError, JournalBackendClosedError, JournalOperationAbortedError, JournalExecutionRetiredError, JournalMessageScopeError;
 var init_journal_backend = __esm(() => {
   init_workflow_instance_ownership_error();
@@ -58403,7 +58488,8 @@ function buildSendSignature(to, options) {
     attachments: canonicalizeAttachmentsForSendSignature(options.attachments) ?? [],
     replyTo: options.replyTo ?? null,
     expectsReply: options.expectsReply ?? false,
-    replyError: options.replyError ?? null
+    replyError: options.replyError ?? null,
+    ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery }
   });
 }
 
@@ -58589,6 +58675,8 @@ function isMessage(value2) {
     return false;
   if (message.expectsReply !== undefined && typeof message.expectsReply !== "boolean")
     return false;
+  if (message.delivery !== undefined && message.delivery !== "steer" && message.delivery !== "followUp" && message.delivery !== "interrupt")
+    return false;
   if (message.replyError !== undefined && typeof message.replyError !== "string")
     return false;
   if (message.source !== undefined && !isMessageSource(message.source))
@@ -59798,6 +59886,7 @@ var init_client = __esm(() => {
         timestamp: Date.now(),
         replyTo: options.replyTo,
         expectsReply: options.expectsReply,
+        ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery },
         replyError: options.replyError,
         source: this._messageSource,
         content: { text: options.text, attachments: options.attachments }

package/dist/builtin/workflows/src/index.js

@@ -9870,6 +9870,13 @@ function removeProcessExitCleanup(cleanup) {
   if (processExitCleanups.delete(cleanup) && processExitCleanups.size === 0)
     process.off("exit", runProcessExitCleanups);
 }
+function snapshotNeedsHistory(tail) {
+  const event = tail.snapshot.event;
+  if (event.type !== RUN_EVENT_TYPES.messageQueued)
+    return false;
+  const payload = event.payload;
+  return hasPendingStageDeliveryDelta(payload.pendingStageMessages);
+}
 function* invoke(action) {
   try {
     const result = action();
@@ -9985,8 +9992,11 @@ class JournalDurableBackend {
       this.projection.applyWorkflowSnapshot(event.payload.handle);
       this.prompts.set(entry.runId, new PromptReservationState(event.payload.handle.pendingPrompts, event.payload.prompts));
     } else {
-      const handle = event.payload;
       const previous = this.projection.getWorkflow(entry.runId);
+      const handle = event.type === RUN_EVENT_TYPES.messageQueued && hasPendingStageDeliveryDelta(event.payload.pendingStageMessages) ? {
+        ...event.payload,
+        pendingStageMessages: decodePendingStageDeliveries(previous?.pendingStageMessages ?? [], event.payload.pendingStageMessages ?? [])
+      } : event.payload;
       this.projection.applyWorkflowSnapshot(handle);
       if (event.type === RUN_EVENT_TYPES.runStarted || previous?.pendingPrompts !== handle.pendingPrompts)
         this.prompts.delete(entry.runId);
@@ -10282,11 +10292,23 @@ class JournalDurableBackend {
     for (const message of messages)
       if (message.runId !== logicalRunId)
         throw new JournalMessageScopeError(logicalRunId, message.runId);
-    yield* this.snapshot({
+    const next = {
       ...handle,
       pendingStageMessages: replacePendingStageMessagesForRun(handle.pendingStageMessages ?? [], logicalRunId, messages),
       updatedAt: Math.max(Date.now(), handle.updatedAt + 1)
-    }, RUN_EVENT_TYPES.messageQueued);
+    };
+    const encoded = encodePendingStageDeliveries(handle.pendingStageMessages ?? [], next.pendingStageMessages ?? []);
+    const base = this.sequences.get(runId);
+    if (encoded !== undefined && base !== undefined) {
+      try {
+        yield* this.append(runId, { type: RUN_EVENT_TYPES.messageQueued, payload: { ...next, pendingStageMessages: encoded } }, { expectSeq: base });
+        return true;
+      } catch (error) {
+        if (!(error instanceof JournalCasConflictError))
+          throw error;
+      }
+    }
+    yield* this.snapshot(next, RUN_EVENT_TYPES.messageQueued);
     return true;
   }
   async archivePendingStageMessage(runId, message) {
@@ -10380,7 +10402,7 @@ class JournalDurableBackend {
       if (summarized !== undefined && summarized.seq === version.seq && summarized.at === version.at)
         return;
       const tail = yield* invoke(() => journal.snapshotTail(runId));
-      if (tail !== undefined)
+      if (tail !== undefined && !snapshotNeedsHistory(tail))
         return this.summarize(runId, tail);
       if (summarized === undefined && version.seq === 0)
         return;
@@ -10606,6 +10628,69 @@ class JournalDurableBackend {
     }
   }
 }
+function identity(message) {
+  return JSON.stringify([message.runId, message.id]);
+}
+function uniqueByIdentity(messages) {
+  const result = new Map;
+  const repeated = new Set;
+  for (const message of messages) {
+    const key = identity(message);
+    if (result.has(key))
+      repeated.add(key);
+    result.set(key, message);
+  }
+  for (const key of repeated)
+    result.delete(key);
+  return result;
+}
+function isDeltaEncoded(message) {
+  return message.deliveryDelta !== undefined;
+}
+function encodePendingStageDeliveries(previous, next) {
+  const bases = uniqueByIdentity(previous);
+  const nextIdentities = uniqueByIdentity(next);
+  let encodedAny = false;
+  const encoded = next.map((message) => {
+    const base = bases.get(identity(message))?.deliveries;
+    const deliveries = message.deliveries;
+    if (base === undefined || deliveries === undefined || !nextIdentities.has(identity(message)))
+      return message;
+    const drop = [];
+    let kept = 0;
+    base.forEach((delivery, index) => {
+      if (kept < deliveries.length && JSON.stringify(delivery) === JSON.stringify(deliveries[kept]))
+        kept++;
+      else
+        drop.push(index);
+    });
+    const add = deliveries.slice(kept);
+    if (drop.length + add.length >= deliveries.length)
+      return message;
+    encodedAny = true;
+    const { deliveries: _full, ...rest } = message;
+    return { ...rest, deliveryDelta: drop.length === 0 ? { add } : { drop, add } };
+  });
+  return encodedAny ? encoded : undefined;
+}
+function decodePendingStageDeliveries(previous, messages) {
+  if (!messages.some(isDeltaEncoded))
+    return messages;
+  const bases = uniqueByIdentity(previous);
+  return messages.map((message) => {
+    if (!isDeltaEncoded(message))
+      return message;
+    const base = bases.get(identity(message))?.deliveries;
+    if (base === undefined)
+      throw new Error(`atomic-workflows: journal delivery change for ${identity(message)} has no base entry`);
+    const { deliveryDelta, ...rest } = message;
+    const dropped = new Set(deliveryDelta.drop ?? []);
+    return { ...rest, deliveries: [...base.filter((_, index) => !dropped.has(index)), ...deliveryDelta.add] };
+  });
+}
+function hasPendingStageDeliveryDelta(messages) {
+  return messages?.some(isDeltaEncoded) === true;
+}
 var PROCESS_HOLDER_ID, processExitCleanups, JournalOwnershipError, JournalBackendClosedError, JournalOperationAbortedError, JournalExecutionRetiredError, JournalMessageScopeError;
 var init_journal_backend = __esm(() => {
   init_workflow_instance_ownership_error();
@@ -59086,7 +59171,8 @@ function buildSendSignature(to, options) {
     attachments: canonicalizeAttachmentsForSendSignature(options.attachments) ?? [],
     replyTo: options.replyTo ?? null,
     expectsReply: options.expectsReply ?? false,
-    replyError: options.replyError ?? null
+    replyError: options.replyError ?? null,
+    ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery }
   });
 }
 
@@ -59272,6 +59358,8 @@ function isMessage(value2) {
     return false;
   if (message.expectsReply !== undefined && typeof message.expectsReply !== "boolean")
     return false;
+  if (message.delivery !== undefined && message.delivery !== "steer" && message.delivery !== "followUp" && message.delivery !== "interrupt")
+    return false;
   if (message.replyError !== undefined && typeof message.replyError !== "string")
     return false;
   if (message.source !== undefined && !isMessageSource(message.source))
@@ -60481,6 +60569,7 @@ var init_client = __esm(() => {
         timestamp: Date.now(),
         replyTo: options.replyTo,
         expectsReply: options.expectsReply,
+        ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery },
         replyError: options.replyError,
         source: this._messageSource,
         content: { text: options.text, attachments: options.attachments }

package/dist/builtin/workflows/src/local-worker-entry.mjs

@@ -1661,6 +1661,13 @@ function removeProcessExitCleanup(cleanup) {
   if (processExitCleanups.delete(cleanup) && processExitCleanups.size === 0)
     process.off("exit", runProcessExitCleanups);
 }
+function snapshotNeedsHistory(tail) {
+  const event = tail.snapshot.event;
+  if (event.type !== RUN_EVENT_TYPES.messageQueued)
+    return false;
+  const payload = event.payload;
+  return hasPendingStageDeliveryDelta(payload.pendingStageMessages);
+}
 function* invoke(action) {
   try {
     const result = action();
@@ -1776,8 +1783,11 @@ class JournalDurableBackend {
       this.projection.applyWorkflowSnapshot(event.payload.handle);
       this.prompts.set(entry.runId, new PromptReservationState(event.payload.handle.pendingPrompts, event.payload.prompts));
     } else {
-      const handle = event.payload;
       const previous = this.projection.getWorkflow(entry.runId);
+      const handle = event.type === RUN_EVENT_TYPES.messageQueued && hasPendingStageDeliveryDelta(event.payload.pendingStageMessages) ? {
+        ...event.payload,
+        pendingStageMessages: decodePendingStageDeliveries(previous?.pendingStageMessages ?? [], event.payload.pendingStageMessages ?? [])
+      } : event.payload;
       this.projection.applyWorkflowSnapshot(handle);
       if (event.type === RUN_EVENT_TYPES.runStarted || previous?.pendingPrompts !== handle.pendingPrompts)
         this.prompts.delete(entry.runId);
@@ -2073,11 +2083,23 @@ class JournalDurableBackend {
     for (const message of messages)
       if (message.runId !== logicalRunId)
         throw new JournalMessageScopeError(logicalRunId, message.runId);
-    yield* this.snapshot({
+    const next = {
       ...handle,
       pendingStageMessages: replacePendingStageMessagesForRun(handle.pendingStageMessages ?? [], logicalRunId, messages),
       updatedAt: Math.max(Date.now(), handle.updatedAt + 1)
-    }, RUN_EVENT_TYPES.messageQueued);
+    };
+    const encoded = encodePendingStageDeliveries(handle.pendingStageMessages ?? [], next.pendingStageMessages ?? []);
+    const base = this.sequences.get(runId);
+    if (encoded !== undefined && base !== undefined) {
+      try {
+        yield* this.append(runId, { type: RUN_EVENT_TYPES.messageQueued, payload: { ...next, pendingStageMessages: encoded } }, { expectSeq: base });
+        return true;
+      } catch (error) {
+        if (!(error instanceof JournalCasConflictError))
+          throw error;
+      }
+    }
+    yield* this.snapshot(next, RUN_EVENT_TYPES.messageQueued);
     return true;
   }
   async archivePendingStageMessage(runId, message) {
@@ -2171,7 +2193,7 @@ class JournalDurableBackend {
       if (summarized !== undefined && summarized.seq === version.seq && summarized.at === version.at)
         return;
       const tail = yield* invoke(() => journal.snapshotTail(runId));
-      if (tail !== undefined)
+      if (tail !== undefined && !snapshotNeedsHistory(tail))
         return this.summarize(runId, tail);
       if (summarized === undefined && version.seq === 0)
         return;
@@ -2397,6 +2419,69 @@ class JournalDurableBackend {
     }
   }
 }
+function identity(message) {
+  return JSON.stringify([message.runId, message.id]);
+}
+function uniqueByIdentity(messages) {
+  const result = new Map;
+  const repeated = new Set;
+  for (const message of messages) {
+    const key = identity(message);
+    if (result.has(key))
+      repeated.add(key);
+    result.set(key, message);
+  }
+  for (const key of repeated)
+    result.delete(key);
+  return result;
+}
+function isDeltaEncoded(message) {
+  return message.deliveryDelta !== undefined;
+}
+function encodePendingStageDeliveries(previous, next) {
+  const bases = uniqueByIdentity(previous);
+  const nextIdentities = uniqueByIdentity(next);
+  let encodedAny = false;
+  const encoded = next.map((message) => {
+    const base = bases.get(identity(message))?.deliveries;
+    const deliveries = message.deliveries;
+    if (base === undefined || deliveries === undefined || !nextIdentities.has(identity(message)))
+      return message;
+    const drop = [];
+    let kept = 0;
+    base.forEach((delivery, index) => {
+      if (kept < deliveries.length && JSON.stringify(delivery) === JSON.stringify(deliveries[kept]))
+        kept++;
+      else
+        drop.push(index);
+    });
+    const add = deliveries.slice(kept);
+    if (drop.length + add.length >= deliveries.length)
+      return message;
+    encodedAny = true;
+    const { deliveries: _full, ...rest } = message;
+    return { ...rest, deliveryDelta: drop.length === 0 ? { add } : { drop, add } };
+  });
+  return encodedAny ? encoded : undefined;
+}
+function decodePendingStageDeliveries(previous, messages) {
+  if (!messages.some(isDeltaEncoded))
+    return messages;
+  const bases = uniqueByIdentity(previous);
+  return messages.map((message) => {
+    if (!isDeltaEncoded(message))
+      return message;
+    const base = bases.get(identity(message))?.deliveries;
+    if (base === undefined)
+      throw new Error(`atomic-workflows: journal delivery change for ${identity(message)} has no base entry`);
+    const { deliveryDelta, ...rest } = message;
+    const dropped = new Set(deliveryDelta.drop ?? []);
+    return { ...rest, deliveries: [...base.filter((_, index) => !dropped.has(index)), ...deliveryDelta.add] };
+  });
+}
+function hasPendingStageDeliveryDelta(messages) {
+  return messages?.some(isDeltaEncoded) === true;
+}
 var PROCESS_HOLDER_ID, processExitCleanups, JournalOwnershipError, JournalBackendClosedError, JournalOperationAbortedError, JournalExecutionRetiredError, JournalMessageScopeError;
 var init_journal_backend = __esm(() => {
   init_workflow_instance_ownership_error();
@@ -58403,7 +58488,8 @@ function buildSendSignature(to, options) {
     attachments: canonicalizeAttachmentsForSendSignature(options.attachments) ?? [],
     replyTo: options.replyTo ?? null,
     expectsReply: options.expectsReply ?? false,
-    replyError: options.replyError ?? null
+    replyError: options.replyError ?? null,
+    ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery }
   });
 }
 
@@ -58589,6 +58675,8 @@ function isMessage(value2) {
     return false;
   if (message.expectsReply !== undefined && typeof message.expectsReply !== "boolean")
     return false;
+  if (message.delivery !== undefined && message.delivery !== "steer" && message.delivery !== "followUp" && message.delivery !== "interrupt")
+    return false;
   if (message.replyError !== undefined && typeof message.replyError !== "string")
     return false;
   if (message.source !== undefined && !isMessageSource(message.source))
@@ -59798,6 +59886,7 @@ var init_client = __esm(() => {
         timestamp: Date.now(),
         replyTo: options.replyTo,
         expectsReply: options.expectsReply,
+        ...options.delivery === undefined || options.delivery === "steer" ? {} : { delivery: options.delivery },
         replyError: options.replyError,
         source: this._messageSource,
         content: { text: options.text, attachments: options.attachments }

package/dist/core/agent-session-custom-message-commit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-custom-message-commit.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-custom-message-commit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAO9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AA6BnD,6EAA6E;AAC7E,wBAAsB,2BAA2B,CAAC,CAAC,EAClD,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAmGf;AAED,wBAAgB,4BAA4B,CAAC,CAAC,EAC7C,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,+EAA+E;AAC/E,wBAAsB,4BAA4B,CAAC,CAAC,EACnD,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAiDf;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAC9C,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,eAAO,MAAM,sCAAsC;;;CAGlD,CAAC"}
+{"version":3,"file":"agent-session-custom-message-commit.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-custom-message-commit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQ9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAmEnD,6EAA6E;AAC7E,wBAAsB,2BAA2B,CAAC,CAAC,EAClD,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA+Gf;AAED,wBAAgB,4BAA4B,CAAC,CAAC,EAC7C,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,+EAA+E;AAC/E,wBAAsB,4BAA4B,CAAC,CAAC,EACnD,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Df;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAC9C,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,eAAO,MAAM,sCAAsC;;;CAGlD,CAAC"}

package/dist/core/agent-session-custom-message-commit.js

@@ -1,5 +1,7 @@
 import { resolveWorkflowStageDeliveryTarget } from "./agent-session-delivery-forwarding.js";
 import { admitProtectedStreamingCustomMessage, queueProtectedStreamingCustomMessage, queueProtectedStreamingCustomMessages, triggerProtectedStreamingCustomMessages, } from "./agent-session-persistent-custom-messages.js";
+import { deliverQueuedInputIfIdle } from "./agent-session-prompt.js";
+import { TASK_COMPLETION_MESSAGE_TYPE } from "./tasks/completion.js";
 async function appendDurableStageAdmission(session, message) {
     await session._appendCustomMessage(message);
 }
@@ -23,15 +25,54 @@ async function commitPriorityMessage(session, message) {
         void turn.catch(() => { });
     }
 }
+/**
+ * #3919: before a fresh stage's own prompt is submitted, turn-starting input is that prompt's startup context.
+ * Once the prompt is in preflight, a run has started, or queued input is paused, the ordinary admission paths
+ * own ordering. The stage's own task completions follow its own work, so they never precede its prompt.
+ */
+function holdsForFirstStagePrompt(session, message, options) {
+    return (session._workflowStageAwaitingFirstPrompt &&
+        session._activePromptCount === 0 &&
+        !session._queuedMessagesPaused &&
+        message.customType !== TASK_COMPLETION_MESSAGE_TYPE &&
+        options?.triggerTurn === true &&
+        options.excludeFromContext !== true &&
+        options.deliverAs !== "nextTurn");
+}
+/**
+ * #3919: once the stage prompt is submitted but before it owns a run (its input hooks), a turn-starting
+ * message must not start a competing turn. It queues behind the pending prompt; interrupts keep their own path.
+ */
+function queuesBehindFirstStagePrompt(session, options) {
+    return (session._workflowStageAwaitingFirstPrompt &&
+        session._activePromptCount > 0 &&
+        !session._queuedMessagesPaused &&
+        options?.triggerTurn === true &&
+        options.excludeFromContext !== true &&
+        options.deliverAs !== "nextTurn" &&
+        options.deliverAs !== "interrupt");
+}
 /** Commit one delivery whose source generation already granted admission. */
 export async function commitAdmittedCustomMessage(session, appMessage, options) {
     const owner = resolveWorkflowStageDeliveryTarget(session);
     if (owner !== session)
         return commitAdmittedCustomMessage(owner, appMessage, options);
     const self = session;
+    if (holdsForFirstStagePrompt(self, appMessage, options)) {
+        await appendDurableStageAdmission(self, appMessage);
+        return;
+    }
     const useProtectedReconciliation = options?.persistWhenStreaming === true &&
         options.excludeFromContext !== true &&
         (options.triggerTurn === true || options.stageAdmissionKey !== undefined);
+    if (queuesBehindFirstStagePrompt(self, options)) {
+        const delivery = options?.deliverAs === "followUp" ? "followUp" : "steer";
+        if (useProtectedReconciliation)
+            await queueProtectedStreamingCustomMessage(self, appMessage, delivery);
+        else
+            self._queueAgentMessage(appMessage, delivery);
+        return;
+    }
     if (useProtectedReconciliation &&
         options?.triggerTurn &&
         options.deliverAs === "interrupt" &&
@@ -78,6 +119,9 @@ export async function commitAdmittedCustomMessage(session, appMessage, options)
     }
     else if ((self.isStreaming || self._isPreparingRun) && useProtectedReconciliation) {
         await queueProtectedStreamingCustomMessage(self, appMessage, options?.deliverAs === "followUp" ? "followUp" : "steer");
+        // The durable card append can yield past the run's last queue drain.
+        if (!self.isStreaming)
+            deliverQueuedInputIfIdle(self);
     }
     else if ((self.isStreaming || self._isPreparingRun) && options?.persistWhenStreaming === true) {
         await appendDurableStageAdmission(self, appMessage);
@@ -130,8 +174,21 @@ export async function commitAdmittedCustomMessages(session, appMessages, options
     if (owner !== session)
         return commitAdmittedCustomMessages(owner, appMessages, options);
     const self = session;
+    if (appMessages.every((item) => holdsForFirstStagePrompt(self, item, options))) {
+        for (const item of appMessages)
+            await appendDurableStageAdmission(self, item);
+        return;
+    }
     const useProtectedReconciliation = options?.persistWhenStreaming === true && options.triggerTurn === true && options.excludeFromContext !== true;
     const delivery = options?.deliverAs === "followUp" ? "followUp" : "steer";
+    if (queuesBehindFirstStagePrompt(self, options)) {
+        if (useProtectedReconciliation)
+            await queueProtectedStreamingCustomMessages(self, appMessages, delivery);
+        else
+            for (const item of appMessages)
+                self._queueAgentMessage(item, delivery);
+        return;
+    }
     if (options?.deliverAs === "nextTurn") {
         self._pendingNextTurnMessages.push(...appMessages);
     }
@@ -166,6 +223,8 @@ export async function commitAdmittedCustomMessages(session, appMessages, options
     }
     else if ((self.isStreaming || self._isPreparingRun) && useProtectedReconciliation) {
         await queueProtectedStreamingCustomMessages(self, appMessages, delivery);
+        if (!self.isStreaming)
+            deliverQueuedInputIfIdle(self);
     }
     else if ((self.isStreaming || self._isPreparingRun) && options?.persistWhenStreaming === true) {
         for (const item of appMessages)