@deepseek-harness-tui/dsh-tui 0.8.8 → 0.9.1

package/lib/types/ink/events/click-event.d.ts

@@ -1,25 +1,16 @@
-import { Event } from './event.js';
+import { PointerEvent, type PointerEventInit } from './pointer-event.js';
 /**
  * Mouse click event. Fired on left-button release without drag, only when
  * mouse tracking is enabled (i.e. inside <AlternateScreen>).
  *
  * Bubbles from the deepest hit node up through parentNode. Call
  * stopImmediatePropagation() to prevent ancestors' onClick from firing.
+ *
+ * Extends PointerEvent: `shift`/`alt`/`ctrl` expose the modifiers the
+ * terminal reported on the release, and `localCol`/`localRow` are recomputed
+ * per handler so containers see coordinates relative to themselves.
  */
-export declare class ClickEvent extends Event {
-    /** 0-indexed screen column of the click */
-    readonly col: number;
-    /** 0-indexed screen row of the click */
-    readonly row: number;
-    /**
-     * Click column relative to the current handler's Box (col - box.x).
-     * Recomputed by dispatchClick before each handler fires, so an onClick
-     * on a container sees coords relative to that container, not to any
-     * child the click landed on.
-     */
-    localCol: number;
-    /** Click row relative to the current handler's Box (row - box.y). */
-    localRow: number;
+export declare class ClickEvent extends PointerEvent {
     /**
      * True if the clicked cell has no visible content (unwritten in the
      * screen buffer — both packed words are 0). Handlers can check this to
@@ -27,6 +18,6 @@ export declare class ClickEvent extends Event {
      * clicks on empty terminal space don't toggle state.
      */
     readonly cellIsBlank: boolean;
-    constructor(col: number, row: number, cellIsBlank: boolean);
+    constructor(col: number, row: number, cellIsBlank: boolean, init?: PointerEventInit);
 }
 //# sourceMappingURL=click-event.d.ts.map

package/lib/types/ink/events/click-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"click-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/click-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC,2CAA2C;IAC3C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,wCAAwC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB;;;;;OAKG;IACH,QAAQ,SAAI;IACZ,qEAAqE;IACrE,QAAQ,SAAI;IACZ;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;gBAEjB,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO;CAM3D"}
+{"version":3,"file":"click-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/click-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAExE;;;;;;;;;;GAUG;AACH,qBAAa,UAAW,SAAQ,YAAY;IAC1C;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;gBAG3B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,EACpB,IAAI,CAAC,EAAE,gBAAgB;CAa1B"}

package/lib/types/ink/events/click-event.js

@@ -1,25 +1,16 @@
-import { Event } from './event.js';
+import { PointerEvent } from './pointer-event.js';
 /**
  * Mouse click event. Fired on left-button release without drag, only when
  * mouse tracking is enabled (i.e. inside <AlternateScreen>).
  *
  * Bubbles from the deepest hit node up through parentNode. Call
  * stopImmediatePropagation() to prevent ancestors' onClick from firing.
+ *
+ * Extends PointerEvent: `shift`/`alt`/`ctrl` expose the modifiers the
+ * terminal reported on the release, and `localCol`/`localRow` are recomputed
+ * per handler so containers see coordinates relative to themselves.
  */
-export class ClickEvent extends Event {
-    /** 0-indexed screen column of the click */
-    col;
-    /** 0-indexed screen row of the click */
-    row;
-    /**
-     * Click column relative to the current handler's Box (col - box.x).
-     * Recomputed by dispatchClick before each handler fires, so an onClick
-     * on a container sees coords relative to that container, not to any
-     * child the click landed on.
-     */
-    localCol = 0;
-    /** Click row relative to the current handler's Box (row - box.y). */
-    localRow = 0;
+export class ClickEvent extends PointerEvent {
     /**
      * True if the clicked cell has no visible content (unwritten in the
      * screen buffer — both packed words are 0). Handlers can check this to
@@ -27,10 +18,16 @@ export class ClickEvent extends Event {
      * clicks on empty terminal space don't toggle state.
      */
     cellIsBlank;
-    constructor(col, row, cellIsBlank) {
-        super();
-        this.col = col;
-        this.row = row;
+    constructor(col, row, cellIsBlank, init) {
+        // A click is by definition a left-button release without drag. Normalize
+        // the low button bits to 0 (left) while preserving modifier bits
+        // (0x04 shift / 0x08 alt / 0x10 ctrl) from the release byte.
+        const button = init?.button ?? 0;
+        super('click', col, row, {
+            ...init,
+            action: 'release',
+            button: button & ~0x03,
+        });
         this.cellIsBlank = cellIsBlank;
     }
 }

package/lib/types/ink/events/event-handlers.d.ts

@@ -2,13 +2,22 @@ import type { ClickEvent } from './click-event.js';
 import type { FocusEvent } from './focus-event.js';
 import type { KeyboardEvent } from './keyboard-event.js';
 import type { PasteEvent } from './paste-event.js';
+import type { PointerEvent } from './pointer-event.js';
 import type { ResizeEvent } from './resize-event.js';
+import type { WheelEvent } from './wheel-event.js';
 type KeyboardEventHandler = (event: KeyboardEvent) => void;
 type FocusEventHandler = (event: FocusEvent) => void;
 type PasteEventHandler = (event: PasteEvent) => void;
 type ResizeEventHandler = (event: ResizeEvent) => void;
 type ClickEventHandler = (event: ClickEvent) => void;
-type HoverEventHandler = () => void;
+/**
+ * Hover handlers receive the pointer position. Existing `() => void`
+ * handlers remain assignable (a function taking fewer parameters is
+ * assignable to one taking more), so this widening is fully backwards
+ * compatible.
+ */
+type HoverEventHandler = (event: PointerEvent) => void;
+type WheelEventHandler = (event: WheelEvent) => void;
 /**
  * Props for event handlers on Box and other host components.
  *
@@ -29,6 +38,7 @@ export type EventHandlerProps = {
     onClick?: ClickEventHandler;
     onMouseEnter?: HoverEventHandler;
     onMouseLeave?: HoverEventHandler;
+    onWheel?: WheelEventHandler;
 };
 /**
  * Reverse lookup: event type string → handler prop names.

package/lib/types/ink/events/event-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-handlers.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/event-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,KAAK,oBAAoB,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;AAC1D,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD,KAAK,kBAAkB,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;AACtD,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD,KAAK,iBAAiB,GAAG,MAAM,IAAI,CAAA;AAEnC;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IAEvC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAClC,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAEjC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAElC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAE7B,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAA;IAChC,YAAY,CAAC,EAAE,iBAAiB,CAAA;CACjC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,MAAM,EACN;IAAE,MAAM,CAAC,EAAE,MAAM,iBAAiB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,iBAAiB,CAAA;CAAE,CAQxE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,aAa9B,CAAA"}
+{"version":3,"file":"event-handlers.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/event-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,KAAK,oBAAoB,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;AAC1D,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD,KAAK,kBAAkB,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;AACtD,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AACpD;;;;;GAKG;AACH,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;AACtD,KAAK,iBAAiB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;AAEpD;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IAEvC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAClC,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAEjC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAElC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAE7B,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAA;IAChC,YAAY,CAAC,EAAE,iBAAiB,CAAA;IAChC,OAAO,CAAC,EAAE,iBAAiB,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,MAAM,EACN;IAAE,MAAM,CAAC,EAAE,MAAM,iBAAiB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,iBAAiB,CAAA;CAAE,CASxE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,aAc9B,CAAA"}

package/lib/types/ink/events/event-handlers.js

@@ -9,6 +9,7 @@ export const HANDLER_FOR_EVENT = {
     paste: { bubble: 'onPaste', capture: 'onPasteCapture' },
     resize: { bubble: 'onResize' },
     click: { bubble: 'onClick' },
+    wheel: { bubble: 'onWheel' },
 };
 /**
  * Set of all event handler prop names, for the reconciler to detect
@@ -27,4 +28,5 @@ export const EVENT_HANDLER_PROPS = new Set([
     'onClick',
     'onMouseEnter',
     'onMouseLeave',
+    'onWheel',
 ]);

package/lib/types/ink/events/input-event.d.ts

@@ -13,6 +13,8 @@ export type Key = {
     pageUp: boolean;
     wheelUp: boolean;
     wheelDown: boolean;
+    wheelLeft: boolean;
+    wheelRight: boolean;
     home: boolean;
     end: boolean;
     return: boolean;
@@ -25,6 +27,13 @@ export type Key = {
     delete: boolean;
     meta: boolean;
     super: boolean;
+    /**
+     * Pointer column (0-indexed) when the key is a wheel event — the SGR/X10
+     * sequence carries the position. Undefined for non-wheel keys.
+     */
+    mouseCol?: number;
+    /** Pointer row (0-indexed) when the key is a wheel event. See mouseCol. */
+    mouseRow?: number;
 };
 /**
  * Event fired for each input chunk received from stdin (a typed character or

package/lib/types/ink/events/input-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/input-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC;;;GAGG;AACH,MAAM,MAAM,GAAG,GAAG;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,OAAO,CAAA;IACX,GAAG,EAAE,OAAO,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAuKD;;;GAGG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;IAEjB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB;;;wBAGoB;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;gBAEd,QAAQ,EAAE,SAAS;CAShC"}
+{"version":3,"file":"input-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/input-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC;;;GAGG;AACH,MAAM,MAAM,GAAG,GAAG;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;IACb,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,OAAO,CAAA;IACX,GAAG,EAAE,OAAO,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AA2KD;;;GAGG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;IAEjB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB;;;wBAGoB;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;gBAEd,QAAQ,EAAE,SAAS;CAShC"}

package/lib/types/ink/events/input-event.js

@@ -10,6 +10,8 @@ function parseKey(keypress) {
         pageUp: keypress.name === 'pageup',
         wheelUp: keypress.name === 'wheelup',
         wheelDown: keypress.name === 'wheeldown',
+        wheelLeft: keypress.name === 'wheelleft',
+        wheelRight: keypress.name === 'wheelright',
         home: keypress.name === 'home',
         end: keypress.name === 'end',
         return: keypress.name === 'return',
@@ -29,6 +31,8 @@ function parseKey(keypress) {
         // protocol CSI u sequences. Distinct from meta (Alt/Option) so
         // bindings like cmd+c can be expressed separately from opt+c.
         super: keypress.super,
+        mouseCol: keypress.mouseCol,
+        mouseRow: keypress.mouseRow,
     };
     let input = keypress.ctrl ? keypress.name : keypress.sequence;
     // Handle undefined input case

package/lib/types/ink/events/pointer-event.d.ts

@@ -0,0 +1,61 @@
+import { TerminalEvent, type EventTarget } from './terminal-event.js';
+/**
+ * Pointer action reported by the terminal protocol.
+ *
+ * - `press`: a button went down (SGR `M` terminator / X10 press)
+ * - `release`: a button came up (SGR `m` terminator; X10 cannot report this)
+ * - `move`: pointer motion (SGR drag bit or mode-1003 no-button motion)
+ */
+export type PointerAction = 'press' | 'release' | 'move';
+/** Optional state when constructing a {@link PointerEvent}. */
+export type PointerEventInit = {
+    /** Raw protocol button byte (SGR bits: 0x04 shift, 0x08 alt, 0x10 ctrl). */
+    button?: number;
+    action?: PointerAction;
+    bubbles?: boolean;
+    cancelable?: boolean;
+};
+/**
+ * Base class for pointer-derived terminal events (click, wheel, hover).
+ *
+ * Carries the raw SGR/X10 button byte so handlers can read modifier flags
+ * (`shift`/`alt`/`ctrl`) without re-parsing the escape sequence, plus
+ * per-handler local coordinates: `_prepareForTarget` recomputes
+ * `localCol`/`localRow` from the nodeCache rect before each handler fires,
+ * so an onClick on a container sees coordinates relative to that container,
+ * not to the child the pointer actually landed on.
+ *
+ * `meta` is deliberately always false: xterm.js drops metaKey before SGR
+ * encoding (the SGR bit we call "meta" is wired to alt), so no pointer
+ * protocol can distinguish it reliably.
+ */
+export declare class PointerEvent extends TerminalEvent {
+    /** 0-indexed screen column of the pointer. */
+    readonly col: number;
+    /** 0-indexed screen row of the pointer. */
+    readonly row: number;
+    /** Raw protocol button byte (SGR encoding). */
+    readonly button: number;
+    /** Which pointer action produced this event. */
+    readonly action: PointerAction;
+    /** Shift held (SGR button bit 0x04). */
+    readonly shift: boolean;
+    /** Alt/Option held (SGR button bit 0x08). */
+    readonly alt: boolean;
+    /** Ctrl held (SGR button bit 0x10). */
+    readonly ctrl: boolean;
+    /** Always false — see class doc. */
+    readonly meta = false;
+    /** Column relative to the current handler's node (set during dispatch). */
+    localCol: number;
+    /** Row relative to the current handler's node (set during dispatch). */
+    localRow: number;
+    constructor(type: string, col: number, row: number, init?: PointerEventInit);
+    /**
+     * Refresh localCol/localRow for the node whose handler is about to run.
+     * Nodes without a cached rect (not rendered this frame) get 0,0 — handlers
+     * should prefer absolute col/row when that distinction matters.
+     */
+    _prepareForTarget(target: EventTarget): void;
+}
+//# sourceMappingURL=pointer-event.d.ts.map

package/lib/types/ink/events/pointer-event.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pointer-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/pointer-event.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAErE;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAExD,+DAA+D;AAC/D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,YAAa,SAAQ,aAAa;IAC7C,8CAA8C;IAC9C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,2CAA2C;IAC3C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,+CAA+C;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;IAC9B,wCAAwC;IACxC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,6CAA6C;IAC7C,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAA;IACrB,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,oCAAoC;IACpC,QAAQ,CAAC,IAAI,SAAQ;IACrB,2EAA2E;IAC3E,QAAQ,SAAI;IACZ,wEAAwE;IACxE,QAAQ,SAAI;gBAEA,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB;IAc3E;;;;OAIG;IACM,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;CAKtD"}

package/lib/types/ink/events/pointer-event.js

@@ -0,0 +1,61 @@
+import { nodeCache } from '../node-cache.js';
+import { TerminalEvent } from './terminal-event.js';
+/**
+ * Base class for pointer-derived terminal events (click, wheel, hover).
+ *
+ * Carries the raw SGR/X10 button byte so handlers can read modifier flags
+ * (`shift`/`alt`/`ctrl`) without re-parsing the escape sequence, plus
+ * per-handler local coordinates: `_prepareForTarget` recomputes
+ * `localCol`/`localRow` from the nodeCache rect before each handler fires,
+ * so an onClick on a container sees coordinates relative to that container,
+ * not to the child the pointer actually landed on.
+ *
+ * `meta` is deliberately always false: xterm.js drops metaKey before SGR
+ * encoding (the SGR bit we call "meta" is wired to alt), so no pointer
+ * protocol can distinguish it reliably.
+ */
+export class PointerEvent extends TerminalEvent {
+    /** 0-indexed screen column of the pointer. */
+    col;
+    /** 0-indexed screen row of the pointer. */
+    row;
+    /** Raw protocol button byte (SGR encoding). */
+    button;
+    /** Which pointer action produced this event. */
+    action;
+    /** Shift held (SGR button bit 0x04). */
+    shift;
+    /** Alt/Option held (SGR button bit 0x08). */
+    alt;
+    /** Ctrl held (SGR button bit 0x10). */
+    ctrl;
+    /** Always false — see class doc. */
+    meta = false;
+    /** Column relative to the current handler's node (set during dispatch). */
+    localCol = 0;
+    /** Row relative to the current handler's node (set during dispatch). */
+    localRow = 0;
+    constructor(type, col, row, init) {
+        super(type, {
+            bubbles: init?.bubbles ?? true,
+            cancelable: init?.cancelable ?? true,
+        });
+        this.col = col;
+        this.row = row;
+        this.button = init?.button ?? 0;
+        this.action = init?.action ?? 'move';
+        this.shift = (this.button & 0x04) !== 0;
+        this.alt = (this.button & 0x08) !== 0;
+        this.ctrl = (this.button & 0x10) !== 0;
+    }
+    /**
+     * Refresh localCol/localRow for the node whose handler is about to run.
+     * Nodes without a cached rect (not rendered this frame) get 0,0 — handlers
+     * should prefer absolute col/row when that distinction matters.
+     */
+    _prepareForTarget(target) {
+        const rect = nodeCache.get(target);
+        this.localCol = rect ? this.col - rect.x : 0;
+        this.localRow = rect ? this.row - rect.y : 0;
+    }
+}

package/lib/types/ink/events/wheel-event.d.ts

@@ -0,0 +1,17 @@
+import { PointerEvent, type PointerEventInit } from './pointer-event.js';
+/**
+ * Mouse wheel event dispatched to the ScrollBox under the pointer.
+ *
+ * `deltaY`/`deltaX` are in terminal rows/columns per wheel notch (positive =
+ * content moves up / right, i.e. scroll down / scroll right), matching
+ * ScrollBox.scrollBy's sign convention. Coordinates identify where the wheel
+ * event occurred so routing can hit-test the deepest scroll container.
+ */
+export declare class WheelEvent extends PointerEvent {
+    /** Rows to scroll (positive = scroll down). */
+    readonly deltaY: number;
+    /** Columns to scroll (positive = scroll right; currently informational). */
+    readonly deltaX: number;
+    constructor(col: number, row: number, deltaY: number, deltaX?: number, init?: PointerEventInit);
+}
+//# sourceMappingURL=wheel-event.d.ts.map

package/lib/types/ink/events/wheel-event.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wheel-event.d.ts","sourceRoot":"","sources":["../../../../src/ink/events/wheel-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAExE;;;;;;;GAOG;AACH,qBAAa,UAAW,SAAQ,YAAY;IAC1C,+CAA+C;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,4EAA4E;IAC5E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;gBAGrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,MAAM,SAAI,EACV,IAAI,CAAC,EAAE,gBAAgB;CAM1B"}

package/lib/types/ink/events/wheel-event.js

@@ -0,0 +1,20 @@
+import { PointerEvent } from './pointer-event.js';
+/**
+ * Mouse wheel event dispatched to the ScrollBox under the pointer.
+ *
+ * `deltaY`/`deltaX` are in terminal rows/columns per wheel notch (positive =
+ * content moves up / right, i.e. scroll down / scroll right), matching
+ * ScrollBox.scrollBy's sign convention. Coordinates identify where the wheel
+ * event occurred so routing can hit-test the deepest scroll container.
+ */
+export class WheelEvent extends PointerEvent {
+    /** Rows to scroll (positive = scroll down). */
+    deltaY;
+    /** Columns to scroll (positive = scroll right; currently informational). */
+    deltaX;
+    constructor(col, row, deltaY, deltaX = 0, init) {
+        super('wheel', col, row, { ...init, action: 'move' });
+        this.deltaY = deltaY;
+        this.deltaX = deltaX;
+    }
+}

package/lib/types/ink/geometry-trace.d.ts

@@ -0,0 +1,51 @@
+export type FrameCause = 'react-commit' | 'animation' | 'scroll' | 'scroll-drain' | 'measure' | 'resize' | 'reanchor' | 'immediate';
+export declare const GEOMETRY_TRACE_ENABLED: boolean;
+export type ScrollGeometryNote = {
+    sticky: boolean;
+    shrunk: boolean;
+    grew: boolean;
+    atBottom: boolean;
+    /** scrollTop captured before at-bottom follow (the user's logical view). */
+    scrollTopBeforeFollow: number;
+    /** scrollTop after pendingScrollDelta drain, before clamps. */
+    cur: number;
+    /** scrollTop written back to the DOM node (post follow/drain, pre virtual clamp). */
+    scrollTop: number;
+    /** What actually gets painted this frame (post cMin/cMax virtual clamp). */
+    renderScrollTop: number;
+    scrollHeight: number;
+    prevScrollHeight: number;
+    innerHeight: number;
+    maxScroll: number;
+    prevMaxScroll: number;
+    clampMin: number | null;
+    clampMax: number | null;
+};
+export type ListGeometryNote = {
+    start: number;
+    end: number;
+    topPad: number;
+    bottomPad: number;
+    /** Estimated total content height from cached row heights. */
+    total: number;
+    base: number;
+    sticky: boolean;
+    pending: number;
+    viewport: number;
+    termRows: number;
+    columns: number;
+    rowCount: number;
+};
+/** Tag the origin of the next painted frame. First note in the window wins. */
+export declare function noteFrameCause(cause: FrameCause): void;
+/** Renderer-side note, one per ScrollBox encountered during the paint. */
+export declare function noteScrollGeometry(note: ScrollGeometryNote): void;
+/** React-side note from MessageList's virtualization pass (latest wins). */
+export declare function noteListGeometry(note: ListGeometryNote): void;
+/** Scalar forensics (PromptInput content rows, …). Latest wins. */
+export declare function noteAuxNumber(key: string, value: number): void;
+/** Paint begins: just tag the frame id — inter-frame notes belong to it. */
+export declare function beginGeometryFrame(frame: number): void;
+/** Paint ends: flush one JSON line and reset the inter-frame window. */
+export declare function endGeometryFrame(durationMs: number): void;
+//# sourceMappingURL=geometry-trace.d.ts.map

package/lib/types/ink/geometry-trace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry-trace.d.ts","sourceRoot":"","sources":["../../../src/ink/geometry-trace.ts"],"names":[],"mappings":"AAoBA,MAAM,MAAM,UAAU,GAClB,cAAc,GACd,WAAW,GACX,QAAQ,GACR,cAAc,GACd,SAAS,GACT,QAAQ,GACR,UAAU,GACV,WAAW,CAAA;AAEf,eAAO,MAAM,sBAAsB,SACQ,CAAA;AAI3C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,OAAO,CAAA;IACjB,4EAA4E;IAC5E,qBAAqB,EAAE,MAAM,CAAA;IAC7B,+DAA+D;IAC/D,GAAG,EAAE,MAAM,CAAA;IACX,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAA;IACjB,4EAA4E;IAC5E,eAAe,EAAE,MAAM,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAkBD,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAGtD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAGjE;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAG7D;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAG9D;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAGtD;AAED,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAmBzD"}

package/lib/types/ink/geometry-trace.js

@@ -0,0 +1,83 @@
+/**
+ * Geometry forensics — per-frame scroll-geometry trace (issues #421/#433).
+ *
+ * `DSH_TUI_GEOMETRY_TRACE=<file>` appends one JSON line per painted frame:
+ * the frame's trigger cause, every ScrollBox's resolved geometry (scrollTop
+ * before/after follow + drain + virtual clamp, scrollHeight/maxScroll
+ * prev/cur, sticky/shrunk/grew flags, clamp bounds), the MessageList
+ * virtualization window, and aux counters (e.g. PromptInput content rows).
+ *
+ * Zero overhead when the env is unset: every entry point returns on a
+ * module-const boolean, so the disabled path is a single predictable branch.
+ *
+ * Ordering contract: causes and React-side notes (list geometry, aux) land
+ * BETWEEN frames — at event/commit time, before the throttled paint. The
+ * renderer adds scroll geometry during the paint; endGeometryFrame flushes
+ * and resets. First-noted cause wins (the origin of the frame chain); no
+ * note at paint time means a plain reconciler commit.
+ */
+import { appendFileSync } from 'node:fs';
+export const GEOMETRY_TRACE_ENABLED = process.env.DSH_TUI_GEOMETRY_TRACE !== undefined &&
+    process.env.DSH_TUI_GEOMETRY_TRACE !== '';
+const TRACE_PATH = process.env.DSH_TUI_GEOMETRY_TRACE ?? '';
+let state = {
+    frame: -1,
+    cause: null,
+    scroll: [],
+    list: null,
+    aux: {}
+};
+/** Tag the origin of the next painted frame. First note in the window wins. */
+export function noteFrameCause(cause) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    if (state.cause === null)
+        state.cause = cause;
+}
+/** Renderer-side note, one per ScrollBox encountered during the paint. */
+export function noteScrollGeometry(note) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    state.scroll.push(note);
+}
+/** React-side note from MessageList's virtualization pass (latest wins). */
+export function noteListGeometry(note) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    state.list = note;
+}
+/** Scalar forensics (PromptInput content rows, …). Latest wins. */
+export function noteAuxNumber(key, value) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    state.aux[key] = value;
+}
+/** Paint begins: just tag the frame id — inter-frame notes belong to it. */
+export function beginGeometryFrame(frame) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    state.frame = frame;
+}
+/** Paint ends: flush one JSON line and reset the inter-frame window. */
+export function endGeometryFrame(durationMs) {
+    if (!GEOMETRY_TRACE_ENABLED)
+        return;
+    if (state.frame >= 0) {
+        const line = JSON.stringify({
+            t: new Date().toISOString(),
+            frame: state.frame,
+            cause: state.cause ?? 'react-commit',
+            ms: Math.round(durationMs * 10) / 10,
+            scroll: state.scroll,
+            list: state.list,
+            aux: state.aux
+        });
+        try {
+            appendFileSync(TRACE_PATH, line + '\n');
+        }
+        catch {
+            // Unwritable path etc. — forensics must never break rendering.
+        }
+    }
+    state = { frame: -1, cause: null, scroll: [], list: null, aux: {} };
+}

package/lib/types/ink/hit-test.d.ts

@@ -16,18 +16,69 @@ import type { DOMElement } from './dom.js';
  * @returns the deepest element whose rect contains (col, row), or null.
  */
 export declare function hitTest(node: DOMElement, col: number, row: number): DOMElement | null;
+/**
+ * hitTest, but overlay-aware: absolute-positioned nodes can paint OUTSIDE
+ * every ancestor's rect (OverlayAbove's `bottom:'100%'` pickers float over
+ * the transcript), so the plain containment recursion never reaches them —
+ * a click on the picker lands in the ScrollBox's rows instead. Check the
+ * frame's absolute hit list FIRST, in reverse paint order (later = visually
+ * on top), then fall back to the in-flow tree.
+ * @param root - the tree root for the in-flow fallback.
+ * @param col - the screen column to test.
+ * @param row - the screen row to test.
+ * @returns the deepest element at (col, row), or null.
+ */
+export declare function hitTestWithOverlays(root: DOMElement, col: number, row: number): DOMElement | null;
 /**
  * Hit-test the root at (col, row) and bubble a ClickEvent from the deepest
  * containing node up through parentNode. Only nodes with an onClick handler
  * fire. Stops when a handler calls stopImmediatePropagation(). Returns
  * true if at least one onClick handler fired.
+ *
+ * Each handler call is isolated: a throwing handler is logged and the
+ * bubbling continues, so one broken onClick cannot swallow the click from
+ * its ancestors or the rest of the input batch.
+ *
  * @param root - the tree root to hit-test.
  * @param col - the screen column of the click.
  * @param row - the screen row of the click.
  * @param cellIsBlank - whether the clicked cell is blank, reported on the event.
+ * @param button - raw SGR release byte (carries shift/alt/ctrl modifier bits).
  * @returns true when at least one onClick handler fired.
  */
-export declare function dispatchClick(root: DOMElement, col: number, row: number, cellIsBlank?: boolean): boolean;
+export declare function dispatchClick(root: DOMElement, col: number, row: number, cellIsBlank?: boolean, button?: number): boolean;
+/**
+ * Fire onMouseLeave on every tracked hover node, then empty the set.
+ *
+ * The pointer-state resets (alt-screen swap, terminal resize) drop the hover
+ * set because the geometry it was computed against is gone. But the React
+ * components behind those nodes still hold their `hovered=true` state: a bare
+ * `set.clear()` never tells them the pointer "left", so every row crossed
+ * before the reset keeps its highlight forever — the next motion event only
+ * fires enter on the new row (the old nodes are no longer in the set, so no
+ * diff ever produces their leave). Firing leave first is what makes the
+ * reset invisible to the rows.
+ *
+ * @param hovered - the tracked hover set; emptied in place.
+ * @param col - pointer column for the synthetic leave events (-1 = unknown).
+ * @param row - pointer row for the synthetic leave events.
+ */
+export declare function clearHovered(hovered: Set<DOMElement>, col?: number, row?: number): void;
+/**
+ * Route a wheel event to the ScrollBox (or any onWheel handler) under the
+ * pointer. Dispatches through the shared Dispatcher at continuous priority
+ * so the event bubbles from the deepest hit node and React schedules any
+ * state updates at the right lane.
+ *
+ * @param root - the tree root to hit-test.
+ * @param col - the screen column of the wheel event.
+ * @param row - the screen row of the wheel event.
+ * @param deltaY - rows to scroll (positive = scroll down).
+ * @param deltaX - columns to scroll (positive = right; informational).
+ * @param button - raw SGR byte (carries modifier bits).
+ * @returns true when an onWheel handler existed under the pointer.
+ */
+export declare function dispatchWheel(root: DOMElement, col: number, row: number, deltaY: number, deltaX?: number, button?: number): boolean;
 /**
  * Fire onMouseEnter/onMouseLeave as the pointer moves. Like DOM
  * mouseenter/mouseleave: does NOT bubble — moving between children does
@@ -35,6 +86,10 @@ export declare function dispatchClick(root: DOMElement, col: number, row: number
  * ancestor with a hover handler; diffs against the previous hovered set;
  * fires leave on the nodes exited, enter on the nodes entered.
  *
+ * Handlers receive a PointerEvent ('hover') with the pointer position;
+ * existing `() => void` handlers simply ignore the argument. Each call is
+ * isolated so one throwing handler cannot break the rest of the diff.
+ *
  * Mutates `hovered` in place so the caller (App instance) can hold it
  * across calls. Clears the set when the hit is null (cursor moved into a
  * non-rendered gap or off the root rect).

package/lib/types/ink/hit-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hit-test.d.ts","sourceRoot":"","sources":["../../../src/ink/hit-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAK1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,UAAU,GAAG,IAAI,CAmBnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,WAAW,UAAQ,GAClB,OAAO,CAmCT;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,GACvB,IAAI,CAuBN"}
+{"version":3,"file":"hit-test.d.ts","sourceRoot":"","sources":["../../../src/ink/hit-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAU1C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,UAAU,GAAG,IAAI,CAmBnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,UAAU,GAAG,IAAI,CAkBnB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,WAAW,UAAQ,EACnB,MAAM,SAAI,GACT,OAAO,CA2CT;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,EACxB,GAAG,SAAK,EACR,GAAG,SAAK,GACP,IAAI,CAiBN;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,MAAM,SAAI,EACV,MAAM,SAAI,GACT,OAAO,CAcT;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,GACvB,IAAI,CAwCN"}