@corca-org/ceal-host-linux-arm64 1.0.19 → 1.0.20

package/libexec/ceal-host/codex-invocation-authentication.mjs

@@ -3009,6 +3009,7 @@ var REQUIRED_FIELDS = CEAL_CLIENT_WIRE_CONTRACT.command_response.bare_document_f
 var OPTIONAL_FIELDS = CEAL_CLIENT_WIRE_CONTRACT.command_response.bare_document_optional_fields;
 
 // packages/ceal-client-protocol/src/resource-row.ts
+var CEAL_RESOURCE_ROW_TITLE_MATCH_DISPOSITIONS = vocabulary(["exact", "not_exact", "unknown"]);
 var CEAL_RESOURCE_SEARCH_ORDERS = vocabulary(["relevance", "modified", "viewed", "created"]);
 var CEAL_RESOURCE_SEARCH_DIRECTIONS = vocabulary(["ascending", "descending"]);
 var CEAL_RESOURCE_SEARCH_FILTERS = vocabulary(["query", "modified_since", "since", "until", "authored_by_me", "authored_by", "include_replies", "kinds", "container_ref", "container_refs", "container_names", "addressed_to_me", "unread"]);
@@ -3092,6 +3093,7 @@ var RESOURCE_ROW_KEY_RULES = Object.freeze({
   next: { required: true, timestamp: false },
   kind: { required: true, timestamp: false },
   matched_kinds: { required: false, timestamp: false },
+  title_match: { required: false, timestamp: false },
   title: { required: true, timestamp: false },
   container_label: { required: true, timestamp: false },
   container_ref: { required: false, timestamp: false },
@@ -3578,7 +3580,7 @@ var CEAL_HOST_AUTHENTICATION_POLICY = Object.freeze({
   invalid_arguments: Object.freeze({ classification: "host_arguments_invalid", next_action: "answer_with_gap" }),
   options_invalid: Object.freeze({ classification: "host_configuration_invalid", next_action: "answer_with_gap" }),
   session_unavailable: Object.freeze({ classification: "host_session_unavailable", next_action: "answer_with_gap" }),
-  context_unavailable: Object.freeze({ classification: "host_context_unavailable", next_action: "refresh_host_invocation_context", remedy: "the Host has no invocation context from the current transcript turn; run `ceal-host install` to repair the Host hook registration, then retry this command on a fresh Host turn" }),
+  context_unavailable: Object.freeze({ classification: "host_context_unavailable", next_action: "refresh_host_invocation_context", remedy: "the Host has no invocation context from the current transcript turn; send a new message to start a fresh Host turn, then retry this command on that turn (run `ceal-host install` only if the Host hook registration is missing or drifted)" }),
   context_replaced: Object.freeze({ classification: "host_invocation_context_stale", next_action: "refresh_host_invocation_context" }),
   no_binding: Object.freeze({ classification: "host_binding_unavailable", next_action: "refresh_host_invocation_context" }),
   context_stale: Object.freeze({ classification: "host_invocation_context_stale", next_action: "refresh_host_invocation_context" }),
@@ -3631,6 +3633,7 @@ var CEAL_HOST_SERVICE_DIAGNOSTIC_EVENTS = vocabulary([
   "watcher_turn_observed",
   "current_prompt_registered",
   "current_prompt_registration_failed",
+  "current_prompt_capacity_exhausted",
   "activation_recorded",
   "activation_failed",
   "watcher_scan_failed",
@@ -4186,6 +4189,21 @@ var MAX_STATE_BYTES = 8 * 1024 * 1024;
 // host/relay/src/current-prompt-custody.ts
 var HOST_CURRENT_PROMPT_MAX_BYTES = 256 * 1024;
 
+// host/service-log.ts
+function writeHostServiceDiagnostic(producer_id, event, failure_kind, cause, sink) {
+  const line = `${JSON.stringify({ schema_version: CEAL_HOST_SERVICE_DIAGNOSTIC_SCHEMA, producer_id, event, ...event === "watcher_scan_failed" && failure_kind !== void 0 ? { failure_kind } : {}, ...event === "watcher_scan_failed" && cause !== void 0 ? { cause } : {} })}
+`;
+  try {
+    (sink ?? defaultHostServiceDiagnosticSink)(line);
+  } catch {
+  }
+}
+function defaultHostServiceDiagnosticSink(line) {
+  process.stderr.write(line);
+}
+var HOST_SERVICE_LOG_MAX_BYTES = 1024 * 1024;
+var HOST_SERVICE_LOG_TAIL_BYTES = 64 * 1024;
+
 // host/relay/src/relay-ipc.ts
 var HOST_RELAY_REQUEST_BINDING_KEYS = Object.freeze([
   "schema_version",
@@ -4206,6 +4224,7 @@ var HOST_RELAY_IPC_RESPONSE_SCHEMA = "ceal.host_relay_admission.v1";
 var HOST_RELAY_INVOCATION_CONTEXT_QUERY_SCHEMA = "ceal.host_relay_invocation_context_query.v1";
 var HOST_RELAY_INVOCATION_CONTEXT_RESULT_SCHEMA = "ceal.host_relay_invocation_context_result.v1";
 var HOST_RELAY_CURRENT_PROMPT_REGISTER_SCHEMA = "ceal.host_relay_current_prompt_register.v1";
+var HOST_RELAY_CURRENT_PROMPT_RELEASE_SCHEMA = "ceal.host_relay_current_prompt_release.v1";
 var HOST_RELAY_CURRENT_PROMPT_RESULT_SCHEMA = "ceal.host_relay_current_prompt_result.v1";
 var HOST_RELAY_IPC_LENGTH_BYTES = Uint32Array.BYTES_PER_ELEMENT;
 var HOST_RELAY_ADMISSION_RESPONSE_MAX_BYTES = 4096;
@@ -4265,6 +4284,12 @@ var HostRelayIpcError = class extends Error {
     this.failure = failure2;
   }
 };
+var HostRelayCurrentPromptCapacityRefusal = class extends Error {
+  constructor() {
+    super("current_prompt_capacity_exhausted");
+    this.name = "HostRelayCurrentPromptCapacityRefusal";
+  }
+};
 function hostRelayExchangeFailure(error) {
   return error instanceof HostRelayIpcError ? error.failure : void 0;
 }
@@ -4313,8 +4338,14 @@ var HostRelayCurrentPromptPort = class {
   async register(input) {
     const request2 = { schema_version: HOST_RELAY_CURRENT_PROMPT_REGISTER_SCHEMA, ...input };
     const response2 = await exchange(this.endpoint, encodeLengthPrefixed(request2), this.timeout_ms, decodeCurrentPromptResponseBuffer);
+    if (response2.status === "capacity_exhausted") throw new HostRelayCurrentPromptCapacityRefusal();
     if (response2.status !== "registered") throw new HostRelayIpcError("relay_unavailable", response2.status);
   }
+  async release(identity) {
+    const request2 = { schema_version: HOST_RELAY_CURRENT_PROMPT_RELEASE_SCHEMA, ...identity };
+    const response2 = await exchange(this.endpoint, encodeLengthPrefixed(request2), this.timeout_ms, decodeCurrentPromptResponseBuffer);
+    if (response2.status !== "released") throw new HostRelayIpcError("relay_unavailable", response2.status, "response_invalid");
+  }
 };
 function submitHostProducerFrame(endpoint, frame, timeoutMs = 5e3) {
   return exchange(endpoint, encodeHostProducerFrame(frame), timeoutMs, decodeResponseBuffer);
@@ -4406,7 +4437,7 @@ function decodeInvocationContextResponseBuffer(buffer) {
 function decodeCurrentPromptResponseBuffer(buffer) {
   const value = decodeLengthPrefixedJson(buffer, HOST_RELAY_ADMISSION_RESPONSE_MAX_BYTES);
   if (value === null) return null;
-  if (!record2(value) || !exactKeys3(value, ["schema_version", "status"]) || value.schema_version !== HOST_RELAY_CURRENT_PROMPT_RESULT_SCHEMA || value.status !== "registered" && value.status !== "current_prompt_unavailable") throw new HostRelayIpcError("relay_unavailable");
+  if (!record2(value) || !exactKeys3(value, ["schema_version", "status"]) || value.schema_version !== HOST_RELAY_CURRENT_PROMPT_RESULT_SCHEMA || value.status !== "registered" && value.status !== "capacity_exhausted" && value.status !== "current_prompt_unavailable" && value.status !== "released") throw new HostRelayIpcError("relay_unavailable", "Host Relay current-prompt response is invalid.", "response_invalid");
   return { schema_version: HOST_RELAY_CURRENT_PROMPT_RESULT_SCHEMA, status: value.status };
 }
 function encodeInvocationContextQuery(query) {
@@ -4471,6 +4502,29 @@ function isHostTranscriptCursorReason(value) {
   return typeof value === "string" && HOST_TRANSCRIPT_CURSOR_REASONS.some((reason) => reason === value);
 }
 var TRANSCRIPT_MISSING_REASON = "transcript_missing";
+var TRANSCRIPT_SCAN_READ_ERROR_ERRNOS = ["EBADF", "EACCES", "EIO", "EMFILE", "ENFILE", "ENOENT", "ENOTDIR", "EPERM"];
+function transcriptScanFailureKind(error, adapterFailureKind) {
+  if (transcriptErrorCode(error) === "ELOOP") return "symlink";
+  const adapter = adapterFailureKind(error);
+  if (adapter !== void 0) return adapter;
+  const code = transcriptErrorCode(error);
+  if (code === "EFBIG") return "size_budget";
+  if (code !== null && TRANSCRIPT_SCAN_READ_ERROR_ERRNOS.includes(code)) return "read_error";
+  return "other";
+}
+async function registerHostCurrentPromptDiagnosed(register, diagnostic) {
+  try {
+    await register();
+    diagnostic("current_prompt_registered");
+    return true;
+  } catch (error) {
+    if (!(error instanceof HostRelayCurrentPromptCapacityRefusal)) diagnostic("current_prompt_registration_failed");
+    throw error;
+  }
+}
+function transcriptErrorCode(error) {
+  return typeof error === "object" && error !== null && "code" in error && typeof error.code === "string" ? error.code : null;
+}
 var HOST_TRANSCRIPT_READ_CHUNK_BYTES = 256 * 1024;
 async function readTranscriptCompleteChunk(handle, offset, size) {
   const available = Math.max(0, size - offset);
@@ -4579,10 +4633,15 @@ var HostTranscriptWatcher = class {
     return scanTranscriptRegistrations(await this.listRegistrations(), (registration) => this.scanRegistration(registration));
   }
   async scanRegistration(registration) {
-    return this.openTranscript(registration, (handle) => this.scanOpened(handle, registration), {
-      missing: () => this.retireMissing(registration),
-      failed: (handle, error) => this.scanFailed(handle, registration, error)
-    });
+    try {
+      return await this.openTranscript(registration, (handle) => this.scanOpened(handle, registration), {
+        missing: () => this.retireMissing(registration),
+        failed: (handle, error) => this.scanFailed(handle, registration, error)
+      });
+    } catch (error) {
+      if (error instanceof HostRelayCurrentPromptCapacityRefusal) return { records: 0, enqueued: 0, quarantined: false };
+      throw error;
+    }
   }
   async openTranscript(registration, scan, handlers) {
     let handle;
@@ -4591,7 +4650,7 @@ var HostTranscriptWatcher = class {
       return await scan(handle);
     } catch (error) {
       if (handle === void 0 && isMissingTranscriptError(error)) return handlers.missing();
-      if (hostRelayExchangeFailure(error) !== void 0) throw error;
+      if (hostRelayExchangeFailure(error) !== void 0 || error instanceof HostRelayCurrentPromptCapacityRefusal) throw error;
       return handlers.failed(handle, error);
     } finally {
       await handle?.close();
@@ -4792,17 +4851,6 @@ var DEFAULT_LIMITS = { global_count: 8192, global_bytes: 64 * 1024 * 1024, produ
 var RETRY_SECONDS = [1, 2, 4, 8, 16, 32, 60];
 var MAX_RETRYABLE_ATTEMPTS = RETRY_SECONDS.length + 10;
 
-// host/service-log.ts
-function writeHostServiceDiagnostic(producer_id, event, failure_kind) {
-  try {
-    process.stderr.write(`${JSON.stringify({ schema_version: CEAL_HOST_SERVICE_DIAGNOSTIC_SCHEMA, producer_id, event, ...event === "watcher_scan_failed" && failure_kind !== void 0 ? { failure_kind } : {} })}
-`);
-  } catch {
-  }
-}
-var HOST_SERVICE_LOG_MAX_BYTES = 1024 * 1024;
-var HOST_SERVICE_LOG_TAIL_BYTES = 64 * 1024;
-
 // host/invocation-authentication-command.ts
 var HOST_INVOCATION_AUTHENTICATION_COMMAND_PREFIX = ["authenticate", "--client-nonce"];
 var HOST_AUTHENTICATION_BUDGET_ENVIRONMENT = "CEAL_HOST_AUTHENTICATION_BUDGET_MS";
@@ -4899,36 +4947,36 @@ async function currentInvocation(descriptor2, config, now) {
   let waitEngaged = false;
   while (true) {
     if (!firstCheck && monotonicNow() >= deadline) {
-      recordActivationWaitExhaustion(descriptor2.producer_id, waitEngaged, waitBudgetMs);
+      recordActivationWaitExhaustion(descriptor2.producer_id, waitEngaged, waitBudgetMs, config.diagnostic_sink);
       throw new TypeError("context_unavailable");
     }
     firstCheck = false;
     const observedAt = now();
     const current = await readLiveSessionContext(store, identity.identity.host_source_ref, identity.identity.host_session_ref, observedAt);
     if (current !== null) {
-      recordActivationWaitCompletion(descriptor2.producer_id, waitEngaged);
+      recordActivationWaitCompletion(descriptor2.producer_id, waitEngaged, config.diagnostic_sink);
       return { store, current };
     }
     const remainingMs = deadline - monotonicNow();
     if (remainingMs <= 0) {
-      recordActivationWaitExhaustion(descriptor2.producer_id, waitEngaged, waitBudgetMs);
+      recordActivationWaitExhaustion(descriptor2.producer_id, waitEngaged, waitBudgetMs, config.diagnostic_sink);
       throw new TypeError("context_unavailable");
     }
-    recordActivationWaitEngagement(descriptor2.producer_id, waitEngaged);
+    recordActivationWaitEngagement(descriptor2.producer_id, waitEngaged, config.diagnostic_sink);
     waitEngaged = true;
     const intervalMs = Math.min(INVOCATION_CONTEXT_POLL_INTERVAL_MS, remainingMs);
     await (config.wait ?? waitForContextActivation)(intervalMs);
   }
 }
-function recordActivationWaitExhaustion(producer, engaged, budgetMs) {
-  if (engaged || budgetMs > 0) writeHostServiceDiagnostic(producer, "activation_wait_exhausted");
-  else writeHostServiceDiagnostic(producer, "activation_wait_skipped");
+function recordActivationWaitExhaustion(producer, engaged, budgetMs, sink) {
+  if (engaged || budgetMs > 0) writeHostServiceDiagnostic(producer, "activation_wait_exhausted", void 0, void 0, sink);
+  else writeHostServiceDiagnostic(producer, "activation_wait_skipped", void 0, void 0, sink);
 }
-function recordActivationWaitCompletion(producer, engaged) {
-  if (engaged) writeHostServiceDiagnostic(producer, "activation_wait_completed");
+function recordActivationWaitCompletion(producer, engaged, sink) {
+  if (engaged) writeHostServiceDiagnostic(producer, "activation_wait_completed", void 0, void 0, sink);
 }
-function recordActivationWaitEngagement(producer, engaged) {
-  if (!engaged) writeHostServiceDiagnostic(producer, "activation_wait_engaged");
+function recordActivationWaitEngagement(producer, engaged, sink) {
+  if (!engaged) writeHostServiceDiagnostic(producer, "activation_wait_engaged", void 0, void 0, sink);
 }
 async function readLiveSessionContext(store, hostSourceRef, hostSessionRef, now) {
   const current = await store.readInvocationContext(hostSourceRef, hostSessionRef, now);
@@ -6236,6 +6284,8 @@ function codexSubmissionReference(hostInputRef, event, ordinal) {
 var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
   store;
   registerCurrentPrompt;
+  releaseCurrentPrompt;
+  diagnostic;
   constructor(options) {
     super(options, {
       default_retention_ms: CODEX_DEFAULT_RETENTION_MS,
@@ -6244,6 +6294,8 @@ var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
     });
     this.store = new CodexOutboxStore(options.outbox_dir);
     this.registerCurrentPrompt = options.register_current_prompt;
+    this.releaseCurrentPrompt = options.release_current_prompt;
+    this.diagnostic = options.diagnostic ?? (() => void 0);
   }
   transcriptPathOf(registration) {
     return registration.transcript_path;
@@ -6259,17 +6311,22 @@ var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
     if (complete === "empty" || complete === "partial") return { records: 0, enqueued: 0, quarantined: false };
     return await this.consumeCompleteChunk(registration, handle, preflight.cursor, complete, device, inode);
   }
-  async scanFailed(handle, registration, _error) {
+  async scanFailed(handle, registration, error) {
+    this.diagnostic("watcher_scan_failed", codexTranscriptScanFailureKind(error));
     await this.quarantineFailure(registration, handle);
     return { records: 0, enqueued: 0, quarantined: true };
   }
   async retireMissing(registration) {
+    await this.releaseStoredPromptBestEffort(registration.host_session_ref, await this.store.readTranscriptCursor(registration).catch(() => null));
     return this.retireMissingTranscript(registration.transcript_path, "Codex", () => this.store.retireTranscriptRegistration(registration));
   }
   async preflight(registration, handle, size, device, inode) {
     const existing = await this.store.readTranscriptCursor(registration);
     let cursor = existing ?? codexTranscriptInitialCursor(registration, device, inode, this.now);
-    if (cursor.status === "quarantined") return { cursor: null, result: { records: 0, enqueued: 0, quarantined: true } };
+    if (cursor.status === "quarantined") {
+      if (cursor.reason !== "transcript_malformed") await this.releaseStoredPromptBestEffort(registration.host_session_ref, cursor);
+      return { cursor: null, result: { records: 0, enqueued: 0, quarantined: true } };
+    }
     const reason = this.cursorIdentityReason(cursor, registration.transcript_path, device, inode) ?? await this.cursorBoundsReason(handle, cursor, size);
     if (reason === null) return { cursor, result: { records: 0, enqueued: 0, quarantined: false } };
     await this.quarantine(registration, cursor, device, inode, reason);
@@ -6308,25 +6365,41 @@ var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
     const stats = await handle.stat().catch(() => null);
     if (stats === null) return;
     const existing = await this.store.readTranscriptCursor(registration).catch(() => null);
-    await this.quarantine(registration, existing ?? codexTranscriptInitialCursor(registration, String(stats.dev), String(stats.ino), this.now), String(stats.dev), String(stats.ino), "transcript_malformed");
+    const quarantined = {
+      ...existing ?? codexTranscriptInitialCursor(registration, String(stats.dev), String(stats.ino), this.now),
+      transcript_path: registration.transcript_path,
+      device: String(stats.dev),
+      inode: String(stats.ino),
+      status: "quarantined",
+      reason: "transcript_malformed",
+      updated_at: this.stamp()
+    };
+    await this.store.writeTranscriptCursor(quarantined);
   }
   async processRecord(registration, activeTask, record3) {
-    if (record3.kind === "task_started") {
-      return { activeTask: { codex_turn_id: record3.turn_id, host_turn_ref: hostTurnReference(registration.host_source_ref, registration.host_session_ref, record3.turn_id), started_at: record3.timestamp }, enqueued: 0 };
-    }
+    if (record3.kind === "task_started") return this.processTaskStarted(registration, activeTask, record3);
     if (record3.kind === "turn_context") return { ...activeTask === void 0 ? {} : { activeTask: record3.turn_id === activeTask.codex_turn_id ? { ...activeTask, model: record3.model } : activeTask }, enqueued: 0 };
     if (record3.kind === "token_count") return { ...activeTask === void 0 ? {} : { activeTask: accumulateTokenCount(activeTask, record3) }, enqueued: 0 };
     if (record3.kind === "user_text") return this.processUserInput(registration, activeTask, record3);
     if (record3.kind === "task_complete" || record3.kind === "turn_aborted") return this.processTerminal(registration, activeTask, record3);
     return { ...activeTask === void 0 ? {} : { activeTask }, enqueued: 0 };
   }
+  async processTaskStarted(registration, activeTask, record3) {
+    if (activeTask !== void 0 && activeTask.codex_turn_id !== record3.turn_id && activeTask.prompt_ref !== void 0) await this.releasePrompt(registration.host_session_ref, activeTask, activeTask.prompt_ref);
+    return { activeTask: { codex_turn_id: record3.turn_id, host_turn_ref: hostTurnReference(registration.host_source_ref, registration.host_session_ref, record3.turn_id), started_at: record3.timestamp }, enqueued: 0 };
+  }
   async processUserInput(registration, activeTask, record3) {
-    if (activeTask === void 0 || activeTask.codex_turn_id !== record3.turn_id) return { ...activeTask === void 0 ? {} : { activeTask }, enqueued: 0 };
+    if (activeTask === void 0 || activeTask.codex_turn_id !== record3.turn_id) {
+      const adopted = await this.adoptHookCorrelatedTurn(registration, activeTask, record3);
+      if (adopted === void 0) return { ...activeTask === void 0 ? {} : { activeTask }, enqueued: 0 };
+      activeTask = adopted;
+    }
     const hostInputRef = hostInputReference(registration.host_source_ref, registration.host_session_ref, record3.turn_id, record3.message_id, record3.ordinal, record3.prompt);
     const origin = activeTask.origin_host_input_ref === void 0;
     const promptValue = promptObservationValue(record3.prompt);
     const currentPromptRef = hostProducerPromptRef(promptValue.body_sha256);
     const promptRef = activeTask.prompt_ref ?? currentPromptRef;
+    const steeredPromptRef = await this.steeredPromptRef(registration, activeTask, origin, currentPromptRef);
     const identity = { host_source_ref: registration.host_source_ref, host_session_ref: registration.host_session_ref, host_turn_ref: activeTask.host_turn_ref };
     const observations = [{
       observation_ref: observationRef("transcript_user_text", hostInputRef, record3.prompt),
@@ -6352,14 +6425,88 @@ var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
       created_at: record3.timestamp,
       expires_at: this.expire(this.outboxRetentionMs)
     };
-    await this.registerPrompt(origin, registration, activeTask, currentPromptRef, record3.prompt, envelope.expires_at);
-    await this.store.put(envelope);
-    if (origin) await activateTranscriptTurnContext(this.store, identity, promptRef, envelope.expires_at);
+    const persisted = await this.persistUserInputTurn(registration, activeTask, record3, hostInputRef, origin, currentPromptRef, promptRef, identity, envelope);
+    if (steeredPromptRef !== null) await this.activateTranscriptTurnContext(identity, steeredPromptRef, envelope.expires_at);
+    return persisted;
+  }
+  /**
+   * The steered prompt to re-activate under the running task, or null when
+   * there is nothing to repair. A steered message joins the running turn
+   * with new prompt bytes but no task_started. When the steer hook already
+   * replaced the turn selection (a turn id the hook did not recognize as
+   * the running one, or a hook that ran before any context was live), the
+   * running task's context no longer matches and the next invocation would
+   * wait for a boundary that never comes. When the hook kept the live
+   * selection, the context still matches and this stays null.
+   */
+  async steeredPromptRef(registration, activeTask, origin, currentPromptRef) {
+    if (origin || activeTask.prompt_ref === void 0 || activeTask.prompt_ref === currentPromptRef) return null;
+    const selection = await this.store.readInvocationTurnSelection(registration.host_source_ref, registration.host_session_ref).catch(() => null);
+    return selection?.prompt_ref === currentPromptRef ? currentPromptRef : null;
+  }
+  /**
+   * Adopt the live hooked turn when its transcript message arrives before
+   * (or without) its task_started, as an interrupted turn's follow-up can.
+   * The UserPromptSubmit hook names the exact hooked prompt, so only a
+   * message carrying those bytes adopts; inherited history and other turns
+   * stay ignored. A stale active task for another turn releases first, the
+   * same as a task_started supersession.
+   */
+  async adoptHookCorrelatedTurn(registration, activeTask, record3) {
+    const currentPromptRef = hostProducerPromptRef(promptObservationValue(record3.prompt).body_sha256);
+    const selection = await this.store.readInvocationTurnSelection(registration.host_source_ref, registration.host_session_ref);
+    if (selection?.prompt_ref !== currentPromptRef) return void 0;
+    if (activeTask !== void 0 && activeTask.codex_turn_id !== record3.turn_id && activeTask.prompt_ref !== void 0) {
+      await this.releasePrompt(registration.host_session_ref, activeTask, activeTask.prompt_ref);
+    }
+    return {
+      codex_turn_id: record3.turn_id,
+      host_turn_ref: hostTurnReference(registration.host_source_ref, registration.host_session_ref, record3.turn_id),
+      started_at: record3.timestamp
+    };
+  }
+  async persistUserInputTurn(registration, activeTask, record3, hostInputRef, origin, currentPromptRef, promptRef, identity, envelope) {
+    const custodyRegistered = await this.registerPrompt(origin, registration, activeTask, currentPromptRef, record3.prompt, envelope.expires_at);
+    if (custodyRegistered) this.diagnostic("watcher_turn_observed");
+    try {
+      await this.store.put(envelope);
+      if (origin) await this.activateTranscriptTurnContext(identity, promptRef, envelope.expires_at);
+    } catch (error) {
+      if (custodyRegistered) await this.releasePrompt(registration.host_session_ref, activeTask, currentPromptRef).catch(() => void 0);
+      throw error;
+    }
     return { activeTask: { ...activeTask, origin_host_input_ref: activeTask.origin_host_input_ref ?? hostInputRef, prompt_ref: activeTask.prompt_ref ?? currentPromptRef }, enqueued: 1 };
   }
   async registerPrompt(origin, registration, activeTask, promptRef, prompt, expiresAt) {
-    if (!origin || this.producerInstallationRef === void 0 || this.registerCurrentPrompt === void 0) return;
-    await this.registerCurrentPrompt({ producer_id: "codex", producer_installation_ref: this.producerInstallationRef, local_session_ref: registration.host_session_ref, local_turn_ref: activeTask.host_turn_ref, prompt_ref: promptRef, current_prompt: prompt, context_expires_at: expiresAt });
+    if (!origin || this.producerInstallationRef === void 0 || this.registerCurrentPrompt === void 0) return false;
+    const register = this.registerCurrentPrompt;
+    const installationRef = this.producerInstallationRef;
+    return registerHostCurrentPromptDiagnosed(
+      () => register({ producer_id: "codex", producer_installation_ref: installationRef, local_session_ref: registration.host_session_ref, local_turn_ref: activeTask.host_turn_ref, prompt_ref: promptRef, current_prompt: prompt, context_expires_at: expiresAt }),
+      (event) => this.diagnostic(event)
+    );
+  }
+  async activateTranscriptTurnContext(identity, promptRef, expiresAt) {
+    try {
+      const selection = await this.store.readInvocationTurnSelection(identity.host_source_ref, identity.host_session_ref);
+      const turnGenerationRef = selection?.prompt_ref === promptRef ? selection.turn_generation_ref : void 0;
+      await this.store.activateInvocationContext(identity, promptRef, expiresAt, turnGenerationRef);
+      this.diagnostic("activation_recorded");
+    } catch (error) {
+      this.diagnostic("activation_failed");
+      throw error;
+    }
+  }
+  async releasePrompt(sessionRef, activeTask, promptRef) {
+    if (this.producerInstallationRef === void 0 || this.releaseCurrentPrompt === void 0) return;
+    await this.releaseCurrentPrompt({ producer_id: "codex", producer_installation_ref: this.producerInstallationRef, local_session_ref: sessionRef, local_turn_ref: activeTask.host_turn_ref, prompt_ref: promptRef });
+  }
+  async releaseStoredPromptBestEffort(sessionRef, cursor) {
+    await this.releaseActiveTaskBestEffort(sessionRef, cursor?.active_task);
+  }
+  async releaseActiveTaskBestEffort(sessionRef, activeTask) {
+    if (activeTask?.prompt_ref === void 0) return;
+    await this.releasePrompt(sessionRef, activeTask, activeTask.prompt_ref).catch(() => void 0);
   }
   async processTerminal(registration, activeTask, record3) {
     if (activeTask === void 0 || activeTask.codex_turn_id !== record3.turn_id || activeTask.origin_host_input_ref === void 0 || activeTask.prompt_ref === void 0) return { ...activeTask === void 0 ? {} : { activeTask }, enqueued: 0 };
@@ -6379,18 +6526,23 @@ var CodexTranscriptWatcher = class extends HostTranscriptWatcher {
       created_at: record3.timestamp,
       expires_at: this.expire(this.outboxRetentionMs)
     });
+    await this.releasePrompt(registration.host_session_ref, activeTask, activeTask.prompt_ref);
     await this.store.clearInvocationContext(identity, this.now());
     return { enqueued: 1 };
   }
   async quarantine(registration, cursor, device, inode, reason) {
+    await this.releaseStoredPromptBestEffort(registration.host_session_ref, cursor);
     const quarantined = { ...cursor, transcript_path: registration.transcript_path, device, inode, status: "quarantined", reason, updated_at: this.stamp() };
     await this.store.writeTranscriptCursor(quarantined);
   }
 };
-async function activateTranscriptTurnContext(store, identity, promptRef, expiresAt) {
-  const selection = await store.readInvocationTurnSelection(identity.host_source_ref, identity.host_session_ref);
-  const turnGenerationRef = selection?.prompt_ref === promptRef ? selection.turn_generation_ref : void 0;
-  await store.activateInvocationContext(identity, promptRef, expiresAt, turnGenerationRef);
+function codexTranscriptScanFailureKind(error) {
+  return transcriptScanFailureKind(error, (candidate) => {
+    if (!(candidate instanceof CodexHostAdapterError)) return void 0;
+    if (candidate.code === "payload_rejected") return "payload_rejected";
+    if (candidate.code === "storage") return "read_error";
+    return void 0;
+  });
 }
 function accumulateTokenCount(activeTask, record3) {
   if (record3.usage_gap_reason !== void 0) return { ...activeTask, token_usage_gap_reason: record3.usage_gap_reason };
@@ -6478,7 +6630,16 @@ function assertRecordSequence(registration, cursor, records, lastOrdinal, record
 // host/codex/src/codex-producer-runtime.ts
 async function drainCodexProducerOnce(options) {
   const promptPort = new HostRelayCurrentPromptPort(options.relay_endpoint, options.timeout_ms);
-  const scan = await new CodexTranscriptWatcher({ outbox_dir: options.outbox_dir, producer_installation_ref: options.producer_installation_ref, register_current_prompt: (input) => promptPort.register(input) }).scanOnce();
+  const scan = await new CodexTranscriptWatcher({
+    outbox_dir: options.outbox_dir,
+    producer_installation_ref: options.producer_installation_ref,
+    register_current_prompt: (input) => promptPort.register(input),
+    release_current_prompt: (identity) => promptPort.release(identity),
+    diagnostic: (event, failure_kind) => writeHostServiceDiagnostic("codex", event, failure_kind)
+  }).scanOnce().catch((error) => {
+    writeHostServiceDiagnostic("codex", "watcher_scan_failed", codexTranscriptScanFailureKind(error));
+    throw error;
+  });
   const producer = new CodexProducer({ outbox_dir: options.outbox_dir, producer_installation_ref: options.producer_installation_ref, relay: new HostRelayIpcAdmissionPort(options.relay_endpoint, options.timeout_ms), ...options.producer_epoch === void 0 ? {} : { producer_epoch: options.producer_epoch }, ...options.now === void 0 ? {} : { now: options.now } });
   return { scanned: scan.enqueued, ...await producer.drainOutbox() };
 }