@deepseek-harness-tui/dsh-tui 0.5.1 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/README.md +6 -0
  2. package/cordis.patch.yml +5 -1
  3. package/lib/types/approvals.d.ts +80 -0
  4. package/lib/types/approvals.d.ts.map +1 -0
  5. package/lib/types/approvals.js +170 -0
  6. package/lib/types/commands.d.ts +14 -1
  7. package/lib/types/commands.d.ts.map +1 -1
  8. package/lib/types/commands.js +12 -0
  9. package/lib/types/compat/sessionLog.d.ts.map +1 -1
  10. package/lib/types/compat/sessionLog.js +52 -37
  11. package/lib/types/components/CommandSuggestions.d.ts.map +1 -1
  12. package/lib/types/components/CommandSuggestions.js +5 -3
  13. package/lib/types/components/HelpMenu.d.ts +1 -0
  14. package/lib/types/components/HelpMenu.d.ts.map +1 -1
  15. package/lib/types/components/HelpMenu.js +4 -1
  16. package/lib/types/components/PromptInput.d.ts.map +1 -1
  17. package/lib/types/components/PromptInput.js +16 -15
  18. package/lib/types/components/approvals/ApprovalPanel.d.ts +21 -0
  19. package/lib/types/components/approvals/ApprovalPanel.d.ts.map +1 -0
  20. package/lib/types/components/approvals/ApprovalPanel.js +48 -0
  21. package/lib/types/components/questions/AskUserQuestionPanel.d.ts +6 -0
  22. package/lib/types/components/questions/AskUserQuestionPanel.d.ts.map +1 -1
  23. package/lib/types/components/questions/AskUserQuestionPanel.js +9 -2
  24. package/lib/types/components/questions/PlanReviewPanel.d.ts +39 -0
  25. package/lib/types/components/questions/PlanReviewPanel.d.ts.map +1 -0
  26. package/lib/types/components/questions/PlanReviewPanel.js +168 -0
  27. package/lib/types/i18n.d.ts +174 -2
  28. package/lib/types/i18n.d.ts.map +1 -1
  29. package/lib/types/i18n.js +82 -1
  30. package/lib/types/ink/stringWidth.d.ts.map +1 -1
  31. package/lib/types/ink/stringWidth.js +61 -0
  32. package/lib/types/plugin.d.ts.map +1 -1
  33. package/lib/types/plugin.js +15 -0
  34. package/lib/types/questions.d.ts +3 -0
  35. package/lib/types/questions.d.ts.map +1 -1
  36. package/lib/types/questions.js +13 -1
  37. package/lib/types/screens/Chat.d.ts +8 -13
  38. package/lib/types/screens/Chat.d.ts.map +1 -1
  39. package/lib/types/screens/Chat.js +33 -18
  40. package/lib/types/utils/modifiers.d.ts +19 -0
  41. package/lib/types/utils/modifiers.d.ts.map +1 -0
  42. package/lib/types/utils/modifiers.js +17 -0
  43. package/package.json +2 -1
package/README.md CHANGED
@@ -95,6 +95,12 @@ TUI 启动后会在后台检查 npm 是否有新版本;发现更新时会提
95
95
  | `?` | 快捷键菜单 |
96
96
  | `Shift+↑` | 消息选择模式(Enter 展开单条) |
97
97
 
98
+ **macOS 修饰键**:上表中 Windows/Linux 的 `Ctrl+<键>` 在 macOS 上同时可用 `⌘<键>`
99
+ (如 `⌘V` 粘贴、`⌘O` 展开详情、`⌘Enter` 立即发送);仅 `Ctrl+C` / `Ctrl+D`
100
+ (中断/退出)保持 Ctrl 不变,避免与 macOS 系统级 `⌘C` 复制等肌肉记忆冲突。
101
+ `⌘` 需终端支持扩展键盘协议(iTerm2 / kitty / WezTerm / ghostty / tmux);
102
+ macOS 自带 Terminal.app 会自行消费 `⌘` 快捷键,请继续使用 `Ctrl`。
103
+
98
104
  **鼠标(`fullscreen: true` 全屏模式;默认关,profile 补丁层覆盖开启)**
99
105
 
100
106
  | 操作 | 功能 |
package/cordis.patch.yml CHANGED
@@ -211,8 +211,12 @@
211
211
  # bare name died with ERR_MODULE_NOT_FOUND and disposed the whole app at
212
212
  # boot (#60).
213
213
  # publishIntervalMs 500 keeps the status-line timers ticking smoothly
214
- # (default 2000ms).
214
+ # (default 2000ms). publish is enabled here (upstream default off since
215
+ # 0.2.2) because this profile's resume path repairs third-party event
216
+ # types via src/compat/sessionLog.ts — the TUI is the protected consumer;
217
+ # the bare plugin stays default-off for unprotected web/headless users.
215
218
  - id: working-activity
216
219
  name: '@deepseek-harness-tui/dsh-tui/working-activity'
217
220
  config:
221
+ publish: true
218
222
  publishIntervalMs: 500
@@ -0,0 +1,80 @@
1
+ /**
2
+ * Approval store — the UI-side answerer half of the DSH approval seam
3
+ * (`ctx.approval`). The harness's permission layer asks
4
+ * `ApprovalService.request()`, which dispatches an `approval/request`
5
+ * waterfall; the listener registered in plugin.ts parks the request here,
6
+ * surfaces one ask at a time to the TUI (Claude Code style permission
7
+ * prompt), and settles the harness promise when the user decides, the
8
+ * asker's abort signal fires, or the plugin tears down.
9
+ *
10
+ * Queue semantics mirror QuestionStore: parallel tool calls can trigger
11
+ * several asks before any answer is given, so asks are drained FIFO.
12
+ * Outcomes are the protocol's closed set — `'allowed-once'` and
13
+ * `'rejected'` from the panel, `'cancelled'` on abort/teardown; there is
14
+ * no allow-always or feedback channel in the protocol.
15
+ */
16
+ import type { ApprovalOutcome, ApprovalRequest } from '@deepseek-ai/dsh-user-approval';
17
+ /** What the TUI renders while an approval is pending. */
18
+ export interface ApprovalSnapshot {
19
+ /** Stable key so the panel remounts (fresh focus state) per request. */
20
+ readonly key: string;
21
+ readonly toolName: string;
22
+ /** The asker's human-readable explanation, when given. */
23
+ readonly reason?: string;
24
+ /** The gated command, recovered from the paired tool/call event. */
25
+ readonly command?: string;
26
+ }
27
+ /**
28
+ * Approval store: parks asks from the harness's approval seam, surfaces
29
+ * one at a time to the TUI, and settles each ask when the user decides or
30
+ * the ask is withdrawn. The TUI subscribes for re-renders and decides via
31
+ * {@link ApprovalStore.decide}.
32
+ */
33
+ export declare class ApprovalStore {
34
+ private readonly queue;
35
+ private active;
36
+ private readonly listeners;
37
+ private seq;
38
+ /**
39
+ * Cached snapshot: useSyncExternalStore requires a stable reference while
40
+ * nothing changed (a fresh object per call would loop re-renders).
41
+ */
42
+ private snapshotCache;
43
+ /**
44
+ * Subscribe to store changes (useSyncExternalStore contract).
45
+ * @param listener - Called after every mutation that changes the snapshot.
46
+ * @returns An unsubscribe function removing the listener.
47
+ */
48
+ subscribe(listener: () => void): () => void;
49
+ /**
50
+ * The approval the TUI should render now, or null when idle.
51
+ * @returns The cached snapshot; the reference is stable between mutations.
52
+ */
53
+ getSnapshot(): ApprovalSnapshot | null;
54
+ private emit;
55
+ /** Rebuild the cached snapshot after any mutation of active. */
56
+ private rebuildSnapshot;
57
+ /**
58
+ * Answerer entry point — called by the `approval/request` waterfall
59
+ * listener when the ask concerns the agent this TUI owns.
60
+ * @param req - The approval request (agent, tool, callId, reason, signal).
61
+ * @returns A promise settling with the user's decision, or `'cancelled'`
62
+ * when the ask is withdrawn or the plugin tears down.
63
+ */
64
+ park(req: ApprovalRequest): Promise<ApprovalOutcome>;
65
+ /** Advance to the next queued ask, if any. */
66
+ private startNext;
67
+ /**
68
+ * The user decided on the current approval; settles it and drains the
69
+ * next queued ask if any. No-op when nothing is pending.
70
+ * @param outcome - `'allowed-once'` or `'rejected'`.
71
+ */
72
+ decide(outcome: 'allowed-once' | 'rejected'): void;
73
+ /**
74
+ * Settle the active and all queued asks (plugin teardown). The panel
75
+ * unmounts as the snapshot clears.
76
+ * @param outcome - The outcome every pending ask resolves with.
77
+ */
78
+ settleAll(outcome: ApprovalOutcome): void;
79
+ }
80
+ //# sourceMappingURL=approvals.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"approvals.d.ts","sourceRoot":"","sources":["../../src/approvals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAGtF,yDAAyD;AACzD,MAAM,WAAW,gBAAgB;IAC/B,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,oEAAoE;IACpE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1B;AA0CD;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;IAC9C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwB;IAClD,OAAO,CAAC,GAAG,CAAI;IACf;;;OAGG;IACH,OAAO,CAAC,aAAa,CAAgC;IAErD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAO3C;;;OAGG;IACH,WAAW,IAAI,gBAAgB,GAAG,IAAI;IAItC,OAAO,CAAC,IAAI;IAIZ,gEAAgE;IAChE,OAAO,CAAC,eAAe;IAOvB;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA8BpD,8CAA8C;IAC9C,OAAO,CAAC,SAAS;IAOjB;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI;IAUlD;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CAQ1C"}
@@ -0,0 +1,170 @@
1
+ /**
2
+ * Approval store — the UI-side answerer half of the DSH approval seam
3
+ * (`ctx.approval`). The harness's permission layer asks
4
+ * `ApprovalService.request()`, which dispatches an `approval/request`
5
+ * waterfall; the listener registered in plugin.ts parks the request here,
6
+ * surfaces one ask at a time to the TUI (Claude Code style permission
7
+ * prompt), and settles the harness promise when the user decides, the
8
+ * asker's abort signal fires, or the plugin tears down.
9
+ *
10
+ * Queue semantics mirror QuestionStore: parallel tool calls can trigger
11
+ * several asks before any answer is given, so asks are drained FIFO.
12
+ * Outcomes are the protocol's closed set — `'allowed-once'` and
13
+ * `'rejected'` from the panel, `'cancelled'` on abort/teardown; there is
14
+ * no allow-always or feedback channel in the protocol.
15
+ */
16
+ const COMMAND_CLIP = 500;
17
+ /**
18
+ * Recover the gated command from the session log: the approval request
19
+ * links to an already-presented tool call via `callId`, so the arguments
20
+ * are not duplicated on the request. Mirrors the web client's `commandOf`.
21
+ * @param req - The pending approval request.
22
+ * @returns The `command` argument when present, else the raw arguments
23
+ * string (clipped), else undefined when the call cannot be found.
24
+ */
25
+ function commandOf(req) {
26
+ if (req.callId === undefined)
27
+ return undefined;
28
+ const events = req.agent.session.events;
29
+ for (let i = events.length - 1; i >= 0; i -= 1) {
30
+ const event = events[i];
31
+ if (event.type !== 'tool/call')
32
+ continue;
33
+ if (String(event.data.callId) !== String(req.callId))
34
+ continue;
35
+ const raw = event.data.arguments;
36
+ try {
37
+ const parsed = JSON.parse(raw);
38
+ if (parsed !== null && typeof parsed === 'object' && 'command' in parsed) {
39
+ const command = parsed.command;
40
+ if (typeof command === 'string')
41
+ return command;
42
+ }
43
+ }
44
+ catch {
45
+ // Not JSON — fall through to the raw string.
46
+ }
47
+ return raw.length <= COMMAND_CLIP ? raw : `${raw.slice(0, COMMAND_CLIP)}…`;
48
+ }
49
+ return undefined;
50
+ }
51
+ /**
52
+ * Approval store: parks asks from the harness's approval seam, surfaces
53
+ * one at a time to the TUI, and settles each ask when the user decides or
54
+ * the ask is withdrawn. The TUI subscribes for re-renders and decides via
55
+ * {@link ApprovalStore.decide}.
56
+ */
57
+ export class ApprovalStore {
58
+ queue = [];
59
+ active;
60
+ listeners = new Set();
61
+ seq = 0;
62
+ /**
63
+ * Cached snapshot: useSyncExternalStore requires a stable reference while
64
+ * nothing changed (a fresh object per call would loop re-renders).
65
+ */
66
+ snapshotCache = null;
67
+ /**
68
+ * Subscribe to store changes (useSyncExternalStore contract).
69
+ * @param listener - Called after every mutation that changes the snapshot.
70
+ * @returns An unsubscribe function removing the listener.
71
+ */
72
+ subscribe(listener) {
73
+ this.listeners.add(listener);
74
+ return () => {
75
+ this.listeners.delete(listener);
76
+ };
77
+ }
78
+ /**
79
+ * The approval the TUI should render now, or null when idle.
80
+ * @returns The cached snapshot; the reference is stable between mutations.
81
+ */
82
+ getSnapshot() {
83
+ return this.snapshotCache;
84
+ }
85
+ emit() {
86
+ for (const listener of this.listeners)
87
+ listener();
88
+ }
89
+ /** Rebuild the cached snapshot after any mutation of active. */
90
+ rebuildSnapshot() {
91
+ const pending = this.active;
92
+ this.snapshotCache = pending === undefined
93
+ ? null
94
+ : { key: pending.key, ...pending.snapshot };
95
+ }
96
+ /**
97
+ * Answerer entry point — called by the `approval/request` waterfall
98
+ * listener when the ask concerns the agent this TUI owns.
99
+ * @param req - The approval request (agent, tool, callId, reason, signal).
100
+ * @returns A promise settling with the user's decision, or `'cancelled'`
101
+ * when the ask is withdrawn or the plugin tears down.
102
+ */
103
+ park(req) {
104
+ return new Promise(resolve => {
105
+ const command = commandOf(req);
106
+ const pending = {
107
+ key: String(++this.seq),
108
+ snapshot: {
109
+ toolName: req.toolName,
110
+ ...(req.reason !== undefined ? { reason: req.reason } : {}),
111
+ ...(command !== undefined ? { command } : {}),
112
+ },
113
+ resolve,
114
+ onAbort: () => {
115
+ if (this.active === pending) {
116
+ this.active = undefined;
117
+ this.rebuildSnapshot();
118
+ pending.resolve('cancelled');
119
+ this.startNext();
120
+ return;
121
+ }
122
+ const at = this.queue.indexOf(pending);
123
+ if (at >= 0)
124
+ this.queue.splice(at, 1);
125
+ pending.resolve('cancelled');
126
+ },
127
+ };
128
+ req.signal?.addEventListener('abort', pending.onAbort, { once: true });
129
+ this.queue.push(pending);
130
+ this.startNext();
131
+ });
132
+ }
133
+ /** Advance to the next queued ask, if any. */
134
+ startNext() {
135
+ if (this.active !== undefined || this.queue.length === 0)
136
+ return;
137
+ this.active = this.queue.shift();
138
+ this.rebuildSnapshot();
139
+ this.emit();
140
+ }
141
+ /**
142
+ * The user decided on the current approval; settles it and drains the
143
+ * next queued ask if any. No-op when nothing is pending.
144
+ * @param outcome - `'allowed-once'` or `'rejected'`.
145
+ */
146
+ decide(outcome) {
147
+ const pending = this.active;
148
+ if (pending === undefined)
149
+ return;
150
+ this.active = undefined;
151
+ this.rebuildSnapshot();
152
+ pending.resolve(outcome);
153
+ this.startNext();
154
+ this.emit();
155
+ }
156
+ /**
157
+ * Settle the active and all queued asks (plugin teardown). The panel
158
+ * unmounts as the snapshot clears.
159
+ * @param outcome - The outcome every pending ask resolves with.
160
+ */
161
+ settleAll(outcome) {
162
+ const active = this.active;
163
+ this.active = undefined;
164
+ this.rebuildSnapshot();
165
+ active?.resolve(outcome);
166
+ for (const pending of this.queue.splice(0))
167
+ pending.resolve(outcome);
168
+ this.emit();
169
+ }
170
+ }
@@ -9,7 +9,11 @@
9
9
  export interface LocalCommand {
10
10
  /** The command name without the slash, e.g. `clear`. */
11
11
  name: string;
12
- /** One-line description shown in the suggestion overlay. */
12
+ /**
13
+ * One-line description shown in the suggestion overlay — the English text
14
+ * and the fallback for languages without a `cmd-desc-<name>` dict entry
15
+ * (see {@link localizedDescription}).
16
+ */
13
17
  description: string;
14
18
  /** Optional bracket tag shown between name and description. */
15
19
  tag?: string;
@@ -21,6 +25,15 @@ export interface LocalCommand {
21
25
  * commands merge in at runtime; locals win on name collisions.
22
26
  */
23
27
  export declare const LOCAL_COMMANDS: LocalCommand[];
28
+ /**
29
+ * Resolve a command's description in the active UI language. The en text in
30
+ * `LOCAL_COMMANDS` (and the registry's own text for external commands) is
31
+ * the fallback; zh translations live in the i18n dict under
32
+ * `cmd-desc-<name>`. Resolved at call time — components call this during
33
+ * render, so a `/lang` switch repaints descriptions immediately.
34
+ * @param command - The command whose description to localize.
35
+ */
36
+ export declare function localizedDescription(command: LocalCommand): string;
24
37
  /**
25
38
  * Parse a slash-command line into its name and the verbatim input following
26
39
  * the name (separator whitespace included) — the same split the DSH command
@@ -1 +1 @@
1
- {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,IAAI,EAAE,MAAM,CAAA;IACZ,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAA;IACnB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,YAAY,EA+CxC,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAIhD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,SAAS,YAAY,EAAmB,GAC7C,OAAO,CAKT;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,SAAS,YAAY,EAAmB,GAC7C,YAAY,EAAE,CAKhB"}
1
+ {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,YAAY,EA+CxC,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAElE;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAIhD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,SAAS,YAAY,EAAmB,GAC7C,OAAO,CAKT;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,SAAS,YAAY,EAAmB,GAC7C,YAAY,EAAE,CAKhB"}
@@ -6,6 +6,7 @@
6
6
  * `runCommand` in the Chat screen dispatches either kind, with the registry
7
7
  * handler winning for names both sides declare.
8
8
  */
9
+ import { tOr } from './i18n.js';
9
10
  /**
10
11
  * The built-in slash commands (name + description pairs). Plugin-registered
11
12
  * commands merge in at runtime; locals win on name collisions.
@@ -58,6 +59,17 @@ export const LOCAL_COMMANDS = [
58
59
  { name: 'help', description: 'Show shortcuts and commands' },
59
60
  { name: 'exit', description: 'Exit dsh-tui' },
60
61
  ];
62
+ /**
63
+ * Resolve a command's description in the active UI language. The en text in
64
+ * `LOCAL_COMMANDS` (and the registry's own text for external commands) is
65
+ * the fallback; zh translations live in the i18n dict under
66
+ * `cmd-desc-<name>`. Resolved at call time — components call this during
67
+ * render, so a `/lang` switch repaints descriptions immediately.
68
+ * @param command - The command whose description to localize.
69
+ */
70
+ export function localizedDescription(command) {
71
+ return tOr(`cmd-desc-${command.name}`, command.description);
72
+ }
61
73
  /**
62
74
  * Parse a slash-command line into its name and the verbatim input following
63
75
  * the name (separator whitespace included) — the same split the DSH command
@@ -1 +1 @@
1
- {"version":3,"file":"sessionLog.d.ts","sourceRoot":"","sources":["../../../src/compat/sessionLog.ts"],"names":[],"mappings":"AA8BA,6EAA6E;AAC7E,MAAM,MAAM,mBAAmB,GAC3B,UAAU,GACV,OAAO,GACP,aAAa,CAAA;AAkEjB;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,CA6BhF;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E"}
1
+ {"version":3,"file":"sessionLog.d.ts","sourceRoot":"","sources":["../../../src/compat/sessionLog.ts"],"names":[],"mappings":"AAiCA,6EAA6E;AAC7E,MAAM,MAAM,mBAAmB,GAC3B,UAAU,GACV,OAAO,GACP,aAAa,CAAA;AA4EjB;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,CAsChF;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E"}
@@ -16,10 +16,13 @@
16
16
  * marked, and already-known events are never touched.
17
17
  *
18
18
  * Storage notes: the jsonl persistence flushes by APPENDING zstd frames, so
19
- * the file is a concatenation of frames; every frame is decoded, the log is
20
- * rewritten as one frame, and the file is swapped in atomically (tmp +
21
- * rename). Any decode/parse anomaly aborts the repair and resume proceeds
22
- * unpatched — the failure mode degrades to the pre-patch behavior.
19
+ * the file is a concatenation of frames. Frame layout is load-bearing: the
20
+ * backend asserts frame 0 holds EXACTLY the header line (listings read only
21
+ * that frame; `assertZstdHeaderFrame`), so the repair re-encodes each frame
22
+ * with its original line set — frame boundaries are preserved 1:1, and any
23
+ * frame whose lines were untouched is copied verbatim. Any decode/parse
24
+ * anomaly aborts the repair and resume proceeds unpatched — the failure
25
+ * mode degrades to the pre-patch behavior.
23
26
  * @module @deepseek-harness-tui/dsh-tui/compat/sessionLog
24
27
  */
25
28
  import { KNOWN_SESSION_EVENT_TYPES } from '@deepseek-ai/dsh-session';
@@ -61,11 +64,12 @@ function findSessionLogFile(sessionId) {
61
64
  return undefined;
62
65
  }
63
66
  /**
64
- * Decode a (possibly multi-frame) zstd jsonl log. Frames are split by magic
65
- * scan; any frame failing to decode or any line failing to parse throws, so
66
- * callers abort instead of rewriting a log they did not fully understand.
67
+ * Decode a (possibly multi-frame) zstd jsonl log, keeping frames separate.
68
+ * Frames are split by magic scan; any frame failing to decode or any line
69
+ * failing to parse throws, so callers abort instead of rewriting a log they
70
+ * did not fully understand.
67
71
  * @param buf - Raw file bytes.
68
- * @returns Parsed event envelopes in log order.
72
+ * @returns Per-frame byte spans and parsed event envelopes, in log order.
69
73
  */
70
74
  function decodeFrames(buf) {
71
75
  const offsets = [];
@@ -75,20 +79,21 @@ function decodeFrames(buf) {
75
79
  }
76
80
  if (offsets.length === 0)
77
81
  throw new Error('no zstd frame found');
78
- let text = '';
79
- for (let i = 0; i < offsets.length; i++) {
82
+ return offsets.map((start, i) => {
80
83
  const end = i + 1 < offsets.length ? offsets[i + 1] : buf.length;
81
- text += zstdDecompressSync(buf.subarray(offsets[i], end)).toString('utf8');
82
- }
83
- return text
84
- .split('\n')
85
- .filter((line) => line.length > 0)
86
- .map((line) => {
87
- const parsed = JSON.parse(line);
88
- if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
89
- throw new Error('session log line is not an event envelope');
90
- }
91
- return parsed;
84
+ const raw = buf.subarray(start, end);
85
+ const text = zstdDecompressSync(raw).toString('utf8');
86
+ const events = text
87
+ .split('\n')
88
+ .filter((line) => line.length > 0)
89
+ .map((line) => {
90
+ const parsed = JSON.parse(line);
91
+ if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
92
+ throw new Error('session log line is not an event envelope');
93
+ }
94
+ return parsed;
95
+ });
96
+ return { raw, events };
92
97
  });
93
98
  }
94
99
  /**
@@ -103,25 +108,35 @@ export function repairSessionLogForResume(sessionId) {
103
108
  const file = findSessionLogFile(sessionId);
104
109
  if (file === undefined)
105
110
  return 'unavailable';
106
- const events = decodeFrames(readFileSync(file));
107
- let changed = false;
108
- for (const event of events) {
109
- const type = event['type'];
110
- // Only real log entries carry a numeric seq — the seq-less header row
111
- // is parsed by a separate path that must not see an extra field.
112
- if (typeof type === 'string' &&
113
- typeof event['seq'] === 'number' &&
114
- !KNOWN_SESSION_EVENT_TYPES.has(type) &&
115
- event['ignorable'] === undefined) {
116
- event['ignorable'] = true;
117
- changed = true;
111
+ const frames = decodeFrames(readFileSync(file));
112
+ // Mark unknown types in place, tracking which frames actually changed:
113
+ // untouched frames are copied back verbatim, so the header frame keeps
114
+ // its exact original bytes (and the one-header-line invariant with it).
115
+ const dirty = new Set();
116
+ frames.forEach((frame, index) => {
117
+ for (const event of frame.events) {
118
+ const type = event['type'];
119
+ // Only real log entries carry a numeric seq — the seq-less header row
120
+ // is parsed by a separate path that must not see an extra field.
121
+ if (typeof type === 'string' &&
122
+ typeof event['seq'] === 'number' &&
123
+ !KNOWN_SESSION_EVENT_TYPES.has(type) &&
124
+ event['ignorable'] === undefined) {
125
+ event['ignorable'] = true;
126
+ dirty.add(index);
127
+ }
118
128
  }
119
- }
120
- if (!changed)
129
+ });
130
+ if (dirty.size === 0)
121
131
  return 'clean';
122
- const payload = events.map((event) => JSON.stringify(event)).join('\n') + '\n';
132
+ const parts = frames.map((frame, index) => {
133
+ if (!dirty.has(index))
134
+ return frame.raw;
135
+ const payload = frame.events.map((event) => JSON.stringify(event)).join('\n') + '\n';
136
+ return zstdCompressSync(Buffer.from(payload, 'utf8'));
137
+ });
123
138
  const tmp = `${file}.compat-${randomUUID()}.tmp`;
124
- writeFileSync(tmp, zstdCompressSync(Buffer.from(payload, 'utf8')));
139
+ writeFileSync(tmp, Buffer.concat(parts));
125
140
  renameSync(tmp, file);
126
141
  return 'repaired';
127
142
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,KAAK,CAAC,SAAS,CAoDlB"}
1
+ {"version":3,"file":"CommandSuggestions.d.ts","sourceRoot":"","sources":["../../../src/components/CommandSuggestions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAGlD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,aAAa,EACb,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,KAAK,CAAC,SAAS,CAqDlB"}
@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { Box, Text } from '../ui.js';
3
3
  import { stringWidth } from '../ink/stringWidth.js';
4
4
  import { truncateToWidth } from '../ink/truncateToWidth.js';
5
+ import { localizedDescription } from '../commands.js';
5
6
  /**
6
7
  * The slash-command suggestion overlay, ported from the leak's
7
8
  * `PromptInputFooterSuggestions.tsx` (command layout only): a name column
@@ -25,9 +26,10 @@ export function CommandSuggestions({ commands, selectedIndex, columns, }) {
25
26
  const tagText = command.tag ? `[${command.tag}] ` : '';
26
27
  const tagWidth = stringWidth(tagText);
27
28
  const descriptionWidth = Math.max(0, columns - nameWidth - tagWidth - 4);
28
- const description = stringWidth(command.description) > descriptionWidth
29
- ? truncateToWidth(command.description, descriptionWidth - 1) + '…'
30
- : command.description;
29
+ const rawDescription = localizedDescription(command);
30
+ const description = stringWidth(rawDescription) > descriptionWidth
31
+ ? truncateToWidth(rawDescription, descriptionWidth - 1) + '…'
32
+ : rawDescription;
31
33
  return (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: isSelected ? 'suggestion' : undefined, dimColor: !isSelected, children: padded }), tagText ? _jsx(Text, { dimColor: true, children: tagText }) : null, _jsx(Text, { color: isSelected ? 'suggestion' : undefined, dimColor: !isSelected, children: description })] }, command.name));
32
34
  }) }));
33
35
  }
@@ -5,6 +5,7 @@ import type { LocalCommand } from '../commands.js';
5
5
  * (three-column shortcut layout, trimmed to the keys dsh-tui actually binds).
6
6
  * The command column lists the merged slash-command surface: built-in
7
7
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
8
+ * Modifier labels follow the platform convention: ⌘ on macOS, ctrl elsewhere.
8
9
  */
9
10
  export declare function HelpMenu({ commands, }: {
10
11
  commands: readonly LocalCommand[];
@@ -1 +1 @@
1
- {"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA6DlB"}
1
+ {"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIlD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CA6DlB"}
@@ -1,12 +1,15 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import Box from '../ink/components/Box.js';
3
3
  import Text from '../ink/components/Text.js';
4
+ import { localizedDescription } from '../commands.js';
5
+ import { modLabel } from '../utils/modifiers.js';
4
6
  /**
5
7
  * The `?` help menu, ported from the leak's `PromptInputHelpMenu.tsx`
6
8
  * (three-column shortcut layout, trimmed to the keys dsh-tui actually binds).
7
9
  * The command column lists the merged slash-command surface: built-in
8
10
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
11
+ * Modifier labels follow the platform convention: ⌘ on macOS, ctrl elsewhere.
9
12
  */
10
13
  export function HelpMenu({ commands, }) {
11
- return (_jsxs(Box, { paddingX: 2, flexDirection: "row", gap: 4, children: [_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "/ for commands" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "? for this help" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+o for verbose output" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+t to toggle context" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+r to search history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+c to interrupt" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+d to exit" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+l to redraw" }) })] }), _jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "esc to clear input" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 for history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2190/\u2192 to move cursor" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+\u2190/\u2192 for word jumps" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "tab to complete command" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "shift+tab to cycle effort" }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { dimColor: true, children: "commands:" }), commands.map(command => (_jsx(Box, { children: _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["/", command.name, " \u2014 ", command.description] }) }, command.name)))] })] }));
14
+ return (_jsxs(Box, { paddingX: 2, flexDirection: "row", gap: 4, children: [_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "/ for commands" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "? for this help" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "o for verbose output"] }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "t to toggle context"] }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "r to search history"] }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+c to interrupt" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "ctrl+d to exit" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "l to redraw"] }) })] }), _jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: "esc to clear input" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 for history" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "\u2190/\u2192 to move cursor" }) }), _jsx(Box, { children: _jsxs(Text, { dimColor: true, children: [modLabel, "\u2190/\u2192 for word jumps"] }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "tab to complete command" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "shift+tab to cycle effort" }) })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { dimColor: true, children: "commands:" }), commands.map(command => (_jsx(Box, { children: _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["/", command.name, " \u2014 ", localizedDescription(command)] }) }, command.name)))] })] }));
12
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAwC5C;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBA+xBlB"}
1
+ {"version":3,"file":"PromptInput.d.ts","sourceRoot":"","sources":["../../../src/components/PromptInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAyC5C;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAA;IAClB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,IAAI,IAAI,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACrD,6EAA6E;IAC7E,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,cAAc,CAAC,IAAI,IAAI,CAAA;IACvB,8EAA8E;IAC9E,eAAe,CAAC,IAAI,IAAI,CAAA;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CACzD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,gBAAgB,qBA+xBlB"}