@north-light/crouter 0.3.282 → 0.3.284

package/dist/clients/attach/overlays/graph.js

@@ -205,24 +205,15 @@ export class GraphOverlay {
     }
     async buildSnapshot() {
         beginFrameTelem();
-        const nodes = new Map();
+        const [listed, focused] = await Promise.all([
+            this.source.listNodes().catch(() => []),
+            this.fetchFocused(),
+        ]);
+        const nodes = new Map(listed.map((node) => [node.node_id, node]));
         const childIds = new Map();
         const sortedChildIds = new Map();
         const managerOf = new Map();
         const activeBelow = new Map();
-        const node = async (id) => {
-            if (nodes.has(id))
-                return nodes.get(id) ?? null;
-            let v;
-            try {
-                v = await this.source.getNode(id);
-            }
-            catch {
-                v = null;
-            }
-            nodes.set(id, v);
-            return v;
-        };
         const children = async (id) => {
             const hit = childIds.get(id);
             if (hit !== undefined)
@@ -234,11 +225,9 @@ export class GraphOverlay {
             catch {
                 refs = [];
             }
-            const out = [];
-            for (const ref of refs) {
-                if ((await node(ref.node_id))?.kind !== 'human')
-                    out.push(ref.node_id);
-            }
+            const out = refs
+                .map((ref) => ref.node_id)
+                .filter((childId) => nodes.get(childId)?.kind !== 'human');
             childIds.set(id, out);
             return out;
         };
@@ -255,8 +244,8 @@ export class GraphOverlay {
             managerOf.set(id, mgr);
             return mgr;
         };
-        const climbRoot = async (self) => {
-            let cur = self;
+        const climbRoot = async () => {
+            let cur = this.self;
             const seen = new Set([cur]);
             for (;;) {
                 const mgr = await manager(cur);
@@ -267,60 +256,89 @@ export class GraphOverlay {
             }
             return cur;
         };
-        const rank = async (id) => statusRank((await node(id))?.status);
         const sortedChildren = async (id) => {
             const cached = sortedChildIds.get(id);
             if (cached !== undefined)
                 return cached;
             const ids = [...await children(id)];
-            const ranks = new Map();
-            await Promise.all(ids.map(async (cid) => { ranks.set(cid, await rank(cid)); }));
-            ids.sort((a, b) => (ranks.get(a) ?? 99) - (ranks.get(b) ?? 99));
+            ids.sort((a, b) => statusRank(nodes.get(a)?.status) - statusRank(nodes.get(b)?.status));
             sortedChildIds.set(id, ids);
             return ids;
         };
-        const expand = new Set();
+        const autoExpanded = new Set();
         const seenActivity = new Set();
         const visitActivity = async (id) => {
-            const selfActive = (await node(id))?.status === 'active';
+            const selfActive = nodes.get(id)?.status === 'active';
             if (seenActivity.has(id))
                 return { active: selfActive ? 1 : 0, reveal: selfActive || id === this.self };
             seenActivity.add(id);
             let below = 0;
             let childReveal = false;
-            for (const c of await children(id)) {
-                const r = await visitActivity(c);
-                below += r.active;
-                if (r.reveal)
+            for (const childId of await children(id)) {
+                const result = await visitActivity(childId);
+                below += result.active;
+                if (result.reveal)
                     childReveal = true;
             }
             activeBelow.set(id, below);
             if (childReveal)
-                expand.add(id);
+                autoExpanded.add(id);
             return { active: below + (selfActive ? 1 : 0), reveal: childReveal || selfActive || id === this.self };
         };
-        await visitActivity(await climbRoot(this.self));
+        const root = await climbRoot();
+        await visitActivity(root);
+        await Promise.all([...childIds.keys()].map((id) => sortedChildren(id)));
+        const snapshot = {
+            root,
+            rows: [],
+            autoExpanded,
+            activeBelow,
+            nodes,
+            childIds,
+            sortedChildIds,
+            managerOf,
+            focused,
+        };
+        snapshot.rows = this.projectRows(snapshot);
+        return snapshot;
+    }
+    /** Fold state is presentation-only. Reproject the visible DFS from the fully
+     * fetched topology so h/l never cross the daemon boundary. The explicit stack
+     * also keeps a deep graph from consuming the JavaScript call stack. */
+    projectRows(snapshot) {
         const rows = [];
         const visited = new Set();
-        const walk = async (id, prefix, isRoot, isLast) => {
+        const stack = [
+            { id: snapshot.root, prefix: '', isRoot: true, isLast: true },
+        ];
+        while (stack.length > 0) {
+            const { id, prefix, isRoot, isLast } = stack.pop();
+            const connector = isRoot ? '' : isLast ? '└─ ' : '├─ ';
             if (visited.has(id)) {
-                const connector = isRoot ? '' : isLast ? '└─ ' : '├─ ';
                 rows.push({ id, hasKids: false, isSelf: id === this.self, branch: prefix + connector, cycle: true, collapsed: false });
-                return;
+                continue;
             }
             visited.add(id);
-            const kids = await sortedChildren(id);
-            const folded = this.folds.userExpanded.has(id) ? false : this.folds.userCollapsed.has(id) ? true : !expand.has(id);
-            const connector = isRoot ? '' : isLast ? '└─ ' : '├─ ';
+            const kids = snapshot.sortedChildIds.get(id) ?? [];
+            const folded = this.folds.userExpanded.has(id)
+                ? false
+                : this.folds.userCollapsed.has(id)
+                    ? true
+                    : !snapshot.autoExpanded.has(id);
             rows.push({ id, hasKids: kids.length > 0, isSelf: id === this.self, branch: prefix + connector, cycle: false, collapsed: folded });
             if (folded)
-                return;
+                continue;
             const childPrefix = isRoot ? '' : prefix + (isLast ? '   ' : '│  ');
-            for (let i = 0; i < kids.length; i++)
-                await walk(kids[i], childPrefix, false, i === kids.length - 1);
-        };
-        await walk(await climbRoot(this.self), '', true, true);
-        return { rows, activeBelow, nodes, childIds, sortedChildIds, managerOf, focused: await this.fetchFocused() };
+            for (let i = kids.length - 1; i >= 0; i--) {
+                stack.push({ id: kids[i], prefix: childPrefix, isRoot: false, isLast: i === kids.length - 1 });
+            }
+        }
+        return rows;
+    }
+    repaintFolds() {
+        if (this.snapshot !== undefined)
+            this.snapshot.rows = this.projectRows(this.snapshot);
+        this.tui.requestRender();
     }
     renderSnapshotRow(snapshot, r, isCursor, asks) {
         const wrap = (line, attached) => isCursor ? fillBar(line, fillWidth(), REVERSE)
@@ -523,7 +541,7 @@ export class GraphOverlay {
             if (cur !== undefined && cur.hasKids && !cur.collapsed) {
                 this.userCollapsed.add(cur.id);
                 this.userExpanded.delete(cur.id);
-                this.refresh();
+                this.repaintFolds();
             }
             else {
                 const p = snapshot?.managerOf.get(this.cursorId ?? this.self);
@@ -537,7 +555,7 @@ export class GraphOverlay {
             if (cur !== undefined && cur.collapsed && cur.hasKids) {
                 this.userExpanded.add(cur.id);
                 this.userCollapsed.delete(cur.id);
-                this.refresh();
+                this.repaintFolds();
             }
             else if (cur !== undefined && cur.hasKids) {
                 const c = snapshot?.sortedChildIds.get(cur.id)?.[0];

package/dist/clients/attach/overlays/pickers.js

@@ -14,20 +14,19 @@
 //
 // R1 (contract): the tree/fork/settings payloads are PURE DATA — their selectors
 // build verbatim, no reconstruction. The MODEL picker's `ModelSelectorComponent`
-// needs a live `ModelRuntime`/`SettingsManager`: we feed the REAL component a
-// minimal in-memory `SettingsManager` plus a tiny `ModelRuntime` adapter (the
-// component calls only getAvailableSnapshot/getModel/getError/refresh — verified
-// against model-selector.js), preserving its full search + scope-toggle UI without
-// crossing engine state over the socket. The SESSION picker reconstructs
+// needs a live `ModelRuntime`: we feed the REAL component a tiny `ModelRuntime`
+// adapter (the component calls only getAvailableSnapshot/getModel/getError —
+// verified against model-selector.js), preserving its full search + scope-toggle
+// UI without crossing engine state over the socket. The SESSION picker reconstructs
 // faithfully from async loaders (no shim). The SCOPED-MODELS component is NOT
 // re-exported by pi (through 0.79.1) AND has no mutation frame in the contract,
 // so it renders read-only via a pi-tui SelectList.
 //
-// The duck-typed runtime adapter relies on the component's current 4-method
-// ModelRuntime surface — a future pi adding a runtime call there would surface at
+// The duck-typed runtime adapter relies on the component's current ModelRuntime
+// surface — a future pi adding a runtime call there would surface at
 // runtime (caught by live verification).
 import { Container, SelectList, SettingsList, } from '@earendil-works/pi-tui';
-import { DynamicBorder, getSelectListTheme, getSettingsListTheme, ModelSelectorComponent, SessionSelectorComponent, TreeSelectorComponent, UserMessageSelectorComponent, SettingsManager, } from '@earendil-works/pi-coding-agent';
+import { DynamicBorder, getSelectListTheme, getSettingsListTheme, ModelSelectorComponent, SessionSelectorComponent, TreeSelectorComponent, UserMessageSelectorComponent, } from '@earendil-works/pi-coding-agent';
 /** A minimal `ModelRuntime` for `ModelSelectorComponent`: the component calls
  *  only `getAvailableSnapshot()`, `getModel()`, `getError()`, and `refresh()`
  *  (verified against pi `model-selector.js`). We satisfy exactly those from the
@@ -62,7 +61,7 @@ export function buildModelPicker(tui, data, send, close) {
     const current = data.current
         ? all.find((m) => m.provider === data.current.provider && m.id === data.current.id)
         : undefined;
-    const component = new ModelSelectorComponent(tui, current, SettingsManager.inMemory(), modelRuntimeAdapter(all, available), data.scopedModels, (model) => {
+    const component = new ModelSelectorComponent(tui, current, modelRuntimeAdapter(all, available), data.scopedModels, (model) => {
         send({ type: 'set_model', model: `${model.provider}/${model.id}` });
         close();
     }, () => close());

package/dist/clients/attach/render/card-presentation.js

@@ -102,7 +102,7 @@ function reviewCommentSummary(card) {
 }
 /** Both structured-output reprompts open this way (core/runtime/stop-guard.ts);
  *  the stall reprompt does not. */
-const STRUCTURED_OUTPUT_REPROMPT = /^(?:You must call the `submit` tool|Structured-output request file is invalid)/;
+const STRUCTURED_OUTPUT_REPROMPT = /^(?:You must submit a result|Structured-output request file is invalid)/;
 function stopGuardSummary(card) {
     return STRUCTURED_OUTPUT_REPROMPT.test(card.body) ? 'structured output required' : 'completion required';
 }