replicas-engine 0.1.1250 → 0.1.1251

package/dist/src/{asp-host-UBXPKAXA.js → asp-host-ENQ4ABM4.js}

@@ -8,12 +8,12 @@ import {
   listRunningCodexModels,
   restartCodexAspHost,
   restartCodexAspHostIfRunning
-} from "./chunk-GH5EEUT2.js";
-import "./chunk-6PVW5AKP.js";
-import "./chunk-5GHRPLRX.js";
-import "./chunk-3C2WTKME.js";
+} from "./chunk-HRWUYYTF.js";
+import "./chunk-T5YXOKTZ.js";
+import "./chunk-S4QAKSXE.js";
+import "./chunk-PYR5LTLY.js";
 import "./chunk-UZSNFLDQ.js";
-import "./chunk-7QJWP5ZL.js";
+import "./chunk-MRBFRPXT.js";
 import "./chunk-VEQXQN22.js";
 export {
   CODEX_ULTRAFAST_SERVICE_TIER,

package/dist/src/{chunk-GH5EEUT2.js → chunk-HRWUYYTF.js}

@@ -10,15 +10,15 @@ import {
   resolveDiffBase,
   runGitCommand,
   setAgentCredentialSnapshot
-} from "./chunk-6PVW5AKP.js";
+} from "./chunk-T5YXOKTZ.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-5GHRPLRX.js";
+} from "./chunk-S4QAKSXE.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
-} from "./chunk-3C2WTKME.js";
+} from "./chunk-PYR5LTLY.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
@@ -55,7 +55,7 @@ import {
   resolveOpenAICompatibleModelsUrl,
   splitMothershipInstructions,
   withTimeout
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/managers/codex-token-manager.ts
 import { promises as fs } from "fs";
@@ -291,7 +291,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-UBXPKAXA.js");
+      const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-ENQ4ABM4.js");
       await restartCodexAspHostIfRunning2();
     });
     await this.start(true);
@@ -313,7 +313,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-UBXPKAXA.js");
+        const { restartCodexAspHostIfRunning: restartCodexAspHostIfRunning2 } = await import("./asp-host-ENQ4ABM4.js");
         await restartCodexAspHostIfRunning2();
       }
       setAgentCredentialSnapshot("codex", data);

package/dist/src/{chunk-4AIHQBEA.js → chunk-IGGMUT3I.js}

@@ -5,14 +5,14 @@ import {
   getOriginDefaultBranch,
   monolithRequest,
   runGitCommand
-} from "./chunk-6PVW5AKP.js";
+} from "./chunk-T5YXOKTZ.js";
 import {
   extractCommandProtectionCommandText,
   findCommandProtectionGitLookups,
   findGitCommitSignals,
   findPrMergeSignals,
   parseCommandProtectionRequest
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/services/command-protection-service.ts
 import { readFile, stat } from "fs/promises";

package/dist/src/{chunk-FQZ6YTN2.js → chunk-JF3UUTX5.js}

@@ -5,7 +5,7 @@ import {
   extractCommandProtectionCommandText,
   isRecord,
   parseCodeHostPrUrl
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/services/published-pull-request-urls.ts
 function publishedPullRequestUrls(result) {

package/dist/src/{chunk-5ANTWWVQ.js → chunk-KXHXAE4A.js}

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   AspClient
-} from "./chunk-5GHRPLRX.js";
+} from "./chunk-S4QAKSXE.js";
 import {
   ASTER_BASE_URL,
   ASTER_PROVIDER,
@@ -13,7 +13,7 @@ import {
   isRecord,
   readOllamaAuthEnv,
   readOpenAICompatibleAuthEnv
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/managers/codex-asp/notification-dispatch.ts
 var TURN_STARTED_METHOD = "turn/started";

package/dist/src/{chunk-7QJWP5ZL.js → chunk-MRBFRPXT.js}

@@ -1414,6 +1414,7 @@ var ACCEPTED_USER_MESSAGE_SOURCE = "replicas-chat-turn-accepted";
 var QUEUED_MESSAGE_REMOVED_EVENT_TYPE = "replicas-queued-message-removed";
 var REMOVED_MESSAGE_IDS_PAYLOAD_KEY = "removedMessageIds";
 var USER_MESSAGE_ID_PAYLOAD_KEY = "replicasMessageId";
+var REPLACED_MESSAGE_ID_PAYLOAD_KEY = "replicasReplacedMessageId";
 var CODEX_ASP_ITEM_ID_PAYLOAD_KEY = "codexAspItemId";
 var CODEX_ASP_TRANSCRIPT_UPDATED_EVENT_TYPE = "codex-asp-transcript-updated";
 var CODEX_ITEM_EVENT_TYPE = "codex-item";
@@ -1609,7 +1610,8 @@ var sendChatMessageRequestSchema = z4.object({
   senderDisplayName: z4.string().optional(),
   senderAvatarUrl: z4.string().optional(),
   errorNotificationTarget: integrationErrorNotificationTargetSchema.optional(),
-  errorNotificationTargets: z4.array(integrationErrorNotificationTargetSchema).optional()
+  errorNotificationTargets: z4.array(integrationErrorNotificationTargetSchema).optional(),
+  replacesMessageId: z4.string().min(1).max(256).optional()
 }).passthrough();
 function isChatMessageSender(value) {
   return isRecord(value) && (value.messageId === void 0 || typeof value.messageId === "string") && typeof value.senderUserId === "string" && typeof value.senderEmail === "string" && typeof value.recordedAt === "string";
@@ -1631,7 +1633,7 @@ function imageContentToUserMessageImages(images) {
   }
   return userImages.length > 0 ? userImages : void 0;
 }
-function createAcceptedUserMessageEvent(message2, messageId, timestamp, images) {
+function createAcceptedUserMessageEvent(message2, messageId, timestamp, images, replacesMessageId) {
   const eventImages = imageContentToUserMessageImages(images);
   return {
     timestamp,
@@ -1641,6 +1643,7 @@ function createAcceptedUserMessageEvent(message2, messageId, timestamp, images)
       message: message2,
       source: ACCEPTED_USER_MESSAGE_SOURCE,
       [USER_MESSAGE_ID_PAYLOAD_KEY]: messageId,
+      ...replacesMessageId ? { [REPLACED_MESSAGE_ID_PAYLOAD_KEY]: replacesMessageId } : {},
       ...eventImages ? { images: eventImages } : {}
     }
   };
@@ -6230,6 +6233,10 @@ function takeRecordedPrompt(prompts, echo, turnIndex) {
   }
   return closestIndex === -1 ? void 0 : prompts.splice(closestIndex, 1)[0].message;
 }
+var promptTurnIds = /* @__PURE__ */ new WeakMap();
+function codexPromptTurnId(message2) {
+  return promptTurnIds.get(message2);
+}
 function parseCodexEvents(events) {
   const messages = [];
   const turns = collectCodexTurns(events);
@@ -6453,6 +6460,7 @@ function parseCodexEvents(events) {
     const turn = turns.get(turnId);
     if (!turn) continue;
     const kept = [];
+    let opened = false;
     for (const message2 of messagesForCodexTurn(turn)) {
       if (retriedTurnIds.has(turnId)) {
         if (message2.type === "error") continue;
@@ -6467,12 +6475,11 @@ function parseCodexEvents(events) {
       }
       const prompts = recordedPrompts.get(stripReplicasInstructionBlock(message2.content));
       const recorded = prompts && takeRecordedPrompt(prompts, message2, index);
-      if (!recorded) {
-        kept.push(message2);
-        continue;
-      }
-      claimedPrompts.add(recorded);
-      kept.push({ ...recorded, images: recorded.images ?? message2.images });
+      if (recorded) claimedPrompts.add(recorded);
+      const prompt = recorded ? { ...recorded, images: recorded.images ?? message2.images } : message2;
+      if (!opened) promptTurnIds.set(prompt, turnId);
+      opened = true;
+      kept.push(prompt);
     }
     messages.splice(index, 0, ...kept);
   }
@@ -7792,7 +7799,9 @@ function parseClaudeEvents(events, parentToolUseId) {
 // ../shared/src/display-message/parsers/index.ts
 var INTERRUPTION_DEDUP_WINDOW_MS = 15e3;
 function parseAgentEvents(events, agentType) {
-  events = excludeQueuedAcceptedEvents(events, []);
+  return withoutReplacedMessages(excludeQueuedAcceptedEvents(events, []), (segment) => parseProviderEvents(segment, agentType));
+}
+function parseProviderEvents(events, agentType, parentToolUseId) {
   if (agentType === "codex") {
     return parseCodexEvents(events);
   }
@@ -7808,21 +7817,37 @@ function parseAgentEvents(events, agentType) {
   if (agentType === "pi") {
     return parsePiEvents(events);
   }
-  return parseClaudeEvents(events);
+  return parseClaudeEvents(events, parentToolUseId);
 }
 function parseDisplayMessages(events, agentType, options = {}) {
-  events = excludeQueuedAcceptedEvents(events, []);
-  const parsedEvents = agentType === "claude" ? parseClaudeEvents(events, options.parentToolUseId) : parseAgentEvents(events, agentType);
-  const reconciledEvents = [];
-  for (const message2 of parsedEvents) {
-    if (message2.type === "user") upsertDisplayMessage(reconciledEvents, message2);
-    else reconciledEvents.push(message2);
-  }
-  if (options.filter === false) return reconciledEvents;
-  return applyEngineNotices(
-    applyInterruptions(filterDisplayMessages(reconciledEvents, agentType), events),
-    events
-  );
+  return withoutReplacedMessages(excludeQueuedAcceptedEvents(events, []), (segment) => {
+    const parsedEvents = parseProviderEvents(segment, agentType, options.parentToolUseId);
+    const reconciledEvents = [];
+    for (const message2 of parsedEvents) {
+      if (message2.type === "user") upsertDisplayMessage(reconciledEvents, message2);
+      else reconciledEvents.push(message2);
+    }
+    if (options.filter === false) return reconciledEvents;
+    return applyEngineNotices(
+      applyInterruptions(filterDisplayMessages(reconciledEvents, agentType), segment),
+      segment
+    );
+  });
+}
+function withoutReplacedMessages(events, parse) {
+  let kept = [];
+  let start = 0;
+  const handled = /* @__PURE__ */ new Set();
+  events.forEach((event, index) => {
+    const replaced = getReplacedMessageId(event);
+    if (replaced === null || handled.has(replaced)) return;
+    handled.add(replaced);
+    if (index === 0) return;
+    kept.push(...parse(events.slice(start, index)));
+    kept = kept.slice(0, Math.max(0, kept.findIndex(({ id }) => id === replaced)));
+    start = index;
+  });
+  return start === 0 ? parse(events) : [...kept, ...parse(events.slice(start))];
 }
 function applyInterruptions(messages, events) {
   const result = [...messages];
@@ -7996,6 +8021,10 @@ function getUserMessageId(event) {
   const messageId = event.payload[USER_MESSAGE_ID_PAYLOAD_KEY];
   return typeof messageId === "string" ? messageId : null;
 }
+function getReplacedMessageId(event) {
+  const messageId = event.payload[REPLACED_MESSAGE_ID_PAYLOAD_KEY];
+  return typeof messageId === "string" ? messageId : null;
+}
 function getRemovedMessageIds(event) {
   if (event.type !== QUEUED_MESSAGE_REMOVED_EVENT_TYPE) return [];
   const messageIds = event.payload[REMOVED_MESSAGE_IDS_PAYLOAD_KEY];
@@ -8398,8 +8427,11 @@ function redactSecrets(value) {
 function parseChatTranscript(content, provider2, senders) {
   return attachSendersToMessages(parseDisplayMessages(parseCodexHistoryEvents(content), provider2), senders);
 }
-function canonicalizeChatTranscriptBlocks(content, provider2, senders) {
-  return parseChatTranscript(content, provider2, senders).flatMap((message2) => {
+function canonicalizeChatTranscriptBlocks(content, provider2, senders, beforeMessageId) {
+  const messages = parseChatTranscript(content, provider2, senders);
+  const end = beforeMessageId === void 0 ? messages.length : messages.findIndex(({ id }) => id === beforeMessageId);
+  if (end === -1) throw new Error("That message is no longer in the chat history");
+  return messages.slice(0, end).flatMap((message2) => {
     let block = null;
     if (message2.type === "user") {
       block = `## User${message2.senderEmail ? ` (${message2.senderEmail})` : ""}
@@ -10367,6 +10399,7 @@ export {
   QUEUED_MESSAGE_REMOVED_EVENT_TYPE,
   REMOVED_MESSAGE_IDS_PAYLOAD_KEY,
   USER_MESSAGE_ID_PAYLOAD_KEY,
+  REPLACED_MESSAGE_ID_PAYLOAD_KEY,
   CODEX_ASP_ITEM_ID_PAYLOAD_KEY,
   CODEX_ITEM_EVENT_TYPE,
   CODEX_ITEM_PARTIAL_EVENT_TYPE,
@@ -10447,6 +10480,7 @@ export {
   learnedSkillsManifestSchema,
   learnedSkillFormatInstruction,
   areUserMessagesWithinMatchWindow,
+  codexPromptTurnId,
   extractErrorText,
   isTransientErrorText,
   extractToolResultText,

package/dist/src/{chunk-3C2WTKME.js → chunk-PYR5LTLY.js}

@@ -3,7 +3,7 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   HOOK_EXEC_MAX_BUFFER_BYTES
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/utils/exec.ts
 import { exec, execFile } from "child_process";

package/dist/src/{chunk-5GHRPLRX.js → chunk-S4QAKSXE.js}

@@ -3,10 +3,10 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   execFileAsync
-} from "./chunk-3C2WTKME.js";
+} from "./chunk-PYR5LTLY.js";
 import {
   isVersionBelow
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/utils/codex-agent-env.ts
 function buildCodexAgentEnv(source = process.env) {
@@ -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.1249";
+var ENGINE_PACKAGE_VERSION = "0.1.1251";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";

package/dist/src/{chunk-6PVW5AKP.js → chunk-T5YXOKTZ.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 import {
   SUBPROCESS_MAX_BUFFER,
   execFileAsync
-} from "./chunk-3C2WTKME.js";
+} from "./chunk-PYR5LTLY.js";
 import {
   isRecord as isRecord2
 } from "./chunk-UZSNFLDQ.js";
@@ -19,7 +19,7 @@ import {
   isValidAgentProvider,
   parsePosixEnvFile,
   readReplicasRuntimeEnv
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 
 // src/runtime-env-loader.ts
 import { readFileSync } from "fs";

package/dist/src/command-protection-hook.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   evaluateCommandProtection
-} from "./chunk-4AIHQBEA.js";
-import "./chunk-6PVW5AKP.js";
-import "./chunk-3C2WTKME.js";
+} from "./chunk-IGGMUT3I.js";
+import "./chunk-T5YXOKTZ.js";
+import "./chunk-PYR5LTLY.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
-import "./chunk-7QJWP5ZL.js";
+import "./chunk-MRBFRPXT.js";
 import "./chunk-VEQXQN22.js";
 
 // src/command-protection-hook.ts

package/dist/src/headless-agent.js

@@ -13,12 +13,12 @@ import {
   recoverCompletedTurn,
   spawnMuseMsp,
   startMuseSession
-} from "./chunk-5ANTWWVQ.js";
+} from "./chunk-KXHXAE4A.js";
 import {
   AppServerProcess,
   buildCodexAgentEnv
-} from "./chunk-5GHRPLRX.js";
-import "./chunk-3C2WTKME.js";
+} from "./chunk-S4QAKSXE.js";
+import "./chunk-PYR5LTLY.js";
 import {
   AGENT,
   OPENCODE_GO_PROVIDER,
@@ -28,7 +28,7 @@ import {
   headlessAgentUsagePath,
   isRecord,
   withTimeout
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 import "./chunk-VEQXQN22.js";
 
 // src/headless-agent.ts

package/dist/src/index.js

@@ -27,7 +27,7 @@ import {
   evaluateCommandProtection,
   extractToolCommand,
   reportCommandProtectionBlock
-} from "./chunk-4AIHQBEA.js";
+} from "./chunk-IGGMUT3I.js";
 import {
   ACCOUNT_RATE_LIMITS_UPDATED_METHOD,
   AGENT_MESSAGE_DELTA_METHOD,
@@ -64,10 +64,10 @@ import {
   spawnMuseMsp,
   startMuseSession,
   uuidV7
-} from "./chunk-5ANTWWVQ.js";
+} from "./chunk-KXHXAE4A.js";
 import {
   publishedPullRequestUrls
-} from "./chunk-FQZ6YTN2.js";
+} from "./chunk-JF3UUTX5.js";
 import {
   ACCOUNT_RATE_LIMITS_READ_METHOD,
   AsyncLock,
@@ -140,7 +140,7 @@ import {
   timestampFromSeconds,
   upsertCredentialFileLines,
   writeSecureCredentialFile
-} from "./chunk-GH5EEUT2.js";
+} from "./chunk-HRWUYYTF.js";
 import {
   ENGINE_ENV,
   monolithRequest,
@@ -149,15 +149,15 @@ import {
   reloadEngineEnv,
   resolveDiffBase,
   setAgentCredentialSnapshot
-} from "./chunk-6PVW5AKP.js";
+} from "./chunk-T5YXOKTZ.js";
 import {
   getCodexModelProvider
-} from "./chunk-5GHRPLRX.js";
+} from "./chunk-S4QAKSXE.js";
 import {
   SUBPROCESS_MAX_BUFFER,
   execAsync,
   execFileAsync
-} from "./chunk-3C2WTKME.js";
+} from "./chunk-PYR5LTLY.js";
 import {
   isRecord as isRecord2
 } from "./chunk-UZSNFLDQ.js";
@@ -236,6 +236,7 @@ import {
   OPENCODE_GO_PROVIDER,
   QUEUED_MESSAGE_REMOVED_EVENT_TYPE,
   REMOVED_MESSAGE_IDS_PAYLOAD_KEY,
+  REPLACED_MESSAGE_ID_PAYLOAD_KEY,
   REPLICAS_CONFIG_FILENAMES,
   REPLICAS_INSTRUCTIONS_TAG,
   REPLICAS_RUNTIME_ENV_ALIASES,
@@ -269,6 +270,7 @@ import {
   codexHistoryFormatEvent,
   codexItemEvent,
   codexItemFromEvent,
+  codexPromptTurnId,
   codexTranscriptToEvents,
   codexTurnEvent,
   codexTurnFromEvent,
@@ -396,7 +398,7 @@ import {
   workspaceTokenRequestSchema,
   workspaceTokenResponseSchema,
   wrapInTag
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 import {
   cloneMcpConfig,
   ensureCompatibilityImports,
@@ -9650,6 +9652,7 @@ var EnvironmentDetailsService = class {
     details.supportsChatForking = true;
     details.supportsChatForkMessage = true;
     details.supportsDeferredChatForking = true;
+    details.supportsMessageEditing = true;
     details.supportsSideChats = true;
     details.supportsMultipleSideChats = true;
     details.supportsCredentialSwitching = true;
@@ -11623,7 +11626,8 @@ var CodingAgentManager = class {
       type: "user_message",
       message: request.message,
       ...extraPayload,
-      ...request.messageId ? { [USER_MESSAGE_ID_PAYLOAD_KEY]: request.messageId } : {}
+      ...request.messageId ? { [USER_MESSAGE_ID_PAYLOAD_KEY]: request.messageId } : {},
+      ...request.replacesMessageId ? { [REPLACED_MESSAGE_ID_PAYLOAD_KEY]: request.replacesMessageId } : {}
     };
   }
   initializeManager(processMessage) {
@@ -12462,12 +12466,15 @@ var CodexHistoryFile = class {
    * match, so history size does not bound memory.
    */
   async findLastEventOfType(type) {
+    return this.findLastEvent(type, (event) => event.type === type);
+  }
+  async findLastEvent(needle, matches) {
     let found = null;
     try {
       for await (const line of createInterface({ input: createReadStream(this.filePath), crlfDelay: Infinity })) {
-        if (!line.includes(type)) continue;
+        if (!line.includes(needle)) continue;
         const event = parseAgentEventJsonlLine(line);
-        if (event?.type === type) found = event;
+        if (event && matches(event)) found = event;
       }
     } catch (error) {
       if (!isMissingFile(error)) throw error;
@@ -13393,7 +13400,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     this.pendingInterrupt = false;
     const userMessage = await this.buildUserMessage(request);
     if (!options.skipUserMessageRecord) {
-      await this.recordEvent(userMessage, request.messageId);
+      await this.recordEvent(userMessage, request.messageId, request.replacesMessageId);
     }
     const goalCommand = getGoalCommand(message, request.goalMode);
     const goalObjective = goalCommand?.type === "set" ? goalCommand.objective : goalCommand?.type === "resume" ? this.currentGoal?.objective : void 0;
@@ -13886,14 +13893,15 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
     await this.abortAllPendingToolInputs();
     await this.tearDownSession();
   }
-  async forkPoint() {
+  async forkPoint(beforeMessageId) {
     await this.initialized;
     const sessionId = this.sessionId;
     if (!sessionId) return null;
     const messages = await getSessionMessages(sessionId, { dir: this.workingDirectory });
+    const editedPrompt = beforeMessageId && await this.historyFile.findLastEvent(beforeMessageId, (event) => event.type === "claude-user" && event.payload[USER_MESSAGE_ID_PAYLOAD_KEY] === beforeMessageId);
     const turnUuids = this.pendingTurn?.userMessageUuids;
     const turnStart = turnUuids ? messages.findIndex((entry) => turnUuids.has(entry.uuid)) : -1;
-    const end = turnStart >= 0 ? turnStart : this.isProcessing() ? Math.max(0, messages.findLastIndex((entry) => entry.type === "user" && isPromptMessage(entry.message))) : messages.length;
+    const end = beforeMessageId ? messages.findIndex((entry) => editedPrompt && entry.uuid === editedPrompt.payload.uuid) : turnStart >= 0 ? turnStart : this.isProcessing() ? Math.max(0, messages.findLastIndex((entry) => entry.type === "user" && isPromptMessage(entry.message))) : messages.length;
     const throughTurn = messages[end - 1]?.uuid;
     return throughTurn ? { sessionId, throughTurn } : null;
   }
@@ -14206,7 +14214,7 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       this.recordGoalChange(null);
     }
   }
-  async recordEvent(event, replicasMessageId) {
+  async recordEvent(event, replicasMessageId, replacesMessageId) {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     const restampAmbient = event.type === "system" && "task_id" in event && this.ambientTaskIds.has(event.task_id);
     const payload = { ...event };
@@ -14217,7 +14225,8 @@ var ClaudeManager = class _ClaudeManager extends CodingAgentManager {
       payload: {
         ...payload,
         ...restampAmbient ? { ambient: true } : {},
-        ...replicasMessageId ? { [USER_MESSAGE_ID_PAYLOAD_KEY]: replicasMessageId } : {}
+        ...replicasMessageId ? { [USER_MESSAGE_ID_PAYLOAD_KEY]: replicasMessageId } : {},
+        ...replacesMessageId ? { [REPLACED_MESSAGE_ID_PAYLOAD_KEY]: replacesMessageId } : {}
       }
     };
     this.historyFile.append(jsonEvent);
@@ -14293,6 +14302,12 @@ var ChatMessagePersistenceError = class extends Error {
     this.cause = cause;
   }
 };
+var ChatBusyError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ChatBusyError";
+  }
+};
 var ChatProviderUnavailableError = class extends Error {
   constructor(provider) {
     super(`${provider} is not configured in this workspace`);
@@ -14524,7 +14539,7 @@ var CodexAspManager = class extends CodingAgentManager {
     }
     return true;
   }
-  async forkPoint() {
+  async forkPoint(beforeMessageId) {
     await this.initialized;
     const sessionId = this.currentThreadId;
     if (!sessionId) return null;
@@ -14532,7 +14547,10 @@ var CodexAspManager = class extends CodingAgentManager {
       THREAD_READ_METHOD,
       { threadId: sessionId, includeTurns: true }
     );
-    const throughTurn = thread.turns.findLast((turn) => turn.status !== "inProgress")?.id;
+    const edited = beforeMessageId ? parseAgentEvents(await this.historyFile?.loadAll() ?? [], "codex").findLast(({ id }) => id === beforeMessageId) : void 0;
+    const editedTurnId = edited && codexPromptTurnId(edited);
+    const turns = beforeMessageId ? thread.turns.slice(0, Math.max(0, thread.turns.findIndex((turn) => turn.id === editedTurnId))) : thread.turns;
+    const throughTurn = turns.findLast((turn) => turn.status !== "inProgress")?.id;
     return throughTurn ? { sessionId, throughTurn } : null;
   }
   /** The fork happens on the next turn: Codex keeps a loaded thread's settings, so it must be created with this chat's own. */
@@ -59708,7 +59726,8 @@ function unseenConversationExcerpt(seenHashes, blocks) {
 async function buildForkHandoff(input) {
   const rawHistoryPath = join27(HISTORY_DIR_BY_PROVIDER[input.sourceProvider], `${input.sourceChatId}.jsonl`);
   const { content, truncated: sourceTruncated } = await readHistoryTail(rawHistoryPath, MAX_SANITIZED_SOURCE_BYTES);
-  let blocks = canonicalizeChatTranscriptBlocks(content, input.sourceProvider, input.senders);
+  let blocks = canonicalizeChatTranscriptBlocks(content, input.sourceProvider, input.senders, input.beforeMessageId);
+  const fullHistory = input.turnLimit === void 0 && input.beforeMessageId === void 0;
   if (input.turnLimit !== void 0) {
     let turns = 0;
     const start = blocks.findLastIndex((block) => block.startsWith("## User") && ++turns === input.turnLimit);
@@ -59716,8 +59735,8 @@ async function buildForkHandoff(input) {
   }
   const forkDir = join27(FORKS_DIR, input.targetChatId);
   await mkdir16(forkDir, { recursive: true });
-  const transcriptPath = join27(forkDir, "source-transcript.md");
-  const header = sourceTruncated ? `_This file was generated from only the most recent ${MAX_SANITIZED_SOURCE_BYTES / 1024 / 1024} MB of the source chat.${input.turnLimit === void 0 ? ` The complete raw event log is at ${rawHistoryPath}; grep it for anything earlier.` : ""}_
+  const transcriptPath = join27(forkDir, input.transcriptName ?? "source-transcript.md");
+  const header = sourceTruncated ? `_This file was generated from only the most recent ${MAX_SANITIZED_SOURCE_BYTES / 1024 / 1024} MB of the source chat.${fullHistory ? ` The complete raw event log is at ${rawHistoryPath}; grep it for anything earlier.` : ""}_
 
 ` : "";
   await writeFile8(transcriptPath, `${header}${blocks.join("\n\n")}
@@ -59730,7 +59749,7 @@ async function buildForkHandoff(input) {
     blocks,
     resumeRequest: unansweredRequest(blocks),
     transcriptPath,
-    rawHistoryPath: input.turnLimit === void 0 ? rawHistoryPath : void 0
+    rawHistoryPath: fullHistory ? rawHistoryPath : void 0
   };
 }
 async function readPullRequestDecisions(notesPath) {
@@ -59750,7 +59769,8 @@ function createTurnMetadata(message, messageId, recordedAt) {
     message.message,
     messageId,
     recordedAt,
-    message.images
+    message.images,
+    message.replacesMessageId
   );
   const sender = message.senderUserId && message.senderEmail ? {
     messageId,
@@ -60131,7 +60151,9 @@ var ChatService = class {
         this.requireChat(chatId);
         seenBeforeSend = this.forkSourceSeenBlocks.get(chatId);
         const fork = chat.persisted.fork;
-        if (fork && (chat.persisted.pendingForkHandoff || fork.trigger === "side")) {
+        if (request.replacesMessageId) {
+          request = { ...request, message: await this.rewindBefore(chat, request.replacesMessageId, request.message) };
+        } else if (fork && (chat.persisted.pendingForkHandoff || fork.trigger === "side")) {
           request = {
             ...request,
             message: await this.createForkHandoffMessage(chatId, { source: fork.source, trigger: fork.trigger, message: request.message })
@@ -60643,6 +60665,46 @@ ${note}`;
     const unseen = options.followsSource ? unseenConversationExcerpt(seen, handoff.blocks) : unseenTurnsExcerpt(seen, handoff.blocks);
     return unseen ? formatChatForkUpdateMessage(options.source, options.trigger, unseen, options.message ?? "") : options.message ?? "";
   }
+  async rewindBefore(chat, messageId, message) {
+    if (chat.provider.isProcessing() || chat.provider.getQueue().length > 0 || chat.provider.hasActiveBackgroundTasks?.()) {
+      throw new ChatBusyError("Stop the agent before editing a message.");
+    }
+    const files = "Files and git state may still include changes from turns that came after the original message.";
+    const point = await chat.provider.forkPoint?.(messageId).catch((error) => {
+      console.warn("[ChatService] Could not find the edited message in the agent session; restarting it:", { chatId: chat.persisted.id, error });
+      return null;
+    });
+    if (point && chat.provider.forkFrom) {
+      chat.persisted.pendingProviderFork = point;
+      await this.persistAllChats();
+      await chat.provider.forkFrom(point);
+      return `${message}
+
+${wrapInTag(`The user edited one of their earlier messages: the conversation above ends where that message was, and this is its edited version. ${files}`, REPLICAS_INSTRUCTIONS_TAG)}`;
+    }
+    await chat.provider.getHistory({ limit: 1 });
+    const handoff = await buildForkHandoff({
+      sourceChatId: chat.persisted.id,
+      sourceProvider: chat.persisted.provider,
+      targetChatId: chat.persisted.id,
+      senders: await this.readSenders(chat.persisted.id),
+      beforeMessageId: messageId,
+      transcriptName: "transcript-before-edit.md"
+    });
+    await chat.provider.dispose?.();
+    chat.persisted.providerSessionId = null;
+    delete chat.persisted.pendingProviderFork;
+    await this.persistAllChats();
+    chat.provider = this.createRuntimeChat(chat.persisted).provider;
+    const note = handoff.blocks.length === 0 ? `The user edited their first message, so your session restarted and this is its edited version. ${files}` : `The user edited one of their earlier messages, so your session restarted. The conversation before that message is below (also saved at \`${handoff.transcriptPath}\`), and this is its edited version. ${files}
+
+${handoff.excerptTruncated ? `${CHAT_FORK_EXCERPT_OMITTED_NOTICE}
+
+` : ""}${handoff.excerpt}`;
+    return `${message}
+
+${wrapInTag(note, REPLICAS_INSTRUCTIONS_TAG)}`;
+  }
   async forkProviderSession(source, target, point) {
     if (source.persisted.provider !== target.persisted.provider || !source.provider.forkPoint || !target.provider.forkFrom) return false;
     const { forkedThroughTurn, pendingProviderFork } = target.persisted;
@@ -62828,6 +62890,9 @@ function createV1Routes(deps) {
       if (error instanceof ChatMessagePersistenceError) {
         return c.json(jsonError("Failed to save user message", details), 500);
       }
+      if (error instanceof ChatBusyError) {
+        return c.json(jsonError(ENGINE_SEND_MESSAGE_FAILED_ERROR, details), 409);
+      }
       return c.json(jsonError(ENGINE_SEND_MESSAGE_FAILED_ERROR, details), 400);
     }
   });

package/dist/src/post-tool-pr-hook.js

@@ -3,13 +3,13 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   publishedPullRequestUrls
-} from "./chunk-FQZ6YTN2.js";
+} from "./chunk-JF3UUTX5.js";
 import {
   isRecord
 } from "./chunk-UZSNFLDQ.js";
 import {
   shouldRefreshPullRequests
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 import "./chunk-VEQXQN22.js";
 
 // src/services/post-tool-pr-notifier.ts

package/dist/src/subagent-mcp.js

@@ -11,7 +11,7 @@ import {
   spawnSubagentRequestSchema,
   subagentResponseSchema,
   waitSubagentRequestSchema
-} from "./chunk-7QJWP5ZL.js";
+} from "./chunk-MRBFRPXT.js";
 import "./chunk-VEQXQN22.js";
 
 // src/subagent-mcp.ts

package/package.json

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