@timurproko/a1 0.2.5-dev.683 → 0.2.5-dev.698

package/dist/integrations/pi/components/upstream/components/thinking-selector.js

@@ -5,17 +5,20 @@
  * selection, and focus while accepting the active bare-A1 cycle-key label from the shell, styling the
  * title with the established bold semantic accent treatment, placing it directly below the top rule
  * through the shared compact padded modal frame and its muted hint directly below it, deduplicating
- * levels, and rendering aligned muted descriptions after fixed active and bracketed default columns.
- * Bare A1 persists defaults immediately on Space, closes only on Escape, and uses the shared compact
- * semantic shortcut row. All list and border colors use the owned theme and its explicit color mode.
- * The comparison profile retains the public pinned component.
+ * levels, and rendering exclusive radio-style default markers before level names, an item-adjacent
+ * active checkmark, and aligned muted descriptions. Bare A1 persists defaults immediately on Space,
+ * closes through the implicit Ctrl+C-capable selection-cancel action, and uses the shared compact
+ * semantic shortcut row without advertising that alias. All list and border colors use the owned theme
+ * and its explicit color mode. Selected rows use the shared bare-A1 blue selection surface only around
+ * the rendered item span, with the existing accent arrow, normal-text level, and preserved
+ * current/default/description roles. The comparison profile retains the public pinned component.
  * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading,
- * owned-thinking-selector-controls.
+ * owned-thinking-selector-controls, owned-dialog-ctrl-c-cancel, owned-standard-dialog-selection.
  */
-import { Container, fuzzyFilter, getKeybindings, Input, Key, matchesKey, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
+import { Container, fuzzyFilter, getKeybindings, Input, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
 import { addPiModalHeader, adoptPiModalFrame } from "../../modal-frame.js";
-import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, piTheme, renderPiModalListRow, renderPiModalShortcutHints } from "../../theme.js";
 const THINKING_SELECT_LIST_LAYOUT = {
     minPrimaryColumnWidth: 12,
     maxPrimaryColumnWidth: 32,
@@ -29,6 +32,25 @@ const LEVEL_DESCRIPTIONS = {
     xhigh: "Extra-high reasoning (~32k tokens)",
     max: "Maximum reasoning",
 };
+class ThinkingSelectListPresentation {
+    list;
+    items;
+    constructor(list, items) {
+        this.list = list;
+        this.items = items;
+    }
+    invalidate() {
+        this.list.invalidate();
+    }
+    handleMouse(event) {
+        return this.list.handleMouse(event);
+    }
+    render(width) {
+        const selected = this.list.getSelectedItem();
+        const selectedIndex = selected === null ? -1 : this.items.findIndex((item) => item.value === selected.value);
+        return this.list.render(width).map((row, index) => renderPiModalListRow(row, width, index === selectedIndex));
+    }
+}
 /** Bare-A1 thinking-level selector with profile-resolved shortcut presentation. */
 export class OwnedThinkingSelectorComponent extends Container {
     searchInput;
@@ -67,15 +89,16 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.searchInput.onSubmit = () => this.selectList.handleInput("\r");
         this.addChild(this.searchInput);
         this.addChild(new Spacer(1));
-        this.selectList = this.buildSelectList(this.allItems, currentLevel);
+        const initialList = this.buildSelectList(this.allItems, currentLevel);
+        this.selectList = initialList.list;
         this.selectListContainer = new Container();
-        this.selectListContainer.addChild(this.selectList);
+        this.selectListContainer.addChild(initialList.presentation);
         this.addChild(this.selectListContainer);
         this.addChild(new Spacer(1));
         this.addChild(new Text(renderPiModalShortcutHints([
             { key: this.keyDisplayText("tui.select.confirm"), action: "select" },
             { key: "Space", action: "default" },
-            { key: "Esc", action: "close" },
+            DIALOG_CLOSE_SHORTCUT_HINT,
         ]), 0, 0));
         this.addChild(new DynamicBorder((text) => piTheme().fg("border", text)));
         adoptPiModalFrame(this, { topIndex: 0, bottomIndex: this.children.length - 1, header });
@@ -89,29 +112,43 @@ export class OwnedThinkingSelectorComponent extends Container {
             .join("/");
     }
     buildSelectList(items, preselect) {
+        const theme = piTheme();
         const levelWidth = this.allItems.reduce((widest, item) => Math.max(widest, (item.label ?? item.value).length), 0);
+        const selectedDefaultMarker = theme.fg("accent", "◉");
+        const unselectedDefaultMarker = theme.fg("dim", "○");
         const themedItems = items.map((item) => {
-            const level = (item.label ?? item.value).padEnd(levelWidth);
-            const currentMarker = item.value === this.currentLevel ? ` ${piTheme().fg("success", "✓")}` : "  ";
-            const defaultMarker = item.value === this.defaultThinkingLevel
-                ? ` ${piTheme().fg("muted", "[default]")}`
-                : "          ";
-            const description = item.description ? piTheme().fg("muted", item.description) : "";
-            return { value: item.value, label: `${level}${currentMarker}${defaultMarker} ${description}` };
+            const level = item.label ?? item.value;
+            const isCurrent = item.value === this.currentLevel;
+            const currentMarker = isCurrent ? ` ${theme.fg("success", "✓")}` : "";
+            const statePadding = " ".repeat(levelWidth - level.length + (isCurrent ? 0 : 2));
+            const defaultMarker = item.value === this.defaultThinkingLevel ? selectedDefaultMarker : unselectedDefaultMarker;
+            const description = item.description ? theme.fg("muted", item.description) : "";
+            return { value: item.value, label: `${defaultMarker} ${level}${currentMarker}${statePadding} ${description}` };
         });
         // Invariant: the bare selector uses the owned theme's explicit color mode, not upstream's host detection.
         const list = new SelectList(themedItems, Math.max(1, themedItems.length), {
-            selectedPrefix: text => piTheme().fg("accent", text),
-            selectedText: text => piTheme().fg("accent", text),
-            description: text => piTheme().fg("muted", text),
-            scrollInfo: text => piTheme().fg("muted", text),
-            noMatch: text => piTheme().fg("muted", text),
+            selectedPrefix: text => theme.fg("accent", text),
+            selectedText: text => {
+                const arrowEnd = text.startsWith("→ ") ? 2 : 0;
+                const arrow = arrowEnd === 0 ? "" : theme.fg("accent", text.slice(0, arrowEnd));
+                const marker = text.includes(selectedDefaultMarker) ? selectedDefaultMarker : unselectedDefaultMarker;
+                const markerIndex = text.indexOf(marker, arrowEnd);
+                return markerIndex === -1
+                    ? arrow + theme.fg("text", text.slice(arrowEnd))
+                    : arrow
+                        + theme.fg("text", text.slice(arrowEnd, markerIndex))
+                        + marker
+                        + theme.fg("text", text.slice(markerIndex + marker.length));
+            },
+            description: text => theme.fg("muted", text),
+            scrollInfo: text => theme.fg("muted", text),
+            noMatch: text => theme.fg("muted", text),
         }, THINKING_SELECT_LIST_LAYOUT);
         const currentIndex = themedItems.findIndex((item) => item.value === preselect);
         if (currentIndex !== -1)
             list.setSelectedIndex(currentIndex);
         list.onSelect = (item) => this.onSelect(item.value);
-        return list;
+        return { list, presentation: new ThinkingSelectListPresentation(list, themedItems) };
     }
     applyFilter(query) {
         const filtered = query
@@ -120,8 +157,8 @@ export class OwnedThinkingSelectorComponent extends Container {
         const selectedValue = this.selectList.getSelectedItem()?.value;
         const newList = this.buildSelectList(filtered, selectedValue);
         this.selectListContainer.clear();
-        this.selectListContainer.addChild(newList);
-        this.selectList = newList;
+        this.selectListContainer.addChild(newList.presentation);
+        this.selectList = newList.list;
     }
     handleInput(keyData) {
         const kb = getKeybindings();
@@ -134,7 +171,7 @@ export class OwnedThinkingSelectorComponent extends Container {
             }
             return;
         }
-        if (matchesKey(keyData, Key.escape)) {
+        if (kb.matches(keyData, "tui.select.cancel")) {
             this.onCancel();
             return;
         }

package/dist/integrations/pi/components/upstream/components/tree-selector.d.ts

@@ -1,11 +1,17 @@
 /**
  * Provenance: @earendil-works/pi-coding-agent 1.0.4 (MIT), commit 7c10bd4337495ee613f2224843ecdf349b80d1df,
  * packages/coding-agent/src/modes/interactive/components/tree-selector.ts.
- * Modifications: Source-synchronized tree selector port: preserve filtering, folding, labels, copying,
- * tree navigation, key hints, focus, and viewport behavior while remapping public types/components
- * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton;
- * bare A1 uses the shared semantic modal shortcut row and compact padded modal frame.
- * Deviations: owned-modal-shortcut-hints.
+ * Modifications: Port remaps public types/components plus owned keybindings/theme helpers while
+ * preserving tree behavior; bare A1 uses compact modal chrome and label editing, four-mode
+ * Models-style filter status with Tab/Shift+Tab directional cycling and concise all-first presentation
+ * excluding internal bookkeeping, standard search input, blue item-bounded menu-arrow selection that
+ * preserves per-entry semantic foregrounds and has no path bullets, accent entry labels, bracketed
+ * timestamps, and plain label-time status, semantic role colors with session naming for the system
+ * root, standard paging/first-last/non-root containing-branch folding keys with a permanently expanded
+ * system session entry even behind hidden metadata, single-character ellipses on both clipped edges
+ * with bracket-delimiter preservation and selected-fragment highlighting, and Models-ordered semantic
+ * shortcut footers without a redundant select hint.
+ * Deviations: owned-modal-shortcut-hints, owned-session-tree-dialog.
  */
 import { type Component, Container, type Focusable } from "@earendil-works/pi-tui";
 import { type SessionTreeNode } from "@earendil-works/pi-coding-agent";
@@ -22,9 +28,9 @@ declare class TreeList implements Component {
     private toolCallMap;
     private multipleRoots;
     private showLabelTimestamps;
-    private activePathIds;
     private visibleParentMap;
     private visibleChildrenMap;
+    private sessionRootIds;
     private lastSelectedId;
     private foldedNodes;
     onSelect?: (entryId: string) => void;
@@ -37,8 +43,6 @@ declare class TreeList implements Component {
      * Returns the index in filteredNodes, or the last index as fallback.
      */
     private findNearestVisibleIndex;
-    /** Build the set of entry IDs on the path from root to current leaf */
-    private buildActivePath;
     private flattenTree;
     private applyFilter;
     /**
@@ -52,6 +56,7 @@ declare class TreeList implements Component {
     private getSearchableText;
     invalidate(): void;
     getSearchQuery(): string;
+    getFilterMode(): FilterMode;
     getSelectedNode(): SessionTreeNode | undefined;
     copySelected(): void;
     updateNodeLabel(entryId: string, label: string | undefined, labelTimestamp?: string): void;
@@ -66,18 +71,15 @@ declare class TreeList implements Component {
     private formatToolCall;
     handleInput(keyData: string): void;
     /**
-     * Whether a node can be folded. A node is foldable if it has visible children
-     * and is either a root (no visible parent) or a segment start (visible parent
-     * has multiple visible children).
+     * Whether a node can be folded. The system entry rendered as the session root
+     * stays expanded even when hidden metadata precedes it; other nodes are
+     * foldable when they have visible children and either appear at the filtered
+     * root or begin a segment below a visible branch point.
      */
     private isFoldable;
-    /**
-     * Find the index of the next branch segment start in the given direction.
-     * A segment start is the first child of a branch point.
-     *
-     * "up" walks the visible parent chain; "down" walks visible children
-     * (always following the first child).
-     */
+    /** Resolve the nearest expanded branch containing the selected entry. */
+    private findNearestExpandedBranch;
+    /** Find the next branch segment start for the retained modified-arrow shortcuts. */
     private findBranchSegmentStart;
 }
 /**
@@ -85,15 +87,22 @@ declare class TreeList implements Component {
  */
 export declare class TreeSelectorComponent extends Container implements Focusable {
     private treeList;
+    private readonly searchInput;
+    private readonly treeFilter;
+    private readonly titleText;
+    private readonly searchInputContainer;
+    private readonly treeContainer;
+    private readonly labelInputContainer;
+    private readonly footerContainer;
+    private readonly treeHelp;
     private labelInput;
-    private labelInputContainer;
-    private treeContainer;
     private onLabelChangeCallback;
     onCopy?: (text: string | undefined) => void;
     private _focused;
     get focused(): boolean;
     set focused(value: boolean);
     constructor(tree: SessionTreeNode[], currentLeafId: string | null, terminalHeight: number, onSelect: (entryId: string) => void, onCancel: () => void, onLabelChange?: (entryId: string, label: string | undefined) => void, initialSelectedId?: string, initialFilterMode?: FilterMode);
+    private restoreTreeContent;
     private showLabelInput;
     private hideLabelInput;
     handleInput(keyData: string): void;