@deepseek-harness-tui/dsh-tui 0.7.0 → 0.7.2

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

@@ -1,15 +1,16 @@
 import { randomUUID } from 'node:crypto';
 import { assembleContextFor, installModelSelection } from '@deepseek-ai/dsh-agent';
-import { isUserInvocable } from '@deepseek-ai/dsh-skill';
+import { isUserInvocable, renderSkillContent } from '@deepseek-ai/dsh-skill';
 import { createUserMessage, isTokenDelta, MessageId, ReasoningEffortId, } from '@deepseek-ai/dsh-llm';
 import { runSideQuestion, wrapSideQuestion } from './sideQuestion.js';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { renderContextSections, renderPrompt } from '@deepseek-ai/dsh-system-prompt';
 import { loadBaselineInstructions } from '@deepseek-ai/dsh-agent-instructions';
 import { extname, isAbsolute, join } from 'node:path';
-import { completeCommands, LOCAL_COMMANDS } from '../commands.js';
-import { clearResumeTarget, forgetSession, readLastUsed, readResumeTarget, touchSession, writeResumeTarget } from '../sessionHistory.js';
-import { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, readSessionTitleFromLog, sessionsRoots } from './compat/index.js';
+import { completeCommands, isLocalCommandName, LOCAL_COMMANDS, parseCommandName } from '../commands.js';
+import { clearResumeTarget, forgetSession, readResumeTarget, touchSession, writeResumeTarget } from '../sessionHistory.js';
+import { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, sessionsRoots } from './compat/index.js';
+import { listSummaries, locateSession, noteBranch, previewSession, } from './sessions/index.js';
 import { writeActivityFrames } from '../activityPrefs.js';
 import { readEffortPref, writeEffortPref } from '../effortPrefs.js';
 import { readModelPref, writeModelPref } from '../modelPrefs.js';
@@ -26,6 +27,11 @@ import { modeDisplayName, resolveSessionModes } from '../sessionModes.js';
 import { ActivityTracker } from 'dsh-working-activity/status';
 import { attachSessionToWorkspace } from './workspace.js';
 import { createLocalWorkspaceRuntime } from './workspaces.js';
+/**
+ * Delay before re-reading a skill catalog that reported an incomplete
+ * observation (a provider whose directory watcher is still warming).
+ */
+const SKILL_COMMAND_RETRY_MS = 800;
 const ARGS_PREVIEW_LIMIT = 160;
 const RESULT_PREVIEW_LIMIT = 240;
 /** Local `!`-command output cap (mirrors the result preview limit). */
@@ -251,18 +257,8 @@ function coalesceReplayEvents(events) {
 }
 /** Buffer below the context window at which CC warns (autoCompact.ts). */
 const CONTEXT_WARNING_BUFFER_TOKENS = 20_000;
-/** How many newest sessions resolve their title from the first user message
- *  (persistence.load reads the whole log — depth caps the picker latency). */
-const SESSION_TITLE_DEPTH = 20;
-/** Picker title cap, in characters. */
-const SESSION_TITLE_LIMIT = 40;
-/** One-line session title: whitespace folded, capped with an ellipsis. */
-function shortenTitle(text) {
-    const flat = text.replace(/\s+/g, ' ').trim();
-    return flat.length <= SESSION_TITLE_LIMIT
-        ? flat
-        : `${flat.slice(0, SESSION_TITLE_LIMIT - 1)}…`;
-}
+/** How many trailing exchanges the browser's preview pane asks for. */
+const PREVIEW_ENTRIES = 8;
 /** Resolve once a `turn/end` event newer than `fromSeq` lands in the session
  *  log (Agent.cancel closes the turn asynchronously), or when the timeout
  *  expires. Polling the session log is race-free here: fork reads the same
@@ -298,7 +294,11 @@ export function createChannel(ctx, initialAgent, options) {
     // command/run + command/done records). Absent the service, only the
     // built-in local commands exist.
     const commandService = ctx.get('commands');
-    const workspaceService = ctx.tuiWorkspaces ?? createLocalWorkspaceRuntime();
+    // 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. plugin.ts owns
+    // the degraded-boot warning for profile launches.
+    const workspaceService = ctx.get('tuiWorkspaces') ?? createLocalWorkspaceRuntime();
     const commandTrees = ctx.get('tuiCommandTrees');
     // Shift+Tab session-mode cycle: cordis.yml `modes` wins; absent/empty/
     // atom-less → the built-in default/plan/full cycle (sessionModes.ts).
@@ -977,6 +977,7 @@ export function createChannel(ctx, initialAgent, options) {
             bindAgent();
             refreshCommandList();
             void refreshLoadedContext();
+            void refreshSkillCommands();
             // The forked session (rewind) becomes the most recently used.
             touchSession(childId);
             state.emit();
@@ -1103,6 +1104,7 @@ export function createChannel(ctx, initialAgent, options) {
             bindAgent();
             refreshCommandList();
             void refreshLoadedContext();
+            void refreshSkillCommands();
             // Keep the `--resume` launcher contract pointing at the same session.
             writeResumeTarget(sessionId);
             // The resumed session is now the most recently used.
@@ -1225,6 +1227,7 @@ export function createChannel(ctx, initialAgent, options) {
             bindAgent();
             refreshCommandList();
             void refreshLoadedContext();
+            void refreshSkillCommands();
             clearResumeTarget();
             // The brand-new session becomes the most recently used.
             touchSession(handle.agent.id);
@@ -1398,6 +1401,7 @@ export function createChannel(ctx, initialAgent, options) {
             bindAgent();
             refreshCommandList();
             void refreshLoadedContext();
+            void refreshSkillCommands();
             // The model-switched fork becomes the most recently used.
             touchSession(childId);
             state.emit();
@@ -1661,61 +1665,21 @@ export function createChannel(ctx, initialAgent, options) {
             return listFilesDeep(fs, state.cwd);
         },
         async listSessions() {
-            // DSH's own session index: the persistence backend materializes one
-            // entry per durable session log (headers carry cwd + createdAt).
+            // Every stored session, classified and unfiltered. Which of them a
+            // surface shows — this project only, conversations only, sub-agent runs
+            // folded away — is a view decision, and keeping it out of here is what
+            // lets the browser toggle those views without re-reading a single log.
             const persistence = ctx.get('sessionPersistence');
             if (!persistence)
                 return [];
-            try {
-                const headers = await persistence.list();
-                // 按工作目录隔离（Claude Code 的项目维度）：/resume 只列出本会话
-                // 目录启动的会话，别的项目的会话不出现在选择器里。
-                const local = headers.filter(header => sessionCwdMatches(state.cwd, header.cwd ?? ''));
-                // MRU ordering: DSH headers carry only createdAt, so dsh-tui keeps its
-                // own last-used timestamps (touchSession on resume/submit/new) and
-                // falls back to createdAt for sessions never touched in this install.
-                const lastUsed = readLastUsed();
-                const records = local
-                    .map(header => ({
-                    id: header.id,
-                    // Titles load lazily below (first user message); until then the
-                    // cwd basename stands in (matching the status line), with a
-                    // short id when absent.
-                    title: basename(header.cwd ?? '') || `session ${String(header.id).slice(0, 8)}`,
-                    cwd: header.cwd ?? '',
-                    createdAt: header.createdAt,
-                    updatedAt: lastUsed[header.id] ?? header.createdAt,
-                }))
-                    .sort((a, b) => b.updatedAt - a.updatedAt);
-                // Title = the session's session/title event (auto: first prompt;
-                // manual: /rename), else its FIRST user message — the picker's most
-                // useful label. Read via the tolerant compat log reader instead of
-                // persistence.load: the backend validates every event against
-                // KNOWN_SESSION_EVENT_TYPES and throws the whole load on an unmarked
-                // an unregistered third-party type, which would otherwise leave the
-                // affected session titled with the cwd
-                // basename. An unreadable log keeps the basename fallback.
-                const empty = new Set();
-                for (const record of records.slice(0, SESSION_TITLE_DEPTH)) {
-                    const info = readSessionTitleFromLog(String(record.id));
-                    if (info === undefined)
-                        continue; // keep the basename fallback
-                    if (!info.hasUserMessage) {
-                        // Launch artifact — a session with no user message holds no
-                        // conversation to resume, so drop it from the picker (its
-                        // createdAt-only updatedAt would otherwise pin it near the
-                        // top forever, one per dsh-tui launch).
-                        empty.add(record.id);
-                        continue;
-                    }
-                    if (info.title !== undefined)
-                        record.title = shortenTitle(info.title);
-                }
-                return records.filter(record => !empty.has(record.id));
-            }
-            catch {
+            return listSummaries(persistence);
+        },
+        async previewSession(sessionId) {
+            const persistence = ctx.get('sessionPersistence');
+            if (!persistence)
                 return [];
-            }
+            const path = await locateSession(persistence, sessionId);
+            return path === undefined ? [] : previewSession(path, PREVIEW_ENTRIES);
         },
         setResumeTarget(sessionId) {
             writeResumeTarget(sessionId);
@@ -1755,12 +1719,10 @@ export function createChannel(ctx, initialAgent, options) {
             }
             if (appendSessionTitle(sessionId, title) !== 'appended')
                 return false;
-            // listSessions resolves persisted titles only for the MRU top
-            // SESSION_TITLE_DEPTH; a rename does not change MRU by itself, so a
-            // session beyond the window would keep showing the cwd-basename
-            // fallback (in the next picker AND after restart) even though the
-            // title event is durable. A rename IS user interaction with the
-            // session — touching it pulls it into the title window.
+            // The append changed the log, so the next listing sees a new revision,
+            // re-derives, and reads back the very title event just written — no
+            // second path to the same answer. Touching it is about ordering, not
+            // titles: a rename is user interaction, so the row belongs at the top.
             touchSession(sessionId);
             return true;
         },
@@ -1973,6 +1935,9 @@ export function createChannel(ctx, initialAgent, options) {
                 return [t('subagent-query-failed', { err: error instanceof Error ? error.message : String(error) })];
             }
         },
+        releaseContributions() {
+            releaseSkillCommands();
+        },
         traceEvents() {
             // Immutable per-append snapshot (dsh-session caches the frozen array);
             // reads follow agent swaps (/resume /rewind /new) automatically.
@@ -2093,6 +2058,11 @@ export function createChannel(ctx, initialAgent, options) {
                     ...(descriptions === undefined ? {} : { descriptions }),
                     tag: descriptor.input?.hint,
                     external: true,
+                    // Skills reach the registry as ordinary commands, so the menu would
+                    // lose the marker HelpMenu uses to keep them out of the chrome list.
+                    // This channel registered them and is the authority on which names
+                    // are skills.
+                    ...(skillCommands.has(descriptor.name) ? { skill: true } : {}),
                 });
             }
         }
@@ -2165,8 +2135,148 @@ export function createChannel(ctx, initialAgent, options) {
     };
     ctx.on('commands/change', refreshCommandList);
     ctx.on('skills/change', refreshCommandList);
+    /**
+     * The view a skill-catalog read must be taken through, as ONE value.
+     *
+     * The registry is host-plane but scope-LAYERED: a provider mounted by an
+     * agent preset's standing composition files into that preset's layer, and a
+     * read taken without the scope sees only the host layer. Passing the pair
+     * together keeps a read from being taken half-scoped.
+     *
+     * @param target - the agent whose view is wanted.
+     */
+    const skillViewOptions = (target) => ({
+        scope: target,
+        cwd: state.cwd,
+    });
+    /** The skill registry as the given agent sees it, or undefined when a boot
+     *  mounts none. `serviceForAgent` resolves through the agent's mount and
+     *  falls back to the host context. */
+    const skillRegistryFor = (target) => serviceForAgent(ctx, target, 'skills');
+    /**
+     * Skill commands this channel owns, by skill name. The value keeps the
+     * description the command was registered with so an edited SKILL.md
+     * re-registers instead of leaving a stale menu entry.
+     */
+    const skillCommands = new Map();
+    /** Skill names the registry refused (name taken, or invalid) — warn once. */
+    const skillCommandsRefused = new Set();
+    /** Pending re-read after an incomplete catalog observation. */
+    let skillCommandsRetry;
+    /**
+     * Publish every user-invocable skill as a slash command (issue #86).
+     *
+     * The completion menu already lists these skills, but a menu entry is not a
+     * command: nothing dispatches it, so typing the name and pressing Enter does
+     * nothing. Registering through the host command registry is what makes them
+     * runnable, and buys three things the TUI would otherwise reimplement:
+     * `register` emits `commands/change`, so the menu merge folds the entry in
+     * on its own; Enter dispatches through the normal command path, so the
+     * invocation is logged as a paired `command/run`/`command/done` like every
+     * other command; and the handler runs host-side, so invoking a skill is
+     * DETERMINISTIC — the body is injected here, instead of sending `/name` to
+     * the model and depending on it to recognize the text and reach for its
+     * skill loader.
+     *
+     * `userInvocable` covers "human-facing command catalogs AND loaders", so
+     * discovery alone would honor half the flag.
+     */
+    const refreshSkillCommands = async () => {
+        if (commandService === undefined)
+            return;
+        const target = agent;
+        const registry = skillRegistryFor(target);
+        if (registry === undefined)
+            return;
+        let observation;
+        try {
+            observation = await registry.snapshot(skillViewOptions(target));
+        }
+        catch (error) {
+            ctx.logger.warn('skill commands: catalog read failed: %o', error);
+            return;
+        }
+        if (target !== agent)
+            return;
+        // A provider still warming its watcher reports an incomplete observation;
+        // re-read once so a cold start cannot leave the menu permanently short.
+        if (!observation.complete && skillCommandsRetry === undefined) {
+            skillCommandsRetry = setTimeout(() => {
+                skillCommandsRetry = undefined;
+                void refreshSkillCommands();
+            }, SKILL_COMMAND_RETRY_MS);
+        }
+        const wanted = new Map(observation.skills
+            .filter(skill => isUserInvocable(skill))
+            // A name the TUI's own command grammar cannot parse would show in the
+            // menu and then fail to dispatch when typed; ask the real parser
+            // instead of restating its pattern here.
+            .filter(skill => parseCommandName(`/${skill.name}`)?.name === skill.name)
+            // Built-in locals win a name collision, exactly as they do over
+            // plugin-registered commands in refreshCommandList.
+            .filter(skill => !isLocalCommandName(skill.name))
+            .map(skill => [skill.name, skill.description]));
+        for (const [name, entry] of skillCommands) {
+            if (wanted.get(name) === entry.description)
+                continue;
+            entry.dispose();
+            skillCommands.delete(name);
+        }
+        for (const [name, description] of wanted) {
+            if (skillCommands.has(name) || skillCommandsRefused.has(name))
+                continue;
+            // Another plugin already owns this name (plan/goal/…): leave it alone.
+            if (commandService.find(target, name) !== undefined)
+                continue;
+            try {
+                const dispose = commandService.register({
+                    name,
+                    description,
+                    // The injected body is the payload; recording the (empty) raw input
+                    // would only duplicate the command name into the session log.
+                    recordInput: false,
+                    handler: async ({ agent: invoker, signal }) => {
+                        const view = { ...skillViewOptions(invoker), signal };
+                        const skill = await skillRegistryFor(invoker)?.get(name, view);
+                        if (skill === undefined || !isUserInvocable(skill)) {
+                            return { kind: 'error', text: t('skill-unavailable', { name }) };
+                        }
+                        // The official user-explicit invocation shape (dsh-skill's
+                        // SkillInvocationSource): the rendered body rides as instructions
+                        // the model follows, and transcript consumers present it from the
+                        // source metadata instead of re-parsing model-facing text.
+                        invoker.followup(createUserMessage({
+                            content: [{ type: 'text', text: renderSkillContent(skill) }],
+                            source: { kind: 'skill-invocation', name, form: 'instructions' },
+                        }));
+                        // Silent success: the agent visibly starts working on the skill,
+                        // which is the feedback (CC shows no banner either).
+                        return { kind: 'success' };
+                    },
+                });
+                skillCommands.set(name, { dispose, description });
+            }
+            catch (error) {
+                skillCommandsRefused.add(name);
+                ctx.logger.warn(`skill commands: "${name}" not registrable: %o`, error);
+            }
+        }
+    };
+    ctx.on('skills/change', () => {
+        void refreshSkillCommands();
+    });
+    /** See {@link Channel.releaseContributions}. */
+    const releaseSkillCommands = () => {
+        if (skillCommandsRetry !== undefined)
+            clearTimeout(skillCommandsRetry);
+        skillCommandsRetry = undefined;
+        for (const entry of skillCommands.values())
+            entry.dispose();
+        skillCommands.clear();
+    };
     refreshCommandList();
     void refreshLoadedContext();
+    void refreshSkillCommands();
     let nextRowId = 0;
     /** The leaf's bash executor (dsh-bash-local in the example leaf) — the DSH
    *  execution seam for local `!` commands and the git status breadcrumb. The
@@ -2915,6 +3025,11 @@ ${output}
             const branch = result.stdout.text.trim();
             if (branch !== '') {
                 state.gitBranch = branch;
+                // Note it against the session too. A session log records no branch,
+                // and nothing can reconstruct one after the fact, so the browser can
+                // only show a branch for sessions this install actually used — which
+                // is exactly what the column claims.
+                noteBranch(agent.session.id, branch);
                 state.emit();
             }
         })
@@ -2927,7 +3042,7 @@ ${output}
     refreshGitBranch();
     return state;
 }
-/** Path basename for the resume-list title (`C:/a/b` → `b`). */
+/** Trailing path segment (`C:/a/b` → `b`). */
 function basename(path) {
     const parts = path.split(/[\\/]/);
     return parts[parts.length - 1] ?? path;

package/lib/types/dsh-adapter/compat/index.d.ts

@@ -18,5 +18,5 @@
  *    registration API (issue #153).
  * @module @deepseek-harness-tui/dsh-tui/compat
  */
-export { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, LEGACY_SESSION_EVENT_TYPES, readSessionTitleFromLog, sessionsRoots, } from './sessionLog.js';
+export { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, findSessionLogFile, LEGACY_SESSION_EVENT_TYPES, readSessionTitleFromLog, sessionsRoots, } from './sessionLog.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/types/dsh-adapter/compat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,0BAA0B,EAC1B,uBAAuB,EACvB,aAAa,GACd,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,EAClB,0BAA0B,EAC1B,uBAAuB,EACvB,aAAa,GACd,MAAM,iBAAiB,CAAA"}

package/lib/types/dsh-adapter/compat/index.js

@@ -18,4 +18,4 @@
  *    registration API (issue #153).
  * @module @deepseek-harness-tui/dsh-tui/compat
  */
-export { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, LEGACY_SESSION_EVENT_TYPES, readSessionTitleFromLog, sessionsRoots, } from './sessionLog.js';
+export { appendSessionTitle, deleteSessionLog, ensureLegacySessionEventTypes, findSessionLogFile, LEGACY_SESSION_EVENT_TYPES, readSessionTitleFromLog, sessionsRoots, } from './sessionLog.js';

package/lib/types/dsh-adapter/compat/sessionLog.d.ts

@@ -14,6 +14,14 @@ export declare const LEGACY_SESSION_EVENT_TYPES: readonly string[];
  * explicit DSH_TUI_SESSION_ROOT always outranks the defaults.
  */
 export declare function sessionsRoots(): string[];
+/**
+ * Locate a session's log by scanning workspace directories for the session
+ * id — deliberately NOT replicating the persistence plugin's workspace-key
+ * sanitization, so the helpers survive upstream key-scheme changes.
+ * @param sessionId - Session id (directory name under each workspace dir).
+ * @returns Absolute path of session.jsonl.zstd, or undefined when absent.
+ */
+export declare function findSessionLogFile(sessionId: string): string | undefined;
 /**
  * Register every {@link LEGACY_SESSION_EVENT_TYPES} type as known in EVERY
  * reachable KNOWN_SESSION_EVENT_TYPES copy, ahead of the strict read path

package/lib/types/dsh-adapter/compat/sessionLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionLog.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/sessionLog.ts"],"names":[],"mappings":"AAqDA;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAAwB,CAAA;AAKhF;;;;;;;GAOG;AACH,wBAAgB,aAAa,IAAI,MAAM,EAAE,CASxC;AAkED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAkCpD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAChB;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAyBzD;AAyBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,CAwB/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAwB7E"}
+{"version":3,"file":"sessionLog.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/sessionLog.ts"],"names":[],"mappings":"AAqDA;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAAwB,CAAA;AAKhF;;;;;;;GAOG;AACH,wBAAgB,aAAa,IAAI,MAAM,EAAE,CASxC;AAaD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAexE;AA+BD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAkCpD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAChB;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAyBzD;AAyBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,CAwB/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAwB7E"}

package/lib/types/dsh-adapter/compat/sessionLog.js

@@ -88,7 +88,7 @@ function isSafeSessionId(sessionId) {
  * @param sessionId - Session id (directory name under each workspace dir).
  * @returns Absolute path of session.jsonl.zstd, or undefined when absent.
  */
-function findSessionLogFile(sessionId) {
+export function findSessionLogFile(sessionId) {
     if (!isSafeSessionId(sessionId))
         return undefined;
     for (const root of sessionsRoots()) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD,eAAO,MAAM,IAAI,YAAY,CAAA;AAC7B,eAAO,MAAM,MAAM,UAA8B,CAAA;AAEjD;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;yEAKqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;gDAC4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;gFAE4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;oCACgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;sBAIkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;4BAGwB;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;wDAEoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;gCAG4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA0BhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD,eAAO,MAAM,IAAI,YAAY,CAAA;AAU7B,eAAO,MAAM,MAAM,UAAa,CAAA;AAEhC;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;yEAKqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;gDAC4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;gFAE4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;oCACgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;sBAIkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;4BAGwB;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;wDAEoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;gCAG4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA0BhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE"}

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

@@ -1,6 +1,15 @@
 import Schema from '@deepseek-ai/schemastery';
 export const name = 'dsh-tui';
-export const inject = ['agents', 'tuiWorkspaces'];
+// `tuiWorkspaces` must stay OUT of this code-level inject (issue #183): the
+// dsh CLI resolves the bundle's cordis.patch.yml from the FIRST copy of this
+// package found from its own install anchor (typically the global launcher),
+// while the Loader imports the plugin module from the profile's copy. When
+// the two copies skew, the patch may predate the dsh-tui-workspaces row — a
+// hard inject here then deadlocks the whole tree at boot ("pending (waiting
+// for service: tuiWorkspaces)"). The bundle patch keeps tuiWorkspaces in the
+// row-level inject purely as an ordering guarantee when the row exists; when
+// it does not, plugin.ts/channel.ts fall back to a local workspace runtime.
+export const inject = ['agents'];
 export const Config = Schema.object({
     sessionId: Schema.string().required(false),
     // No schema defaults on the route: a `.default()` here would make an

package/lib/types/dsh-adapter/packaged-presets.d.ts

@@ -0,0 +1,22 @@
+export interface PackagedPresetResult {
+    id: string;
+    status: 'installed' | 'updated' | 'current' | 'conflict';
+}
+export interface PackagedPresetOptions {
+    dshHome?: string;
+    sourceRoot?: string;
+    moduleUrl?: string;
+}
+/** Resolve the package asset in both src/tsx and compiled npm layouts. */
+export declare function packagedPresetRoot(moduleUrl?: string): string;
+/**
+ * Materialize presets shipped by dsh-tui into the Harness user preset root.
+ *
+ * The official launcher replaces the roster's configured roots with its own
+ * shipped root at the end of profile composition, so a bundle patch cannot
+ * add a second system root. The user root is the roster's supported extension
+ * seam and is discovered on every list/resolve call. Existing unmarked
+ * directories are never overwritten.
+ */
+export declare function ensurePackagedPresets(options?: PackagedPresetOptions): PackagedPresetResult[];
+//# sourceMappingURL=packaged-presets.d.ts.map

package/lib/types/dsh-adapter/packaged-presets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"packaged-presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/packaged-presets.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;CACzD;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAmBD,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,MAAwB,GAAG,MAAM,CAQ9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,qBAA0B,GAAG,oBAAoB,EAAE,CAkDjG"}

package/lib/types/dsh-adapter/packaged-presets.js

@@ -0,0 +1,90 @@
+import { randomUUID } from 'node:crypto';
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+const OWNER = '@deepseek-harness-tui/dsh-tui';
+const MARKER = '.dsh-tui-managed.json';
+function readMarker(directory) {
+    try {
+        const value = JSON.parse(readFileSync(join(directory, MARKER), 'utf8'));
+        if (value.owner === OWNER
+            && typeof value.preset === 'string'
+            && typeof value.revision === 'string'
+            && value.revision.length > 0) {
+            return value;
+        }
+    }
+    catch {
+        // An absent or user-authored marker means this directory is not ours.
+    }
+    return undefined;
+}
+/** Resolve the package asset in both src/tsx and compiled npm layouts. */
+export function packagedPresetRoot(moduleUrl = import.meta.url) {
+    const directory = dirname(fileURLToPath(moduleUrl));
+    const candidates = [join(directory, '../../presets'), join(directory, '../../../presets')];
+    const found = candidates.find(candidate => existsSync(candidate));
+    if (found === undefined) {
+        throw new Error(`dsh-tui: packaged preset root is missing (checked ${candidates.join(', ')})`);
+    }
+    return found;
+}
+/**
+ * Materialize presets shipped by dsh-tui into the Harness user preset root.
+ *
+ * The official launcher replaces the roster's configured roots with its own
+ * shipped root at the end of profile composition, so a bundle patch cannot
+ * add a second system root. The user root is the roster's supported extension
+ * seam and is discovered on every list/resolve call. Existing unmarked
+ * directories are never overwritten.
+ */
+export function ensurePackagedPresets(options = {}) {
+    const sourceRoot = options.sourceRoot ?? packagedPresetRoot(options.moduleUrl);
+    const dshHome = options.dshHome ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    const targetRoot = join(dshHome, '.agent-presets');
+    const results = [];
+    for (const entry of readdirSync(sourceRoot, { withFileTypes: true })) {
+        if (!entry.isDirectory())
+            continue;
+        const id = entry.name;
+        const source = join(sourceRoot, id);
+        const sourceMarker = readMarker(source);
+        if (sourceMarker === undefined || sourceMarker.preset !== id) {
+            throw new Error(`dsh-tui: packaged preset ${id} has no valid ${MARKER}`);
+        }
+        const target = join(targetRoot, id);
+        if (!existsSync(target)) {
+            mkdirSync(targetRoot, { recursive: true });
+            cpSync(source, target, { recursive: true, force: false, errorOnExist: true });
+            results.push({ id, status: 'installed' });
+            continue;
+        }
+        const targetMarker = readMarker(target);
+        if (targetMarker === undefined || targetMarker.preset !== id) {
+            results.push({ id, status: 'conflict' });
+            continue;
+        }
+        if (targetMarker.revision === sourceMarker.revision) {
+            results.push({ id, status: 'current' });
+            continue;
+        }
+        const suffix = `${process.pid}-${randomUUID()}`;
+        const staged = join(targetRoot, `.${id}.staged-${suffix}`);
+        const backup = join(targetRoot, `.${id}.backup-${suffix}`);
+        cpSync(source, staged, { recursive: true, force: false, errorOnExist: true });
+        try {
+            renameSync(target, backup);
+            renameSync(staged, target);
+            rmSync(backup, { recursive: true, force: true });
+        }
+        catch (error) {
+            if (!existsSync(target) && existsSync(backup))
+                renameSync(backup, target);
+            rmSync(staged, { recursive: true, force: true });
+            throw error;
+        }
+        results.push({ id, status: 'updated' });
+    }
+    return results;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA2BnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkYvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA6BnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2bvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}