@deepseek-harness-tui/dsh-tui 0.14.0 → 0.15.0

package/lib/types/dsh-adapter/root-dispose.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Disposing the entry's root while the profile may still be composing into it:
+ * @deepseek-ai/dsh-hmr deadlocks when disposed while its init starts config
+ * watchers, so a root dispose first lets the Loader settle, and the composition
+ * skips its audit and readiness once a dispose is waiting.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+export interface CompositionTracker {
+    /** True once a root dispose waits for the composition: stop short of the audit and readiness. */
+    readonly disposing: boolean;
+    /** Composed, failed or stopped. */
+    done(): void;
+}
+/** A root dispose waits for `settle` first. */
+export declare function trackComposition(root: Context, settle: () => Promise<unknown>): CompositionTracker;
+/** Dispose the root once a composition in progress on it has let its Loader settle. */
+export declare function disposeRootSettled(ctx: Context, dispose?: () => Promise<unknown>): Promise<unknown>;
+//# sourceMappingURL=root-dispose.d.ts.map

package/lib/types/dsh-adapter/root-dispose.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"root-dispose.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/root-dispose.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAUlD,MAAM,WAAW,kBAAkB;IACjC,iGAAiG;IACjG,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,mCAAmC;IACnC,IAAI,IAAI,IAAI,CAAA;CACb;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAUlG;AAED,uFAAuF;AACvF,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,MAAM,OAAO,CAAC,OAAO,CAAkC,GAAG,OAAO,CAAC,OAAO,CAAC,CAWzI"}

package/lib/types/dsh-adapter/root-dispose.js

@@ -0,0 +1,28 @@
+const compositions = new WeakMap();
+/** A root dispose waits for `settle` first. */
+export function trackComposition(root, settle) {
+    const key = root.root;
+    const composition = { settle, disposing: false };
+    compositions.set(key, composition);
+    return {
+        get disposing() { return composition.disposing; },
+        done() {
+            if (compositions.get(key) === composition)
+                compositions.delete(key);
+        },
+    };
+}
+/** Dispose the root once a composition in progress on it has let its Loader settle. */
+export async function disposeRootSettled(ctx, dispose = () => ctx.root.fiber.dispose()) {
+    const composition = compositions.get(ctx.root);
+    if (composition !== undefined) {
+        composition.disposing = true;
+        try {
+            await composition.settle();
+        }
+        catch {
+            // A failed activation is the composition's to report; dispose anyway.
+        }
+    }
+    return dispose();
+}

package/lib/types/dsh-adapter/session-list-metadata.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Mirror dsh-api-session-controller's sessionListMetadata projection (0.2.0-rc.2).
+ * The web sidebar treats a missing row as nonblank, so TUI checkpoints need the
+ * same key, stateVersion, schema and fold. verify-session-list-metadata checks
+ * the installed host definition for drift.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { SessionEvent } from '@deepseek-ai/dsh-session';
+export declare const SESSION_LIST_METADATA_KEY = "sessionListMetadata";
+export declare const SESSION_LIST_METADATA_STATE_VERSION = 1;
+export interface SessionListMetadataState {
+    readonly blank: boolean;
+    readonly lastPromptAt: number | null;
+}
+export declare function initSessionListMetadata(): SessionListMetadataState;
+/** Match the host fold, including reference identity when neither field changes. */
+export declare function applySessionListMetadata(state: SessionListMetadataState, event: SessionEvent): SessionListMetadataState;
+/** Register before creating the boot agent, so its first checkpoint has the key. */
+export declare function attachSessionListMetadata(ctx: Context): void;
+//# sourceMappingURL=session-list-metadata.d.ts.map

package/lib/types/dsh-adapter/session-list-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-list-metadata.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/session-list-metadata.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,eAAO,MAAM,yBAAyB,wBAAwB,CAAA;AAC9D,eAAO,MAAM,mCAAmC,IAAI,CAAA;AAEpD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;CACrC;AAOD,wBAAgB,uBAAuB,IAAI,wBAAwB,CAElE;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,wBAAwB,EAC/B,KAAK,EAAE,YAAY,GAClB,wBAAwB,CAQ1B;AAuBD,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAe5D"}

package/lib/types/dsh-adapter/session-list-metadata.js

@@ -0,0 +1,56 @@
+import { z } from 'zod';
+export const SESSION_LIST_METADATA_KEY = 'sessionListMetadata';
+export const SESSION_LIST_METADATA_STATE_VERSION = 1;
+const sessionListMetadataSchema = z.object({
+    blank: z.boolean(),
+    lastPromptAt: z.number().nullable(),
+});
+export function initSessionListMetadata() {
+    return { blank: true, lastPromptAt: null };
+}
+/** Match the host fold, including reference identity when neither field changes. */
+export function applySessionListMetadata(state, event) {
+    const blank = state.blank && event.type !== 'turn/start';
+    const lastPromptAt = event.type === 'user/message' && event.data.source.kind === 'user'
+        ? event.time
+        : state.lastPromptAt;
+    return blank === state.blank && lastPromptAt === state.lastPromptAt
+        ? state
+        : { blank, lastPromptAt };
+}
+function sessionListMetadataDefinition() {
+    const view = (state) => state;
+    return {
+        key: SESSION_LIST_METADATA_KEY,
+        stateVersion: SESSION_LIST_METADATA_STATE_VERSION,
+        stateSchema: sessionListMetadataSchema,
+        init: initSessionListMetadata,
+        apply: applySessionListMetadata,
+        wire: { viewSchema: sessionListMetadataSchema, view },
+        // rc.6 and alpha.2 registries accept register() but read these older fields.
+        // Reuse the same schema and view so registration order cannot change meaning.
+        schema: sessionListMetadataSchema,
+        viewSchema: sessionListMetadataSchema,
+        view,
+    };
+}
+/** Register before creating the boot agent, so its first checkpoint has the key. */
+export function attachSessionListMetadata(ctx) {
+    ctx.inject(['sessionProjections'], ((projectionCtx) => {
+        const registry = projectionCtx.sessionProjections;
+        if (typeof registry?.register !== 'function')
+            return;
+        try {
+            // The host binds this registration to the calling context's fiber.
+            registry.register(sessionListMetadataDefinition());
+        }
+        catch (error) {
+            try {
+                ctx.logger.debug(`dsh-tui: could not register sessionListMetadata: ${String(error)}`);
+            }
+            catch {
+                // Diagnostics must not turn a missing seam or version conflict into a startup failure.
+            }
+        }
+    }));
+}

package/lib/types/dsh-adapter/session-seed.d.ts

@@ -0,0 +1,11 @@
+/** Whether an inherited cut contains no human message or started turn. */
+export declare function holdsNoConversation(events: readonly unknown[]): boolean;
+export interface PolicyFact {
+    readonly type: string;
+    readonly data: unknown;
+}
+/** Last value of each policy fact, ordered by its last occurrence in the cut. */
+export declare function latestPolicyFacts(events: readonly unknown[]): readonly PolicyFact[];
+/** Replay after creation: appending during setup prevents the fresh-session gate from arming. */
+export declare function replayPolicyFacts(session: unknown, facts: readonly PolicyFact[]): void;
+//# sourceMappingURL=session-seed.d.ts.map

package/lib/types/dsh-adapter/session-seed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-seed.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/session-seed.ts"],"names":[],"mappings":"AAEA,0EAA0E;AAC1E,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAiBvE;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CACvB;AAED,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,UAAU,EAAE,CAUnF;AAED,iGAAiG;AACjG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAGtF"}

package/lib/types/dsh-adapter/session-seed.js

@@ -0,0 +1,47 @@
+import { INITIAL_POLICY_EVENTS, isHumanSource } from './fresh-agent.js';
+/** Whether an inherited cut contains no human message or started turn. */
+export function holdsNoConversation(events) {
+    return !events.some(event => {
+        if (event === null || typeof event !== 'object' || Array.isArray(event))
+            return false;
+        const { type, data } = event;
+        if (type === 'turn/start')
+            return true;
+        if (type !== 'user/message' && type !== 'agent/inbox/spliced')
+            return false;
+        // An unreadable conversational event cannot prove an empty cut.
+        if (data === null || typeof data !== 'object' || Array.isArray(data))
+            return true;
+        const record = data;
+        if (type === 'user/message')
+            return isHumanSource(record.source);
+        if (!Array.isArray(record.inserted))
+            return true;
+        return record.inserted.some(message => {
+            if (message === null || typeof message !== 'object')
+                return false;
+            const entry = message;
+            return entry.role === 'user' && isHumanSource(entry.source);
+        });
+    });
+}
+/** Last value of each policy fact, ordered by its last occurrence in the cut. */
+export function latestPolicyFacts(events) {
+    const facts = new Map();
+    for (const event of events) {
+        if (event === null || typeof event !== 'object' || Array.isArray(event))
+            continue;
+        const { type, data } = event;
+        if (typeof type !== 'string' || !INITIAL_POLICY_EVENTS.has(type))
+            continue;
+        facts.delete(type);
+        facts.set(type, { type, data });
+    }
+    return [...facts.values()];
+}
+/** Replay after creation: appending during setup prevents the fresh-session gate from arming. */
+export function replayPolicyFacts(session, facts) {
+    const target = session;
+    for (const fact of facts)
+        target.append(fact.type, fact.data);
+}

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

@@ -46,11 +46,13 @@ export declare function enumerateSessions(source: SessionSource, signal?: AbortS
  *
  * @param source - The persistence service.
  * @param signal - Optional cancellation for the backend's own listing work.
+ * @param priorityCwd - Resolve this workspace before others for partial results;
+ *   the final listing still includes every workspace, sorted by activity.
  * @returns One summary per stored session, most recently active first. No
  *   filtering of any kind is applied — sub-agent runs and sessions with no
  *   conversation are present and labelled as such.
  */
-export declare function listSummaries(source: SessionSource, signal?: AbortSignal, onEnriched?: (summary: SessionSummary) => void, onPartial?: (summaries: readonly SessionSummary[]) => void): Promise<readonly SessionSummary[]>;
+export declare function listSummaries(source: SessionSource, signal?: AbortSignal, onEnriched?: (summary: SessionSummary) => void, onPartial?: (summaries: readonly SessionSummary[]) => void, priorityCwd?: string): Promise<readonly SessionSummary[]>;
 /**
  * Resolve one session's artifact path.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/list.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAQhD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,yEAAyE;IACzE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,wEAAwE;IACxE,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IACrE,iEAAiE;IACjE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IAC5D,4EAA4E;IAC5E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;CACpC;AAED,4EAA4E;AAC5E,UAAU,MAAM;IACd,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACjC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC;AAaD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBtG;AAwCD;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,CAAC,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,EAC9C,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,GACzD,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAoOpC;AAOD;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS7B"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/list.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAShD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB,yEAAyE;IACzE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,wEAAwE;IACxE,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IACrE,iEAAiE;IACjE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;IAC5D,4EAA4E;IAC5E,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;CACpC;AAED,4EAA4E;AAC5E,UAAU,MAAM;IACd,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACjC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC;AAaD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBtG;AAwCD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,CAAC,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,EAC9C,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,EAC1D,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAuOpC;AAOD;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS7B"}

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

@@ -26,6 +26,7 @@ import { classify, readHeader } from './header.js';
 import { findSessionLogFile, resolveLocatedPath } from '../compat/sessionLog.js';
 import { indexFileStamp, readIndex, writeIndex } from './store.js';
 import { readLastUsed } from '../../sessionHistory.js';
+import { normalizeWorkspaceCwd } from '../../sessions/view.js';
 /** A late overlapping listing must not write an older index over a newer one. */
 const listingVersions = new WeakMap();
 /** Large append batches use bounded windows, then background title recovery. */
@@ -116,11 +117,13 @@ function locate(source, raw, sessionId) {
  *
  * @param source - The persistence service.
  * @param signal - Optional cancellation for the backend's own listing work.
+ * @param priorityCwd - Resolve this workspace before others for partial results;
+ *   the final listing still includes every workspace, sorted by activity.
  * @returns One summary per stored session, most recently active first. No
  *   filtering of any kind is applied — sub-agent runs and sessions with no
  *   conversation are present and labelled as such.
  */
-export async function listSummaries(source, signal, onEnriched, onPartial) {
+export async function listSummaries(source, signal, onEnriched, onPartial, priorityCwd) {
     const identity = source.identity ?? source;
     const version = (listingVersions.get(identity) ?? 0) + 1;
     listingVersions.set(identity, version);
@@ -144,10 +147,12 @@ export async function listSummaries(source, signal, onEnriched, onPartial) {
     const index = readIndex();
     const next = new Map();
     const lastUsed = readLastUsed();
-    // Recent conversations lead cold partial batches; backend directory order
-    // must not keep the useful rows behind thousands of old delegated runs.
+    // Resolve the current workspace first, even when other projects are newer.
+    // Activity determines processing order within each group, and final order.
+    const cwd = priorityCwd ? normalizeWorkspaceCwd(priorityCwd) : undefined;
+    const workspace = new Set(cwd === undefined ? [] : listed.filter(entry => normalizeWorkspaceCwd(entry.header.cwd ?? '') === cwd));
     const activity = (entry) => Math.max(index.get(entry.header.id)?.derived?.modifiedAt ?? 0, lastUsed[entry.header.id] ?? 0, entry.header.createdAt ?? 0);
-    listed.sort((a, b) => activity(b) - activity(a));
+    listed.sort((a, b) => Number(workspace.has(b)) - Number(workspace.has(a)) || activity(b) - activity(a));
     let changed = false;
     const records = [];
     const summaryOf = ({ header, facts, cached, derived }) => ({
@@ -302,7 +307,8 @@ export async function listSummaries(source, signal, onEnriched, onPartial) {
         recordsById.set(header.id, record);
         // Yield even for a cold index: scanning many individually bounded logs
         // must not freeze the renderer. Partial rows are never saved as a snapshot.
-        if (records.length % 32 === 0) {
+        // A small workspace must paint before we touch another project's logs.
+        if (records.length % 32 === 0 || (records.length === workspace.size && records.length < listed.length)) {
             if (listingVersions.get(identity) === version)
                 onPartial?.(records.map(summaryOf).sort(compareSummaries));
             await new Promise(resolve => setImmediate(resolve));

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

@@ -1,7 +1,5 @@
 import type { SessionSource } from './list.js';
 import type { SessionSummary } from './types.js';
-/** Undefined is unknown; an empty snapshot is a successful empty listing. */
 export declare function readListingSnapshot(source: SessionSource): readonly SessionSummary[] | undefined;
-/** Capture ordering before async work, including across distinct Context proxies. */
 export declare function beginListingSnapshot(source: SessionSource): (rows: readonly SessionSummary[]) => void;
 //# sourceMappingURL=snapshot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/snapshot.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAiDhD,6EAA6E;AAC7E,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,cAAc,EAAE,GAAG,SAAS,CAGhG;AAED,qFAAqF;AACrF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,CAiBrG"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/snapshot.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAehD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,cAAc,EAAE,GAAG,SAAS,CAGhG;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,KAAK,IAAI,CAGrG"}

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

@@ -1,10 +1,6 @@
-/** 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();
+/** DSH provider scope over the shared, first-paint-only listing snapshot. */
+import { isAbsolute, normalize } from 'node:path';
+import { beginListingSnapshot as begin, readListingSnapshot as read } from '../../sessions/listSnapshot.js';
 /** Only the known JSONL provider exposes a public, durable source configuration. */
 function sourceKey(source) {
     if (source.name !== 'session-persistence-jsonl')
@@ -13,78 +9,19 @@ function sourceKey(source) {
     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.
+    // Relative roots can change meaning after a workspace switch. Keep exact
+    // path case, including on Windows, rather than sharing another store's rows.
     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']);
+    return JSON.stringify([source.name, normalize(root), 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. */ }
-        }
-    };
+    return key === undefined ? () => { } : begin(key);
 }

package/lib/types/dsh-adapter/startup-args.d.ts

@@ -5,4 +5,6 @@
  * `--` ends flag parsing; all following tokens are literal prompt text.
  */
 export declare function initialPromptFromCmdlineArgs(args: readonly string[] | undefined): string;
+/** `ctx.cmdlineArgs`: the app argv the host snapshotted, if it provides one. */
+export declare function cmdlineArgsOf(ctx: object): readonly string[] | undefined;
 //# sourceMappingURL=startup-args.d.ts.map

package/lib/types/dsh-adapter/startup-args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup-args.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/startup-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAsBxF"}
+{"version":3,"file":"startup-args.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/startup-args.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAsBxF;AAED,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,CAGxE"}

package/lib/types/dsh-adapter/startup-args.js

@@ -32,3 +32,8 @@ export function initialPromptFromCmdlineArgs(args) {
     }
     return promptArgs.join(' ').trim();
 }
+/** `ctx.cmdlineArgs`: the app argv the host snapshotted, if it provides one. */
+export function cmdlineArgsOf(ctx) {
+    const cmdline = ctx.cmdlineArgs;
+    return cmdline?.get?.() ?? cmdline?.args;
+}

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

@@ -18,9 +18,36 @@ export declare class SubagentActivityStore {
     private costUnpriced;
     /** 每个 agent 已消费的最大 durable 事件 seq（同一事件重投不重复计费）。 */
     private costSeq;
+    /** 描述的来源。spawn 首帧的描述来自一条**无身份**的 FIFO 队列（并发派发
+     *  时可能是别的 child 的），只有 childId-keyed 的权威 label
+     *  （`subagent/catalog`、子会话 `subagent/descriptor`）能定案：`bound`
+     *  之后不再改写，`queue`/`placeholder` 允许被 label 覆盖。 */
+    private descriptionSource;
+    /** keyed label 可能比它那一行先到：子会话的 `subagent/descriptor` 在会话
+     *  链接建立之前就已投递。丢掉它，这一行就只剩队列猜出来的名字，而外部
+     *  子代理上游不写 catalog ⇒ 没有第二条 keyed 事实来救，永久错名。先寄存在
+     *  这里，建行时直接当描述用：keyed 事实不因到达先后而失效。有界，理由同
+     *  队列（没人建行时不能无界增长）。 */
+    private earlyLabels;
     private commitLine;
     private pushLine;
-    onSpawned(agentId: string, provider?: string, model?: string, info?: Partial<SubagentState>): void;
+    onSpawned(agentId: string, provider?: string, model?: string, info?: Partial<SubagentState> & {
+        descriptionFromQueue?: boolean;
+    }): void;
+    /** Park a keyed label whose row does not exist yet — a child session's
+     *  `subagent/descriptor` can be published before the host's spawn edge, and
+     *  dropping it there would leave the row with the identity-less queue's
+     *  guess and no second keyed fact to correct it (an external child gets no
+     *  catalog). `onSpawned` adopts it when the row is created. Bounded: when
+     *  full, the oldest parked label goes first — the least likely to still be
+     *  waiting for its row. */
+    holdKeyedLabel(agentId: string, label: unknown): void;
+    /** Bind the authoritative description of one child (a `subagent/catalog`
+     *  label or a child session's own `subagent/descriptor`). The identity-less
+     *  spawn queue may have handed this row a concurrent delegation's term, so
+     *  the keyed fact wins, once, until it is the source of truth for this row.
+     *  Returns whether the displayed description changed. */
+    private describeFromLabel;
     /** 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
@@ -37,6 +64,11 @@ export declare class SubagentActivityStore {
     linkSession(agentId: string, session: unknown): void;
     getSubagentIdBySession(session: unknown): string | undefined;
     has(agentId: string): boolean;
+    /** The run key of one tracked child: its current epoch's key, or `undefined`
+     *  when the row is tracked but has no run fact yet (a durable discovery row
+     *  carries none). That is the same value an untracked child yields, so a
+     *  caller that must tell the two apart asks `has()` as well. */
+    runIdOf(agentId: string): string | undefined;
     appendOutput(agentId: string, text: string, kind?: SubagentOutputKind): void;
     /** Mark the streaming tail line complete (run settlement). */
     flushOutput(agentId: string): void;

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":"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"}
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAGlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAsC,kBAAkB,EAAE,gBAAgB,EAAsB,MAAM,kCAAkC,CAAA;AACxM,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAQtL;gCACgC;AAChC,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,iBAAiB,EAAE,CAAA;IAC5B,QAAQ,EAAE,gBAAgB,CAAA;CAC3B;AAaD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,OAAO,CAA2C;IAC1D,+DAA+D;IAC/D,OAAO,CAAC,WAAW,CAAuC;IAC1D,iDAAiD;IACjD,OAAO,CAAC,YAAY,CAAqB;IACzC,mDAAmD;IACnD,OAAO,CAAC,OAAO,CAA4B;IAC3C;;;qDAGiD;IACjD,OAAO,CAAC,iBAAiB,CAAuD;IAChF;;;;2BAIuB;IACvB,OAAO,CAAC,WAAW,CAA4B;IAE/C,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,CAAC,GAAG;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;IAkF/I;;;;;;+BAM2B;IAC3B,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IASrD;;;;6DAIyD;IACzD,OAAO,CAAC,iBAAiB;IAazB;;;;uDAImD;IACnD,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,SAAS,CAAA;KAAO,GAAG,IAAI;IAmC7L,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAMpD,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAE5D,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAE7B;;;oEAGgE;IAChE,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAE5C,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;IA+DrD,6EAA6E;IAC7E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAS7D,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,mDAAmD;IACnD,OAAO,CAAC,WAAW;IAqBnB;;;;;;sCAMkC;IAClC,OAAO,CAAC,cAAc;IAyBtB,qDAAqD;IACrD,YAAY,IAAI,oBAAoB;IAWpC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,SAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAChG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAChE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAc,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAE5F,OAAO,CAAC,MAAM;IAuBd;;;sDAGkD;IAClD,KAAK,IAAI,IAAI;IAYb,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"}