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

package/lib/types/tips.js

@@ -134,8 +134,8 @@ export const TIPS = [
     {
         id: 'keys-paste',
         group: 'keys',
-        zh: 'Ctrl+V 粘贴文本、文件路径或图片附件',
-        en: 'Ctrl+V pastes text, file paths, or image attachments',
+        zh: 'Ctrl+V 或 Alt+V 粘贴文本、文件路径或图片附件；/settings 可改快捷键',
+        en: 'Ctrl+V or Alt+V pastes text, file paths, or image attachments; remappable in /settings',
     },
     {
         id: 'keys-slash-search',
@@ -361,6 +361,18 @@ export const TIPS = [
         zh: '时间回溯会 fork 新会话，原消息回到输入框',
         en: 'Rewind forks a session; your message returns to the input',
     },
+    {
+        id: 'flow-tree',
+        group: 'workflow',
+        zh: '/tree 打开会话分叉树：悬停预览、点击回退/分叉/切分支',
+        en: '/tree opens the session tree: hover to preview, click to rewind/fork/adopt',
+    },
+    {
+        id: 'flow-fork-copy',
+        group: 'workflow',
+        zh: '/fork 把当前会话复制成可恢复副本，原会话不受影响',
+        en: '/fork copies the session into a resumable twin; the original is untouched',
+    },
     {
         id: 'flow-resume',
         group: 'workflow',
@@ -512,6 +524,12 @@ export const TIPS = [
         zh: '全屏模式鼠标拖选即复制；Esc 取消选区',
         en: 'Drag-select copies instantly in fullscreen; Esc cancels',
     },
+    {
+        id: 'disp-hover-footer',
+        group: 'display',
+        zh: '悬停底栏字段：ctx 原地变等宽压力条，明细走常驻底行，布局不动',
+        en: 'Hover footer fields: ctx morphs in place into a same-width bar, details on a stable line',
+    },
     {
         id: 'disp-wheel-sel',
         group: 'display',
@@ -534,8 +552,8 @@ export const TIPS = [
     {
         id: 'pit-esc',
         group: 'pitfalls',
-        zh: '审批条 Esc=拒绝；问卷 Esc=取消整批提问',
-        en: 'Esc rejects approvals and cancels question batches',
+        zh: '审批条 Esc=拒绝；问卷第 2 题起 Esc=上一题，Ctrl+C=取消整批',
+        en: 'Esc rejects approvals; question batches use Esc for previous and Ctrl+C to cancel',
     },
     {
         id: 'pit-ctrl-c',

package/lib/types/update.d.ts

@@ -1,5 +1,19 @@
 import { shellQuote } from './utils/shellQuote.js';
 export { shellQuote };
+/**
+ * Append a /restart handoff event to ~/.dsh-tui/restart.log.
+ * @param event - Short stable event name.
+ * @param data - Small JSON-safe detail (never credentials or session text).
+ */
+export declare function logRestartEvent(event: string, data?: Record<string, unknown>): void;
+/** Start a fresh, clearly delimited /restart attempt block in the log. */
+export declare function beginRestartAttempt(sessionId: string): void;
+/**
+ * Write a handoff notice to stderr synchronously: process.exit() right after
+ * an async stream write skips the flush, and a vanished diagnosis is
+ * indistinguishable from a silent failure.
+ */
+export declare function writeHandoffNotice(text: string): void;
 export interface TuiUpdateInfo {
     current: string;
     latest: string;
@@ -77,6 +91,26 @@ export declare function resolveTuiUpdateTarget(): Promise<TuiUpdateTarget>;
 export declare function checkForTuiUpdate(): Promise<TuiUpdateInfo | undefined>;
 /** Build the profile-manager command, preferring a preflight-pinned version. */
 export declare function tuiUpdatePluginArgs(profile: string, targetVersion?: string): string[];
+/** The profile's pnpm-workspace.yaml (`$DSH_HOME ?? ~/.dsh` layout). */
+export declare function profileWorkspaceYamlPath(profile: string): string;
+/** What ensureProfileAllowBuilds did to the profile workspace file. */
+export interface AllowBuildsOutcome {
+    /** Keys already present before this run (left untouched). */
+    existing: string[];
+    /** Keys this run appended. */
+    added: string[];
+}
+/**
+ * Make sure the profile's pnpm-workspace.yaml carries explicit `false`
+ * allowBuilds entries for the dsh-tui chain's postinstall-only deps, so a
+ * pnpm ≥11 update is not killed by ERR_PNPM_IGNORED_BUILDS. Best effort and
+ * idempotent: existing entries are never overwritten (an explicit user
+ * decision wins), a missing `allowBuilds:` block is appended, and a missing
+ * file is created. Returns undefined when the profile directory is absent or
+ * the file could not be updated — the caller still runs pnpm, whose own
+ * ERR_PNPM_IGNORED_BUILDS diagnostic stays the visible fallback.
+ */
+export declare function ensureProfileAllowBuilds(profile: string): AllowBuildsOutcome | undefined;
 /**
  * The pnpm Windows tmp-rename race signature (issue #225): pnpm swaps a
  * package directory via a `<name>_tmp_<pid>` staging dir, and a file lock or
@@ -88,6 +122,50 @@ export declare function tuiUpdatePluginArgs(profile: string, targetVersion?: str
  * token, so matching both keeps the retry from masking real failures.
  */
 export declare function isTransientUpdateFailure(stderr: string): boolean;
+/**
+ * The pnpm Linux flavor of the tmp-rename race (issue #479): the very same
+ * `importPackage` staging path, but overlayfs surfaces the second swap of an
+ * already-replaced package dir as EEXIST — deterministically, on every run,
+ * never transiently. A plain retry of the identical command ALWAYS fails the
+ * same way (the leftover `_tmp_<pid>_<threadId>` staging dir keeps colliding),
+ * so this signature must route to the recovery path
+ * (removeStalePackageInstall + rerun), not to the plain retry.
+ */
+export declare function isEexistTmpRenameFailure(stderr: string): boolean;
+/**
+ * The dsh profile layout places plugin packages under
+ * `$DSH_HOME ?? ~/.dsh` — the same root dsh itself resolves
+ * (`dshHomePath is $DSH_HOME ?? ~/.dsh`, and packaged presets resolve
+ * identically). /update's recovery path needs this location to clear a
+ * half-updated install pnpm can no longer swap in place (issue #479).
+ */
+export declare function profilePackageDir(profile: string): string;
+/** What removeStalePackageInstall actually cleared from disk. */
+export interface StaleInstallRemoval {
+    /**
+     * `removed` — the package dir (or its junction/symlink link) is gone;
+     * `absent` — it was not there to begin with (custom profile roots just
+     * miss); `failed` — an error other than ENOENT blocked the removal.
+     */
+    packageDir: 'removed' | 'absent' | 'failed';
+    /** Leftover pnpm staging dirs (`dsh-tui_tmp_<pid>_<threadId>`) removed. */
+    tmpDirs: string[];
+}
+/**
+ * Recovery for the pnpm tmp-rename races (issues #225/#479): remove the
+ * profile's installed copy of this package plus the sibling `_tmp_`
+ * staging dirs a crashed swap leaves behind, so the next installer run
+ * takes the fresh-install path instead of renaming over the collision.
+ * Field-verified workaround (issue #479): `rm -rf <pkg dir>` + rerun
+ * succeeds where ten plain retries fail.
+ *
+ * A junction/symlink at the package dir is UNLINKED only — the link is
+ * removed, the target tree (a dev checkout it may point at) is never
+ * traversed or deleted. Best effort throughout: this runs inside a
+ * failure-recovery branch, so an unusable result simply falls through to
+ * the rerun and the manual repair hint.
+ */
+export declare function removeStalePackageInstall(profile: string): StaleInstallRemoval;
 /**
  * Best-effort migrate the GLOBAL launcher to the delegating shim (0.8.7):
  * after a successful profile update, copy this package's `bin/dsh-tui.js`
@@ -106,6 +184,27 @@ export declare function isTransientUpdateFailure(stderr: string): boolean;
  * @returns true when the global launcher files were replaced.
  */
 export declare function migrateGlobalLauncher(): boolean;
+/** Outcome of the install-only half of an update (no restart). */
+export interface TuiUpdateOutcome {
+    /** 0 = the profile now runs the intended version; non-zero = failed. */
+    code: number;
+    /** Version installed before the update ran (the #307 stamp). */
+    updatedFrom: string;
+    /** Version installed after the update ran, when readable. */
+    installed?: string;
+}
+/**
+ * Install-only half of `/update`: run `dsh plugin add`, refuse boot-deadlock
+ * targets, verify the profile actually advanced, and migrate the global
+ * launcher. No restart — `updateTuiAndRestart` layers the session-preserving
+ * restart on top, and the `dsh-tui update` CLI stops here.
+ *
+ * @param profile - The dsh profile to update.
+ * @param targetVersion - Exact version from the preflight registry check, or
+ *   undefined when that check failed and pnpm should resolve latest.
+ * @returns The update exit code plus the before/after versions.
+ */
+export declare function updateTui(profile: string, targetVersion?: string): Promise<TuiUpdateOutcome>;
 /**
  * Update the installed dsh-tui package and restart the same launcher while
  * preserving the active session. The TUI must already be unmounted before
@@ -125,4 +224,64 @@ export declare function migrateGlobalLauncher(): boolean;
  * @returns Exit codes for the update run and the replacement process.
  */
 export declare function updateTuiAndRestart(sessionId: string, profile: string, targetVersion?: string): Promise<TuiUpdateResult>;
+/**
+ * Headless `dsh-tui update`: the `/update` decision flow (preflight, deadlock
+ * refusal, mirror-lag note, `--latest` fallback) followed by the install-only
+ * half — no TUI, no restart. The bin launcher dynamic-imports this from the
+ * profile copy's compiled lib.
+ *
+ * @param profile - The dsh profile to update.
+ * @returns Process exit code: 0 on success or already-latest, 1 otherwise.
+ */
+export declare function cliUpdate(profile: string): Promise<number>;
+/**
+ * Restart the running TUI in place and resume the active session — the
+ * `/update` restart path minus the pnpm step, for `/restart`. Spawns the
+ * same node process with the original argv and the dual-written resume
+ * contract, so a fresh process re-boots the same profile and attaches the
+ * same session. No installation is touched, so it works on any launch
+ * (profile, source checkout, `--config` overlay). `/update` reuses this
+ * handoff for its own restart tail (`kind: 'update'`): the keyboard-race
+ * hardening below is exactly the failure its users reported (issue #483:
+ * update restarts into a TUI that takes no input).
+ *
+ * The TUI must already be unmounted before this is called (same terminal
+ * handoff contract as `updateTuiAndRestart`): the caller runs this from the
+ * exit funnel's done callback, after finishExit detached the terminal and
+ * the readable stdin pump.
+ *
+ * This waits for the replacement's natural exit: the outer command
+ * interpreter that ran `dsh-tui` reclaims the console the moment the
+ * launch chain (cmd → wrapper → this process) unwinds, and an orphaned
+ * replacement still attached to the console then fights the interpreter's
+ * own prompt and line reader for every keypress (field evidence
+ * 2026-08-24: healthy child mounted the UI, the old process exited on a
+ * 4s survival timer, the interpreter printed its prompt over the TUI and
+ * the DA response bytes landed on the prompt line). Waiting is safe
+ * because finishExit already paused and unref'd this process's stdin —
+ * the child is the console's only key reader (issues #284/#307).
+ *
+ * The 4s survival window remains a DIAGNOSIS marker only: a replacement
+ * that dies within it never painted the TUI, and its captured stderr is
+ * reported synchronously (a raw inherit write can vanish mid-handoff). A
+ * late exit is quiet — by then the user owned a working TUI session.
+ *
+ * @param sessionId - Session to resume in the replacement process.
+ * @param options - `kind: 'update'` drops the /restart boot-diagnosis
+ *   marker and tags restart.log events for the update flow; `env` adds
+ *   marker variables for the replacement (e.g. DSH_TUI_UPDATED_FROM).
+ * @returns 0 when the replacement ran and exited cleanly, 127 when it
+ *   failed to start, otherwise the child's own exit code.
+ */
+export interface TuiRestartOptions {
+    /** Extra env markers for the replacement process (/update's stamp). */
+    env?: Record<string, string>;
+    /**
+     * 'update' reuses this handoff after an install: no
+     * DSH_TUI_RESTART_CHILD marker (that flag is /restart-only boot
+     * diagnostics) and restart.log events carry the update-restart tag.
+     */
+    kind?: 'restart' | 'update';
+}
+export declare function restartTui(sessionId: string, options?: TuiRestartOptions): Promise<number>;
 //# sourceMappingURL=update.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAE,UAAU,EAAE,CAAA;AAQrB,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAA;AAEvB,MAAM,WAAW,eAAe;IAC9B,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAiBxD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,MAAM,GAAG,SAAS,CAahG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG7D;AA4BD;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAcvE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAG5E;AA6DD,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAIrF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CA2C/C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,eAAe,CAAC,CA+E1B"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"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"}