@moxt-ai/mobius 0.0.361 → 0.0.363

package/dist/{chunk-WQKXKY2U.js → chunk-DXA4UBI6.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-HXDMU5LX.js";
+} from "./chunk-DPKJ73U5.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -59921,6 +59921,15 @@ async function readFullHistory(transcript, sessionId, signal) {
   return await append(await project([...transcript])) ? result : null;
 }
 
+// src/engine/acp/harness/claude/upstream/dist/environment-session-revision.js
+var SESSION_REVISION_TIMEOUT_MILLISECONDS = 3e4;
+function getEnvironmentSessionRevision(environment, sessionId, cwd, ownMessageIds, signal) {
+  return withEnvironment(environment, () => withDeadline(signal, SESSION_REVISION_TIMEOUT_MILLISECONDS, async () => {
+    const messages = await FZt(sessionId, { dir: cwd });
+    return messages.findLast((message) => !ownMessageIds.has(message.uuid))?.uuid ?? "";
+  }));
+}
+
 // src/engine/acp/harness/claude/upstream/dist/session-config-ids.js
 var DEFAULT_MODEL_ID = "default";
 var DEFAULT_AGENT_ID = "default";
@@ -62603,6 +62612,17 @@ function parseRenameRequest(params) {
   }
   return { sessionId, title: title2 };
 }
+var REVISION_METHOD = "_session/revision";
+function parseRevisionRequest(params) {
+  if (!params || typeof params !== "object") {
+    throw RequestError5.invalidParams(void 0, "revision params must be an object");
+  }
+  const { sessionId } = params;
+  if (typeof sessionId !== "string" || sessionId.length === 0) {
+    throw RequestError5.invalidParams(void 0, "revision params require a non-empty sessionId");
+  }
+  return { sessionId };
+}
 var AUTONOMOUS_RESULT_ORIGINS = /* @__PURE__ */ new Set([
   "task-notification",
   "peer",
@@ -63222,6 +63242,10 @@ var ClaudeAcpAgent = class {
     return result;
   }
   async listSessions(params, signal) {
+    const offset = params.cursor == null ? 0 : Number(params.cursor);
+    if (!Number.isSafeInteger(offset) || offset < 0) {
+      throw RequestError5.invalidParams("Invalid native session cursor");
+    }
     const sdk_sessions = await listEnvironmentSessions(this.environment, params.cwd ?? void 0, signal);
     const sessions = [];
     for (const session of sdk_sessions) {
@@ -63235,8 +63259,12 @@ var ClaudeAcpAgent = class {
         updatedAt: new Date(session.lastModified).toISOString()
       });
     }
+    sessions.sort((left, right) => right.updatedAt.localeCompare(left.updatedAt) || left.sessionId.localeCompare(right.sessionId));
+    const pageSize = 500;
+    const end = offset + pageSize;
     return {
-      sessions
+      sessions: sessions.slice(offset, end),
+      ...end < sessions.length ? { nextCursor: String(end) } : {}
     };
   }
   async authenticate(_params) {
@@ -63421,6 +63449,7 @@ var ClaudeAcpAgent = class {
     });
     session.turnQueue ??= [];
     session.turnQueue.push(turn);
+    session.streamedMessageIds.add(promptUuid);
     session.input.push(userMessage);
     this.ensureConsumer(session, params.sessionId);
     onSubmitted();
@@ -63557,6 +63586,7 @@ var ClaudeAcpAgent = class {
       turnInFlight.steeredSettle = turnInFlight.deferredSettle;
       turnInFlight.deferredSettle = void 0;
     }
+    session.streamedMessageIds.add(steeredUuid);
     session.input.push(userMessage);
     const firstText = params.prompt[0]?.type === "text" ? params.prompt[0].text : "";
     for (const content of params.prompt) {
@@ -63871,6 +63901,9 @@ var ClaudeAcpAgent = class {
           this.closeQueryStream(session);
           return;
         }
+        if ("uuid" in message && typeof message.uuid === "string") {
+          session.streamedMessageIds.add(message.uuid);
+        }
         if (session.emitRawSDKMessages && shouldEmitRawMessage(session.emitRawSDKMessages, message)) {
           await this.client.extNotification("_claude/sdkMessage", {
             sessionId: params.sessionId,
@@ -64992,6 +65025,15 @@ ${message.api_refusal_explanation}` : "";
     await jZt(params.sessionId, sanitizeTitle(params.title), { dir: session.cwd });
     return {};
   }
+  async readSessionRevision(params, signal) {
+    const session = this.sessions[params.sessionId];
+    if (!session) {
+      throw new Error("Session not found");
+    }
+    return {
+      latestEntryId: await getEnvironmentSessionRevision(this.environment, params.sessionId, session.cwd, session.streamedMessageIds, signal)
+    };
+  }
   async setSessionMode(params) {
     return this.sessionModes.setSessionMode(params);
   }
@@ -65903,6 +65945,7 @@ ${message.api_refusal_explanation}` : "";
       query: q2,
       input: input2,
       cancelled: false,
+      streamedMessageIds: /* @__PURE__ */ new Set(),
       cwd: params.cwd,
       sessionFingerprint: computeSessionFingerprint(params),
       creationParams: params,
@@ -67168,7 +67211,7 @@ function createClaudeAcpApp(options = {}) {
   const app = acpAgent({ name: "claude-code-acp" }).onConnect((connection) => {
     agent = new ClaudeAcpAgent(new ClientConnection(connection.client, options.onSessionUpdate), options.logger, options.environment, options.spawnClaudeCodeProcess, options.onBackgroundActivity);
     options.onConnect?.(connection);
-  }).onRequest(methods2.agent.initialize, (ctx) => requiredAgent(agent).initialize(ctx.params)).onRequest(methods2.agent.session.new, (ctx) => requiredAgent(agent).newSession(ctx.params)).onRequest(methods2.agent.session.load, (ctx) => requiredAgent(agent).loadSession(ctx.params, ctx.signal)).onRequest(methods2.agent.session.fork, (ctx) => requiredAgent(agent).unstable_forkSession(ctx.params, ctx.signal)).onRequest(methods2.agent.session.list, (ctx) => requiredAgent(agent).listSessions(ctx.params, ctx.signal)).onRequest(methods2.agent.session.delete, (ctx) => requiredAgent(agent).deleteSession(ctx.params)).onRequest(methods2.agent.session.resume, (ctx) => requiredAgent(agent).resumeSession(ctx.params)).onRequest(methods2.agent.session.close, (ctx) => requiredAgent(agent).closeSession(ctx.params)).onRequest(methods2.agent.session.setMode, (ctx) => requiredAgent(agent).setSessionMode(ctx.params)).onRequest(methods2.agent.session.setConfigOption, (ctx) => requiredAgent(agent).setSessionConfigOption(ctx.params)).onRequest(methods2.agent.authenticate, (ctx) => requiredAgent(agent).authenticate(ctx.params)).onRequest(methods2.agent.providers.list, (ctx) => requiredAgent(agent).unstable_listProviders(ctx.params)).onRequest(methods2.agent.providers.set, (ctx) => requiredAgent(agent).unstable_setProvider(ctx.params)).onRequest(methods2.agent.providers.disable, (ctx) => requiredAgent(agent).unstable_disableProvider(ctx.params)).onRequest(methods2.agent.logout, (ctx) => requiredAgent(agent).logout(ctx.params)).onRequest(methods2.agent.session.prompt, (ctx) => runPromptWithCancellation(requiredAgent(agent), ctx.params, ctx.signal)).onNotification(methods2.agent.session.cancel, (ctx) => requiredAgent(agent).cancel(ctx.params)).onRequest(STEER_METHOD, { parse: parseSteerRequest }, (ctx) => requiredAgent(agent).steer(ctx.params)).onRequest(RENAME_METHOD, { parse: parseRenameRequest }, (ctx) => requiredAgent(agent).renameSession(ctx.params)).onRequest(GOAL_CONTROL_METHOD, { parse: parseGoalRequest }, (ctx) => requiredAgent(agent).goal(ctx.params));
+  }).onRequest(methods2.agent.initialize, (ctx) => requiredAgent(agent).initialize(ctx.params)).onRequest(methods2.agent.session.new, (ctx) => requiredAgent(agent).newSession(ctx.params)).onRequest(methods2.agent.session.load, (ctx) => requiredAgent(agent).loadSession(ctx.params, ctx.signal)).onRequest(methods2.agent.session.fork, (ctx) => requiredAgent(agent).unstable_forkSession(ctx.params, ctx.signal)).onRequest(methods2.agent.session.list, (ctx) => requiredAgent(agent).listSessions(ctx.params, ctx.signal)).onRequest(methods2.agent.session.delete, (ctx) => requiredAgent(agent).deleteSession(ctx.params)).onRequest(methods2.agent.session.resume, (ctx) => requiredAgent(agent).resumeSession(ctx.params)).onRequest(methods2.agent.session.close, (ctx) => requiredAgent(agent).closeSession(ctx.params)).onRequest(methods2.agent.session.setMode, (ctx) => requiredAgent(agent).setSessionMode(ctx.params)).onRequest(methods2.agent.session.setConfigOption, (ctx) => requiredAgent(agent).setSessionConfigOption(ctx.params)).onRequest(methods2.agent.authenticate, (ctx) => requiredAgent(agent).authenticate(ctx.params)).onRequest(methods2.agent.providers.list, (ctx) => requiredAgent(agent).unstable_listProviders(ctx.params)).onRequest(methods2.agent.providers.set, (ctx) => requiredAgent(agent).unstable_setProvider(ctx.params)).onRequest(methods2.agent.providers.disable, (ctx) => requiredAgent(agent).unstable_disableProvider(ctx.params)).onRequest(methods2.agent.logout, (ctx) => requiredAgent(agent).logout(ctx.params)).onRequest(methods2.agent.session.prompt, (ctx) => runPromptWithCancellation(requiredAgent(agent), ctx.params, ctx.signal)).onNotification(methods2.agent.session.cancel, (ctx) => requiredAgent(agent).cancel(ctx.params)).onRequest(STEER_METHOD, { parse: parseSteerRequest }, (ctx) => requiredAgent(agent).steer(ctx.params)).onRequest(RENAME_METHOD, { parse: parseRenameRequest }, (ctx) => requiredAgent(agent).renameSession(ctx.params)).onRequest(REVISION_METHOD, { parse: parseRevisionRequest }, (ctx) => requiredAgent(agent).readSessionRevision(ctx.params, ctx.signal)).onRequest(GOAL_CONTROL_METHOD, { parse: parseGoalRequest }, (ctx) => requiredAgent(agent).goal(ctx.params));
   return { agent: () => agent, app };
 }
 function requiredAgent(agent) {
@@ -71062,7 +71105,7 @@ import {
 // src/engine/acp/harness/pi/upstream/dist/acp/agent.js
 import { spawnSync } from "node:child_process";
 import { randomUUID as randomUUID11 } from "node:crypto";
-import { existsSync as existsSync7, readdirSync as readdirSync6, readFileSync as readFileSync9, realpathSync as realpathSync3, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
+import { existsSync as existsSync8, readdirSync as readdirSync6, readFileSync as readFileSync9, realpathSync as realpathSync3, statSync as statSync3, unlinkSync as unlinkSync2 } from "node:fs";
 import { basename as basename5, dirname as dirname8, isAbsolute as isAbsolute12, join as join20 } from "node:path";
 import { RequestError as RequestError11 } from "@agentclientprotocol/sdk";
 
@@ -71578,7 +71621,8 @@ function toAvailableCommandsFromPiGetCommands(data, opts) {
 }
 
 // src/engine/acp/harness/pi/upstream/dist/acp/pi-history.js
-import { readFileSync as readFileSync3 } from "node:fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "node:fs";
+import { readFile as readFile6 } from "node:fs/promises";
 import { RequestError as RequestError8 } from "@agentclientprotocol/sdk";
 var entrySchema = external_exports.object({
   type: external_exports.string(),
@@ -71630,9 +71674,32 @@ function readPiHistory(sessionFile) {
     throw error62;
   }
 }
+async function readPiLatestEntryId(sessionFile) {
+  if (!existsSync4(sessionFile)) {
+    return "";
+  }
+  try {
+    let latest = "";
+    for (const line of (await readFile6(sessionFile, "utf8")).split(/\r?\n/u)) {
+      if (!line.trim()) {
+        continue;
+      }
+      const value = JSON.parse(line);
+      if (external_exports.object({ type: external_exports.literal("session") }).safeParse(value).success) {
+        continue;
+      }
+      latest = entrySchema.parse(value).id;
+    }
+    return latest;
+  } catch (cause) {
+    const error62 = RequestError8.internalError({ code: "PI_HISTORY_READ_FAILED" }, "Unable to read Pi history");
+    error62.cause = cause;
+    throw error62;
+  }
+}
 
 // src/engine/acp/harness/pi/upstream/dist/acp/pi-sessions.js
-import { closeSync as closeSync2, existsSync as existsSync4, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync4, readSync as readSync2, statSync as statSync2 } from "node:fs";
+import { closeSync as closeSync2, existsSync as existsSync5, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync4, readSync as readSync2, statSync as statSync2 } from "node:fs";
 import { isAbsolute as isAbsolute10, join as join17, resolve as resolve10 } from "node:path";
 var DEFAULT_TAIL_BYTES = 256 * 1024;
 var DEFAULT_HEAD_BYTES = 64 * 1024;
@@ -71643,7 +71710,7 @@ function getPiAgentDir(environment) {
 function readSessionDirFromSettings(agentDir) {
   const settingsPath = join17(agentDir, "settings.json");
   try {
-    if (!existsSync4(settingsPath)) {
+    if (!existsSync5(settingsPath)) {
       return null;
     }
     const raw = readFileSync4(settingsPath, "utf8");
@@ -71958,7 +72025,7 @@ function findPiSession(sessionId, environment = process.env) {
 }
 
 // src/engine/acp/harness/pi/upstream/dist/acp/pi-settings.js
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "node:fs";
 import { join as join18, resolve as resolve11 } from "node:path";
 function isObject2(x) {
   return Boolean(x) && typeof x === "object" && !Array.isArray(x);
@@ -71977,7 +72044,7 @@ function deepMerge(a, b2) {
 }
 function readJsonFile2(path7) {
   try {
-    if (!existsSync5(path7)) {
+    if (!existsSync6(path7)) {
       return {};
     }
     const raw = readFileSync5(path7, "utf-8");
@@ -72251,7 +72318,7 @@ var SessionStore = class {
 };
 
 // src/engine/acp/harness/pi/upstream/dist/acp/slash-commands.js
-import { existsSync as existsSync6, readdirSync as readdirSync5, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync7, readdirSync as readdirSync5, readFileSync as readFileSync7 } from "node:fs";
 import { join as join19, resolve as resolve12 } from "node:path";
 function parseFrontmatter(content) {
   const frontmatter = {};
@@ -72274,7 +72341,7 @@ function parseFrontmatter(content) {
 }
 function loadCommandsFromDir(dir, source, subdir = "") {
   const commands = [];
-  if (!existsSync6(dir)) {
+  if (!existsSync7(dir)) {
     return commands;
   }
   try {
@@ -73410,6 +73477,7 @@ var contentBlockSchema2 = external_exports.discriminatedUnion("type", [
     ])
   })
 ]);
+var revisionRequestSchema = external_exports.object({ sessionId: external_exports.string().min(1) });
 var steerRequestSchema = external_exports.object({
   _meta: external_exports.object({
     steering: external_exports.object({ idleBehavior: external_exports.literal("promptRequired").optional() }).optional()
@@ -73497,7 +73565,7 @@ var PiAcpAgent = class {
     const sessionFile = typeof state?.sessionFile === "string" && state.sessionFile.trim() ? state.sessionFile : this.store.get(sessionId)?.sessionFile;
     if (typeof sessionFile === "string" && sessionFile.trim()) {
       try {
-        if (existsSync7(sessionFile)) {
+        if (existsSync8(sessionFile)) {
           unlinkSync2(sessionFile);
         }
       } catch {
@@ -73989,7 +74057,7 @@ ${JSON.stringify(stats, null, 2)}`;
               const resolved = realpathSync3(piPath);
               const pkgRoot = dirname8(dirname8(resolved));
               const p = join20(pkgRoot, "CHANGELOG.md");
-              if (existsSync7(p)) {
+              if (existsSync8(p)) {
                 return p;
               }
             }
@@ -74000,7 +74068,7 @@ ${JSON.stringify(stats, null, 2)}`;
             const root = String(npmRoot.stdout ?? "").trim();
             if (root) {
               const p = join20(root, "@earendil-works", "pi-coding-agent", "CHANGELOG.md");
-              if (existsSync7(p)) {
+              if (existsSync8(p)) {
                 return p;
               }
             }
@@ -74051,7 +74119,7 @@ ${JSON.stringify(stats, null, 2)}`;
         const state = await session.proc.getState();
         const sessionFile = typeof state?.sessionFile === "string" ? state.sessionFile : null;
         const messageCount = typeof state?.messageCount === "number" ? state.messageCount : 0;
-        if (!sessionFile || messageCount === 0 || !existsSync7(sessionFile)) {
+        if (!sessionFile || messageCount === 0 || !existsSync8(sessionFile)) {
           await this.conn.sessionUpdate({
             sessionId: session.sessionId,
             update: {
@@ -74184,6 +74252,17 @@ ${JSON.stringify(stats, null, 2)}`;
     const stopReason = result === "error" ? session.wasCancelRequested() ? "cancelled" : "end_turn" : result;
     return { stopReason };
   }
+  async readSessionRevision(params) {
+    const parsed = revisionRequestSchema.safeParse(params);
+    if (!parsed.success) {
+      throw RequestError11.invalidParams("Invalid revision request");
+    }
+    const stored = this.findStoredSession(parsed.data.sessionId);
+    if (!stored) {
+      throw RequestError11.invalidParams(`Unknown sessionId: ${parsed.data.sessionId}`);
+    }
+    return { latestEntryId: await readPiLatestEntryId(stored.sessionFile) };
+  }
   async steer(params, signal) {
     signal.throwIfAborted();
     const parsed = steerRequestSchema.safeParse(params);
@@ -74552,7 +74631,7 @@ ${JSON.stringify(stats, null, 2)}`;
     const sessionFile = stored?.sessionFile ?? piSession?.sessionFile;
     if (sessionFile) {
       try {
-        if (existsSync7(sessionFile)) {
+        if (existsSync8(sessionFile)) {
           unlinkSync2(sessionFile);
         }
       } catch {
@@ -74820,7 +74899,7 @@ function buildStartupInfo(opts) {
   };
   const contextItems = [];
   const contextPath = join20(opts.cwd, "AGENTS.md");
-  if (existsSync7(contextPath)) {
+  if (existsSync8(contextPath)) {
     contextItems.push(contextPath);
   }
   addSection("Context", contextItems);
@@ -75005,6 +75084,10 @@ var PiAcpEndpoint = class {
         context.signal.removeEventListener("abort", cancel);
       }
     }).onRequest(
+      "_session/revision",
+      (params) => params,
+      async (context) => await piAgentOrThrow(piAgent).readSessionRevision(context.params)
+    ).onRequest(
       "_session/steering",
       (params) => params,
       async (context) => await piAgentOrThrow(piAgent).steer(context.params, context.signal)
@@ -75875,7 +75958,7 @@ var nativeSessionPageSchema = external_exports.object({
 
 // src/engine/acp/adapter/execution-connections.ts
 import { isAbsolute as isAbsolute14, resolve as resolve13 } from "node:path";
-import { methods as methods11 } from "@agentclientprotocol/sdk";
+import { methods as methods11, RequestError as RequestError12 } from "@agentclientprotocol/sdk";
 
 // src/engine/acp/client/prompt-content.ts
 function validatePromptContent(options, capabilities) {
@@ -76605,6 +76688,8 @@ var AcpSessionConnector = class {
 
 // src/engine/acp/adapter/execution-connections.ts
 var absolutePathSchema = external_exports.string().min(1).refine(isAbsolute14);
+var nativeHistoryRevisionSchema = external_exports.object({ latestEntryId: external_exports.string().max(256) });
+var isMethodNotFound = (cause) => cause instanceof RequestError12 && cause.code === -32601;
 var targetSchema = external_exports.object({
   nativeSessionId: nativeSessionIdSchema,
   cwd: absolutePathSchema,
@@ -76868,6 +76953,38 @@ var AcpExecutionConnections = class {
     }
     return { nativeRenameApplied: true };
   };
+  /** Asks the harness that owns the native history for its latest conversation entry. */
+  readNativeHistoryRevision = async ({ signal, ...target }) => {
+    signal.throwIfAborted();
+    const { connection } = this.#resolve(target);
+    let response;
+    try {
+      response = await connection.race(
+        connection.connection.agent.request(
+          "_session/revision",
+          { sessionId: target.nativeSessionId },
+          { cancellationSignal: AbortSignal.any([signal, AbortSignal.timeout(3e4)]) }
+        ),
+        "ACP agent exited while reading native history",
+        signal
+      );
+    } catch (error62) {
+      signal.throwIfAborted();
+      if (error62 instanceof AcpExecutionError && isMethodNotFound(error62.cause)) {
+        return { kind: "untracked" };
+      }
+      throw error62;
+    }
+    const decoded = nativeHistoryRevisionSchema.safeParse(response);
+    if (!decoded.success) {
+      throw new AcpExecutionError(
+        "ACP agent returned an invalid native history revision",
+        { cause: decoded.error },
+        "invalid_native_session_response"
+      );
+    }
+    return { kind: "tracked", latestEntryId: decoded.data.latestEntryId };
+  };
   configureSession = async ({
     selection,
     signal,
@@ -77990,6 +78107,7 @@ var ClaudeAdapter = class {
   cancel = (...args) => this.#executionConnections.cancel(...args);
   closeSession = (...args) => this.#executionConnections.closeSession(...args);
   releaseSession = (params) => this.#executionConnections.releaseSession(params);
+  readNativeHistoryRevision = (params) => this.#executionConnections.readNativeHistoryRevision(params);
   prompt = (...args) => this.#executionConnections.prompt(...args);
   steer = (...args) => this.#executionConnections.steer(...args);
   renameSession = (...args) => this.#executionConnections.renameSession(...args);
@@ -83407,6 +83525,11 @@ var CodexAdapter = class {
   };
   closeSession = (...args) => this.#executionConnections.closeSession(...args);
   releaseSession = (params) => this.#executionConnections.releaseSession(params);
+  // Codex admits one active writer per thread; another client borrows the thread instead.
+  readNativeHistoryRevision = async ({ signal }) => {
+    signal.throwIfAborted();
+    return { kind: "untracked" };
+  };
   prompt = (...args) => this.#executionConnections.prompt(...args);
   steer = (...args) => this.#executionConnections.steer(...args);
   renameSession = (...args) => this.#executionConnections.renameSession(...args);
@@ -83574,6 +83697,7 @@ var PiAdapter = class {
   cancel = (...args) => this.#executionConnections.cancel(...args);
   closeSession = (...args) => this.#executionConnections.closeSession(...args);
   releaseSession = (params) => this.#executionConnections.releaseSession(params);
+  readNativeHistoryRevision = (params) => this.#executionConnections.readNativeHistoryRevision(params);
   prompt = (...args) => this.#executionConnections.prompt(...args);
   steer = (...args) => this.#executionConnections.steer(...args);
   renameSession = (...args) => this.#executionConnections.renameSession(...args);
@@ -86028,6 +86152,8 @@ var AgentSession = class _AgentSession {
   #configOptions = [];
   #sessionConfigurations = new SessionConfigurations();
   #nativeHistoryOwnership = { kind: "unbound" };
+  #nativeHistoryBaseline = { kind: "unavailable" };
+  #nativeHistoryWrites = 0;
   #prompted = false;
   #sessionLoad = { kind: "not-requested" };
   #restored = false;
@@ -86070,8 +86196,12 @@ var AgentSession = class _AgentSession {
         await this.#processEvent(event);
       },
       onBackgroundActivity: (activity) => {
+        const previous = this.#backgroundActivity;
         this.#backgroundActivity = activity;
         this.#getObserver().onBackgroundActivity?.(this, activity);
+        if (previous !== "none" && activity === "none") {
+          void this.#recordNativeHistoryRevision();
+        }
       },
       interactions: {
         onPermission: this.#interactions.onPermission,
@@ -86164,7 +86294,9 @@ var AgentSession = class _AgentSession {
     }
     const nativeSessionId = this.#nativeSessionId;
     if (nativeSessionId.length > 0) {
-      await this.#adapter.renameSession({ ...this.#target(), title: normalized, signal });
+      await this.#writeNativeHistory(
+        async () => await this.#adapter.renameSession({ ...this.#target(), title: normalized, signal })
+      );
     }
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     await this.#processEvent({
@@ -86291,10 +86423,12 @@ var AgentSession = class _AgentSession {
     const history = new HistoryReplayCapture(this.#store.events, this.#mobiusSessionId);
     const completion = Promise.resolve().then(async () => {
       try {
-        const opened = await this.#adapter.openSessionWithReplay({
-          ...this.#sessionParams(signal),
-          nativeSessionId: this.nativeSessionId()
-        });
+        const opened = await this.#writeNativeHistory(
+          async () => await this.#adapter.openSessionWithReplay({
+            ...this.#sessionParams(signal),
+            nativeSessionId: this.nativeSessionId()
+          })
+        );
         signal.throwIfAborted();
         this.#capabilities = opened.capabilities;
         const loaded = { history, kind: "loaded", opened };
@@ -86308,7 +86442,82 @@ var AgentSession = class _AgentSession {
     this.#sessionLoad = { completion, history, kind: "capturing" };
     return await completion;
   }
-  initialize = async (signal, recovery, origin) => await restoreSession(this, signal, recovery, origin);
+  initialize = async (signal, recovery, origin) => await this.#writeNativeHistory(async () => await restoreSession(this, signal, recovery, origin));
+  /**
+   * Native clients, such as the Agent's own terminal, can continue the conversation
+   * while this process is idle. The Agent would then answer from, and append to, the
+   * copy it loaded earlier, so the caller must reopen the conversation from native history.
+   */
+  nativeHistoryChanged = async (signal) => {
+    const baseline = this.#nativeHistoryBaseline;
+    if (this.#writingNativeHistory()) {
+      return false;
+    }
+    switch (baseline.kind) {
+      case "unavailable":
+        return false;
+      case "recording":
+        await waitForSharedOperation(baseline.completion, signal);
+        return await this.nativeHistoryChanged(signal);
+      case "recorded": {
+        let current;
+        try {
+          current = await this.#readNativeHistoryRevision(signal);
+        } catch (error62) {
+          signal.throwIfAborted();
+          console.warn(`[${this.#agentId}-acp] Native history revision could not be read`, error62);
+          return false;
+        }
+        return !this.#writingNativeHistory() && this.#nativeHistoryBaseline === baseline && current.kind === "tracked" && current.latestEntryId !== baseline.latestEntryId;
+      }
+      default: {
+        const unreachable3 = baseline;
+        throw new AcpExecutionError("Unexpected native history baseline", { cause: unreachable3 });
+      }
+    }
+  };
+  #writingNativeHistory = () => this.#nativeHistoryWrites > 0 || this.#backgroundActivity !== "none";
+  /**
+   * Runs an operation that may append to native history, then records what it left there.
+   * The recording starts synchronously; a later comparison waits for it instead of the operation.
+   */
+  #writeNativeHistory = async (operation) => {
+    this.#nativeHistoryWrites += 1;
+    try {
+      return await operation();
+    } finally {
+      this.#nativeHistoryWrites -= 1;
+      void this.#recordNativeHistoryRevision();
+    }
+  };
+  #readNativeHistoryRevision = async (signal) => this.#nativeIdentity.kind === "bound" ? await this.#adapter.readNativeHistoryRevision({
+    ...this.#target(),
+    signal: AbortSignal.any([signal, AbortSignal.timeout(3e4)])
+  }) : { kind: "untracked" };
+  #recordNativeHistoryRevision = async () => {
+    if (this.#writingNativeHistory()) {
+      return;
+    }
+    const recorded = Promise.withResolvers();
+    const recording = { kind: "recording", completion: recorded.promise };
+    this.#nativeHistoryBaseline = recording;
+    let baseline = { kind: "unavailable" };
+    try {
+      const revision = await this.#readNativeHistoryRevision(AbortSignal.timeout(3e4));
+      if (revision.kind === "tracked") {
+        baseline = { kind: "recorded", latestEntryId: revision.latestEntryId };
+      }
+    } catch (error62) {
+      if (!(error62 instanceof AcpExecutionError && error62.code === "invalid_agent_session")) {
+        console.warn(`[${this.#agentId}-acp] Native history revision could not be recorded`, error62);
+      }
+    } finally {
+      if (this.#nativeHistoryBaseline === recording) {
+        this.#nativeHistoryBaseline = baseline;
+      }
+      recorded.resolve();
+    }
+  };
   nativeSessionId = () => this.#nativeSessionId;
   adoptNativeSessionId = (sessionId) => {
     if (this.#prompted || this.#nativeSessionId !== sessionId) {
@@ -86333,7 +86542,9 @@ var AgentSession = class _AgentSession {
   };
   #applyConfiguration = async (selection, signal) => {
     const configRevision = this.#configRevision;
-    const configured = await this.#adapter.configureSession({ ...this.#target(), selection, signal });
+    const configured = await this.#writeNativeHistory(
+      async () => await this.#adapter.configureSession({ ...this.#target(), selection, signal })
+    );
     if (this.#configRevision === configRevision) {
       this.#configOptions = configured;
       this.#configRevision = crypto.randomUUID();
@@ -86437,7 +86648,9 @@ var AgentSession = class _AgentSession {
       });
     }
     try {
-      const result = await this.#adapter.prompt({ ...this.#target(), content: options, signal: options.signal });
+      const result = await this.#writeNativeHistory(
+        async () => await this.#adapter.prompt({ ...this.#target(), content: options, signal: options.signal })
+      );
       this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
       if (lifecycle !== void 0) {
         await this.recordLifecycleEvent({
@@ -87017,6 +87230,40 @@ var SessionManager2 = class {
       return runtime;
     });
   }
+  /**
+   * Reuses an idle process only while it still continues the latest native conversation.
+   * Otherwise its Agent would answer from, and append to, an earlier copy, so the process is
+   * released and the Session reopens from native history as after idle reclamation.
+   */
+  async #currentSessionProcess(existing, options, recovery) {
+    const changed = !this.#isNativeSessionOperationActive(options.sessionId) && await existing.nativeHistoryChanged(options.signal);
+    const pending = this.#executionProcesses.pending(options.sessionId);
+    if (pending !== void 0) {
+      return await waitForSharedOperation(pending, options.signal);
+    }
+    const current = this.#executionProcesses.get(options.sessionId);
+    if (current !== void 0 && current !== existing) {
+      return current;
+    }
+    if (!changed) {
+      return existing;
+    }
+    return await this.#executionProcesses.prepare(options.sessionId, async () => {
+      await this.#stopSessionProcess(options.sessionId, existing);
+      return await this.#startRetainedSessionProcess(
+        options,
+        async (capabilities) => await AgentSession.start(
+          options,
+          recovery,
+          () => this.#observer,
+          this.#store,
+          unmeasuredOperationMetrics,
+          options.adapter,
+          capabilities
+        )
+      );
+    });
+  }
   async #prepareSession(options, recovery, closed, metrics = unmeasuredOperationMetrics) {
     return await this.#executionProcesses.use(
       options.sessionId,
@@ -87055,14 +87302,15 @@ var SessionManager2 = class {
         const existing = this.#executionProcesses.get(options2.sessionId);
         if (existing !== void 0) {
           if (existing.belongsTo(options2.agent.id, options2.cwd, options2.additionalDirectories)) {
-            this.#executionProcesses.touch(options2.sessionId, existing);
+            const runtime3 = await this.#currentSessionProcess(existing, options2, recovery);
+            this.#executionProcesses.touch(options2.sessionId, runtime3);
             if (recovery.kind === "history-required") {
               await metrics.measure(
                 "session-load",
-                async () => await existing.ensureHistoryLoaded(options2.signal)
+                async () => await runtime3.ensureHistoryLoaded(options2.signal)
               );
             }
-            return existing.prepared();
+            return runtime3.prepared();
           }
           if (!existing.canRebind()) {
             throw new AcpExecutionError(
@@ -87172,11 +87420,12 @@ var SessionManager2 = class {
       );
     }
     if (existing.usesEnvironment(options2.agent.environment)) {
+      const runtime = await this.#currentSessionProcess(existing, options2, recovery);
       if (recovery.kind === "execution-only") {
-        existing.startExecutionOnlyCapture();
+        runtime.startExecutionOnlyCapture();
       }
-      this.#executionProcesses.touch(options2.sessionId, existing);
-      return existing.prepared();
+      this.#executionProcesses.touch(options2.sessionId, runtime);
+      return runtime.prepared();
     }
     if (existing.hasRunningTurn()) {
       throw new AcpExecutionError(
@@ -87197,8 +87446,11 @@ var SessionManager2 = class {
     options.sessionId,
     async () => this.#operations.run(options, async (options2) => {
       this.#assertOpen(options2.sessionId);
-      if (this.#executionProcesses.get(options2.sessionId) === void 0) {
+      const existing = this.#executionProcesses.get(options2.sessionId);
+      if (existing === void 0) {
         await this.#prepareSession(options2, { kind: "interactive-only" }, "keep-closed");
+      } else {
+        await this.#currentSessionProcess(existing, options2, { kind: "interactive-only" });
       }
       const runtime = this.#executionProcesses.get(options2.sessionId);
       if (runtime === void 0) {
@@ -87462,11 +87714,16 @@ var SessionManager2 = class {
           "session_identity_mismatch"
         );
       }
+      const runtime = await this.#currentSessionProcess(
+        existing,
+        options2,
+        options2.recovery ?? { kind: "interactive-only" }
+      );
       if (options2.recovery?.kind === "execution-only") {
-        existing.startExecutionOnlyCapture();
+        runtime.startExecutionOnlyCapture();
       }
-      this.#executionProcesses.touch(options2.sessionId, existing);
-      return existing;
+      this.#executionProcesses.touch(options2.sessionId, runtime);
+      return runtime;
     }
     await this.#prepareSession(options2, options2.recovery ?? { kind: "interactive-only" }, "reopen");
     const started = this.#executionProcesses.get(options2.sessionId);
@@ -89122,7 +89379,7 @@ import { pathToFileURL as pathToFileURL3 } from "node:url";
 
 // src/engine/storage/files/scratch-directory.ts
 import { randomUUID as randomUUID17 } from "node:crypto";
-import { lstat as lstat4, mkdir as mkdir5, readdir as readdir6, readFile as readFile6, realpath as realpath8, rename as rename4, rm as rm3, stat as stat7, utimes, writeFile as writeFile2 } from "node:fs/promises";
+import { lstat as lstat4, mkdir as mkdir5, readdir as readdir6, readFile as readFile7, realpath as realpath8, rename as rename4, rm as rm3, stat as stat7, utimes, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname11, join as join28 } from "node:path";
 async function atomicWrite(path7, bytes, signal) {
   const temporary = `${path7}.${randomUUID17()}.tmp`;
@@ -89190,7 +89447,7 @@ var ScratchDirectory = class {
   read = async (path7, signal) => {
     const resolved = await this.resolveFile(path7);
     signal.throwIfAborted();
-    return resolved === null ? null : new Uint8Array(await readFile6(resolved, { signal }));
+    return resolved === null ? null : new Uint8Array(await readFile7(resolved, { signal }));
   };
   removeAll = async () => {
     await rm3(this.#root, { force: true, recursive: true });
@@ -93132,4 +93389,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-WQKXKY2U.js.map
+//# sourceMappingURL=chunk-DXA4UBI6.js.map