@with-logic/elwood 0.1.3 → 0.2.1

package/dist/codex/images/attach.js

@@ -8,7 +8,8 @@
  * sessions cannot cross-attach. Implements PRD §5.3 (C-API-46).
  */
 import { elwoodError } from "../../core/errors.js";
-import { clearComposer, imageChipCount, sendWhenUnblocked, waitForImageChip, } from "../../core/images/chip-wait.js";
+import { sendObservedImage, waitForImageChip, } from "../../core/images/chip-wait.js";
+import { requestComposerCleanup } from "../../core/input/composer-cleanup.js";
 import { clipboardImageSupported, restoreClipboardText, setClipboardImage, snapshotClipboardText, } from "./clipboard.js";
 import { withClipboardLock } from "./clipboard-lock.js";
 const CTRL_V = "\u0016"; // Ctrl+V triggers Codex clipboard-image paste
@@ -18,37 +19,35 @@ const chipWait = { settleMs: 200, timeoutMs: 10_000, pollMs: 100 };
  * the user's clipboard text afterward (best-effort). Rejects with
  * `unsupported_platform` on non-macOS BEFORE touching the clipboard, and with
  * `image_attach_failed`/`invalid_image` on a snapshot/set/confirm failure; the
- * caller then submits no text. The Ctrl+V is held while a blocking dialog is on
+ * caller then submits no text. A detected permanent render failure rejects with
+ * `image_attach_failed` immediately, without awaiting the confirmation timeout.
+ * The Ctrl+V is held while a blocking dialog is on
  * screen so it never confirms a dialog (C-API-37/46).
  */
 export async function attachCodexImages(terminal, paths, signal, blocked, onRestoreFailed) {
     if (!clipboardImageSupported())
         throw elwoodError("unsupported_platform", "Codex image attachment requires macOS.");
-    await withClipboardLock(() => attachUnderLock(terminal, paths, signal, blocked, onRestoreFailed));
+    await withClipboardLock(() => attachUnderLock(terminal, paths, signal, blocked, onRestoreFailed), { signal, error: () => elwoodError("image_attach_failed", "Image attach aborted.") });
 }
 async function attachUnderLock(terminal, paths, signal, blocked, onRestoreFailed) {
-    // A waiter that acquired the lock only after its session closed must touch
-    // nothing — check abort FIRST, before snapshotting or mutating the clipboard.
-    if (signal.aborted)
-        throw elwoodError("image_attach_failed", "Image attach aborted.");
     // Snapshot BEFORE mutating; a snapshot failure rejects here so we never
     // overwrite then "restore" an empty string over the user's clipboard.
     const priorClipboard = await snapshotClipboardText();
     let staged = false;
     try {
         for (const path of paths) {
-            const before = imageChipCount(terminal.snapshot().text);
             await setClipboardImage(path);
-            // sendWhenUnblocked rejects if the signal is already aborted, so a mid-attach
+            // sendObservedImage rejects if the signal is already aborted, so a mid-attach
             // close is caught here before the Ctrl+V reaches the PTY (C-API-46).
-            await sendWhenUnblocked(terminal, CTRL_V, blocked, signal);
+            const before = await sendObservedImage(terminal, CTRL_V, blocked, signal);
             staged = true;
             await waitForImageChip(terminal, before, signal, chipWait);
         }
     }
     catch (error) {
+        // Request now; the session owner clears only after this clipboard finalizer and safe input.
         if (staged)
-            await clearComposer(terminal); // discard staged chips on failure (C-API-44)
+            await requestComposerCleanup(terminal, blocked);
         throw error;
     }
     finally {

package/dist/codex/images/attach.js.map

@@ -1 +1 @@
-{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../../src/codex/images/attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAIL,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,8CAA8C;AACvE,MAAM,QAAQ,GAAoB,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;AAEpF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAwB,EACxB,KAAwB,EACxB,MAAmB,EACnB,OAAsB,EACtB,eAA4B;IAE5B,IAAI,CAAC,uBAAuB,EAAE;QAC5B,MAAM,WAAW,CAAC,sBAAsB,EAAE,wCAAwC,CAAC,CAAC;IACtF,MAAM,iBAAiB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAwB,EACxB,KAAwB,EACxB,MAAmB,EACnB,OAAiC,EACjC,eAAyC;IAEzC,2EAA2E;IAC3E,8EAA8E;IAC9E,IAAI,MAAM,CAAC,OAAO;QAAE,MAAM,WAAW,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC;IACtF,wEAAwE;IACxE,sEAAsE;IACtE,MAAM,cAAc,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACrD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC9B,8EAA8E;YAC9E,qEAAqE;YACrE,MAAM,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3D,MAAM,GAAG,IAAI,CAAC;YACd,MAAM,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,MAAM;YAAE,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,6CAA6C;QACxF,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,+EAA+E;QAC/E,iEAAiE;QACjE,IAAI,CAAC;YACH,IAAI,CAAC,CAAC,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;gBAAE,eAAe,EAAE,EAAE,CAAC;QACzE,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;QAC9E,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../../src/codex/images/attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAIL,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,8CAA8C;AACvE,MAAM,QAAQ,GAAoB,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;AAEpF;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAwB,EACxB,KAAwB,EACxB,MAAmB,EACnB,OAAsB,EACtB,eAA4B;IAE5B,IAAI,CAAC,uBAAuB,EAAE;QAC5B,MAAM,WAAW,CAAC,sBAAsB,EAAE,wCAAwC,CAAC,CAAC;IACtF,MAAM,iBAAiB,CACrB,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,EACxE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,EAAE,CACrF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAwB,EACxB,KAAwB,EACxB,MAAmB,EACnB,OAAiC,EACjC,eAAyC;IAEzC,wEAAwE;IACxE,sEAAsE;IACtE,MAAM,cAAc,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACrD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC9B,8EAA8E;YAC9E,qEAAqE;YACrE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,GAAG,IAAI,CAAC;YACd,MAAM,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,4FAA4F;QAC5F,IAAI,MAAM;YAAE,MAAM,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,+EAA+E;QAC/E,iEAAiE;QACjE,IAAI,CAAC;YACH,IAAI,CAAC,CAAC,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;gBAAE,eAAe,EAAE,EAAE,CAAC;QACzE,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;QAC9E,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/codex/images/clipboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clipboard.d.ts","sourceRoot":"","sources":["../../../src/codex/images/clipboard.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAyBH,wFAAwF;AACxF,eAAO,MAAM,gCAAgC,qEACuB,CAAC;AAErE,kFAAkF;AAClF,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAS7D;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASzE;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASnE"}
+{"version":3,"file":"clipboard.d.ts","sourceRoot":"","sources":["../../../src/codex/images/clipboard.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA2BH,wFAAwF;AACxF,eAAO,MAAM,gCAAgC,qEACuB,CAAC;AAErE,kFAAkF;AAClF,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAS7D;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAezE;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASnE"}

package/dist/codex/images/clipboard.js

@@ -7,6 +7,8 @@
  * (C-API-46).
  */
 import { execFile } from "node:child_process";
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { promisify } from "node:util";
 import { elwoodError } from "../../core/errors.js";
 import { currentPlatform } from "../../runtime/seams.js";
@@ -53,10 +55,16 @@ export async function snapshotClipboardText() {
  */
 export async function restoreClipboardText(text) {
     try {
+        // `spawn` throws synchronously for some launch failures (e.g. E2BIG): no
+        // child exists then, so the restore simply failed and the caller must warn.
         const child = run(PBCOPY, [], { timeout: 5_000 });
-        child.child.stdin?.end(text); // inside try so a synchronous spawn/stdin failure can't escape
-        await child;
-        return true;
+        // Own both failures and their completion: a broken stdin must not release
+        // the clipboard lock while pbcopy can still mutate the shared pasteboard.
+        const settled = await Promise.allSettled([
+            child,
+            pipeline(Readable.from([text]), child.child.stdin),
+        ]);
+        return settled.every((result) => result.status === "fulfilled");
     }
     catch {
         return false;

package/dist/codex/images/clipboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../src/codex/images/clipboard.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAEhC,MAAM,SAAS,GAAG,oBAAoB,CAAC;AACvC,MAAM,OAAO,GAAG,kBAAkB,CAAC;AACnC,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAEjC,+EAA+E;AAC/E,iFAAiF;AACjF,+EAA+E;AAC/E,+EAA+E;AAC/E,MAAM,aAAa,GACjB,2CAA2C;IAC3C,0DAA0D;IAC1D,4DAA4D;IAC5D,2DAA2D;IAC3D,sDAAsD;IACtD,yDAAyD,CAAC;AAE5D,wFAAwF;AACxF,MAAM,CAAC,MAAM,gCAAgC,GAC3C,kEAAkE,CAAC;AAErE,kFAAkF;AAClF,MAAM,UAAU,uBAAuB;IACrC,OAAO,eAAe,EAAE,KAAK,QAAQ,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAChF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,WAAW,CAAC,qBAAqB,EAAE,+BAA+B,EAAE;YACxE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAAY;IACrD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAClD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,+DAA+D;QAC7F,MAAM,KAAK,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY;IAClD,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC3C,+EAA+E;QAC/E,MAAM,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,qBAAqB,CAAC;QACzF,MAAM,WAAW,CAAC,IAAI,EAAE,uCAAuC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAgD,CAAC;QAC7E,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE;YAAE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;YAAE,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;IAC3E,CAAC;IACD,OAAO,8BAA8B,CAAC;AACxC,CAAC"}
+{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../src/codex/images/clipboard.ts"],"names":[],"mappings":"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"}

package/dist/codex/model-picker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-picker.d.ts","sourceRoot":"","sources":["../../src/codex/model-picker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAOhE,eAAO,MAAM,gBAAgB,EAAE,eAsB9B,CAAC"}
+{"version":3,"file":"model-picker.d.ts","sourceRoot":"","sources":["../../src/codex/model-picker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAehE,eAAO,MAAM,gBAAgB,EAAE,eAgD9B,CAAC"}

package/dist/codex/model-picker.js

@@ -3,21 +3,39 @@
  * Implements PRD §5.7, C-API-23, and C-API-24.
  */
 import { sendPickerInput } from "../core/models/input.js";
-import { codexModelPickerHeader, parseCodexModelPicker } from "../core/models/rows.js";
+import { bottomDialogCandidate, bottomDialogRow, codexModelPickerHeader, ownOperation, parseCodexModelPicker, } from "../core/models/rows.js";
 import { waitForScreen } from "../core/models/tui-screen.js";
+import { codexComposerClearance } from "./screen/clearance.js";
 const reasoningHeader = /Select Reasoning Level/;
 const changeConfirmed = /Model changed to/;
 export const codexModelPicker = {
     agent: "codex",
+    isClear: codexComposerClearance,
+    isCandidate: (text) => bottomDialogCandidate(text, codexModelPickerHeader) ||
+        bottomDialogCandidate(text, reasoningHeader),
     isOpen: (text) => codexModelPickerHeader.test(text),
+    activeDialog: (text, authority) => {
+        // Nothing on screen is our dialog unless we opened one; the grammar below only has to
+        // locate Elwood's own dialog, never adjudicate arbitrary agent output (C-API-24).
+        if (!authority.opened)
+            return undefined;
+        const picker = bottomDialogRow(text, codexModelPickerHeader);
+        const level = bottomDialogRow(text, reasoningHeader);
+        if (picker < 0 && level < 0)
+            return undefined;
+        return level > picker ? "follow-up" : "picker";
+    },
     parse: parseCodexModelPicker,
     // Enter confirms the model, then Codex asks for a reasoning level with the
     // cursor pre-set on that model's default; a second Enter keeps it.
     apply: async (io, timeoutMs) => {
-        await sendPickerInput(io, "\r", (text) => codexModelPickerHeader.test(text));
-        await waitForScreen(io.terminal, (text) => reasoningHeader.test(text), timeoutMs, "codex reasoning level screen");
-        await sendPickerInput(io, "\r", (text) => reasoningHeader.test(text));
-        await waitForScreen(io.terminal, (text) => changeConfirmed.test(text) && !reasoningHeader.test(text), timeoutMs, "codex model change confirmation");
+        // Enter CONFIRMS a model, so it is revalidated against the operation's own picker
+        // rather than a bare header a transcript could print (C-API-24).
+        await sendPickerInput(io, "\r", (text) => codexModelPicker.activeDialog(text, ownOperation) === "picker");
+        await waitForScreen(io.terminal, (text) => reasoningHeader.test(text), timeoutMs, "codex reasoning level screen", io.signal);
+        // Same for the reasoning stage: only our own follow-up may receive this Enter.
+        await sendPickerInput(io, "\r", (text) => codexModelPicker.activeDialog(text, ownOperation) === "follow-up");
+        await waitForScreen(io.terminal, (text) => changeConfirmed.test(text) && !reasoningHeader.test(text), timeoutMs, "codex model change confirmation", io.signal);
     },
 };
 //# sourceMappingURL=model-picker.js.map

package/dist/codex/model-picker.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-picker.js","sourceRoot":"","sources":["../../src/codex/model-picker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,eAAe,GAAG,wBAAwB,CAAC;AACjD,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,gBAAgB,GAAoB;IAC/C,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC;IACnD,KAAK,EAAE,qBAAqB;IAC5B,2EAA2E;IAC3E,mEAAmE;IACnE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;QAC7B,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7E,MAAM,aAAa,CACjB,EAAE,CAAC,QAAQ,EACX,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EACpC,SAAS,EACT,8BAA8B,CAC/B,CAAC;QACF,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,MAAM,aAAa,CACjB,EAAE,CAAC,QAAQ,EACX,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EACnE,SAAS,EACT,iCAAiC,CAClC,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"model-picker.js","sourceRoot":"","sources":["../../src/codex/model-picker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,eAAe,GAAG,wBAAwB,CAAC;AACjD,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,gBAAgB,GAAoB;IAC/C,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CACpB,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,CAAC;QACnD,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC;IAC9C,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC;IACnD,YAAY,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;QAChC,sFAAsF;QACtF,kFAAkF;QAClF,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QACxC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACrD,IAAI,MAAM,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAC9C,OAAO,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;IACjD,CAAC;IACD,KAAK,EAAE,qBAAqB;IAC5B,2EAA2E;IAC3E,mEAAmE;IACnE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;QAC7B,kFAAkF;QAClF,iEAAiE;QACjE,MAAM,eAAe,CACnB,EAAE,EACF,IAAI,EACJ,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,QAAQ,CACzE,CAAC;QACF,MAAM,aAAa,CACjB,EAAE,CAAC,QAAQ,EACX,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EACpC,SAAS,EACT,8BAA8B,EAC9B,EAAE,CAAC,MAAM,CACV,CAAC;QACF,+EAA+E;QAC/E,MAAM,eAAe,CACnB,EAAE,EACF,IAAI,EACJ,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,WAAW,CAC5E,CAAC;QACF,MAAM,aAAa,CACjB,EAAE,CAAC,QAAQ,EACX,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EACnE,SAAS,EACT,iCAAiC,EACjC,EAAE,CAAC,MAAM,CACV,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/codex/preflight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/codex/preflight.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,KAAK,gBAAgB,EAAuB,MAAM,4BAA4B,CAAC;AAOxF,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,MAAM,MAAM,oBAAoB,GAAG;IAAE,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAA;CAAE,CAAC;AACjF,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAClD,OAAO,CAAC,kBAAkB,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,CAAA;CAAE,CAAC,EAC7F,iBAAiB,CAClB,CAAC;AAMF,wBAAsB,cAAc,CAClC,kBAAkB,EAAE,OAAO,EAC3B,UAAU,UAAQ,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAqC5C;AA4BD,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAI1E;AAaD,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD"}
+{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../../src/codex/preflight.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAsB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAOvF,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,MAAM,MAAM,oBAAoB,GAAG;IAAE,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAA;CAAE,CAAC;AACjF,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAClD,OAAO,CAAC,kBAAkB,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,CAAA;CAAE,CAAC,EAC7F,iBAAiB,CAClB,CAAC;AAMF,wBAAsB,cAAc,CAClC,kBAAkB,EAAE,OAAO,EAC3B,UAAU,UAAQ,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAqC5C;AA4BD,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAI1E;AAaD,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD"}

package/dist/codex/preflight.js

@@ -4,7 +4,7 @@
  */
 import { elwoodError, probeFailureDetails } from "../core/errors.js";
 import { compareVersions, parseVersion } from "../core/versions.js";
-import { updateFailedWarning } from "../core/warnings/update.js";
+import { buildUpdateWarning } from "../core/warnings/update.js";
 import { currentCommandRunner, currentPlatform } from "../runtime/seams.js";
 import { probeShellCommand, userShell } from "../runtime/shell.js";
 import { cachedAutoupdate, cachedVersionRead, dedupeInFlight } from "../runtime/update/once.js";
@@ -43,7 +43,7 @@ export async function preflightCodex(strictVersionCheck, autoupdate = false) {
         throw elwoodError("codex_version_unsupported", `Codex CLI ${minimumCodexVersion} or newer is required for Elwood hooks.`, { version, minimumCodexVersion });
     }
     // Installed CLI is compatible: a failed best-effort update is a warning, not a start failure.
-    return updateError === undefined ? undefined : updateFailedWarning("codex", version, updateError);
+    return updateError === undefined ? undefined : buildUpdateWarning("codex", version, updateError);
 }
 async function runCodexUpdate() {
     const result = await currentCommandRunner()(userShell(), probeShellCommand("codex update"));

package/dist/codex/preflight.js.map

@@ -1 +1 @@
-{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/codex/preflight.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../../src/codex/preflight.ts"],"names":[],"mappings":"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"}

package/dist/codex/questions/acceptance.d.ts

@@ -0,0 +1,18 @@
+import type { ValidatedQuestionAnswer } from "../../core/questions/validate.ts";
+import type { Candidate } from "./candidate-store.ts";
+import type { QuestionReply } from "./records.ts";
+export declare class AnswerExpectations {
+    private readonly pending;
+    /** Arm values in question order before driver input.
+     * Text normalizes CRLF/lone CR to LF, then trims Rust Unicode White_Space.
+     * Queued uses provided text (even empty), otherwise the whitespace-trimmed label.
+     * Blocking keeps the verbatim label, then adds user_note only for nonempty normalized text.
+     * Label line endings are not normalized. */
+    expect(candidate: Candidate, answers: readonly ValidatedQuestionAnswer[], signal: AbortSignal): () => void;
+    clear(candidate: Candidate): void;
+    /** Unowned queued replies retain manual native acceptance; owned replies require a full match. */
+    isQueuedReplyAccepted(candidate: Candidate, replies: readonly QuestionReply[]): boolean;
+    /** Without an owned expectation, undefined delegates to the caller's legacy manual check. */
+    matchesOwnedBlockingAnswers(candidate: Candidate, answers: unknown): boolean | undefined;
+}
+//# sourceMappingURL=acceptance.d.ts.map

package/dist/codex/questions/acceptance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acceptance.d.ts","sourceRoot":"","sources":["../../../src/codex/questions/acceptance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAWlD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAMpB;IACJ;;;;gDAI4C;IAC5C,MAAM,CACJ,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,SAAS,uBAAuB,EAAE,EAC3C,MAAM,EAAE,WAAW,GAClB,MAAM,IAAI;IAqBb,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAGjC,kGAAkG;IAClG,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,OAAO;IAMvF,6FAA6F;IAC7F,2BAA2B,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;CAkBzF"}

package/dist/codex/questions/acceptance.js

@@ -0,0 +1,70 @@
+/** Compare complete owned native answers without retaining them after PRD §4 attempts. */
+import { isRecord } from "../../core/predicates.js";
+import { questionAnswerFailed } from "../../core/questions/errors.js";
+// Rust str::trim uses Unicode White_Space, which excludes JavaScript's FEFF.
+function nativeTrim(value) {
+    const whitespace = /\p{White_Space}/u;
+    let start = 0;
+    let end = value.length;
+    while (start < end && whitespace.test(value[start]))
+        start++;
+    while (end > start && whitespace.test(value[end - 1]))
+        end--;
+    return value.slice(start, end);
+}
+export class AnswerExpectations {
+    pending = new Map();
+    /** Arm values in question order before driver input.
+     * Text normalizes CRLF/lone CR to LF, then trims Rust Unicode White_Space.
+     * Queued uses provided text (even empty), otherwise the whitespace-trimmed label.
+     * Blocking keeps the verbatim label, then adds user_note only for nonempty normalized text.
+     * Label line endings are not normalized. */
+    expect(candidate, answers, signal) {
+        if (signal.aborted || this.pending.has(candidate))
+            throw questionAnswerFailed();
+        const values = candidate.questions.map((question, index) => {
+            const answer = answers[index];
+            const label = question.definition.options[answer.optionIndexes[0] ?? question.definition.options.length - 1]?.label;
+            const text = answer.text === undefined ? undefined : nativeTrim(answer.text.replace(/\r\n?/g, "\n"));
+            if (candidate.queued)
+                return [text ?? nativeTrim(label)];
+            return [label, ...(text ? [`user_note: ${text}`] : [])];
+        });
+        const release = () => {
+            if (this.pending.get(candidate)?.release === release)
+                this.pending.delete(candidate);
+            signal.removeEventListener("abort", release);
+        };
+        this.pending.set(candidate, { values, release });
+        signal.addEventListener("abort", release, { once: true });
+        return release;
+    }
+    clear(candidate) {
+        this.pending.get(candidate)?.release();
+    }
+    /** Unowned queued replies retain manual native acceptance; owned replies require a full match. */
+    isQueuedReplyAccepted(candidate, replies) {
+        const expected = this.pending.get(candidate);
+        if (!expected)
+            return true;
+        const matching = replies.filter((reply) => reply.questionItemId === candidate.nativeKey);
+        return matching.length === 1 && matching[0].answer === expected.values[0][0];
+    }
+    /** Without an owned expectation, undefined delegates to the caller's legacy manual check. */
+    matchesOwnedBlockingAnswers(candidate, answers) {
+        const expected = this.pending.get(candidate);
+        if (!expected)
+            return undefined;
+        return (isRecord(answers) &&
+            Object.keys(answers).length === candidate.questions.length &&
+            candidate.questions.every((question, index) => {
+                const native = answers[String(question.nativeId)];
+                const values = expected.values[index];
+                const actual = isRecord(native) ? native["answers"] : undefined;
+                return (Array.isArray(actual) &&
+                    actual.length === values.length &&
+                    values.every((value, item) => actual[item] === value));
+            }));
+    }
+}
+//# sourceMappingURL=acceptance.js.map

package/dist/codex/questions/acceptance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acceptance.js","sourceRoot":"","sources":["../../../src/codex/questions/acceptance.ts"],"names":[],"mappings":"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"}

package/dist/codex/questions/adapter.d.ts

@@ -0,0 +1,26 @@
+/** Reconcile private Codex question UI and route guarded native answers (PRD §7A.5; C-QUESTION-05). */
+import type { ElwoodActivityEvent } from "../../core/activity/index.ts";
+import type { QuestionAdapter, QuestionFrame, QuestionIo } from "../../core/questions/adapter.ts";
+import type { QuestionRegistry } from "../../core/questions/registry.ts";
+import type { ElwoodQuestionRequest } from "../../core/questions/types.ts";
+import type { ValidatedQuestionAnswer } from "../../core/questions/validate.ts";
+export declare class CodexQuestionAdapter implements QuestionAdapter {
+    private readonly state;
+    private readonly registry;
+    private readonly candidatesSeenInNativeUi;
+    private readonly pending;
+    private focused;
+    private previousQuestionCount;
+    private hold;
+    private composerEligibilityChecked;
+    constructor(registry: QuestionRegistry, onDisabled?: () => void);
+    observe(event: ElwoodActivityEvent): boolean;
+    render(frame: QuestionFrame): void;
+    blocksInput(): boolean;
+    answer(request: ElwoodQuestionRequest, answers: readonly ValidatedQuestionAnswer[], io: QuestionIo): Promise<void>;
+    private publishConfirmedCandidates;
+    private markSeen;
+    private observeComposer;
+    private observeQueued;
+}
+//# sourceMappingURL=adapter.d.ts.map

package/dist/codex/questions/adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/codex/questions/adapter.ts"],"names":[],"mappings":"AAAA,uGAAuG;AACvG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAShF,qBAAa,oBAAqB,YAAW,eAAe;IAC1D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IACrE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IACpD,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,0BAA0B,CAAS;gBAC/B,QAAQ,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,IAAI;IAI/D,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO;IAW5C,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAmBlC,WAAW,IAAI,OAAO;IAGhB,MAAM,CACV,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,SAAS,uBAAuB,EAAE,EAC3C,EAAE,EAAE,UAAU,GACb,OAAO,CAAC,IAAI,CAAC;IAwChB,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,aAAa;CAqBtB"}

package/dist/codex/questions/adapter.js

@@ -0,0 +1,163 @@
+import { questionAnswerFailed } from "../../core/questions/errors.js";
+import { codexEmptyInputRows } from "../screen/empty-input.js";
+import { hasInFlightSubmission } from "./candidate.js";
+import { CodexQuestionCandidates } from "./candidates.js";
+import { answerBlocking, answerQueued } from "./driver.js";
+import { matchesQuestion, questionView, queuedBadge } from "./frame.js";
+import { nativeQuestionFragment } from "./native-pending.js";
+import { PendingSubmissions } from "./pending-submissions.js";
+export class CodexQuestionAdapter {
+    state;
+    registry;
+    candidatesSeenInNativeUi = new WeakSet();
+    pending = new PendingSubmissions();
+    focused;
+    previousQuestionCount = 0;
+    hold = false;
+    composerEligibilityChecked = false;
+    constructor(registry, onDisabled) {
+        this.registry = registry;
+        this.state = new CodexQuestionCandidates(registry, onDisabled);
+    }
+    observe(event) {
+        return this.state.batchNotifications(() => {
+            const changed = this.state.observe(event);
+            if (changed)
+                this.composerEligibilityChecked = false;
+            if (this.focused && this.state.candidates.get(this.focused.nativeKey) !== this.focused) {
+                this.focused = undefined;
+                this.previousQuestionCount = 0;
+            }
+            return changed;
+        });
+    }
+    render(frame) {
+        this.state.batchNotifications(() => {
+            const view = questionView(frame);
+            const badge = queuedBadge(frame);
+            const chrome = view !== undefined || badge !== undefined || nativeQuestionFragment(frame);
+            if (chrome) {
+                this.hold = true;
+                this.composerEligibilityChecked = false;
+            }
+            this.pending.observe(frame, view, this.state);
+            const current = view?.kind === "queued" ? this.observeQueued(view) : undefined;
+            const available = this.state.availableAcceptedQueuedCandidates();
+            const queuedConfirmed = (badge === available.length && !this.state.hasOpaqueReservation()) ||
+                (current !== undefined && view?.count === available.length);
+            this.publishConfirmedCandidates(view, queuedConfirmed);
+            this.observeComposer(frame, chrome);
+        });
+    }
+    blocksInput() {
+        return this.hold || this.state.hasReservation();
+    }
+    async answer(request, answers, io) {
+        this.composerEligibilityChecked = false;
+        const nativeKey = this.registry.keyFor(request.id);
+        const candidate = nativeKey === undefined ? undefined : this.state.candidates.get(nativeKey);
+        if (!candidate || candidate.hasPendingNativeSubmission)
+            throw questionAnswerFailed();
+        // Physical dispatch retains native ownership even if the caller stops waiting.
+        const submitting = () => this.state.setSubmitting(candidate, true);
+        let answerNative;
+        if (candidate.queued) {
+            if (answers.length !== 1)
+                throw questionAnswerFailed();
+            const [answer] = answers;
+            if (answer === undefined)
+                throw questionAnswerFailed();
+            const queued = this.state.availableAcceptedQueuedCandidates();
+            answerNative = () => answerQueued(queued.map((item) => item.questions[0].definition), answer, 
+            // biome-ignore lint/complexity/useIndexOf: the accepted snapshot has a narrower element type than candidate.
+            queued.findIndex((item) => item === candidate), io, submitting);
+        }
+        else
+            answerNative = () => answerBlocking(candidate.questions.map((question) => question.definition), answers, io, submitting);
+        const abandon = this.state.expectAnswer(candidate, answers, io.signal);
+        try {
+            await answerNative();
+        }
+        catch (error) {
+            abandon();
+            this.composerEligibilityChecked = false;
+            throw error;
+        }
+    }
+    publishConfirmedCandidates(view, queuedConfirmed) {
+        for (const candidate of this.state.unpublishedCandidates()) {
+            if (candidate.queued) {
+                if (queuedConfirmed && candidate.accepted && !candidate.hasPendingNativeSubmission) {
+                    this.markSeen(candidate);
+                    this.state.publish(candidate);
+                }
+            }
+            else if (view?.kind === "blocking" &&
+                candidate.questions.length === view.count &&
+                matchesQuestion(view, candidate.questions[view.index].definition)) {
+                this.markSeen(candidate);
+                this.state.publish(candidate);
+            }
+        }
+    }
+    markSeen(candidate) {
+        if (!this.candidatesSeenInNativeUi.has(candidate)) {
+            this.candidatesSeenInNativeUi.add(candidate);
+            this.composerEligibilityChecked = false;
+        }
+    }
+    observeComposer(frame, chrome) {
+        if (chrome ||
+            frame.cursorVisible !== true ||
+            frame.cursorX !== 2 ||
+            !codexEmptyInputRows(frame.lines, frame.cursorRow))
+            return;
+        this.hold = false;
+        // Only native eligibility changes invalidate this scan; unrelated viewport redraws do not.
+        if (this.composerEligibilityChecked)
+            return;
+        this.composerEligibilityChecked = true;
+        for (const candidate of this.state.candidates.values()) {
+            if (this.candidatesSeenInNativeUi.has(candidate) &&
+                !hasInFlightSubmission(candidate) &&
+                !this.pending.isAmbiguous(candidate))
+                this.state.close(candidate.nativeKey, "unavailable");
+        }
+        // Unknown native identities cannot be correlated to a later panel. Turn end releases them.
+    }
+    observeQueued(view) {
+        const queued = this.state.availableAcceptedQueuedCandidates();
+        const current = queuedCandidate(queued, view);
+        if (current) {
+            this.markSeen(current);
+            const previous = this.focused;
+            // A one-item decrease or remaining singleton permits retiring another focused candidate.
+            const canRetirePreviousCandidate = previous !== current && (this.previousQuestionCount === view.count + 1 || view.count === 1);
+            if (previous) {
+                const retirementEligible = !(hasInFlightSubmission(previous) || this.pending.isAmbiguous(previous));
+                if (canRetirePreviousCandidate && retirementEligible)
+                    this.state.close(previous.nativeKey, "unavailable");
+            }
+            this.focused = current;
+        }
+        this.previousQuestionCount = view.count;
+        return current;
+    }
+}
+/** Use position only when counts agree; otherwise require one unambiguous definition match. */
+function queuedCandidate(queued, view) {
+    if (queued.length === view.count) {
+        const indexed = queued[view.index];
+        return matchesQuestion(view, indexed.questions[0].definition) ? indexed : undefined;
+    }
+    let match;
+    for (const candidate of queued) {
+        if (!matchesQuestion(view, candidate.questions[0].definition))
+            continue;
+        if (match)
+            return undefined;
+        match = candidate;
+    }
+    return match;
+}
+//# sourceMappingURL=adapter.js.map

package/dist/codex/questions/adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/codex/questions/adapter.ts"],"names":[],"mappings":"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"}

package/dist/codex/questions/candidate-acceptance.d.ts

@@ -0,0 +1,5 @@
+/** Derive queued-call acceptance from native and retained metadata (PRD §4). */
+import type { Candidate } from "./candidate.ts";
+import type { QuestionCall } from "./records.ts";
+export declare function candidateCallAccepted(call: QuestionCall, candidates: ReadonlyMap<string, Candidate>): boolean;
+//# sourceMappingURL=candidate-acceptance.d.ts.map

package/dist/codex/questions/candidate-acceptance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-acceptance.d.ts","sourceRoot":"","sources":["../../../src/codex/questions/candidate-acceptance.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,GACzC,OAAO,CAQT"}

package/dist/codex/questions/candidate-acceptance.js

@@ -0,0 +1,8 @@
+export function candidateCallAccepted(call, candidates) {
+    return (call.queued &&
+        (call.accepted ||
+            candidates
+                .values()
+                .some((candidate) => candidate.callId === call.callId && candidate.accepted)));
+}
+//# sourceMappingURL=candidate-acceptance.js.map

package/dist/codex/questions/candidate-acceptance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-acceptance.js","sourceRoot":"","sources":["../../../src/codex/questions/candidate-acceptance.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,qBAAqB,CACnC,IAAkB,EAClB,UAA0C;IAE1C,OAAO,CACL,IAAI,CAAC,MAAM;QACX,CAAC,IAAI,CAAC,QAAQ;YACZ,UAAU;iBACP,MAAM,EAAE;iBACR,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,CAClF,CAAC;AACJ,CAAC"}

package/dist/codex/questions/candidate-authority.d.ts

@@ -0,0 +1,10 @@
+/** Keep reentrant native-call mutations bound to their current owner (PRD §4). */
+export declare class CandidateAuthority {
+    private readonly active;
+    /** Same-call reentry replaces the token; older cleanup must preserve the newer owner.
+     * Other call IDs remain independent. Return the operation callback's change boolean. */
+    run(callId: string, operation: (authority: object) => boolean): boolean;
+    isCurrent(callId: string, authority: object): boolean;
+    supersede(callId: unknown): void;
+}
+//# sourceMappingURL=candidate-authority.d.ts.map

package/dist/codex/questions/candidate-authority.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-authority.d.ts","sourceRoot":"","sources":["../../../src/codex/questions/candidate-authority.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAEpD;4FACwF;IACxF,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO;IAUvE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAIrD,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;CAGjC"}

package/dist/codex/questions/candidate-authority.js

@@ -0,0 +1,25 @@
+/** Keep reentrant native-call mutations bound to their current owner (PRD §4). */
+export class CandidateAuthority {
+    active = new Map();
+    /** Same-call reentry replaces the token; older cleanup must preserve the newer owner.
+     * Other call IDs remain independent. Return the operation callback's change boolean. */
+    run(callId, operation) {
+        const authority = {};
+        this.active.set(callId, authority);
+        try {
+            return operation(authority);
+        }
+        finally {
+            if (this.isCurrent(callId, authority))
+                this.active.delete(callId);
+        }
+    }
+    isCurrent(callId, authority) {
+        return this.active.get(callId) === authority;
+    }
+    supersede(callId) {
+        if (typeof callId === "string")
+            this.active.delete(callId);
+    }
+}
+//# sourceMappingURL=candidate-authority.js.map

package/dist/codex/questions/candidate-authority.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-authority.js","sourceRoot":"","sources":["../../../src/codex/questions/candidate-authority.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,MAAM,OAAO,kBAAkB;IACZ,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEpD;4FACwF;IACxF,GAAG,CAAC,MAAc,EAAE,SAAyC;QAC3D,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,SAAiB;QACzC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;IAC/C,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,OAAO,MAAM,KAAK,QAAQ;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;CACF"}