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

package/lib/types/dsh-adapter/channel/core/host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/host.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAI5D,OAAO,EAAE,gBAAgB,EAA2B,MAAM,oBAAoB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAA;AAC3E,OAAO,EAAE,uBAAuB,EAAiE,MAAM,4BAA4B,CAAA;AACnI,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC1F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,wEAAwE;AACxE,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAA;IAC9C,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAA;IACpD,0EAA0E;IAC1E,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAA;IACnI,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IAC7D,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IAC7D,QAAQ,CAAC,uBAAuB,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;IAC5E,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAA;IAC7D;iFAC6E;IAC7E,iBAAiB,IAAI,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CACvD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,QAAQ,CAyCxF;AAED,6EAA6E;AAC7E,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,yBAAyB,GAAG,cAAc,CAAC,EAChE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,SAAS,CAAC,EAC5C,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,MAAM,CAAC,GAChD,IAAI,CAiBN;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IAC3D,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;IACvD;iEAC6D;IAC7D,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,GAAG,MAAM,IAAI,CA8Bb"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/host.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAA8B,MAAM,wBAAwB,CAAA;AAGxF,OAAO,EAAE,gBAAgB,EAA2B,MAAM,oBAAoB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAA;AAC3E,OAAO,EAAE,uBAAuB,EAAmC,MAAM,4BAA4B,CAAA;AACrG,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,2BAA2B,EAAE,uBAAuB,EAA4B,MAAM,qBAAqB,CAAA;AACpH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAA;IAC9C,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAA;IACpD,0EAA0E;IAC1E,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAA;IACnI,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IAC7D,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAA;IAC7D,QAAQ,CAAC,uBAAuB,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;IAC5E,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAA;IAC7D;iFAC6E;IAC7E,iBAAiB,IAAI,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CACvD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,QAAQ,CA6C5F;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,yBAAyB,GAAG,cAAc,CAAC,EAChE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,SAAS,CAAC,EAC5C,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,MAAM,CAAC,EACjD,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,GAC5C,IAAI,CAwCN;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE;IACjE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;IACvD;iEAC6D;IAC7D,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,GAAG,MAAM,IAAI,CA8Bb"}

package/lib/types/dsh-adapter/channel/core/host.js

@@ -1,12 +1,10 @@
-import { adapterRuntimeFor } from '../../../adapter/kernel/runtime-context.js';
 import { readGrantStore } from '../../../adapter/standard/grants.js';
 import { getHostCommandTrees } from '../../command-trees.js';
 import { runForegroundShell } from '../../compat/shell.js';
-import { installDecisionGuard, markDecisionDispatchTopology } from '../../decision-guard.js';
 import { getHostGrantStore } from '../../host-grants.js';
 import { getHostRenderers } from '../../renderers.js';
 import { getHostSceneRuntime } from '../../scenes.js';
-import { getHostSettingsSections, getLocalSettingsSectionsHost } from '../../settings-sections.js';
+import { getHostSettingsSections } from '../../settings-sections.js';
 import { getHostThemes } from '../../themes.js';
 import { createLocalWorkspaceRuntime, getHostWorkspaceRuntime } from '../../workspaces.js';
 /**
@@ -15,8 +13,7 @@ import { createLocalWorkspaceRuntime, getHostWorkspaceRuntime } from '../../work
  * failure rolls it back.
  */
 export function resolveCoreHost(ctx, owner) {
-    const adapterRuntime = adapterRuntimeFor(ctx);
-    const themeHost = getHostThemes(ctx.get('tuiThemes'));
+    const adapterRuntime = ctx.runtime;
     // Backstop: the extensions row installs the decision-subscription gate,
     // but the channel is the dispatch path. A stale patch without that row (or
     // a bare embed mounting neither) would otherwise leave tui/input and
@@ -28,52 +25,89 @@ export function resolveCoreHost(ctx, owner) {
     // shadowed by an early snapshot.
     const fallbackGrantStore = readGrantStore(undefined, undefined, adapterRuntime);
     const currentGrantStore = () => getHostGrantStore(ctx.get('tuiPluginHost')) ?? fallbackGrantStore;
-    installDecisionGuard(ctx, currentGrantStore());
+    ctx.installDecisionGuard(currentGrantStore());
     // The channel is the real DecisionEvents dispatch path. Record that
     // topology so the live driver can distinguish "guard installed" (not a
     // live feature) from "events can actually be dispatched here".
-    owner.own(markDecisionDispatchTopology(ctx));
+    owner.own(ctx.markDecisionDispatchTopology());
+    // Workspace registry runtime (optional service, issue #183): mounted by
+    // the bundle patch's dsh-tui-workspaces row; absent the row (stale patch
+    // or a bare embedder), degrade to the local-only runtime (one per channel).
+    let localWorkspaces;
     return {
         adapterRuntime,
-        themeHost,
-        // Workspace registry runtime (optional service, issue #183): mounted by
-        // the bundle patch's dsh-tui-workspaces row; absent the row (stale patch
-        // or a bare embedder), degrade to the local-only runtime.
-        workspaceService: getHostWorkspaceRuntime(ctx.get('tuiWorkspaces')) ?? createLocalWorkspaceRuntime(),
-        commandTrees: getHostCommandTrees(ctx.get('tuiCommandTrees')),
+        get themeHost() { return getHostThemes(ctx.get('tuiThemes')); },
+        get workspaceService() {
+            return getHostWorkspaceRuntime(ctx.get('tuiWorkspaces'))
+                ?? (localWorkspaces ??= createLocalWorkspaceRuntime());
+        },
+        get commandTrees() { return getHostCommandTrees(ctx.get('tuiCommandTrees')); },
         // Plugin scene runtime (optional, dsh-tui-scenes row): absent the row,
         // `pluginScene` simply stays undefined.
-        sceneRuntime: getHostSceneRuntime(ctx.get('tuiScenes')),
+        get sceneRuntime() { return getHostSceneRuntime(ctx.get('tuiScenes')); },
         // Falls back to the in-package local host when the composition's
         // service row is unavailable (issue #557).
-        settingsSectionsRuntime: getHostSettingsSections(ctx.get('tuiSettingsSections')) ?? getLocalSettingsSectionsHost(ctx),
+        get settingsSectionsRuntime() {
+            return getHostSettingsSections(ctx.get('tuiSettingsSections'))
+                ?? ctx.localSettingsSections();
+        },
         // Custom-entry text renderers (optional, dsh-tui-extensions row): absent
         // the row, unknown plugin event types stay invisible in the transcript.
-        rendererRuntime: getHostRenderers(ctx.get('tuiRenderers')),
+        get rendererRuntime() { return getHostRenderers(ctx.get('tuiRenderers')); },
         currentGrantStore,
     };
 }
-/** Re-render on settings-section and plugin-scene changes (owner-scoped). */
-export function startHostSubscriptions(host, owner, state) {
-    owner.own(host.settingsSectionsRuntime?.subscribe(() => { if (owner.current())
-        state.emit(); }) ?? (() => undefined));
-    const sceneRuntime = host.sceneRuntime;
-    let unsubscribeScenes;
-    const disposeScenes = sceneRuntime?.subscribe(() => {
-        if (state.pluginScene === sceneRuntime.active)
+/**
+ * Re-render on settings-section and plugin-scene changes (owner-scoped),
+ * re-binding when the host reports a service change.
+ */
+export function startHostSubscriptions(host, owner, state, services) {
+    let sections;
+    let scenes;
+    const bind = () => {
+        let changed = false;
+        const sectionsRuntime = host.settingsSectionsRuntime;
+        if (sections === undefined || sections.runtime !== sectionsRuntime) {
+            sections?.off?.();
+            sections = { runtime: sectionsRuntime, off: sectionsRuntime?.subscribe(() => { if (owner.current())
+                    state.emit(); }) };
+            changed = true;
+        }
+        const sceneRuntime = host.sceneRuntime;
+        if (scenes === undefined || scenes.runtime !== sceneRuntime) {
+            scenes?.off?.();
+            scenes = {
+                runtime: sceneRuntime,
+                off: sceneRuntime?.subscribe(() => {
+                    if (state.pluginScene === sceneRuntime.active)
+                        return;
+                    state.pluginScene = sceneRuntime.active;
+                    state.emit();
+                }),
+            };
+            if (state.pluginScene !== sceneRuntime?.active)
+                state.pluginScene = sceneRuntime?.active;
+            changed = true;
+        }
+        return changed;
+    };
+    bind();
+    owner.own(() => {
+        sections?.off?.();
+        scenes?.off?.();
+        sections = undefined;
+        scenes = undefined;
+    });
+    const unwatch = services?.watchServices?.(name => {
+        if (name !== 'tuiSettingsSections' && name !== 'tuiScenes')
             return;
-        state.pluginScene = sceneRuntime.active;
-        state.emit();
+        if (!owner.current())
+            return;
+        if (bind())
+            state.emit();
     });
-    if (disposeScenes !== undefined) {
-        unsubscribeScenes = disposeScenes;
-        owner.own(() => {
-            if (unsubscribeScenes !== disposeScenes)
-                return;
-            unsubscribeScenes = undefined;
-            disposeScenes();
-        });
-    }
+    if (unwatch !== undefined)
+        owner.own(unwatch);
 }
 /**
  * Statusline breadcrumb: the current git branch of the session cwd

package/lib/types/dsh-adapter/channel/core/local-actions.d.ts

@@ -5,14 +5,14 @@
  * restore only works when the backend can slice its own durable history;
  * otherwise nothing is ever folded and the action restores 0 rows.
  */
-import type { Context } from '@deepseek-ai/cordis';
+import type { ServiceLookup } from '../channel-host.js';
 import type { ChannelBinding } from '../binding.js';
 import type { ChannelOwner } from '../owner.js';
 import type { ChannelState } from '../types.js';
 import type { CoreHost } from './host.js';
 /** `/activity frames <name>`: validate, persist, re-render. */
 export declare function setActivityFrames(state: Pick<ChannelState, 'activityFrames' | 'emit'>, notify: ChannelState['notify'], name: string): boolean;
-export declare function createCoreLocalActions(ctx: Context, deps: {
+export declare function createCoreLocalActions(ctx: ServiceLookup, deps: {
     owner: Pick<ChannelOwner, 'current'>;
     binding: Pick<ChannelBinding, 'capture' | 'isCurrent'>;
     state: ChannelState;
@@ -33,7 +33,9 @@ export declare function createCoreLocalActions(ctx: Context, deps: {
 }): {
     loadOlder(): number;
     clear(): void;
-    pushLocal(title: string, lines: readonly string[]): void;
+    pushLocal(title: string, lines: readonly string[], options?: {
+        readonly lineLimit?: number;
+    }): void;
     setActivityFrames: (name: string) => boolean;
     /**
      * `!cmd` / `!!cmd`: the workspace's own command shell when it has one

package/lib/types/dsh-adapter/channel/core/local-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-actions.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/local-actions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAOlD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEzC,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,MAAM,CAAC,EACpD,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAYT;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IACzD,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IACtD,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,SAAS,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;IACvC,eAAe,IAAI,IAAI,CAAA;IACvB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,2EAA2E;IAC3E,QAAQ,IAAI,IAAI,CAAA;IAChB;2DACuD;IACvD,SAAS,IAAI,CAAC,MAAM,MAAM,CAAC,GAAG,SAAS,CAAA;IACvC,kEAAkE;IAClE,UAAU,CAAC,IAAI,MAAM,IAAI,CAAA;CAC1B;iBAIgB,MAAM;aAQV,IAAI;qBAYI,MAAM,SAAS,SAAS,MAAM,EAAE,GAAG,IAAI;8BAM9B,MAAM,KAAG,OAAO;IAE1C;;;;OAIG;6BAC4B,MAAM,oBAAoB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;EA8CnF;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAA"}
+{"version":3,"file":"local-actions.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/local-actions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAOvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEzC,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,MAAM,CAAC,EACpD,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAYT;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE;IAC/D,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,WAAW,CAAC,CAAA;IACtD,KAAK,EAAE,YAAY,CAAA;IACnB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,SAAS,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;IACvC,eAAe,IAAI,IAAI,CAAA;IACvB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,2EAA2E;IAC3E,QAAQ,IAAI,IAAI,CAAA;IAChB;2DACuD;IACvD,SAAS,IAAI,CAAC,MAAM,MAAM,CAAC,GAAG,SAAS,CAAA;IACvC,kEAAkE;IAClE,UAAU,CAAC,IAAI,MAAM,IAAI,CAAA;CAC1B;iBAIgB,MAAM;aAQV,IAAI;qBAYI,MAAM,SAAS,SAAS,MAAM,EAAE,YAAY;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;8BASzE,MAAM,KAAG,OAAO;IAE1C;;;;OAIG;6BAC4B,MAAM,oBAAoB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;EA8CnF;AAED,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAA"}

package/lib/types/dsh-adapter/channel/core/local-actions.js

@@ -51,10 +51,13 @@ export function createCoreLocalActions(ctx, deps) {
             state.rows.push({ id: rowIds.value++, kind: 'notice', text: t('session-cleared') });
             state.emit();
         },
-        pushLocal(title, lines) {
+        pushLocal(title, lines, options) {
+            // A report whose line IS the payload (the /goal objective) raises the
+            // budget; every other report keeps the shared 240-cell preview.
+            const limit = options?.lineLimit ?? LOCAL_OUTPUT_LIMIT;
             state.rows.push({ id: rowIds.value++, kind: 'local', text: title });
             for (const line of lines)
-                state.rows.push({ id: rowIds.value++, kind: 'local-output', text: preview(line, LOCAL_OUTPUT_LIMIT) });
+                state.rows.push({ id: rowIds.value++, kind: 'local-output', text: preview(line, limit) });
             state.emit();
         },
         setActivityFrames: (name) => setActivityFrames(state, notify, name),

package/lib/types/dsh-adapter/channel/core/session-controls.js

@@ -35,12 +35,12 @@ export function createSessionControls(deps) {
         // Local names win, served here or not: a typed `/init` is the local
         // command (or its explicit unavailability), never the backend's. A
         // served `/goal` (the typed capability) wins over a same-named backend
-        // command the same way.
+        // command the same way. Compare names case-insensitively, as completion does.
         const served = localCommandsFor(state.backendCapabilities.commands);
         const local = new Set([...LOCAL_COMMANDS.map(command => command.name), ...(served.includes(BACKEND_GOAL_COMMAND) ? [BACKEND_GOAL_COMMAND.name] : [])]);
         state.commandList = backendCommands.length === 0
             ? served
-            : [...served, ...backendCommands.filter(command => !local.has(command.name))];
+            : [...served, ...backendCommands.filter(command => !local.has(command.name.toLowerCase()))];
     };
     const loadBackendCommands = (session, current) => {
         const commands = session.capabilities.commands;

package/lib/types/dsh-adapter/channel/core/session-switch.d.ts

@@ -20,10 +20,10 @@
  * (`claude:<id>`) for the whole attempt, like a DSH disk resume: a session
  * another TUI process drives is refused.
  */
-import type { Context } from '@deepseek-ai/cordis';
 import type { AgentEvent } from '../../../agent/events.js';
 import type { AgentSession } from '../../../agent/session.js';
 import { reserveMount } from '../../../sessionMounts.js';
+import type { ChannelHost } from '../channel-host.js';
 import type { ChannelCapabilities } from '../../../adapter/ports/channel-view.js';
 import type { ChannelBinding } from '../binding.js';
 import type { ChannelOwner } from '../owner.js';
@@ -95,7 +95,7 @@ export interface ResumeSessionOpener {
         readonly sessionId: string;
     }): ResumeSessionPlan;
 }
-export declare function createSessionSwitch(ctx: Context, deps: {
+export declare function createSessionSwitch(ctx: Pick<ChannelHost, 'logger' | 'dispatchDecision' | 'dispatchNotification'>, deps: {
     owner: Pick<ChannelOwner, 'current'>;
     binding: Pick<ChannelBinding, 'session' | 'capture' | 'isCurrent' | 'prepare' | 'abandon' | 'adopt'>;
     state: () => Pick<ChannelState, 'agentId' | 'cwd' | 'displayCwd' | 'working' | 'pending'>;
@@ -156,12 +156,15 @@ export declare function createBackendOpener(deps: {
         value: number;
     };
     resetProjection(): void;
-    /** Forget the replaced session's subagents and background jobs. */
-    resetActivity?(): void;
+    /** Forget the replaced session's subagents and background jobs, and
+     *  rebuild the subagent control for the candidate (its capabilities). */
+    resetActivity?(candidate: AgentSession): void;
     snapshotOf(session: AgentSession): ChannelCapabilities;
     /** Forget the replaced session's backend commands and reports. */
     resetControls(): void;
     bind(seed: readonly AgentEvent[]): void;
+    /** Runs before the bind (core/compose.ts `attachOnAdopt`). */
+    attach?(candidate: AgentSession): void;
     /** The bound session (its backend-qualified reference is the ledger key). */
     bound(): AgentSession;
     mounts: SessionMountLedger;

package/lib/types/dsh-adapter/channel/core/session-switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-switch.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/session-switch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-switch.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/session-switch.ts"],"names":[],"mappings":"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"}

package/lib/types/dsh-adapter/channel/core/session-switch.js

@@ -3,7 +3,7 @@ import { t } from '../../../i18n.js';
 import { WORKING_GATE_NOTICES } from '../../../commands.js';
 import { mountFailureText } from '../../../sessions/resumeFailure.js';
 import { releaseMount, reserveMount, reserveNewSession } from '../../../sessionMounts.js';
-import { dispatchTuiDecision, dispatchTuiNotification, normalizeCancelDecision } from '../../extension-events.js';
+import { normalizeCancelDecision } from '../../extension-events.js';
 import { resetSessionProjection } from '../session-reset.js';
 export function createSessionSwitch(ctx, deps) {
     const { binding, notify } = deps;
@@ -19,7 +19,7 @@ export function createSessionSwitch(ctx, deps) {
         // switch roll over a newer session the user switched to mid-await.
         const origin = deps.conversationKey(binding.session);
         const state = deps.state();
-        const decision = await deps.withDecisionPending('tui/session-switch', dispatchTuiDecision(ctx, 'tui/session-switch', {
+        const decision = await deps.withDecisionPending('tui/session-switch', ctx.dispatchDecision('tui/session-switch', {
             kind,
             ...(targetSessionId === undefined ? {} : { targetSessionId }),
             sessionId: state.agentId,
@@ -42,7 +42,7 @@ export function createSessionSwitch(ctx, deps) {
      *  the switch itself already succeeded. */
     const notifySessionSwitched = (kind, sessionId, previousSessionId) => {
         try {
-            void dispatchTuiNotification(ctx, 'tui/session-switched', { kind, sessionId, previousSessionId, cwd: deps.state().cwd }).catch((error) => {
+            void ctx.dispatchNotification('tui/session-switched', { kind, sessionId, previousSessionId, cwd: deps.state().cwd }).catch((error) => {
                 ctx.logger.warn('dsh-tui: tui/session-switched listener failed: %o', error);
             });
         }
@@ -315,11 +315,15 @@ export function createBackendOpener(deps) {
         }
     };
     const adoptWith = (candidate, history) => {
-        resetSessionProjection(state, deps.rowIds, deps.resetProjection, () => { deps.resetActivity?.(); }, () => undefined);
+        resetSessionProjection(state, deps.rowIds, deps.resetProjection, () => { deps.resetActivity?.(candidate); }, () => undefined);
         state.agentId = candidate.ref.sessionId;
         state.sessionId = candidate.ref.sessionId;
         state.backendCapabilities = deps.snapshotOf(candidate);
+        // A placeholder whose startup open failed is retried by `/new`.
+        state.ready = true;
+        state.startupFailure = undefined;
         deps.resetControls();
+        deps.attach?.(candidate);
         deps.bind(history);
         deps.touch?.(candidate.ref.sessionId);
         state.emit();

package/lib/types/dsh-adapter/channel/core/sessions.d.ts

@@ -19,7 +19,7 @@ import type { ChannelLaunchOptions } from '../state.js';
 import type { TuiRewindMode } from '../../../adapter/ports/channel-session.js';
 import type { ChannelState, ChatRow, ResumeResult } from '../types.js';
 export declare function createCoreSessionActions(deps: {
-    owner: Pick<ChannelOwner, 'current'>;
+    owner: Pick<ChannelOwner, 'current' | 'own'>;
     session(): AgentSession;
     state: () => ChannelState;
     notify: ChannelState['notify'];

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

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/sessions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAkB,aAAa,EAAE,MAAM,2CAA2C,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAWtE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,IAAI,YAAY,CAAA;IACvB,KAAK,EAAE,MAAM,YAAY,CAAA;IACzB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,OAAO,EAAE,cAAc,GAAG,SAAS,CAAA;IACnC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAC3C,aAAa,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAA;IACpD,0DAA0D;IAC1D,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC3E,uEAAuE;IACvE,OAAO,EAAE,OAAO,CAAA;CACjB;;wBAiMkC,OAAO,KAAG,OAAO,CAAC;QAAE,KAAK,EAAE,SAAS,aAAa,EAAE,CAAA;KAAE,GAAG,QAAQ,GAAG,IAAI,CAAC;EA2B1G"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/channel/core/sessions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAK7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAkB,aAAa,EAAE,MAAM,2CAA2C,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAWtE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,CAAA;IAC5C,OAAO,IAAI,YAAY,CAAA;IACvB,KAAK,EAAE,MAAM,YAAY,CAAA;IACzB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,OAAO,EAAE,cAAc,GAAG,SAAS,CAAA;IACnC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAC3C,aAAa,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAA;IACpD,0DAA0D;IAC1D,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC3E,uEAAuE;IACvE,OAAO,EAAE,OAAO,CAAA;CACjB;;wBAmPkC,OAAO,KAAG,OAAO,CAAC;QAAE,KAAK,EAAE,SAAS,aAAa,EAAE,CAAA;KAAE,GAAG,QAAQ,GAAG,IAAI,CAAC;EA2B1G"}

package/lib/types/dsh-adapter/channel/core/sessions.js

@@ -2,6 +2,8 @@ import { formatSessionRef } from '../../../agent/refs.js';
 import { t } from '../../../i18n.js';
 import { WORKING_GATE_NOTICES } from '../../../commands.js';
 import { occupancyOf, readSessionOwners } from '../../../sessionMounts.js';
+import { beginListingSnapshot, readListingSnapshot } from '../../../sessions/listSnapshot.js';
+import { createSessionListing } from '../session-listing.js';
 /** Preview text of a dry-run file restore (`3 files · +10 −2`). */
 function filesSummary(preview) {
     const parts = [t('rewind-files-count', { n: preview.filesChanged.length })];
@@ -15,40 +17,97 @@ export function createCoreSessionActions(deps) {
     const caps = () => deps.session().capabilities;
     /** The last successful listing (the browser's first paint; may be stale). */
     let cached;
-    const rowOf = (sessionId) => cached?.find(row => row.id === sessionId);
+    let cachedSource;
+    const cachedSessions = () => {
+        const catalog = deps.catalog;
+        if (catalog === undefined)
+            return undefined;
+        const key = catalog.snapshotKey?.();
+        if (cachedSource === (key ?? catalog))
+            return cached;
+        return key === undefined ? undefined : readListingSnapshot(key);
+    };
+    const remember = (rows) => {
+        cached = rows;
+        cachedSource = deps.catalog?.snapshotKey?.() ?? deps.catalog;
+    };
+    const saveMutation = (rows) => {
+        listing.invalidate();
+        if (rows === undefined)
+            return;
+        remember(rows);
+        const key = deps.catalog?.snapshotKey?.();
+        if (key !== undefined)
+            beginListingSnapshot(key)(rows);
+    };
+    const rowOf = (sessionId) => cachedSessions()?.find(row => row.id === sessionId);
     const isBound = (sessionId) => deps.session().ref.sessionId === sessionId;
     const failed = (key, error) => {
         if (deps.owner.current())
             notify(t(key, { err: errorText(error) }), { color: 'error', timeoutMs: 8000 });
     };
-    const delegates = {
-        cachedSessions: () => cached,
-        /**
-         * The bound backend's sessions: the working directory's first (painted
-         * at once through `onPartial`), then every project the backend knows,
-         * which the browser's rail groups by directory. A failing all-projects
-         * read keeps the directory's rows.
-         */
-        async listSessions(_onEnriched, onPartial) {
+    const listing = createSessionListing({
+        owner: deps.owner,
+        capture: () => {
+            const session = deps.session();
+            const state = deps.state();
+            const cwd = state.cwd;
+            const starting = state.ready === false && session.ref.sessionId === '';
+            const bindingGeneration = state.agentBindingGeneration;
+            const key = deps.catalog?.snapshotKey?.();
+            return () => {
+                const state = deps.state();
+                const bound = deps.session();
+                // A same-workspace startup adoption keeps the pending catalog valid;
+                // subsequent switches still revoke it, even when their cwd is equal.
+                const adopted = starting && state.ready && state.agentBindingGeneration === bindingGeneration + 1
+                    && bound.ref.backendId === session.ref.backendId;
+                return deps.owner.current() && (bound === session || adopted) && state.cwd === cwd && deps.catalog?.snapshotKey?.() === key;
+            };
+        },
+        // Read this workspace before the global catalog. Only the complete
+        // global result may replace the durable snapshot.
+        async read(current, _onEnriched, onPartial) {
             const catalog = deps.catalog;
             if (catalog === undefined) {
                 unavailable('resume');
                 return [];
             }
-            const local = await catalog.list({ cwd: deps.state().cwd });
-            onPartial?.(local);
+            const key = catalog.snapshotKey?.();
+            const save = key === undefined ? undefined : beginListingSnapshot(key);
+            const publish = (rows) => { if (current())
+                onPartial?.(rows); };
+            const local = await catalog.list({ cwd: deps.state().cwd }, publish);
+            if (!current())
+                return [];
+            publish(local);
             let all;
+            let complete = true;
             try {
-                all = await catalog.list({ allProjects: true });
+                all = await catalog.list({ allProjects: true }, rows => {
+                    const ids = new Set(rows.map(row => row.id));
+                    publish([...rows, ...local.filter(row => !ids.has(row.id))].sort((a, b) => b.updatedAt - a.updatedAt));
+                });
             }
             catch {
                 all = local;
+                complete = false;
             }
+            if (!current())
+                return [];
             const ids = new Set(all.map(row => row.id));
             const merged = [...all, ...local.filter(row => !ids.has(row.id))].sort((a, b) => b.updatedAt - a.updatedAt);
-            cached = merged;
+            // Failed global reads and partial pages never replace a durable snapshot.
+            if (complete) {
+                remember(merged);
+                save?.(merged);
+            }
             return merged;
         },
+    });
+    const delegates = {
+        cachedSessions,
+        listSessions: listing.listSessions,
         async previewSession(sessionId) {
             const preview = deps.catalog?.preview;
             if (preview === undefined) {
@@ -79,7 +138,7 @@ export function createCoreSessionActions(deps) {
                 failed('rename-failed', error);
                 return false;
             }
-            cached = cached?.map(row => row.id === sessionId ? { ...row, title: { text: next, source: 'renamed' } } : row);
+            saveMutation(cachedSessions()?.map(row => row.id === sessionId ? { ...row, title: { text: next, source: 'renamed' } } : row));
             if (isBound(sessionId) && deps.owner.current()) {
                 const state = deps.state();
                 state.sessionTitle = next;
@@ -114,7 +173,7 @@ export function createCoreSessionActions(deps) {
                 return false;
             }
             deps.prefs?.forget(sessionId);
-            cached = cached?.filter(row => row.id !== sessionId);
+            saveMutation(cachedSessions()?.filter(row => row.id !== sessionId));
             return true;
         },
         setResumeTarget(sessionId) {

package/lib/types/dsh-adapter/channel/extensions.d.ts

@@ -15,7 +15,7 @@
  * - controls: permission modes and presets, model / preset / effort, manual
  *   compaction, the model-selection waterfalls and the child-route fill;
  * - reports: `/doctor`, `/export` (from the log), `/mcp`, `/init`, `/balance`,
- *   `/plugins`, `/login` credential descriptions.
+ *   `/plugin`, `/login` credential descriptions.
  *
  * Construction order matters where it is observable: the job feed and
  * pricing are installed before the seed replay, the replay runs before the
@@ -29,8 +29,9 @@ import type { CoreChannel } from './core/compose.js';
 import { type ChannelLaunchOptions } from './state.js';
 /**
  * Attach the DSH specialists to a core whose bound session is a DSH session.
- * Called inside `createChannel`'s construction transaction: a throw here is
- * rolled back by the caller through the core's owner.
+ * Called inside `createChannel`'s construction transaction, or inside the
+ * adoption that binds a placeholder's DSH session (`core.extendOnAdopt`); a
+ * throw fails either. The binding already holds the DSH session.
  */
 export declare function attachDshExtensions(core: CoreChannel, ctx: Context, initialNative: DshNative, options: ChannelLaunchOptions): void;
 //# sourceMappingURL=extensions.d.ts.map

package/lib/types/dsh-adapter/channel/extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/extensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAoB5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAyBpD,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAoBzE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,SAAS,EACxB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CA0qBN"}
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/extensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAsB5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AA0BpD,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAqBzE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,SAAS,EACxB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CAsrBN"}