replicas-engine 0.1.1363 → 0.1.1365

package/dist/src/{asp-host-UNKNQSUT.js → asp-host-BRGFQFHZ.js}

@@ -8,9 +8,9 @@ import {
   listRunningCodexModels,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-2WJHTBM5.js";
+} from "./chunk-VMYOMUFX.js";
 import "./chunk-YQI4XGIX.js";
-import "./chunk-B4JWWQR5.js";
+import "./chunk-EP357UKU.js";
 import "./chunk-QCX45VR3.js";
 import "./chunk-UZSNFLDQ.js";
 import "./chunk-TQ6XAXNA.js";

package/dist/src/{chunk-TPN7XDWM.js → chunk-3FLP6Y2W.js}

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

package/dist/src/{chunk-B4JWWQR5.js → chunk-EP357UKU.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.1363";
+var ENGINE_PACKAGE_VERSION = "0.1.1365";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/{chunk-2WJHTBM5.js → chunk-VMYOMUFX.js}

@@ -14,7 +14,7 @@ import {
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-B4JWWQR5.js";
+} from "./chunk-EP357UKU.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
@@ -319,7 +319,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-UNKNQSUT.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-BRGFQFHZ.js");
       await restartCodexAspHostIfRunning2();
     });
     await this.start(true);
@@ -341,7 +341,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-UNKNQSUT.js");
+        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-BRGFQFHZ.js");
         await restartCodexAspHostIfRunning2();
       }
       setAgentCredentialSnapshot("codex", data);

package/dist/src/headless-agent.js

@@ -14,11 +14,11 @@ import {
   recoverCompletedTurn,
   spawnMuseMsp,
   startMuseSession
-} from "./chunk-TPN7XDWM.js";
+} from "./chunk-3FLP6Y2W.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-B4JWWQR5.js";
+} from "./chunk-EP357UKU.js";
 import "./chunk-QCX45VR3.js";
 import {
   AGENT,

package/dist/src/index.js

@@ -65,7 +65,7 @@ import {
   spawnMuseMsp,
   startMuseSession,
   uuidV7
-} from "./chunk-TPN7XDWM.js";
+} from "./chunk-3FLP6Y2W.js";
 import {
   publishedPullRequestUrls
 } from "./chunk-6FLA4WPX.js";
@@ -143,7 +143,7 @@ import {
   timestampFromSeconds,
   upsertCredentialFileLines,
   writeSecureCredentialFile
-} from "./chunk-2WJHTBM5.js";
+} from "./chunk-VMYOMUFX.js";
 import {
   ENGINE_ENV,
   monolithRequest,
@@ -156,7 +156,7 @@ import {
 } from "./chunk-YQI4XGIX.js";
 import {
   getCodexModelProvider
-} from "./chunk-B4JWWQR5.js";
+} from "./chunk-EP357UKU.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execAsync,
@@ -12054,20 +12054,15 @@ ${note}` };
     await this.initialized;
     const queued = this.messageQueue.getQueue().some(({ id }) => id === messageId);
     if (!queued && !this.unreadSteers.has(messageId)) return { success: false, queue: this.getQueue() };
-    const turnRunning = this.messageQueue.isProcessing();
-    if (turnRunning && this.canDeliverSteersNow()) {
-      if (queued && (await this.steerFromQueue(messageId)).success && !this.unreadSteers.has(messageId)) {
-        return { success: true, queue: this.getQueue() };
-      }
-      if (this.unreadSteers.has(messageId)) {
-        await this.deliverSteersNow();
-        return { success: true, queue: this.getQueue() };
-      }
+    if (this.messageQueue.isProcessing() && (!queued || (await this.steerFromQueue(messageId)).success)) {
+      if (this.unreadSteers.has(messageId) && this.canDeliverSteersNow()) await this.deliverSteersNow();
+      return { success: true, queue: this.getQueue() };
     }
     this.requeueUnreadSteers();
     const taken = this.messageQueue.takeFromQueue(messageId);
-    if (taken) this.messageQueue.restoreToQueue(taken.message, 0);
-    if (turnRunning) {
+    if (!taken) return { success: true, queue: this.getQueue() };
+    this.messageQueue.restoreToQueue(taken.message, 0);
+    if (this.messageQueue.isProcessing()) {
       this.recordInterrupted((/* @__PURE__ */ new Date()).toISOString(), true);
       this.messageQueue.cancelActiveTurn();
       await this.interruptActiveTurn();
@@ -13164,6 +13159,9 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
   turnPromptRecorded = false;
   // Claude Code never sees a prompt stopped before it started, so it is sent again with the next message.
   unreadPrompt = null;
+  runningTools = /* @__PURE__ */ new Map();
+  // Claude Code tells the model the user rejected the tool calls a stop cuts off, so the next prompt corrects that.
+  cutOffTools = /* @__PURE__ */ new Map();
   backgroundTasks = new ClaudeBackgroundTasks();
   backgroundRecoveryAttempted = false;
   // Ultracode workflow child agents never reach the SDK stream (forwardSubagentText
@@ -13815,10 +13813,21 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     }
     await this.dropRecordedUnreadPrompt();
     const prompt = goalCommand ? [{ type: "text", text: `/goal ${goalObjective ?? "clear"}` }] : userMessage.message.content;
-    const content = appendUserContent(this.unreadPrompt?.content ?? [], prompt);
+    const notedCutOffs = [...this.cutOffTools.keys()];
+    const cutOffNote = notedCutOffs.length > 0 ? [{
+      type: "text",
+      text: wrapInTag(`The user interrupted your last turn, cutting off these tool calls before they returned: ${[...new Set(this.cutOffTools.values())].map((name) => `\`${name}\``).join(", ")}. Nobody rejected them, whatever their results say. They may or may not have taken effect, so check before relying on or repeating them.`, REPLICAS_INSTRUCTIONS_TAG)
+    }] : [];
+    const dropNotedCutOffs = () => {
+      for (const id of notedCutOffs) this.cutOffTools.delete(id);
+    };
+    const content = appendUserContent(appendUserContent(cutOffNote, this.unreadPrompt?.content ?? []), prompt);
     if (this.pendingInterrupt || options.signal?.aborted) {
       this.pendingInterrupt = false;
-      if (!options.engineTurn) this.unreadPrompt = { uuid: userMessage.uuid, content };
+      if (!options.engineTurn) {
+        this.unreadPrompt = { uuid: userMessage.uuid, content };
+        dropNotedCutOffs();
+      }
       return;
     }
     this.turnPromptRecorded = false;
@@ -13837,6 +13846,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         void this.deliverEarlySteers();
       });
     } finally {
+      if (this.turnPromptRecorded || options.signal?.aborted && !options.engineTurn) dropNotedCutOffs();
       if (this.turnPromptRecorded) this.unreadPrompt = null;
       else if (options.signal?.aborted && !options.engineTurn) this.unreadPrompt = { uuid: userMessage.uuid, content };
     }
@@ -14065,6 +14075,15 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
         if (next.done || this.activeQuery !== response) break;
         const msg = next.value;
         if (!msg) break;
+        if ((msg.type === "assistant" || msg.type === "user") && msg.parent_tool_use_id === null && Array.isArray(msg.message.content)) {
+          for (const block of msg.message.content) {
+            if (block.type === "tool_use") this.runningTools.set(block.id, block.name);
+            if (block.type !== "tool_result") continue;
+            const name = this.runningTools.get(block.tool_use_id);
+            this.runningTools.delete(block.tool_use_id);
+            if (name && this.pendingInterrupt && block.is_error) this.cutOffTools.set(block.tool_use_id, name);
+          }
+        }
         if (this.pendingInterrupt) {
           if (msg.type === "assistant" || msg.type === "user") await this.recordEvent(msg);
           else if (msg.type === "result") this.stoppedTurnEnded?.resolve();
@@ -14202,6 +14221,7 @@ ${msg.result}` } : { ...msg, errors: [loginFailure, ...msg.errors] } : msg);
     }
     this.partialMessageFlushTimers.clear();
     this.partialMessageStreams.clear();
+    this.runningTools.clear();
     if (hadBackgroundTasks && !this.isProcessing()) this.onProcessingChanged(false);
   }
   resolvePendingTurn() {
@@ -16188,11 +16208,11 @@ var CursorManager = class extends CodingAgentManager {
     await this.cancelRun(this.activeRun);
     this.abortActiveTurn?.();
   }
-  // Cursor's steer API is text-only, so an image message interrupts the turn and runs next instead.
+  // Cursor's steer API is text-only, so an image message waits for the turn to end.
   async steerFromQueue(messageId) {
     await this.initialized;
     const queued = this.messageQueue.getQueue().find(({ id }) => id === messageId);
-    return queued?.images?.length ? this.sendNow(messageId) : super.steerFromQueue(messageId);
+    return queued?.images?.length ? { success: false, queue: this.getQueue() } : super.steerFromQueue(messageId);
   }
   // Cursor's steer resolves once the turn appends the message, so it settles later; the turn
   // waits for pending steers before completing, and an unread one is requeued as a follow-up.
@@ -60576,7 +60596,7 @@ var ChatService = class {
   requireSubagent(parentChatId, chatId) {
     this.requireSubagentParent(parentChatId);
     const child = this.requireChat(chatId);
-    if (child.persisted.parentChatId !== parentChatId) throw new Error("Chat is not a subagent of this chat");
+    if (child.persisted.parentChatId !== parentChatId || child.persisted.fork?.trigger === "side") throw new Error("Chat is not a subagent of this chat");
     return child;
   }
   async waitForSubagent(parentChatId, chatId, timeoutMinutes, signal) {
@@ -61996,7 +62016,7 @@ ${note}`;
     if (chat.persisted.parentChatId) {
       this.publish({ type: "chat.updated", payload: { chat: this.toSummary(chat) } }).catch(() => {
       });
-      if (!processing) void this.reportSubagentToParent(chat, completedAt, chat.lastTurnErrors);
+      if (!processing && chat.persisted.fork?.trigger !== "side") void this.reportSubagentToParent(chat, completedAt, chat.lastTurnErrors);
       return;
     }
     this.publish({

package/package.json

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