replicas-engine 0.1.1295 → 0.1.1296

package/dist/src/{asp-host-FJLQE5VO.js → asp-host-6FYWPUOM.js}

@@ -8,9 +8,9 @@ import {
   listRunningCodexModels,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-WC72KGDL.js";
+} from "./chunk-JPQ2UW3B.js";
 import "./chunk-OCOIXNER.js";
-import "./chunk-JBZNUWMJ.js";
+import "./chunk-ZNRUYJCQ.js";
 import "./chunk-TBKEZB4T.js";
 import "./chunk-UZSNFLDQ.js";
 import "./chunk-Q5KCYMUE.js";

package/dist/src/{chunk-4YOLKZQK.js → chunk-7URL5D26.js}

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   AspClient
-} from "./chunk-JBZNUWMJ.js";
+} from "./chunk-ZNRUYJCQ.js";
 import {
   ASTER_BASE_URL,
   ASTER_PROVIDER,

package/dist/src/{chunk-WC72KGDL.js → chunk-JPQ2UW3B.js}

@@ -14,7 +14,7 @@ import {
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-JBZNUWMJ.js";
+} from "./chunk-ZNRUYJCQ.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
@@ -306,7 +306,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
     await this.applyCredentialUpdate(++this.credentialGeneration, async () => {
       await this.applyCredentialsResponse(data);
       setAgentCredentialSnapshot("codex", data);
-      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-FJLQE5VO.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-6FYWPUOM.js");
       await restartCodexAspHostIfRunning2();
     });
     await this.start(true);
@@ -328,7 +328,7 @@ var CodexTokenManager = class extends BaseRefreshManager {
       const accountChanged = ENGINE_ENV.REPLICAS_AGENT_CREDENTIALS.codex?.credentialId !== data.credentialId;
       await this.applyCredentialsResponse(data);
       if (restartOnChange && (accountChanged || CODEX_AUTH_ENV_KEYS.some((key, index) => process.env[key] !== previousEnv[index]))) {
-        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-FJLQE5VO.js");
+        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-6FYWPUOM.js");
         await restartCodexAspHostIfRunning2();
       }
       setAgentCredentialSnapshot("codex", data);

package/dist/src/{chunk-JBZNUWMJ.js → chunk-ZNRUYJCQ.js}

@@ -240,7 +240,7 @@ function getCodexModelProvider(method) {
   if (method === "foundry") return "azure";
   return method === "ollama" || method === "openai-compatible" ? "replicas_openai_compatible" : "openai";
 }
-var ENGINE_PACKAGE_VERSION = "0.1.1295";
+var ENGINE_PACKAGE_VERSION = "0.1.1296";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/headless-agent.js

@@ -14,11 +14,11 @@ import {
   recoverCompletedTurn,
   spawnMuseMsp,
   startMuseSession
-} from "./chunk-4YOLKZQK.js";
+} from "./chunk-7URL5D26.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-JBZNUWMJ.js";
+} from "./chunk-ZNRUYJCQ.js";
 import "./chunk-TBKEZB4T.js";
 import {
   AGENT,

package/dist/src/index.js

@@ -65,7 +65,7 @@ import {
   spawnMuseMsp,
   startMuseSession,
   uuidV7
-} from "./chunk-4YOLKZQK.js";
+} from "./chunk-7URL5D26.js";
 import {
   publishedPullRequestUrls
 } from "./chunk-EBKIWJLA.js";
@@ -143,7 +143,7 @@ import {
   timestampFromSeconds,
   upsertCredentialFileLines,
   writeSecureCredentialFile
-} from "./chunk-WC72KGDL.js";
+} from "./chunk-JPQ2UW3B.js";
 import {
   ENGINE_ENV,
   monolithRequest,
@@ -156,7 +156,7 @@ import {
 } from "./chunk-OCOIXNER.js";
 import {
   getCodexModelProvider
-} from "./chunk-JBZNUWMJ.js";
+} from "./chunk-ZNRUYJCQ.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execAsync,
@@ -11666,7 +11666,7 @@ function toQueuedMessageInfo(message) {
   };
 }
 var subagentMcpConfigRequest = null;
-var CodingAgentManager = class {
+var CodingAgentManager = class _CodingAgentManager {
   workingDirectory;
   messageQueue;
   initialized;
@@ -11691,6 +11691,10 @@ var CodingAgentManager = class {
   unreadSteers = /* @__PURE__ */ new Map();
   steersInFlight = /* @__PURE__ */ new Map();
   steerSettlements = /* @__PURE__ */ new Set();
+  earlySteers = [];
+  withdrawnSteers = /* @__PURE__ */ new WeakSet();
+  earlySteerDelivery = new AsyncLock();
+  turnOpen = false;
   lastSenderKey;
   // Unset until this process sends a turn, so a restart can't mistake the first one for a change.
   sentTurn = false;
@@ -11783,22 +11787,36 @@ var CodingAgentManager = class {
   initializeManager(processMessage) {
     this.messageQueue = new MessageQueueService(
       async (request, signal) => {
-        await Promise.all([this.refreshSubagentMcp(), this.refreshAutoCompactTokens()]);
-        const { request: delivered, senderKey } = this.withSenderLine(request);
-        const stopped = signal.aborted;
-        if (stopped && (request.engineTurn || !await this.keepStoppedRequest(delivered))) return;
-        await this.saveLastSenderKey(senderKey);
-        if (stopped) return;
-        const instructionsChanged = this.sentTurn && this.lastCustomInstructions !== request.customInstructions && !request.goalMode && !request.message.trimStart().startsWith("/");
-        this.sentTurn = true;
-        this.lastCustomInstructions = request.customInstructions;
-        const note = wrapInTag("Your instructions changed since your previous turn. Earlier turns followed the old version: follow the current instructions from here on, and leave earlier replies as they are.", REPLICAS_INSTRUCTIONS_TAG);
-        await processMessage(instructionsChanged ? { ...delivered, message: `${delivered.message}
+        this.turnOpen = true;
+        try {
+          await Promise.all([this.refreshSubagentMcp(), this.refreshAutoCompactTokens()]);
+          const { request: delivered, senderKey } = this.withSenderLine(request);
+          const stopped = signal.aborted;
+          if (stopped && (request.engineTurn || !await this.keepStoppedRequest(delivered))) return;
+          await this.saveLastSenderKey(senderKey);
+          if (stopped) return;
+          const instructionsChanged = this.sentTurn && this.lastCustomInstructions !== request.customInstructions && !request.goalMode && !request.message.trimStart().startsWith("/");
+          this.sentTurn = true;
+          this.lastCustomInstructions = request.customInstructions;
+          const note = wrapInTag("Your instructions changed since your previous turn. Earlier turns followed the old version: follow the current instructions from here on, and leave earlier replies as they are.", REPLICAS_INSTRUCTIONS_TAG);
+          await processMessage(instructionsChanged ? { ...delivered, message: `${delivered.message}
 
 ${note}` } : delivered, signal);
+        } finally {
+          this.closeTurn();
+        }
       },
       this.onProcessingChanged,
-      this.onMessageStarted,
+      // Opened before the turn-start event persists, since a follow-up can arrive while it does.
+      async (message) => {
+        this.turnOpen = true;
+        try {
+          await this.onMessageStarted(message);
+        } catch (error) {
+          this.closeTurn();
+          throw error;
+        }
+      },
       this.onQueueChanged
     );
     this.initialized = this.initialize();
@@ -11856,6 +11874,8 @@ ${request.message}` }, senderKey };
   async interrupt(persistRemoval) {
     const queuedMessages = this.messageQueue.drainQueue();
     const unreadSteers = [...this.unreadSteers.values()];
+    const earlySteers = this.earlySteers.splice(0);
+    for (const steer of earlySteers) this.withdrawnSteers.add(steer);
     this.unreadSteers.clear();
     this.onQueueChanged();
     this.messageQueue.cancelActiveTurn();
@@ -11865,6 +11885,8 @@ ${request.message}` }, senderKey };
         await this.interruptActiveTurn();
       } catch (error) {
         for (const steer of unreadSteers) this.unreadSteers.set(steer.message.id, steer);
+        for (const steer of earlySteers) this.withdrawnSteers.delete(steer);
+        this.earlySteers.push(...earlySteers);
         this.onQueueChanged();
         this.restoreQueuedMessages(queuedMessages.map((message, index) => ({ message, index })));
         throw error;
@@ -11967,11 +11989,17 @@ ${request.message}` }, senderKey };
     let steered = false;
     const { request: withSender, senderKey } = this.withSenderLine(taken.message);
     const note = wrapInTag("You received this message while working. The chat folds everything before your last message of this turn, so that message must answer it too, even if you already did earlier.", REPLICAS_INSTRUCTIONS_TAG);
-    const delivered = withSender.goalMode || withSender.message.trimStart().startsWith("/") ? withSender : { ...withSender, message: `${withSender.message}
+    const command = withSender.goalMode || withSender.message.trimStart().startsWith("/");
+    const delivered = command ? withSender : { ...withSender, message: `${withSender.message}
 
 ${note}` };
     try {
-      steered = await this.steerRequest(delivered);
+      steered = this.earlySteers.length === 0 && await this.steerRequest(delivered);
+      if (!steered && this.turnOpen && !command && this.steerRequest !== _CodingAgentManager.prototype.steerRequest) {
+        this.earlySteers.push(delivered);
+        steered = true;
+        void this.deliverEarlySteers();
+      }
       if (steered) await this.saveLastSenderKey(senderKey);
     } catch (error) {
       console.error("[CodingAgentManager] steerRequest threw, keeping message queued:", error);
@@ -12007,9 +12035,14 @@ ${note}` };
     }
     return { success: true, queue: this.getQueue() };
   }
+  closeTurn() {
+    this.turnOpen = false;
+    if (this.earlySteers.length > 0) this.requeueUnreadSteers();
+  }
   requeueUnreadSteers() {
     const steers = [...this.unreadSteers.values()].map(({ message }) => message);
     this.unreadSteers.clear();
+    for (const steer of this.earlySteers.splice(0)) this.withdrawnSteers.add(steer);
     this.onQueueChanged();
     this.restoreQueuedMessages(steers.map((message) => ({ message, index: 0 })));
     if (steers.length > 0) {
@@ -12032,6 +12065,18 @@ ${note}` };
   steerRequest(_request) {
     return Promise.resolve(false);
   }
+  // A held steer withdrawn by a stop or a turn ending must not reach a later turn, even mid-request.
+  isSteerWithdrawn(request) {
+    return this.withdrawnSteers.has(request);
+  }
+  deliverEarlySteers() {
+    return this.earlySteerDelivery.run(async () => {
+      for (let next = this.earlySteers[0]; next && await this.steerRequest(next).catch(() => false); next = this.earlySteers[0]) {
+        if (this.earlySteers[0] !== next) return;
+        this.earlySteers.shift();
+      }
+    });
+  }
   emitContextUsage(payload) {
     const event = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -13703,6 +13748,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         };
         promptStream.push({ ...userMessage, message: { role: "user", content } });
         for (const { userMessage: steer } of steers.values()) promptStream.push({ ...steer, priority: "next" });
+        void this.deliverEarlySteers();
       });
     } finally {
       if (this.turnPromptRecorded) this.unreadPrompt = null;
@@ -14762,10 +14808,13 @@ var CodexAspManager = class extends CodingAgentManager {
     const result = await this.requestActiveTurnWithReconciliation(
       "steer",
       expectedTurnId,
-      (host, turnId) => host.client.request(
-        TURN_STEER_METHOD,
-        { threadId, expectedTurnId: turnId, input, clientUserMessageId: request.id }
-      )
+      (host, turnId) => {
+        if (this.isSteerWithdrawn(request)) throw new Error("Steer was withdrawn");
+        return host.client.request(
+          TURN_STEER_METHOD,
+          { threadId, expectedTurnId: turnId, input, clientUserMessageId: request.id }
+        );
+      }
     );
     if (!result.ok) {
       await removeTempImageFiles(tempImagePaths);
@@ -15344,6 +15393,7 @@ ${text.slice(-24e3)}`
       [THREAD_COMPACTED_METHOD]: (notification) => {
         if (!matchesTurn(notification.params.threadId, notification.params.turnId)) return;
         this.compacting = false;
+        void this.deliverEarlySteers();
       },
       [TURN_STARTED_METHOD]: (notification) => {
         if (notification.params.threadId !== threadId) return;
@@ -15351,6 +15401,7 @@ ${text.slice(-24e3)}`
         observedTurnIds.add(notification.params.turn.id);
         this.activeTurnId = notification.params.turn.id;
         this.onCodexTurnStarted?.(threadId, notification.params.turn.id);
+        void this.deliverEarlySteers();
         lastCompletedTurn = null;
         completedItems.length = 0;
         agentMessageDeltas.clear();
@@ -15378,7 +15429,10 @@ ${text.slice(-24e3)}`
       [ITEM_COMPLETED_METHOD]: (notification) => {
         if (!matchesTurn(notification.params.threadId, notification.params.turnId)) return;
         completedItems.push(notification.params.item);
-        if (notification.params.item.type === "contextCompaction") this.compacting = false;
+        if (notification.params.item.type === "contextCompaction") {
+          this.compacting = false;
+          void this.deliverEarlySteers();
+        }
         const itemFailed = notification.params.item.type === "commandExecution" && typeof notification.params.item.exitCode === "number" && notification.params.item.exitCode !== 0;
         this.completeItem(
           notification.params.turnId,
@@ -15471,6 +15525,7 @@ ${text.slice(-24e3)}`
         observedTurnIds.add(started.turn.id);
         this.activeTurnId = started.turn.id;
         this.onCodexTurnStarted?.(threadId, started.turn.id);
+        void this.deliverEarlySteers();
         this.startTurn(started.turn);
         interruptIfStopped();
       }
@@ -16187,6 +16242,7 @@ var CursorManager = class extends CodingAgentManager {
           }
         }, this.workingDirectory);
         this.activeRun = run;
+        void this.deliverEarlySteers();
         const events = run.stream()[Symbol.asyncIterator]();
         let interrupted = false;
         while (true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.1295",
+  "version": "0.1.1296",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",