@deepseek-harness-tui/dsh-tui 0.8.3 → 0.8.5

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

@@ -24,7 +24,10 @@ import { homeDir, LEGACY_DATA_DIR } from '../utils/paths.js';
 import { extractMentions } from '../utils/mentions.js';
 import { t } from '../i18n.js';
 import { modeDisplayName, resolveSessionModes } from '../sessionModes.js';
+import { normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
 import { ActivityTracker } from 'dsh-working-activity/status';
+import { featureOn } from 'dsh-working-activity/config';
+import { readActivityConfig } from '../activityPrefs.js';
 import { attachSessionToWorkspace } from './workspace.js';
 import { createLocalWorkspaceRuntime, getHostWorkspaceRuntime } from './workspaces.js';
 import { getHostCommandTrees } from './command-trees.js';
@@ -968,6 +971,8 @@ export function createChannel(ctx, initialAgent, options) {
         activityFrames: options.activityFrames,
         diffLayout: options.diffLayout ?? 'auto',
         thinkingFold: options.thinkingFold ?? 'preview',
+        toolBackground: normalizeToolBackground(options.toolBackground),
+        statusBar: normalizeStatusBar(options.statusBar),
         activityEnabled: options.activity !== false,
         contextBarEnabled: options.contextBar !== false,
         agentPreset: options.agentPreset,
@@ -1140,14 +1145,12 @@ export function createChannel(ctx, initialAgent, options) {
                 return 0;
             // No keepInbox: the parked copies are dropped (their discard events
             // retire the preview), then each text is re-queued as a fresh
-            // followup. The harness parks kept inbox work until an unrelated wake
-            // (official cancel.spec: "keepInbox parks queued work after an active
-            // turn aborts"), and a wake issued while the driver is still aborting
-            // is ignored — so the re-queue happens on `whenIdle`, whose own wake
-            // starts the new turn.
+            // followup. dsh-agent's cancel-convergence wake latch accepts this
+            // wake immediately after cancel and starts it once the aborted turn
+            // retires; waiting for whenIdle is unsafe because it also follows
+            // replacement work and may never settle.
             agent.cancel({ kind: 'user' });
             const token = ++interruptSeq;
-            const whenIdle = agent.whenIdle;
             const deliver = () => {
                 // A second interrupt while the abort is still settling must not
                 // double-deliver: only the latest request's re-queue runs.
@@ -1161,14 +1164,10 @@ export function createChannel(ctx, initialAgent, options) {
                     dispatchUserText(text, 'followup');
                 }
             };
-            if (typeof whenIdle === 'function') {
-                void whenIdle.call(agent).then(deliver);
-            }
-            else {
-                // Defensive: a wake while the driver still runs is ignored, so wait
-                // for the abort to settle before re-queueing.
-                setTimeout(deliver, 200);
-            }
+            // Let cancel finish its synchronous inbox bookkeeping before waking.
+            // A microtask also coalesces two same-tick interrupts: only the latest
+            // token survives, so the user's text is never sent twice.
+            queueMicrotask(deliver);
             return queued.length;
         },
         /**
@@ -1619,10 +1618,16 @@ export function createChannel(ctx, initialAgent, options) {
             streaming = undefined;
             reasoning = undefined;
             // Stale sealed/thinking bookkeeping belongs to the OLD agent's rows;
-            // keep it out of the next turn's settle logs and revive cache.
+            // keep it out of the next turn's settle logs and revive cache. Event
+            // sequence numbers restart in the fresh session, so its dedupe ledgers
+            // must not retain the old session's sequence ids.
             sealedReasoning.length = 0;
             lastReasoningRow = undefined;
             toolCards.clear();
+            handledAssistantMessages.clear();
+            handledAssistantChunks.clear();
+            assistantRowsByStep.clear();
+            lastTextDelta.clear();
             nextRowId = 0;
             state.rows.length = 0;
             // Goal/todo/title are session-scoped; the replay re-derives them for
@@ -1650,6 +1655,7 @@ export function createChannel(ctx, initialAgent, options) {
             state.tpsSamples = [];
             state.lastUsage = undefined;
             state.workingActivity = undefined;
+            state.loadedContext = undefined;
             state.contextWindow = undefined;
             state.contextSegments = {
                 system: 0,
@@ -1843,6 +1849,8 @@ export function createChannel(ctx, initialAgent, options) {
             agent = handle.agent;
             currentHandle = handle;
             bindAgent();
+            // Model-switch quip rides the fresh tracker (pi parity).
+            activityTracker.onModelSwitch(model);
             refreshCommandList();
             void refreshLoadedContext();
             void refreshSkillCommands();
@@ -1919,6 +1927,21 @@ export function createChannel(ctx, initialAgent, options) {
             state.thinkingFold = mode;
             state.emit();
         },
+        setToolBackground(background) {
+            const normalized = normalizeToolBackground(background);
+            if (normalized === state.toolBackground)
+                return;
+            state.toolBackground = normalized;
+            state.emit();
+        },
+        setStatusBar(config) {
+            const next = normalizeStatusBar({ ...state.statusBar, ...config });
+            const changed = Object.keys(next).some(key => next[key] !== state.statusBar[key]);
+            if (!changed)
+                return;
+            state.statusBar = next;
+            state.emit();
+        },
         setActivityFrames(name) {
             if (!isPresetName(name)) {
                 state.notify(t('unknown-activity-preset', { name }), { color: 'error' });
@@ -2324,6 +2347,9 @@ export function createChannel(ctx, initialAgent, options) {
                     .compactNow(agent, signal)
                     .then((result) => {
                     state.notify(result ? t('compact-done') : t('compact-nothing'));
+                    // Compaction quip rides the next thinking rotation (pi parity).
+                    if (result)
+                        activityTracker.onCompact('done');
                 })
                     .catch((error) => {
                     state.notify(t('compact-failed', { err: error instanceof Error ? error.message : String(error) }), { color: 'error', timeoutMs: 8000 });
@@ -2989,6 +3015,39 @@ ${output}
     let tpsStep;
     /** Tool cards by callId, so tool/result can settle the running card. */
     const toolCards = new Map();
+    /**
+     * Session events are delivered live and can also be replayed around a
+     * reconnect. A repeated sealed message must not create a second assistant
+     * row for the same durable sequence number.
+     */
+    const handledAssistantMessages = new Set();
+    const handledAssistantChunks = new Set();
+    const assistantRowsByStep = new Map();
+    const lastTextDelta = new Map();
+    const stepKey = (turn, step) => `${turn}:${step}`;
+    /** Append a stream delta idempotently. Providers normally send a pure
+     * delta, but reconnect/proxy paths can resend a cumulative prefix or a
+     * delta whose beginning overlaps the previous tail. Merge the overlap
+     * instead of blindly concatenating it into the visible transcript. */
+    const appendTextDelta = (row, delta) => {
+        if (delta === '')
+            return;
+        if (lastTextDelta.get(row) === delta)
+            return;
+        lastTextDelta.set(row, delta);
+        if (delta.startsWith(row.text)) {
+            row.text = delta;
+            return;
+        }
+        const maxOverlap = Math.min(row.text.length, delta.length, 4096);
+        for (let size = maxOverlap; size > 0; size--) {
+            if (row.text.endsWith(delta.slice(0, size))) {
+                row.text += delta.slice(size);
+                return;
+            }
+        }
+        row.text += delta;
+    };
     /** The host-plane tools registry (dsh-tools). Resolved once; absent in
      *  bare embedders — every presenter call soft-fails to undefined and the
      *  card falls back to raw text. */
@@ -3040,11 +3099,22 @@ ${output}
      */
     const firstTextOf = (content) => (content ?? []).find(block => block.type === 'text')?.text.trim() ?? '';
     const ensureStreaming = (seq) => {
-        if (streaming === undefined) {
-            streaming = { id: nextRowId, kind: 'assistant', text: '', streaming: true, ...seq !== undefined ? { seq } : {} };
-            nextRowId += 1;
-            state.rows.push(streaming);
+        if (streaming !== undefined)
+            return streaming;
+        // A reconnect can replay the first delta after the sealed message was
+        // already observed. Reuse that durable row instead of opening a second
+        // assistant bubble for the same event sequence.
+        const existing = seq === undefined
+            ? undefined
+            : [...state.rows].reverse().find(row => row.kind === 'assistant' && row.seq === seq);
+        if (existing !== undefined) {
+            existing.streaming = true;
+            streaming = existing;
+            return existing;
         }
+        streaming = { id: nextRowId, kind: 'assistant', text: '', streaming: true, ...seq !== undefined ? { seq } : {} };
+        nextRowId += 1;
+        state.rows.push(streaming);
         return streaming;
     };
     /** Latest reasoning row keyed by its (turn, step) — lets a resumed
@@ -3175,6 +3245,13 @@ ${output}
      *  using it would rebuild a second thinking block per step. */
     let replaying = false;
     const replayEvents = (events) => {
+        // Event sequence numbers restart with a replacement session; reset the
+        // idempotency ledger before replay so an old session cannot suppress a
+        // legitimate message in the new transcript.
+        handledAssistantMessages.clear();
+        handledAssistantChunks.clear();
+        assistantRowsByStep.clear();
+        lastTextDelta.clear();
         replaying = true;
         try {
             for (const event of prepareReplayEvents(events))
@@ -3262,6 +3339,9 @@ ${output}
                 break;
             }
             case 'assistant/chunk': {
+                if (handledAssistantChunks.has(event.seq))
+                    break;
+                handledAssistantChunks.add(event.seq);
                 const chunk = event.data.chunk;
                 if (chunk.type === 'text-delta') {
                     if (chunk.text) {
@@ -3269,13 +3349,20 @@ ${output}
                         // window (see foldLiveReasoning) — before this text grows the
                         // transcript and pushes the block into scrollback.
                         foldLiveReasoning('first text token');
-                        ensureStreaming(event.seq).text += chunk.text;
-                        state.responseChars += chunk.text.length;
+                        const key = stepKey(event.data.turn, event.data.step);
+                        const row = assistantRowsByStep.get(key) ?? ensureStreaming(event.seq);
+                        assistantRowsByStep.set(key, row);
+                        streaming = row;
+                        row.streaming = true;
+                        const before = row.text.length;
+                        appendTextDelta(row, chunk.text);
+                        state.responseChars += Math.max(0, row.text.length - before);
                     }
                 }
                 else if (chunk.type === 'reasoning-delta') {
                     if (chunk.text) {
-                        ensureReasoning(event.seq, event.data.turn, event.data.step).text += chunk.text;
+                        const row = ensureReasoning(event.seq, event.data.turn, event.data.step);
+                        appendTextDelta(row, chunk.text);
                     }
                 }
                 const step = tpsStep;
@@ -3296,6 +3383,9 @@ ${output}
                 break;
             }
             case 'assistant/message': {
+                if (handledAssistantMessages.has(event.seq))
+                    break;
+                handledAssistantMessages.add(event.seq);
                 const text = textOf(event.data.message.content);
                 // Replay without chunk deltas (prepareReplayEvents drops settled
                 // ones): rebuild the reasoning row from the sealed message's
@@ -3325,8 +3415,22 @@ ${output}
                 // anyway leaves an empty `●` bullet in the transcript. A pre-existing
                 // streaming row always has text (ensureStreaming is only reached on
                 // non-empty text deltas), so only create one when text arrives.
-                const row = streaming ?? (text ? ensureStreaming(event.seq) : undefined);
+                // Key the step→row ledger only when the event carries a durable
+                // turn/step; a message without them must never collide onto a
+                // previous step's row (a bare `undefined:undefined` key would make
+                // every turn/step-less message reuse the FIRST one's assistant row).
+                const msgTurn = event.data.turn;
+                const msgStep = event.data.step;
+                const msgKey = msgTurn !== undefined && msgStep !== undefined
+                    ? stepKey(msgTurn, msgStep)
+                    : undefined;
+                const row = (msgKey !== undefined ? assistantRowsByStep.get(msgKey) : undefined) ?? streaming ??
+                    (text
+                        ? ([...state.rows].reverse().find(candidate => candidate.kind === 'assistant' && candidate.seq === event.seq) ?? ensureStreaming(event.seq))
+                        : undefined);
                 if (row !== undefined) {
+                    if (msgKey !== undefined)
+                        assistantRowsByStep.set(msgKey, row);
                     row.time = event.time;
                     if (text)
                         row.text = text;
@@ -3622,11 +3726,36 @@ ${output}
     // Live subscription list and activity timer, rebound to every replacement
     // agent so no status from the previous session can leak across a swap.
     let agentSubscriptions = [];
-    let activityTracker = new ActivityTracker({
-        phrases: true,
-        detailLimit: 40,
-        showIdle: false,
-    });
+    /** Tracker knobs + custom actions from the persisted pi-style config
+     *  (`~/.dsh-tui/working-activity.json`); a missing file means lively
+     *  defaults (all eggs on). */
+    const activityPrefsSnapshot = () => {
+        const cfg = readActivityConfig();
+        if (cfg === undefined) {
+            return { config: { phrases: true, detailLimit: 40, showIdle: false } };
+        }
+        return {
+            config: {
+                phrases: featureOn(cfg, 'phrases'),
+                detailLimit: 40,
+                showIdle: false,
+                features: {
+                    rareEggs: featureOn(cfg, 'rareEggs'),
+                    weekend: featureOn(cfg, 'weekend'),
+                    holidays: featureOn(cfg, 'holidays'),
+                    nightPhrases: featureOn(cfg, 'nightPhrases'),
+                },
+                customPhrases: cfg.customPhrases,
+                showTokPerSec: cfg.showTokPerSec,
+                workRemindAt: cfg.workRemindAt,
+            },
+            customActions: cfg.customActions,
+        };
+    };
+    let activityTracker = (() => {
+        const prefs = activityPrefsSnapshot();
+        return new ActivityTracker(prefs.config, Date.now, prefs.customActions);
+    })();
     let activityTickTimer;
     const stopActivityTick = () => {
         if (activityTickTimer === undefined)
@@ -3648,11 +3777,8 @@ ${output}
         for (const dispose of agentSubscriptions)
             dispose();
         stopActivityTick();
-        activityTracker = new ActivityTracker({
-            phrases: true,
-            detailLimit: 40,
-            showIdle: false,
-        });
+        const prefs = activityPrefsSnapshot();
+        activityTracker = new ActivityTracker(prefs.config, Date.now, prefs.customActions);
         activityTracker.onAgentStatus(agent.status);
         renderWorkingActivity();
         activityTickTimer = setInterval(() => {
@@ -3748,6 +3874,14 @@ ${output}
                 // publish never throws into this arm.
                 messageObserver?.publish(session, event);
                 activityTracker.onSessionEvent(event);
+                // Interrupt quip: an aborted/interrupted turn ends the round; the
+                // comeback copy shows on the next thinking rotation (pi parity).
+                if (event.type === 'turn/end') {
+                    const reason = event.data.reason;
+                    if (reason?.kind === 'aborted' || reason?.kind === 'interrupted') {
+                        activityTracker.onInterrupted();
+                    }
+                }
                 renderWorkingActivity();
                 // Mode-affecting atoms fold into the Shift+Tab mode indicator the
                 // moment they land (whether appended by cycleMode or by hand).
@@ -3815,6 +3949,8 @@ ${output}
                 // only show a branch for sessions this install actually used — which
                 // is exactly what the column claims.
                 noteBranch(agent.session.id, branch);
+                // Feed the working line so git tools can show ` · git <branch>`.
+                activityTracker.onGitBranch(branch);
                 state.emit();
             }
         })

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

@@ -9,6 +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';
 export declare const name = "dsh-tui";
 export declare const inject: string[];
 /**
@@ -70,6 +71,10 @@ export interface Config {
      *  preview and folds each step when it settles; `full` keeps thinking
      *  expanded until the whole turn ends. Editable live from `/settings`. */
     thinkingFold?: 'preview' | 'full';
+    /** Tool-card background strength; defaults to no added background. */
+    toolBackground?: ToolBackground;
+    /** Status-footer field visibility and compact presentation preferences. */
+    statusBar?: Partial<StatusBarConfig>;
     /** Shift+Tab session-mode cycle (array order IS the cycle order; index 0
      *  is the unmarked base mode). Each entry bundles any subset of the
      *  `plan`/`sandbox`/`approval` atoms; absent → the built-in

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEzD,eAAO,MAAM,IAAI,YAAY,CAAA;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;;;yDAGqD;IACrD,KAAK,CAAC,EAAE,eAAe,EAAE,CAAA;CAC1B;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CA4BhC,CAAA;AAEF;;;;;;GAMG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;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,CAWvE"}

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

@@ -1,4 +1,5 @@
 import Schema from '@deepseek-ai/schemastery';
+import { DEFAULT_STATUS_BAR } from '../tuiDisplayPrefs.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
@@ -29,6 +30,24 @@ export const Config = Schema.object({
     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'),
+    statusBar: Schema.object({
+        compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
+        model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
+        thinking: Schema.boolean().default(DEFAULT_STATUS_BAR.thinking),
+        cwd: Schema.boolean().default(DEFAULT_STATUS_BAR.cwd),
+        contextUsage: Schema.boolean().default(DEFAULT_STATUS_BAR.contextUsage),
+        cache: Schema.boolean().default(DEFAULT_STATUS_BAR.cache),
+        tokens: Schema.boolean().default(DEFAULT_STATUS_BAR.tokens),
+        tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
+        gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
+        sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
+        mode: Schema.boolean().default(DEFAULT_STATUS_BAR.mode),
+        contextBar: Schema.boolean().default(DEFAULT_STATUS_BAR.contextBar),
+        activity: Schema.boolean().default(DEFAULT_STATUS_BAR.activity),
+        trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
+        shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
+    }).default({ ...DEFAULT_STATUS_BAR }),
     modes: Schema.array(Schema.object({
         id: Schema.string(),
         label: Schema.string().required(false),

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;AAmCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAonBvE;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;AAoCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsyBvE;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,6 +23,7 @@ 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 { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
 import { Chat } from '../screens/Chat.js';
 import { getHostDialogStore } from './dialogs.js';
@@ -326,6 +327,8 @@ export async function apply(ctx, config) {
         // screen edits this key live through the dsh-tui namespace.
         diffLayout: config.diffLayout,
         thinkingFold: config.thinkingFold,
+        toolBackground: config.toolBackground,
+        statusBar: config.statusBar,
         handle,
     });
     // Register the dsh-tui settings namespace so the /settings screen can
@@ -336,6 +339,24 @@ export async function apply(ctx, config) {
         const scope = settingsCtx.settings.register(settingsNamespace('dsh-tui'), 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'),
+            statusBar: Schema.object({
+                compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
+                model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
+                thinking: Schema.boolean().default(DEFAULT_STATUS_BAR.thinking),
+                cwd: Schema.boolean().default(DEFAULT_STATUS_BAR.cwd),
+                contextUsage: Schema.boolean().default(DEFAULT_STATUS_BAR.contextUsage),
+                cache: Schema.boolean().default(DEFAULT_STATUS_BAR.cache),
+                tokens: Schema.boolean().default(DEFAULT_STATUS_BAR.tokens),
+                tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
+                gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
+                sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
+                mode: Schema.boolean().default(DEFAULT_STATUS_BAR.mode),
+                contextBar: Schema.boolean().default(DEFAULT_STATUS_BAR.contextBar),
+                activity: Schema.boolean().default(DEFAULT_STATUS_BAR.activity),
+                trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
+                shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
+            }).default({ ...DEFAULT_STATUS_BAR }),
             // No default on purpose: an unset `lang` keeps the field showing
             // the effective language (see the section's format below) and lets
             // cordis.yml / lang.json keep their precedence.
@@ -355,15 +376,17 @@ export async function apply(ctx, config) {
                 writeLangPref(value.lang);
             }
         };
-        // thinkingFold rides the same namespace: /settings writes it live and
-        // the channel picks it up at the next step seal.
-        const applyThinkingFold = (value) => {
+        // Display preferences ride the same namespace: /settings writes them
+        // live and future render consumers observe the channel version bump.
+        const applyDisplay = (value) => {
             channel.setThinkingFold(value.thinkingFold ?? config.thinkingFold ?? 'preview');
+            channel.setToolBackground(normalizeToolBackground(value.toolBackground ?? config.toolBackground));
+            channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
         const apply = (next) => {
             applyLayout(next);
             applyLang(next);
-            applyThinkingFold(next);
+            applyDisplay(next);
         };
         apply(scope.get());
         scope.watch(next => {
@@ -379,6 +402,7 @@ export async function apply(ctx, config) {
         const unregister = settingsSections.register({
             ns: 'dsh-tui',
             title: 'dsh-tui',
+            groups: [{ id: 'status-bar', title: 'Status bar', descriptions: { zh: '底栏设置' } }],
             fields: [
                 {
                     path: ['lang'],
@@ -423,6 +447,154 @@ export async function apply(ctx, config) {
                         { value: 'full', label: 'Full until turn end', descriptions: { zh: '展开至轮末' } },
                     ],
                 },
+                {
+                    path: ['toolBackground'],
+                    label: 'Tool background',
+                    descriptions: { zh: '工具卡背景' },
+                    hint: 'Choose whether tool-call cards add no, subtle, or strong background emphasis.',
+                    hintDescriptions: { zh: '选择工具调用卡片不添加、轻微或明显的背景强调。' },
+                    kind: 'select',
+                    options: [
+                        { value: 'none', label: 'None', descriptions: { zh: '无' } },
+                        { value: 'subtle', label: 'Subtle', descriptions: { zh: '轻微' } },
+                        { value: 'strong', label: 'Strong', descriptions: { zh: '明显' } },
+                    ],
+                },
+                {
+                    path: ['statusBar', 'compact'],
+                    label: 'Compact status bar',
+                    descriptions: { zh: '紧凑状态栏' },
+                    hint: 'Prefer the compact status presentation when terminal space allows.',
+                    hintDescriptions: { zh: '终端空间允许时优先使用紧凑状态栏布局。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'model'],
+                    label: 'Show model',
+                    descriptions: { zh: '显示模型' },
+                    hint: 'Show the live model id in the status bar.',
+                    hintDescriptions: { zh: '在状态栏显示当前模型标识。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'thinking'],
+                    label: 'Show thinking',
+                    descriptions: { zh: '显示思考' },
+                    hint: 'Show the live reasoning effort or thinking mode.',
+                    hintDescriptions: { zh: '显示当前推理强度或思考模式。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'cwd'],
+                    label: 'Show working directory',
+                    descriptions: { zh: '显示工作目录' },
+                    hint: 'Show the session working directory.',
+                    hintDescriptions: { zh: '显示当前会话的工作目录。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'contextUsage'],
+                    label: 'Show context usage',
+                    descriptions: { zh: '显示上下文用量' },
+                    hint: 'Show current context-window consumption.',
+                    hintDescriptions: { zh: '显示当前上下文窗口占用情况。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'cache'],
+                    label: 'Show cache',
+                    descriptions: { zh: '显示缓存' },
+                    hint: 'Show prompt-cache hit information.',
+                    hintDescriptions: { zh: '显示提示词缓存命中信息。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'tokens'],
+                    label: 'Show token totals',
+                    descriptions: { zh: '显示 Token 总量' },
+                    hint: 'Show running input and output token totals.',
+                    hintDescriptions: { zh: '显示累计输入与输出 Token。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'tps'],
+                    label: 'Show output speed',
+                    descriptions: { zh: '显示输出速度' },
+                    hint: 'Show live and recent tokens-per-second metrics.',
+                    hintDescriptions: { zh: '显示实时及近期每秒 Token 指标。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'gitBranch'],
+                    label: 'Show git branch',
+                    descriptions: { zh: '显示 Git 分支' },
+                    hint: 'Show the current git branch when available.',
+                    hintDescriptions: { zh: '可用时显示当前 Git 分支。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'sessionTitle'],
+                    label: 'Show session title',
+                    descriptions: { zh: '显示会话标题' },
+                    hint: 'Show the current session title.',
+                    hintDescriptions: { zh: '显示当前会话标题。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'mode'],
+                    label: 'Show session mode',
+                    descriptions: { zh: '显示会话模式' },
+                    hint: 'Show the active non-default session mode.',
+                    hintDescriptions: { zh: '显示当前启用的非默认会话模式。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'contextBar'],
+                    label: 'Show context progress bar',
+                    descriptions: { zh: '显示上下文进度条' },
+                    hint: 'Show the segmented context progress bar on its own footer row.',
+                    hintDescriptions: { zh: '在底部单独一行显示分段上下文进度条。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'activity'],
+                    label: 'Show activity summary',
+                    descriptions: { zh: '显示活动摘要' },
+                    hint: 'Show the idle working-activity summary.',
+                    hintDescriptions: { zh: '显示空闲时的工作活动摘要。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'trajectory'],
+                    label: 'Show trajectory strip',
+                    descriptions: { zh: '显示轨迹条' },
+                    hint: 'Show the animated mini trajectory strip at the footer edge.',
+                    hintDescriptions: { zh: '在状态栏边缘显示动态迷你轨迹条。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
+                {
+                    path: ['statusBar', 'shortcutHint'],
+                    label: 'Show shortcut reminder',
+                    descriptions: { zh: '显示快捷键提示' },
+                    hint: 'Control only the idle `? for shortcuts` reminder; pressing ? and the Esc shortcut hints are unaffected.',
+                    hintDescriptions: { zh: '仅控制空闲时的 `? for shortcuts` 提示；按 ? 打开快捷键以及 Esc 快捷提示均不受影响。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
             ],
         });
         ctx.effect(() => unregister);