@code-yeongyu/senpi-tui 2026.8.18 → 2026.8.20

package/dist/components/editor.d.ts

@@ -1,7 +1,10 @@
 import type { AutocompleteProvider } from "../autocomplete.ts";
+import { type EditorImageState } from "../image-markers.ts";
 import { type EditorPasteState } from "../paste-markers.ts";
 import { type Component, type Focusable, type TUI } from "../tui.ts";
 import { type SelectListTheme } from "./select-list.ts";
+/** Which atomic marker family a segment belongs to, if any. */
+export type MarkerKind = "paste" | "image";
 /**
  * Represents a chunk of text for word-wrap layout.
  * Tracks both the text content and its position in the original line.
@@ -61,6 +64,7 @@ export declare class Editor implements Component, Focusable {
     private autocompleteStartToken;
     private autocompleteRequestId;
     private pasteMarkers;
+    private imageMarkers;
     private pasteBuffer;
     private isInPaste;
     private history;
@@ -75,11 +79,44 @@ export declare class Editor implements Component, Focusable {
     private wrappedLineCache;
     onSubmit?: (text: string) => void;
     onChange?: (text: string) => void;
+    /**
+     * Fired whenever image markers are added, removed, pruned or renumbered.
+     * Carries the marker ids in text reading order so the owner can keep its
+     * payload map aligned with the visible numbers.
+     *
+     * The reported ids are the ids the OWNER CURRENTLY KEYS ITS PAYLOADS BY -
+     * i.e. the PRE-renumber ids - and the visible numbers are always canonical
+     * 1..k in reading order after the change, so the owner re-keys payload
+     * `order[i]` onto slot `i + 1`.
+     */
+    onImageMarkersChanged?: (order: number[]) => void;
+    /**
+     * Owner hook: capture the attachment payloads keyed by marker id so an undo
+     * can restore them alongside the editor snapshot. The value is stored
+     * opaquely - image bytes never cross into the editor - and is handed back
+     * through {@link restoreAttachmentState} when the matching snapshot is
+     * popped. Return `undefined` to store nothing (restores are skipped).
+     */
+    snapshotAttachmentState?: () => unknown;
+    /**
+     * Owner hook: restore the attachment payloads captured by
+     * {@link snapshotAttachmentState} for the snapshot an undo just popped.
+     * Called BEFORE {@link onImageMarkersChanged} fires for that undo so the
+     * reconcile pass maps the restored payloads, not the post-delete ones.
+     */
+    restoreAttachmentState?: (state: unknown) => void;
     disableSubmit: boolean;
     constructor(tui: TUI, theme: EditorTheme, options?: EditorOptions);
-    /** Segment text with paste-marker awareness, only merging exact canonical markers. */
+    /** Segment text with marker awareness, only merging exact canonical markers. */
     private segment;
+    /** Union of every marker family that must segment as one atomic grapheme. */
+    private authorizedMarkers;
     private removePasteMarker;
+    /** Removes an image marker whole, applying the registry's renumbered text. */
+    private removeImageMarker;
+    /** Removes whichever marker family `segment` belongs to; returns false when it is not a marker. */
+    private removeMarkerSegment;
+    private notifyImageMarkersChanged;
     getPaddingX(): number;
     setPaddingX(padding: number): void;
     getAutocompleteMaxVisible(): number;
@@ -126,6 +163,41 @@ export declare class Editor implements Component, Focusable {
      * counter is raised so future paste ids cannot collide.
      */
     setPasteState(state: EditorPasteState): void;
+    /**
+     * Snapshot the image-marker registry (ids only, never image payloads) so
+     * markers can be transferred to another editor instance alongside getText().
+     */
+    getImageMarkerState(): EditorImageState;
+    /**
+     * Install an image-marker registry snapshot taken from another editor
+     * instance. Call after setText() with the source editor's raw text: ids whose
+     * markers are absent from the current text are dropped, and the id counter is
+     * raised so future marker ids cannot collide.
+     */
+    setImageMarkerState(state: EditorImageState): void;
+    /**
+     * Insert the next canonical `[Image #N]` marker at the cursor and return its id.
+     * This is atomic for undo - a single undo restores the entire pre-insert state,
+     * registry included - matching the insertTextAtCursor() contract.
+     *
+     * The text is canonicalized before returning: the insertion counter only
+     * produces reading-order numbers when the cursor sat after every existing
+     * marker, so a paste in front of an earlier marker renumbers the visible
+     * markers to stay 1..k in reading order. The returned id is the marker's
+     * FINAL canonical number (its 1-based reading position), which is the slot
+     * the owner must key its payload under; the notification fires with the
+     * PRE-renumber ids, so that slot is guaranteed vacant by the time this
+     * returns and a caller registering its payload right after cannot orphan
+     * or overwrite a surviving payload.
+     */
+    insertImageMarker(): number;
+    /**
+     * Rewrite the buffer with a canonicalized marker numbering, preserving the
+     * cursor by folding the length delta of every marker rewrite that ended at
+     * or before the cursor on the cursor's line (markers never span lines, and
+     * rewrites never change the line count).
+     */
+    private applyCanonicalizedText;
     /**
      * Insert text at the current cursor position.
      * Used for programmatic insertion (e.g., clipboard image markers).

package/dist/components/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/components/editor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAA2B,MAAM,oBAAoB,CAAC;AAIxF,OAAO,EACN,KAAK,gBAAgB,EAKrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,SAAS,EAAiB,KAAK,SAAS,EAAE,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAWpF,OAAO,EAA4C,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlG;;;GAGG;AACH,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAyDD;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,SAAS,EAAE,CA+F3G;AAqBD,MAAM,WAAW,WAAW;IAC3B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC;;;;;OAKG;IACH,UAAU,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAChC;AAkCD,qBAAa,MAAO,YAAW,SAAS,EAAE,SAAS;IAClD,OAAO,CAAC,KAAK,CAIX;IAEF,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAS;IAEzB,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAa;IAG7B,OAAO,CAAC,SAAS,CAAc;IAG/B,OAAO,CAAC,YAAY,CAAa;IAG1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IAG5C,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,6BAA6B,CAAgD;IACrF,OAAO,CAAC,0BAA0B,CAA2D;IAC7F,OAAO,CAAC,2BAA2B,CAA4D;IAC/F,OAAO,CAAC,gBAAgB,CAAC,CAAa;IACtC,OAAO,CAAC,iBAAiB,CAAoC;IAC7D,OAAO,CAAC,kBAAkB,CAAc;IACxC,OAAO,CAAC,sBAAsB,CAAa;IAC3C,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAC5C,OAAO,CAAC,yBAAyB,CAAC,CAAgC;IAClE,OAAO,CAAC,uBAAuB,CAAoC;IACnE,OAAO,CAAC,sBAAsB,CAAa;IAC3C,OAAO,CAAC,qBAAqB,CAAa;IAG1C,OAAO,CAAC,YAAY,CAA6B;IAGjD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAkB;IAGnC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,YAAY,CAA4B;IAGhD,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,UAAU,CAA8C;IAGhE,OAAO,CAAC,QAAQ,CAAuC;IAGvD,OAAO,CAAC,kBAAkB,CAAuB;IAOjD,OAAO,CAAC,oBAAoB,CAAuB;IAGnD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,gBAAgB,CAA2B;IAE5C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,aAAa,EAAE,OAAO,CAAS;gBAE1B,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,GAAE,aAAkB;IAUrE,sFAAsF;IACtF,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,iBAAiB;IAOzB,WAAW,IAAI,MAAM;IAIrB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAQlC,yBAAyB,IAAI,MAAM;IAInC,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAQnD,uBAAuB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IAM7D;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAYhC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,mBAAmB;IAK3B,kFAAkF;IAClF,OAAO,CAAC,eAAe;IAavB,UAAU,IAAI,IAAI;IAIlB,OAAO,CAAC,cAAc;IA+BtB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IA4H/B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IA8S/B,OAAO,CAAC,UAAU;IA0FlB,OAAO,IAAI,MAAM;IAIjB;;;OAGG;IACH,eAAe,IAAI,MAAM;IAIzB,QAAQ,IAAI,MAAM,EAAE;IAIpB,SAAS,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;IAI1C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAc3B;;;OAGG;IACH,aAAa,IAAI,gBAAgB;IAIjC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAI5C;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAStC;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAIrB;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IA4ClC,OAAO,CAAC,eAAe;IA4DvB,OAAO,CAAC,WAAW;IA2DnB,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,4BAA4B;IAWpC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,eAAe;IA8DvB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAMpB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAkFxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,yBAAyB;IAiCjC,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,mBAAmB;IAmC3B,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,mBAAmB;IA6C3B,OAAO,CAAC,iBAAiB;IA0CzB,OAAO,CAAC,mBAAmB;IAyD3B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IA2B1B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmBxB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,UAAU;IA+DlB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,iBAAiB;IAsBzB;;OAEG;IACH,OAAO,CAAC,IAAI;IAWZ;;;OAGG;IACH,OAAO,CAAC,OAAO;IAmBf;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAuCxB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAsCxB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,IAAI;IAaZ;;;OAGG;IACH,OAAO,CAAC,UAAU;IA8BlB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,uBAAuB;IAK/B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,6BAA6B;IAkBrC,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,mBAAmB;YA+Bb,wBAAwB;IAuBtC,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,yBAAyB;YAUnB,sBAAsB;IAoDpC,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,kBAAkB;IAKnB,qBAAqB,IAAI,OAAO;IAIvC,OAAO,CAAC,kBAAkB;CAI1B"}
+{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/components/editor.ts"],"names":[],"mappings":"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"}

package/dist/components/editor.js

@@ -1,7 +1,8 @@
+import { formatImageMarker, IMAGE_MARKER_REGEX, ImageMarkerRegistry, imageMarkerId, isImageMarker, } from "../image-markers.js";
 import { getKeybindings } from "../keybindings.js";
 import { decodePrintableKey, matchesKey } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
-import { isPasteMarker, PasteMarkerRegistry, pasteMarkerId, segmentWithPasteMarkers, } from "../paste-markers.js";
+import { isPasteMarker, PasteMarkerRegistry, pasteMarkerId, segmentWithMarkers, } from "../paste-markers.js";
 import { CURSOR_MARKER } from "../tui.js";
 import { UndoStack } from "../undo-stack.js";
 import { cjkBreakRegex, getGraphemeSegmenter, getWordSegmenter, isWhitespaceChar, sliceByColumn, visibleWidth, } from "../utils.js";
@@ -9,6 +10,20 @@ import { findWordBackward, findWordForward } from "../word-navigation.js";
 import { SelectList } from "./select-list.js";
 const graphemeSegmenter = getGraphemeSegmenter();
 const wordSegmenter = getWordSegmenter();
+/** Atomic-marker predicate covering every marker family the editor treats as one grapheme. */
+function isAtomicMarker(segment) {
+    return isPasteMarker(segment) || isImageMarker(segment);
+}
+function markerKind(segment) {
+    if (isPasteMarker(segment))
+        return "paste";
+    if (isImageMarker(segment))
+        return "image";
+    return undefined;
+}
+function containsMarkerPrefix(text) {
+    return text.includes("[paste #") || text.includes("[Image #");
+}
 function isPrintableAsciiText(text) {
     for (let i = 0; i < text.length; i++) {
         const code = text.charCodeAt(i);
@@ -67,7 +82,7 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
     if (!line || maxWidth <= 0) {
         return [{ text: "", startIndex: 0, endIndex: 0 }];
     }
-    if (preSegmented === undefined && !/\s/.test(line) && !line.includes("[paste #") && isPrintableAsciiText(line)) {
+    if (preSegmented === undefined && !/\s/.test(line) && !containsMarkerPrefix(line) && isPrintableAsciiText(line)) {
         return wordWrapAsciiLine(line, maxWidth);
     }
     const lineWidth = visibleWidth(line);
@@ -87,7 +102,7 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
         const grapheme = seg.segment;
         const gWidth = visibleWidth(grapheme);
         const charIndex = seg.index;
-        const isWs = !isPasteMarker(grapheme) && isWhitespaceChar(grapheme);
+        const isWs = !isAtomicMarker(grapheme) && isWhitespaceChar(grapheme);
         // Overflow check before advancing.
         if (currentWidth + gWidth > maxWidth) {
             if (wrapOppIndex >= 0 && currentWidth - wrapOppWidth + gWidth <= maxWidth) {
@@ -132,13 +147,13 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
         // or at a boundary where either side is CJK (CJK allows breaking
         // between any adjacent characters).
         const next = segments[i + 1];
-        if (isWs && next && (isPasteMarker(next.segment) || !isWhitespaceChar(next.segment))) {
+        if (isWs && next && (isAtomicMarker(next.segment) || !isWhitespaceChar(next.segment))) {
             wrapOppIndex = next.index;
             wrapOppWidth = currentWidth;
         }
         else if (!isWs && next && !isWhitespaceChar(next.segment)) {
-            const isCjk = !isPasteMarker(grapheme) && cjkBreakRegex.test(grapheme);
-            const nextIsCjk = !isPasteMarker(next.segment) && cjkBreakRegex.test(next.segment);
+            const isCjk = !isAtomicMarker(grapheme) && cjkBreakRegex.test(grapheme);
+            const nextIsCjk = !isAtomicMarker(next.segment) && cjkBreakRegex.test(next.segment);
             if (isCjk || nextIsCjk) {
                 wrapOppIndex = next.index;
                 wrapOppWidth = currentWidth;
@@ -200,6 +215,8 @@ export class Editor {
         this.autocompleteRequestId = 0;
         // Paste tracking for large pastes
         this.pasteMarkers = new PasteMarkerRegistry();
+        // Atomic `[Image #N]` markers; ids only, the owner keeps the image payload
+        this.imageMarkers = new ImageMarkerRegistry();
         // Bracketed paste mode buffering
         this.pasteBuffer = "";
         this.isInPaste = false;
@@ -232,9 +249,19 @@ export class Editor {
         const maxVisible = options.autocompleteMaxVisible ?? 5;
         this.autocompleteMaxVisible = Number.isFinite(maxVisible) ? Math.max(3, Math.min(20, Math.floor(maxVisible))) : 5;
     }
-    /** Segment text with paste-marker awareness, only merging exact canonical markers. */
+    /** Segment text with marker awareness, only merging exact canonical markers. */
     segment(text, mode) {
-        return segmentWithPasteMarkers(text, mode === "word" ? wordSegmenter : graphemeSegmenter, this.pasteMarkers.authorizedMarkers(text));
+        return segmentWithMarkers(text, mode === "word" ? wordSegmenter : graphemeSegmenter, this.authorizedMarkers(text));
+    }
+    /** Union of every marker family that must segment as one atomic grapheme. */
+    authorizedMarkers(text) {
+        const imageMarkers = this.imageMarkers.authorizedMarkers(text);
+        if (imageMarkers.size === 0)
+            return this.pasteMarkers.authorizedMarkers(text);
+        const merged = new Set(this.pasteMarkers.authorizedMarkers(text));
+        for (const marker of imageMarkers)
+            merged.add(marker);
+        return merged;
     }
     removePasteMarker(id) {
         const removal = this.pasteMarkers.remove(id, this.getText());
@@ -243,6 +270,37 @@ export class Editor {
         this.state.lines = removal.text.split("\n");
         return true;
     }
+    /** Removes an image marker whole, applying the registry's renumbered text. */
+    removeImageMarker(id) {
+        // The reported order is in PRE-renumber ids: the owner keys its payloads by the
+        // numbers it was handed, so it needs the surviving originals - `[2]` after
+        // deleting `[Image #1]` - to remap them onto the new 1..k display numbers.
+        const survivors = this.imageMarkers.ids(this.getText()).filter((entryId) => entryId !== id);
+        const removal = this.imageMarkers.remove(id, this.getText());
+        if (!removal.removed)
+            return false;
+        this.state.lines = removal.text.split("\n");
+        this.onImageMarkersChanged?.(survivors);
+        return true;
+    }
+    /** Removes whichever marker family `segment` belongs to; returns false when it is not a marker. */
+    removeMarkerSegment(segment) {
+        switch (markerKind(segment)) {
+            case "paste": {
+                const id = pasteMarkerId(segment);
+                return id !== undefined && this.removePasteMarker(id);
+            }
+            case "image": {
+                const id = imageMarkerId(segment);
+                return id !== undefined && this.removeImageMarker(id);
+            }
+            default:
+                return false;
+        }
+    }
+    notifyImageMarkersChanged() {
+        this.onImageMarkersChanged?.(this.imageMarkers.ids(this.getText()));
+    }
     getPaddingX() {
         return this.paddingX;
     }
@@ -356,7 +414,7 @@ export class Editor {
             return cached;
         }
         const width = isPrintableAsciiText(line) ? line.length : visibleWidth(line);
-        if (line.includes("[paste #")) {
+        if (containsMarkerPrefix(line)) {
             return {
                 width,
                 chunks: width <= contentWidth
@@ -861,7 +919,17 @@ export class Editor {
             this.pushUndoSnapshot();
         }
         this.pasteMarkers.prune(normalized, previousText);
+        const previousImageOrder = this.imageMarkers.ids(previousText);
+        this.imageMarkers.prune(normalized, previousText);
         this.setTextInternal(normalized);
+        // A prune can leave a gap (e.g. only id 2 surviving); renumber so the
+        // visible numbers stay 1..k in reading order.
+        const canonicalization = this.imageMarkers.canonicalize(normalized);
+        this.applyCanonicalizedText(canonicalization);
+        const imageOrder = canonicalization.order;
+        if (previousImageOrder.length !== imageOrder.length || previousImageOrder.some((id, i) => id !== imageOrder[i])) {
+            this.onImageMarkersChanged?.(imageOrder);
+        }
     }
     /**
      * Snapshot the large-paste registry (marker id -> stored body) so it can be
@@ -879,6 +947,85 @@ export class Editor {
     setPasteState(state) {
         this.pasteMarkers.install(state, this.getText());
     }
+    /**
+     * Snapshot the image-marker registry (ids only, never image payloads) so
+     * markers can be transferred to another editor instance alongside getText().
+     */
+    getImageMarkerState() {
+        return this.imageMarkers.snapshot();
+    }
+    /**
+     * Install an image-marker registry snapshot taken from another editor
+     * instance. Call after setText() with the source editor's raw text: ids whose
+     * markers are absent from the current text are dropped, and the id counter is
+     * raised so future marker ids cannot collide.
+     */
+    setImageMarkerState(state) {
+        this.imageMarkers.install(state, this.getText());
+    }
+    /**
+     * Insert the next canonical `[Image #N]` marker at the cursor and return its id.
+     * This is atomic for undo - a single undo restores the entire pre-insert state,
+     * registry included - matching the insertTextAtCursor() contract.
+     *
+     * The text is canonicalized before returning: the insertion counter only
+     * produces reading-order numbers when the cursor sat after every existing
+     * marker, so a paste in front of an earlier marker renumbers the visible
+     * markers to stay 1..k in reading order. The returned id is the marker's
+     * FINAL canonical number (its 1-based reading position), which is the slot
+     * the owner must key its payload under; the notification fires with the
+     * PRE-renumber ids, so that slot is guaranteed vacant by the time this
+     * returns and a caller registering its payload right after cannot orphan
+     * or overwrite a surviving payload.
+     */
+    insertImageMarker() {
+        this.cancelAutocomplete();
+        this.pushUndoSnapshot();
+        this.lastAction = null;
+        this.exitHistoryBrowsing();
+        const marker = this.imageMarkers.add();
+        this.insertTextAtCursorInternal(marker);
+        const canonicalization = this.imageMarkers.canonicalize(this.getText());
+        this.applyCanonicalizedText(canonicalization);
+        const insertionId = imageMarkerId(marker);
+        // An id missing from the order means the inserted marker duplicates a
+        // hand-typed literal, so the registry treats both occurrences as
+        // unauthorized; keep the insertion id so first-occurrence-wins still
+        // attaches the payload at submit.
+        const finalId = canonicalization.order.includes(insertionId)
+            ? canonicalization.order.indexOf(insertionId) + 1
+            : insertionId;
+        this.onImageMarkersChanged?.(canonicalization.order);
+        return finalId;
+    }
+    /**
+     * Rewrite the buffer with a canonicalized marker numbering, preserving the
+     * cursor by folding the length delta of every marker rewrite that ended at
+     * or before the cursor on the cursor's line (markers never span lines, and
+     * rewrites never change the line count).
+     */
+    applyCanonicalizedText(canonicalization) {
+        if (canonicalization.text === this.getText())
+            return;
+        const oldLine = this.state.lines[this.state.cursorLine] ?? "";
+        const cursorCol = this.state.cursorCol;
+        const renumbered = new Map();
+        for (const [index, id] of canonicalization.order.entries()) {
+            renumbered.set(id, index + 1);
+        }
+        let delta = 0;
+        for (const match of oldLine.matchAll(IMAGE_MARKER_REGEX)) {
+            const end = (match.index ?? 0) + match[0].length;
+            if (end > cursorCol)
+                break;
+            const newId = renumbered.get(Number.parseInt(match[1] ?? "0", 10));
+            if (newId === undefined)
+                continue;
+            delta += formatImageMarker(newId).length - match[0].length;
+        }
+        this.state.lines = canonicalization.text.split("\n");
+        this.setCursorCol(Math.max(0, cursorCol + delta));
+    }
     /**
      * Insert text at the current cursor position.
      * Used for programmatic insertion (e.g., clipboard image markers).
@@ -1082,6 +1229,8 @@ export class Editor {
         const result = this.pasteMarkers.expand(this.state.lines.join("\n")).trim();
         this.state = { lines: [""], cursorLine: 0, cursorCol: 0 };
         this.pasteMarkers.clear();
+        // Marker numbering is turn-local: ids restart at 1 for the next submission.
+        this.imageMarkers.clear();
         this.exitHistoryBrowsing();
         this.scrollOffset = 0;
         this.undoStack.clear();
@@ -1103,9 +1252,7 @@ export class Editor {
             const graphemes = [...this.segment(beforeCursor, "grapheme")];
             const lastGrapheme = graphemes[graphemes.length - 1];
             const graphemeLength = lastGrapheme ? lastGrapheme.segment.length : 1;
-            const targetId = pasteMarkerId(lastGrapheme?.segment ?? "");
-            if (targetId !== undefined) {
-                this.removePasteMarker(targetId);
+            if (this.removeMarkerSegment(lastGrapheme?.segment ?? "")) {
                 this.setCursorCol(Math.max(0, this.state.cursorCol - graphemeLength));
             }
             else {
@@ -1414,9 +1561,7 @@ export class Editor {
             // Find the first grapheme at cursor
             const graphemes = [...this.segment(afterCursor, "grapheme")];
             const firstGrapheme = graphemes[0];
-            const markerId = firstGrapheme && isPasteMarker(firstGrapheme.segment) ? pasteMarkerId(firstGrapheme.segment) : undefined;
-            if (markerId !== undefined) {
-                this.removePasteMarker(markerId);
+            if (this.removeMarkerSegment(firstGrapheme?.segment ?? "")) {
                 this.onChange?.(this.getText());
                 return;
             }
@@ -1597,7 +1742,7 @@ export class Editor {
         }
         this.setCursorCol(findWordBackward(currentLine, this.state.cursorCol, {
             segment: (text) => this.segment(text, "word"),
-            isAtomicSegment: isPasteMarker,
+            isAtomicSegment: isAtomicMarker,
         }));
     }
     /**
@@ -1705,6 +1850,8 @@ export class Editor {
         this.undoStack.push({
             state: this.state,
             pasteState: this.pasteMarkers.snapshot(),
+            imageState: this.imageMarkers.snapshot(),
+            attachmentState: this.snapshotAttachmentState?.(),
         });
     }
     undo() {
@@ -1714,11 +1861,20 @@ export class Editor {
             return;
         Object.assign(this.state, snapshot.state);
         this.pasteMarkers.restore(snapshot.pasteState);
+        this.imageMarkers.restore(snapshot.imageState);
+        // Restore the owner's payload snapshot BEFORE the marker-order
+        // notification: the reconcile pass maps payloads by the restored ids, so
+        // restoring after it would re-key the post-delete survivors onto the
+        // restored marker set and permanently drop the deleted marker's image.
+        if (snapshot.attachmentState !== undefined) {
+            this.restoreAttachmentState?.(snapshot.attachmentState);
+        }
         this.lastAction = null;
         this.preferredVisualCol = null;
         if (this.onChange) {
             this.onChange(this.getText());
         }
+        this.notifyImageMarkersChanged();
     }
     /**
      * Jump to the first occurrence of a character in the specified direction.
@@ -1761,7 +1917,7 @@ export class Editor {
         }
         this.setCursorCol(findWordForward(currentLine, this.state.cursorCol, {
             segment: (text) => this.segment(text, "word"),
-            isAtomicSegment: isPasteMarker,
+            isAtomicSegment: isAtomicMarker,
         }));
     }
     // Slash menu only allowed on the first line of the editor