@deepseek-harness-tui/dsh-tui 0.8.8 → 0.9.0

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

@@ -9,7 +9,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import Schema from '@deepseek-ai/schemastery';
 import type { SessionModeSpec } from '../sessionModes.js';
-import { type StatusBarConfig, type ToolBackground } from '../tuiDisplayPrefs.js';
+import { type ScrollGutterMode, type StatusBarConfig, type ToolBackground } from '../tuiDisplayPrefs.js';
 export declare const name = "dsh-tui";
 export declare const inject: string[];
 /**
@@ -53,7 +53,11 @@ export interface Config {
      *  `ctx used/window` readout) in the status footer; off hides that row
      *  while the status/mode lines stay (issue #29). */
     contextBar?: boolean;
-    /** Run in the terminal's alternate screen (Claude Code fullscreen layout). */
+    /** Run in the terminal's alternate screen (Claude Code fullscreen layout).
+     *  Defaults to true — the fullscreen surface is the more complete one
+     *  (mouse, timeline rail, scrollbar gutter, selection copy), so fresh
+     *  installs start there; cordis.yml `fullscreen: false` or a /settings
+     *  toggle opts back into the inline main-screen layout. */
     fullscreen?: boolean;
     /** UI language: `en` / `zh`. When absent, the `DSH_TUI_LANG` env var wins,
      *  then the `/lang` choice persisted in `~/.dsh-tui/lang.json`, then `zh`. */
@@ -73,6 +77,10 @@ export interface Config {
     thinkingFold?: 'preview' | 'full';
     /** Tool-card background strength; defaults to no added background. */
     toolBackground?: ToolBackground;
+    /** What the fullscreen transcript's right gutter shows (settings
+     *  `dsh-tui.scrollGutter`): `timeline` turn rail (default), `scrollbar`
+     *  proportional thumb, or `hidden`. */
+    scrollGutter?: ScrollGutterMode;
     /** Status-footer field visibility and compact presentation preferences. */
     statusBar?: Partial<StatusBarConfig>;
     /** Shift+Tab session-mode cycle (array order IS the cycle order; index 0

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;AACzD,OAAO,EAAsB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAErG,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;;6DAEyD;IACzD,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC;;8EAE0E;IAC1E,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,sEAAsE;IACtE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACpC;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA8ChC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASvE"}
+{"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;AACzD,OAAO,EAAsB,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE5H,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;;;;+DAI2D;IAC3D,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;kFAC8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;gCAG4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf;;6DAEyD;IACzD,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC;;8EAE0E;IAC1E,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IACjC,sEAAsE;IACtE,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B;;2CAEuC;IACvC,YAAY,CAAC,EAAE,gBAAgB,CAAA;IAC/B,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACpC;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CAiDhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASvE"}

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

@@ -25,12 +25,13 @@ export const Config = Schema.object({
     activity: Schema.boolean().default(true),
     activityFrames: Schema.string().required(false),
     contextBar: Schema.boolean().default(true),
-    fullscreen: Schema.boolean().default(false),
+    fullscreen: Schema.boolean().default(true),
     lang: Schema.string().required(false),
     preset: Schema.string().required(false),
     diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
     thinkingFold: Schema.union(['preview', 'full']).default('preview'),
     toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
+    scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
     statusBar: Schema.object({
         compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
         model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
@@ -42,6 +43,8 @@ export const Config = Schema.object({
         tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
         gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
         sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
+        sessionId: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionId),
+        goal: Schema.boolean().default(DEFAULT_STATUS_BAR.goal),
         mode: Schema.boolean().default(DEFAULT_STATUS_BAR.mode),
         contextBar: Schema.boolean().default(DEFAULT_STATUS_BAR.contextBar),
         activity: Schema.boolean().default(DEFAULT_STATUS_BAR.activity),

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

@@ -1,15 +1,6 @@
 import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { Config } from './index.js';
-/**
- * Claude Code style interactive TUI front door for DeepSeek Harness agents.
- *
- * The plugin attaches to (or creates) one agent, renders a chat transcript
- * from the agent's session log and live `session/event` records, and submits
- * user turns through `Agent.followup`. It is a client-driver front door like
- * `dsh-jsonrpc`: the surrounding `cordis.yml` supplies the agent spine, the
- * LLM adapter, and the tool plugins.
- */
 export declare function apply(ctx: Context, config: Config): Promise<void>;
 /**
  * Distinguish a user-driven exit from a cordis context teardown (issue #12).

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;AAqCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA60BvE;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;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA6DnC,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAm8BvE;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

@@ -23,9 +23,10 @@ import { clearResumeTarget, writeResumeTarget } from '../sessionHistory.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
 import { checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersionNewer, resolveDshProfileName, resolveTuiUpdateTarget, updateTuiAndRestart } from '../update.js';
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
-import { DEFAULT_STATUS_BAR, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
+import { DEFAULT_STATUS_BAR, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
 import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
 import { attachHerdrIntegration } from '../herdr.js';
+import { logMouseDebug } from '../utils/debug.js';
 import { Chat } from '../screens/Chat.js';
 import { getHostDialogStore } from './dialogs.js';
 import { getHostStatusStore } from './status.js';
@@ -48,6 +49,19 @@ import { CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, supportsTabStatus, wrapForMult
  * `dsh-jsonrpc`: the surrounding `cordis.yml` supplies the agent spine, the
  * LLM adapter, and the tool plugins.
  */
+/**
+ * Fullscreen decision latched across host recomposes. The launcher disposes
+ * and re-mounts the plugin tree (teardown → apply() runs again) — a fresh
+ * apply() re-resolves `bootedFullscreen` from cordis config, and the
+ * settings user layer (settings.yaml) can arrive after the 300ms
+ * `settingsReady` bound when the recompose is also re-mounting the settings
+ * service. The tree would then mount INLINE and `fullscreenFrozen` would
+ * swallow the late application — the app lands on the main screen
+ * ("exited fullscreen", dead mouse, unpinned input) until restart. A
+ * session that already mounted fullscreen must never regress on a
+ * recompose: latch the decision.
+ */
+let lastBootedFullscreen;
 export async function apply(ctx, config) {
     if (!process.stdout.isTTY) {
         throw new Error('dsh-tui requires an interactive terminal (stdout must be a TTY).');
@@ -329,9 +343,31 @@ export async function apply(ctx, config) {
         diffLayout: config.diffLayout,
         thinkingFold: config.thinkingFold,
         toolBackground: config.toolBackground,
+        scrollGutter: config.scrollGutter,
         statusBar: config.statusBar,
         handle,
     });
+    // Fullscreen layout decision: the settings user layer (edited through the
+    // /settings screen) overrides cordis.yml when set. The settings injection
+    // below resolves it synchronously when the host settings service is up —
+    // i.e. before the tree mounts. `fullscreenFrozen` latches at mount: the
+    // exit funnel and the AlternateScreen wrap must keep reading the mode this
+    // session ACTUALLY runs, never a mid-session edit meant for the next boot
+    // (swapping layouts requires re-mounting the whole tree).
+    let bootedFullscreen = config.fullscreen === true;
+    let fullscreenFrozen = false;
+    // The settings service may come up AFTER this plugin's apply: the cordis
+    // inject callback defers until the service registers, so the first
+    // `apply(scope.get())` below can land after the mount (field report: the
+    // /settings fullscreen toggle never took effect — the frozen latch below
+    // swallowed the late callback and bootedFullscreen stayed false). The
+    // mount must therefore WAIT for the first settings application (bounded —
+    // a bare embedder without a settings service must not deadlock).
+    let resolveSettingsReady;
+    const settingsReady = new Promise(resolve => {
+        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
@@ -341,6 +377,7 @@ export async function apply(ctx, config) {
             diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
             thinkingFold: Schema.union(['preview', 'full']).default('preview'),
             toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
+            scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
             statusBar: Schema.object({
                 compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
                 model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
@@ -352,6 +389,8 @@ export async function apply(ctx, config) {
                 tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
                 gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
                 sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
+                sessionId: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionId),
+                goal: Schema.boolean().default(DEFAULT_STATUS_BAR.goal),
                 mode: Schema.boolean().default(DEFAULT_STATUS_BAR.mode),
                 contextBar: Schema.boolean().default(DEFAULT_STATUS_BAR.contextBar),
                 activity: Schema.boolean().default(DEFAULT_STATUS_BAR.activity),
@@ -367,6 +406,9 @@ export async function apply(ctx, config) {
             // the effective language (see the section's format below) and lets
             // cordis.yml / lang.json keep their precedence.
             lang: Schema.union(['zh', 'en']),
+            // Same no-default rule: unset keeps cordis.yml's `fullscreen`
+            // decisive; set overrides it from the next boot on.
+            fullscreen: Schema.boolean(),
         }));
         const applyLayout = (value) => {
             channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
@@ -377,6 +419,15 @@ export async function apply(ctx, config) {
         const applyMinimal = (value) => {
             channel.setMinimal(value.minimal ?? false);
         };
+        // Fullscreen: only meaningful before the tree mounts (the freeze latch
+        // above). A later doc change (mid-session /settings edit) is persisted
+        // by the service and picked up on the next boot; the watch below says
+        // so with a notify.
+        const applyFullscreen = (value) => {
+            if (!fullscreenFrozen && typeof value.fullscreen === 'boolean') {
+                bootedFullscreen = value.fullscreen;
+            }
+        };
         // The /settings language field writes `lang` through the settings
         // service (user layer): apply it live and mirror it to lang.json so
         // the /lang command and next-boot resolution agree. DSH_TUI_LANG
@@ -393,6 +444,7 @@ export async function apply(ctx, config) {
         const applyDisplay = (value) => {
             channel.setThinkingFold(value.thinkingFold ?? config.thinkingFold ?? 'preview');
             channel.setToolBackground(normalizeToolBackground(value.toolBackground ?? config.toolBackground));
+            channel.setScrollGutter(normalizeScrollGutter(value.scrollGutter ?? config.scrollGutter));
             channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
         const apply = (next) => {
@@ -401,11 +453,16 @@ export async function apply(ctx, config) {
             applyMinimal(next);
             applyLang(next);
             applyDisplay(next);
+            applyFullscreen(next);
         };
         apply(scope.get());
         scope.watch(next => {
             apply(next);
+            if (typeof next.fullscreen === 'boolean' && next.fullscreen !== bootedFullscreen) {
+                channel.notify(t('settings-fullscreen-restart'), { color: 'warning' });
+            }
         });
+        resolveSettingsReady?.();
     });
     // The /settings screen's own section: the dsh-tui namespace comes from
     // the settings registration above, and the declared selects write `lang`
@@ -436,6 +493,22 @@ export async function apply(ctx, config) {
                         return value === undefined || value === null ? getLang() : String(value);
                     },
                 },
+                {
+                    path: ['fullscreen'],
+                    label: 'Fullscreen mode',
+                    descriptions: { zh: '全屏模式' },
+                    // 故意不用 "alt-screen" 这类终端术语：读者要的是行为差异。鼠标
+                    // 两种模式都可用（整屏页面自带鼠标跟踪），别让描述暗示关掉就
+                    // 没有鼠标——最常见的误解。长度对齐既有最长 hint（单行假设）。
+                    hint: 'On: app takes the whole screen (vim/less style), in-app mouse. Off: native scrollback; full-page screens keep the mouse. Restart to apply.',
+                    hintDescriptions: { zh: '开启：接管整个终端（同 vim/less），应用内鼠标；关闭：终端原生滚动选择；整屏页两种模式都有鼠标。重启生效。' },
+                    kind: 'boolean',
+                    format(value) {
+                        // Unset in settings.yaml: show what THIS session booted with
+                        // (the cordis.yml resolution) instead of a misleading false.
+                        return value === undefined || value === null ? String(bootedFullscreen) : String(value);
+                    },
+                },
                 {
                     path: ['diffLayout'],
                     label: 'Diff layout',
@@ -474,6 +547,19 @@ export async function apply(ctx, config) {
                         { value: 'strong', label: 'Strong', descriptions: { zh: '明显' } },
                     ],
                 },
+                {
+                    path: ['scrollGutter'],
+                    label: 'Transcript gutter',
+                    descriptions: { zh: '转录边栏' },
+                    hint: 'Right gutter of the fullscreen transcript: per-turn timeline ticks, a proportional scrollbar, or nothing.',
+                    hintDescriptions: { zh: '全屏转录区右侧边栏：按轮次的时间线节点、比例滚动条，或留空。' },
+                    kind: 'select',
+                    options: [
+                        { value: 'timeline', label: 'Turn timeline', descriptions: { zh: '轮次时间线' } },
+                        { value: 'scrollbar', label: 'Scrollbar', descriptions: { zh: '滚动条' } },
+                        { value: 'hidden', label: 'Hidden', descriptions: { zh: '隐藏' } },
+                    ],
+                },
                 {
                     path: ['statusBar', 'compact'],
                     label: 'Compact status bar',
@@ -564,6 +650,24 @@ export async function apply(ctx, config) {
                     group: 'status-bar',
                     kind: 'boolean',
                 },
+                {
+                    path: ['statusBar', 'sessionId'],
+                    label: 'Show session id',
+                    descriptions: { zh: '显示会话 ID' },
+                    hint: 'Show the short session id (# + first 8 chars) — it matches the session log filename for --resume.',
+                    hintDescriptions: { zh: '显示短会话 ID（# + 前 8 位）——与日志文件名对应，方便 --resume 定位。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'goal'],
+                    label: 'Show goal status',
+                    descriptions: { zh: '显示 Goal 状态' },
+                    hint: 'Show a compact goal chip (phase glyph + rounds) in the status footer while a goal exists.',
+                    hintDescriptions: { zh: '存在 Goal 时，在底部状态栏显示紧凑的 Goal 状态（阶段符号与轮次）。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
                 {
                     path: ['statusBar', 'mode'],
                     label: 'Show session mode',
@@ -695,7 +799,7 @@ export async function apply(ctx, config) {
             if (error !== undefined) {
                 const message = error instanceof Error ? error.message : String(error);
                 ctx.logger.error(`dsh-tui: exit after error: ${message}`);
-                void finishExit(ctx, instance, config.fullscreen === true, undefined, `dsh-tui crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
+                void finishExit(ctx, instance, bootedFullscreen, undefined, `dsh-tui crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
                 return;
             }
             if (updateRequested) {
@@ -705,7 +809,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, updateTargetVersion));
+                void finishExit(ctx, instance, bootedFullscreen, '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),
@@ -729,10 +833,19 @@ export async function apply(ctx, config) {
             const hint = resumable
                 ? `Resume with the command below:\n${resumeCommand(profile, channel.agentId)}`
                 : undefined;
-            void finishExit(ctx, instance, config.fullscreen === true, hint, undefined, () => disposeRootAndExit(ctx, 0));
+            void finishExit(ctx, instance, bootedFullscreen, hint, undefined, () => disposeRootAndExit(ctx, 0));
         },
     });
     const handleExit = funnel.handleExit;
+    // Chat's `fullscreen` prop must match the root wrap below, or the
+    // full-screen surfaces inside Chat (session browser, settings, trajectory,
+    // subagent pages) would nest a SECOND <AlternateScreen> — whose unmount
+    // writes DEC 1049 exit and drops the whole app back to the main screen
+    // (the stable /resume→Esc "exited fullscreen" repro). The prop is captured
+    // when the element is created, so wait for the settings first-application
+    // BEFORE creating Chat: the element must see the same bootedFullscreen the
+    // root tree resolves after settingsReady below.
+    await settingsReady;
     const chat = React.createElement(Chat, {
         channel,
         questionStore,
@@ -746,7 +859,7 @@ export async function apply(ctx, config) {
         // 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,
+        fullscreen: bootedFullscreen,
         onExit: () => handleExit(),
         // Only a `dsh --profile <name>` launch has a profile installation for
         // `/update` to act on; source checkouts and `--config` overlays get the
@@ -791,12 +904,28 @@ export async function apply(ctx, config) {
             });
         },
     });
+    // Freeze the fullscreen decision only NOW, right before the tree mounts:
+    // Chat above was created after the same settingsReady await, so the root
+    // wrap and the `fullscreen` prop share one value; a mid-session /settings
+    // edit from here on is persisted for the next boot (the watch notifies),
+    // never applied live (swapping layouts requires re-mounting the tree).
+    // Host recompose hardening: never regress a fullscreen session to inline
+    // on a re-mount whose settings application arrived late (see the module
+    // latch note). A fresh process still resolves from config + settings
+    // normally — the latch is undefined there.
+    if (bootedFullscreen === false && lastBootedFullscreen === true) {
+        bootedFullscreen = true;
+    }
+    fullscreenFrozen = true;
     // fullscreen: wrap the tree in <AlternateScreen> (DEC 1049 + SGR mouse
     // tracking), which turns on in-app text selection (copy-on-select via
     // useCopyOnSelect), wheel scroll, and click/hover hit-testing. Inline
     // mode leaves the mouse to the terminal emulator's native selection.
-    const tree = React.createElement(ThemeProvider, null, config.fullscreen ? React.createElement(AlternateScreen, null, chat) : chat);
+    const tree = React.createElement(ThemeProvider, null, bootedFullscreen ? React.createElement(AlternateScreen, null, chat) : chat);
     instance = await render(tree, { exitOnCtrlC: false });
+    const isRecompose = lastBootedFullscreen !== undefined;
+    lastBootedFullscreen = bootedFullscreen;
+    logMouseDebug('apply mount', { bootedFullscreen, isRecompose });
     // 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.
@@ -814,6 +943,7 @@ export async function apply(ctx, config) {
     // skill commands (issue #86) would survive this exact recompose and the
     // re-mounted channel would find the names taken, freezing its menu.
     ctx.effect(() => () => {
+        logMouseDebug('apply teardown');
         funnel.markTeardown();
         channel.releaseContributions();
         instance?.unmount();

package/lib/types/i18n.d.ts

@@ -363,6 +363,14 @@ declare const dict: {
         readonly zh: "模型已切换，但工作区挂载失败 · {{err}}";
         readonly en: "Model switched, but workspace attachment failed · {{err}}";
     };
+    readonly 'model-usage': {
+        readonly zh: "用法：/model <provider/model>（如 deepseek/deepseek-v4-flash）";
+        readonly en: "Usage: /model <provider/model> (e.g. deepseek/deepseek-v4-flash)";
+    };
+    readonly 'model-unknown': {
+        readonly zh: "未知模型「{{spec}}」· /model 查看全部";
+        readonly en: "Unknown model \"{{spec}}\" · /model to view all";
+    };
     readonly 'compact-unavailable': {
         readonly zh: "压缩不可用——当前 leaf 没有压缩服务";
         readonly en: "Compaction unavailable · no compaction service in this leaf";
@@ -643,6 +651,22 @@ declare const dict: {
         readonly zh: "用法：/workspace resume | rename <名称> | open <路径或 URI>{{commands}}";
         readonly en: "Usage: /workspace resume | rename <name> | open <path-or-URI>{{commands}}";
     };
+    readonly 'workspace-menu-title': {
+        readonly zh: "Workspace 操作";
+        readonly en: "Workspace actions";
+    };
+    readonly 'workspace-menu-resume-desc': {
+        readonly zh: "切换到另一个工作区";
+        readonly en: "Switch to another workspace";
+    };
+    readonly 'workspace-menu-rename-desc': {
+        readonly zh: "重命名当前工作区（需输入名称）";
+        readonly en: "Rename the current workspace (needs a name)";
+    };
+    readonly 'workspace-menu-open-desc': {
+        readonly zh: "打开路径或工作区 URI（需输入路径）";
+        readonly en: "Open a path or workspace URI (needs a path)";
+    };
     readonly 'workspace-open-usage': {
         readonly zh: "用法：/workspace open <路径或 URI>";
         readonly en: "Usage: /workspace open <path-or-URI>";
@@ -775,26 +799,74 @@ declare const dict: {
         readonly zh: "使用 /provider 管理 DSH 凭据；若来源为 env，请删除对应环境变量并重启 dsh-tui";
         readonly en: "Manage DSH credentials with /provider; for env sources, remove the corresponding environment variable and restart dsh-tui";
     };
-    readonly 'permissions-policy-hint': {
+    readonly 'permission-policy-hint': {
         readonly zh: "DSH 权限策略由 fs-policy / bash-sandbox 配置决定（当前 leaf：workspace 内读写、写入需已读文件）。";
         readonly en: "DSH permission policy is set by fs-policy / bash-sandbox config (current leaf: read/write in workspace, writes need a prior read).";
     };
-    readonly 'permissions-approval-hint': {
+    readonly 'permission-approval-hint': {
         readonly zh: "审批通道已挂载：命令申请权限提升（sandbox_permissions）时弹出审批条，Yes 放行一次、No / Esc 拒绝。";
         readonly en: "The approval channel is mounted: sandbox escalations (sandbox_permissions) raise an approval bar — Yes allows once, No / Esc rejects.";
     };
-    readonly 'permissions-preset-hint': {
-        readonly zh: "/permission 可查看与切换权限预设（read-only / workspace-write / danger-full-access）。";
-        readonly en: "/permission shows and switches permission presets (read-only / workspace-write / danger-full-access).";
-    };
-    readonly 'permissions-root-hint': {
+    readonly 'permission-root-hint': {
         readonly zh: "当前文件系统策略以工作目录为根：{{cwd}}";
         readonly en: "Current filesystem policy is rooted at the working directory: {{cwd}}";
     };
-    readonly 'permissions-path-hint': {
+    readonly 'permission-path-hint': {
         readonly zh: "模型工具相对路径均解析自该目录；跨目录访问由 fs-policy 拦截。";
         readonly en: "Relative paths of model tools resolve from this directory; cross-directory access is blocked by fs-policy.";
     };
+    readonly 'permission-current': {
+        readonly zh: "当前预设  {{name}}";
+        readonly en: "Current preset  {{name}}";
+    };
+    readonly 'permission-picker-title': {
+        readonly zh: "权限预设";
+        readonly en: "Permission preset";
+    };
+    readonly 'permission-preset-readonly': {
+        readonly zh: "只读";
+        readonly en: "Read-only";
+    };
+    readonly 'permission-preset-readonly-desc': {
+        readonly zh: "会话只读：不写文件、不执行命令";
+        readonly en: "Read-only session: no file writes, no commands";
+    };
+    readonly 'permission-preset-workspace-write': {
+        readonly zh: "工作区读写";
+        readonly en: "Workspace read/write";
+    };
+    readonly 'permission-preset-workspace-write-desc': {
+        readonly zh: "工作区内读写；写入需先读该文件";
+        readonly en: "Read/write inside the workspace; writes need a prior read";
+    };
+    readonly 'permission-preset-full-access': {
+        readonly zh: "完全访问";
+        readonly en: "Full access";
+    };
+    readonly 'permission-preset-full-access-desc': {
+        readonly zh: "不受限读写，无需审批";
+        readonly en: "Unrestricted access, no approvals";
+    };
+    readonly 'plan-picker-title': {
+        readonly zh: "计划模式";
+        readonly en: "Plan mode";
+    };
+    readonly 'plan-mode-on': {
+        readonly zh: "开启";
+        readonly en: "On";
+    };
+    readonly 'plan-mode-on-desc': {
+        readonly zh: "进入计划模式：只读，先规划后动手";
+        readonly en: "Enter plan mode: read-only, plan before acting";
+    };
+    readonly 'plan-mode-off': {
+        readonly zh: "关闭";
+        readonly en: "Off";
+    };
+    readonly 'plan-mode-off-desc': {
+        readonly zh: "退出计划模式，恢复正常执行";
+        readonly en: "Exit plan mode, back to normal execution";
+    };
     readonly 'hooks-not-mounted': {
         readonly zh: "DSH hooks（dsh-hooks-claude / dsh-hooks-codex）未在本 leaf 挂载。";
         readonly en: "DSH hooks (dsh-hooks-claude / dsh-hooks-codex) are not mounted in this leaf.";
@@ -1159,6 +1231,66 @@ declare const dict: {
         readonly zh: "摆尾巴3";
         readonly en: "tail3";
     };
+    readonly 'sugg-commands-title': {
+        readonly zh: "命令";
+        readonly en: "commands";
+    };
+    readonly 'sugg-files-title': {
+        readonly zh: "文件";
+        readonly en: "files";
+    };
+    readonly 'sugg-count': {
+        readonly zh: "共 {{n}} 项";
+        readonly en: "{{n}} items";
+    };
+    readonly 'sugg-more-above': {
+        readonly zh: "↑{{n}}";
+        readonly en: "↑{{n}}";
+    };
+    readonly 'sugg-more-below': {
+        readonly zh: "↓{{n}}";
+        readonly en: "↓{{n}}";
+    };
+    readonly 'sugg-status-desc': {
+        readonly zh: "显示当前选择";
+        readonly en: "Show the current choice";
+    };
+    readonly 'sugg-lang-zh-desc': {
+        readonly zh: "切换界面语言到中文";
+        readonly en: "Switch the UI language to Chinese";
+    };
+    readonly 'sugg-lang-en-desc': {
+        readonly zh: "切换界面语言到英文";
+        readonly en: "Switch the UI language to English";
+    };
+    readonly 'sugg-theme-auto-desc': {
+        readonly zh: "跟随终端背景自动切换";
+        readonly en: "Follow the terminal background";
+    };
+    readonly 'sugg-theme-builtin-desc': {
+        readonly zh: "内置主题";
+        readonly en: "Built-in theme";
+    };
+    readonly 'sugg-theme-user-desc': {
+        readonly zh: "用户主题（{{base}} 基底）";
+        readonly en: "User theme ({{base}} base)";
+    };
+    readonly 'sugg-effort-level-desc': {
+        readonly zh: "思考强度档位";
+        readonly en: "Reasoning effort level";
+    };
+    readonly 'sugg-activity-frames-desc': {
+        readonly zh: "列出或切换动画帧预设";
+        readonly en: "List or switch frame presets";
+    };
+    readonly 'sugg-activity-frame-desc': {
+        readonly zh: "动画帧预设";
+        readonly en: "Animation frame preset";
+    };
+    readonly 'settings-fullscreen-restart': {
+        readonly zh: "全屏设置已保存，重启 dsh-tui 后生效";
+        readonly en: "Fullscreen preference saved — restart dsh-tui to apply";
+    };
     readonly 'help-for-commands': {
         readonly zh: "/ 查看命令";
         readonly en: "/ for commands";
@@ -1219,6 +1351,14 @@ declare const dict: {
         readonly zh: "ctrl+g 打开编辑器";
         readonly en: "ctrl+g to open editor";
     };
+    readonly 'help-fold-todos': {
+        readonly zh: "{{mod}}q 折叠待办";
+        readonly en: "{{mod}}q to fold todos";
+    };
+    readonly 'goal-todo-fold-hint': {
+        readonly zh: "{{mod}}q 折叠";
+        readonly en: "{{mod}}q to fold";
+    };
     readonly 'help-commands-title': {
         readonly zh: "命令：";
         readonly en: "commands:";
@@ -1567,6 +1707,14 @@ declare const dict: {
         readonly zh: "技能列表加载失败";
         readonly en: "Failed to load the skill list";
     };
+    readonly 'skills-unknown': {
+        readonly zh: "未知技能「{{name}}」";
+        readonly en: "Unknown skill \"{{name}}\"";
+    };
+    readonly 'skills-not-invocable': {
+        readonly zh: "技能「{{name}}」不可直接调用";
+        readonly en: "Skill \"{{name}}\" is not directly invocable";
+    };
     readonly 'plugin-scene-crashed': {
         readonly zh: "插件场景「{{id}}」渲染崩溃：{{err}}（已自动关闭）";
         readonly en: "Plugin scene \"{{id}}\" crashed while rendering: {{err}} (closed)";
@@ -1864,12 +2012,16 @@ declare const dict: {
         readonly en: "Summary folded";
     };
     readonly 'new-message': {
-        readonly zh: "{{n}} 条新消息";
-        readonly en: "1 new message";
+        readonly zh: "↓ {{n}} 条新消息";
+        readonly en: "↓ 1 new message";
     };
     readonly 'new-messages': {
-        readonly zh: "{{n}} 条新消息";
-        readonly en: "{{n}} new messages";
+        readonly zh: "↓ {{n}} 条新消息";
+        readonly en: "↓ {{n}} new messages";
+    };
+    readonly 'back-to-bottom': {
+        readonly zh: "↓ 回到底部（Enter/End）";
+        readonly en: "↓ back to bottom (Enter/End)";
     };
     readonly 'theme-builtin-base': {
         readonly zh: "内置 · {{name}} 基底";
@@ -2384,9 +2536,6 @@ declare const dict: {
     readonly 'cmd-desc-logout': {
         readonly zh: "清除 API 凭证";
     };
-    readonly 'cmd-desc-permissions': {
-        readonly zh: "查看权限策略状态";
-    };
     readonly 'cmd-desc-add-dir': {
         readonly zh: "查看文件系统策略范围";
     };
@@ -2489,6 +2638,18 @@ declare const dict: {
         readonly zh: "语言「{{lang}}」切换失败（无法写入 ~/.dsh-tui/lang.json）";
         readonly en: "Language \"{{lang}}\" switch failed (cannot write ~/.dsh-tui/lang.json)";
     };
+    readonly 'lang-picker-title': {
+        readonly zh: "界面语言";
+        readonly en: "UI language";
+    };
+    readonly 'lang-zh-desc': {
+        readonly zh: "简体中文（默认）";
+        readonly en: "Simplified Chinese (default)";
+    };
+    readonly 'lang-en-desc': {
+        readonly zh: "English（英文）";
+        readonly en: "English";
+    };
     readonly 'status-cache-label': {
         readonly zh: "缓存 ";
         readonly en: "cache ";