@with-logic/elwood 0.1.2 → 0.2.0

package/dist/runtime/session/base.js

@@ -4,29 +4,61 @@
  * interrupt/compact, the model picker, and recurring loops — layered over the
  * lifecycle core in `lifecycle.ts`. Implements PRD §5.3, §5.7, §5.9.
  */
+import { toError } from "../../core/errors.js";
+import { sessionImageBudget } from "../../core/images/queued-budget.js";
+import { writeQueuedInput } from "../../core/input/index.js";
+import { submissionControlOptions } from "../../core/input/submission-cancel.js";
+import { isPickerIntervention } from "../../core/models/intervention.js";
+import { submissionAttempt } from "../../core/simple/submission-context.js";
+import { assertStopInput } from "../../core/stop-input.js";
+import { currentRenderedFrame } from "../../terminal/cursor.js";
 import { CommandSurface } from "./commands.js";
-import { enqueueSubmission, QueuedImageBudget, } from "./image-attach.js";
-import { SessionLifecycle } from "./lifecycle.js";
+import { enqueueSubmission, } from "./image-attach.js";
+import { PickerInputOwnership } from "./picker-input.js";
+import { QuestionSessionBase } from "./questions.js";
 import { applyResize, restoreHeldResize } from "./resize.js";
-export class AgentSessionBase extends SessionLifecycle {
+export class AgentSessionBase extends QuestionSessionBase {
     commands;
-    imageBudget = new QueuedImageBudget();
     constructor(agent, record, stateDir, runtime, pty, terminal, statusEvents, terminalReplay, loopDefinitions) {
-        super(agent, record, stateDir, runtime, pty, terminal, statusEvents, terminalReplay, loopDefinitions);
+        const ownership = new PickerInputOwnership(terminal);
+        super(agent, record, stateDir, runtime, pty, ownership, statusEvents, terminalReplay, loopDefinitions);
         // `picker` is a subclass field initializer that runs AFTER this constructor, so the
         // surface resolves it per call rather than capturing it here.
         this.commands = new CommandSurface({
-            terminal,
+            terminal: ownership.automated,
+            inputSignal: () => ownership.signal(),
+            observeRendered: (listener) => {
+                terminal.xterm.onWriteParsed(listener);
+            },
             statusEvents,
             status: () => this.status,
             everReady: () => this.everReady,
-            blocked: () => this.isInputBlocked(),
+            blocked: () => super.isInputBlocked(),
             picker: () => this.picker,
-            submit: (command, kind, signal) => this.controlQueue.send(command, kind, undefined, {
-                cancel: { signal, error: () => signal.reason },
-            }),
+            controlQueue: this.controlQueue,
+            submitDirect: (command, signal) => writeQueuedInput(ownership.automated, command, "command", {
+                ...this.pasteGuard,
+                blocked: () => isPickerIntervention(signal.reason) || this.queuedInputBlocked(),
+            }, signal),
         });
     }
+    /** Every queued writer also holds on a model dialog that outlived its cleanup (C-API-55). */
+    isInputBlocked() {
+        return super.isInputBlocked() || this.commands.blocksInput();
+    }
+    /**
+     * Writes that are NOT part of a picker transaction (`/login` recovery) must additionally
+     * stand off a model dialog a human opened. It is deliberately not part of
+     * `isInputBlocked`: that feeds readiness, and suppressing readiness while any picker is
+     * visible would deadlock Elwood's own picker, whose dialog is on screen by design.
+     */
+    foreignDialogBlocksWrite() {
+        return this.commands.foreignDialogVisible();
+    }
+    /** Ordinary queued text and attachments cannot drive a model dialog that they did not open. */
+    queuedInputBlocked() {
+        return this.isInputBlocked() || this.foreignDialogBlocksWrite();
+    }
     sendPrompt(prompt, options) {
         return this.enqueue(prompt, "prompt", options);
     }
@@ -46,6 +78,7 @@ export class AgentSessionBase extends SessionLifecycle {
         return this.inSession(() => applyResize(this.pty, this.terminal, size));
     }
     interrupt(options) {
+        this.revokeQuestionAnswer();
         return this.inSession(() => this.commands.interrupt(options));
     }
     compact(options) {
@@ -54,8 +87,8 @@ export class AgentSessionBase extends SessionLifecycle {
     listModels(options) {
         return this.inSession(() => this.commands.listModels(options));
     }
-    setModel(id, options) {
-        return this.inSession(() => this.commands.setModel(id, options));
+    setModel(id, options, around) {
+        return this.inSession(() => this.commands.setModel(id, options, around));
     }
     createLoop(request) {
         return this.inSession(() => this.loops.create(request));
@@ -66,14 +99,35 @@ export class AgentSessionBase extends SessionLifecycle {
     cancelLoop(loopId) {
         return this.inSession(() => this.loops.cancel(loopId), true);
     }
+    /** A stable completed frame only when the native composer is positively empty (C-API-56). */
+    emptyComposerFrame() {
+        const frame = currentRenderedFrame(this.terminal);
+        return frame && this.composerIsEmpty(frame.text) ? frame : undefined;
+    }
+    composerIsEmpty(text) {
+        return this.picker.isClear(text);
+    }
     /** Re-apply a resize that was held during startup (a best-effort restore). */
     restoreHeldSize(size) {
         void restoreHeldResize(this.pty, this.terminal, size);
     }
     enqueue(input, kind, options) {
+        try {
+            assertStopInput(this);
+        }
+        catch (error) {
+            return Promise.reject(toError(error));
+        }
+        const attempt = submissionAttempt(this);
+        const control = {
+            ...submissionControlOptions(options),
+            ...(attempt ? { beforeEnter: attempt.beforeEnter } : {}),
+        };
         const driver = (paths, signal) => this.attachImages(paths, signal);
-        const send = (attach) => this.controlQueue.send(input, kind, attach);
-        return this.inSession(() => enqueueSubmission(options?.images, driver, send, this.imageBudget));
+        const send = (attach) => this.controlQueue.send(input, kind, attach, control);
+        // Looked up per call: a facade that launched this session shares ITS budget (C-API-44).
+        const budget = sessionImageBudget(this);
+        return this.inSession(() => enqueueSubmission(options?.images, driver, send, budget));
     }
 }
 //# sourceMappingURL=base.js.map

package/dist/runtime/session/base.js.map

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

package/dist/runtime/session/commands.d.ts

@@ -6,6 +6,7 @@
  * the `compact` and `/model` picker commands (which do go through submission).
  * Implements PRD §5.3.
  */
+import type { ControlQueue } from "../../core/control-queue/index.ts";
 import { type ModelPickerSpec } from "../../core/models/picker.ts";
 import type { AgentModelOption } from "../../core/models/rows.ts";
 import type { ScreenTerminal } from "../../core/models/tui-screen.ts";
@@ -27,18 +28,31 @@ export type CommandSurfaceDeps = {
     readonly everReady: () => boolean;
     readonly blocked: () => boolean;
     readonly picker: () => ModelPickerSpec;
-    readonly submit: (command: string, kind: "compact" | "list_models" | "set_model", signal: AbortSignal) => Promise<void>;
+    readonly controlQueue: ControlQueue;
+    readonly observeRendered?: (listener: () => void) => void;
+    readonly inputSignal?: () => AbortSignal;
+    readonly submitDirect: (command: string, signal: AbortSignal) => Promise<void>;
 };
 /** Builds each command's interrupt/compact/picker closures from the injected primitives. */
 export declare class CommandSurface {
     private readonly deps;
+    private readonly picker;
     private interrupting;
     constructor(deps: CommandSurfaceDeps);
     interrupt(options?: Timeout): Promise<void>;
     compact(options?: Timeout): Promise<void>;
     listModels(options?: Timeout): Promise<readonly AgentModelOption[]>;
-    setModel(id: string, options?: Timeout): Promise<void>;
-    private io;
+    /**
+     * `around` lets an adapter wrap the picker flow in its own transaction (Codex's
+     * process-wide `config.toml` lock) INSIDE the queue slot. Acquiring that lock before
+     * the slot would let a following `sendMessage` dispatch first and send under the old
+     * model — the slot is what preserves FIFO ordering, so it must be claimed first.
+     * The wrapper receives the same deadline/termination signal as the picker flow.
+     */
+    setModel(id: string, options?: Timeout, around?: (flow: () => Promise<void>, signal: AbortSignal) => Promise<void>): Promise<void>;
+    blocksInput(): boolean;
+    /** A model dialog nobody here opened; a non-picker WRITE must be withheld while it is up. */
+    foreignDialogVisible(): boolean;
 }
 export {};
 //# sourceMappingURL=commands.d.ts.map

package/dist/runtime/session/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAGL,KAAK,eAAe,EAGrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,eAAe,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,CACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,EAC7C,MAAM,EAAE,WAAW,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAEF,4FAA4F;AAC5F,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAI1C,OAAO,CAAC,YAAY,CAA4B;gBAEpC,IAAI,EAAE,kBAAkB;IAIpC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB3C,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,gBAAgB,EAAE,CAAC;IAInE,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,OAAO,CAAC,EAAE;CAOX"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAItE,OAAO,EAEL,KAAK,eAAe,EAGrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAwB,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAW/D,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,eAAe,CAAC;IACvC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChF,CAAC;AAEF,4FAA4F;AAC5F,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAI5C,OAAO,CAAC,YAAY,CAA4B;gBAEpC,IAAI,EAAE,kBAAkB;IAKpC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB3C,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCzC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,gBAAgB,EAAE,CAAC;IAQnE;;;;;;OAMG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GACzE,OAAO,CAAC,IAAI,CAAC;IAShB,WAAW,IAAI,OAAO;IAItB,6FAA6F;IAC7F,oBAAoB,IAAI,OAAO;CAGhC"}

package/dist/runtime/session/commands.js

@@ -7,18 +7,30 @@
  * Implements PRD §5.3.
  */
 import { compactCommand, sessionCompact } from "../../core/compact.js";
+import { holdWhileUnsafe } from "../../core/input/abort.js";
 import { ignoreInputFailure } from "../../core/input/index.js";
 import { interruptKey, sessionInterrupt } from "../../core/interrupt.js";
 import { listPickerModels, pickerTimeout, setPickerModel, } from "../../core/models/picker.js";
+import { PickerTransactions } from "./picker.js";
+/**
+ * Compact's recovery Enter asks a different question from a picker transaction's: not
+ * "is this OUR dialog" but "is there ANY model dialog here that Enter would apply". It
+ * has no transaction of its own, so it supplies authority to get the grammar's answer and
+ * then REFUSES to write on it — the opposite of driving it. Naming it separately keeps
+ * that distinction visible rather than looking like a borrowed `opened: true`.
+ */
+const anyDialog = { opened: true };
 /** Builds each command's interrupt/compact/picker closures from the injected primitives. */
 export class CommandSurface {
     deps;
+    picker;
     // Coalesces concurrent interrupts: a second call while one is in flight joins
     // the first rather than writing a second Escape, which could land on the now
     // idle composer after the first cancels the turn (a non-neutral keystroke).
     interrupting;
     constructor(deps) {
         this.deps = deps;
+        this.picker = new PickerTransactions(deps);
     }
     interrupt(options) {
         if (this.interrupting)
@@ -34,25 +46,60 @@ export class CommandSurface {
     }
     compact(options) {
         const pending = new AbortController();
-        const submit = () => this.deps.submit(compactCommand, "compact", pending.signal);
-        const nudge = () => {
-            if (!this.deps.blocked())
-                ignoreInputFailure(this.deps.terminal.sendInput("\r"));
+        const cancel = { signal: pending.signal, error: () => pending.signal.reason };
+        const submit = () => this.deps.controlQueue.send(compactCommand, "compact", undefined, { cancel });
+        const { terminal, blocked } = this.deps;
+        /**
+         * The recovery Enter needs BOTH protections, for two different hazards.
+         *
+         * It runs as a queued operation (C-API-55) so it waits behind a model operation that
+         * owns the queue, rather than landing in that operation's picker or being skipped for
+         * good; and once it holds the slot it still decides on everything RECEIVED rather than
+         * the last rendered frame (C-API-56), because a dialog can already be in the PTY buffer
+         * while the observed screen is still the composer. An Enter on any model dialog — one
+         * that survived cleanup, or a human's — would apply that dialog's highlighted option.
+         */
+        const enter = async (closed) => {
+            // BOTH signals: `pending` ends when compaction settles, `closed` when the queue slot
+            // is revoked (session shutdown). Waiting only on `pending` would leave the hold and
+            // the write running against a dying PTY after the slot was taken away.
+            const live = AbortSignal.any([pending.signal, closed]);
+            await holdWhileUnsafe(terminal, { blocked }, live);
+            if (live.aborted)
+                return;
+            if (this.deps.picker().activeDialog(terminal.snapshot().text, anyDialog) !== undefined)
+                return;
+            await terminal.sendInput("\r");
         };
+        const nudge = () => ignoreInputFailure(this.deps.controlQueue.runExclusive("compact", enter, cancel));
         return sessionCompact(this.deps.statusEvents, submit, nudge, options?.timeoutMs).finally(() => pending.abort());
     }
     listModels(options) {
-        return listPickerModels(this.io("list_models"), this.deps.picker(), pickerTimeout(options));
+        const spec = this.deps.picker();
+        const timeoutMs = pickerTimeout(options);
+        return this.picker.run("list_models", spec, timeoutMs, (io) => listPickerModels(io, spec, timeoutMs));
     }
-    setModel(id, options) {
-        return setPickerModel(this.io("set_model"), this.deps.picker(), id, pickerTimeout(options));
+    /**
+     * `around` lets an adapter wrap the picker flow in its own transaction (Codex's
+     * process-wide `config.toml` lock) INSIDE the queue slot. Acquiring that lock before
+     * the slot would let a following `sendMessage` dispatch first and send under the old
+     * model — the slot is what preserves FIFO ordering, so it must be claimed first.
+     * The wrapper receives the same deadline/termination signal as the picker flow.
+     */
+    setModel(id, options, around) {
+        const spec = this.deps.picker();
+        const timeoutMs = pickerTimeout(options);
+        return this.picker.run("set_model", spec, timeoutMs, (io, signal) => {
+            const flow = () => setPickerModel(io, spec, id, timeoutMs);
+            return around ? around(flow, signal) : flow();
+        });
     }
-    io(kind) {
-        return {
-            terminal: this.deps.terminal,
-            blocked: this.deps.blocked,
-            submit: (c, signal) => this.deps.submit(c, kind, signal),
-        };
+    blocksInput() {
+        return this.picker.blocksInput();
+    }
+    /** A model dialog nobody here opened; a non-picker WRITE must be withheld while it is up. */
+    foreignDialogVisible() {
+        return this.picker.foreignDialogVisible();
     }
 }
 //# sourceMappingURL=commands.js.map

package/dist/runtime/session/commands.js.map

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

package/dist/runtime/session/foreign-picker.d.ts

@@ -0,0 +1,8 @@
+/** Preserve a foreign model-dialog hold until positive composer clearance (C-API-55). */
+import type { ModelPickerSpec } from "../../core/models/picker.ts";
+export declare class ForeignPickerHold {
+    private held;
+    private clearStreak;
+    observe(text: string, spec: ModelPickerSpec): boolean;
+}
+//# sourceMappingURL=foreign-picker.d.ts.map

package/dist/runtime/session/foreign-picker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"foreign-picker.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/foreign-picker.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,WAAW,CAAK;IAExB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO;CAUtD"}

package/dist/runtime/session/foreign-picker.js

@@ -0,0 +1,18 @@
+import { clearFrames } from "./picker-cleanup.js";
+export class ForeignPickerHold {
+    held = false;
+    clearStreak = 0;
+    observe(text, spec) {
+        if (spec.isCandidate(text)) {
+            this.held = true;
+            this.clearStreak = 0;
+        }
+        else if (this.held) {
+            this.clearStreak = spec.isClear(text) ? this.clearStreak + 1 : 0;
+            if (this.clearStreak >= clearFrames)
+                this.held = false;
+        }
+        return this.held;
+    }
+}
+//# sourceMappingURL=foreign-picker.js.map

package/dist/runtime/session/foreign-picker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"foreign-picker.js","sourceRoot":"","sources":["../../../src/runtime/session/foreign-picker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,OAAO,iBAAiB;IACpB,IAAI,GAAG,KAAK,CAAC;IACb,WAAW,GAAG,CAAC,CAAC;IAExB,OAAO,CAAC,IAAY,EAAE,IAAqB;QACzC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,IAAI,CAAC,WAAW,IAAI,WAAW;gBAAE,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF"}

package/dist/runtime/session/frames.d.ts

@@ -0,0 +1,27 @@
+import { type RenderedObservers } from "../../core/rendered-observers.ts";
+import type { RenderedFrame } from "../../core/screen-facts.ts";
+import type { TrustClearance } from "../../core/trust/clearance.ts";
+import type { SessionLifecycle } from "./lifecycle.ts";
+import type { ReadinessGate } from "./readiness.ts";
+type FrameSession = Pick<SessionLifecycle, "closing" | "inputBlocking" | "trustInputBlocking" | "submitEvidence" | "status">;
+type TrustState = {
+    readonly inputBlocking: boolean;
+    readonly blockedPrompt: string | undefined;
+    dispose(): void;
+    observeClearance?(frame: string): void;
+};
+/** Timers and PTY frames use the same guards, facts, and attention edge owner. */
+export declare function createSessionFrameObserver(observers: RenderedObservers, session: () => FrameSession | undefined, trust: () => TrustState, readiness: ReadinessGate, isIdleComposer: TrustClearance): {
+    refresh: () => void;
+    observe: (current: RenderedFrame) => void;
+    /**
+     * Blocking evidence is ignored while `starting`, yet that frame already spent the
+     * attention edge. Once live, block on a still-visible gate AND announce it, so a
+     * startup gate never yields `blocked` without its human-decision activity (C-ATTN-03).
+     */
+    blockOnceLive: (active: FrameSession) => void;
+};
+/** Cancel automation synchronously before signaling or disposing its PTY. */
+export declare function bindStartupLifetime(session: Pick<SessionLifecycle, "closing" | "bindInitialReadinessHold">, trust: TrustState, readiness: ReadinessGate): void;
+export {};
+//# sourceMappingURL=frames.d.ts.map

package/dist/runtime/session/frames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"frames.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/frames.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,KAAK,YAAY,GAAG,IAAI,CACtB,gBAAgB,EAChB,SAAS,GAAG,eAAe,GAAG,oBAAoB,GAAG,gBAAgB,GAAG,QAAQ,CACjF,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,OAAO,IAAI,IAAI,CAAC;IAChB,gBAAgB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,kFAAkF;AAClF,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,MAAM,YAAY,GAAG,SAAS,EACvC,KAAK,EAAE,MAAM,UAAU,EACvB,SAAS,EAAE,aAAa,EACxB,cAAc,EAAE,cAAc;;uBAoDT,aAAa;IAIhC;;;;OAIG;4BACqB,YAAY;EAOvC;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,0BAA0B,CAAC,EACvE,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,aAAa,GACvB,IAAI,CAUN"}

package/dist/runtime/session/frames.js

@@ -0,0 +1,80 @@
+/** Session-owned frame and trust-deadline observation (PRD §5.3/§5.4, C-TRUST-01). */
+import { activityFromAttention, blockingRuleIds } from "../../core/attention.js";
+import { observeRenderedReading, readRenderedFrame, } from "../../core/rendered-observers.js";
+import { createAttentionClearance } from "./attention-clearance.js";
+/** Timers and PTY frames use the same guards, facts, and attention edge owner. */
+export function createSessionFrameObserver(observers, session, trust, readiness, isIdleComposer) {
+    const attentionClearance = createAttentionClearance(isIdleComposer);
+    let frame;
+    let ruleIds = [];
+    let pendingAutomationClearance = false;
+    const replayAutomationClearance = (active, facts) => {
+        if (pendingAutomationClearance &&
+            active.status === "blocked" &&
+            !active.trustInputBlocking &&
+            !active.inputBlocking &&
+            (facts.working_visible || facts.composer_visible)) {
+            if (facts.working_visible)
+                observers.turn.adoptWorkingClearance(facts);
+            active.submitEvidence("blocking_prompt_cleared", facts.working_visible);
+        }
+        if (active.status !== "blocked")
+            pendingAutomationClearance = false;
+    };
+    const refresh = () => {
+        const active = session();
+        if (active === undefined || active.closing.signal.aborted || frame === undefined)
+            return;
+        const state = trust();
+        const reading = attentionClearance(readRenderedFrame(observers, frame, state.blockedPrompt, state.inputBlocking), frame.text, state.inputBlocking);
+        const released = active.trustInputBlocking && !state.inputBlocking;
+        active.trustInputBlocking = state.inputBlocking;
+        active.inputBlocking =
+            reading.facts.blocking_prompt_visible ||
+                (active.inputBlocking && !reading.facts.working_visible && !reading.facts.composer_visible);
+        const currentRuleIds = blockingRuleIds(reading);
+        if (currentRuleIds.length > 0 || !active.inputBlocking)
+            ruleIds = currentRuleIds;
+        if (released && active.status === "blocked")
+            pendingAutomationClearance = true;
+        // Settle automation against this frame before evidence/readiness releases input.
+        state.observeClearance?.(frame.text);
+        // Publish this frame's hold before evidence listeners can submit readiness.
+        readiness.observeFrameHold(reading.facts, active.trustInputBlocking);
+        readiness.ready.armDeadline();
+        try {
+            observeRenderedReading(observers, reading, active);
+            // Automation can consume the human clear edge. Retain its replay until a
+            // positive frame shows either resumed work or an idle composer.
+            replayAutomationClearance(active, reading.facts);
+        }
+        finally {
+            readiness.observeReadinessFrame(reading.facts, active.trustInputBlocking);
+        }
+    };
+    return {
+        refresh,
+        observe: (current) => {
+            frame = current;
+            refresh();
+        },
+        /**
+         * Blocking evidence is ignored while `starting`, yet that frame already spent the
+         * attention edge. Once live, block on a still-visible gate AND announce it, so a
+         * startup gate never yields `blocked` without its human-decision activity (C-ATTN-03).
+         */
+        blockOnceLive: (active) => {
+            if (active.inputBlocking && active.submitEvidence("blocking_prompt_shown").to === "blocked")
+                observers.emitActivity(activityFromAttention(observers.agent, observers.elwoodSessionId, ruleIds));
+        },
+    };
+}
+/** Cancel automation synchronously before signaling or disposing its PTY. */
+export function bindStartupLifetime(session, trust, readiness) {
+    session.bindInitialReadinessHold(readiness.isHeld);
+    session.closing.signal.addEventListener("abort", () => {
+        trust.dispose();
+        readiness.ready.cancel();
+    }, { once: true });
+}
+//# sourceMappingURL=frames.js.map

package/dist/runtime/session/frames.js.map

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

package/dist/runtime/session/image-attach.d.ts

@@ -9,20 +9,9 @@
  * (never wedging the queue) and pending submissions accumulate no temp-disk usage.
  * Implements PRD §5.3 (C-API-44).
  */
-import { type ImageInput } from "../../core/images/types.ts";
-/**
- * A per-session aggregate byte budget for image clones held across ALL not-yet-attached
- * queued submissions. Reserved synchronously when a submission's bytes are cloned and
- * released when it settles, so a slow paste can't let a caller retain gigabytes of
- * queued clones (C-API-44).
- */
-export declare class QueuedImageBudget {
-    private used;
-    private readonly ceiling;
-    constructor(ceiling?: number);
-    reserve(bytes: number): void;
-    release(bytes: number): void;
-}
+import type { QueuedImageBudget } from "../../core/images/queued-budget.ts";
+export { QueuedImageBudget } from "../../core/images/queued-budget.ts";
+import type { ImageInput } from "../../core/images/types.ts";
 /** A text-submission kind carried by the control queue. */
 export type SubmitKind = "prompt" | "message" | "guidance";
 /** An attach step run inside a queued op, before the text write. */
@@ -41,5 +30,4 @@ type QueueSend = (attach?: AttachTask) => Promise<void>;
  * synchronous throw out of the send API (C-API-44).
  */
 export declare function enqueueSubmission(images: readonly ImageInput[] | undefined, driver: AttachDriver, send: QueueSend, budget?: QueuedImageBudget): Promise<void>;
-export {};
 //# sourceMappingURL=image-attach.d.ts.map

package/dist/runtime/session/image-attach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-attach.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/image-attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,4BAA4B,CAAC;AAE1E;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBACrB,OAAO,SAA6B;IAGhD,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK5B,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAG7B;AAED,2DAA2D;AAC3D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAE3D,oEAAoE;AACpE,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhE,mFAAmF;AACnF,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5F,qFAAqF;AACrF,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAExD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,EACzC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"image-attach.d.ts","sourceRoot":"","sources":["../../../src/runtime/session/image-attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAQvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,2DAA2D;AAC3D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAE3D,oEAAoE;AACpE,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhE,mFAAmF;AACnF,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5F,qFAAqF;AACrF,KAAK,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAExD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,EACzC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/runtime/session/image-attach.js

@@ -9,30 +9,9 @@
  * (never wedging the queue) and pending submissions accumulate no temp-disk usage.
  * Implements PRD §5.3 (C-API-44).
  */
-import { elwoodError } from "../../core/errors.js";
+import { capturedImageSnapshot } from "../../core/images/capture.js";
+export { QueuedImageBudget } from "../../core/images/queued-budget.js";
 import { materializeImages, snapshotImages, validateImagePaths, } from "../../core/images/index.js";
-import { imageLimits } from "../../core/images/types.js";
-/**
- * A per-session aggregate byte budget for image clones held across ALL not-yet-attached
- * queued submissions. Reserved synchronously when a submission's bytes are cloned and
- * released when it settles, so a slow paste can't let a caller retain gigabytes of
- * queued clones (C-API-44).
- */
-export class QueuedImageBudget {
-    used = 0;
-    ceiling;
-    constructor(ceiling = imageLimits.maxQueuedBytes) {
-        this.ceiling = ceiling;
-    }
-    reserve(bytes) {
-        if (this.used + bytes > this.ceiling)
-            throw elwoodError("invalid_image", "Too many queued image bytes for this session.");
-        this.used += bytes;
-    }
-    release(bytes) {
-        this.used = Math.max(0, this.used - bytes);
-    }
-}
 /**
  * Queues a text submission, optionally attaching `images`. With no images it is a
  * plain `send()`; the queue call happens synchronously so a later plain submission
@@ -50,22 +29,25 @@ export function enqueueSubmission(images, driver, send, budget) {
     if (images === undefined)
         return send();
     let snapshot;
+    const captured = capturedImageSnapshot(images);
+    // A facade already owns and budgets these private immutable copies.
+    const reservation = captured === undefined ? budget : undefined;
     try {
-        snapshot = snapshotImages(images); // validates shape + clones bytes at the call
-        budget?.reserve(snapshot.inlineByteTotal); // reserve the clone bytes vs the session ceiling
+        snapshot = captured ?? snapshotImages(images); // validates shape + clones bytes at the call
+        reservation?.reserve(snapshot.inlineByteTotal); // reserve the clone bytes vs the session ceiling
     }
     catch (error) {
         return Promise.reject(error);
     }
     const bytes = snapshot.inlineByteTotal;
     if (snapshot.images.length === 0) {
-        budget?.release(bytes); // nothing to attach: give the reservation back
+        reservation?.release(bytes); // nothing to attach: give the reservation back
         return send();
     }
     // Release on EVERY settle path (attach done, reject, or the op never dispatching), so
     // the clone memory is always accounted back even when a session closes mid-queue.
     const done = send((signal) => runAttach(snapshot, driver, signal));
-    done.finally(() => budget?.release(bytes)).catch(() => undefined);
+    done.finally(() => reservation?.release(bytes)).catch(() => undefined);
     return done;
 }
 /** Validate paths (async) → materialize → drive the adapter attach → clean up temp files. */

package/dist/runtime/session/image-attach.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-attach.js","sourceRoot":"","sources":["../../../src/runtime/session/image-attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAEL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAmB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,OAAO,iBAAiB;IACpB,IAAI,GAAG,CAAC,CAAC;IACA,OAAO,CAAS;IACjC,YAAY,OAAO,GAAG,WAAW,CAAC,cAAc;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IACD,OAAO,CAAC,KAAa;QACnB,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO;YAClC,MAAM,WAAW,CAAC,eAAe,EAAE,+CAA+C,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,KAAa;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IAC7C,CAAC;CACF;AAcD;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAyC,EACzC,MAAoB,EACpB,IAAe,EACf,MAA0B;IAE1B,iFAAiF;IACjF,iFAAiF;IACjF,gFAAgF;IAChF,0DAA0D;IAC1D,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,EAAE,CAAC;IACxC,IAAI,QAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,6CAA6C;QAChF,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,iDAAiD;IAC9F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC;IACvC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,+CAA+C;QACvE,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IACD,sFAAsF;IACtF,kFAAkF;IAClF,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAClE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,6FAA6F;AAC7F,KAAK,UAAU,SAAS,CACtB,QAAuB,EACvB,MAAoB,EACpB,MAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACT,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}
+{"version":3,"file":"image-attach.js","sourceRoot":"","sources":["../../../src/runtime/session/image-attach.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAEL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AAepC;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAyC,EACzC,MAAoB,EACpB,IAAe,EACf,MAA0B;IAE1B,iFAAiF;IACjF,iFAAiF;IACjF,gFAAgF;IAChF,0DAA0D;IAC1D,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,EAAE,CAAC;IACxC,IAAI,QAAuB,CAAC;IAC5B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC/C,oEAAoE;IACpE,MAAM,WAAW,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,IAAI,CAAC;QACH,QAAQ,GAAG,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,6CAA6C;QAC5F,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,iDAAiD;IACnG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC;IACvC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,+CAA+C;QAC5E,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IACD,sFAAsF;IACtF,kFAAkF;IAClF,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACvE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,6FAA6F;AAC7F,KAAK,UAAU,SAAS,CACtB,QAAuB,EACvB,MAAoB,EACpB,MAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACT,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}