@with-logic/elwood 0.1.2 → 0.2.0

package/dist/codex/config/transaction.js

@@ -8,40 +8,70 @@
  */
 import { withCodexConfigLock } from "./lock.js";
 export function runCodexModelSwitch(io) {
-    return withCodexConfigLock(async () => {
-        const snapshot = io.snapshot();
-        let primary;
-        let failed = false;
-        try {
-            await io.apply();
-        }
-        catch (error) {
-            failed = true;
-            primary = error;
-        }
-        // Restore whether or not the switch rejected, so a late picker timeout that
-        // fired AFTER Codex wrote config.toml still restores the user's default.
-        try {
-            io.restore(snapshot);
-        }
-        catch (restoreError) {
-            // When the switch succeeded, a restore failure surfaces on its own. When a
-            // primary error is being preserved we cannot also throw the restore failure,
-            // but it must NOT vanish — report it so the user learns config.toml may still
-            // be mutated (the alternative, silently dropping it, was the bug). The report
-            // is CONTAINED here: a throwing reporter must never replace the primary error
-            // this function guarantees to preserve.
-            if (!failed)
-                throw restoreError;
+    return new Promise((resolve, reject) => {
+        const transaction = withCodexConfigLock(async () => {
+            const snapshot = io.snapshot();
+            let primary;
+            let failed = false;
             try {
-                io.onRestoreError?.(restoreError);
+                await io.apply();
             }
-            catch {
-                // A throwing reporter must not replace the primary error we preserve below.
+            catch (error) {
+                failed = true;
+                primary = error;
             }
-        }
-        if (failed)
-            throw primary;
+            // The barrier is about the CLI still being able to WRITE, which has nothing to do
+            // with whether our picker automation succeeded. A switch that applied cleanly and
+            // then raced termination must defer its restore just as a failed one does, or the
+            // dying process's final config write lands after it. `waitForCliExit` returns
+            // undefined unless the session is closing, so the ordinary path is unchanged.
+            const exitWait = io.waitForCliExit?.();
+            // A non-undefined wait means the session is CLOSING. The caller is told immediately
+            // and identically either way: a switch that "succeeded" into a terminating session
+            // did not take effect for that session, so reporting success — five seconds later,
+            // once the exit barrier cleared — would be a lie. Only the restore waits.
+            const closing = exitWait !== undefined;
+            if (closing) {
+                // `failed` is always true here in practice: the queue slot's close signal aborts
+                // every picker read and write, so a switch cannot APPLY into a closing session.
+                // The rejection is still delivered before the wait so the caller is never held for
+                // the exit bound, and the restore below is told the call has already settled.
+                reject(primary);
+                await exitWait;
+            }
+            // `settled` tells the restore its failure can no longer reach the caller through the
+            // returned promise, so it must be REPORTED instead of thrown into a void.
+            restoreAfterSwitch(io, snapshot, failed || closing);
+            if (failed)
+                throw primary;
+        }, io.cancel);
+        // A rejection already delivered above makes this one a no-op.
+        transaction.then(resolve, reject);
     });
 }
+/**
+ * Restores whether or not the switch rejected, so a late picker timeout that fired
+ * AFTER Codex wrote config.toml still restores the user's default. When the switch
+ * succeeded AND the caller is still listening, a restore failure surfaces on its own. Once
+ * the call has already settled — a preserved primary error, or a termination rejection
+ * delivered before the barrier — the restore failure cannot be thrown, but it must NOT
+ * vanish (that would leave config.toml holding the temporary model silently): it is
+ * reported so the user learns config.toml may still be mutated. The report is
+ * CONTAINED: a throwing reporter must never replace the primary error.
+ */
+function restoreAfterSwitch(io, snapshot, settled) {
+    try {
+        io.restore(snapshot);
+    }
+    catch (restoreError) {
+        if (!settled)
+            throw restoreError;
+        try {
+            io.onRestoreError?.(restoreError);
+        }
+        catch {
+            // A throwing reporter must not replace the primary error the caller preserves.
+        }
+    }
+}
 //# sourceMappingURL=transaction.js.map

package/dist/codex/config/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/codex/config/transaction.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAkBhD,MAAM,UAAU,mBAAmB,CAAC,EAAoB;IACtD,OAAO,mBAAmB,CAAC,KAAK,IAAI,EAAE;QACpC,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAgB,CAAC;QACrB,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC;YACd,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;QACD,4EAA4E;QAC5E,yEAAyE;QACzE,IAAI,CAAC;YACH,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,2EAA2E;YAC3E,6EAA6E;YAC7E,8EAA8E;YAC9E,8EAA8E;YAC9E,8EAA8E;YAC9E,wCAAwC;YACxC,IAAI,CAAC,MAAM;gBAAE,MAAM,YAAY,CAAC;YAChC,IAAI,CAAC;gBACH,EAAE,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,4EAA4E;YAC9E,CAAC;QACH,CAAC;QACD,IAAI,MAAM;YAAE,MAAM,OAAO,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/codex/config/transaction.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAuChD,MAAM,UAAU,mBAAmB,CAAC,EAAoB;IACtD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,IAAI,EAAE;YACjD,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAgB,CAAC;YACrB,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,IAAI,CAAC;gBACd,OAAO,GAAG,KAAK,CAAC;YAClB,CAAC;YACD,kFAAkF;YAClF,kFAAkF;YAClF,kFAAkF;YAClF,8EAA8E;YAC9E,8EAA8E;YAC9E,MAAM,QAAQ,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC;YACvC,oFAAoF;YACpF,mFAAmF;YACnF,mFAAmF;YACnF,0EAA0E;YAC1E,MAAM,OAAO,GAAG,QAAQ,KAAK,SAAS,CAAC;YACvC,IAAI,OAAO,EAAE,CAAC;gBACZ,iFAAiF;gBACjF,gFAAgF;gBAChF,mFAAmF;gBACnF,8EAA8E;gBAC9E,MAAM,CAAC,OAAO,CAAC,CAAC;gBAChB,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,qFAAqF;YACrF,0EAA0E;YAC1E,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,IAAI,OAAO,CAAC,CAAC;YACpD,IAAI,MAAM;gBAAE,MAAM,OAAO,CAAC;QAC5B,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;QACd,8DAA8D;QAC9D,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,kBAAkB,CACzB,EAAoB,EACpB,QAA4B,EAC5B,OAAgB;IAEhB,IAAI,CAAC;QACH,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO;YAAE,MAAM,YAAY,CAAC;QACjC,IAAI,CAAC;YACH,EAAE,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,+EAA+E;QACjF,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/codex/hooks/index.d.ts

@@ -48,21 +48,25 @@ type CodexToolInputUpdateForEvent<Event> = Event extends {
 export type CodexPreToolUseResultFor<Event> = {
     readonly permissionDecision: "deny";
     readonly permissionDecisionReason: string;
+    readonly updatedInput?: never;
 } | {
     readonly permissionDecision: "allow";
     readonly updatedInput?: CodexToolInputUpdateForEvent<Event>;
 } | {
     readonly additionalContext: string;
+    readonly updatedInput?: never;
 };
 export type CodexPreToolUseResult = CodexPreToolUseResultFor<CodexHookEventFor<"PreToolUse">>;
-type CodexPreToolUseCommonResult = {
+export type CodexPreToolUseCommonResult = {
     readonly permissionDecision: "deny";
     readonly permissionDecisionReason: string;
+    readonly updatedInput?: never;
 } | {
     readonly permissionDecision: "allow";
     readonly updatedInput?: never;
 } | {
     readonly additionalContext: string;
+    readonly updatedInput?: never;
 };
 export type CodexPermissionRequestResult = {
     readonly behavior: "allow" | "deny";
@@ -80,6 +84,7 @@ export type CodexStopResult = {
 };
 /** Return undefined for no decision; empty objects are invalid and fail open. */
 export type CodexHookResultFor<K extends CodexHookEventName> = K extends "PreToolUse" ? CodexPreToolUseResult | undefined : K extends "PermissionRequest" ? CodexPermissionRequestResult | undefined : K extends "Stop" | "SubagentStop" ? CodexBlockResult | CodexStopResult | undefined : undefined;
+export type CodexHookCommonResultFor<K extends CodexHookEventName> = K extends "PreToolUse" ? CodexPreToolUseCommonResult | undefined : CodexHookResultFor<K>;
 export type CodexHookResultForEvent<Event extends CodexHookEvent> = Event["hook_event_name"] extends "PreToolUse" ? CodexPreToolUseResultFor<Event> | undefined : CodexHookResultFor<Event["hook_event_name"]>;
 export type CodexHookResult = {
     [K in CodexHookEventName]: CodexHookResultFor<K>;

package/dist/codex/hooks/index.d.ts.map

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

package/dist/codex/hooks/validate-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-result.d.ts","sourceRoot":"","sources":["../../../src/codex/hooks/validate-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAEtF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,kBAAkB,GAAG,cAAc,EAC1C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,eAAe,CAY1B"}
+{"version":3,"file":"validate-result.d.ts","sourceRoot":"","sources":["../../../src/codex/hooks/validate-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGtF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,kBAAkB,GAAG,cAAc,EAC1C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,eAAe,CAY1B"}

package/dist/codex/hooks/validate-result.js

@@ -3,6 +3,7 @@
  * Implements PRD §7A.2.
  */
 import { isOneOf, isRecord, optionalString } from "../../core/predicates.js";
+import { optionalNullableString } from "./values.js";
 export function isCodexHookResult(event, value) {
     const eventName = typeof event === "string" ? event : event.hook_event_name;
     const toolName = typeof event === "string" || !("tool_name" in event) ? undefined : event.tool_name;
@@ -78,7 +79,7 @@ function isCodexToolInputUpdate(toolName, value) {
     if (toolName !== "Bash" && toolName !== "apply_patch")
         return true;
     return (keysAre(value, ["command", "description"]) &&
-        optionalString(value["description"]) &&
+        optionalNullableString(value["description"]) &&
         ("command" in value ? typeof value["command"] === "string" : true));
 }
 //# sourceMappingURL=validate-result.js.map

package/dist/codex/hooks/validate-result.js.map

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

package/dist/codex/hooks/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/codex/hooks/validate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAG7E;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,cAAc,CA8BxE;AAqCD,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzD"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/codex/hooks/validate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAG7E;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,cAAc,CA8BxE;AAqCD,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzD"}

package/dist/codex/hooks/validate.js

@@ -3,6 +3,7 @@
  * Implements PRD §7A.2.
  */
 import { isOneOf, isRecord, optionalString } from "../../core/predicates.js";
+import { optionalNullableString } from "./values.js";
 export { isCodexHookResult } from "./validate-result.js";
 export function normalizeCodexHookEvent(event) {
     if (!("tool_name" in event) || isPublicToolName(event.tool_name))
@@ -78,9 +79,6 @@ export function isKnownCommandTool(value) {
 function isPublicToolName(value) {
     return isKnownCommandTool(value) || value.startsWith("mcp__") || value.startsWith("unknown:");
 }
-function optionalNullableString(value) {
-    return value === undefined || value === null || typeof value === "string";
-}
 function optionalPermissionMode(value) {
     return (value === undefined ||
         isOneOf(value, ["default", "acceptEdits", "plan", "auto", "dontAsk", "bypassPermissions"]));

package/dist/codex/hooks/validate.js.map

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

package/dist/codex/hooks/values.d.ts

@@ -0,0 +1,3 @@
+/** Shared Codex nullable text validation at ingress and response boundaries (PRD §7A.2). */
+export declare function optionalNullableString(value: unknown): boolean;
+//# sourceMappingURL=values.d.ts.map

package/dist/codex/hooks/values.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"values.d.ts","sourceRoot":"","sources":["../../../src/codex/hooks/values.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAE5F,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE9D"}

package/dist/codex/hooks/values.js

@@ -0,0 +1,5 @@
+/** Shared Codex nullable text validation at ingress and response boundaries (PRD §7A.2). */
+export function optionalNullableString(value) {
+    return value === undefined || value === null || typeof value === "string";
+}
+//# sourceMappingURL=values.js.map

package/dist/codex/hooks/values.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../src/codex/hooks/values.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAE5F,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAC5E,CAAC"}

package/dist/codex/images/attach.d.ts

@@ -13,7 +13,9 @@ import { type AttachTerminal, type BlockedGuard } from "../../core/images/chip-w
  * 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 declare function attachCodexImages(terminal: AttachTerminal, paths: readonly string[], signal: AbortSignal, blocked?: BlockedGuard, onRestoreFailed?: () => void): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/codex/images/attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,YAAY,EAMlB,MAAM,gCAAgC,CAAC;AAYxC;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,YAAY,EACtB,eAAe,CAAC,EAAE,MAAM,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC,CAIf"}
+{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/codex/images/attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,YAAY,EAIlB,MAAM,gCAAgC,CAAC;AAaxC;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,YAAY,EACtB,eAAe,CAAC,EAAE,MAAM,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC,CAOf"}

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":"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"}
+{"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":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAyB,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAsB,oBAAoB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhG,oFAAoF;AAEpF,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;AAM7C,oGAAoG;AACpG,mGAAmG;AACnG,uFAAuF;AACvF,MAAM,eAAe,GAAG,IAAI,GAAG,EAA0C,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,kBAA2B,EAC3B,UAAU,GAAG,KAAK;IAElB,0EAA0E;IAC1E,6BAA6B;IAC7B,IAAI,eAAe,EAAE,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,WAAW,CAAC,sBAAsB,EAAE,uCAAuC,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,WAAoB,CAAC;IACzB,IAAI,UAAU,EAAE,CAAC;QACf,8FAA8F;QAC9F,2FAA2F;QAC3F,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,OAAO,EACP,KAAK,IAAI,EAAE;YACT,MAAM,gBAAgB,EAAE,CAAC,CAAC,6DAA6D;YACvF,MAAM,cAAc,EAAE,CAAC;QACzB,CAAC,EACD,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAC9B,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/C,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,gBAAgB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,WAAW,CAAC,2BAA2B,EAAE,oCAAoC,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;QACtD,MAAM,WAAW,CACf,2BAA2B,EAC3B,aAAa,mBAAmB,yCAAyC,EACzE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC,CAAC;IACJ,CAAC;IACD,8FAA8F;IAC9F,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACpG,CAAC;AAED,KAAK,UAAU,cAAc;IAC3B,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC,SAAS,EAAE,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC5F,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,WAAW,CAAC,qBAAqB,EAAE,wBAAwB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClG,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,4EAA4E;IAC5E,6DAA6D;IAC7D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,GAAG,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,SAAS,EAAE,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAC3F,CAAC;IACF,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7D,MAAM,WAAW,CAAC,iBAAiB,EAAE,iCAAiC,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,WAAW,CACf,oBAAoB,EACpB,2BAA2B,EAC3B,mBAAmB,CAAC,MAAM,CAAC,CAC5B,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,0BAA0B;IACxC,2FAA2F;IAC3F,gDAAgD;IAChD,OAAO,cAAc,CAAC,eAAe,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,kBAAkB;IAC/B,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC,SAAS,EAAE,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC5F,sEAAsE;IACtE,yEAAyE;IACzE,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,WAAW,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;IAClD,OAAO,EAAE,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,EAAE,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,gCAAgC;IAC9C,eAAe,CAAC,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,OAAO;QACL,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,qBAAqB;QAC3B,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,oEAAoE;QAC7E,GAAG,EAAE,MAAM;KACZ,CAAC;AACJ,CAAC"}
+{"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"}