@deepseek-harness-tui/dsh-tui 0.7.1 → 0.7.3

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

@@ -0,0 +1,93 @@
+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 });
+            // `filter` forces the JS copy path (see src/utils/paths.ts): the native
+            // cpSync fast path fails with EIO or crashes under a non-ASCII home
+            // directory such as `C:\Users\米`.
+            cpSync(source, target, { recursive: true, force: false, errorOnExist: true, filter: () => 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, filter: () => 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,CA+YvE;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,CA8bvE;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"}

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

@@ -13,7 +13,8 @@ import { readActivityFrames } from '../activityPrefs.js';
 import { readModelPref } from '../modelPrefs.js';
 import { explicitModelRoute, recordedModelRoute, resolveModelRoute, validateModelRoute } from '../modelRoute.js';
 import { readPresetPref } from '../presetPrefs.js';
-import { composePreset, resolvePersistedPreset, runningPresetOf } from './presets.js';
+import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, runningPresetOf } from './presets.js';
+import { ensurePackagedPresets } from './packaged-presets.js';
 import { ensureLegacySessionEventTypes } from './compat/index.js';
 import { clearResumeTarget, writeResumeTarget } from '../sessionHistory.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
@@ -22,6 +23,7 @@ import { isLang, resolveStartupLang, setLang, t } from '../i18n.js';
 import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
 import { Chat } from '../screens/Chat.js';
 import { attachSessionToWorkspace } from './workspace.js';
+import { createLocalWorkspaceRuntime } from './workspaces.js';
 import { render, ThemeProvider, AlternateScreen } from '../ui.js';
 import instances from '../ink/instances.js';
 import { cursorMove, DISABLE_KITTY_KEYBOARD, DISABLE_MODIFY_OTHER_KEYS, DISABLE_WIN32_INPUT_MODE } from '../ink/termio/csi.js';
@@ -40,6 +42,22 @@ export async function apply(ctx, config) {
     if (!process.stdout.isTTY) {
         throw new Error('dsh-tui requires an interactive terminal (stdout must be a TTY).');
     }
+    // The official profile launcher owns the system preset root and replaces
+    // any bundle-supplied roots at boot. Install dsh-tui's bundled presets via
+    // the roster's supported user-root seam before resolving the first agent.
+    // Never overwrite an existing directory unless it carries our marker.
+    try {
+        for (const result of ensurePackagedPresets()) {
+            if (result.status === 'conflict') {
+                ctx.logger.warn(`dsh-tui: packaged preset "${result.id}" was not installed because an unmanaged preset already uses that id`);
+            }
+        }
+    }
+    catch (error) {
+        // A read-only home must not make the whole terminal unusable; the other
+        // official and user presets remain available.
+        ctx.logger.warn(`dsh-tui: unable to install packaged presets (${error instanceof Error ? error.message : String(error)})`);
+    }
     // Data-directory rename (~/.dsh-cc → ~/.dsh-tui, issue #120): copy the
     // legacy directory before ANY preference read below (resolveStartupLang
     // already touches lang.json). Copy, not move — old launchers keep working
@@ -98,6 +116,16 @@ export async function apply(ctx, config) {
     // the inject proxy.
     const userQuestions = ctx.get('userQuestions') ?? new UserQuestionService(ctx);
     ctx.plugin(toolAskUser);
+    // The host-level tool mount above is intentional for the TUI and for user
+    // presets, but the official Minimal preset is a strict two-tool trajectory
+    // (persistent bash + str_replace_editor). Filter only that preset at the
+    // final assembly boundary. Reading the session on every assembly also makes
+    // blank-session /preset switches and resumed sessions behave correctly.
+    ctx.on('system-prompt/assemble', async (_assembly, context, next) => {
+        const assembled = await next();
+        const presetId = context.agent === undefined ? undefined : runningPresetOf(context.agent.session);
+        return filterMinimalPresetTools(assembled, presetId);
+    });
     const questionStore = new QuestionStore();
     // Packaged skills (/audit, /bug, …): contribute them through the host's
     // skill registry so they resolve with zero manual copying.
@@ -170,9 +198,22 @@ export async function apply(ctx, config) {
     // see the repository, not an arbitrary launch subdirectory. Resolved ONCE
     // here — the agent meta and the channel must agree.
     const requestedWorkspace = config.workspace ?? process.env.DSH_TUI_WORKSPACE_TARGET;
+    // Degraded boot (issue #183): a stale bundle patch without the
+    // dsh-tui-workspaces row leaves the service unmounted; resolve startup
+    // targets through the local-only runtime (provider URIs then fail loud
+    // below instead of crashing on an undefined service). A profile launch
+    // without the service means the patch came from an older dsh-tui copy
+    // than the running code — warn once so the skew is diagnosable. Bare
+    // embedders (no --profile) take the same fallback by design, silently.
+    const mountedWorkspaceService = ctx.get('tuiWorkspaces');
+    if (mountedWorkspaceService === undefined && resolveDshProfileName() !== undefined) {
+        ctx.logger.warn('dsh-tui: tuiWorkspaces service is not mounted; /workspace runs with the local-only fallback. ' +
+            'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+    }
+    const workspaceService = mountedWorkspaceService ?? createLocalWorkspaceRuntime();
     const initialWorkspace = requestedWorkspace === undefined
         ? undefined
-        : await ctx.tuiWorkspaces.resolve(requestedWorkspace);
+        : await workspaceService.resolve(requestedWorkspace);
     if (requestedWorkspace !== undefined && initialWorkspace === undefined) {
         throw new Error(`dsh-tui: unsupported or unavailable workspace target: ${requestedWorkspace}`);
     }
@@ -268,6 +309,7 @@ export async function apply(ctx, config) {
     let instance;
     let exited = false;
     let updateRequested = false;
+    let updateTargetVersion;
     // The profile this process was booted with (`dsh --profile <name>`); dsh
     // exposes it nowhere else, and /update must update the installation the
     // user is actually running, not a hard-coded one.
@@ -295,7 +337,7 @@ export async function apply(ctx, config) {
                 catch {
                     // Resume persistence is best effort and must never block an update.
                 }
-                void finishExit(ctx, instance, config.fullscreen === true, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId));
+                void finishExit(ctx, instance, config.fullscreen === true, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId, updateTargetVersion));
                 return;
             }
             // Judge against the live session behind the channel (channel.agentId),
@@ -327,8 +369,9 @@ export async function apply(ctx, config) {
         channel,
         questionStore,
         approvalStore,
-        // The trajectory scene enters the alt screen itself in inline mode; in
-        // fullscreen the tree is already wrapped below, so it must not nest.
+        // Full-screen surfaces inside Chat — the trajectory scene and the session
+        // browser — enter the alt screen themselves in inline mode; in fullscreen
+        // the tree is already wrapped below, so they must not nest.
         fullscreen: config.fullscreen === true,
         onExit: () => handleExit(),
         // Only a `dsh --profile <name>` launch has a profile installation for
@@ -350,6 +393,9 @@ export async function apply(ctx, config) {
                 if (target.kind === 'unknown') {
                     channel.notify(t('update-check-failed'));
                 }
+                else {
+                    updateTargetVersion = target.latest;
+                }
                 channel.notify(t('update-starting'));
                 updateRequested = true;
                 handleExit();
@@ -623,13 +669,13 @@ function writeStream(stream, data) {
         }
     });
 }
-function runUpdate(ctx, profile, sessionId) {
+function runUpdate(ctx, profile, sessionId, targetVersion) {
     disposeRootAndThen(ctx, () => {
         if (profile === undefined) {
             process.stderr.write(`\n${t('update-aborted-no-profile')}\n`);
             process.exit(1);
         }
-        void updateTuiAndRestart(sessionId, profile).then(({ updateCode, restartCode }) => {
+        void updateTuiAndRestart(sessionId, profile, targetVersion).then(({ updateCode, restartCode }) => {
             if (updateCode !== 0) {
                 process.stderr.write(`\ndsh-tui update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
                     `${resumeCommand(profile, sessionId)}\n\n`);

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

@@ -18,6 +18,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { AgentSetup } from '@deepseek-ai/dsh-agent';
 import type { SessionId } from '@deepseek-ai/dsh-session';
+import type { PromptAssembly } from '@deepseek-ai/dsh-system-prompt';
 /** One roster entry, as returned by `agentPresets.list()`/`resolve()`. */
 export interface AgentPresetInfo {
     readonly id: string;
@@ -93,6 +94,21 @@ export declare function runningPresetOf(session: {
         data: unknown;
     }[];
 }): string | undefined;
+/**
+ * Keep the official Minimal preset's model-facing contract at exactly two
+ * tools. The TUI mounts ask_user_question at the host layer so every other
+ * preset (including user presets) can use its questionnaire UI; host-layer
+ * tools otherwise merge into Minimal's scoped catalog as a third tool.
+ *
+ * This is a per-assembly filter rather than a startup-time decision because
+ * one TUI process can resume, create, or recompose sessions under different
+ * presets. The session log remains the source of truth for the active preset.
+ *
+ * @param assembly - Fully assembled prompt inputs for one model request.
+ * @param presetId - Preset recorded for the requesting session.
+ * @returns The original assembly, except ask_user_question is absent in Minimal.
+ */
+export declare function filterMinimalPresetTools(assembly: PromptAssembly, presetId: string | undefined): PromptAssembly;
 /**
  * Read a service the way a joined agent sees it: through the preset scope
  * chain when a roster is mounted (preset realms hide e.g. `compaction` from

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

@@ -1 +1 @@
-{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAGzD,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,IAAI,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC9C,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,yEAAyE;IACzE,UAAU,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAC3D;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAqB5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACnD,GAAG,MAAM,GAAG,SAAS,CAErB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}
+{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAKpE,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,IAAI,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC9C,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,yEAAyE;IACzE,UAAU,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAC3D;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAqB5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACnD,GAAG,MAAM,GAAG,SAAS,CAErB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAM/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}

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

@@ -16,6 +16,7 @@
  * before presets existed.
  */
 import { resolveSessionPreset } from '@deepseek-ai/dsh-agent-presets';
+const ASK_USER_TOOL = 'ask_user_question';
 /**
  * The mounted preset roster, or undefined when the composition has no
  * `agent-presets` row (bare boots) — optional-service access via `ctx.get`.
@@ -94,6 +95,28 @@ export async function resolvePersistedPreset(ctx, sessionId) {
 export function runningPresetOf(session) {
     return resolveSessionPreset(session);
 }
+/**
+ * Keep the official Minimal preset's model-facing contract at exactly two
+ * tools. The TUI mounts ask_user_question at the host layer so every other
+ * preset (including user presets) can use its questionnaire UI; host-layer
+ * tools otherwise merge into Minimal's scoped catalog as a third tool.
+ *
+ * This is a per-assembly filter rather than a startup-time decision because
+ * one TUI process can resume, create, or recompose sessions under different
+ * presets. The session log remains the source of truth for the active preset.
+ *
+ * @param assembly - Fully assembled prompt inputs for one model request.
+ * @param presetId - Preset recorded for the requesting session.
+ * @returns The original assembly, except ask_user_question is absent in Minimal.
+ */
+export function filterMinimalPresetTools(assembly, presetId) {
+    if (presetId !== 'minimal' || !assembly.tools.some(tool => tool.name === ASK_USER_TOOL))
+        return assembly;
+    return {
+        ...assembly,
+        tools: assembly.tools.filter(tool => tool.name !== ASK_USER_TOOL),
+    };
+}
 /**
  * Read a service the way a joined agent sees it: through the preset scope
  * chain when a roster is mounted (preset realms hide e.g. `compaction` from

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

@@ -1 +1 @@
-{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,mEAAmE;AACnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,oBAAoB,IAAI,SAAS,wBAAwB,EAAE,CAAA;IAC3D,kEAAkE;IAClE,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;IACnC,sEAAsE;IACtE,cAAc,CAAC,OAAO,EAAE;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAA;IAC1C,0EAA0E;IAC1E,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAChC;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACxD,2EAA2E;IAC3E,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,yDAAyD;IACzD,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnD;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7E;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAA;AAgDpE;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA4MhC"}
+{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,mEAAmE;AACnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,oBAAoB,IAAI,SAAS,wBAAwB,EAAE,CAAA;IAC3D,kEAAkE;IAClE,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;IACnC,sEAAsE;IACtE,cAAc,CAAC,OAAO,EAAE;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAA;IAC1C,0EAA0E;IAC1E,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAChC;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACxD,2EAA2E;IAC3E,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,yDAAyD;IACzD,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnD;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7E;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAA;AAgDpE;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA8MhC"}

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

@@ -86,7 +86,9 @@ export async function runProviderWizard(deps) {
                     questions: [optionQuestion('catalog', t('provider-q-catalog'), [
                             ...candidates.map(candidate => ({
                                 label: candidate.provider,
-                                description: candidate.displayName,
+                                description: candidate.displayName === candidate.provider
+                                    ? undefined
+                                    : candidate.displayName,
                             })),
                             { label: otherLabel, description: t('provider-opt-other-route-desc') },
                         ], { hideCustomInput: true })],

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

@@ -0,0 +1,29 @@
+import type { PreviewEntry, SessionDigest } from './types.js';
+/** Head window budget. Eight times the measured worst-case prompt offset. */
+export declare const HEAD_WINDOW_BYTES: number;
+/** Head frame ceiling — a cost bound independent of how the bytes compress. */
+export declare const HEAD_MAX_FRAMES = 128;
+/** Tail window budget. Wider than the head: trailing frames carry payloads. */
+export declare const TAIL_WINDOW_BYTES: number;
+/**
+ * Read both windows of one session log.
+ *
+ * @param path - Absolute artifact path.
+ * @param cwd - Working directory, for the last-resort title.
+ * @returns The digest. An unreadable log still yields a usable record: the
+ *   title falls back to the directory basename and says so through its source.
+ */
+export declare function digestSession(path: string, cwd: string): SessionDigest;
+/**
+ * The last exchanges of a session, for the browser's preview pane.
+ *
+ * Bounded like everything else here: the preview shows the end of the
+ * conversation because that is what the tail window holds, and because the end
+ * is what tells you whether this is the session you meant.
+ *
+ * @param path - Absolute artifact path.
+ * @param limit - How many entries to keep, newest last.
+ * @returns Entries in log order.
+ */
+export declare function previewSession(path: string, limit: number): PreviewEntry[];
+//# sourceMappingURL=digest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"digest.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/sessions/digest.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAgB,MAAM,YAAY,CAAA;AAE3E,6EAA6E;AAC7E,eAAO,MAAM,iBAAiB,QAAY,CAAA;AAC1C,+EAA+E;AAC/E,eAAO,MAAM,eAAe,MAAM,CAAA;AAClC,+EAA+E;AAC/E,eAAO,MAAM,iBAAiB,QAAa,CAAA;AA+F3C;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CA8CtE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,CAyB1E"}

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

@@ -0,0 +1,224 @@
+/**
+ * What a bounded read can learn about a session log.
+ *
+ * Two windows, one at each end, and never anything in between:
+ *
+ * - The HEAD holds the session envelope, the boot policy events, and the
+ *   opening prompt. Measured across a real corpus, the first user prompt lands
+ *   within 8,107 bytes of the start (524 in its `agent/inbox/spliced` form),
+ *   so a 64 KB window carries an eightfold margin.
+ * - The TAIL holds whatever was appended most recently: the current title
+ *   (titles are re-emitted, and the last one wins), the model of the last
+ *   request, and the last exchanges for the preview.
+ *
+ * Titles carry their own provenance, so this module does not have to guess.
+ * A title written by a provider records `source.kind: 'provider'`; the TUI's
+ * own rename paths append `{ title }` with no source at all. That difference
+ * is the evidence behind {@link SessionTitle.source}, which is why the picker
+ * can dim a fallback and explain a name instead of merely displaying one.
+ *
+ * @module @deepseek-harness-tui/dsh-tui/sessions/digest
+ */
+import { basename } from 'node:path';
+import { decodeFrames, decodeTail, readWindow, walkFrames } from './frames.js';
+/** Head window budget. Eight times the measured worst-case prompt offset. */
+export const HEAD_WINDOW_BYTES = 64 * 1024;
+/** Head frame ceiling — a cost bound independent of how the bytes compress. */
+export const HEAD_MAX_FRAMES = 128;
+/** Tail window budget. Wider than the head: trailing frames carry payloads. */
+export const TAIL_WINDOW_BYTES = 128 * 1024;
+/** Longest preview excerpt kept per message, in characters. */
+const PREVIEW_CHARS = 400;
+/** The first text block of a message `content` payload. */
+function textOfContent(content) {
+    if (typeof content === 'string')
+        return content.trim() || undefined;
+    if (!Array.isArray(content))
+        return undefined;
+    for (const block of content) {
+        if (block === null || typeof block !== 'object')
+            continue;
+        const record = block;
+        if (record['type'] !== 'text')
+            continue;
+        const value = record['text'];
+        if (typeof value === 'string' && value.trim().length > 0)
+            return value.trim();
+    }
+    return undefined;
+}
+/**
+ * Whether a message's `source` marks it as typed by the person at the
+ * keyboard. Plugin injections, instruction snapshots, skill catalogues and
+ * sub-agent reports all arrive as user-role messages too, and counting them
+ * would report a conversation where none happened.
+ */
+function isHumanSource(source) {
+    if (source === undefined || source === null)
+        return true;
+    if (typeof source !== 'object')
+        return false;
+    return source['kind'] === 'user';
+}
+/** The human prompt carried by one log line, in either of its two forms. */
+function humanPrompt(line) {
+    const data = line['data'];
+    if (data === null || typeof data !== 'object')
+        return undefined;
+    const record = data;
+    if (line['type'] === 'user/message') {
+        return isHumanSource(record['source']) ? textOfContent(record['content']) : undefined;
+    }
+    // The inbox splice precedes the durable user/message and reaches the log
+    // several frames earlier, which is what keeps the head window small.
+    if (line['type'] === 'agent/inbox/spliced') {
+        const inserted = record['inserted'];
+        if (!Array.isArray(inserted))
+            return undefined;
+        for (const message of inserted) {
+            if (message === null || typeof message !== 'object')
+                continue;
+            const entry = message;
+            if (entry['role'] !== 'user' || !isHumanSource(entry['source']))
+                continue;
+            const text = textOfContent(entry['content']);
+            if (text !== undefined)
+                return text;
+        }
+    }
+    return undefined;
+}
+/** A `session/title` payload, with the provenance that classifies it. */
+function titleOf(line) {
+    if (line['type'] !== 'session/title')
+        return undefined;
+    const data = line['data'];
+    if (data === null || typeof data !== 'object')
+        return undefined;
+    const record = data;
+    const text = record['title'];
+    if (typeof text !== 'string' || text.trim().length === 0)
+        return undefined;
+    const source = record['source'];
+    const byProvider = source !== null &&
+        typeof source === 'object' &&
+        source['kind'] === 'provider';
+    return { text: text.trim(), source: byProvider ? 'auto' : 'renamed' };
+}
+/** The route recorded by a `request/context` event. */
+function modelOf(line) {
+    if (line['type'] !== 'request/context')
+        return undefined;
+    const data = line['data'];
+    if (data === null || typeof data !== 'object')
+        return undefined;
+    const model = data['model'];
+    return typeof model === 'string' && model.length > 0 ? model : undefined;
+}
+/** The label a delegated run was started under. */
+function labelOf(line) {
+    if (line['type'] !== 'subagent/descriptor')
+        return undefined;
+    const data = line['data'];
+    if (data === null || typeof data !== 'object')
+        return undefined;
+    const label = data['label'];
+    return typeof label === 'string' && label.trim().length > 0 ? label.trim() : undefined;
+}
+/** Epoch-ms of a log line, when it carries one. */
+function timeOf(line) {
+    const time = line['time'];
+    return typeof time === 'number' && Number.isFinite(time) ? time : undefined;
+}
+/**
+ * Read both windows of one session log.
+ *
+ * @param path - Absolute artifact path.
+ * @param cwd - Working directory, for the last-resort title.
+ * @returns The digest. An unreadable log still yields a usable record: the
+ *   title falls back to the directory basename and says so through its source.
+ */
+export function digestSession(path, cwd) {
+    const head = readWindow(path, HEAD_WINDOW_BYTES);
+    if (head === undefined) {
+        return { title: undefined, hasPrompt: false, model: undefined, label: undefined };
+    }
+    const headLines = decodeFrames(head.buffer, walkFrames(head.buffer, 0, HEAD_MAX_FRAMES));
+    let prompt;
+    let headTitle;
+    let label;
+    for (const line of headLines) {
+        prompt ??= humanPrompt(line);
+        headTitle ??= titleOf(line);
+        label ??= labelOf(line);
+    }
+    // Absence of a prompt only means "empty" when the window actually saw the
+    // whole log. A log too large for the window has a conversation in it by
+    // construction, and erring toward listing it is the safe direction: hiding
+    // a real session is a defect, showing a boot artifact is a nuisance.
+    const hasPrompt = prompt !== undefined || !head.whole;
+    // A head window that already covered the whole log IS the tail.
+    const tail = head.whole ? undefined : readWindow(path, TAIL_WINDOW_BYTES, true);
+    const tailLines = tail === undefined ? headLines : decodeTail(tail);
+    let tailTitle;
+    let model;
+    for (const line of tailLines) {
+        const title = titleOf(line);
+        if (title !== undefined)
+            tailTitle = title;
+        const route = modelOf(line);
+        if (route !== undefined)
+            model = route;
+    }
+    const resolved = tailTitle ??
+        headTitle ??
+        (prompt === undefined ? undefined : { text: prompt, source: 'prompt' });
+    return {
+        title: resolved ?? { text: basename(cwd), source: 'fallback' },
+        hasPrompt,
+        model,
+        label,
+    };
+}
+/**
+ * The last exchanges of a session, for the browser's preview pane.
+ *
+ * Bounded like everything else here: the preview shows the end of the
+ * conversation because that is what the tail window holds, and because the end
+ * is what tells you whether this is the session you meant.
+ *
+ * @param path - Absolute artifact path.
+ * @param limit - How many entries to keep, newest last.
+ * @returns Entries in log order.
+ */
+export function previewSession(path, limit) {
+    const window = readWindow(path, TAIL_WINDOW_BYTES, true);
+    if (window === undefined)
+        return [];
+    const lines = decodeTail(window);
+    const entries = [];
+    for (const line of lines) {
+        const data = line['data'];
+        if (data === null || typeof data !== 'object')
+            continue;
+        const record = data;
+        if (line['type'] === 'user/message') {
+            if (!isHumanSource(record['source']))
+                continue;
+            const text = textOfContent(record['content']);
+            if (text !== undefined)
+                entries.push({ role: 'user', text: text.slice(0, PREVIEW_CHARS), at: timeOf(line) });
+            continue;
+        }
+        if (line['type'] === 'assistant/message') {
+            const message = record['message'];
+            if (message === null || typeof message !== 'object')
+                continue;
+            const text = textOfContent(message['content']);
+            if (text !== undefined) {
+                entries.push({ role: 'assistant', text: text.slice(0, PREVIEW_CHARS), at: timeOf(line) });
+            }
+        }
+    }
+    return entries.slice(-limit);
+}