@deepseek-harness-tui/dsh-tui 0.11.0 → 0.11.2

package/lib/types/dsh-adapter/sessions/snapshot.js

@@ -0,0 +1,90 @@
+/** Last successful listing for first paint only; the backend still refreshes it. */
+import { createHash } from 'node:crypto';
+import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { isAbsolute, join, normalize } from 'node:path';
+import { DATA_DIR } from '../../utils/paths.js';
+const directory = join(DATA_DIR, 'session-lists');
+const generations = new Map();
+/** Only the known JSONL provider exposes a public, durable source configuration. */
+function sourceKey(source) {
+    if (source.name !== 'session-persistence-jsonl')
+        return undefined;
+    const config = source.config;
+    if (config === null || typeof config !== 'object')
+        return undefined;
+    const { root, compression } = config;
+    // A relative config root could be reinterpreted after a workspace switch.
+    // Decline caching rather than inspecting the backend's private resolved root.
+    if (typeof root !== 'string' || !isAbsolute(root))
+        return undefined;
+    if (compression !== undefined && compression !== 'zstd' && compression !== 'none')
+        return undefined;
+    const path = normalize(root);
+    // Even Windows can host case-sensitive directories; alias misses are safer
+    // than displaying a different store's rows.
+    return JSON.stringify([source.name, path, compression ?? 'zstd']);
+}
+const record = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+const finite = (value) => typeof value === 'number' && Number.isFinite(value);
+const optionalText = (value) => value === undefined || typeof value === 'string';
+function isSummary(value) {
+    if (!record(value) || typeof value.id !== 'string' || !value.id || typeof value.cwd !== 'string' ||
+        !finite(value.createdAt) || !finite(value.updatedAt) || typeof value.hasPrompt !== 'boolean' ||
+        !finite(value.childCount) || value.childCount < 0 ||
+        (value.bytes !== undefined && (!finite(value.bytes) || value.bytes < 0)) ||
+        !['agentPreset', 'model', 'label', 'branch'].every(key => optionalText(value[key])))
+        return false;
+    const { title, kind } = value;
+    if (!record(title) || typeof title.text !== 'string' || typeof title.source !== 'string' ||
+        !['renamed', 'auto', 'prompt', 'fallback'].includes(title.source) || !record(kind))
+        return false;
+    return kind.kind === 'root' ||
+        (kind.kind === 'fork' && typeof kind.parent === 'string') ||
+        (kind.kind === 'subagent' && optionalText(kind.parent) && finite(kind.depth) && kind.depth >= 0);
+}
+function fileOf(key) {
+    return join(directory, createHash('sha256').update(key).digest('hex') + '.json');
+}
+function read(key) {
+    try {
+        const value = JSON.parse(readFileSync(fileOf(key), 'utf8'));
+        if (!record(value) || value.version !== 1 || value.source !== key || !Array.isArray(value.rows) || !value.rows.every(isSummary))
+            return undefined;
+        if (new Set(value.rows.map(row => row.id)).size !== value.rows.length)
+            return undefined;
+        return value.rows;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Undefined is unknown; an empty snapshot is a successful empty listing. */
+export function readListingSnapshot(source) {
+    const key = sourceKey(source);
+    return key === undefined ? undefined : read(key);
+}
+/** Capture ordering before async work, including across distinct Context proxies. */
+export function beginListingSnapshot(source) {
+    const key = sourceKey(source);
+    if (key === undefined)
+        return () => { };
+    const generation = (generations.get(key) ?? 0) + 1;
+    generations.set(key, generation);
+    return rows => {
+        if (generations.get(key) !== generation)
+            return;
+        const file = fileOf(key);
+        const temporary = file + '.' + process.pid + '.tmp';
+        try {
+            mkdirSync(directory, { recursive: true, mode: 0o700 });
+            writeFileSync(temporary, JSON.stringify({ version: 1, source: key, rows }), { mode: 0o600 });
+            renameSync(temporary, file);
+        }
+        catch {
+            try {
+                rmSync(temporary, { force: true });
+            }
+            catch { /* A cache never blocks listing. */ }
+        }
+    };
+}

package/lib/types/dsh-adapter/sessions/store.d.ts

@@ -1,12 +1,18 @@
 import type { TitleSource } from './types.js';
+/** Cheap file generation check for asynchronous listing writes. */
+export declare function indexFileStamp(): string | undefined;
 /** Facts derived from a log at one revision. */
 export interface DerivedEntry {
     readonly revision: string;
     /** Artifact size at this observation; append growth can retain older title evidence. */
     readonly bytes: number;
+    /** Last-write time observed with this revision, for the revision-only path. */
+    readonly modifiedAt: number | undefined;
     /** Physical file identity; a replacement invalidates append-only evidence. */
     readonly identity: string | undefined;
-    /** Hash of the previous EOF neighborhood, validating append-only carry-forward. */
+    /** Optional in older indexes; certifies only the physical-file-derived summary. */
+    readonly artifactStamp?: string;
+    /** Old EOF neighborhood hash, paired with the backend's append-only contract. */
     readonly anchor: string | undefined;
     readonly title: string;
     readonly titleSource: TitleSource;
@@ -26,8 +32,8 @@ export interface IndexEntry {
 export type SessionIndex = Map<string, IndexEntry>;
 /**
  * Load the cache.
- * @returns The parsed index; old derived facts are discarded for a rebuild.
- *   Version 2 retains branch notes; unrecognized files yield an empty index.
+ * @returns The parsed index; version 3 derivations are upgraded lazily and
+ *   version 2 retains branch notes only.
  */
 export declare function readIndex(): SessionIndex;
 /**
@@ -38,7 +44,7 @@ export declare function readIndex(): SessionIndex;
  * A concurrent writer may win the rename; the loser's derivations are simply
  * recomputed next time.
  *
- * @param index - The index to store. Entries are written in insertion order.
+ * @param index - The index to store. Stable id order ignores scan scheduling.
  */
 export declare function writeIndex(index: SessionIndex): void;
 /**

package/lib/types/dsh-adapter/sessions/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/store.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAW7C,gDAAgD;AAChD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,wFAAwF;IACxF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,mFAAmF;IACnF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AAED,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAA;IAC1C,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CACpC;AAED,2CAA2C;AAC3C,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAuDlD;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,YAAY,CAkBxC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAwBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO9E"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/store.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAsB7C,mEAAmE;AACnE,wBAAgB,cAAc,IAAI,MAAM,GAAG,SAAS,CAEnD;AAED,gDAAgD;AAChD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,wFAAwF;IACxF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,mFAAmF;IACnF,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,iFAAiF;IACjF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACjC,8EAA8E;IAC9E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC;AAED,gFAAgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,CAAA;IAC1C,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CACpC;AAED,2CAA2C;AAC3C,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AA2DlD;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,YAAY,CAoCxC;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CA0BpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAO9E"}

package/lib/types/dsh-adapter/sessions/store.js

@@ -6,9 +6,10 @@
  * service already hands out the exact token needed to avoid it:
  * `listSnapshots()` returns, per session, an opaque revision that changes
  * whenever the stored log changes. An entry whose revision still matches is
- * reused verbatim; anything else is re-derived. Steady state is therefore zero
- * log reads, and a session edited by another client (the store is shared with
- * dsh web) invalidates itself without any coordination.
+ * reused verbatim. A changed logical revision can still reuse a summary when
+ * its physical artifact stamp matches: historical revisions also depend on
+ * other sessions, whereas these derived fields read only the located file.
+ * A session edited by another client invalidates its artifact stamp.
  *
  * The revision is treated as opaque, as its contract requires. It happens to
  * be stat-derived today, but parsing it to shortcut a `stat` would couple this
@@ -16,10 +17,9 @@
  * per-session files is used.
  *
  * Two halves live in one entry because they have different lifetimes:
- * `derived` facts come from the log and die with the revision, while `branch`
- * is a local note about how this install used the session and no log change
- * can invalidate it. Keeping them in one record with one governing revision
- * field makes that boundary explicit instead of implied.
+ * `derived` facts come from the log and are checked against its revision or
+ * physical artifact stamp. `branch` is a local note about how this install
+ * used the session and no log change can invalidate it.
  *
  * Every operation is best-effort. The index is a cache: a corrupt file, a
  * losing concurrent write, or a read-only home directory costs a re-derivation
@@ -27,16 +27,31 @@
  *
  * @module @deepseek-harness-tui/dsh-tui/sessions/store
  */
-import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { DATA_DIR } from '../../utils/paths.js';
 /**
- * Bumped when derived facts change shape or meaning. Version 2 could cache
- * incomplete reads as empty: discard those derivations, retaining only the
- * branch notes that cannot be recovered from the session log.
+ * Bumped for cached mtime. Version 3 derivations remain readable and receive
+ * that field on their next listing; version 2 could cache incomplete reads as
+ * empty, so only its branch notes survive.
  */
-const SCHEMA_VERSION = 3;
+const SCHEMA_VERSION = 4;
 const INDEX_FILE = join(DATA_DIR, 'session-index.json');
+let loadedStamp;
+let loadedIndex;
+function indexStamp() {
+    try {
+        const stats = statSync(INDEX_FILE);
+        return `${stats.dev}:${stats.ino}:${stats.size}:${stats.mtimeMs}:${stats.ctimeMs}`;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Cheap file generation check for asynchronous listing writes. */
+export function indexFileStamp() {
+    return indexStamp();
+}
 /** A title source as written to disk, or undefined for anything unexpected. */
 function readTitleSource(value) {
     return value === 'renamed' || value === 'auto' || value === 'prompt' || value === 'fallback'
@@ -55,6 +70,7 @@ function readEntry(value, derivedValid) {
     const derived = raw;
     const revision = derived['revision'];
     const bytes = derived['bytes'];
+    const modifiedAt = derived['modifiedAt'];
     const identity = derived['identity'];
     const anchor = derived['anchor'];
     const title = derived['title'];
@@ -64,6 +80,7 @@ function readEntry(value, derivedValid) {
         typeof bytes !== 'number' ||
         !Number.isFinite(bytes) ||
         bytes < 0 ||
+        (modifiedAt !== undefined && (typeof modifiedAt !== 'number' || !Number.isFinite(modifiedAt))) ||
         (identity !== undefined && typeof identity !== 'string') ||
         (anchor !== undefined && typeof anchor !== 'string') ||
         typeof title !== 'string' ||
@@ -77,7 +94,9 @@ function readEntry(value, derivedValid) {
         derived: {
             revision,
             bytes,
+            modifiedAt: typeof modifiedAt === 'number' ? modifiedAt : undefined,
             identity: typeof identity === 'string' ? identity : undefined,
+            artifactStamp: typeof derived['artifactStamp'] === 'string' ? derived['artifactStamp'] : undefined,
             anchor: typeof anchor === 'string' ? anchor : undefined,
             title,
             titleSource,
@@ -90,32 +109,48 @@ function readEntry(value, derivedValid) {
 }
 /**
  * Load the cache.
- * @returns The parsed index; old derived facts are discarded for a rebuild.
- *   Version 2 retains branch notes; unrecognized files yield an empty index.
+ * @returns The parsed index; version 3 derivations are upgraded lazily and
+ *   version 2 retains branch notes only.
  */
 export function readIndex() {
+    const stamp = indexStamp();
+    if (loadedIndex !== undefined && loadedStamp === stamp)
+        return new Map(loadedIndex);
     const index = new Map();
     let parsed;
     try {
         parsed = JSON.parse(readFileSync(INDEX_FILE, 'utf8'));
     }
     catch {
-        return index;
+        loadedStamp = stamp;
+        loadedIndex = index;
+        return new Map(index);
+    }
+    if (parsed === null || typeof parsed !== 'object') {
+        loadedStamp = stamp;
+        loadedIndex = index;
+        return new Map(index);
     }
-    if (parsed === null || typeof parsed !== 'object')
-        return index;
     const file = parsed;
-    if (file['version'] !== SCHEMA_VERSION && file['version'] !== 2)
-        return index;
+    if (file['version'] !== SCHEMA_VERSION && file['version'] !== 3 && file['version'] !== 2) {
+        loadedStamp = stamp;
+        loadedIndex = index;
+        return new Map(index);
+    }
     const entries = file['entries'];
-    if (entries === null || typeof entries !== 'object')
-        return index;
+    if (entries === null || typeof entries !== 'object') {
+        loadedStamp = stamp;
+        loadedIndex = index;
+        return new Map(index);
+    }
     for (const [id, value] of Object.entries(entries)) {
-        const entry = readEntry(value, file['version'] === SCHEMA_VERSION);
+        const entry = readEntry(value, file['version'] === SCHEMA_VERSION || file['version'] === 3);
         if (entry !== undefined)
             index.set(id, entry);
     }
-    return index;
+    loadedStamp = stamp;
+    loadedIndex = index;
+    return new Map(index);
 }
 /**
  * Persist the cache, atomically.
@@ -125,11 +160,11 @@ export function readIndex() {
  * A concurrent writer may win the rename; the loser's derivations are simply
  * recomputed next time.
  *
- * @param index - The index to store. Entries are written in insertion order.
+ * @param index - The index to store. Stable id order ignores scan scheduling.
  */
 export function writeIndex(index) {
     const entries = {};
-    for (const [id, entry] of index) {
+    for (const [id, entry] of [...index].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
         entries[id] = {
             ...(entry.derived === undefined ? {} : { derived: entry.derived }),
             ...(entry.branch === undefined ? {} : { branch: entry.branch }),
@@ -144,6 +179,8 @@ export function writeIndex(index) {
         mkdirSync(DATA_DIR, { recursive: true, mode: 0o700 });
         writeFileSync(temporary, JSON.stringify({ version: SCHEMA_VERSION, entries }), { mode: 0o600 });
         renameSync(temporary, INDEX_FILE);
+        loadedStamp = indexStamp();
+        loadedIndex = new Map(index);
     }
     catch {
         try {

package/lib/types/dsh-adapter/settings-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/settings-sections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAA2G,MAAM,sCAAsC,CAAA;AACvL,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAA;AACvL;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAWtD,6EAA6E;AAC7E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAAA;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE,CAAA;IACrC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAAA;IACnD,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,mBAAmB,EAAE,0BAA0B,CAAA;KAChD;CACF;AAED,eAAO,MAAM,IAAI,8BAA8B,CAAA;AAE/C;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,OAAO;gBACzC,GAAG,EAAE,OAAO;IAsBxB,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI;IAuBjD,iDAAiD;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE;IASrC,sDAAsD;IACtD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IASnD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;CAU5C;AAyFD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,GAAG,SAAS,GAAG,uBAAuB,GAAG,SAAS,CAO5H;AAiDD,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAiBnF;AAED,eAAe,0BAA0B,CAAA"}
+{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/settings-sections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAA2G,MAAM,sCAAsC,CAAA;AACvL,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAA;AACvL;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAWtD,6EAA6E;AAC7E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAAA;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE,CAAA;IACrC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAAA;IACnD,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,mBAAmB,EAAE,0BAA0B,CAAA;KAChD;CACF;AAED,eAAO,MAAM,IAAI,8BAA8B,CAAA;AAE/C;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,OAAO;gBACzC,GAAG,EAAE,OAAO;IAsBxB,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI;IAuBjD,iDAAiD;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE;IASrC,sDAAsD;IACtD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IASnD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;CAU5C;AA6FD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,GAAG,SAAS,GAAG,uBAAuB,GAAG,SAAS,CAO5H;AAiDD,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAiBnF;AAED,eAAe,0BAA0B,CAAA"}

package/lib/types/dsh-adapter/settings-sections.js

@@ -33,7 +33,7 @@ export class TuiSettingsSectionsRuntime extends Service {
                 return [...settingsSectionStateFor(runtime).sections.values()];
             },
             section(ns) {
-                return settingsSectionStateFor(runtime).sections.get(ns.trim());
+                return settingsSectionStateFor(runtime).sections.get(ns);
             },
             subscribe(listener) {
                 return subscribeSections(runtime, listener);
@@ -104,9 +104,12 @@ function settingsSectionStateFor(runtime) {
 }
 function registerSection(runtime, section, owner) {
     const state = isSectionState(runtime) ? runtime : settingsSectionStateFor(runtime);
-    const ns = section.ns.trim();
-    if (!/^[a-z][a-z0-9_-]*$/u.test(ns))
+    // Host sections use opaque Loader IDs; rewriting them breaks settings.mutate.
+    // Plugin-owned sections retain their existing namespace validation.
+    const ns = owner === undefined ? section.ns : section.ns.trim();
+    if (!ns || (owner !== undefined && !/^[a-z][a-z0-9_-]*$/u.test(ns))) {
         throw new TypeError(`invalid TUI settings-section namespace: ${section.ns}`);
+    }
     if (state.sections.has(ns))
         throw new Error(`TUI settings section "${ns}" is already registered`);
     const groupIds = new Set();
@@ -239,7 +242,7 @@ export function getLocalSettingsSectionsHost(ctx) {
             return [...state.sections.values()];
         },
         section(ns) {
-            return state.sections.get(ns.trim());
+            return state.sections.get(ns);
         },
         subscribe(listener) {
             return subscribeSections(state, listener);

package/lib/types/dsh-adapter/sideQuestion.d.ts

@@ -6,12 +6,50 @@
  *
  * @module
  */
-import { type StreamChunk } from '@deepseek-ai/dsh-llm';
+import { type ContentBlock, type Message, type StreamChunk } from '@deepseek-ai/dsh-llm';
+import type { SessionEvent } from '@deepseek-ai/dsh-session';
+type ToolCall = Extract<ContentBlock, {
+    type: 'tool-call';
+}>;
 /**
  * Describe the auxiliary call's scope: one answer from existing context,
  * with no tools, follow-up actions, or interruption of the main session.
+ * `pending` names the main task's in-flight calls, which
+ * {@link splitUnresolvedToolCalls} removed from the replayed history.
  */
-export declare function wrapSideQuestion(question: string): string;
+export declare function wrapSideQuestion(question: string, pending?: readonly ToolCall[]): string;
+/**
+ * Split assistant `tool-call` blocks whose result never entered the derived
+ * history out of it. The composer runs `/btw` immediately while the main turn
+ * streams, so the derived tail can end on a tool request still executing
+ * (a running command, a job read). Providers reject that transcript ("An
+ * assistant message with 'tool_calls' must be followed by tool messages
+ * responding to each 'tool_call_id'"): pi-ai routes pad such calls with
+ * synthetic results, but the native DeepSeek adapter (dsh-llm-deepseek, 0.1.5
+ * hosts) serializes history verbatim and gets a 400. Every unanswered call is
+ * removed — with any message left without content — but only those in
+ * `running` (see {@link openStepToolCallIds}) come back as `pending` for the
+ * wrapper to name: a closed step can keep a call without a result (a failed
+ * tool scheduler still appends `step/end`), and that call is not executing.
+ * A history whose calls are all answered is returned unchanged.
+ *
+ * 0.1.7 answers a call with a tool-role message carrying `toolCallId`; older
+ * logs wrap the result in a `tool-result` block inside a user message; both
+ * shapes count as answered via `answeredToolCallIds` (compat/messages.ts).
+ */
+export declare function splitUnresolvedToolCalls(messages: readonly Message[], running: ReadonlySet<string>): {
+    messages: readonly Message[];
+    pending: ToolCall[];
+};
+/**
+ * Tool-call ids of the open step still waiting for their result: the calls
+ * the main task is executing right now. Mirrors dsh-session's crash-tail
+ * scan — a turn or step boundary closes every earlier call, answered or not.
+ * Ids come from `assistant/message`, not `tool/call`: upstream appends
+ * `tool/call` only when execution starts, so queued calls would go unnamed.
+ * `source.callId` is required on every supported line and read unguarded upstream.
+ */
+export declare function openStepToolCallIds(events: readonly SessionEvent[]): Set<string>;
 /** Outcome of one side question: the visible text answer, or an error. */
 export interface SideQuestionOutcome {
     answer: string | null;
@@ -33,4 +71,5 @@ export declare function runSideQuestion(params: {
     /** Cancellation: aborting yields `{answer: null}` with no error text. */
     signal?: AbortSignal;
 }): Promise<SideQuestionOutcome>;
+export {};
 //# sourceMappingURL=sideQuestion.d.ts.map

package/lib/types/dsh-adapter/sideQuestion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sideQuestion.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/sideQuestion.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAWzD;AAED,0EAA0E;AAC1E,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,yEAAyE;IACzE,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,WAAW,CAAC,CAAA;IACvD,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAA;IACf,iDAAiD;IACjD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,yEAAyE;IACzE,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuB/B"}
+{"version":3,"file":"sideQuestion.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/sideQuestion.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAkB,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,KAAK,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAK5D;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,SAAS,QAAQ,EAAO,GAAG,MAAM,CAc5F;AAeD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG;IACpG,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;IAC5B,OAAO,EAAE,QAAQ,EAAE,CAAA;CACpB,CA2BA;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAUhF;AAED,0EAA0E;AAC1E,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,yEAAyE;IACzE,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,WAAW,CAAC,CAAA;IACvD,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAA;IACf,iDAAiD;IACjD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,yEAAyE;IACzE,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuB/B"}

package/lib/types/dsh-adapter/sideQuestion.js

@@ -7,22 +7,118 @@
  * @module
  */
 import { BlockAssembler } from '@deepseek-ai/dsh-llm';
+import { answeredToolCallIds } from './compat/messages.js';
+/** Per-call argument budget in the pending-calls note; a file write can carry megabytes. */
+const PENDING_ARGS_LIMIT = 400;
 /**
  * Describe the auxiliary call's scope: one answer from existing context,
  * with no tools, follow-up actions, or interruption of the main session.
+ * `pending` names the main task's in-flight calls, which
+ * {@link splitUnresolvedToolCalls} removed from the replayed history.
  */
-export function wrapSideQuestion(question) {
+export function wrapSideQuestion(question, pending = []) {
+    const running = pending.length === 0 ? '' : `
+The main task is still executing these tool calls; their results are not available yet:
+${pending.map(call => `- ${call.name} ${clip(oneLine(call.arguments), PENDING_ARGS_LIMIT)}`).join('\n')}`;
     return `<side-question-context>
 Give one concise answer to the question below using the conversation already provided.
 This auxiliary call runs alongside the main session. The main task continues independently;
 do not describe it as interrupted, resumed, or as work performed by this call.
 No tools are available here: do not claim to inspect files, execute commands, browse,
 or carry out future actions. There will be no follow-up turn for this call.
-When the available context is insufficient, state what is unknown without promising research.
+When the available context is insufficient, state what is unknown without promising research.${running}
 </side-question-context>
 
 ${question}`;
 }
+/** Pretty-printed arguments carry literal breaks (the native adapter keeps the provider string); keep one bullet line. */
+function oneLine(text) {
+    return text.replace(/\s+/g, ' ').trim();
+}
+/** Cut at a code-unit budget without stranding a high surrogate (a lone one reaches the wire as `\ud83d`). */
+function clip(text, limit) {
+    if (text.length <= limit)
+        return text;
+    const code = text.charCodeAt(limit - 1);
+    const end = code >= 0xd800 && code <= 0xdbff ? limit - 1 : limit;
+    return `${text.slice(0, end)}…`;
+}
+/**
+ * Split assistant `tool-call` blocks whose result never entered the derived
+ * history out of it. The composer runs `/btw` immediately while the main turn
+ * streams, so the derived tail can end on a tool request still executing
+ * (a running command, a job read). Providers reject that transcript ("An
+ * assistant message with 'tool_calls' must be followed by tool messages
+ * responding to each 'tool_call_id'"): pi-ai routes pad such calls with
+ * synthetic results, but the native DeepSeek adapter (dsh-llm-deepseek, 0.1.5
+ * hosts) serializes history verbatim and gets a 400. Every unanswered call is
+ * removed — with any message left without content — but only those in
+ * `running` (see {@link openStepToolCallIds}) come back as `pending` for the
+ * wrapper to name: a closed step can keep a call without a result (a failed
+ * tool scheduler still appends `step/end`), and that call is not executing.
+ * A history whose calls are all answered is returned unchanged.
+ *
+ * 0.1.7 answers a call with a tool-role message carrying `toolCallId`; older
+ * logs wrap the result in a `tool-result` block inside a user message; both
+ * shapes count as answered via `answeredToolCallIds` (compat/messages.ts).
+ */
+export function splitUnresolvedToolCalls(messages, running) {
+    const answered = new Set();
+    const calls = [];
+    for (const message of messages) {
+        for (const id of answeredToolCallIds(message))
+            answered.add(id);
+        if (message.role !== 'assistant')
+            continue;
+        for (const block of message.content)
+            if (block.type === 'tool-call')
+                calls.push(block);
+    }
+    const unresolved = new Set(calls.filter(call => !answered.has(call.id)).map(call => call.id));
+    if (unresolved.size === 0)
+        return { messages, pending: [] };
+    const pending = calls.filter(call => unresolved.has(call.id) && running.has(call.id));
+    const kept = [];
+    for (const message of messages) {
+        if (message.role !== 'assistant') {
+            kept.push(message);
+            continue;
+        }
+        const content = message.content.filter(block => block.type !== 'tool-call' || !unresolved.has(block.id));
+        // A reasoning-only remainder stays: upstream replays the same shape for a
+        // turn interrupted mid-thinking. An emptied message drops the way
+        // deriveEventMessage drops an empty assistant/message; the user→user
+        // adjacency this can leave already reaches the native adapter from the
+        // agent loop itself (prompt + runtime-context user messages).
+        if (content.length === 0)
+            continue;
+        kept.push(content.length === message.content.length ? message : { ...message, content });
+    }
+    return { messages: kept, pending };
+}
+/**
+ * Tool-call ids of the open step still waiting for their result: the calls
+ * the main task is executing right now. Mirrors dsh-session's crash-tail
+ * scan — a turn or step boundary closes every earlier call, answered or not.
+ * Ids come from `assistant/message`, not `tool/call`: upstream appends
+ * `tool/call` only when execution starts, so queued calls would go unnamed.
+ * `source.callId` is required on every supported line and read unguarded upstream.
+ */
+export function openStepToolCallIds(events) {
+    const open = new Set();
+    for (const event of events) {
+        if (event.type === 'turn/start' || event.type === 'turn/end' || event.type === 'step/end')
+            open.clear();
+        if (event.type === 'assistant/message') {
+            for (const block of event.data.message.content)
+                if (block.type === 'tool-call')
+                    open.add(block.id);
+        }
+        if (event.type === 'tool/result')
+            open.delete(event.data.message.source.callId);
+    }
+    return open;
+}
 /**
  * Run one side-question call: stream the assembled options, fold chunks
  * through the shared BlockAssembler, and surface the assembled text

package/lib/types/dsh-adapter/subagents.d.ts

@@ -1,16 +1,41 @@
 import type { AssistantStreamFrame } from '@deepseek-ai/dsh-agent';
-import type { SubagentState, SubagentOutputKind, SubagentToolCall } from '../adapter/ports/channel-view.js';
-export type { SubagentState, SubagentStatus, SubagentOutputLine, SubagentOutputKind, SubagentToolCall, SubagentTokenUsage } from '../adapter/ports/channel-view.js';
+import type { CostTokenBuckets, SubagentCostEntry, SubagentState, SubagentOutputKind, SubagentToolCall } from '../adapter/ports/channel-view.js';
+export type { SubagentState, SubagentStatus, SubagentOutputLine, SubagentOutputKind, SubagentToolCall, SubagentTokenUsage, SubagentCostEntry } from '../adapter/ports/channel-view.js';
+/** 子代理 durable 用量的费用快照：entries 供多模型计价，unpriced 是
+ *  非官方/未收录用量的独立副本（展示与回归断言用）。 */
+export interface SubagentCostSnapshot {
+    entries: SubagentCostEntry[];
+    unpriced: CostTokenBuckets;
+}
 export declare class SubagentActivityStore {
     private states;
     private sessionToAgent;
     private listeners;
     private streams;
+    /** 会话级 durable usage 费用桶，key = `${provider}\u0000${model}`。 */
+    private costByModel;
+    /** 非官方 provider / 未收录模型的用量副本（只展示 token，不计金额）。 */
+    private costUnpriced;
+    /** 每个 agent 已消费的最大 durable 事件 seq（同一事件重投不重复计费）。 */
+    private costSeq;
     private commitLine;
     private pushLine;
     onSpawned(agentId: string, provider?: string, model?: string, info?: Partial<SubagentState>): void;
+    /** Durable discovery (`subagent/catalog`, workflow member events, registry
+     * back-fill): register a child WITHOUT disturbing an already-tracked run.
+     * `live` marks a child the agents registry currently holds, which keeps the
+     * row running; an idle historical child shows as `unknown` (the parent log
+     * alone cannot prove how its last epoch ended). */
+    onDiscovered(agentId: string, info?: {
+        label?: string;
+        childCreatedAt?: number;
+        live?: boolean;
+        provider?: string;
+        model?: string;
+    }): void;
     linkSession(agentId: string, session: unknown): void;
     getSubagentIdBySession(session: unknown): string | undefined;
+    has(agentId: string): boolean;
     appendOutput(agentId: string, text: string, kind?: SubagentOutputKind): void;
     /** Mark the streaming tail line complete (run settlement). */
     flushOutput(agentId: string): void;
@@ -35,13 +60,26 @@ export declare class SubagentActivityStore {
         total?: number;
         context?: number;
     }): void;
-    onCompleted(agentId: string, summary?: string, stopReason?: string): void;
-    onFailed(agentId: string, error: string): void;
-    onCancelled(agentId: string, reason?: string, summary?: string): void;
+    /** durable usage 的计价字段；全零/非法返回 undefined（不建零桶）。 */
+    private costDeltaOf;
+    /** 一笔 durable usage 按发生时刻落 peak/idle 桶，model/provider 取事件
+     *  发生时的子代理身份；非官方/未收录同时进 unpriced 副本。
+     *
+     *  `seq` 是同一 binding 内的事件序号：重放/回放把同一条 durable 事件再投
+     *  一次时只计第一笔（重投即双计会让"并入子代理"的估算凭空变大）。判据与
+     *  `settleAssistant` 的 `settledSeq` 同源但**各自独立**——两处都要消费
+     *  同一个 seq，共用字段会让后消费的那处被前一处挡掉。 */
+    private accumulateCost;
+    /** durable 用量的费用快照（深拷贝）：entries 供计价，unpriced 供展示。 */
+    costSnapshot(): SubagentCostSnapshot;
+    onCompleted(agentId: string, summary?: string, stopReason?: string, endedAt?: number): void;
+    onFailed(agentId: string, error: string, endedAt?: number): void;
+    onCancelled(agentId: string, reason?: string, summary?: string, endedAt?: number): void;
     private finish;
     /** Drop all tracked subagents and session links (session swap: the old
      * session's children were disposed with their parent — nothing may keep
-     * routing events of a session the channel no longer projects). */
+     * routing events of a session the channel no longer projects). The
+     * session-scoped cost buckets reset with them. */
     reset(): void;
     snapshot(): SubagentState[];
     get(agentId: string): SubagentState | undefined;

package/lib/types/dsh-adapter/subagents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,OAAO,KAAK,EAAE,aAAa,EAAsC,kBAAkB,EAAE,gBAAgB,EAAsB,MAAM,kCAAkC,CAAA;AACnK,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAiBnK,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,OAAO,CAA2C;IAE1D,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,QAAQ;IAOhB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAa,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,IAAI;IA0B1G,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAMpD,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAE5D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,kBAA2B,GAAG,IAAI;IA0BpF,8DAA8D;IAC9D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IASlC;mFAC+E;IAC/E,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,IAAI;IA+BjE,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,eAAe;IAyBvB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAmDrD,6EAA6E;IAC7E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAO7D,2EAA2E;IAC3E,OAAO,CAAC,SAAS;IAUjB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IASvF,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAU3J,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,SAAc,GAAG,IAAI;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAC9C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAE1E,OAAO,CAAC,MAAM;IAcd;;sEAEkE;IAClE,KAAK,IAAI,IAAI;IAOb,QAAQ,IAAI,aAAa,EAAE;IAC3B,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAC/C,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAC3C,OAAO,CAAC,MAAM;CACf"}
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"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"}