@timurproko/a1 0.1.8-dev.457 → 0.1.8-dev.465

package/dist/composition/owned-ui.js

@@ -120,7 +120,8 @@ function quitOutroSettingsSnapshot(settings) {
     const effect = settings.value("quitEffect");
     const durationMs = settings.value("quitEffectDurationMs");
     return {
-        effect: effect === "dissolve" || effect === "starburst" || effect === "waves" || effect === "off" ? effect : "fall",
+        enabled: settings.value("quitAnimation") !== false,
+        effect: effect === "dissolve" || effect === "starburst" || effect === "waves" ? effect : "fall",
         durationMs: typeof durationMs === "number" ? durationMs : 800,
     };
 }

package/dist/contracts/owned-ui/model.d.ts

@@ -64,9 +64,11 @@ export interface OwnedUiViewportSettingsPort {
     snapshot(): OwnedUiViewportSettings;
     onChange(listener: (settings: OwnedUiViewportSettings) => void): () => void;
 }
-export type OwnedUiQuitEffect = "fall" | "dissolve" | "starburst" | "waves" | "off";
+export type OwnedUiQuitEffect = "fall" | "dissolve" | "starburst" | "waves";
 /** Profile-local quit outro choice, read at the moment bare A1 quits. */
 export interface OwnedUiQuitOutroSettings {
+    /** False leaves the terminal immediately; the effect and duration are then ignored. */
+    readonly enabled: boolean;
     readonly effect: OwnedUiQuitEffect;
     /** Requested playback length; the player clamps it to its supported range. */
     readonly durationMs: number;
@@ -124,6 +126,8 @@ export interface OwnedUiFooterView {
 export interface OwnedUiStatusView {
     readonly title: string;
     readonly workingMessage: string | null;
+    /** Estimated progress of the shown work state as an integer percent below 100, when the engine can measure it. */
+    readonly workingProgress?: number | null;
     readonly diagnostics: readonly string[];
     readonly badges: readonly string[];
     readonly usage?: OwnedUiUsageView;

package/dist/contracts/owned-ui/validation.js

@@ -347,6 +347,9 @@ export function assertOwnedUiEditorState(editor) {
 export function assertOwnedUiStatusView(status) {
     assertBoundedText(status.title, "owned-UI status title", MAX_LABEL_LENGTH);
     assertOptionalText(status.workingMessage, "owned-UI working message", MAX_MESSAGE_LENGTH);
+    if (status.workingProgress !== undefined && status.workingProgress !== null) {
+        assertIntegerInRange(status.workingProgress, 0, 99, "owned-UI working progress");
+    }
     assertCollection(status.diagnostics, "owned-UI status diagnostics", MAX_STATUS_DIAGNOSTICS);
     for (const diagnostic of status.diagnostics) {
         assertBoundedText(diagnostic, "owned-UI status diagnostic", MAX_MESSAGE_LENGTH);

package/dist/features/owned-ui/settings-app.d.ts

@@ -14,6 +14,7 @@ export declare class SettingsApp implements UiApp {
     readonly id = "settings";
     constructor(session: OwnedUiSettingsSession);
     onActivate(host: AppHostServices): void;
+    onClose(_host: AppHostServices): void;
     render(rect: PaneRect, host: AppHostServices): readonly string[];
     onInput(data: string, host: AppHostServices): PaneInputResult;
     onMouse(event: PaneMouseEvent, _host: AppHostServices): PaneInputResult;

package/dist/features/owned-ui/settings-app.js

@@ -1,10 +1,15 @@
-import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, dialogValueColumn, numericValues, RAIL_COLUMNS, renderDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, renderStatusLine, dialogRowAt, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, handleLineInputKey, humanizeLabel, humanizeTitle, indexOfKey, isThumbRow, layoutList, moveSelection, rowKey, scrollForSelection, scrollbarGeometry, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
+import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, dialogValueColumn, numericValues, RAIL_COLUMNS, renderDialogPanel, renderEmptyState, renderGroupHeader, renderInputRow, renderListRow, renderNote, renderStatusLine, dialogRowAt, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, handleLineInputKey, humanizeLabel, humanizeTitle, indexOfKey, isThumbRow, layoutList, moveSelection, rowKey, scrollForSelection, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, ScrollbarRails, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
 import { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 export { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 const SCOPE = SETTINGS_APP_ID;
 /** The panel a setting with parts opens: its own keys, its own hint. */
 const DIALOG_SCOPE = `${SETTINGS_APP_ID}-parts`;
 const SCROLLBAR_TOP_INSET = 1;
+/** Identity of the settings list rail in the shared rail state. */
+const RAIL_KEY = "settings";
+// Compatibility: the transcript rail stays lit this long after a scroll, and repaints just after.
+const SCROLL_LINGER_MS = 900;
+const SCROLL_LINGER_REPAINT_MS = 925;
 const SEARCH_PLACEHOLDER = "search settings";
 /** What a structured value offers instead of printing itself. */
 const CONFIGURE = "configure";
@@ -16,8 +21,10 @@ SETTINGS_SHORTCUTS.declare({ key: "shift+up", scope: SCOPE, description: "Previo
 SETTINGS_SHORTCUTS.declare({ key: "shift+down", scope: SCOPE, description: "Next section", section: "Navigate", hint: { keys: "Shift+↑↓", does: "to jump" } }, "block-down");
 SETTINGS_SHORTCUTS.declare({ key: "pageUp", scope: SCOPE, description: "Up a page", section: "Navigate" }, "page-up");
 SETTINGS_SHORTCUTS.declare({ key: "pageDown", scope: SCOPE, description: "Down a page", section: "Navigate" }, "page-down");
-SETTINGS_SHORTCUTS.declare({ key: "home", scope: SCOPE, description: "First setting", section: "Navigate" }, "first");
-SETTINGS_SHORTCUTS.declare({ key: "end", scope: SCOPE, description: "Last setting", section: "Navigate" }, "last");
+// Compatibility: the same chords the transcript uses for its content boundaries; plain
+// Home and End stay with the search input's cursor.
+SETTINGS_SHORTCUTS.declare({ key: "ctrl+home", scope: SCOPE, description: "First setting", section: "Navigate" }, "first");
+SETTINGS_SHORTCUTS.declare({ key: "ctrl+end", scope: SCOPE, description: "Last setting", section: "Navigate" }, "last");
 SETTINGS_SHORTCUTS.declare({ key: "enter", scope: SCOPE, description: "Change value", section: "Change", hint: { keys: "Enter/Space", does: "to change" } }, "activate");
 SETTINGS_SHORTCUTS.declare({ key: "space", scope: SCOPE, description: "Change value", section: "Change", hint: { keys: "Enter/Space", does: "to change" } }, "activate");
 SETTINGS_SHORTCUTS.declare({ key: "left", scope: SCOPE, description: "Previous value", section: "Change", hint: { keys: "←→", does: "to adjust" } }, "previous-value");
@@ -39,8 +46,11 @@ const KEYS = {
     "\u001b[C": "right",
     "\u001b[5~": "pageUp",
     "\u001b[6~": "pageDown",
-    "\u001b[H": "home",
-    "\u001b[F": "end",
+    // Protocol: xterm modifier form, then the rxvt Ctrl form of the same chords.
+    "\u001b[1;5H": "ctrl+home",
+    "\u001b[1;5F": "ctrl+end",
+    "\u001b[7^": "ctrl+home",
+    "\u001b[8^": "ctrl+end",
     "\u001b": "escape",
     "\r": "enter",
     "\n": "enter",
@@ -76,6 +86,14 @@ export class SettingsApp {
     #hoverRegion = "label";
     #frameRows = [];
     #menuFrame = null;
+    // Invariant: rail hover and drag live in the shared keyed state, as the transcript's do.
+    #rails = new ScrollbarRails();
+    // Rationale: the rail as drawn in the last frame, or null when nothing can be pointed at.
+    #railFrame = null;
+    // Invariant: a scroll lights the rail until this time; the timer repaints once it has passed.
+    #activeUntil = 0;
+    #activityTimer;
+    #renderedScroll;
     constructor(session) {
         this.#session = session;
     }
@@ -85,6 +103,10 @@ export class SettingsApp {
             host.requestRender();
         });
     }
+    onClose(_host) {
+        this.#clearActivityTimer();
+        this.#rails.clear();
+    }
     render(rect, host) {
         const theme = host.theme ?? PLAIN_THEME;
         this.#interruptArmed = host.interruptArmed;
@@ -102,7 +124,17 @@ export class SettingsApp {
         this.#reveal = undefined;
         const layout = layoutList(rows, bodyHeight, this.#scroll);
         this.#scroll = layout.scroll;
-        const contentWidth = Math.max(0, rect.width - RAIL_COLUMNS);
+        const now = Date.now();
+        // Rationale: every way of scrolling ends in this frame, so a moved list is noticed here
+        // once rather than at each wheel, drag, key, and search branch.
+        if (this.#renderedScroll !== undefined && this.#renderedScroll !== layout.scroll)
+            this.#noteScrollActivity(host, now);
+        this.#renderedScroll = layout.scroll;
+        // Invariant: auto and always keep the rail columns while the list fits, so a revealed
+        // rail never reflows the rows; hidden gives the columns back to the rows.
+        const appearance = this.#scrollbarAppearance();
+        const reservesRail = appearance !== "hidden";
+        const contentWidth = reservesRail ? Math.max(0, rect.width - RAIL_COLUMNS) : rect.width;
         const valueColumn = this.#valueColumn(rows);
         const geometry = scrollbarGeometry({
             contentLength: rows.length,
@@ -110,6 +142,22 @@ export class SettingsApp {
             scroll: layout.scroll,
             trackHeight: Math.max(0, bodyHeight - SCROLLBAR_TOP_INSET),
         });
+        const presentation = scrollbarPresentation({
+            geometry,
+            appearance,
+            style: this.#scrollbarStyle(),
+            hovered: this.#rails.isHovered(RAIL_KEY),
+            dragging: this.#rails.isDragging(RAIL_KEY),
+            activeUntil: this.#activeUntil,
+            now,
+        });
+        this.#railFrame = reservesRail && geometry !== null
+            ? {
+                rail: { key: RAIL_KEY, column: rect.width, rowStart: SCROLLBAR_TOP_INSET, trackHeight: geometry.trackHeight },
+                geometry,
+                page: layout.visible,
+            }
+            : null;
         const body = [];
         this.#frameRows = [];
         if (rows.length === 0) {
@@ -140,8 +188,9 @@ export class SettingsApp {
         }
         const withRail = withScrollbarRail(body.slice(0, bodyHeight), geometry, contentWidth, theme, {
             topInset: SCROLLBAR_TOP_INSET,
+            presentation,
         });
-        return this.#withMenu([...withRail, ...footer], selected, layout, valueColumn, theme, rect);
+        return this.#withMenu([...withRail, ...footer], selected, layout, valueColumn, theme, rect, reservesRail ? RAIL_COLUMNS : 0);
     }
     onInput(data, host) {
         if (this.#structured !== null)
@@ -278,13 +327,16 @@ export class SettingsApp {
             this.#scroll = Math.max(0, this.#scroll + (event.kind === "wheel-down" ? distance : -distance));
             return { consumed: true };
         }
+        const rail = this.#railPointer(event);
+        if (rail.owned)
+            return { consumed: true };
         const row = this.#frameRows.find(candidate => candidate.screenRow === event.row - 1);
         const previousKey = this.#hoverKey;
         const previousRegion = this.#hoverRegion;
         if (row === undefined) {
             this.#hoverKey = null;
             this.#hoverRegion = "label";
-            return { consumed: event.kind !== "motion", render: previousKey !== null };
+            return { consumed: event.kind !== "motion", render: previousKey !== null || rail.changed };
         }
         this.#hoverKey = row.key;
         this.#hoverRegion = regionAt(row, event.column);
@@ -303,9 +355,55 @@ export class SettingsApp {
             }
             return { consumed: true };
         }
-        const changed = previousKey !== this.#hoverKey || previousRegion !== this.#hoverRegion;
+        const changed = previousKey !== this.#hoverKey || previousRegion !== this.#hoverRegion || rail.changed;
         return { consumed: event.kind !== "motion", render: changed };
     }
+    // Rationale: the rail takes its share of a pointer report first: hover, a thumb drag, or a
+    // track page. Owned means the list must not see the report; changed means the rail looks different.
+    #railPointer(event) {
+        const frame = this.#railFrame;
+        const wasHovered = this.#rails.isHovered(RAIL_KEY);
+        if (frame === null) {
+            this.#rails.clear();
+            return { owned: false, changed: wasHovered };
+        }
+        const pointer = { column: event.column, row: event.row - 1 };
+        if (this.#rails.isDragging(RAIL_KEY)) {
+            // Invariant: a drag keeps the pointer wherever it goes until the button comes up.
+            if (event.kind === "release")
+                this.#rails.endDrag();
+            else {
+                const target = this.#rails.dragTo(frame.rail, frame.geometry, pointer);
+                if (target !== null)
+                    this.#scroll = target;
+            }
+            return { owned: true, changed: true };
+        }
+        const over = this.#rails.notePointer([frame.rail], pointer) !== null;
+        if (!over)
+            return { owned: false, changed: wasHovered };
+        // Invariant: the rail is not a row: pointing at it lights nothing in the list.
+        this.#hoverKey = null;
+        this.#hoverRegion = "label";
+        if (event.kind === "press" && !this.#rails.beginDrag(frame.rail, frame.geometry, pointer)) {
+            this.#scroll = scrollForTrackPage(frame.geometry, pointer.row - frame.rail.rowStart, this.#scroll, frame.page);
+        }
+        return { owned: true, changed: true };
+    }
+    #noteScrollActivity(host, now) {
+        this.#activeUntil = Math.max(this.#activeUntil, now + SCROLL_LINGER_MS);
+        this.#clearActivityTimer();
+        this.#activityTimer = setTimeout(() => {
+            this.#activityTimer = undefined;
+            host.requestRender();
+        }, SCROLL_LINGER_REPAINT_MS);
+        this.#activityTimer.unref?.();
+    }
+    #clearActivityTimer() {
+        if (this.#activityTimer !== undefined)
+            clearTimeout(this.#activityTimer);
+        this.#activityTimer = undefined;
+    }
     #openMenu(rows, selected) {
         const row = rows[selected];
         if (row === undefined || row.kind !== "element")
@@ -348,6 +446,7 @@ export class SettingsApp {
         // thing under the pointer, so it stops looking like it.
         this.#hoverKey = null;
         this.#hoverRegion = "label";
+        this.#rails.clear();
         this.#structured = { entry, flags: entry.flags.map(flag => flag.key), index: 0, record };
     }
     #structuredKey(data) {
@@ -410,13 +509,15 @@ export class SettingsApp {
         if (input === null)
             return { consumed: false };
         const key = KEYS[data];
-        if (key === "home" || key === "end") {
+        // Rationale: the boundary chords jump through the results; plain Home and End stay with
+        // the search cursor, which the shared line input moves below.
+        if (key === "ctrl+home" || key === "ctrl+end") {
             const rows = this.#rows();
             const selectable = selectableIndexes(rows);
-            const target = key === "end" ? selectable.at(-1) : selectable[0];
+            const target = key === "ctrl+end" ? selectable.at(-1) : selectable[0];
             if (target !== undefined) {
                 this.#select(rows, target);
-                if (key === "home")
+                if (key === "ctrl+home")
                     this.#scroll = 0;
             }
             return { consumed: true };
@@ -502,11 +603,22 @@ export class SettingsApp {
         return this.#pending.get(`${entry.backend}:${entry.id}`) ?? entry.value;
     }
     #scrollbarSpeed() {
+        const value = this.#scrollSetting("scrollbarSpeed");
+        return isScrollbarSpeed(value) ? value : "normal";
+    }
+    #scrollbarAppearance() {
+        const value = this.#scrollSetting("scrollbarAppearance");
+        return value === "always" || value === "hidden" ? value : "auto";
+    }
+    #scrollbarStyle() {
+        return this.#scrollSetting("scrollbarStyle") === "thick" ? "thick" : "thin";
+    }
+    // Invariant: a Scroll setting reads as the screen shows it: an accepted value first, then the source.
+    #scrollSetting(id) {
         const entry = this.#session.sections()
             .flatMap(section => section.entries)
-            .find(candidate => candidate.backend === "a1" && candidate.id === "scrollbarSpeed");
-        const value = entry === undefined ? this.#session.value("scrollbarSpeed") : this.#shownValue(entry);
-        return isScrollbarSpeed(value) ? value : "normal";
+            .find(candidate => candidate.backend === "a1" && candidate.id === id);
+        return entry === undefined ? this.#session.value(id) : this.#shownValue(entry);
     }
     #jump(rows, target) {
         this.#select(rows, target);
@@ -590,7 +702,7 @@ export class SettingsApp {
             ...(typeof shown === "number" && entry.editable ? { stepper: stepperEnds(range, shown) } : {}),
         };
     }
-    #withMenu(lines, _selected, _layout, valueColumn, theme, rect) {
+    #withMenu(lines, _selected, _layout, valueColumn, theme, rect, reservedRight) {
         const menu = this.#menu;
         const anchor = menu === null ? undefined : this.#frameRows.find(candidate => candidate.key === menu.anchorKey);
         if (menu === null || anchor === undefined) {
@@ -605,7 +717,7 @@ export class SettingsApp {
         const frame = valueMenuFrame(state, { screenRow: anchor.screenRow, valueColumn }, {
             bodyHeight: lines.length - this.#footerHeight,
             surfaceWidth: rect.width,
-            reservedRight: RAIL_COLUMNS,
+            reservedRight,
         });
         this.#menuFrame = frame;
         return renderValueMenu(lines, state, frame, theme);

package/dist/integrations/pi/components/shell-footer-status.js

@@ -75,19 +75,29 @@ export function createPiShellStatus(view, formatProgressStatus, runtime) {
     const statusUi = createTuiFacade(runtime ?? { getColumns: () => 80, getRows: () => 24, requestRender() { } });
     let workingOverride;
     let outputPad = PINNED_PI_LAYOUT.outputPad;
+    let progressPresentation = "pinned";
     let placement = statusPlacement(view, workingOverride);
-    let component = statusComponent(view, statusUi, workingOverride, outputPad, formatProgressStatus, placement);
-    let signature = statusSignature(view, workingOverride, outputPad, placement);
+    const liveStatusText = () => formatProgressStatus(liveWorkingText(view, workingOverride, progressPresentation));
+    let component = statusComponent(view, statusUi, outputPad, liveStatusText, placement);
+    let signature = statusSignature(view, workingOverride, outputPad, placement, progressPresentation);
     const rebuild = () => {
         const nextPlacement = statusPlacement(view, workingOverride);
-        const nextSignature = statusSignature(view, workingOverride, outputPad, nextPlacement);
+        const nextSignature = statusSignature(view, workingOverride, outputPad, nextPlacement, progressPresentation);
         if (nextSignature === signature)
             return;
+        // Performance: progress ticks change only the live message; the spinner keeps its frame and timer.
+        if (placement === "live" && nextPlacement === "live" && component instanceof WorkingStatusIndicator
+            && statusSignature(view, workingOverride, outputPad, nextPlacement, progressPresentation, false)
+                === statusSignature(view, workingOverride, outputPad, placement, progressPresentation, false)) {
+            component.setMessage(liveStatusText());
+            signature = nextSignature;
+            return;
+        }
         if (component !== undefined && "dispose" in component && typeof component.dispose === "function")
             component.dispose();
         placement = nextPlacement;
         signature = nextSignature;
-        component = statusComponent(view, statusUi, workingOverride, outputPad, formatProgressStatus, placement);
+        component = statusComponent(view, statusUi, outputPad, liveStatusText, placement);
     };
     return {
         render: width => component?.render(width) ?? [],
@@ -107,6 +117,10 @@ export function createPiShellStatus(view, formatProgressStatus, runtime) {
             outputPad = padding;
             rebuild();
         },
+        setProgressPresentation(presentation) {
+            progressPresentation = presentation;
+            rebuild();
+        },
         dispose() {
             if (component !== undefined && "dispose" in component && typeof component.dispose === "function")
                 component.dispose();
@@ -145,9 +159,18 @@ function statusPlacement(view, workingOverride) {
         return "dock";
     return view.status.workingMessage === null ? "hidden" : "dock";
 }
-function statusComponent(view, ui, workingOverride, outputPad, formatProgressStatus, placement) {
+// Rationale: the engine publishes the semantic working word and a separate measured percent; bare A1
+// composes them here, while the pinned route keeps the bare word for comparison with Pi.
+function liveWorkingText(view, workingOverride, progressPresentation) {
+    const message = workingOverride ?? view.status.workingMessage ?? "Working";
+    const progress = view.status.workingProgress;
+    return workingOverride === undefined && progressPresentation === "custom-viewport" && typeof progress === "number"
+        ? `${message} (${progress}%)`
+        : message;
+}
+function statusComponent(view, ui, outputPad, liveStatusText, placement) {
     if (placement === "live") {
-        return new WorkingStatusIndicator(ui, formatProgressStatus(workingOverride ?? view.status.workingMessage ?? "Working"));
+        return new WorkingStatusIndicator(ui, liveStatusText());
     }
     if (placement === "dock") {
         if (view.lifecycle === "failed") {
@@ -157,8 +180,9 @@ function statusComponent(view, ui, workingOverride, outputPad, formatProgressSta
     }
     return undefined;
 }
-function statusSignature(view, workingOverride, outputPad, placement) {
-    return `${placement}\u0000${outputPad}\u0000${view.lifecycle}\u0000${workingOverride ?? ""}\u0000${view.status.workingMessage ?? ""}\u0000${view.status.diagnostics.at(-1) ?? ""}`;
+function statusSignature(view, workingOverride, outputPad, placement, progressPresentation, withMessage = true) {
+    const message = withMessage ? `${workingOverride ?? ""}\u0000${view.status.workingMessage ?? ""}\u0000${view.status.workingProgress ?? ""}` : "";
+    return `${placement}\u0000${outputPad}\u0000${view.lifecycle}\u0000${progressPresentation}\u0000${message}\u0000${view.status.diagnostics.at(-1) ?? ""}`;
 }
 function queuedInputText(submissions, presentation) {
     if (submissions.length === 0)

package/dist/integrations/pi/components/shell-shared-facade.d.ts

@@ -79,6 +79,8 @@ export type PiShellStatusPlacement = "live" | "dock" | "hidden";
 export interface PiShellStatusPort extends PiShellViewComponentPort {
     setWorkingOverride(message: string | undefined): void;
     setOutputPad(padding: 0 | 1): void;
+    /** Bare A1 shows engine-measured progress beside the working word; the pinned route keeps the bare word. */
+    setProgressPresentation(presentation: "pinned" | "custom-viewport"): void;
     /** Semantic row placement; callers must not inspect rendered text. */
     placement(): PiShellStatusPlacement;
     renderDock(width: number): readonly string[];

package/dist/integrations/pi/components/upstream/components/owned-editor.js

@@ -44,12 +44,12 @@ export function createOwnedEditorClass(Base) {
                 && this.getText().length === 0
                 && !this.isShowingAutocomplete();
         }
-        /** True when autocomplete is searching one top-level slash command that is the editor's only content. */
+        /** True when autocomplete is searching one space-free slash command that is the editor's only content. */
         isTopLevelCommandSearch() {
             if (!this.isShowingAutocomplete())
                 return false;
             const text = this.getText();
-            if (!/^\/[^\s/]*$/.test(text))
+            if (!/^\/\S*$/.test(text))
                 return false;
             const cursor = this.getCursor();
             return cursor.line === 0 && cursor.col === text.length;

package/dist/integrations/pi/engine/adapter.js

@@ -14,6 +14,7 @@ import { OWNED_UI_EXTENSION_CONTRACT_VERSION, OWNED_UI_EXTENSION_RENDER_CALLBACK
 import { PINNED_PI_SETTINGS_CALLBACKS, PINNED_PI_WORKFLOW_COMMAND_NAMES, } from "./workflows.js";
 import { createPiRuntimeIntegration } from "./runtime-integration.js";
 import { PiSessionCommandIntegration } from "./session-integration.js";
+import { observeCompactionProgress } from "./compaction-progress.js";
 import { PiSettingsIntegration } from "./settings-integration.js";
 import { PendingEngineDelivery } from "./pending-delivery.js";
 /** Explicit flush failure when required delivery was interrupted rather than completed. */
@@ -147,6 +148,7 @@ export class PiEngineAdapter {
     #assistantResponseSequence = 0;
     #statusKind = null;
     #sessionCommands;
+    #compactionProgress = null;
     #gitBranch = null;
     #extensionUi;
     #extensionShutdown;
@@ -1059,6 +1061,7 @@ export class PiEngineAdapter {
     clearQueuedWorkflows() {
         const session = this.#requireWorkflowSession();
         const result = session.clearQueue?.();
+        this.#sessionCommands?.forgetQueuedImages();
         if (!isRecord(result))
             return [];
         return [...readStringArray(result.steering), ...readStringArray(result.followUp)];
@@ -1257,6 +1260,8 @@ export class PiEngineAdapter {
         this.#emitEvent({ type: "session-lifecycle", lifecycle: "stopping", reason: null });
         this.#unsubscribe?.();
         this.#unsubscribe = undefined;
+        this.#compactionProgress?.dispose();
+        this.#compactionProgress = null;
         await this.#runtime?.dispose();
         this.#lifecycle = "stopped";
         this.#emitEvent({ type: "session-lifecycle", lifecycle: "stopped", reason: null });
@@ -2016,6 +2021,11 @@ export class PiEngineAdapter {
         this.#activeCommandIds = [];
         this.#completedCommands.clear();
         this.#sessionCommands = new PiSessionCommandIntegration(session);
+        this.#compactionProgress?.dispose();
+        this.#compactionProgress = observeCompactionProgress(session, percent => {
+            if (this.#session === session && !this.#disposed)
+                this.#publishCompactionProgress(percent);
+        });
         this.#editor = {
             text: "",
             queuedSubmissions: [],
@@ -2024,7 +2034,7 @@ export class PiEngineAdapter {
             historyRevision: this.#editor.historyRevision + 1,
             submitEnabled: true,
         };
-        this.#status = { ...this.#status, workingMessage: null, badges: [] };
+        this.#status = { ...this.#status, workingMessage: null, workingProgress: null, badges: [] };
         this.#statusKind = null;
         this.#agentRunActive = false;
         this.#agentRunSequence = 0;
@@ -2115,7 +2125,7 @@ export class PiEngineAdapter {
         const wasBusy = this.#lifecycle === "busy";
         this.#statusKind = kind;
         this.#lifecycle = "busy";
-        this.#status = { ...this.#status, workingMessage: message };
+        this.#status = { ...this.#status, workingMessage: message, workingProgress: null };
         if (!wasBusy)
             this.#emitEvent({ type: "session-lifecycle", lifecycle: "busy", reason: null });
         this.#emitEvent({ type: "status", status: this.#status });
@@ -2133,10 +2143,32 @@ export class PiEngineAdapter {
     #leaveWorkStates() {
         this.#statusKind = null;
         this.#lifecycle = "ready";
-        this.#status = { ...this.#status, workingMessage: null };
+        this.#status = { ...this.#status, workingMessage: null, workingProgress: null };
         this.#emitEvent({ type: "session-lifecycle", lifecycle: "ready", reason: null });
         this.#emitEvent({ type: "status", status: this.#status });
     }
+    // Invariant: progress belongs to the compaction state only and is published when the integer changes.
+    #publishCompactionProgress(percent) {
+        if (this.#statusKind !== "compaction" || this.#status.workingProgress === percent)
+            return;
+        this.#status = { ...this.#status, workingProgress: percent };
+        this.#emitEvent({ type: "status", status: this.#status });
+    }
+    // Rationale: a manual compaction ends with an idle session, so the engine would never consume
+    // the messages queued during it; automatic compaction returns to a run or a pending prompt.
+    #deliverQueuedAfterCompaction() {
+        const commands = this.#sessionCommands;
+        const generation = this.#sessionGeneration;
+        if (commands === undefined)
+            return;
+        const report = (error) => {
+            if (generation !== this.#sessionGeneration || this.#disposed)
+                return;
+            this.#addDiagnostic("error", "engine-command", `Queued input could not be sent after compaction: ${error instanceof Error ? error.message : String(error)}`, true);
+            this.#emitView();
+        };
+        commands.deliverQueuedAfterCompaction(report).catch(report);
+    }
     #handlePiEvent(event) {
         try {
             this.#applyPiEvent(event);
@@ -2286,9 +2318,13 @@ export class PiEngineAdapter {
                 return;
             case "compaction_start":
                 this.#enterWorkState("compaction", "Compacting");
+                this.#compactionProgress?.begin();
                 return;
             case "compaction_end":
+                this.#compactionProgress?.end();
                 this.#endWorkState("compaction");
+                if (event.reason === "manual")
+                    this.#deliverQueuedAfterCompaction();
                 return;
             case "thinking_level_changed":
                 this.#thinkingLevel = readThinkingLevel(event.level);
@@ -2797,10 +2833,12 @@ export class PiEngineAdapter {
         this.#admissionStopped = !canResume;
         this.#unsubscribe?.();
         this.#unsubscribe = undefined;
+        this.#compactionProgress?.dispose();
+        this.#compactionProgress = null;
         ++this.#sessionGeneration;
         this.#agentRunActive = false;
         this.#statusKind = null;
-        this.#status = { ...this.#status, workingMessage: null };
+        this.#status = { ...this.#status, workingMessage: null, workingProgress: null };
         this.#lifecycle = this.#disposed ? "stopped" : canResume ? "ready" : "failed";
         this.#editor = { ...this.#editor, submitEnabled: canResume && !this.#disposed };
         this.#viewRevision += 1;

package/dist/integrations/pi/engine/compaction-progress.d.ts

@@ -0,0 +1,28 @@
+/** Expected summary size for a first compaction, when no previous summary on the branch can serve as the estimate. */
+export declare const DEFAULT_EXPECTED_COMPACTION_SUMMARY_CHARS = 4000;
+/** The public session surface compaction progress reads: the agent's stream function and the branch entries. */
+export interface CompactionProgressSession {
+    readonly agent?: {
+        streamFunction?: unknown;
+    } | undefined;
+    readonly sessionManager?: {
+        getBranch?(): readonly unknown[];
+    } | undefined;
+}
+export interface CompactionProgressObserver {
+    /** Marks `compaction_start`: resets the streamed count and captures the expected summary size. */
+    begin(): void;
+    /** Marks `compaction_end`: later stream chunks are ignored. */
+    end(): void;
+    /** Restores the original stream function; the observer reports nothing afterwards. */
+    dispose(): void;
+}
+/**
+ * Observes the summarization stream of a compaction through the session agent's public stream
+ * function and reports an estimated integer percent. Pi never iterates that stream itself (it
+ * reads only its final result), so the observer iterates it in the background between
+ * `begin()` and `end()` and returns the same stream object to Pi. Outside that window the
+ * wrapper is a pass-through. Returns null when the agent exposes no callable stream function,
+ * in which case compaction proceeds without progress.
+ */
+export declare function observeCompactionProgress(session: CompactionProgressSession, onProgress: (percent: number) => void): CompactionProgressObserver | null;