@aiwayds/dsh-tui-pi 2.23.1 → 2.25.0

package/lib/model-list.js

@@ -1,8 +1,10 @@
 /**
  * Pure model-list assembly for the /model picker — favorites pinned on top,
- * hidden models in a dim section at the bottom, everything between. No TUI
- * imports: every function here is plain data-in/data-out, so the ordering,
- * filtering and toggle semantics stay unit-testable without a terminal
+ * hidden models in a dim section at the bottom, everything between. Every
+ * section lists its models aggregated under their provider (providers
+ * alphabetical, models alphabetical within a provider). No TUI imports:
+ * every function here is plain data-in/data-out, so the ordering, filtering
+ * and toggle semantics stay unit-testable without a terminal
  * (test/model-list.test.mjs).
  */
 /** Composite settings key of a model: `${provider}/${id}`. */
@@ -18,6 +20,22 @@ export function matchesModelFilter(model, query) {
         || model.id.toLowerCase().includes(needle)
         || model.provider.toLowerCase().includes(needle));
 }
+/**
+ * Display order of every picker section: providers aggregate alphabetically,
+ * and within a provider models sort by the label the MODEL column shows
+ * (name, falling back to id) with the id as the tiebreak. The listing
+ * arrives from pickModel as a Promise.all race across providers, so the
+ * input order interleaves providers by resolve speed — this comparator is
+ * what makes the rows deterministic.
+ */
+export function compareListedModels(a, b) {
+    const byProvider = a.provider.localeCompare(b.provider);
+    if (byProvider !== 0)
+        return byProvider;
+    const labelA = a.name === '' ? a.id : a.name;
+    const labelB = b.name === '' ? b.id : b.name;
+    return labelA.localeCompare(labelB) || a.id.localeCompare(b.id);
+}
 /**
  * Toggle `key` in `list`: remove when present, append when absent (join
  * order = favorite order). Returns a new array; the input is never mutated.
@@ -44,33 +62,39 @@ export function narrowStringList(value) {
 /**
  * Assemble the picker rows, top to bottom:
  *
- * 1. Favorites (`section: 'favorite'`, ★ prefix applied by renderCell), in
- *    join order — a favorited model is removed from every other section;
+ * 1. Favorites (`section: 'favorite'`, ★ prefix applied by renderCell) —
+ *    display order is the shared provider-grouped alphabetical order, not
+ *    the join order of the persisted `favoriteModels` list (persistence
+ *    keeps join order; only the rendering sorts). A favorited model is
+ *    removed from every other section;
  * 2. one full-width divider row — only when at least one favorite is visible
  *    AND something follows it;
- * 3. the remaining models (`section: 'normal'`) in listing order;
+ * 3. the remaining models (`section: 'normal'`) in the same order;
  * 4. the Hidden section — only without an active filter and when non-empty:
  *    a `hiddenHeader` row carrying the count, then the hidden models
- *    (`section: 'hidden'`, rendered dim) that are not also favorited.
+ *    (`section: 'hidden'`, rendered dim) that are not also favorited,
+ *    likewise in the shared order.
  *
  * An active `filter` keeps the pinned structure but leaves only matching
  * models per section; stale keys in `favorites`/`hidden` (models no longer
  * listed by any provider) are skipped silently.
  */
 export function buildModelRows(models, favorites, hidden, filter = '') {
-    const byKey = new Map(models.map(model => [modelKey(model), model]));
+    const sorted = [...models].sort(compareListedModels);
+    const byKey = new Map(sorted.map(model => [modelKey(model), model]));
     const favKeys = new Set(favorites);
     const hiddenSet = new Set(hidden);
     const favRows = favorites
         .map(key => byKey.get(key))
         .filter((model) => model !== undefined && matchesModelFilter(model, filter))
+        .sort(compareListedModels)
         .map(model => ({ kind: 'model', section: 'favorite', model }));
-    const normalRows = models
+    const normalRows = sorted
         .filter(model => !favKeys.has(modelKey(model))
         && !hiddenSet.has(modelKey(model))
         && matchesModelFilter(model, filter))
         .map(model => ({ kind: 'model', section: 'normal', model }));
-    const hiddenModels = models.filter(model => hiddenSet.has(modelKey(model)) && !favKeys.has(modelKey(model)));
+    const hiddenModels = sorted.filter(model => hiddenSet.has(modelKey(model)) && !favKeys.has(modelKey(model)));
     const showHidden = filter.trim() === '' && hiddenModels.length > 0;
     const rows = [...favRows];
     if (favRows.length > 0 && (normalRows.length > 0 || showHidden)) {

package/lib/model-list.js.map

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

package/lib/session.d.ts

@@ -13,6 +13,8 @@ import type { Context } from '@deepseek-ai/cordis';
 import type { Agent, AgentHandle, ModelSelection } from '@deepseek-ai/dsh-agent';
 import { type StreamChunk } from '@deepseek-ai/dsh-llm';
 import { SessionId, type SessionEvent } from '@deepseek-ai/dsh-session';
+import { type AttentionInfo, type AttentionRow } from './attention.ts';
+import type { AttentionJevSource } from './attention-jev.ts';
 import type { AgentView } from './dsh-events.ts';
 import type { PendingPromptView } from './steer-flow.ts';
 export interface BridgeCallbacks {
@@ -215,6 +217,48 @@ export declare class DshSessionBridge {
     });
     /** Whether a `reconcileLiveWithProjection` pass is already in flight. */
     private projectionReconcileInFlight;
+    /**
+     * Shared child-adoption gate for the two discovery paths: the firehose
+     * `session/event` fold (constructor) and the reconcile tick's live-store
+     * sweep (`reconcileLiveFromStore`). A session whose parent is a tracked
+     * session AND is marked as delegated is a child; the descriptor event
+     * later refines the label/provider.
+     *
+     * Guard: a child is `origin: 'subagent'` OR a delegation budget
+     * `delegationDepth > 0`. Both markers are written together by dsh's
+     * childSessionMeta (spawn AND in-process fork children alike), so in
+     * practice the origin alone carries the decision; the budget clause
+     * only future-proofs the gate against a child that carries the budget
+     * without the origin. The budget test MUST be a VALUE test, not a
+     * field-presence test: the jsonl persistence backend materialises
+     * `delegationDepth: 0` on every restored header (write `?? 0`, read
+     * unconditionally), so a presence test would pull user-facing
+     * `Session.fork` conversations and other non-child restored sessions
+     * onto the live board / Ctrl+G.
+     *
+     * @returns whether a new view was adopted (caller emits).
+     */
+    private adoptChildSession;
+    /**
+     * Live-store sweep — the corpus-level companion to
+     * `reconcileLiveWithProjection` (dsh 0.1.7-rc.2). `listDescendants` walked
+     * the complete Session corpus on rc.1 but recurses parent CATALOGS on
+     * rc.2, so a child whose catalog branch is corrupt/unreadable — or whose
+     * catalog entry is missing entirely — is omitted from the authoritative
+     * listing with no diagnostic row of its own. Every still-working child
+     * necessarily resides in the process, and the store's live list is the one
+     * enumeration that depends on no catalog: this sweep re-runs the shared
+     * adoption gate over `sessions.list()` each tick and picks up what both
+     * the firehose (burst-lost creation events) and the catalog walk missed.
+     * Merge discipline is the bridge-wide one — only ADD (the
+     * `agentViews.has` guard makes it idempotent and never resurrects a
+     * settled view); rounds/settlement continue through the ordinary fold
+     * paths once the child is in `childSessions`/`trackedSessions`. Cost is
+     * one header check per process-resident session per tick — no persistence
+     * read, and children of previous runs are not resident after a restart,
+     * so they cannot be resurrected onto the board.
+     */
+    private reconcileLiveFromStore;
     /**
      * Correct the live view against the host's authoritative descendant
      * listing (`SubagentRuntime.listDescendants`, projection-backed — no
@@ -235,6 +279,13 @@ export declare class DshSessionBridge {
      * resurrect a settled continuable (its listing row is `inactive` while it
      * idles between turns). Runs best-effort: an absent/unshaped subagents
      * service or a throwing listing is silently skipped.
+     *
+     * dsh 0.1.7-rc.2: the listing recurses parent CATALOGS instead of walking
+     * the complete Session corpus — a child behind a corrupt/unreadable
+     * catalog branch is reported only as a branch diagnostic, and a truly
+     * catalog-less orphan is invisible (no row at all). Diagnostic rows are
+     * skipped here; the {@link reconcileLiveFromStore} sweep is the
+     * corpus-level companion that keeps such children off the blind spot.
      */
     private reconcileLiveWithProjection;
     /**
@@ -269,6 +320,28 @@ export declare class DshSessionBridge {
      *  policy's hard-stop records composed in (they live off-view — see
      *  markChildHardStopped). */
     getAgentViews(): readonly AgentView[];
+    /**
+     * Attach the attention ranking's jev upgrade source (heuristic-only when
+     * undefined) and the live maxRounds reader for the ranking's state table.
+     * Wired once by the host; the source self-debounces and self-guards.
+     */
+    attachAttentionSource(source: AttentionJevSource | undefined, capReader: () => number): void;
+    /** Re-observe the attention ranking; driven by the reconcile tick. */
+    private updateAttention;
+    /** One child's current attention info (heuristic base; jev once it has judged). */
+    getAttention(childId: string): AttentionInfo | undefined;
+    /** The spin-strike state for one child (the early-stop ladder's input). */
+    getSpinState(childId: string): {
+        streak: number;
+        lastStrikeAt: number;
+    };
+    /** All attention rows, highest score first (picker sort, status board). */
+    getAttentionRows(): readonly AttentionRow[];
+    /** The guard deny-copy hint: the top attention-worthy live child, when one ranks above ok. */
+    getAttentionHint(): {
+        label: string;
+        detail: string;
+    } | undefined;
     /** Children still running (`outcome` unset) — the live count the guard caps. */
     getLiveChildren(): readonly AgentView[];
     /** The buffered transcript of one child, in log order (capped, maybe truncated). */
@@ -369,9 +442,13 @@ export declare class DshSessionBridge {
      * after a successful `cancelChild`; a stop that found nothing live is
      * deliberately not recorded (the child settled on its own in time).
      */
-    markChildHardStopped(childId: string, round: number, cap: number): void;
+    markChildHardStopped(childId: string, round: number, cap: number, early?: true): void;
     /** Hard stops the maxRounds policy executed, keyed by child session id. */
     private readonly hardStopRecords;
+    /** Attention ranking (heuristic base + optional jev layer) — see src/attention.ts. */
+    private readonly attentionBoard;
+    private attentionSource;
+    private attentionCapReader;
     /**
      * Whether ANY LLM work is in flight: the bridge's own mid-turn status OR
      * at least one live child. The keymap's running gate reads this — with

package/lib/session.js

@@ -14,6 +14,7 @@ import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { SettingsConflictError } from '@deepseek-ai/dsh-settings';
 import { SessionId, SessionLogOffset } from '@deepseek-ai/dsh-session';
 import { readAppendSystem } from "./append-system.js";
+import { AttentionBoard } from "./attention.js";
 import { statSync } from 'node:fs';
 import { join } from 'node:path';
 import { descriptorModelRoute, isAgentEnd, isAgentStart, isDcpCompactionNotice, isLlmRetry, isSubagentDescriptor, isTuiPluginInjection } from "./dsh-events.js";
@@ -355,45 +356,10 @@ export class DshSessionBridge {
             const sessionKey = String(session.id);
             // Discover subagent children by session header — the deployment may
             // never emit tool-workflow events (the firehose is not scope-filtered,
-            // so child sessions arrive here too). A session whose parent is a
-            // tracked session AND is marked as delegated is a child; the descriptor
-            // event later refines the label/provider.
-            //
-            // Guard: a child is `origin: 'subagent'` OR a delegation budget
-            // `delegationDepth > 0`. Both markers are written together by dsh's
-            // childSessionMeta (spawn AND in-process fork children alike), so in
-            // practice the origin alone carries the decision; the budget clause
-            // only future-proofs the gate against a child that carries the budget
-            // without the origin. The budget test MUST be a VALUE test, not a
-            // field-presence test: the jsonl persistence backend materialises
-            // `delegationDepth: 0` on every restored header (write `?? 0`, read
-            // unconditionally), so a presence test would pull user-facing
-            // `Session.fork` conversations and other non-child restored sessions
-            // onto the live board / Ctrl+G.
-            const header = session.header;
-            if (header?.parentSession !== undefined
-                && (header.origin === 'subagent' || (header.delegationDepth ?? 0) > 0)
-                && this.trackedSessions.has(String(header.parentSession))
-                && !this.agentViews.has(sessionKey)) {
-                this.agentViews.set(sessionKey, {
-                    childId: sessionKey,
-                    parentSession: String(header.parentSession),
-                    // Current dsh children always carry the origin, so in practice the
-                    // label is `subagent <id8>`; the `fork` label only fires for the
-                    // defensive budget-without-origin shape above.
-                    label: header.origin === undefined
-                        ? `fork ${sessionKey.slice(0, 8)}`
-                        : `subagent ${sessionKey.slice(0, 8)}`,
-                    startedAt: event.time,
-                    tokens: 0,
-                    rounds: 0,
-                    retries: 0,
-                    contextTokens: 0,
-                });
-                this.childSessions.add(sessionKey);
-                this.trackedSessions.add(sessionKey);
+            // so child sessions arrive here too). The gate is shared with the
+            // reconcile tick's live-store sweep (`reconcileLiveFromStore`).
+            if (this.adoptChildSession(session, event.time))
                 this.emitLive();
-            }
             // Fold workflow + child events for every tracked session.
             if (this.trackedSessions.has(sessionKey)) {
                 this.foldTracked(sessionKey, event);
@@ -436,10 +402,17 @@ export class DshSessionBridge {
         // cap must still fire while the child works in the background.
         const reconcile = setInterval(() => {
             try {
+                // Live-store sweep first (dsh 0.1.7-rc.2 companion): a child adopted
+                // here is in childSessions before the round reconcile scans it, so a
+                // recovered child gets its rounds the same tick.
+                this.reconcileLiveFromStore();
                 this.reconcileChildRounds();
                 // The projection-backed reconciliation rides the same cadence but is
                 // async and self-guarded (never overlaps itself).
                 void this.reconcileLiveWithProjection();
+                // Attention ranking re-observe (heuristic recompute is a map walk;
+                // the jev layer self-debounces inside its source).
+                this.updateAttention();
             }
             catch {
                 // A throwing reconcile must never take the process down.
@@ -450,6 +423,85 @@ export class DshSessionBridge {
     }
     /** Whether a `reconcileLiveWithProjection` pass is already in flight. */
     projectionReconcileInFlight = false;
+    /**
+     * Shared child-adoption gate for the two discovery paths: the firehose
+     * `session/event` fold (constructor) and the reconcile tick's live-store
+     * sweep (`reconcileLiveFromStore`). A session whose parent is a tracked
+     * session AND is marked as delegated is a child; the descriptor event
+     * later refines the label/provider.
+     *
+     * Guard: a child is `origin: 'subagent'` OR a delegation budget
+     * `delegationDepth > 0`. Both markers are written together by dsh's
+     * childSessionMeta (spawn AND in-process fork children alike), so in
+     * practice the origin alone carries the decision; the budget clause
+     * only future-proofs the gate against a child that carries the budget
+     * without the origin. The budget test MUST be a VALUE test, not a
+     * field-presence test: the jsonl persistence backend materialises
+     * `delegationDepth: 0` on every restored header (write `?? 0`, read
+     * unconditionally), so a presence test would pull user-facing
+     * `Session.fork` conversations and other non-child restored sessions
+     * onto the live board / Ctrl+G.
+     *
+     * @returns whether a new view was adopted (caller emits).
+     */
+    adoptChildSession(session, startedAt) {
+        const sessionKey = String(session.id);
+        const header = session.header;
+        if (header?.parentSession === undefined
+            || (header.origin !== 'subagent' && (header.delegationDepth ?? 0) <= 0)
+            || !this.trackedSessions.has(String(header.parentSession))
+            || this.agentViews.has(sessionKey))
+            return false;
+        this.agentViews.set(sessionKey, {
+            childId: sessionKey,
+            parentSession: String(header.parentSession),
+            // Current dsh children always carry the origin, so in practice the
+            // label is `subagent <id8>`; the `fork` label only fires for the
+            // defensive budget-without-origin shape above.
+            label: header.origin === undefined
+                ? `fork ${sessionKey.slice(0, 8)}`
+                : `subagent ${sessionKey.slice(0, 8)}`,
+            startedAt,
+            tokens: 0,
+            rounds: 0,
+            retries: 0,
+            contextTokens: 0,
+        });
+        this.childSessions.add(sessionKey);
+        this.trackedSessions.add(sessionKey);
+        return true;
+    }
+    /**
+     * Live-store sweep — the corpus-level companion to
+     * `reconcileLiveWithProjection` (dsh 0.1.7-rc.2). `listDescendants` walked
+     * the complete Session corpus on rc.1 but recurses parent CATALOGS on
+     * rc.2, so a child whose catalog branch is corrupt/unreadable — or whose
+     * catalog entry is missing entirely — is omitted from the authoritative
+     * listing with no diagnostic row of its own. Every still-working child
+     * necessarily resides in the process, and the store's live list is the one
+     * enumeration that depends on no catalog: this sweep re-runs the shared
+     * adoption gate over `sessions.list()` each tick and picks up what both
+     * the firehose (burst-lost creation events) and the catalog walk missed.
+     * Merge discipline is the bridge-wide one — only ADD (the
+     * `agentViews.has` guard makes it idempotent and never resurrects a
+     * settled view); rounds/settlement continue through the ordinary fold
+     * paths once the child is in `childSessions`/`trackedSessions`. Cost is
+     * one header check per process-resident session per tick — no persistence
+     * read, and children of previous runs are not resident after a restart,
+     * so they cannot be resurrected onto the board.
+     */
+    reconcileLiveFromStore() {
+        const sessions = this.ctx.get('sessions');
+        if (sessions?.list === undefined)
+            return;
+        let changed = false;
+        for (const session of sessions.list()) {
+            if (this.adoptChildSession(session, Date.now()))
+                changed = true;
+        }
+        if (changed)
+            this.emitLive();
+    }
     /**
      * Correct the live view against the host's authoritative descendant
      * listing (`SubagentRuntime.listDescendants`, projection-backed — no
@@ -470,6 +522,13 @@ export class DshSessionBridge {
      * resurrect a settled continuable (its listing row is `inactive` while it
      * idles between turns). Runs best-effort: an absent/unshaped subagents
      * service or a throwing listing is silently skipped.
+     *
+     * dsh 0.1.7-rc.2: the listing recurses parent CATALOGS instead of walking
+     * the complete Session corpus — a child behind a corrupt/unreadable
+     * catalog branch is reported only as a branch diagnostic, and a truly
+     * catalog-less orphan is invisible (no row at all). Diagnostic rows are
+     * skipped here; the {@link reconcileLiveFromStore} sweep is the
+     * corpus-level companion that keeps such children off the blind spot.
      */
     async reconcileLiveWithProjection() {
         if (this.projectionReconcileInFlight)
@@ -478,6 +537,9 @@ export class DshSessionBridge {
         if (root === undefined)
             return;
         // ctx.get (NOT property access) — see the sessions accessor note above.
+        // Inline rc.2 `SubagentDescendantListEntry` union: child rows (catalog
+        // walk) and branch diagnostics share the list; `kind` has been on every
+        // row since rc.1, so the discriminator is floor-safe.
         const subagents = this.ctx.get('subagents');
         if (subagents?.listDescendants === undefined)
             return;
@@ -487,13 +549,24 @@ export class DshSessionBridge {
             const rootKey = String(root);
             let changed = false;
             for (const entry of entries) {
+                // A branch diagnostic (corrupt/unavailable/unsupported) names no
+                // child row — skipping it here is what the sweep above covers for.
+                if (entry.kind === 'diagnostic')
+                    continue;
                 const childKey = String(entry.id);
-                if (childKey === rootKey || this.agentViews.has(childKey))
+                if (childKey === rootKey)
                     continue;
                 // A running child this bridge never discovered (burst, or its events
                 // never bubbled). Register it header-discovery-shaped; descriptor
-                // refinement (label/mode/route) follows from the listing itself.
+                // refinement (label/mode/route) follows from the listing itself. A
+                // child already on the board needs no listing re-add — its own events
+                // drive the fold. (The existence guard lives HERE, not on the loop
+                // head: the settle arm below must still reach existing views — a
+                // loop-head guard made it dead code and stale one-shots lingered on
+                // the board holding maxAgents slots.)
                 if (entry.activity === 'running') {
+                    if (this.agentViews.has(childKey))
+                        continue;
                     this.agentViews.set(childKey, {
                         childId: childKey,
                         parentSession: entry.parentId !== undefined ? String(entry.parentId) : undefined,
@@ -655,6 +728,38 @@ export class DshSessionBridge {
             return hs === undefined || view.hardStop !== undefined ? view : { ...view, hardStop: hs };
         });
     }
+    /**
+     * Attach the attention ranking's jev upgrade source (heuristic-only when
+     * undefined) and the live maxRounds reader for the ranking's state table.
+     * Wired once by the host; the source self-debounces and self-guards.
+     */
+    attachAttentionSource(source, capReader) {
+        this.attentionSource = source;
+        this.attentionCapReader = capReader;
+    }
+    /** Re-observe the attention ranking; driven by the reconcile tick. */
+    updateAttention() {
+        const views = this.getLiveChildren();
+        const cap = this.attentionCapReader?.() ?? 0;
+        this.attentionBoard.update(views, cap);
+        this.attentionSource?.tick(this.attentionBoard, views, cap);
+    }
+    /** One child's current attention info (heuristic base; jev once it has judged). */
+    getAttention(childId) {
+        return this.attentionBoard.get(childId);
+    }
+    /** The spin-strike state for one child (the early-stop ladder's input). */
+    getSpinState(childId) {
+        return this.attentionBoard.spinState(childId);
+    }
+    /** All attention rows, highest score first (picker sort, status board). */
+    getAttentionRows() {
+        return this.attentionBoard.rows();
+    }
+    /** The guard deny-copy hint: the top attention-worthy live child, when one ranks above ok. */
+    getAttentionHint() {
+        return this.attentionBoard.topHint();
+    }
     /** Children still running (`outcome` unset) — the live count the guard caps. */
     getLiveChildren() {
         return this.getAgentViews().filter(view => view.outcome === undefined);
@@ -967,17 +1072,21 @@ export class DshSessionBridge {
      * after a successful `cancelChild`; a stop that found nothing live is
      * deliberately not recorded (the child settled on its own in time).
      */
-    markChildHardStopped(childId, round, cap) {
+    markChildHardStopped(childId, round, cap, early) {
         // The record lives in its OWN map, not on the view: fold updates spread
         // the view snapshot captured at their own event-dispatch time, and the
         // cancel races those events — a hardStop folded onto the view object was
         // observably overwritten by the in-flight `turn/end` spread. The map is
         // authoritative; getAgentViews composes it onto the returned views.
-        this.hardStopRecords.set(childId, { round, cap });
+        this.hardStopRecords.set(childId, { round, cap, ...(early !== undefined ? { early } : {}) });
         this.emitLive();
     }
     /** Hard stops the maxRounds policy executed, keyed by child session id. */
     hardStopRecords = new Map();
+    /** Attention ranking (heuristic base + optional jev layer) — see src/attention.ts. */
+    attentionBoard = new AttentionBoard();
+    attentionSource;
+    attentionCapReader;
     /**
      * Whether ANY LLM work is in flight: the bridge's own mid-turn status OR
      * at least one live child. The keymap's running gate reads this — with