@aui.io/apollo 0.1.12 → 0.1.13

package/node_modules/@aui.io/apollo-tui/dist/src/lib/jsonview.js

@@ -0,0 +1,114 @@
+/**
+ * JSON tree rows — trace/debug payloads rendered as a collapsible tree
+ * (IDE-inspector style: indented `key: value` rows, container previews with
+ * child counts) instead of a wall of stringified JSON. Pure data layer:
+ * expansion state lives in the caller keyed by stable row paths, the pane
+ * component renders rows and reports clicks back by index.
+ */
+function kindOf(value) {
+    if (value === null || value === undefined)
+        return "null";
+    if (Array.isArray(value))
+        return "array";
+    const t = typeof value;
+    if (t === "object")
+        return "object";
+    if (t === "number" || t === "bigint")
+        return "number";
+    if (t === "boolean")
+        return "boolean";
+    return "string";
+}
+/** Single-line scalar rendering; strings keep quotes so "" and "3" read. */
+function scalar(value, kind) {
+    if (kind === "null")
+        return value === undefined ? "undefined" : "null";
+    if (kind === "string")
+        return JSON.stringify(value);
+    return String(value);
+}
+function entries(value) {
+    return Array.isArray(value)
+        ? value.map((v, i) => [`[${i}]`, v])
+        : Object.entries(value);
+}
+function childPath(parent, key, isIndex) {
+    return isIndex ? `${parent}${key}` : `${parent}.${key}`;
+}
+/** Flatten `value` into visible rows honoring `expanded` paths. */
+export function jsonRows(value, expanded) {
+    const rows = [];
+    const walk = (node, path, key, depth) => {
+        const kind = kindOf(node);
+        if (kind !== "object" && kind !== "array") {
+            rows.push({
+                path,
+                depth,
+                key,
+                kind,
+                value: scalar(node, kind),
+                expandable: false,
+                expanded: false,
+            });
+            return;
+        }
+        const children = entries(node);
+        const isOpen = expanded.has(path) && children.length > 0;
+        rows.push({
+            path,
+            depth,
+            key,
+            kind,
+            value: kind === "array"
+                ? children.length === 0
+                    ? "[]"
+                    : `[${children.length}]`
+                : children.length === 0
+                    ? "{}"
+                    : `{${children.length}}`,
+            expandable: children.length > 0,
+            expanded: isOpen,
+        });
+        if (!isOpen)
+            return;
+        for (const [childKey, childValue] of children) {
+            walk(childValue, childPath(path, childKey, kind === "array"), childKey, depth + 1);
+        }
+    };
+    walk(value, "$", undefined, 0);
+    return rows;
+}
+/**
+ * Default expansion: containers down to `maxDepth` open (root = depth 0),
+ * so a fresh trace shows its shape without a click storm — deep payloads
+ * stay behind their previews.
+ */
+export function jsonDefaultExpanded(value, maxDepth = 2) {
+    const expanded = new Set();
+    const walk = (node, path, depth) => {
+        const kind = kindOf(node);
+        if (kind !== "object" && kind !== "array")
+            return;
+        const children = entries(node);
+        if (children.length === 0)
+            return;
+        if (depth >= maxDepth)
+            return;
+        expanded.add(path);
+        for (const [key, child] of children) {
+            walk(child, childPath(path, key, kind === "array"), depth + 1);
+        }
+    };
+    walk(value, "$", 0);
+    return expanded;
+}
+/** Toggle one container; returns a new set (state-friendly). */
+export function toggleJsonPath(expanded, path) {
+    const next = new Set(expanded);
+    if (next.has(path))
+        next.delete(path);
+    else
+        next.add(path);
+    return next;
+}
+//# sourceMappingURL=jsonview.js.map

package/node_modules/@aui.io/apollo-tui/dist/src/lib/jsonview.js.map

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

package/node_modules/@aui.io/apollo-tui/dist/src/opentui-app.js

@@ -14,7 +14,6 @@ import { resolveContext } from "@aui.io/apollo-core/config/index.js";
 import { listVersions } from "@aui.io/apollo-core/services/bundles.js";
 import { createClients } from "@aui.io/apollo-core/services/clients.js";
 import { listAgentThreads, listThreads, resolveSendVersion, sendMessage, } from "@aui.io/apollo-core/services/messaging.js";
-import { GlyphController } from "./components/glyph.js";
 import { applyPick, chatOverlay, destructiveSpec, IMPORT_LIVE_PREFIX, loadPickerCatalog, refreshContext, runDestructive, runSheetAction, runSimpleCommand, } from "./lib/actions.js";
 import { filterCommands, PLACE_ONBOARD_COMMAND, resolveCommand, SLASH_COMMANDS, } from "./lib/commands.js";
 import { checkConfirm, createConfirm } from "./lib/confirm.js";
@@ -47,14 +46,13 @@ import { Composer } from "./talk/Composer.js";
 import { agentOrdinal, beginSend, cancelSend, composerDisabledReason, hasPendingSend, inspectorMeta, lastAgentTurnIndex, settleSend, talkLayout, talkRows, threadSummaries, turnRowOffset, } from "./talk/data.js";
 import { NEW_THREAD_ROW, threadsRowCount } from "./talk/ThreadsPane.js";
 import { TalkView } from "./talk/TalkView.js";
+import { jsonDefaultExpanded, jsonRows, toggleJsonPath, } from "./lib/jsonview.js";
 import { ConfirmPane } from "./ui/ConfirmPane.js";
 import { PickerPane } from "./ui/PickerPane.js";
 import { SheetPane } from "./ui/SheetPane.js";
-import { G, unicodeSupported } from "./theme/glyphs.js";
-import { AMBER, DIM, FAINT, FG, TEAL, TEAL_DIM } from "./theme/tokens.js";
+import { G } from "./theme/glyphs.js";
+import { AMBER, DIM, FAINT, FG, RICH, TEAL, TEAL_DIM } from "./theme/tokens.js";
 const VERSION = process.env.npm_package_version ?? "0.1.11";
-/** Resolved once — glyph support can't change mid-session. */
-const UNICODE_OK = unicodeSupported();
 const REGISTRY = buildActionRegistry();
 /** Author-mode single-letter quick actions (typed + Enter). */
 const AUTHOR_QUICK = {
@@ -71,7 +69,7 @@ const AUTHOR_VIEW_FOCUS = {
     validation: "author-validation",
     versions: "author-versions",
 };
-function App({ context: initialContext, initialScope, glyph, onQuit }) {
+function App({ context: initialContext, initialScope, onQuit }) {
     const [context, setContext] = useState(initialContext);
     const [scope, setScope] = useState(initialScope);
     const [mode, setMode] = useState("author");
@@ -89,6 +87,11 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     const [activityCursor, setActivityCursor] = useState();
     const [paneTitle, setPaneTitle] = useState();
     const [paneLines, setPaneLines] = useState([]);
+    /** Structured payload behind the inline trace/debug overlay (JSON tree). */
+    const [paneJson, setPaneJson] = useState(undefined);
+    /** Expanded container paths for whichever trace/debug tree is on screen —
+     * inline overlay and inspector are mutually exclusive by layout width. */
+    const [jsonExpanded, setJsonExpanded] = useState(new Set());
     const [working, setWorking] = useState(false);
     const [trace, setTrace] = useState(false);
     const [localMode, setLocalMode] = useState(false);
@@ -99,9 +102,6 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
      */
     const [talkTag, setTalkTag] = useState(undefined);
     const [vars, setVars] = useState([]);
-    // The brand orb draws on a Braille canvas — decorative, so it simply
-    // disappears on terminals without Unicode fonts instead of garbling.
-    const [frame, setFrame] = useState(UNICODE_OK ? glyph.frame() : []);
     // Author workbench state (Phase 3).
     const [authorView, setAuthorView] = useState("home");
     const [snapshot, setSnapshot] = useState();
@@ -163,6 +163,11 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     const turnFeedRef = useRef([]);
     /** The one scrollable content pane on screen (diff/validation/versions/talk). */
     const contentScrollRef = useRef(null);
+    /** Turn/unit anchor renderables — position-exact scroll targets. Markdown
+     * block rows have variable height, so row counts alone can't locate a
+     * turn; the anchor's layout y (relative to the scroll content) can. */
+    const talkTurnRefs = useRef(new Map());
+    const sessionUnitRefs = useRef(new Map());
     /** Remote bundle contents cached per bound tag (content diffs). */
     const remoteFilesRef = useRef(undefined);
     /** Detects agent switches to reset per-agent author state. */
@@ -217,7 +222,9 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     /** Session rows are pre-wrapped to the pane width → exact scroll offsets. */
     const sessionPaneWidth = Math.max(30, termWidth - 8);
     const sessionRowsView = useMemo(() => authorSession
-        ? sessionRows(authorSession, sessionExpanded, sessionPaneWidth, queuedPrompts)
+        ? sessionRows(authorSession, sessionExpanded, sessionPaneWidth, queuedPrompts, {
+            markdown: RICH,
+        })
         : [], [authorSession, sessionExpanded, sessionPaneWidth, queuedPrompts]);
     // Talk workbench derivations: panes by width, pre-wrapped rows, pending.
     const talkLayoutEffective = useMemo(() => talkLayout(termWidth), [termWidth]);
@@ -234,9 +241,18 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
         8 -
         (talkLayoutEffective.threads ? talkLayoutEffective.threadsWidth : 0) -
         (talkLayoutEffective.inspector ? talkLayoutEffective.inspectorWidth : 0));
-    const talkRowsView = useMemo(() => talkRows(chat, conversationWidth, Date.now()), 
+    const talkRowsView = useMemo(() => talkRows(chat, conversationWidth, Date.now(), { markdown: RICH }), 
     // talkTick re-times the pending row twice a second.
     [chat, conversationWidth, talkTick]);
+    /** JSON trees for trace/debug — inline overlay and inspector variants. */
+    const overlayJsonRows = useMemo(() => (paneJson === undefined ? undefined : jsonRows(paneJson, jsonExpanded)), [paneJson, jsonExpanded]);
+    const inspectorJsonRows = useMemo(() => inspectorFetch?.data === undefined
+        ? undefined
+        : jsonRows(inspectorFetch.data, jsonExpanded), [inspectorFetch, jsonExpanded]);
+    /** Click on an expandable tree row toggles that container. */
+    function toggleJsonRow(row) {
+        setJsonExpanded((prev) => toggleJsonPath(prev, row.path));
+    }
     const talkCursorClamped = clampPickerCursor(talkCursor, chat.length);
     /** What sends run against, for the composer label and inspector (^B picks). */
     const talkVersionLabel = talkTag === "latest"
@@ -335,15 +351,6 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     const browseRoot = bundleSrcRoot(context) ?? context.workspaceRoot;
     /** Subviews need an agent — except diff, which browses any place. */
     const authorViewEffective = authorEmpty && !(authorView === "diff" && browseRoot) ? "home" : authorView;
-    useEffect(() => {
-        if (!UNICODE_OK || mode !== "author" || !authorEmpty)
-            return;
-        const id = setInterval(() => setFrame(glyph.frame()), 33);
-        return () => clearInterval(id);
-    }, [mode, authorEmpty, glyph]);
-    useEffect(() => {
-        glyph.setWorking(working);
-    }, [working, glyph]);
     // Human names for the strip (workspace manifest, project/org APIs) —
     // ids render immediately, names overlay when resolved; stale results
     // (context changed meanwhile) are dropped.
@@ -475,6 +482,8 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     // Keep the transcript visible: cursor on the newest unit pins the pane to
     // the bottom (streaming rows grow below the unit's label — bottom-pinning
     // keeps live text on screen); browsing history centers the selected unit.
+    // Centering scrolls to the unit anchor's measured position when available
+    // (markdown rows are taller than one line); row offsets are the fallback.
     useEffect(() => {
         if (mode !== "author" || authorViewEffective !== "home")
             return;
@@ -487,13 +496,14 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
         const cursor = clampPickerCursor(sessionCursor, count);
         const viewport = Math.max(4, box.height || 10);
         if (cursor >= count - 1) {
-            box.scrollTo({
-                x: 0,
-                y: Math.max(0, sessionRowsView.length - viewport + 1),
-            });
+            box.scrollTo({ x: 0, y: Math.max(0, box.scrollHeight) });
             return;
         }
-        const offset = unitRowOffset(sessionRowsView, cursor);
+        const anchor = sessionUnitRefs.current.get(cursor);
+        const measured = anchor ? anchor.y - box.content.y : -1;
+        const offset = measured >= 0 && measured <= box.scrollHeight
+            ? measured
+            : unitRowOffset(sessionRowsView, cursor);
         box.scrollTo({ x: 0, y: Math.max(0, offset - Math.floor(viewport / 2)) });
     }, [sessionCursor, sessionRowsView, authorSession, mode, authorViewEffective]);
     // Queued prompts drain in order once the running turn settles. (Effect,
@@ -526,6 +536,8 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
     }, [chat]);
     // Conversation scroll follows the selection: newest turn pins the pane to
     // the bottom (the pending row grows there); history centers the selection.
+    // Centering scrolls to the turn header's measured position when available
+    // (markdown rows are taller than one line); row offsets are the fallback.
     useEffect(() => {
         if (mode !== "talk" || chat.length === 0)
             return;
@@ -535,10 +547,14 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
         const cursor = clampPickerCursor(talkCursor, chat.length);
         const viewport = Math.max(4, box.height || 10);
         if (cursor >= chat.length - 1) {
-            box.scrollTo({ x: 0, y: Math.max(0, talkRowsView.length - viewport + 1) });
+            box.scrollTo({ x: 0, y: Math.max(0, box.scrollHeight) });
             return;
         }
-        const offset = turnRowOffset(talkRowsView, cursor);
+        const anchor = talkTurnRefs.current.get(cursor);
+        const measured = anchor ? anchor.y - box.content.y : -1;
+        const offset = measured >= 0 && measured <= box.scrollHeight
+            ? measured
+            : turnRowOffset(talkRowsView, cursor);
         box.scrollTo({ x: 0, y: Math.max(0, offset - Math.floor(viewport / 2)) });
     }, [talkCursor, talkRowsView, chat, mode]);
     // Threads pane data: lazy, once per context (invalidated on new threads).
@@ -661,7 +677,15 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
             return { kind: "error", path: previewTarget, message: diffFiles.message };
         }
         if (previewDiffLines) {
-            return { kind: "diff", path: previewTarget, lines: previewDiffLines };
+            return {
+                kind: "diff",
+                path: previewTarget,
+                lines: previewDiffLines,
+                // Both sides ride along for the rich <diff> renderable (unified
+                // patch is serialized in the view); plain paths use `lines`.
+                before: diffFiles.remote[previewTarget],
+                after: diffFiles.local[previewTarget],
+            };
         }
         const content = diffFiles.local[previewTarget];
         if (content === undefined) {
@@ -1084,6 +1108,7 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
             setPaneTitle((title) => {
                 if (title && /^(trace|debug)/i.test(title)) {
                     setPaneLines([]);
+                    setPaneJson(undefined);
                     return undefined;
                 }
                 return title;
@@ -1117,6 +1142,10 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
         if (result.paneLines) {
             setPaneLines(result.paneLines);
             setPaneTitle(result.paneTitle ?? "result");
+            // Structured payloads render as a collapsible tree instead of the
+            // stringified lines; fresh payload → fresh default expansion.
+            setPaneJson(result.paneJson);
+            setJsonExpanded(result.paneJson !== undefined ? jsonDefaultExpanded(result.paneJson) : new Set());
         }
         if (result.needConfirm) {
             setConfirm(createConfirm(result.needConfirm.title, result.needConfirm.phrase, result.needConfirm.action, result.needConfirm.args));
@@ -1908,7 +1937,15 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
                 setMode("talk");
                 if (target !== cursor)
                     setTalkCursor(target);
-                setInspectorFetch({ turn: target, kind, lines: result.paneLines ?? [] });
+                setInspectorFetch({
+                    turn: target,
+                    kind,
+                    lines: result.paneLines ?? [],
+                    data: result.paneJson,
+                });
+                setJsonExpanded(result.paneJson !== undefined
+                    ? jsonDefaultExpanded(result.paneJson)
+                    : new Set());
                 setToast(`${kind} · reply #${ordinal ?? "?"} → inspector`);
             }
             else {
@@ -1922,21 +1959,72 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
             setWorking(false);
         }
     }
+    /** Enter/click on a diff-tree row: toggle a dir, or preview a file. */
+    function activateDiffRow(index) {
+        const rows = stateRef.current.diffRows;
+        const row = rows[clampPickerCursor(index, rows.length)];
+        if (row?.kind === "dir") {
+            setDiffCollapsed((prev) => {
+                const next = new Set(prev);
+                if (next.has(row.path))
+                    next.delete(row.path);
+                else
+                    next.add(row.path);
+                return next;
+            });
+        }
+        else if (row) {
+            setPreviewPath(row.path);
+            setFileDiff({ path: row.path });
+        }
+    }
+    /** Enter/second click on a session unit: expand/collapse its body. */
+    function toggleSessionUnitBody(index) {
+        const units = stateRef.current.authorSession?.units ?? [];
+        const unit = units[clampPickerCursor(index, units.length)];
+        if (unit &&
+            unit.body.length > 0 &&
+            (unit.kind === "action" || unit.kind === "thinking")) {
+            setSessionExpanded((prev) => {
+                const next = new Set(prev);
+                if (next.has(unit.id))
+                    next.delete(unit.id);
+                else
+                    next.add(unit.id);
+                return next;
+            });
+        }
+    }
+    /** Run a palette action (Enter on the highlight or a mouse click). */
+    function activatePaletteAction(action) {
+        const reason = action.disabledReason?.(stateRef.current.context);
+        setPaletteCursor(undefined);
+        if (reason && !action.command.requiresAuth) {
+            // Auth gaps route to login via ensureAuth; other gaps just explain.
+            setToast(`${action.title} — ${reason}`);
+            return;
+        }
+        void runCommand(action.command, "");
+    }
+    /** Open the thread at a threads-pane row (row 0 starts a new thread). */
+    function activateThreadRow(row) {
+        const current = stateRef.current;
+        const clamped = clampPickerCursor(row, threadsRowCount(current.threads));
+        if (clamped === NEW_THREAD_ROW) {
+            const cmd = SLASH_COMMANDS.find((c) => c.name === "new");
+            if (cmd)
+                void runCommand(cmd, "");
+            return;
+        }
+        const picked = current.threads?.[clamped - 1];
+        if (picked)
+            void openThread(picked.id);
+    }
     /** Enter in the composer: threads focus opens; otherwise send the draft. */
     function handleComposerSend() {
         const current = stateRef.current;
         if (current.talkFocus === "threads") {
-            const count = threadsRowCount(current.threads);
-            const row = clampPickerCursor(current.threadCursor, count);
-            if (row === NEW_THREAD_ROW) {
-                const cmd = SLASH_COMMANDS.find((c) => c.name === "new");
-                if (cmd)
-                    void runCommand(cmd, "");
-                return;
-            }
-            const picked = current.threads?.[row - 1];
-            if (picked)
-                void openThread(picked.id);
+            activateThreadRow(current.threadCursor);
             return;
         }
         const text = (composerRef.current?.plainText ?? "").trim();
@@ -2054,15 +2142,7 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
                 return;
             }
             const highlight = clampPickerCursor(current.paletteCursor, matches.length);
-            const action = matches[highlight];
-            const reason = action.disabledReason?.(current.context);
-            setPaletteCursor(undefined);
-            if (reason && !action.command.requiresAuth) {
-                // Auth gaps route to login via ensureAuth; other gaps just explain.
-                setToast(`${action.title} — ${reason}`);
-                return;
-            }
-            void runCommand(action.command, "");
+            activatePaletteAction(matches[highlight]);
             return;
         }
         if (current.switcherCursor !== undefined) {
@@ -2095,22 +2175,7 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
             current.mode === "author" &&
             current.authorView === "diff" &&
             !current.fileDiff) {
-            const rows = current.diffRows;
-            const row = rows[clampPickerCursor(current.diffCursor, rows.length)];
-            if (row?.kind === "dir") {
-                setDiffCollapsed((prev) => {
-                    const next = new Set(prev);
-                    if (next.has(row.path))
-                        next.delete(row.path);
-                    else
-                        next.add(row.path);
-                    return next;
-                });
-            }
-            else if (row) {
-                setPreviewPath(row.path);
-                setFileDiff({ path: row.path });
-            }
+            activateDiffRow(clampPickerCursor(current.diffCursor, current.diffRows.length));
             return;
         }
         // Enter on a session unit: expand/collapse its body (tool input/result).
@@ -2119,19 +2184,7 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
             current.authorView === "home" &&
             current.authorSession) {
             const units = current.authorSession.units;
-            const unit = units[clampPickerCursor(current.sessionCursor, units.length)];
-            if (unit &&
-                unit.body.length > 0 &&
-                (unit.kind === "action" || unit.kind === "thinking")) {
-                setSessionExpanded((prev) => {
-                    const next = new Set(prev);
-                    if (next.has(unit.id))
-                        next.delete(unit.id);
-                    else
-                        next.add(unit.id);
-                    return next;
-                });
-            }
+            toggleSessionUnitBody(clampPickerCursor(current.sessionCursor, units.length));
             return;
         }
         if (line === "")
@@ -2233,7 +2286,14 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
         ? 0
         : Math.max(0, Math.min(pickerCursor - Math.floor(PICKER_PAGE / 3), pickerVisible.length - PICKER_PAGE));
     const pickerWindow = pickerVisible.slice(pickerWindowStart, pickerWindowStart + PICKER_PAGE);
-    return (_jsxs("box", { style: { flexDirection: "column", flexGrow: 1, paddingLeft: 1, paddingRight: 1 }, children: [_jsx(Breadcrumb, { scope: scope, working: working }), _jsx(ModeNav, { active: mode }), _jsx("box", { style: {
+    return (_jsxs("box", { style: { flexDirection: "column", flexGrow: 1, paddingLeft: 1, paddingRight: 1 }, children: [_jsx(Breadcrumb, { scope: scope, working: working, onSegment: (row) => {
+                    // Open the ^G switcher on the clicked segment's row.
+                    const index = CONTEXT_ROWS.findIndex((r) => r.id === row);
+                    setSwitcherCursor(index >= 0 ? index : 0);
+                } }), _jsx(ModeNav, { active: mode, onSelect: (id) => {
+                    if (!confirm)
+                        setMode(id);
+                } }), _jsx("box", { style: {
                     flexDirection: "column",
                     flexGrow: 1,
                     flexShrink: 1,
@@ -2246,11 +2306,61 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
                         ? `${picker.command.name} — ${picker.note}`
                         : picker.command.name, filter: pickerFilter, dismissHint: picker.command.name === "place-onboard"
                         ? "Esc continue without place"
-                        : undefined })) : confirm ? (_jsx(ConfirmPane, { confirm: confirm })) : sheet && sheetCommand ? (_jsx(SheetPane, { sheet: sheet })) : paletteOpen ? (_jsx(ActionPalettePane, { actions: paletteMatches, cursor: paletteHighlight, query: input, context: context, pageSize: pickerPageSize() })) : switcherOpen ? (_jsx(ContextSwitcherPane, { scope: scope, cursor: clampPickerCursor(switcherCursor ?? 0, CONTEXT_ROWS.length) })) : activityOpen ? (_jsx(ActivityDrawerPane, { operations: orderedOps, cursor: clampPickerCursor(activityCursor ?? 0, orderedOps.length), pageSize: pickerPageSize(), now: Date.now() })) : mode === "author" ? (authorViewEffective === "home" ? (_jsx(AuthorHome, { scope: scope, snapshot: snapshot, validation: validation, frame: frame, working: working, version: VERSION, paneTitle: paneTitle, paneLines: paneLines, session: authorSession, sessionRows: sessionRowsView, sessionCursor: clampPickerCursor(sessionCursor, authorSession?.units.length ?? 0), sessionScrollRef: contentScrollRef, backendLabel: authorBackend.label, backendDetection: backendDetection })) : authorViewEffective === "diff" ? (_jsx(DiffView, { rows: diffRows, cursor: clampPickerCursor(diffCursor, diffRows.length), treeTitle: hasAgent
+                        : undefined, onPick: (item) => {
+                        setInput("");
+                        void finishPick(picker.command, item.id, picker.sheet, picker.sheetField);
+                    } })) : confirm ? (_jsx(ConfirmPane, { confirm: confirm })) : sheet && sheetCommand ? (_jsx(SheetPane, { sheet: sheet })) : paletteOpen ? (_jsx(ActionPalettePane, { actions: paletteMatches, cursor: paletteHighlight, query: input, context: context, pageSize: pickerPageSize(), onPick: (index) => {
+                        const action = paletteMatches[index];
+                        if (!action)
+                            return;
+                        setInput("");
+                        activatePaletteAction(action);
+                    } })) : switcherOpen ? (_jsx(ContextSwitcherPane, { scope: scope, cursor: clampPickerCursor(switcherCursor ?? 0, CONTEXT_ROWS.length), onPick: (index) => {
+                        const row = CONTEXT_ROWS[index];
+                        setSwitcherCursor(undefined);
+                        if (!row)
+                            return;
+                        const command = SLASH_COMMANDS.find((c) => c.name === row.id);
+                        if (command)
+                            void runCommand(command, "");
+                    } })) : activityOpen ? (_jsx(ActivityDrawerPane, { operations: orderedOps, cursor: clampPickerCursor(activityCursor ?? 0, orderedOps.length), pageSize: pickerPageSize(), now: Date.now(), onPick: (index) => {
+                        const op = orderedOps[index];
+                        if (!op)
+                            return;
+                        const selected = index === clampPickerCursor(activityCursor ?? 0, orderedOps.length);
+                        // Click selects; a second click on a failed row retries it.
+                        if (selected && op.status === "failed" && op.retry)
+                            retryOperation(op);
+                        else
+                            setActivityCursor(index);
+                    } })) : mode === "author" ? (authorViewEffective === "home" ? (_jsx(AuthorHome, { scope: scope, snapshot: snapshot, validation: validation, version: VERSION, paneTitle: paneTitle, paneLines: paneLines, session: authorSession, sessionRows: sessionRowsView, sessionCursor: clampPickerCursor(sessionCursor, authorSession?.units.length ?? 0), sessionScrollRef: contentScrollRef, sessionUnitRefs: sessionUnitRefs, backendLabel: authorBackend.label, backendDetection: backendDetection, onSelectUnit: (unit) => {
+                        const clamped = clampPickerCursor(sessionCursor, authorSession?.units.length ?? 0);
+                        // Click selects; clicking the selected unit toggles its body.
+                        if (unit === clamped)
+                            toggleSessionUnitBody(unit);
+                        else
+                            setSessionCursor(unit);
+                    }, onWelcomeStep: (step) => {
+                        const command = SLASH_COMMANDS.find((c) => c.name === step);
+                        if (command)
+                            void runCommand(command, "");
+                    } })) : authorViewEffective === "diff" ? (_jsx(DiffView, { rows: diffRows, cursor: clampPickerCursor(diffCursor, diffRows.length), treeTitle: hasAgent
                         ? statusByPath.size > 0
                             ? `changes (${changesSummary(snapshot?.diff)})`
                             : "files (clean)"
-                        : "files", preview: preview, style: diffStyleEffective, remoteTag: scope.version, expanded: Boolean(fileDiff), sidebarWidth: Math.max(24, Math.min(36, Math.floor(termWidth / 4))), pageSize: pickerPageSize(), scrollRef: contentScrollRef })) : authorViewEffective === "validation" ? (_jsx(ValidationViewPane, { record: validation, scrollRef: contentScrollRef })) : (_jsx(VersionsViewPane, { versions: versions ?? [], currentTag: scope.version, scrollRef: contentScrollRef }))) : (_jsx(TalkView, { chat: chat, rows: talkRowsView, cursor: talkCursorClamped, focusPane: talkFocus, layout: talkLayoutEffective, threads: threads, threadsLoading: threadsLoading, threadCursor: clampPickerCursor(threadCursor, threadsRowCount(threads)), threadId: threadId, localMode: localMode, trace: trace, vars: vars, inspectorMetaLines: inspectorMetaLines, inspectorFetch: inspectorFetch, paneTitle: paneTitle, paneLines: paneLines, pageSize: pickerPageSize(), scrollRef: contentScrollRef, inspectorScrollRef: inspectorScrollRef })) }), slashOpen && slashMatches.length > 0 && (_jsx("box", { title: " commands ", style: {
+                        : "files", preview: preview, style: diffStyleEffective, remoteTag: scope.version, expanded: Boolean(fileDiff), sidebarWidth: Math.max(24, Math.min(36, Math.floor(termWidth / 4))), pageSize: pickerPageSize(), scrollRef: contentScrollRef, onRowClick: (index) => {
+                        setDiffCursor(index);
+                        // Dirs toggle; file preview follows the cursor effect.
+                        if (diffRows[index]?.kind === "dir")
+                            activateDiffRow(index);
+                    } })) : authorViewEffective === "validation" ? (_jsx(ValidationViewPane, { record: validation, scrollRef: contentScrollRef })) : (_jsx(VersionsViewPane, { versions: versions ?? [], currentTag: scope.version, scrollRef: contentScrollRef }))) : (_jsx(TalkView, { chat: chat, rows: talkRowsView, cursor: talkCursorClamped, focusPane: talkFocus, layout: talkLayoutEffective, threads: threads, threadsLoading: threadsLoading, threadCursor: clampPickerCursor(threadCursor, threadsRowCount(threads)), threadId: threadId, localMode: localMode, trace: trace, vars: vars, inspectorMetaLines: inspectorMetaLines, inspectorFetch: inspectorFetch, paneTitle: paneTitle, paneLines: paneLines, overlayJson: overlayJsonRows, inspectorJson: inspectorJsonRows, onJsonToggle: toggleJsonRow, onSelectTurn: (turn) => {
+                        setTalkFocus("chat");
+                        setTalkCursor(turn);
+                    }, onSelectThread: (row) => {
+                        setTalkFocus("threads");
+                        setThreadCursor(row);
+                        activateThreadRow(row);
+                    }, pageSize: pickerPageSize(), scrollRef: contentScrollRef, inspectorScrollRef: inspectorScrollRef, turnRefs: talkTurnRefs })) }), slashOpen && slashMatches.length > 0 && (_jsx("box", { title: " commands ", style: {
                     border: true,
                     borderStyle: "rounded",
                     borderColor: TEAL_DIM,
@@ -2258,7 +2368,7 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
                     flexShrink: 0,
                     paddingLeft: 1,
                     paddingRight: 1,
-                }, children: slashMatches.map((cmd) => (_jsxs("text", { children: [_jsxs("span", { fg: TEAL, children: ["/", cmd.name.padEnd(16)] }), _jsx("span", { fg: DIM, children: cmd.summary })] }, cmd.name))) })), latestOp && !activityOpen && (_jsx(ActivitySummaryLine, { operation: latestOp, now: Date.now() })), toast && (_jsxs("text", { fg: DIM, style: { paddingLeft: 1, flexShrink: 0 }, children: [G.branch, " ", toast] })), talkComposerActive ? (_jsx(Composer, { targetLabel: `${scope.agent !== "—" ? scope.agent : "agent"} on ${localMode ? "local bundle" : `${scope.env} · ${talkVersionLabel}`}`, draft: composer, disabledReason: composerReason, pending: talkPending, taRef: composerRef, onDraftChange: setComposer, onSend: handleComposerSend })) : (_jsx("box", { style: {
+                }, children: slashMatches.map((cmd) => (_jsxs("text", { children: [_jsxs("span", { fg: TEAL, children: ["/", cmd.name.padEnd(16)] }), _jsx("span", { fg: DIM, children: cmd.summary })] }, cmd.name))) })), latestOp && !activityOpen && (_jsx(ActivitySummaryLine, { operation: latestOp, now: Date.now() })), toast && (_jsxs("text", { fg: DIM, style: { paddingLeft: 1, flexShrink: 0 }, children: [G.branch, " ", toast] })), talkComposerActive ? (_jsx(Composer, { targetLabel: `${scope.agent !== "—" ? scope.agent : "agent"} on ${localMode ? "local bundle" : `${scope.env} · ${talkVersionLabel}`}`, draft: composer, disabledReason: composerReason, pending: talkPending, taRef: composerRef, onDraftChange: setComposer, onSend: handleComposerSend, onFocusRequest: () => setTalkFocus("chat") })) : (_jsx("box", { style: {
                     border: true,
                     borderStyle: "rounded",
                     borderColor: working ? AMBER : TEAL_DIM,
@@ -2284,11 +2394,6 @@ function App({ context: initialContext, initialScope, glyph, onQuit }) {
 export async function runOpenTui() {
     const context = await resolveContext({});
     const scope = scopeFromContext(context);
-    const glyph = new GlyphController(context.agentId ?? context.projectId ?? "apollo", {
-        width: 10,
-        height: 4,
-        compact: true,
-    });
     const renderer = await createCliRenderer({
         // Ctrl+C is an app key (cancel turn / clear input / quit) — see matchCtrlC.
         exitOnCtrlC: false,
@@ -2298,7 +2403,7 @@ export async function runOpenTui() {
     });
     const root = createRoot(renderer);
     const code = await new Promise((resolve) => {
-        root.render(_jsx(App, { context: context, initialScope: scope, glyph: glyph, onQuit: resolve }));
+        root.render(_jsx(App, { context: context, initialScope: scope, onQuit: resolve }));
     });
     root.unmount();
     renderer.destroy();