@deepseek-harness-tui/dsh-tui 0.9.2 → 0.9.3

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

@@ -20,9 +20,9 @@ import { readPresetPref } from '../presetPrefs.js';
 import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, resolvePersistedRoute, runningPresetOf } from './presets.js';
 import { ensurePackagedPresets } from './packaged-presets.js';
 import { ensureLegacySessionEventTypes } from './compat/index.js';
-import { clearResumeTarget, writeResumeTarget } from '../sessionHistory.js';
+import { clearResumeTarget, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
-import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.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_STATUS_BAR, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
 import { draftComboConflicts, effectiveComboString, parseComboDraft, setKeymapOverrides, SHORTCUT_ACTIONS, } from '../utils/keymap.js';
@@ -35,7 +35,7 @@ import { getHostStatusStore } from './status.js';
 import { getHostShortcuts } from './shortcuts.js';
 import { attachSessionToWorkspace } from './workspace.js';
 import { createLocalWorkspaceRuntime, getHostWorkspaceRuntime } from './workspaces.js';
-import { getHostSettingsSections } from './settings-sections.js';
+import { getHostSettingsSections, getLocalSettingsSectionsHost } from './settings-sections.js';
 import { withHostRootCapability } from './host-access.js';
 import { render, ThemeProvider, AlternateScreen } from '../ui.js';
 import instances from '../ink/instances.js';
@@ -350,7 +350,11 @@ export async function apply(ctx, config) {
     }
     const sessionCwd = initialWorkspace?.cwd ?? resolveSessionCwd(config.cwd);
     const meta = { cwd: sessionCwd };
-    const { agent, handle, agentPreset, route: createdRoute } = await resolveAgent(ctx, config.sessionId, configuredRoute, startupRoute, meta, config.preset);
+    // Launch-time resume target: the env handoff (launchers like naive-dsh) wins;
+    // `dsh --profile tui` forwards `--resume` verbatim instead, so fall back to
+    // parsing the forwarded app args (parity with the standalone bin).
+    const launchSessionId = config.sessionId ?? resumeTargetFromArgv(process.argv.slice(2));
+    const { agent, handle, agentPreset, route: createdRoute } = await resolveAgent(ctx, launchSessionId, configuredRoute, startupRoute, meta, config.preset);
     try {
         // Opening a persisted TUI session is an explicit ownership action too.
         // Older TUI versions only wrote the Session log, so attaching on every
@@ -408,6 +412,7 @@ export async function apply(ctx, config) {
         thinkingFold: config.thinkingFold,
         toolBackground: config.toolBackground,
         scrollGutter: config.scrollGutter,
+        foldTerminalCommand: config.foldTerminalCommand,
         promptSessionLabel: config.promptSessionLabel,
         statusBar: config.statusBar,
         handle,
@@ -444,6 +449,13 @@ export async function apply(ctx, config) {
             thinkingFold: Schema.union(['preview', 'full']).default('preview'),
             toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
             scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
+            // No default on purpose (same rule as `fullscreen` below): a schema
+            // default here would come back from scope.get()/watch() and shadow
+            // an explicit cordis.yml `foldTerminalCommand: true` while the
+            // settings user layer is unset — applyDisplay's
+            // `?? config.foldTerminalCommand ?? false` already supplies the
+            // default and keeps cordis.yml decisive.
+            foldTerminalCommand: Schema.boolean(),
             promptSessionLabel: Schema.boolean().default(false),
             statusBar: Schema.object({
                 compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
@@ -516,6 +528,7 @@ export async function apply(ctx, config) {
             channel.setThinkingFold(value.thinkingFold ?? config.thinkingFold ?? 'preview');
             channel.setToolBackground(normalizeToolBackground(value.toolBackground ?? config.toolBackground));
             channel.setScrollGutter(normalizeScrollGutter(value.scrollGutter ?? config.scrollGutter));
+            channel.setFoldTerminalCommand(value.foldTerminalCommand ?? config.foldTerminalCommand ?? false);
             channel.setPromptSessionLabel(value.promptSessionLabel ?? config.promptSessionLabel ?? false);
             channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
@@ -672,8 +685,14 @@ export async function apply(ctx, config) {
             },
         };
     });
-    const settingsSections = getHostSettingsSections(ctx.get('tuiSettingsSections'));
-    if (settingsSections !== undefined) {
+    // Prefer the composition's sections service; fall back to the in-package
+    // local host. Real compositions have been observed disposing the whole
+    // dsh-tui-* host-seam insert list right after load (issue #557), which
+    // left this registration silently skipped and /settings read-only.
+    // channel.ts reads through the same fallback, so both sides meet in the
+    // same registry either way.
+    {
+        const settingsSections = getHostSettingsSections(ctx.get('tuiSettingsSections')) ?? getLocalSettingsSectionsHost();
         const unregister = settingsSections.register({
             ns: 'dsh-tui',
             title: 'dsh-tui',
@@ -768,6 +787,19 @@ export async function apply(ctx, config) {
                         { value: 'hidden', label: 'Hidden', descriptions: { zh: '隐藏' } },
                     ],
                 },
+                {
+                    path: ['foldTerminalCommand'],
+                    label: 'Fold terminal command',
+                    descriptions: { zh: '折叠终端命令' },
+                    hint: 'Terminal cards (Bash/PowerShell): collapse a multi-line command header to its first line + count; Ctrl+O or a click expands it.',
+                    hintDescriptions: { zh: '终端卡（Bash/PowerShell）：多行命令头部折叠为首行 + 计数；Ctrl+O 或点击卡片展开。' },
+                    kind: 'boolean',
+                    format(value) {
+                        // Unset in settings.yaml: show the effective resolution (cordis.yml
+                        // → off) instead of a blank — same rule as `fullscreen`'s field.
+                        return String(typeof value === 'boolean' ? value : config.foldTerminalCommand === true);
+                    },
+                },
                 {
                     path: ['promptSessionLabel'],
                     label: 'Session name chip',
@@ -852,6 +884,15 @@ export async function apply(ctx, config) {
                     group: 'status-bar',
                     kind: 'boolean',
                 },
+                {
+                    path: ['statusBar', 'cost'],
+                    label: 'Show session cost estimate',
+                    descriptions: { zh: '显示本会话花费估算' },
+                    hint: 'Show the estimated session spend (≈¥) next to the token totals. Only appears for official DeepSeek providers whose model has a known price; the estimate follows the official per-million-token rates (peak/idle hours) and is not a bill.',
+                    hintDescriptions: { zh: '在 Token 总量旁显示本会话花费估算（≈¥）。仅在使用 DeepSeek 官方 API key 且模型有已知单价时显示；按官方每百万 token 单价（高峰/空闲时段）估算，非账单。' },
+                    group: 'status-bar',
+                    kind: 'boolean',
+                },
                 {
                     path: ['statusBar', 'tps'],
                     label: 'Show output speed',
@@ -985,10 +1026,13 @@ export async function apply(ctx, config) {
     }
     // Positional command-line arguments are the initial prompt (issue #53):
     // `dsh-tui "run the tests"` forwards positionals through the dsh CLI,
-    // which mounts them as ctx.cmdlineArgs. Submit once the channel exists —
+    // which mounts them as ctx.cmdlineArgs. The service shape drifted across
+    // dsh-cmdline builds — `{ get() }` is the current contract, older builds
+    // exposed `{ args }` — so read both. Submit once the channel exists;
     // delivery goes through the normal pending/inbox chain, so no special
     // timing is needed; flag-shaped leftovers are not prompt text.
-    const cmdlineArgs = ctx.cmdlineArgs?.args;
+    const cmdline = ctx.cmdlineArgs;
+    const cmdlineArgs = cmdline?.get?.() ?? cmdline?.args;
     const initialPrompt = cmdlineArgs?.filter(arg => !arg.startsWith('-')).join(' ').trim();
     if (initialPrompt)
         channel.submit(initialPrompt);
@@ -1042,7 +1086,10 @@ export async function apply(ctx, config) {
                 catch {
                     // Resume persistence is best effort and must never block an update.
                 }
-                void finishExit(ctx, instance, bootedFullscreen, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId, updateTargetVersion));
+                const hintText = isStandaloneRuntime()
+                    ? t('update-standalone-starting')
+                    : t('update-starting');
+                void finishExit(ctx, instance, bootedFullscreen, hintText, undefined, () => runUpdate(ctx, profile, channel.agentId, updateTargetVersion));
                 return;
             }
             // `/restart`: same handoff as the update path, no installation step.
@@ -1159,7 +1206,12 @@ export async function apply(ctx, config) {
                     }
                     updateTargetVersion = target.latest;
                 }
-                channel.notify(t('update-starting'));
+                if (isStandaloneRuntime()) {
+                    channel.notify(t('update-standalone-starting'));
+                }
+                else {
+                    channel.notify(t('update-starting'));
+                }
                 updateRequested = true;
                 handleExit();
             });
@@ -1199,7 +1251,8 @@ export async function apply(ctx, config) {
     void checkForTuiUpdate().then((update) => {
         if (update === undefined || exited || updateRequested)
             return;
-        channel.notify(t('update-available', { current: update.current, latest: update.latest }), { color: 'warning', timeoutMs: 12000 });
+        const key = update.isStandalone ? 'update-standalone-available' : 'update-available';
+        channel.notify(t(key, { current: update.current, latest: update.latest }), { color: 'warning', timeoutMs: 12000 });
     });
     // If the surrounding tree goes down (reload, teardown), unmount the UI —
     // but flag it as teardown first so the settling waitUntilExit does not
@@ -1289,9 +1342,15 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
             };
         }
         catch (error) {
-            // No artifact (first run / cleared storage) or persistence not
-            // mounted: fall through to a fresh session, but stay loud in the log.
-            ctx.logger.warn(`dsh-tui: resume of "${requestedSessionId}" failed: ${error instanceof Error ? error.message : String(error)}`);
+            // 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
+            // terminal). Fail the boot loudly instead; the loader surfaces this to
+            // stderr. The in-session /resume picker has its own error path.
+            const reason = error instanceof Error ? error.message : String(error);
+            throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": ${reason} — ` +
+                'the stored log is unreadable or corrupt; no fresh session was started instead. ' +
+                'Drop --resume to start fresh, or repair the session log first.');
         }
     }
     const sessionId = SessionId(randomUUID());
@@ -1370,12 +1429,45 @@ export function isExitResumable(deps) {
     return (deps.pendingCount > 0 ||
         agent.session.events.some(event => event.type === 'user/message' && event.data.source.kind === 'user'));
 }
-/** Finish terminal I/O before handing control to a process-level exit action. */
-async function finishExit(ctx, instance, fullscreen, notice, stderrNotice, done) {
+/**
+ * Finish terminal I/O before handing control to a process-level exit action.
+ * Exported for scripts/verify-shutdown-fallback.
+ */
+export async function finishExit(ctx, instance, fullscreen, notice, stderrNotice, done) {
     try {
-        const runtime = readInkShutdownState(instances.get(process.stdout));
-        if (runtime === undefined && instance !== undefined) {
+        // Resolve the Ink runtime twice: the instances map is keyed by stdout
+        // identity, so a replaced/overridden stdout misses it; the render()
+        // handle is the caller's own instance and always matches (issue #522 —
+        // a missed lookup skipped detachForShutdown, leaving the stdin pump,
+        // TTY handlers and querier alive so the self-heal probe re-wrote
+        // ENABLE_MOUSE_TRACKING after DISABLE_MOUSE_TRACKING had been sent).
+        const fromMap = readInkShutdownState(instances.get(process.stdout));
+        const fromHandle = instance === undefined ? undefined : readInkShutdownState(instance);
+        // A handle that exposes neither detach hook is not an Ink runtime we can
+        // latch (e.g. the fake render handles in shutdown regressions) — treat it
+        // as a lookup miss so the full-unmount fallback below can still run.
+        const runtime = fromMap ?? (fromHandle?.detachForShutdown === undefined && fromHandle?.detachStdinForHandoff === undefined
+            ? undefined
+            : fromHandle);
+        if (runtime === undefined) {
             ctx.logger.debug('dsh-tui: Ink runtime unavailable during shutdown; using generic terminal cleanup');
+            if (instance !== undefined) {
+                ctx.logger.debug('dsh-tui: Ink shutdown using full unmount as the terminal-restore fallback');
+                // Lookup-miss (custom stdout embedders / detach-less handles): the
+                // registry cannot hand us the detach hooks, so run the full Ink
+                // unmount first. It restores raw mode, alt screen and listeners
+                // synchronously before the notice below is written — the process
+                // must never hand a broken terminal back to the shell.
+                try {
+                    instance.unmount();
+                }
+                catch {
+                    ctx.logger.debug('dsh-tui: Ink shutdown unmount fallback failed; continuing with generic terminal cleanup');
+                }
+            }
+        }
+        else if (fromMap === undefined) {
+            ctx.logger.debug('dsh-tui: Ink runtime resolved from the render handle (instances map missed); detaching');
         }
         const cursor = fullscreen ? '' : cursorMoveToFrameEnd(runtime);
         try {
@@ -1404,6 +1496,16 @@ async function finishExit(ctx, instance, fullscreen, notice, stderrNotice, done)
         ].join('');
         const suffix = notice === undefined ? '' : `${notice}\n`;
         await writeStream(process.stdout, `${cleanup}\r\n${suffix}`);
+        // Re-drain AFTER the cleanup sequences have landed (#507): terminal
+        // replies and mouse packets already in flight when the exit started
+        // keep arriving while cleanup is being written — the detach-time drain
+        // cannot see them. Unconsumed at process exit they land in the shell's
+        // input queue (DECRPM/DA1/XTVERSION garbage pasted into the prompt).
+        // 150ms settle covers reply RTT on slow links (ssh/ghostty is #522's
+        // environment; 50ms proved too tight there) while staying well inside
+        // the exit window the user already waits through.
+        await new Promise(resolve => setTimeout(resolve, 150));
+        runtime?.drainStdin?.();
         if (stderrNotice !== undefined) {
             await writeStream(process.stderr, `\n${stderrNotice}\n`);
         }
@@ -1421,6 +1523,8 @@ function readInkShutdownState(value) {
         return undefined;
     if (candidate.detachStdinForHandoff !== undefined && typeof candidate.detachStdinForHandoff !== 'function')
         return undefined;
+    if (candidate.drainStdin !== undefined && typeof candidate.drainStdin !== 'function')
+        return undefined;
     if (candidate.frontFrame !== undefined && !isFrameState(candidate.frontFrame))
         return undefined;
     if (candidate.displayCursor !== undefined && candidate.displayCursor !== null && !isCursorState(candidate.displayCursor))

package/lib/types/dsh-adapter/settings-sections.d.ts

@@ -129,5 +129,6 @@ export declare class TuiSettingsSectionsRuntime extends Service {
     subscribe(listener: () => void): () => void;
 }
 export declare function getHostSettingsSections(runtime: TuiSettingsSectionsRuntime | undefined): TuiSettingsSectionsHost | undefined;
+export declare function getLocalSettingsSectionsHost(): TuiSettingsSectionsHost;
 export default TuiSettingsSectionsRuntime;
 //# sourceMappingURL=settings-sections.d.ts.map

package/lib/types/dsh-adapter/settings-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/settings-sections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-sections.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/settings-sections.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAG3D,iEAAiE;AACjE,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAA;AAE3E,MAAM,WAAW,sBAAsB;IACrC,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,iDAAiD;IACjD,YAAY,CAAC,EAAE,qBAAqB,CAAA;CACrC;AAED,6DAA6D;AAC7D,MAAM,WAAW,gBAAgB;IAC/B,oDAAoD;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,gDAAgD;IAChD,KAAK,EAAE,MAAM,CAAA;IACb,iDAAiD;IACjD,YAAY,CAAC,EAAE,qBAAqB,CAAA;CACrC;AAED,oEAAoE;AACpE,MAAM,MAAM,qBAAqB,GAC7B;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAErB,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAA;IACb,iDAAiD;IACjD,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;IACxC,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,oBAAoB,CAAA;IAC1B,wDAAwD;IACxD,OAAO,CAAC,EAAE,SAAS,sBAAsB,EAAE,CAAA;IAC3C,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IACxB;;;OAGG;IACH,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAA;IAC/B;;;;;;OAMG;IACH,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAAA;CACxD;AAED,2DAA2D;AAC3D,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAA;IACV,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,iDAAiD;IACjD,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,oDAAoD;IACpD,MAAM,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;IACpC,yCAAyC;IACzC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAA;CACpC;AAED,6EAA6E;AAC7E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAAA;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE,CAAA;IACrC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,mBAAmB,EAAE,0BAA0B,CAAA;KAChD;CACF;AAED,eAAO,MAAM,IAAI,8BAA8B,CAAA;AAE/C;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,OAAO;gBACzC,GAAG,EAAE,OAAO;IAmBxB,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,IAAI;IASjD,iDAAiD;IACjD,IAAI,IAAI,SAAS,kBAAkB,EAAE;IAQrC,sDAAsD;IACtD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAQnD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;CAS5C;AAwFD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,GAAG,SAAS,GAAG,uBAAuB,GAAG,SAAS,CAO5H;AAuBD,wBAAgB,4BAA4B,IAAI,uBAAuB,CAatE;AAED,eAAe,0BAA0B,CAAA"}

package/lib/types/dsh-adapter/settings-sections.js

@@ -82,7 +82,7 @@ function settingsSectionStateFor(runtime) {
     return state;
 }
 function registerSection(runtime, section, owner) {
-    const state = settingsSectionStateFor(runtime);
+    const state = isSectionState(runtime) ? runtime : settingsSectionStateFor(runtime);
     const ns = section.ns.trim();
     if (!/^[a-z][a-z0-9_-]*$/u.test(ns))
         throw new TypeError(`invalid TUI settings-section namespace: ${section.ns}`);
@@ -141,7 +141,7 @@ function registerSection(runtime, section, owner) {
     };
 }
 function subscribeSections(runtime, listener, owner) {
-    const state = settingsSectionStateFor(runtime);
+    const state = isSectionState(runtime) ? runtime : settingsSectionStateFor(runtime);
     const entry = { owner, listener };
     state.listeners.add(entry);
     return () => {
@@ -165,4 +165,37 @@ export function getHostSettingsSections(runtime) {
         return undefined;
     }
 }
+function isSectionState(value) {
+    return value instanceof Map === false && 'sections' in value && 'listeners' in value;
+}
+/**
+ * In-package fallback registry: some real compositions dispose the
+ * `dsh-tui-settings-sections` service row right after it loads (the whole
+ * dsh-tui-* host-seam insert list is affected — see the issue-#183 skew
+ * family), leaving `ctx.get('tuiSettingsSections')` permanently undefined.
+ * The TUI's own section must not depend on that: plugin.ts registers into —
+ * and channel.ts reads from — this local host whenever the composition
+ * service is unavailable. Third-party sections still require the service
+ * row; the local host only carries the TUI's own section.
+ */
+const localSectionsState = {
+    sections: new Map(),
+    owners: new Map(),
+    listeners: new Set(),
+    host: undefined,
+};
+export function getLocalSettingsSectionsHost() {
+    localSectionsState.host ??= Object.freeze({
+        register(section) {
+            return registerSection(localSectionsState, section);
+        },
+        list() {
+            return [...localSectionsState.sections.values()];
+        },
+        subscribe(listener) {
+            return subscribeSections(localSectionsState, listener);
+        },
+    });
+    return localSectionsState.host;
+}
 export default TuiSettingsSectionsRuntime;

package/lib/types/history.d.ts

@@ -16,9 +16,10 @@ export declare function appendHistory(text: string): void;
  */
 export declare function loadHistory(): HistoryEntry[];
 /**
- * Stable id for a history entry (dedupes React keys across identical texts).
+ * Stable id for a history entry (keeps React keys distinct across identical texts).
  * @param entry - The history entry to hash.
- * @returns A 12-char hex id derived from the entry text.
+ * @param index - Position in the currently rendered result list.
+ * @returns A 12-char hex id derived from the entry text, timestamp, and index.
  */
-export declare function historyEntryId(entry: HistoryEntry): string;
+export declare function historyEntryId(entry: HistoryEntry, index?: number): string;
 //# sourceMappingURL=history.d.ts.map

package/lib/types/history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/history.ts"],"names":[],"mappings":"AAQA,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AA0BD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAuBhD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAE5C;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE1D"}
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/history.ts"],"names":[],"mappings":"AASA,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAmED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAwBhD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,YAAY,EAAE,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,SAAI,GAAG,MAAM,CAErE"}

package/lib/types/history.js

@@ -1,10 +1,56 @@
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { DATA_DIR } from './utils/paths.js';
 const HISTORY_DIR = DATA_DIR;
 const HISTORY_FILE = join(HISTORY_DIR, 'history.jsonl');
+const HISTORY_LOCK = `${HISTORY_FILE}.lock`;
 const HISTORY_LIMIT = 200;
+const LOCK_RETRY_LIMIT = 500;
+const LOCK_RETRY_DELAY_MS = 5;
+const STALE_LOCK_MS = 30_000;
+function sleepSync(ms) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function removeStaleHistoryLock() {
+    try {
+        const ageMs = Date.now() - statSync(HISTORY_LOCK).mtimeMs;
+        if (ageMs < STALE_LOCK_MS)
+            return false;
+        rmSync(HISTORY_LOCK, { recursive: true, force: true });
+        return true;
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === 'ENOENT')
+            return true;
+        throw error;
+    }
+}
+function withHistoryLock(write) {
+    mkdirSync(HISTORY_DIR, { recursive: true });
+    for (let attempt = 0; attempt < LOCK_RETRY_LIMIT; attempt += 1) {
+        try {
+            mkdirSync(HISTORY_LOCK);
+            try {
+                write();
+            }
+            finally {
+                rmSync(HISTORY_LOCK, { recursive: true, force: true });
+            }
+            return;
+        }
+        catch (error) {
+            const code = error.code;
+            if (code !== 'EEXIST')
+                throw error;
+            if (removeStaleHistoryLock())
+                continue;
+            sleepSync(LOCK_RETRY_DELAY_MS + Math.floor(Math.random() * 5));
+        }
+    }
+    throw new Error('history lock busy');
+}
 function loadRaw() {
     if (!existsSync(HISTORY_FILE))
         return [];
@@ -39,20 +85,21 @@ export function appendHistory(text) {
     const trimmed = text.trim();
     if (!trimmed)
         return;
-    const entries = loadRaw();
-    // Skip consecutive duplicates (CC behavior: repeated submits of the same
-    // command only advance the existing entry's timestamp).
-    const last = entries[entries.length - 1];
-    if (last && last.text === trimmed) {
-        last.ts = Date.now();
-    }
-    else {
-        entries.push({ text: trimmed, ts: Date.now() });
-    }
-    const sliced = entries.slice(-HISTORY_LIMIT);
     try {
-        mkdirSync(HISTORY_DIR, { recursive: true });
-        writeFileSync(HISTORY_FILE, sliced.map(e => JSON.stringify(e)).join('\n') + '\n', 'utf8');
+        withHistoryLock(() => {
+            const entries = loadRaw();
+            // Skip consecutive duplicates (CC behavior: repeated submits of the same
+            // command only advance the existing entry's timestamp).
+            const last = entries[entries.length - 1];
+            if (last && last.text === trimmed) {
+                last.ts = Date.now();
+            }
+            else {
+                entries.push({ text: trimmed, ts: Date.now() });
+            }
+            const sliced = entries.slice(-HISTORY_LIMIT);
+            writeFileSync(HISTORY_FILE, sliced.map(e => JSON.stringify(e)).join('\n') + '\n', 'utf8');
+        });
     }
     catch {
         // Best-effort persistence; history still works for the session.
@@ -66,10 +113,11 @@ export function loadHistory() {
     return loadRaw().reverse();
 }
 /**
- * Stable id for a history entry (dedupes React keys across identical texts).
+ * Stable id for a history entry (keeps React keys distinct across identical texts).
  * @param entry - The history entry to hash.
- * @returns A 12-char hex id derived from the entry text.
+ * @param index - Position in the currently rendered result list.
+ * @returns A 12-char hex id derived from the entry text, timestamp, and index.
  */
-export function historyEntryId(entry) {
-    return createHash('sha1').update(entry.text).digest('hex').slice(0, 12);
+export function historyEntryId(entry, index = 0) {
+    return createHash('sha1').update(`${entry.text}\0${entry.ts}\0${index}`).digest('hex').slice(0, 12);
 }