replicas-engine 0.1.647 → 0.1.649

package/dist/src/{chunk-ZQ3UMHWS.js → chunk-O5DMGWM7.js}

@@ -5645,6 +5645,9 @@ var memoryGenerationManifestSchema = z6.object({
   rolloutSources: z6.record(z6.string(), z6.string()).optional()
 });
 
+// ../shared/src/chat-transcript-pages.ts
+var decoder = new TextDecoder("utf-8", { fatal: true });
+
 // ../shared/src/skill-registry.ts
 var SKILL_REGISTRY_MANIFEST_VERSION = 1;
 function isSkillRegistryManifest(value) {
@@ -5919,7 +5922,7 @@ var DEFAULT_CODEX_ARGS = [
 var MIN_CODEX_CLI_VERSION = "0.144.6";
 var CODEX_UPGRADE_TIMEOUT_MS = 12e4;
 var codexCliVersionEnsured = null;
-var ENGINE_PACKAGE_VERSION = "0.1.647";
+var ENGINE_PACKAGE_VERSION = "0.1.649";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/headless-agent.js

@@ -7,7 +7,7 @@ import {
   isUnsafeMemoryOutput,
   putPresignedFile,
   recoverCompletedTurn
-} from "./chunk-ZQ3UMHWS.js";
+} from "./chunk-O5DMGWM7.js";
 
 // src/headless-agent.ts
 import { createHash } from "crypto";

package/dist/src/index.js

@@ -172,7 +172,7 @@ import {
   serializeCanvasContentResponse,
   shellQuotePosix,
   stripAgentDiagnosticErrors
-} from "./chunk-ZQ3UMHWS.js";
+} from "./chunk-O5DMGWM7.js";
 
 // src/index.ts
 import { serve } from "@hono/node-server";
@@ -5684,6 +5684,11 @@ var ACCOUNT_RATE_LIMITS_READ_METHOD = "account/rateLimits/read";
 var MODEL_LIST_METHOD = "model/list";
 var SKILLS_LIST_METHOD = "skills/list";
 var MAX_CODEX_ASP_TRANSCRIPT_OUTPUT_CHARS = DEFAULT_HOOK_OUTPUT_PREVIEW_CHARS;
+function getReconciledActiveTurnId(error, expectedTurnId) {
+  const message = error instanceof Error ? error.message : String(error);
+  const match = message.match(/expected active turn id ([0-9a-f-]{36}) but found ([0-9a-f-]{36})/i);
+  return match?.[1]?.toLowerCase() === expectedTurnId.toLowerCase() ? match[2] ?? null : null;
+}
 function codexApprovalPolicyOverrides() {
   return {
     approvalPolicy: "untrusted",
@@ -6433,15 +6438,43 @@ var CodexAspManager = class extends CodingAgentManager {
     if (!this.currentThreadId || !this.activeTurnId) {
       return;
     }
+    const threadId = this.currentThreadId;
+    const expectedTurnId = this.activeTurnId;
+    const result = await this.requestActiveTurnWithReconciliation(
+      "interrupt",
+      expectedTurnId,
+      (host, turnId) => host.client.request(
+        TURN_INTERRUPT_METHOD,
+        { threadId, turnId }
+      )
+    );
+    if (result.ok) return;
+    console.warn(
+      result.error.code === "retry_failed" ? "[CodexAspManager] Failed to interrupt reconciled active turn; leaving shared Codex app-server running:" : "[CodexAspManager] Failed to interrupt active turn:",
+      result.error.details
+    );
+  }
+  async requestActiveTurnWithReconciliation(operation, expectedTurnId, request) {
     try {
-      const host = await getCodexAspHost();
-      const params = {
-        threadId: this.currentThreadId,
-        turnId: this.activeTurnId
-      };
-      await host.client.request(TURN_INTERRUPT_METHOD, params);
+      await request(await getCodexAspHost(), expectedTurnId);
+      return createSuccessResult(expectedTurnId);
     } catch (error) {
-      console.warn("[CodexAspManager] Failed to interrupt active turn:", error);
+      const reconciledTurnId = getReconciledActiveTurnId(error, expectedTurnId);
+      if (!reconciledTurnId) {
+        return createErrorResult({ code: "request_failed", message: `Failed to ${operation} active turn`, details: error });
+      }
+      this.activeTurnId = reconciledTurnId;
+      console.warn(`[CodexAspManager] Active turn changed during ${operation}; retrying with provider turn:`, reconciledTurnId);
+      try {
+        await request(await getCodexAspHost(), reconciledTurnId);
+        return createSuccessResult(reconciledTurnId);
+      } catch (retryError) {
+        return createErrorResult({
+          code: "retry_failed",
+          message: `Failed to ${operation} reconciled active turn`,
+          details: retryError
+        });
+      }
     }
   }
   // Serialize so concurrent steers can't race one `turn/steer` RPC ahead of another.
@@ -6455,18 +6488,23 @@ var CodexAspManager = class extends CodingAgentManager {
     if (this.isCompacting()) return false;
     if (getGoalCommand(request.message, request.goalMode) || isCompactCommand(request.message)) return false;
     const { input, tempImagePaths } = await buildTurnInput(request);
-    try {
-      const host = await getCodexAspHost();
-      await host.client.request(
+    const result = await this.requestActiveTurnWithReconciliation(
+      "steer",
+      expectedTurnId,
+      (host, turnId) => host.client.request(
         TURN_STEER_METHOD,
-        { threadId, expectedTurnId, input }
-      );
-    } catch (error) {
+        { threadId, expectedTurnId: turnId, input }
+      )
+    );
+    if (!result.ok) {
       await removeTempImageFiles(tempImagePaths);
-      console.warn("[CodexAspManager] Failed to steer active turn, keeping message queued:", error);
+      console.warn(
+        result.error.code === "retry_failed" ? "[CodexAspManager] Failed to steer reconciled active turn, keeping message queued:" : "[CodexAspManager] Failed to steer active turn, keeping message queued:",
+        result.error.details
+      );
       return false;
     }
-    if (this.activeTurnId === expectedTurnId) {
+    if (this.activeTurnId === result.data) {
       this.steeredTempImagePaths.push(...tempImagePaths);
     } else {
       await removeTempImageFiles(tempImagePaths);
@@ -6842,7 +6880,7 @@ var CodexAspManager = class extends CodingAgentManager {
     const model = request.model ?? DEFAULT_MODEL;
     let tempImagePaths = [];
     const linearForwarder = new LinearEventForwarder(linearSessionId);
-    const matchesTurn = (notificationThreadId, notificationTurnId) => notificationThreadId === threadId && (!observedTurnId || notificationTurnId === null || notificationTurnId === observedTurnId);
+    const matchesTurn = (notificationThreadId, notificationTurnId) => notificationThreadId === threadId && (!observedTurnId || notificationTurnId === null || notificationTurnId === observedTurnId || notificationTurnId === this.activeTurnId);
     const resolveIfGoalIdle = () => {
       if (!lastCompletedTurn || completedResolved) return;
       if (!options.waitForActiveGoal || this.currentGoal?.status !== "active") {
@@ -6994,7 +7032,8 @@ var CodexAspManager = class extends CodingAgentManager {
       },
       [TURN_COMPLETED_METHOD]: (notification) => {
         if (notification.params.threadId !== threadId) return;
-        if (!observedTurnIds.has(notification.params.turn.id)) return;
+        if (!observedTurnIds.has(notification.params.turn.id) && notification.params.turn.id !== this.activeTurnId) return;
+        observedTurnIds.add(notification.params.turn.id);
         observedTurnId = notification.params.turn.id;
         const completedTurn = recoverCompletedTurn(notification.params.turn, completedItems, agentMessageDeltas);
         this.mergeTranscriptTurn(notification.params.threadId, completedTurn);

package/package.json

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