@deepseek-harness-tui/dsh-tui 0.10.2 → 0.11.1

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

@@ -1,6 +1,7 @@
 import Schema from '@deepseek-ai/schemastery';
 import { DEFAULT_STATUS_BAR, normalizePageMargin } from '../tuiDisplayPrefs.js';
 import { SHORTCUT_ACTIONS } from '../utils/keymap.js';
+import { editableConfig } from './compat/settings.js';
 export const name = 'dsh-tui';
 // `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
@@ -12,7 +13,7 @@ export const name = 'dsh-tui';
 // 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({
+export const Config = editableConfig(Schema.object({
     sessionId: Schema.string().required(false),
     // No schema defaults on the route: a `.default()` here would make an
     // unset key indistinguishable from an explicit cordis.yml choice and the
@@ -23,6 +24,10 @@ export const Config = Schema.object({
     cwd: Schema.string().required(false),
     workspace: Schema.string().required(false),
     effort: Schema.string().required(false),
+    effortDefault: Schema.string().required(false),
+    whale: Schema.boolean().default(true),
+    whaleIdle: Schema.boolean().default(true),
+    minimal: Schema.boolean().default(false),
     activity: Schema.boolean().default(true),
     activityFrames: Schema.string().required(false),
     contextBar: Schema.boolean().default(true),
@@ -42,6 +47,7 @@ export const Config = Schema.object({
     promptSessionLabel: Schema.boolean().default(false),
     expandEditor: Schema.boolean().default(true),
     smoothStreaming: Schema.boolean().default(true),
+    mermaidDiagrams: Schema.boolean().default(true),
     statusBar: Schema.object({
         compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
         model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
@@ -72,13 +78,18 @@ export const Config = Schema.object({
         approval: Schema.union(['ask', 'never']).required(false),
         permission: Schema.string().required(false),
     })).required(false),
-});
+}), [
+    'diffLayout', 'thinkingFold', 'toolBackground', 'scrollGutter', 'pageMargin',
+    'foldTerminalCommand', 'promptSessionLabel', 'expandEditor', 'smoothStreaming',
+    'mermaidDiagrams', 'effortDefault', 'statusBar', 'whale', 'whaleIdle', 'minimal',
+    'lang', 'fullscreen', 'terminalImages', 'shortcuts',
+]);
 /**
  * Start the interactive TUI front door, delegating to the JSX implementation
  * in `./plugin.tsx` (see its module doc for the full contract).
  * @param ctx - the plugin context.
  * @param config - the validated dsh-tui configuration.
- * @returns a promise settling when the TUI teardown completes.
+ * @returns a promise settling when the Loader entry has scheduled its runtime.
  */
 export async function apply(ctx, config) {
     // Upstream drift is NO LONGER spammed to stderr here: per-package
@@ -87,6 +98,22 @@ export async function apply(ctx, config) {
     // natural-language notice now renders in the logo header under the
     // startup tip (LogoV2 ← upstreamDriftSummary); CI keeps the hard gate
     // via scripts/verify-upstream-contract.ts.
-    const { apply: tuiApply } = await import('./plugin.js');
-    return tuiApply(ctx, config);
+    const { apply: tuiApply, handleStartupError } = await import('./plugin.js');
+    let disposed = false;
+    ctx.effect(() => () => { disposed = true; });
+    // Registry diagnostics can await the whole Loader. Do not make this Host
+    // row await the runtime in return. Let Host providers settle before starting
+    // a Cordis-owned child; the original row still owns volatile Config.
+    const loader = ctx.get('loader');
+    void (loader?.await() ?? ctx.fiber.await()).then(() => {
+        if (disposed)
+            return;
+        return ctx.plugin({
+            name: 'dsh-tui-runtime',
+            apply: (runtimeCtx) => tuiApply(runtimeCtx, config, ctx),
+        });
+    }).catch(error => {
+        if (!disposed)
+            handleStartupError(ctx, error);
+    });
 }

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

@@ -1,6 +1,7 @@
 import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { Config } from './index.js';
+import { type RuntimeConfig } from './compat/settings.js';
 import { render } from '../ui.js';
 /**
  * Extract the startup prompt from raw app argv. `--resume <session>` selects
@@ -22,7 +23,7 @@ export declare function initialPromptFromCmdlineArgs(args: readonly string[] | u
  */
 export type TuiHostMode = 'interactive' | 'invalid-explicit-launch' | 'headless-host';
 export declare function resolveTuiHostMode(stdoutIsTTY?: boolean, env?: NodeJS.ProcessEnv): TuiHostMode;
-export declare function apply(ctx: Context, config: Config): Promise<void>;
+export declare function apply(ctx: Context, runtimeConfig: RuntimeConfig<Config>, configOwner?: Context): Promise<void>;
 /**
  * Distinguish a user-driven exit from a cordis context teardown (issue #12).
  *
@@ -64,4 +65,6 @@ export declare function isExitResumable(deps: {
  * Exported for scripts/verify-shutdown-fallback.
  */
 export declare function finishExit(ctx: Context, instance: Awaited<ReturnType<typeof render>> | undefined, fullscreen: boolean, notice: string | undefined, stderrNotice: string | undefined, done: () => void): Promise<void>;
+/** Deferred runtime failures must restore the terminal and fail the process. */
+export declare function handleStartupError(ctx: Context, error: unknown): void;
 //# sourceMappingURL=plugin.d.ts.map

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;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAmDnC,OAAO,EAAE,MAAM,EAAkC,MAAM,UAAU,CAAA;AAgCjE;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAcxF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,yBAAyB,GAAG,eAAe,CAAA;AAErF,wBAAgB,kBAAkB,CAChC,WAAW,UAAgC,EAC3C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,WAAW,CASb;AAED,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgiDvE;AAoID;;;;;;;;;;;;;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;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE,MAAM,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAmFf"}
+{"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;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAA+D,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAwDtH,OAAO,EAAE,MAAM,EAAkC,MAAM,UAAU,CAAA;AAgCjE;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAcxF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,yBAAyB,GAAG,eAAe,CAAA;AAErF,wBAAgB,kBAAkB,CAChC,WAAW,UAAgC,EAC3C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,WAAW,CASb;AAED,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,WAAW,GAAE,OAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAgnDzH;AAmMD;;;;;;;;;;;;;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;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE,MAAM,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAmFf;AA4HD,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAIrE"}

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

@@ -4,6 +4,8 @@ import { SessionId } from '@deepseek-ai/dsh-session';
 import UserQuestionService from '@deepseek-ai/dsh-user-questions';
 import * as toolAskUser from '@deepseek-ai/dsh-tool-ask-user';
 import Schema from '@deepseek-ai/schemastery';
+import { Config } from './index.js';
+import { configValues, createSettingsScope, resolveSettingsNamespace } from './compat/settings.js';
 import { createChannel } from './channel.js';
 import { createChannelSceneOutlet } from './channel-scene-outlet.js';
 import { mountChannelUi } from './channel-ui.js';
@@ -26,19 +28,24 @@ import { migratePresetPref, readPresetPref } from '../presetPrefs.js';
 import { readEffortPref } from '../effortPrefs.js';
 import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, resolvePersistedRoute, runningPresetOf } from './presets.js';
 import { ensurePackagedPresets } from './packaged-presets.js';
+import { registerBundledPresets } from './bundled-presets.js';
 import { ensureLegacySessionEventTypes, snapshotLiveSessionEvents } from './compat/index.js';
 import { clearResumeTarget, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
+import { readHomePrefs } from '../homePrefs.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
 import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isStandaloneRuntime, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.js';
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
-import { DEFAULT_PAGE_MARGIN, DEFAULT_STATUS_BAR, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../tuiDisplayPrefs.js';
+import { DEFAULT_PAGE_MARGIN, DEFAULT_STATUS_BAR, applyMermaidDiagrams, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../tuiDisplayPrefs.js';
 import { draftComboConflicts, effectiveComboString, parseComboDraft, setKeymapOverrides, SHORTCUT_ACTIONS, } from '../utils/keymap.js';
 import { attachHerdrIntegration } from '../herdr.js';
 import { logMouseDebug } from '../utils/debug.js';
 import { Chat } from '../screens/Chat.js';
 import { openInjectChannel } from './inject-channel.js';
+import { startSessionMountHeartbeat } from './session-mount-heartbeat.js';
+import { reserveMount } from '../sessionMounts.js';
 import { getHostDialogStore } from './dialogs.js';
 import { getHostStatusStore } from './status.js';
+import { createActivityStore } from './activity-store.js';
 import { getHostToastStore } from './toast.js';
 import { getHostShortcuts } from './shortcuts.js';
 import { getHostThemes } from './themes.js';
@@ -106,7 +113,8 @@ export function resolveTuiHostMode(stdoutIsTTY = process.stdout.isTTY === true,
     const explicitTuiLaunch = env.DSH_TUI_LAUNCHER_VERSION !== undefined || isStandaloneRuntime();
     return explicitTuiLaunch ? 'invalid-explicit-launch' : 'headless-host';
 }
-export async function apply(ctx, config) {
+export async function apply(ctx, runtimeConfig, configOwner = ctx) {
+    const config = configValues(runtimeConfig);
     // /restart handoff diagnosis: the replacement process is marked by env and
     // logs its boot progress to ~/.dsh-tui/restart.log (ordinary launches stay
     // silent). First line lands before anything in this function can throw.
@@ -178,22 +186,23 @@ export async function apply(ctx, config) {
         ctx.logger.info('dsh-tui: non-interactive host detected (stdout is not a TTY); skipping the TUI frontend');
         return;
     }
-    // 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`);
+    // Validate settings before creating an agent or taking over the terminal.
+    const tuiSettingsNs = resolveSettingsNamespace(configOwner, Config);
+    // Modern hosts own a declarative registry; old hosts discover directories.
+    // A modern bundle failure must not silently fall back to obsolete files.
+    if (!await registerBundledPresets(ctx))
+        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)})`);
-    }
+        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)})`);
+        }
     // UI language resolution: DSH_TUI_LANG env var wins, then the
     // settings.yaml `dsh-tui.lang` user layer (applied once the settings
     // namespace registers below), then cordis.yml `lang`, then the
@@ -398,6 +407,14 @@ export async function apply(ctx, config) {
         // Opening a persisted TUI session is an explicit ownership action too.
         // Older TUI versions only wrote the Session log, so attaching on every
         // startup repairs those durable-but-ungrouped sessions idempotently.
+        //
+        // This is ALSO how a workspace enters the rail: `resolveByPath(cwd) ??
+        // create(cwd)` mints the durable record for the directory this terminal
+        // was launched in, so the session screen lists every directory a TUI has
+        // ever started in. The ledger is DSH's own workspace store, so the Web UI
+        // reads the same records. There is deliberately no rail-side "add a
+        // workspace" control any more: a terminal's launch directory is the whole
+        // registration story.
         const attached = await attachSessionToWorkspace(ctx, meta.cwd, agent.session.id);
         if (!attached) {
             ctx.logger.warn(`dsh-tui: session "${agent.session.id}" has no workspace ownership because workspaceRegistry is not mounted`);
@@ -413,8 +430,23 @@ export async function apply(ctx, config) {
     // validated startup resolution, on resume the route the target session's
     // own records carry (a complete cordis.yml pin wins over them).
     const displayRoute = createdRoute ?? startupRoute;
+    // Read side of the activity projection: filled by the working-activity
+    // plugin's unit, read by the status line. Created BEFORE the channel on
+    // purpose — `createChannel` binds its agent synchronously while it is still
+    // being constructed, and that bind seeds this store (see `seedActivity`
+    // below), so a store declared after the channel is still in its temporal
+    // dead zone when the first seed arrives and takes the whole boot down with
+    // it. One store per process; a composition without the projection service
+    // simply leaves it empty. `activity: false` is a static config-time switch
+    // (the runtime `/activity` command only changes the preset), so a hidden
+    // line attaches nothing at all — no feed, no 500ms tick.
+    const activityStore = createActivityStore(ctx, config.activity !== false);
     const rawChannel = createChannel(ctx, agent, {
         model: displayRoute.model,
+        // The activity projection only pushes on change; read the current value as
+        // soon as this session binds so a resumed or reattached session renders its
+        // line immediately instead of waiting for the next event.
+        seedActivity: session => activityStore.seed(session),
         // A RESUMED session keeps its persisted header cwd (issue #96 review):
         // pre-upgrade sessions recorded the launch directory, and re-resolving
         // from the current launch directory would split @ expansion / file
@@ -488,8 +520,11 @@ export async function apply(ctx, config) {
     // Root page-margin store: the PageMargin inset box sits ABOVE Chat, so
     // the channel version bump (which re-renders everything below Chat)
     // cannot drive it. Seed the store from config before the tree mounts;
-    // applyDisplay below mirrors every settings change into it live.
+    // applyDisplay below mirrors every settings change into it live. The
+    // mermaid switch rides the same kind of store (Markdown is memoized by
+    // content, so no prop reaches the diagram component).
     applyPageMargin(config.pageMargin);
+    applyMermaidDiagrams(config.mermaidDiagrams);
     // Plugin toasts ride the channel's own notification surface: the runtime
     // already sanitized/rate-limited the delivery, the sink only forwards.
     // Without the extensions row (tuiToast absent) plugin toasts are dropped
@@ -527,18 +562,11 @@ export async function apply(ctx, config) {
         resolveSettingsReady = () => resolve();
         setTimeout(resolve, 300);
     });
-    // Register the dsh-tui settings namespace so the /settings screen can
-    // edit it (the section below was '命名空间未注册' without this): the
-    // user layer in settings.yaml wins over cordis.yml's diffLayout, and
-    // watch() lands commits on the live channel — no recompose needed.
+    // Old hosts register a settings.yaml scope. 0.1.7 projects the plugin's
+    // volatile Config fields instead; both paths apply edits without remounting.
     ctx.inject(['settings'], (settingsCtx) => {
-        // alpha.2 removed the `settingsNamespace()` brand helper: register() now
-        // takes the raw string and validates it itself, while rc.2 still wants the
-        // branded handle. Brands are type-only, so the constant cast compiles
-        // against both lines and the runtime value is identical ('dsh-tui' always
-        // satisfied the namespace pattern).
-        const tuiSettingsNs = 'dsh-tui';
-        const scope = settingsCtx.settings.register(tuiSettingsNs, Schema.object({
+        // Loader targets the Config owner's fiber, not the injected child fiber.
+        const scope = createSettingsScope(configOwner, settingsCtx.settings, tuiSettingsNs, Schema.object({
             diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
             thinkingFold: Schema.union(['preview', 'full']).default('preview'),
             toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
@@ -561,6 +589,8 @@ export async function apply(ctx, config) {
             expandEditor: Schema.boolean(),
             // Same no-default rule: applyDisplay resolves `?? config.smoothStreaming ?? true`.
             smoothStreaming: Schema.boolean(),
+            // Same no-default rule: applyDisplay resolves `?? config.mermaidDiagrams ?? true`.
+            mermaidDiagrams: Schema.boolean(),
             // No default on purpose: unset keeps the boot chain decisive
             // (applyEffortDefault hands `undefined` to channel.setDefaultEffort,
             // which resolves cordis.yml `effort` → effort.json → adapter default).
@@ -606,7 +636,10 @@ export async function apply(ctx, config) {
             // action (see the keymap utility). Unset keeps the default binding
             // and the section's format() shows the effective combos.
             shortcuts: Schema.object(Object.fromEntries(SHORTCUT_ACTIONS.map(action => [action.id, Schema.string().required(false)]))).required(false),
-        }));
+        }), () => {
+            const current = configValues(runtimeConfig);
+            return { ...current, lang: isLang(current.lang) ? current.lang : undefined };
+        });
         const applyLayout = (value) => {
             if (!shadow)
                 channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
@@ -663,15 +696,15 @@ export async function apply(ctx, config) {
             channel.setPromptSessionLabel(value.promptSessionLabel ?? config.promptSessionLabel ?? false);
             channel.setExpandEditor(value.expandEditor ?? config.expandEditor ?? true);
             channel.setSmoothStreaming(value.smoothStreaming ?? config.smoothStreaming ?? true);
+            applyMermaidDiagrams(value.mermaidDiagrams ?? config.mermaidDiagrams);
             channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
-        // Shortcut overrides resolve per action: settings user layer wins over
-        // cordis.yml's `shortcuts` (same precedence as every other field);
-        // unset everywhere keeps the registry default. Applied live into the
-        // keymap module — the very next keypress matches the new combos.
+        // Legacy user scopes layer over cordis.yml. Modern Config is already
+        // resolved: an unset action must not revive its startup override.
+        // Applied live so the very next keypress matches the new combos.
         const applyShortcuts = (value) => {
             const userLayer = value.shortcuts ?? {};
-            const configLayer = config.shortcuts ?? {};
+            const configLayer = scope.legacy ? config.shortcuts ?? {} : {};
             const merged = {};
             for (const action of SHORTCUT_ACTIONS) {
                 const user = userLayer[action.id];
@@ -720,7 +753,11 @@ export async function apply(ctx, config) {
         // not an explicit undefined), and the later watch commit (fullscreen
         // back to undefined) leaves the fullscreen decision unchanged.
         const bootSettings = scope.get();
-        const fullscreenMigration = planFullscreenFactoryMigration(bootSettings.fullscreen, readAppliedMigrations());
+        // The old migration applies only to the separate user layer. A modern
+        // profile's explicit inline Config must never be mistaken for that layer.
+        const fullscreenMigration = scope.legacy
+            ? planFullscreenFactoryMigration(bootSettings.fullscreen, readAppliedMigrations())
+            : 'done';
         void commitFullscreenFactoryMigration(fullscreenMigration, {
             unset: () => settingsCtx.settings.mutate(tuiSettingsNs, [{ op: 'unset', path: ['fullscreen'] }]),
         });
@@ -730,7 +767,7 @@ export async function apply(ctx, config) {
         const { fullscreen: staleFullscreen, ...migratedSettings } = bootSettings;
         apply(fullscreenMigration === 'unset' ? migratedSettings : bootSettings);
         let lastTerminalImages = bootSettings.terminalImages ?? config.terminalImages ?? true;
-        scope.watch(next => {
+        settingsCtx.effect(() => scope.watch(next => {
             apply(next);
             if (typeof next.fullscreen === 'boolean' && next.fullscreen !== bootedFullscreen) {
                 notifyChannel(t('settings-fullscreen-restart'), { color: 'warning' });
@@ -740,7 +777,7 @@ export async function apply(ctx, config) {
                 channel.notify(t('settings-terminal-images-restart'), { color: 'warning' });
             }
             lastTerminalImages = terminalImages;
-        });
+        }));
         resolveSettingsReady?.();
     });
     // The /settings screen's own section: the dsh-tui namespace comes from
@@ -813,6 +850,12 @@ export async function apply(ctx, config) {
             hintEn: d => `Fold/unfold the goal/todo panel. Default: ${d}.`,
             hintZh: d => `折叠/展开目标与待办面板。默认 ${d}。`,
         },
+        questionFold: {
+            label: 'Question panel fold shortcut',
+            zh: '提问面板折叠快捷键',
+            hintEn: d => `Fold/unfold the pending question panel. Default: ${d}.`,
+            hintZh: d => `折叠/展开等待回答的提问面板。默认 ${d}。`,
+        },
         expandEditor: {
             label: 'Fullscreen editor shortcut',
             zh: '全屏草稿编辑快捷键',
@@ -855,7 +898,7 @@ export async function apply(ctx, config) {
     {
         const settingsSections = getHostSettingsSections(ctx.get('tuiSettingsSections')) ?? getLocalSettingsSectionsHost(ctx);
         const unregister = settingsSections.register({
-            ns: 'dsh-tui',
+            ns: tuiSettingsNs,
             title: 'dsh-tui',
             groups: [
                 { id: 'status-bar', title: 'Status bar', descriptions: { zh: '底栏设置' } },
@@ -1038,6 +1081,18 @@ export async function apply(ctx, config) {
                         return String(typeof value === 'boolean' ? value : config.smoothStreaming !== false);
                     },
                 },
+                {
+                    path: ['mermaidDiagrams'],
+                    label: 'Mermaid diagrams',
+                    descriptions: { zh: 'Mermaid 图表' },
+                    hint: 'Render ```mermaid fences in replies as box-drawing diagrams (flowchart, sequence, state, class, ER, pie, mindmap, timeline, gitGraph). Diagrams wider than the terminal, or of an unsupported type, keep the fenced source. Applies immediately. On by default.',
+                    hintDescriptions: { zh: '把回复中的 ```mermaid 代码块画成字符图（flowchart、sequence、state、class、ER、pie、mindmap、timeline、gitGraph）。比终端宽或类型不支持的图保留源码。立即生效。默认开启。' },
+                    kind: 'boolean',
+                    format(value) {
+                        // Unset in settings.yaml: the effective default is on.
+                        return String(typeof value === 'boolean' ? value : config.mermaidDiagrams !== false);
+                    },
+                },
                 {
                     path: ['recapOnOpen'],
                     label: 'Auto recap on open',
@@ -1429,17 +1484,37 @@ export async function apply(ctx, config) {
     // BEFORE creating Chat: the element must see the same bootedFullscreen the
     // root tree resolves after settingsReady below.
     await settingsReady;
+    /**
+     * One-shot workspace-home landing.
+     *
+     * Only an ORDINARY launch is eligible: an explicit resume (`--resume` /
+     * `-c` / the launcher's remembered target), an explicit workspace target, and
+     * a first prompt all mean the user already said where they want to be, and
+     * covering that with a browser would be the TUI second-guessing them. The
+     * `seen` marker is written when the screen is dismissed (see `closeHome`),
+     * so a process that dies before the first frame does not consume it.
+     */
+    const homeSeen = readHomePrefs().seen === true;
+    const openHomeOnBoot = !homeSeen
+        && launchSessionId === undefined
+        && requestedWorkspace === undefined
+        && initialPromptFromCmdlineArgs(process.argv.slice(2)) === '';
     const chat = React.createElement(Chat, {
         channel,
         renderScene: createChannelSceneOutlet(() => rawChannel.pluginScene),
         questionStore,
         approvalStore,
         injectControllerRef,
+        openHomeOnBoot,
         // The dsh-tui-extensions row's services (managed dialogs, status line,
         // shortcuts). Soft-consumed: absent the row (stale patch, bare embed),
         // Chat falls back to inert stores and no shortcut registry.
         extensionDialogs: getHostDialogStore(ctx.get('tuiDialogs')),
         extensionStatus: getHostStatusStore(ctx.get('tuiStatus')),
+        // The working line's semantics belong to the dsh-working-activity plugin's
+        // session projection; this store is the read side of that seam, so the TUI
+        // no longer runs a second activity tracker of its own.
+        activityStore,
         extensionShortcuts: getHostShortcuts(ctx.get('tuiShortcuts')),
         themeHost,
         // Full-screen surfaces inside Chat — the trajectory scene and the session
@@ -1555,6 +1630,15 @@ export async function apply(ctx, config) {
     if (injectChannel) {
         ctx.effect(() => () => injectChannel.close());
     }
+    // Cross-process session mounting: publish the sessions this process has
+    // mounted so another TUI (a different terminal process on the same machine)
+    // can see them as occupied and refuse to mount the same log. Two processes
+    // driving one session would interleave writes into a single append-only
+    // transcript, so this is the guard that makes multi-process TUI use safe.
+    // Registered on the same teardown funnel as everything else: the disposer
+    // stops the heartbeat and removes the claim, so a clean exit frees its
+    // sessions at once while a killed process is reclaimed by liveness.
+    ctx.effect(() => startSessionMountHeartbeat(ctx));
     // Check in the background so registry latency never delays the first frame.
     // A failed/offline check is intentionally silent; the manual `/update`
     // command remains available regardless of network access.
@@ -1627,6 +1711,40 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
         if (existing !== undefined) {
             return { agent: existing, agentPreset: runningPresetOf(existing.session) };
         }
+        // The launch-time counterpart of the in-session `/resume` claim
+        // (`channel/session-resume.ts`), and it has to happen before ANY await:
+        // without it `dsh-tui --resume <id>` mounts the log purely because the user
+        // asked for it, so a second terminal doing the same joins the first and
+        // both interleave writes into one append-only transcript. The mount
+        // publisher cannot cover this — it publishes the set, it never refuses a
+        // mount — so the claim is the only place the refusal can come from.
+        //
+        // Every failure refuses. "The ledger was busy" and "the ledger could not be
+        // read" are not evidence that the session is free, and a boot that guesses
+        // the wrong way here interleaves two writers into one append-only log —
+        // the one outcome nothing downstream can repair. A genuinely read-only home
+        // therefore costs a `--resume` refusal, which is loud and fixable, instead
+        // of silent corruption.
+        const reserved = await reserveMount(requestedSessionId);
+        if (!reserved.ok) {
+            if (reserved.reason === 'occupied') {
+                throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": it is mounted by another TUI terminal ` +
+                    `(pid ${reserved.holders[0] ?? 0}) — two processes driving one session log would corrupt it. ` +
+                    'Close that terminal, or drop --resume to start a fresh session.');
+            }
+            if (reserved.reason === 'busy') {
+                throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": another process is holding the ` +
+                    'session mount ledger right now, so its occupancy could not be checked. Retry in a moment.');
+            }
+            throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": its occupancy could not be verified ` +
+                `(${reserved.detail}). Refusing rather than risk two processes writing one session log. ` +
+                'If that file is damaged, remove it (and the matching .lock) while no other TUI is running, ' +
+                'or drop --resume to start a fresh session.');
+        }
+        // The reservation spans the awaits below: the agent only appears in the
+        // registry once `agents.resume` returns, and a publisher beat landing in
+        // between would otherwise drop the claim this boot just committed.
+        const reservation = reserved.reservation;
         try {
             // Compat boundary: register vouched-for legacy event types before the
             // strict read path (issue #153) — same seam as the /resume picker,
@@ -1659,6 +1777,9 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
             };
         }
         catch (error) {
+            // A claim says "this process is driving the log". A resume that never
+            // mounted must not leave one behind for a peer to see and refuse.
+            reservation.abandon();
             // A launch-time --resume is an explicit request: silently substituting a
             // fresh session presents a cold conversation as the resumed one (the
             // "resume did nothing" failure mode — the warn below never reached a
@@ -1669,6 +1790,11 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
                 'the stored log is unreadable or corrupt; no fresh session was started instead. ' +
                 'Drop --resume to start fresh, or repair the session log first.', { cause: error });
         }
+        finally {
+            // The reservation only has to outlive the mount. From here the agent is
+            // in the registry, which is what the publisher derives the set from.
+            reservation.settle();
+        }
     }
     const sessionId = SessionId(randomUUID());
     const presetPref = configuredPreset === undefined ? readPresetPref() : undefined;
@@ -1686,21 +1812,38 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
     if (rejected !== undefined) {
         ctx.logger.warn(`dsh-tui: model route ${rejected.provider}/${rejected.model} is not advertised by provider "${rejected.provider}"; falling back to ${route.provider}/${route.model}`);
     }
-    const created = await ctx.agents.create({
-        sessionId,
-        meta: {
-            ...meta,
-            // Durable header value: a later resume re-mounts exactly this preset.
-            ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }),
-        },
-        agentOptions: route,
-        ...(composed.setup === undefined ? {} : { setup: composed.setup }),
-    }).catch((error) => {
+    // Reserve the fresh id before the factory, exactly like the in-session
+    // creates: from the moment `agents.create` returns this process holds the
+    // only write handle on a log the publisher has not named yet. A brand-new id
+    // cannot conflict, so a refusal is only warned about — it costs
+    // announcement, not correctness — but the reservation is what keeps the gap
+    // between the create and the next beat from being open.
+    const bootReserved = await reserveMount(String(sessionId));
+    if (!bootReserved.ok && bootReserved.reason !== 'occupied') {
+        ctx.logger.warn(`dsh-tui: could not announce the new session in the mount ledger: ${bootReserved.reason}`);
+    }
+    const bootReservation = bootReserved.ok ? bootReserved.reservation : undefined;
+    let created;
+    try {
+        created = await ctx.agents.create({
+            sessionId,
+            meta: {
+                ...meta,
+                // Durable header value: a later resume re-mounts exactly this preset.
+                ...(composed.agentPreset === undefined ? {} : { agentPreset: composed.agentPreset }),
+            },
+            agentOptions: route,
+            ...(composed.setup === undefined ? {} : { setup: composed.setup }),
+        });
+    }
+    catch (error) {
+        bootReservation?.abandon();
         // Fail loud with the reason on stderr — a dead TUI with no message is
         // the worst outcome for a misconfigured leaf (unknown provider/model).
         const message = error instanceof Error ? error.message : String(error);
         throw new Error(`dsh-tui: failed to create agent (provider=${route.provider}, model=${route.model}): ${message}`, { cause: error });
-    });
+    }
+    bootReservation?.settle();
     return { agent: created.agent, handle: created, agentPreset: composed.agentPreset, route };
 }
 /**
@@ -1947,6 +2090,11 @@ function runUpdate(ctx, profile, sessionId, targetVersion) {
         });
     });
 }
+/** Deferred runtime failures must restore the terminal and fail the process. */
+export function handleStartupError(ctx, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    void finishExit(ctx, undefined, lastBootedFullscreen ?? true, undefined, `dsh-tui startup failed: ${message}`, () => disposeRootAndExit(ctx, 1));
+}
 /**
  * Dispose the whole application before process exit, with a bounded fallback.
  * Mirrors the deleted dsh-tui front-door exit semantics.

package/lib/types/dsh-adapter/preset-resolution.d.ts

@@ -46,4 +46,12 @@ export declare function resolveRecordedPreset(session: {
  * a broken exact preset can never be mistaken for an unknown id.
  */
 export declare function resolveCompatiblePreset(presets: AgentPresetsLike, requested?: string): Promise<AgentPresetInfo>;
+/**
+ * The i18n dictionary id a roster preset's localized display text resolves
+ * under. The 0.1.2 line renamed the official PTC preset `code` → `ptc`, but
+ * the dictionary keys still use the legacy `code` id (`preset-name-code` /
+ * `preset-desc-code`), so the `/preset` picker's display lookup must bridge
+ * the roster id back. User-authored ids pass through untouched.
+ */
+export declare function presetDisplayId(id: string): string;
 //# sourceMappingURL=preset-resolution.d.ts.map

package/lib/types/dsh-adapter/preset-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preset-resolution.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/preset-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,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,2EAA2E;AAC3E,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,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,CASrB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B"}
+{"version":3,"file":"preset-resolution.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/preset-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,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,2EAA2E;AAC3E,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,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,CASrB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAElD"}

package/lib/types/dsh-adapter/preset-resolution.js

@@ -40,3 +40,13 @@ export async function resolveCompatiblePreset(presets, requested) {
         return presets.resolve(fallback);
     return presets.resolve(requested);
 }
+/**
+ * The i18n dictionary id a roster preset's localized display text resolves
+ * under. The 0.1.2 line renamed the official PTC preset `code` → `ptc`, but
+ * the dictionary keys still use the legacy `code` id (`preset-name-code` /
+ * `preset-desc-code`), so the `/preset` picker's display lookup must bridge
+ * the roster id back. User-authored ids pass through untouched.
+ */
+export function presetDisplayId(id) {
+    return id === 'ptc' ? 'code' : id;
+}