@moxt-ai/mobius 0.0.380 → 0.0.382

package/dist/{chunk-7HMKMNG4.js → chunk-3GTWYIU4.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-ZY3EYZYU.js";
+} from "./chunk-WGPROR4Q.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -20262,8 +20262,7 @@ var sessionConfigureCommandSchema = external_exports.object({
   ...sessionIdentityFields,
   booleanValue: external_exports.boolean(),
   configId: external_exports.string().min(1).max(128),
-  // Omitted by legacy clients: explicit edits retain last-write-wins behavior.
-  expectedConfigurationRevision: identifierStringSchema.optional(),
+  expectedConfigurationRevision: identifierStringSchema,
   kind: external_exports.literal(SESSION_CONFIGURE_KIND),
   requestId: identifierStringSchema,
   value: external_exports.string().max(500),
@@ -20271,8 +20270,8 @@ var sessionConfigureCommandSchema = external_exports.object({
 }).readonly();
 var sessionConfigUpdatedEventSchema = external_exports.object({
   configOptions: sessionConfigOptionsSchema,
-  // An opaque Runtime generation token; absent on older Runtimes.
-  configurationRevision: identifierStringSchema.optional(),
+  // An opaque Runtime generation token.
+  configurationRevision: identifierStringSchema,
   kind: external_exports.literal(SESSION_CONFIG_UPDATED_KIND),
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
@@ -20291,8 +20290,8 @@ var sessionConfigReadCommandSchema = external_exports.object({
 }).readonly();
 var sessionConfigReadResultSchema = external_exports.object({
   configOptions: sessionConfigOptionsSchema,
-  // An opaque Runtime generation token; absent on older Runtimes.
-  configurationRevision: identifierStringSchema.optional(),
+  // An opaque Runtime generation token.
+  configurationRevision: identifierStringSchema,
   kind: external_exports.literal(SESSION_CONFIG_READ_RESULT_KIND),
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
@@ -20826,8 +20825,8 @@ var sessionEventLogPageSchema = external_exports.object({
   sessionGenerationId: identifierStringSchema,
   tailCursor: external_exports.string().max(512),
   // The generation-scoped live position covered by this snapshot, including
-  // coalesced and omitted events. Absent only on older Runtime versions.
-  throughPosition: positionSchema.optional(),
+  // coalesced and omitted events.
+  throughPosition: positionSchema,
   truncated: external_exports.boolean(),
   version: external_exports.literal(2)
 }).readonly();
@@ -21139,7 +21138,7 @@ var sessionReadyEventSchema = external_exports.object({
   capabilities: sessionCapabilitiesSchema,
   commands: external_exports.array(sessionCommandSchema).max(500).readonly(),
   configOptions: sessionConfigOptionsSchema,
-  configurationRevision: identifierStringSchema.optional(),
+  configurationRevision: identifierStringSchema,
   directoryId: DIRECTORY_IDENTIFIER,
   directoryLabel: external_exports.string().min(1).max(MAX_WORKSPACE_PATH_LENGTH),
   kind: external_exports.literal(SESSION_READY_KIND),
@@ -21266,7 +21265,7 @@ function decodeSessionPromptCommand(encoded) {
   const hasSessionConfigurations = Object.hasOwn(value, "sessionConfigurations");
   assertKind(value, SESSION_PROMPT_KIND);
   const prompt = readText(value, "prompt", MAX_PROMPT_LENGTH);
-  const attachments = !Object.hasOwn(value, "attachments") && Array.isArray(value["images"]) && Array.isArray(value["resources"]) ? [] : decodePromptAttachmentsValue(value["attachments"]);
+  const attachments = decodePromptAttachmentsValue(value["attachments"]);
   const attachmentBytes = attachments.reduce((total, attachment) => total + attachment.byteLength, 0);
   if (attachmentBytes > MAX_PROMPT_ATTACHMENT_BYTES) {
     throw new ProtocolMessageError("Prompt attachments are too large");
@@ -21332,15 +21331,7 @@ function decodeSessionPromptDispositionCommand(encoded) {
   };
 }
 function encodeSessionPromptCommand(message) {
-  const command = decodeSessionPromptCommand(JSON.stringify(message));
-  return JSON.stringify({
-    ...command,
-    // Keep text prompts compatible with the previous Runtime release while
-    // attachments move to the content-key protocol. Older Runtimes ignore
-    // `attachments` and require both legacy arrays to be present.
-    images: [],
-    resources: []
-  });
+  return JSON.stringify(decodeSessionPromptCommand(JSON.stringify(message)));
 }
 function encodeSessionCancelCommand(message) {
   return JSON.stringify(decodeSessionCancelCommand(JSON.stringify(message)));
@@ -21357,6 +21348,16 @@ var envelope = {
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
 };
+var sessionInteractionSnapshotSchema = external_exports.object({
+  sessionGenerationId: identifierStringSchema,
+  throughPosition: external_exports.string().regex(/^(0|[1-9][0-9]*)$/),
+  interactions: external_exports.array(
+    external_exports.discriminatedUnion("kind", [
+      sessionPermissionRequestedEventSchema,
+      sessionElicitationRequestedEventSchema
+    ])
+  ).readonly()
+}).readonly();
 var activeTurnSnapshotSchema = external_exports.object({
   commandId: identifierStringSchema,
   epoch: identifierStringSchema,
@@ -21462,13 +21463,15 @@ var nativeSessionResultSchema = external_exports.discriminatedUnion("action", [
       }).readonly()
     ).readonly(),
     turn: activeTurnSnapshotSchema.nullable(),
+    // Absent when an older Runtime or Relay cannot provide session-scoped interaction recovery.
+    interactionState: sessionInteractionSnapshotSchema.optional(),
     // Present only when the request named a command and every hop understands it. An
     // unrecognized delivery from a newer peer reads as absent instead of failing the snapshot.
     command: commandDeliverySchema.optional().catch(void 0),
     // Absent from older Runtimes and while the last started command is still running.
     lastTurn: lastTurnOutcomeSchema.optional().catch(void 0),
-    // Runtime-owned support; older Relays strip this field before exposing the snapshot.
-    queuedCancellation: external_exports.literal("before-start").optional().catch(void 0)
+    // The Runtime withdraws a queued command only before it starts.
+    queuedCancellation: external_exports.literal("before-start")
   }).readonly(),
   external_exports.object({
     ...resultEnvelope,
@@ -21539,7 +21542,7 @@ var wireNativeSessionEventsSchema = external_exports.object({
     nextCursor: external_exports.string().min(1).max(512).nullable(),
     sessionGenerationId: identifierStringSchema,
     tailCursor: external_exports.string().max(512),
-    throughPosition: external_exports.string().regex(/^(0|[1-9][0-9]*)$/u).optional(),
+    throughPosition: external_exports.string().regex(/^(0|[1-9][0-9]*)$/u),
     truncated: external_exports.boolean(),
     version: external_exports.literal(2)
   }).passthrough().readonly(),
@@ -22724,11 +22727,7 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
       connection.runtimeCredential,
       connection.runtimeId
     );
-    if (isRecord3(record2) && record2["version"] === 5) {
-      await writeJsonAtomically(this.connectionPath(connectionId2), { ...record2, activation }, signal);
-    } else {
-      await this.overwriteConnection(updated, signal);
-    }
+    await this.overwriteConnection(updated, signal);
     return updated;
   };
   removeConnection = async (connectionId2, signal) => {
@@ -68444,6 +68443,7 @@ var threadStartResponseSchema = external_exports.object({
 var threadTurnSchema = external_exports.object({
   id: boundedText(256).optional(),
   status: turnStatusSchema.optional(),
+  completedAt: external_exports.number().nullish(),
   error: external_exports.object({ message: external_exports.string().transform((message) => message.slice(0, 4096)) }).nullish(),
   items: external_exports.array(external_exports.unknown()).max(1e5)
 });
@@ -68751,7 +68751,19 @@ var CodexAppServerClient = class {
 
 // src/engine/acp/harness/codex/borrowed-agent.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
-import { setTimeout as setTimeout2 } from "node:timers/promises";
+
+// src/engine/util/timer.ts
+var SystemTimer = class {
+  schedule = (callback, milliseconds) => {
+    const timeout = setTimeout(callback, milliseconds);
+    return {
+      cancel: () => {
+        clearTimeout(timeout);
+      }
+    };
+  };
+};
+var systemTimer = new SystemTimer();
 
 // src/engine/acp/harness/codex/items.ts
 import { pathToFileURL } from "node:url";
@@ -69039,6 +69051,23 @@ var queuePageSchema = external_exports.object({
   data: external_exports.array(external_exports.object({ id: external_exports.string().min(1), clientUserMessageId: external_exports.string().min(1) })).max(100),
   nextCursor: external_exports.string().nullish()
 });
+function turnRunning(turn) {
+  return turn.status === "inProgress" || turn.status === "interrupted" && turn.completedAt == null;
+}
+function waitForNextPoll(timer, signal) {
+  signal.throwIfAborted();
+  return new Promise((resolve19, reject2) => {
+    const poll = timer.schedule(() => {
+      signal.removeEventListener("abort", abort);
+      resolve19();
+    }, POLL_INTERVAL);
+    const abort = () => {
+      poll.cancel();
+      reject2(signal.reason);
+    };
+    signal.addEventListener("abort", abort, { once: true });
+  });
+}
 var CodexBorrowedAcpAgent = class {
   steeringSupported = false;
   #client;
@@ -69069,7 +69098,7 @@ var CodexBorrowedAcpAgent = class {
     const signal = this.#closed.signal;
     try {
       for (; ; ) {
-        await setTimeout2(POLL_INTERVAL, void 0, { signal });
+        await waitForNextPoll(systemTimer, signal);
         await this.#refresh(signal, false);
       }
     } catch (cause) {
@@ -69140,7 +69169,7 @@ var CodexBorrowedAcpAgent = class {
             this.#seen.set(key, text2);
             continue;
           }
-          if (item.type === "plan" && turn.status === "inProgress") {
+          if (item.type === "plan" && turnRunning(turn)) {
             continue;
           }
           const previous = this.#seen.get(key);
@@ -69169,7 +69198,7 @@ var CodexBorrowedAcpAgent = class {
             }
           }
         }
-        if (matches && turn.status !== void 0 && turn.status !== "inProgress") {
+        if (matches && turn.status !== void 0 && !turnRunning(turn)) {
           if (turn.status === "failed") {
             this.#pending?.completion.reject(
               new AcpExecutionError("The owning Codex turn failed", {}, "codex_turn_failed")
@@ -77547,6 +77576,10 @@ var MemorySessionEventStore = class {
       this.append(sessionId, event);
     }
   };
+  livePosition = (sessionId) => {
+    const session = this.#session(sessionId);
+    return { sessionGenerationId: session.sessionGenerationId, throughPosition: session.throughPosition };
+  };
   page = (sessionId, eventLimit, cursor) => {
     const session = this.#session(sessionId);
     const endIndex = session.endIndex(cursor);
@@ -77674,6 +77707,10 @@ var CachedSessionEventStore = class {
       }
     }
   };
+  livePosition = (sessionId) => {
+    const session = this.#session(sessionId);
+    return { sessionGenerationId: session.sessionGenerationId, throughPosition: session.throughPosition };
+  };
   page = (sessionId, eventLimit, cursor) => {
     const session = this.#sessions.get(sessionId);
     const current = session ?? this.#session(sessionId);
@@ -78181,7 +78218,9 @@ import { join as join23 } from "node:path";
 
 // src/engine/storage/sqlite/local-databases.ts
 import { createHash as createHash4 } from "node:crypto";
+import { existsSync as existsSync9 } from "node:fs";
 import { join as join22 } from "node:path";
+import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
 
 // src/engine/generated/acp-session-store-migrations.ts
 var acpSessionStoreMigrations = [
@@ -78224,6 +78263,14 @@ var acpSessionStoreMigrations = [
   {
     "name": "0009_receipt_admission_order.sql",
     "sql": "ALTER TABLE `execution_receipt` ADD `admission_order` integer;"
+  },
+  {
+    "name": "0010_receipt_admission_order_backfill.sql",
+    "sql": "-- Receipts written before admission order existed are ordered by their last update, after every ordered receipt.\nUPDATE `execution_receipt` SET `admission_order` = `ordered`.`admission_order`\nFROM (\n    SELECT\n        `command_id`,\n        (SELECT coalesce(max(`admission_order`), 0) FROM `execution_receipt`)\n            + row_number() OVER (ORDER BY `updated_at`, `command_id`) AS `admission_order`\n    FROM `execution_receipt`\n    WHERE `admission_order` IS NULL\n) AS `ordered`\nWHERE `execution_receipt`.`command_id` = `ordered`.`command_id`;\n"
+  },
+  {
+    "name": "0011_receipt_admission_order_required.sql",
+    "sql": 'PRAGMA foreign_keys=OFF;--> statement-breakpoint\nCREATE TABLE `__new_execution_receipt` (\n	`command_id` text PRIMARY KEY NOT NULL,\n	`session_id` text NOT NULL,\n	`command_hash` text NOT NULL,\n	`attempt_id` text NOT NULL,\n	`admission_order` integer NOT NULL,\n	`started` integer NOT NULL,\n	`outcome` text,\n	`updated_at` text NOT NULL\n);\n--> statement-breakpoint\nINSERT INTO `__new_execution_receipt`("command_id", "session_id", "command_hash", "attempt_id", "admission_order", "started", "outcome", "updated_at") SELECT "command_id", "session_id", "command_hash", "attempt_id", "admission_order", "started", "outcome", "updated_at" FROM `execution_receipt`;--> statement-breakpoint\nDROP TABLE `execution_receipt`;--> statement-breakpoint\nALTER TABLE `__new_execution_receipt` RENAME TO `execution_receipt`;--> statement-breakpoint\nPRAGMA foreign_keys=ON;'
   }
 ];
 
@@ -83136,13 +83183,6 @@ var LocalSqliteDatabase = class {
         throw new Error(`The ${label} migration is unavailable`);
       }
       this.transaction(() => {
-        if (migration.compatibleColumn !== void 0) {
-          const { table, column } = migration.compatibleColumn;
-          if (this.#sqlite.prepare("SELECT name FROM pragma_table_info(?) WHERE name = ?").get(table, column) === void 0) {
-            this.#sqlite.exec(migration.sql);
-          }
-          return;
-        }
         this.#sqlite.exec(migration.sql);
         this.#sqlite.exec(`PRAGMA user_version = ${index2 + 1}`);
       });
@@ -83177,16 +83217,25 @@ function channelSessionDatabasePaths(stateDirectory, channelId) {
     sessions: join22(stateDirectory, "sessions", `${channelHash}.sqlite`)
   };
 }
-var openAcpSessionDatabase = (path7) => new LocalSqliteDatabase(
-  path7,
-  "ACP Session database",
-  acpSessionStoreMigrations.map(
-    (migration) => migration.name === "0009_receipt_admission_order.sql" ? {
-      ...migration,
-      compatibleColumn: { table: "execution_receipt", column: "admission_order" }
-    } : migration
-  )
-);
+function recordAppliedAdmissionOrder(path7) {
+  if (!existsSync9(path7)) {
+    return;
+  }
+  const database = new DatabaseSync3(path7);
+  try {
+    const version2 = database.prepare("PRAGMA user_version").get()?.["user_version"];
+    const column = database.prepare("SELECT name FROM pragma_table_info('execution_receipt') WHERE name = 'admission_order'").get();
+    if (version2 === 9 && column !== void 0) {
+      database.exec("PRAGMA user_version = 10");
+    }
+  } finally {
+    database.close();
+  }
+}
+var openAcpSessionDatabase = (path7) => {
+  recordAppliedAdmissionOrder(path7);
+  return new LocalSqliteDatabase(path7, "ACP Session database", acpSessionStoreMigrations);
+};
 var openSessionEventCacheDatabase = (path7) => new LocalSqliteDatabase(path7, "V2 Session event cache", sessionEventCacheMigrations, [
   "PRAGMA journal_mode = WAL",
   "PRAGMA synchronous = OFF",
@@ -84463,11 +84512,9 @@ async function publishAgentCatalog(config2, signal) {
         agents: catalog.agents.map((agent) => ({
           agentPath: agent.agentIdentity.requestedPath,
           agentVersion: agent.agentVersion,
-          agentSettingsDiscovery: true,
           capabilities: agent.capabilities,
           id: agent.id,
-          label: agent.label,
-          sessionTurnConfiguration: true
+          label: agent.label
         }))
       }),
       dispatcher: environmentProxyDispatcher,
@@ -84781,11 +84828,9 @@ async function claimPairing(options, defaultWorkspace, localAgents, signal) {
   const agents = localAgents.map((agent) => ({
     agentPath: agent.agentIdentity.requestedPath,
     agentVersion: agent.agentVersion,
-    agentSettingsDiscovery: true,
     capabilities: agent.capabilities,
     id: agent.id,
-    label: agent.label,
-    sessionTurnConfiguration: true
+    label: agent.label
   }));
   const endpoint = options.pairingId.length > 0 ? mobiusApiUrl(options.relayOrigin, `/v1/runtime-pairings/${encodeURIComponent(options.pairingId)}/redeem`) : mobiusApiUrl(options.relayOrigin, "/pairings/claim");
   let response;
@@ -84934,10 +84979,7 @@ var executionReceipt = sqliteTable("execution_receipt", {
   sessionId: text("session_id").notNull(),
   commandHash: text("command_hash").notNull(),
   attemptId: text("attempt_id").notNull(),
-  // Nullable only for receipts written by older Runtimes; assigned before recovery.
-  admissionOrder: integer2("admission_order"),
-  // Compatibility projection for older Runtimes; started and outcome own the facts.
-  state: text("state").notNull(),
+  admissionOrder: integer2("admission_order").notNull(),
   started: integer2("started", { mode: "boolean" }).notNull(),
   outcome: text("outcome"),
   updatedAt: text("updated_at").notNull()
@@ -84996,16 +85038,6 @@ var receiptSchema = external_exports.object({
   outcome: external_exports.string().nullable()
 }).readonly();
 var identitySchema = external_exports.object({ sessionId: external_exports.string(), commandHash: external_exports.string() }).readonly();
-function legacyState(receipt) {
-  if (receipt.outcome === null) {
-    return receipt.started ? "running" : "dispatching";
-  }
-  const event = decodeKnownSessionEventPayload(JSON.parse(receipt.outcome));
-  if (event === null) {
-    return "failed";
-  }
-  return event.type === "lifecycle-metadata" && event.payload.kind === "prompt.completed" ? event.payload.stopReason === "cancelled" ? "cancelled" : "succeeded" : "failed";
-}
 var ExecutionReceiptTable = class {
   #database;
   constructor(database) {
@@ -85015,21 +85047,9 @@ var ExecutionReceiptTable = class {
     const row = this.#database.orm.select({ sessionId: executionIdentity.sessionId, commandHash: executionIdentity.commandHash }).from(executionIdentity).where(eq2(executionIdentity.commandId, commandId)).get();
     return row === void 0 ? void 0 : identitySchema.parse(row);
   };
-  list = () => this.#database.transaction(() => {
-    const rows = this.#database.orm.select().from(executionReceipt).orderBy(asc(executionReceipt.updatedAt), asc(executionReceipt.commandId)).all();
-    let latestOrder = rows.reduce((latest, row) => Math.max(latest, row.admissionOrder ?? 0), 0);
-    return rows.map((row) => {
-      if (row.admissionOrder !== null) {
-        return receiptSchema.parse(row);
-      }
-      const admissionOrder = ++latestOrder;
-      this.#database.orm.update(executionReceipt).set({ admissionOrder }).where(eq2(executionReceipt.commandId, row.commandId)).run();
-      return receiptSchema.parse({ ...row, admissionOrder });
-    }).sort((left, right) => left.admissionOrder - right.admissionOrder);
-  });
+  list = () => this.#database.orm.select().from(executionReceipt).orderBy(asc(executionReceipt.admissionOrder), asc(executionReceipt.commandId)).all().map((row) => receiptSchema.parse(row));
   save = (receipt, terminalLimit) => this.#database.transaction(() => {
-    const row = { ...receipt, state: legacyState(receipt) };
-    this.#database.orm.insert(executionReceipt).values(row).onConflictDoUpdate({ target: executionReceipt.commandId, set: row }).run();
+    this.#database.orm.insert(executionReceipt).values(receipt).onConflictDoUpdate({ target: executionReceipt.commandId, set: receipt }).run();
     if (receipt.outcome === null) {
       return [];
     }
@@ -85041,7 +85061,7 @@ var ExecutionReceiptTable = class {
           isNotNull(executionReceipt.outcome),
           notInArray(
             executionReceipt.commandId,
-            retained.map((row2) => row2.commandId)
+            retained.map((row) => row.commandId)
           )
         )
       );
@@ -85482,12 +85502,12 @@ function validateElicitationContent(encoded, requestedSchema) {
 // src/engine/session/interaction/pending-interactions.ts
 var PendingPermission = class {
   completion = Promise.withResolvers();
-  interactionId;
+  request;
   optionIds;
   #settled = false;
-  constructor(interactionId, optionIds) {
-    this.interactionId = interactionId;
-    this.optionIds = optionIds;
+  constructor(request) {
+    this.request = request;
+    this.optionIds = new Set(request.options.map((option) => option.optionId));
   }
   cancel = () => {
     if (this.#settled) {
@@ -85511,12 +85531,12 @@ var PendingPermission = class {
 var PendingElicitation = class {
   completion = Promise.withResolvers();
   elicitationId;
-  interactionId;
+  request;
   requestedSchema;
   #settled = false;
-  constructor(interactionId, elicitationId, requestedSchema) {
-    this.elicitationId = elicitationId;
-    this.interactionId = interactionId;
+  constructor(request, requestedSchema) {
+    this.request = request;
+    this.elicitationId = request.elicitationId;
     this.requestedSchema = requestedSchema;
   }
   accept = (content) => {
@@ -85551,6 +85571,11 @@ var SessionInteractions = class {
   #pendingElicitations = /* @__PURE__ */ new Map();
   #acceptedUrlElicitations = /* @__PURE__ */ new Map();
   #context;
+  snapshot = () => [
+    ...[...this.#pendingPermissions.values()].map((pending) => pending.request),
+    ...[...this.#pendingElicitations.values()].map((pending) => pending.request),
+    ...this.#acceptedUrlElicitations.values()
+  ];
   constructor(context) {
     this.#context = context;
   }
@@ -85629,7 +85654,7 @@ var SessionInteractions = class {
       if (pending.elicitationId.length > 0) {
         resolved = pending.accept({});
         if (resolved) {
-          this.#acceptedUrlElicitations.set(pending.elicitationId, pending.interactionId);
+          this.#acceptedUrlElicitations.set(pending.elicitationId, { ...pending.request, accepted: true });
         }
       } else {
         resolved = pending.accept(validateElicitationContent(options.content, pending.requestedSchema));
@@ -85669,33 +85694,34 @@ var SessionInteractions = class {
         "invalid_agent_permission_request"
       );
     }
-    const pending = new PendingPermission(interactionId, new Set(options.map((option) => option.optionId)));
+    const announced = this.#context.getToolCall(request.toolCall.toolCallId);
+    const title2 = request.toolCall.title ?? announced?.title;
+    const kind = request.toolCall.kind ?? announced?.kind;
+    const rawInput = request.toolCall.rawInput ?? announced?.rawInput;
+    const locations = request.toolCall.locations ?? announced?.locations ?? [];
+    const event = {
+      commandId: this.#context.commandId(),
+      details: {
+        cwd: this.#context.cwd(),
+        rawInput,
+        locations
+      },
+      interactionId,
+      kind: SESSION_PERMISSION_REQUESTED_KIND,
+      options,
+      sessionId: this.#context.sessionId(),
+      title: truncate(title2 ?? "Permission required", 500),
+      toolCallId: truncate(request.toolCall.toolCallId, 255),
+      toolKind: truncate(kind ?? "other", 64)
+    };
+    const pending = new PendingPermission(event);
     this.#pendingPermissions.set(interactionId, pending);
     const abort = () => {
       void this.cancelPermission(interactionId);
     };
     signal.addEventListener("abort", abort, { once: true });
     try {
-      const announced = this.#context.getToolCall(request.toolCall.toolCallId);
-      const title2 = request.toolCall.title ?? announced?.title;
-      const kind = request.toolCall.kind ?? announced?.kind;
-      const rawInput = request.toolCall.rawInput ?? announced?.rawInput;
-      const locations = request.toolCall.locations ?? announced?.locations ?? [];
-      await this.#notifyPermissionRequested({
-        commandId: this.#context.commandId(),
-        details: {
-          cwd: this.#context.cwd(),
-          rawInput,
-          locations
-        },
-        interactionId,
-        kind: SESSION_PERMISSION_REQUESTED_KIND,
-        options,
-        sessionId: this.#context.sessionId(),
-        title: truncate(title2 ?? "Permission required", 500),
-        toolCallId: truncate(request.toolCall.toolCallId, 255),
-        toolKind: truncate(kind ?? "other", 64)
-      });
+      await this.#notifyPermissionRequested(event);
       return await pending.completion.promise;
     } finally {
       signal.removeEventListener("abort", abort);
@@ -85724,25 +85750,26 @@ var SessionInteractions = class {
     const requestedSchema = request.mode === "form" ? schemaValue : {};
     const elicitationIdValue = Reflect.get(request, "elicitationId");
     const elicitationId = request.mode === "url" && typeof elicitationIdValue === "string" ? truncate(elicitationIdValue, 255) : "";
-    const pending = new PendingElicitation(interactionId, elicitationId, requestedSchema);
+    const event = {
+      accepted: false,
+      commandId: this.#context.commandId(),
+      elicitationId,
+      fields: normalizeElicitationFields(requestedSchema),
+      interactionId,
+      kind: SESSION_ELICITATION_REQUESTED_KIND,
+      message: truncate(request.message, 2e3),
+      mode: request.mode,
+      sessionId: this.#context.sessionId(),
+      url: request.mode === "url" && typeof Reflect.get(request, "url") === "string" ? truncate(readString2(Reflect.get(request, "url")), 4096) : ""
+    };
+    const pending = new PendingElicitation(event, requestedSchema);
     this.#pendingElicitations.set(interactionId, pending);
     const abort = () => {
       void this.cancelElicitation(interactionId);
     };
     signal.addEventListener("abort", abort, { once: true });
     try {
-      await this.#notifyElicitationRequested({
-        accepted: false,
-        commandId: this.#context.commandId(),
-        elicitationId,
-        fields: normalizeElicitationFields(requestedSchema),
-        interactionId,
-        kind: SESSION_ELICITATION_REQUESTED_KIND,
-        message: truncate(request.message, 2e3),
-        mode: request.mode,
-        sessionId: this.#context.sessionId(),
-        url: request.mode === "url" && typeof Reflect.get(request, "url") === "string" ? truncate(readString2(Reflect.get(request, "url")), 4096) : ""
-      });
+      await this.#notifyElicitationRequested(event);
       return await pending.completion.promise;
     } finally {
       signal.removeEventListener("abort", abort);
@@ -85750,14 +85777,14 @@ var SessionInteractions = class {
     }
   };
   onElicitationComplete = async (notification) => {
-    const interactionId = this.#acceptedUrlElicitations.get(notification.elicitationId);
-    if (interactionId === void 0) {
+    const accepted = this.#acceptedUrlElicitations.get(notification.elicitationId);
+    if (accepted === void 0) {
       return;
     }
     this.#acceptedUrlElicitations.delete(notification.elicitationId);
     await this.#notifyElicitationResolved({
       action: "complete",
-      interactionId,
+      interactionId: accepted.interactionId,
       kind: SESSION_ELICITATION_RESOLVED_KIND,
       sessionId: this.#context.sessionId()
     });
@@ -85792,7 +85819,9 @@ var SessionInteractions = class {
   cancelPendingInteractions = async () => {
     const permissionIds = [...this.#pendingPermissions.keys()];
     const elicitationIds = [...this.#pendingElicitations.keys()];
-    const acceptedElicitationIds = [...this.#acceptedUrlElicitations.values()];
+    const acceptedElicitationIds = [...this.#acceptedUrlElicitations.values()].map(
+      (request) => request.interactionId
+    );
     this.#acceptedUrlElicitations.clear();
     for (const interactionId of permissionIds) {
       await this.cancelPermission(interactionId);
@@ -86600,10 +86629,10 @@ var AgentSession = class _AgentSession {
       await this.#publishConfiguration();
     }
   };
-  // The revision check and Agent mutation share one queue, including legacy callers.
+  // The revision check and Agent mutation share one queue, including settings the Runtime applies itself.
   // A lost response may have committed: reread after a conflict, never replay an edit blindly.
   configure = async (options) => this.#configurationChanges.run(async (signal) => {
-    if (options.expectedConfigurationRevision !== void 0 && options.expectedConfigurationRevision !== this.#configRevision) {
+    if (options.expectedConfigurationRevision !== null && options.expectedConfigurationRevision !== this.#configRevision) {
       throw new AcpExecutionError(
         "Session settings changed. Review the current settings before applying your selection again.",
         {},
@@ -86808,6 +86837,10 @@ var AgentSession = class _AgentSession {
     }
     return "retained";
   };
+  interactionSnapshot = () => {
+    const { sessionGenerationId, throughPosition } = this.#store.events.livePosition(this.#mobiusSessionId);
+    return { sessionGenerationId, throughPosition, interactions: this.#interactions.snapshot() };
+  };
   respondPermission = async (options) => {
     await this.#interactions.respondPermission(options);
   };
@@ -87255,6 +87288,7 @@ var SessionManager2 = class {
                 ...options,
                 booleanValue: desired.booleanValue,
                 configId: desired.id,
+                expectedConfigurationRevision: null,
                 requestId: `execution-prepare-${desired.id}`,
                 value: "",
                 valueType: "boolean"
@@ -87267,6 +87301,7 @@ var SessionManager2 = class {
               ...options,
               booleanValue: false,
               configId: desired.id,
+              expectedConfigurationRevision: null,
               requestId: `execution-prepare-${desired.id}`,
               value: desired.currentValue,
               valueType: "select"
@@ -87412,6 +87447,7 @@ var SessionManager2 = class {
           ...options2,
           booleanValue: false,
           configId: modelOption2?.id ?? "model",
+          expectedConfigurationRevision: null,
           requestId: "agent-settings-model",
           sessionId: `agent-settings-${crypto.randomUUID()}`,
           value: model,
@@ -87717,6 +87753,21 @@ var SessionManager2 = class {
   };
   listSessions = (limit) => this.#store.list().filter((session) => session.prompted).slice(0, limit);
   findLinkedSessions = (agentId, nativeSessionId) => this.#store.findNative(agentId, nativeSessionId);
+  interactionSnapshot = (options) => {
+    options.signal.throwIfAborted();
+    const runtime = this.#executionProcesses.get(options.sessionId);
+    if (runtime !== void 0) {
+      return runtime.belongsTo(options.agent.id, options.cwd, options.additionalDirectories) ? runtime.interactionSnapshot() : void 0;
+    }
+    const stored = this.#store.read(options.sessionId);
+    if (!(stored instanceof FoundStoredSession) || stored.session.agentId !== options.agent.id || stored.session.cwd !== options.cwd || stored.session.additionalDirectories.length !== options.additionalDirectories.length || !stored.session.additionalDirectories.every(
+      (directory, index2) => directory === options.additionalDirectories[index2]
+    )) {
+      return void 0;
+    }
+    const { sessionGenerationId, throughPosition } = this.#store.events.livePosition(options.sessionId);
+    return { sessionGenerationId, throughPosition, interactions: [] };
+  };
   hasPreparedSession = (sessionId, agentId, cwd, additionalDirectories) => this.#executionProcesses.get(sessionId)?.belongsTo(agentId, cwd, additionalDirectories) === true;
   createNativeSession = async (options) => this.#operations.run(options, async (options2) => {
     const temporarySessionId = `new-${crypto.randomUUID()}`;
@@ -88151,6 +88202,7 @@ var NativeSessionService = class {
       capabilities: opened.prepared.capabilities,
       commands: opened.prepared.commands,
       configOptions: opened.prepared.configOptions,
+      configurationRevision: opened.prepared.configurationRevision,
       directoryId: target.directoryId,
       directoryLabel: target.directoryLabel,
       kind: "session.ready",
@@ -89476,8 +89528,13 @@ function buildSessionLayer(options) {
         );
       });
       const lastTurn = snapshot.turn === null ? operations.lastTurn(request.targetSessionId) : void 0;
+      const interactionState = manager.interactionSnapshot({
+        ...requestOptions,
+        sessionId: request.targetSessionId
+      });
       return {
         ...snapshot,
+        ...interactionState === void 0 ? {} : { interactionState },
         ...request.deliveryCommandId === void 0 ? {} : { command: operations.delivery(request.deliveryCommandId, request.targetSessionId) },
         ...lastTurn === void 0 ? {} : { lastTurn }
       };
@@ -89728,19 +89785,6 @@ var LocalExternalContentStore = class {
   };
 };
 
-// src/engine/util/timer.ts
-var SystemTimer = class {
-  schedule = (callback, milliseconds) => {
-    const timeout = setTimeout(callback, milliseconds);
-    return {
-      cancel: () => {
-        clearTimeout(timeout);
-      }
-    };
-  };
-};
-var systemTimer = new SystemTimer();
-
 // src/engine/session/process/process-capacity.ts
 var AcpProcessCapacityLease = class {
   #releaseCapacity;
@@ -91699,6 +91743,7 @@ async function applySessionConfigurationSelection(sessions, options, selection,
     agent,
     booleanValue: selection.booleanValue,
     configId: selection.configId,
+    expectedConfigurationRevision: null,
     cwd,
     requestId: `cfg_${randomUUID18()}`,
     sessionId,
@@ -92058,6 +92103,7 @@ async function prepareSession(command, recovery, closed, config2, resolveAgent,
         ...preparation,
         booleanValue: configuration.booleanValue,
         configId: configuration.configId,
+        expectedConfigurationRevision: null,
         requestId: command.requestId,
         value: configuration.value,
         valueType: configuration.valueType
@@ -92234,7 +92280,7 @@ async function executeSessionConfigure(socket, command, config2, resolveAgent, d
       ...await resolveAgent(command.agentId, signal, command.sessionId),
       booleanValue: command.booleanValue,
       configId: command.configId,
-      ...command.expectedConfigurationRevision === void 0 ? {} : { expectedConfigurationRevision: command.expectedConfigurationRevision },
+      expectedConfigurationRevision: command.expectedConfigurationRevision,
       cwd: resolved.cwd,
       requestId: command.requestId,
       sessionId: command.sessionId,
@@ -92637,7 +92683,7 @@ var HEARTBEAT_ACK_TIMEOUT_MILLISECONDS = 1e4;
 var HEARTBEAT_INTERVAL_MILLISECONDS = 2e4;
 var RelayLivenessState = class {
 };
-var UnsupportedRelayLivenessState = class extends RelayLivenessState {
+var NotStartedRelayLivenessState = class extends RelayLivenessState {
 };
 var AwaitingHeartbeatAckState = class extends RelayLivenessState {
   timeout;
@@ -92658,7 +92704,7 @@ var FinishedRelayLivenessState = class extends RelayLivenessState {
 var RelayConnectionLiveness = class {
   #timer;
   #transport;
-  #state = new UnsupportedRelayLivenessState();
+  #state = new NotStartedRelayLivenessState();
   constructor(timer, transport) {
     this.#timer = timer;
     this.#transport = transport;
@@ -92677,13 +92723,13 @@ var RelayConnectionLiveness = class {
       this.#state.timeout.cancel();
     } else if (this.#state instanceof WaitingForHeartbeatState) {
       this.#state.schedule.cancel();
-    } else if (!(this.#state instanceof UnsupportedRelayLivenessState) && !(this.#state instanceof FinishedRelayLivenessState)) {
+    } else if (!(this.#state instanceof NotStartedRelayLivenessState) && !(this.#state instanceof FinishedRelayLivenessState)) {
       throw new Error("Unknown relay liveness state");
     }
     this.#state = new FinishedRelayLivenessState();
   };
   start = () => {
-    if (this.#state instanceof UnsupportedRelayLivenessState) {
+    if (this.#state instanceof NotStartedRelayLivenessState) {
       this.#sendHeartbeat();
       return;
     }
@@ -92709,7 +92755,7 @@ var RelayConnectionLiveness = class {
   #sendHeartbeat = () => {
     if (this.#state instanceof WaitingForHeartbeatState) {
       this.#state.schedule.cancel();
-    } else if (!(this.#state instanceof UnsupportedRelayLivenessState)) {
+    } else if (!(this.#state instanceof NotStartedRelayLivenessState)) {
       if (this.#state instanceof FinishedRelayLivenessState) {
         return;
       }
@@ -92759,7 +92805,6 @@ async function runRelayConnection({
   timer
 }) {
   const relayUrl = new URL(config2.relayUrl);
-  relayUrl.searchParams.set("liveness", "1");
   const relay = await connectRelay(relayUrl, signal, (failure2, source) => {
     diagnostics.transportFailed(connectionEpoch, failure2, source);
   });
@@ -93591,4 +93636,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-7HMKMNG4.js.map
+//# sourceMappingURL=chunk-3GTWYIU4.js.map