@agi-fans/dsh-tui 0.16.0 → 0.17.0

package/lib/session/model-favorites.js

@@ -1,6 +1,5 @@
 /** Durable, product-owned model favorites used by keyboard model cycling. */
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
-import { dirname } from 'node:path';
+import { readJsonFile, writeJsonAtomic } from "./json-file.js";
 const MAX_FAVORITES = 16;
 function favorite(value) {
     if (typeof value !== 'object' || value === null || Array.isArray(value))
@@ -22,33 +21,24 @@ function key(value) {
     return `${value.provider}\0${value.model}`;
 }
 export function readModelFavorites(path) {
-    try {
-        const parsed = JSON.parse(readFileSync(path, 'utf8'));
-        if (!Array.isArray(parsed))
-            return [];
-        const seen = new Set();
-        const result = [];
-        for (const value of parsed) {
-            const entry = favorite(value);
-            if (entry === undefined || seen.has(key(entry)))
-                continue;
-            seen.add(key(entry));
-            result.push(entry);
-            if (result.length >= MAX_FAVORITES)
-                break;
-        }
-        return result;
-    }
-    catch {
+    const parsed = readJsonFile(path);
+    if (!Array.isArray(parsed))
         return [];
+    const seen = new Set();
+    const result = [];
+    for (const value of parsed) {
+        const entry = favorite(value);
+        if (entry === undefined || seen.has(key(entry)))
+            continue;
+        seen.add(key(entry));
+        result.push(entry);
+        if (result.length >= MAX_FAVORITES)
+            break;
     }
+    return result;
 }
 export function writeModelFavorites(path, favorites) {
-    const normalized = readDistinct(favorites);
-    mkdirSync(dirname(path), { recursive: true });
-    const temporary = `${path}.${process.pid}.${Date.now()}.tmp`;
-    writeFileSync(temporary, JSON.stringify(normalized, null, 2) + '\n', { encoding: 'utf8', mode: 0o600 });
-    renameSync(temporary, path);
+    writeJsonAtomic(path, readDistinct(favorites));
 }
 export function addModelFavorite(favorites, entry) {
     return [...favorites.filter(item => key(item) !== key(entry)), entry].slice(-MAX_FAVORITES);

package/lib/session/model-favorites.js.map

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

package/lib/session/release-notes.js

@@ -1,23 +1,6 @@
 /** Keep a Changelog parsing and startup release-note selection. */
+import { compareVersions } from "./version-compare.js";
 export const STARTUP_CHANGELOG_MODES = ['summary', 'expanded', 'hidden'];
-function versionParts(version) {
-    const match = /^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/u.exec(version);
-    if (match?.[1] === undefined || match[2] === undefined || match[3] === undefined)
-        return undefined;
-    return [Number(match[1]), Number(match[2]), Number(match[3])];
-}
-function compareVersions(left, right) {
-    const a = versionParts(left);
-    const b = versionParts(right);
-    if (a === undefined || b === undefined)
-        return 0;
-    for (let index = 0; index < a.length; index += 1) {
-        const difference = (a[index] ?? 0) - (b[index] ?? 0);
-        if (difference !== 0)
-            return difference;
-    }
-    return 0;
-}
 function countCategories(markdown) {
     const counts = {};
     let category;

package/lib/session/release-notes.js.map

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

package/lib/session/session-controller.js

@@ -15,8 +15,10 @@ import { SessionId, SessionLogOffset } from '@deepseek-ai/dsh-session';
 import { queueHostSubagentPrompt } from '@deepseek-ai/dsh-subagent/internal';
 import { firstVisibleStreamTime } from "../views/stream-time.js";
 import { LiveAttemptTracker } from "./live-attempt-tracker.js";
+import { blocksText } from "./content-text.js";
 import { jobNoticeFor } from "./job-notice.js";
-import { descendantDepth, isSteerableSubagent, SubagentRoster } from "./subagent-roster.js";
+import { descendantDepth, isSteerableSubagent } from "./subagent-roster.js";
+import { SubagentTracker } from "./subagent-tracker.js";
 import { commandPermission } from "../commands/permission.js";
 import { isBlankSession, toolPresentationForPreset, } from "./session-configuration.js";
 import { stripComposerImageMarkers } from "../input/image-paste.js";
@@ -245,12 +247,7 @@ function explicitSessionTitle(events) {
 function humanMessageText(event) {
     if (event.type !== 'user/message' || event.data.source.kind !== 'user')
         return undefined;
-    const text = event.data.content
-        .filter((block) => block.type === 'text')
-        .map(block => block.text)
-        .join(' ')
-        .replace(/\s+/gu, ' ')
-        .trim();
+    const text = blocksText(event.data.content, { collapse: true });
     return text === '' ? undefined : text;
 }
 /** Find direct human messages whose preceding log prefix is safe to seed into a fork. */
@@ -270,12 +267,7 @@ export function conversationTurns(events) {
         }
         if (open === undefined || event.type !== 'user/message' || event.data.source.kind !== 'user')
             continue;
-        const text = event.data.content
-            .filter((block) => block.type === 'text')
-            .map(block => block.text)
-            .join('\n')
-            .replace(/\s+/gu, ' ')
-            .trim();
+        const text = blocksText(event.data.content, { collapse: true });
         const imageCount = event.data.content.filter(block => block.type === 'image').length;
         if (text === '' && imageCount === 0)
             continue;
@@ -364,10 +356,7 @@ export function encodeCommandAttachments(images) {
 }
 /** Rehydrate one durable human inbox message into an editable composer draft. */
 export async function restoreSubmissionMessage(message, attachments) {
-    const text = message.content
-        .filter((block) => block.type === 'text')
-        .map(block => block.text)
-        .join('\n');
+    const text = blocksText(message.content);
     const refs = message.content
         .filter((block) => block.type === 'image')
         .map(block => block.attachment);
@@ -401,19 +390,33 @@ export class SessionRuntime {
     #releasedHandles = new WeakSet();
     #disposed = false;
     #off = [];
-    #subagents = new SubagentRoster();
-    #publishedSubagents;
+    #tracker;
     #streamAttempts = new LiveAttemptTracker();
     #recentCache = new Map();
     #refreshInFlight = null;
     #refreshDirty = false;
-    #subagentEpoch = 0;
     #inspectEpoch = 0;
     #activationEpoch = 0;
     #inspectedId;
     constructor(ctx, tui) {
         this.#ctx = ctx;
         this.#tui = tui;
+        this.#tracker = new SubagentTracker({
+            rootId: () => this.#active?.handle.agent.id,
+            depth: (session) => {
+                const rootId = this.#active?.handle.agent.id;
+                return rootId === undefined ? undefined : descendantDepth(session, rootId, this.#lookupSession);
+            },
+            agentStatus: id => this.#ctx.get('agents')?.get(SessionId(id))?.status,
+            sessions: () => this.#ctx.get('sessions')?.list() ?? [],
+            listChildren: rootId => this.#ctx.get('subagents')?.listChildren(SessionId(rootId)),
+            publish: (roster) => {
+                this.#tui.setSubagents(roster);
+                if (this.#inspectedId === undefined)
+                    return;
+                this.#tui.setInspectedSubagent(this.#inspectView(this.#inspectedId));
+            },
+        });
         this.#off.push(tui.onInspectSubagent(id => { void this.#inspectSubagent(id); }));
         this.#off.push(tui.onInspectClose(() => { this.#closeInspect(); }));
         this.#off.push(tui.onInspectSubmit(submission => { void this.#steerInspected(submission); }));
@@ -457,16 +460,13 @@ export class SessionRuntime {
             }
             if (payload.agent.id === this.#inspectedId)
                 tui.setStatus(payload.status);
-            this.#noteSubagentStatus(payload.agent.session, payload.status);
+            this.#tracker.noteStatus(payload.agent.session, payload.status);
         }));
         this.#off.push(ctx.on('session/created', (session) => {
-            this.#noteSubagentSession(session);
+            this.#tracker.noteSession(session);
         }));
         this.#off.push(ctx.on('session/disposed', (session) => {
-            if (!this.#subagents.owns(session.id))
-                return;
-            this.#subagents.setAgentStatus(session.id, 'gone');
-            this.#pushSubagents();
+            this.#tracker.noteGone(session);
         }));
         this.#off.push(ctx.on('session/event', (session, event) => {
             const active = this.#active;
@@ -475,7 +475,7 @@ export class SessionRuntime {
             if (session.id === this.#inspectedId) {
                 const child = ctx.get('agents')?.get(session.id);
                 tui.event(event, child === undefined ? undefined : ctx.get('tuiToolPresentation')?.event(child, event));
-                this.#noteSubagentEvent(session, event);
+                this.#tracker.noteEvent(session, event);
                 return;
             }
             if (session === active.handle.agent.session) {
@@ -483,14 +483,14 @@ export class SessionRuntime {
                     tui.event(event, ctx.get('tuiToolPresentation')?.event(active.handle.agent, event));
                 }
                 if (event.type === 'subagent/catalog')
-                    this.#observeCatalogChildren(session, [event]);
+                    this.#tracker.observeCatalog(session, [event]);
                 if (shouldRefreshSessionInfoAfter(event))
                     this.#pushSessionInfo();
                 if (event.type === 'session/title')
                     void this.refreshRecent();
                 return;
             }
-            this.#noteSubagentEvent(session, event);
+            this.#tracker.noteEvent(session, event);
         }));
         // Format v2 moved live assistant increments off the session log. The
         // durable `session/event` firehose now carries only settlements; chunk
@@ -760,10 +760,7 @@ export class SessionRuntime {
         if (message?.type !== 'user/message' || message.data.source.kind !== 'user') {
             throw new Error('The selected conversation turn is no longer available.');
         }
-        const text = message.data.content
-            .filter((block) => block.type === 'text')
-            .map(block => block.text)
-            .join('\n');
+        const text = blocksText(message.data.content);
         const imageRefs = message.data.content
             .filter((block) => block.type === 'image')
             .map(block => block.attachment);
@@ -964,10 +961,9 @@ export class SessionRuntime {
         if (this.#disposed)
             return;
         this.#disposed = true;
-        this.#subagentEpoch += 1;
         this.#activationEpoch += 1;
         this.#inspectedId = undefined;
-        this.#subagents.reset();
+        this.#tracker.reset();
         this.#tui.setInspectedSubagent(undefined);
         this.#tui.setSubagents(undefined);
         this.#tui.setSessionSearch();
@@ -1009,6 +1005,28 @@ export class SessionRuntime {
             disposeToolPresentation: configuration.disposeToolPresentation,
         };
     }
+    /**
+     * Claim the activated session into the cwd workspace so grouped session
+     * surfaces (the harness web sidebar) file it instead of leaving it
+     * ungrouped. Best-effort like `#resolveModelInfo`: the registry is an
+     * optional service and a failed claim must not disturb activation.
+     */
+    async #claimWorkspace(active) {
+        const registry = this.#ctx.get('workspaceRegistry');
+        if (registry === undefined)
+            return;
+        try {
+            const { session } = active.handle.agent;
+            const cwd = session.header.cwd;
+            if (cwd === undefined)
+                return;
+            const workspace = await registry.resolveByPath(cwd) ?? await registry.create(cwd);
+            await workspace.attachSession(session.id);
+        }
+        catch {
+            // The workspace claim is cosmetic interop; the session itself is fine.
+        }
+    }
     async #resolveModelInfo(selection) {
         try {
             return await this.#ctx.get('llm')?.resolveModelInfo(selection.provider, selection.model);
@@ -1026,6 +1044,7 @@ export class SessionRuntime {
         const previous = this.#active;
         const epoch = ++this.#activationEpoch;
         this.#active = next;
+        void this.#claimWorkspace(next);
         try {
             this.#presentAgent(next);
             const selected = this.selection(next.handle.agent);
@@ -1093,7 +1112,7 @@ export class SessionRuntime {
         this.#inspectedId = undefined;
         this.#tui.setInspectedSubagent(undefined);
         this.#tui.setStatus(agent.status);
-        this.#syncSubagents();
+        this.#tracker.sync();
         // Seed welcome metadata before replaceSession commits the startup header to
         // native scrollback; later updates cannot rewrite that frozen first frame.
         this.#pushSessionInfo();
@@ -1163,45 +1182,6 @@ export class SessionRuntime {
         return list.find(skill => skill.name === name && isUserInvocable(skill));
     }
     #lookupSession = (id) => this.#ctx.get('sessions')?.get(SessionId(id));
-    #subagentDepth(session) {
-        const rootId = this.#active?.handle.agent.id;
-        if (rootId === undefined)
-            return undefined;
-        return descendantDepth(session, rootId, this.#lookupSession);
-    }
-    #noteSubagentSession(session) {
-        const depth = this.#subagentDepth(session);
-        if (depth === undefined)
-            return;
-        const parentId = session.header.parentSession;
-        this.#subagents.remember({
-            id: session.id,
-            ...(parentId === undefined ? {} : { parentId }),
-            depth,
-            phase: this.#ctx.get('agents')?.get(session.id)?.status === 'running' ? 'running' : 'starting',
-        });
-        this.#pushSubagents();
-    }
-    #noteSubagentEvent(session, event) {
-        const depth = this.#subagentDepth(session);
-        if (depth === undefined)
-            return;
-        this.#subagents.apply(session, depth, event, this.#ctx.get('agents')?.get(session.id)?.status);
-        this.#pushSubagents();
-    }
-    /**
-     * Add the direct children a Session's durable catalog declares.
-     *
-     * The live roster is built from `session/created` and child events, so a
-     * resumed parent would otherwise show nothing: its children are neither
-     * loaded nor replayed. Catalog facts are durable, so a restored roster still
-     * lists those children, and `#inspectSubagent` opens each transcript from
-     * disk. Children the live path already knows keep their own state.
-     */
-    #observeCatalogChildren(session, events) {
-        if (this.#subagents.observeCatalog(session.id, events))
-            this.#pushSubagents();
-    }
     /** Route live output only to the visible session; background frames remain buffered for inspection. */
     #forwardLiveDelta(agent, delta) {
         const active = this.#active;
@@ -1229,57 +1209,8 @@ export class SessionRuntime {
                 this.#tui.streamDelta(delta);
         }
     }
-    #noteSubagentStatus(session, status) {
-        if (this.#subagents.owns(session.id)) {
-            this.#subagents.setAgentStatus(session.id, status);
-            this.#pushSubagents();
-            return;
-        }
-        const depth = this.#subagentDepth(session);
-        if (depth === undefined)
-            return;
-        this.#subagents.hydrate(session, depth, this.#ctx.get('agents')?.get(session.id)?.status ?? status);
-        this.#pushSubagents();
-    }
-    #syncSubagents() {
-        const root = this.#active?.handle.agent;
-        const epoch = this.#subagentEpoch + 1;
-        this.#subagentEpoch = epoch;
-        if (root === undefined) {
-            this.#subagents.reset();
-            this.#tui.setSubagents(undefined);
-            return;
-        }
-        this.#subagents.reset(root.id);
-        for (const session of this.#ctx.get('sessions')?.list() ?? []) {
-            const depth = descendantDepth(session, root.id, this.#lookupSession);
-            if (depth === undefined)
-                continue;
-            this.#subagents.hydrate(session, depth, this.#ctx.get('agents')?.get(session.id)?.status);
-        }
-        this.#pushSubagents();
-        const listed = this.#ctx.get('subagents')?.listChildren(root.id);
-        if (listed === undefined)
-            return;
-        void listed.then((entries) => {
-            if (epoch !== this.#subagentEpoch || this.#active?.handle.agent !== root)
-                return;
-            for (const entry of entries) {
-                if (entry.kind !== 'child')
-                    continue;
-                this.#subagents.remember({
-                    id: entry.id,
-                    depth: 1,
-                    mode: entry.mode,
-                    ...(entry.label === undefined ? {} : { label: entry.label }),
-                    phase: entry.activity === 'running' ? 'running' : 'waiting',
-                });
-            }
-            this.#pushSubagents();
-        }, () => undefined);
-    }
     #inspectView(id, fallbackPhase = 'waiting') {
-        const view = this.#subagents.snapshot()?.agents.find(agent => agent.id === id);
+        const view = this.#tracker.snapshot()?.agents.find(agent => agent.id === id);
         const mode = view?.mode;
         return {
             id,
@@ -1289,28 +1220,21 @@ export class SessionRuntime {
             writable: isSteerableSubagent(mode),
         };
     }
-    #pushSubagents() {
-        const roster = this.#subagents.snapshot();
-        if (roster === this.#publishedSubagents)
-            return;
-        this.#publishedSubagents = roster;
-        this.#tui.setSubagents(roster);
-        if (this.#inspectedId === undefined)
-            return;
-        this.#tui.setInspectedSubagent(this.#inspectView(this.#inspectedId));
-    }
     #pushSessionInfo() {
         const active = this.#active;
         if (active === undefined)
             return;
         const agent = active.handle.agent;
         const projection = this.#projection(active);
-        const title = explicitSessionTitle(agent.session.snapshotEvents());
+        // One snapshot feeds both folds; each append invalidates the session's
+        // cached snapshot, so a second call would pay another O(log) copy.
+        const events = agent.session.snapshotEvents();
+        const title = explicitSessionTitle(events);
         this.#tui.setSession({
             id: agent.id,
             ...(title === undefined ? {} : { title }),
             recent: this.#recent.filter(row => row.id !== agent.id),
-            stats: this.#stats(active, projection),
+            stats: sessionStats(events, active.contextWindow, projection),
             controls: this.#sessionControls(active, projection),
         });
     }
@@ -1333,7 +1257,7 @@ export class SessionRuntime {
     }
     #replaceTranscript(agent) {
         const events = agent.session.snapshotEvents();
-        this.#observeCatalogChildren(agent.session, events);
+        this.#tracker.observeCatalog(agent.session, events);
         this.#tui.replaceSession(events, this.#ctx.get('tuiToolPresentation')?.session(agent, events), agent.status);
         this.#replayLivePrefix(agent.session.id);
     }
@@ -1361,7 +1285,7 @@ export class SessionRuntime {
     async #inspectSubagent(id) {
         const request = this.#inspectEpoch + 1;
         this.#inspectEpoch = request;
-        if (!this.#subagents.owns(id)) {
+        if (!this.#tracker.owns(id)) {
             this.#tui.notice('That subagent is no longer available.', { level: 'error' });
             return;
         }
@@ -1408,7 +1332,7 @@ export class SessionRuntime {
             return;
         }
         const live = this.#ctx.get('sessions')?.get(SessionId(childId));
-        const rosterParent = this.#subagents.snapshot()?.agents.find(agent => agent.id === childId)?.parentId;
+        const rosterParent = this.#tracker.snapshot()?.agents.find(agent => agent.id === childId)?.parentId;
         const parentId = live?.header.parentSession ?? rosterParent;
         const parent = parentId === undefined || parentId === root.id
             ? root