@relace-ai/jacq 0.1.2-beta.4 → 0.1.2-beta.6

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 (94) hide show
  1. package/dist/actions/messages.d.ts +16 -16
  2. package/dist/actions/messages.js +47 -29
  3. package/dist/actions/messages.js.map +1 -1
  4. package/dist/actions/tasks.d.ts +1 -2
  5. package/dist/actions/tasks.js +8 -8
  6. package/dist/actions/tasks.js.map +1 -1
  7. package/dist/approvalGate.d.ts +42 -0
  8. package/dist/approvalGate.js +140 -0
  9. package/dist/approvalGate.js.map +1 -0
  10. package/dist/approvals.d.ts +21 -0
  11. package/dist/approvals.js +79 -0
  12. package/dist/approvals.js.map +1 -0
  13. package/dist/auth.d.ts +1 -0
  14. package/dist/auth.js +3 -0
  15. package/dist/auth.js.map +1 -1
  16. package/dist/charWidth.d.ts +7 -0
  17. package/dist/charWidth.js +24 -19
  18. package/dist/charWidth.js.map +1 -1
  19. package/dist/clipboard.d.ts +0 -5
  20. package/dist/clipboard.js +0 -5
  21. package/dist/clipboard.js.map +1 -1
  22. package/dist/commands.js +3 -2
  23. package/dist/commands.js.map +1 -1
  24. package/dist/config.d.ts +2 -1
  25. package/dist/config.js +17 -10
  26. package/dist/config.js.map +1 -1
  27. package/dist/connection.d.ts +2 -0
  28. package/dist/connection.js +199 -6
  29. package/dist/connection.js.map +1 -1
  30. package/dist/index.js +196 -34
  31. package/dist/index.js.map +1 -1
  32. package/dist/markdown/parser.js +248 -60
  33. package/dist/markdown/parser.js.map +1 -1
  34. package/dist/markdown/renderer.d.ts +3 -3
  35. package/dist/markdown/renderer.js +254 -108
  36. package/dist/markdown/renderer.js.map +1 -1
  37. package/dist/markdown/types.d.ts +4 -1
  38. package/dist/markdown/types.js.map +1 -1
  39. package/dist/protocol.d.ts +0 -2
  40. package/dist/protocol.js +137 -98
  41. package/dist/protocol.js.map +1 -1
  42. package/dist/renderer.js +4 -0
  43. package/dist/renderer.js.map +1 -1
  44. package/dist/startupAnimation.d.ts +4 -0
  45. package/dist/startupAnimation.js +326 -0
  46. package/dist/startupAnimation.js.map +1 -0
  47. package/dist/state.js +23 -5
  48. package/dist/state.js.map +1 -1
  49. package/dist/styles.js +4 -1
  50. package/dist/styles.js.map +1 -1
  51. package/dist/terminal.d.ts +9 -0
  52. package/dist/terminal.js +15 -0
  53. package/dist/terminal.js.map +1 -1
  54. package/dist/tools/registry.js +138 -13
  55. package/dist/tools/registry.js.map +1 -1
  56. package/dist/types.d.ts +57 -21
  57. package/dist/types.js +3 -1
  58. package/dist/types.js.map +1 -1
  59. package/dist/ui/config.d.ts +6 -0
  60. package/dist/ui/config.js +53 -0
  61. package/dist/ui/config.js.map +1 -0
  62. package/dist/ui/diffViewer.d.ts +9 -0
  63. package/dist/ui/diffViewer.js +320 -0
  64. package/dist/ui/diffViewer.js.map +1 -0
  65. package/dist/ui/index.js +40 -21
  66. package/dist/ui/index.js.map +1 -1
  67. package/dist/ui/input.d.ts +1 -1
  68. package/dist/ui/input.js +40 -15
  69. package/dist/ui/input.js.map +1 -1
  70. package/dist/ui/localCommands.d.ts +8 -0
  71. package/dist/ui/localCommands.js +267 -0
  72. package/dist/ui/localCommands.js.map +1 -0
  73. package/dist/ui/messages.js +195 -93
  74. package/dist/ui/messages.js.map +1 -1
  75. package/dist/ui/primitives.js +2 -1
  76. package/dist/ui/primitives.js.map +1 -1
  77. package/dist/ui/promptInput.js +42 -8
  78. package/dist/ui/promptInput.js.map +1 -1
  79. package/dist/ui/promptPicker.js +3 -4
  80. package/dist/ui/promptPicker.js.map +1 -1
  81. package/dist/ui/resumeTask.d.ts +6 -0
  82. package/dist/ui/resumeTask.js +136 -0
  83. package/dist/ui/resumeTask.js.map +1 -0
  84. package/dist/ui/sessions.js +2 -2
  85. package/dist/ui/sessions.js.map +1 -1
  86. package/dist/ui/welcome.js +22 -35
  87. package/dist/ui/welcome.js.map +1 -1
  88. package/dist/utils/resolvePath.d.ts +10 -0
  89. package/dist/utils/resolvePath.js +24 -0
  90. package/dist/utils/resolvePath.js.map +1 -0
  91. package/package.json +7 -4
  92. package/dist/ui/backgroundTasks.d.ts +0 -7
  93. package/dist/ui/backgroundTasks.js +0 -192
  94. package/dist/ui/backgroundTasks.js.map +0 -1
@@ -0,0 +1,320 @@
1
+ /**
2
+ * Diff Viewer Component — renders unified diffs in the terminal
3
+ *
4
+ * Uses @pierre/diffs for diff computation, renders to screen buffer.
5
+ * Two modes: compact (default, height-capped) and fullscreen (Ctrl+E, scrollable).
6
+ */
7
+ import { drawText, drawHLine } from './primitives.js';
8
+ import { markDirty } from '../state.js';
9
+ import { scrollHint } from '../terminal.js';
10
+ import { parseDiffFromFile } from '@pierre/diffs';
11
+ /** Flatten hunks into DiffLine objects with shared line numbers for changes */
12
+ function flattenHunks(hunks, totalNewLines) {
13
+ const lines = [];
14
+ for (const hunk of hunks) {
15
+ if (hunk.collapsedBefore > 0) {
16
+ lines.push({
17
+ lineNum: 0,
18
+ type: 'separator',
19
+ text: `${hunk.collapsedBefore} unmodified lines`,
20
+ skipped: hunk.collapsedBefore,
21
+ });
22
+ }
23
+ let displayLine = hunk.additionStart;
24
+ for (const content of hunk.hunkContent) {
25
+ if (content.type === 'context') {
26
+ for (const text of content.lines) {
27
+ lines.push({ lineNum: displayLine, type: 'context', text: text.trimEnd() });
28
+ displayLine++;
29
+ }
30
+ }
31
+ else {
32
+ const change = content;
33
+ const changeStart = displayLine;
34
+ for (let i = 0; i < change.deletions.length; i++) {
35
+ lines.push({ lineNum: changeStart + i, type: 'deletion', text: change.deletions[i].trimEnd() });
36
+ }
37
+ for (let i = 0; i < change.additions.length; i++) {
38
+ lines.push({ lineNum: changeStart + i, type: 'addition', text: change.additions[i].trimEnd() });
39
+ }
40
+ displayLine = changeStart + change.additions.length;
41
+ }
42
+ }
43
+ }
44
+ if (hunks.length > 0) {
45
+ const lastHunk = hunks[hunks.length - 1];
46
+ const lastHunkEnd = lastHunk.additionStart + lastHunk.additionLines;
47
+ const trailingLines = totalNewLines - lastHunkEnd;
48
+ if (trailingLines > 0) {
49
+ lines.push({
50
+ lineNum: 0,
51
+ type: 'separator',
52
+ text: `${trailingLines} unmodified lines`,
53
+ skipped: trailingLines,
54
+ });
55
+ }
56
+ }
57
+ return lines;
58
+ }
59
+ // Cache diff computation — recompute only when content changes
60
+ let cachedOld = null;
61
+ let cachedNew = null;
62
+ let cachedLines = null;
63
+ function getDiffLines(state) {
64
+ const oldContent = state.diffViewerOldContent ?? '';
65
+ const newContent = state.diffViewerNewContent ?? '';
66
+ if (cachedLines && cachedOld === oldContent && cachedNew === newContent) {
67
+ return cachedLines;
68
+ }
69
+ const fileName = state.diffViewerFileName ?? '';
70
+ const diff = parseDiffFromFile({ name: fileName, contents: oldContent }, { name: fileName, contents: newContent });
71
+ const totalNewLines = newContent.split('\n').length;
72
+ cachedLines = flattenHunks(diff.hunks, totalNewLines);
73
+ cachedOld = oldContent;
74
+ cachedNew = newContent;
75
+ return cachedLines;
76
+ }
77
+ function getOptions(state) {
78
+ const dir = state.diffViewerSuggestedDir || process.cwd();
79
+ return [
80
+ 'Yes',
81
+ `Yes, and allow edits in ${dir}`,
82
+ 'No',
83
+ ];
84
+ }
85
+ /** Number of rows used by top chrome: separator + title + path + faint border */
86
+ const TOP_CHROME = 4;
87
+ /** Number of rows used by bottom chrome: faint border + question + 3 options + blank + separator + hints */
88
+ const BOTTOM_CHROME = 8;
89
+ /** Draw a single diff line at the given row */
90
+ function drawDiffLine(screen, dl, row, width, styles) {
91
+ const numWidth = 6;
92
+ const gutterWidth = numWidth + 3;
93
+ const numStr = String(dl.lineNum).padStart(numWidth);
94
+ const indicatorCol = numWidth + 1;
95
+ const contentCol = gutterWidth;
96
+ const maxContent = Math.max(0, width - contentCol);
97
+ const content = dl.text.slice(0, maxContent);
98
+ if (dl.type === 'separator') {
99
+ drawText(screen, 5, row, '\u205E', styles.dim);
100
+ return;
101
+ }
102
+ if (dl.type === 'deletion') {
103
+ drawText(screen, 0, row, numStr, styles.diffRemovedNumBg);
104
+ screen.set(numWidth, row, ' ', styles.diffRemovedBg);
105
+ drawText(screen, indicatorCol, row, '-', styles.diffRemovedIndicatorBg);
106
+ screen.set(indicatorCol + 1, row, ' ', styles.diffRemovedBg);
107
+ drawText(screen, contentCol, row, content, styles.diffRemovedTextBg);
108
+ for (let p = contentCol + content.length; p < width; p++) {
109
+ screen.set(p, row, ' ', styles.diffRemovedBg);
110
+ }
111
+ }
112
+ else if (dl.type === 'addition') {
113
+ drawText(screen, 0, row, numStr, styles.diffAddedNumBg);
114
+ screen.set(numWidth, row, ' ', styles.diffAddedBg);
115
+ drawText(screen, indicatorCol, row, '+', styles.diffAddedIndicatorBg);
116
+ screen.set(indicatorCol + 1, row, ' ', styles.diffAddedBg);
117
+ drawText(screen, contentCol, row, content, styles.diffAddedTextBg);
118
+ for (let p = contentCol + content.length; p < width; p++) {
119
+ screen.set(p, row, ' ', styles.diffAddedBg);
120
+ }
121
+ }
122
+ else {
123
+ drawText(screen, 0, row, numStr, styles.dim);
124
+ drawText(screen, indicatorCol, row, ' ', styles.dim);
125
+ drawText(screen, contentCol, row, content, styles.dim);
126
+ }
127
+ }
128
+ /** Draw bottom chrome (faint border, question, options, blank, separator, hints). Returns next row. */
129
+ function drawBottomChrome(screen, row, state, width, styles, isFullscreen, fileName, truncatedCount) {
130
+ drawHLine(screen, 0, row, width, styles.faintBorder, '╌');
131
+ if (truncatedCount && truncatedCount > 0) {
132
+ const truncMsg = ` ... +${truncatedCount} more lines `;
133
+ const tx = Math.max(0, Math.floor((width - truncMsg.length) / 2));
134
+ drawText(screen, tx, row, truncMsg, styles.faintBorder);
135
+ }
136
+ row++;
137
+ const questionPrefix = 'Do you want to make this edit to ';
138
+ drawText(screen, 1, row, questionPrefix, styles.text);
139
+ drawText(screen, 1 + questionPrefix.length, row, fileName, styles.title);
140
+ drawText(screen, 1 + questionPrefix.length + fileName.length, row, '?', styles.text);
141
+ row++;
142
+ const options = getOptions(state);
143
+ for (let i = 0; i < options.length; i++) {
144
+ const isSelected = state.diffViewerIndex === i;
145
+ const prefix = isSelected ? ' \u276F ' : ' ';
146
+ drawText(screen, 0, row, prefix, styles.text);
147
+ drawText(screen, 3, row, `${i + 1}.`, styles.text);
148
+ const maxOpt = Math.max(0, width - 7);
149
+ drawText(screen, 6, row, options[i].slice(0, maxOpt), isSelected ? styles.title : styles.text);
150
+ row++;
151
+ }
152
+ row++; // blank after options
153
+ drawHLine(screen, 0, row, width, styles.border);
154
+ row++;
155
+ let hx = 1;
156
+ drawText(screen, hx, row, 'Esc', styles.value);
157
+ hx += 3;
158
+ drawText(screen, hx, row, ' cancel', styles.hint);
159
+ hx += 7;
160
+ drawText(screen, hx, row, ' ^E', styles.value);
161
+ hx += 4;
162
+ drawText(screen, hx, row, isFullscreen ? ' compact' : ' fullscreen', styles.hint);
163
+ if (isFullscreen) {
164
+ hx += 8;
165
+ drawText(screen, hx, row, ` ${scrollHint}`, styles.value);
166
+ hx += 2 + scrollHint.length;
167
+ drawText(screen, hx, row, ' scroll', styles.hint);
168
+ }
169
+ row++;
170
+ return row;
171
+ }
172
+ const diffViewer = {
173
+ height(state, layout) {
174
+ if (state.diffViewerFullscreen) {
175
+ return layout ? layout.height : 24;
176
+ }
177
+ const termHeight = layout ? layout.height : 24;
178
+ const maxDiffLines = Math.min(10, Math.max(3, termHeight - BOTTOM_CHROME - TOP_CHROME));
179
+ const lines = getDiffLines(state);
180
+ const visibleLines = Math.min(lines.length, maxDiffLines);
181
+ return TOP_CHROME + visibleLines + BOTTOM_CHROME;
182
+ },
183
+ draw(screen, y, state, layout, styles) {
184
+ const lines = getDiffLines(state);
185
+ if (state.diffViewerFullscreen) {
186
+ drawFullscreen(screen, y, state, layout, styles, lines);
187
+ }
188
+ else {
189
+ drawCompact(screen, y, state, layout, styles, lines);
190
+ }
191
+ },
192
+ handleKey(_str, key, state) {
193
+ // Block other overlay toggles
194
+ if (key.name === 'tab')
195
+ return { handled: true };
196
+ if (key.ctrl && key.name === 'a')
197
+ return { handled: true };
198
+ if (key.ctrl && key.name === 'w')
199
+ return { handled: true };
200
+ if (key.ctrl && key.name === 'f')
201
+ return { handled: true };
202
+ // Ctrl+E: toggle fullscreen
203
+ if (key.ctrl && key.name === 'e') {
204
+ state.diffViewerFullscreen = !state.diffViewerFullscreen;
205
+ state.diffViewerScrollOffset = 0;
206
+ state.forceFullRedraw = true;
207
+ markDirty();
208
+ return { handled: true };
209
+ }
210
+ // Shift+Up/Down: scroll in fullscreen
211
+ if (state.diffViewerFullscreen && key.shift && key.name === 'up') {
212
+ const lines = getDiffLines(state);
213
+ const termHeight = state.layout.height;
214
+ const diffAreaHeight = Math.max(1, termHeight - TOP_CHROME - BOTTOM_CHROME);
215
+ const maxScroll = Math.max(0, lines.length - diffAreaHeight);
216
+ state.diffViewerScrollOffset = Math.min(maxScroll, state.diffViewerScrollOffset + 3);
217
+ markDirty();
218
+ return { handled: true };
219
+ }
220
+ if (state.diffViewerFullscreen && key.shift && key.name === 'down') {
221
+ state.diffViewerScrollOffset = Math.max(0, state.diffViewerScrollOffset - 3);
222
+ markDirty();
223
+ return { handled: true };
224
+ }
225
+ if (key.name === 'escape') {
226
+ state.overlay = null;
227
+ state.diffViewerIndex = 0;
228
+ state.diffViewerFullscreen = false;
229
+ state.diffViewerScrollOffset = 0;
230
+ state.forceFullRedraw = true;
231
+ markDirty();
232
+ return { handled: true, action: 'editReject' };
233
+ }
234
+ if (key.name === 'up') {
235
+ const maxIdx = getOptions(state).length - 1;
236
+ state.diffViewerIndex = state.diffViewerIndex > 0
237
+ ? state.diffViewerIndex - 1
238
+ : maxIdx;
239
+ markDirty();
240
+ return { handled: true };
241
+ }
242
+ if (key.name === 'down') {
243
+ const maxIdx = getOptions(state).length - 1;
244
+ state.diffViewerIndex = state.diffViewerIndex < maxIdx
245
+ ? state.diffViewerIndex + 1
246
+ : 0;
247
+ markDirty();
248
+ return { handled: true };
249
+ }
250
+ if (key.name === 'return') {
251
+ const selected = state.diffViewerIndex;
252
+ state.overlay = null;
253
+ state.diffViewerIndex = 0;
254
+ state.diffViewerFullscreen = false;
255
+ state.diffViewerScrollOffset = 0;
256
+ state.forceFullRedraw = true;
257
+ markDirty();
258
+ if (selected === 0) {
259
+ return { handled: true, action: 'editApprove' };
260
+ }
261
+ else if (selected === 1) {
262
+ return { handled: true, action: 'editAllowAll' };
263
+ }
264
+ else {
265
+ return { handled: true, action: 'editReject' };
266
+ }
267
+ }
268
+ return { handled: false };
269
+ }
270
+ };
271
+ /** Compact mode: height-capped, diff lines sliced to fit */
272
+ function drawCompact(screen, y, state, layout, styles, lines) {
273
+ const width = layout.width;
274
+ const termHeight = layout.height;
275
+ const maxDiffLines = Math.min(10, Math.max(3, termHeight - BOTTOM_CHROME - TOP_CHROME));
276
+ const visibleLines = lines.slice(0, maxDiffLines);
277
+ const truncatedCount = lines.length - visibleLines.length;
278
+ let row = y;
279
+ drawHLine(screen, 0, row, width, styles.border);
280
+ row++;
281
+ drawText(screen, 1, row, 'Edit File', styles.title);
282
+ row++;
283
+ const fileName = state.diffViewerFileName ?? '';
284
+ drawText(screen, 1, row, fileName, styles.dim);
285
+ row++;
286
+ drawHLine(screen, 0, row, width, styles.faintBorder, '╌');
287
+ row++;
288
+ for (const dl of visibleLines) {
289
+ drawDiffLine(screen, dl, row, width, styles);
290
+ row++;
291
+ }
292
+ drawBottomChrome(screen, row, state, width, styles, false, fileName, truncatedCount);
293
+ }
294
+ /** Fullscreen mode: fills terminal, scrollable */
295
+ function drawFullscreen(screen, y, state, layout, styles, lines) {
296
+ const width = layout.width;
297
+ const totalHeight = layout.height;
298
+ let row = y;
299
+ drawHLine(screen, 0, row, width, styles.border);
300
+ row++;
301
+ drawText(screen, 1, row, 'Edit File', styles.title);
302
+ row++;
303
+ const fileName = state.diffViewerFileName ?? '';
304
+ drawText(screen, 1, row, fileName, styles.dim);
305
+ row++;
306
+ drawHLine(screen, 0, row, width, styles.faintBorder, '╌');
307
+ row++;
308
+ const diffAreaHeight = Math.max(1, totalHeight - TOP_CHROME - BOTTOM_CHROME);
309
+ const actualDiffArea = Math.min(diffAreaHeight, lines.length);
310
+ const maxScroll = Math.max(0, lines.length - actualDiffArea);
311
+ const scrollOffset = Math.min(state.diffViewerScrollOffset, maxScroll);
312
+ const startIdx = lines.length - actualDiffArea - scrollOffset;
313
+ for (let i = 0; i < actualDiffArea; i++) {
314
+ drawDiffLine(screen, lines[startIdx + i], row, width, styles);
315
+ row++;
316
+ }
317
+ drawBottomChrome(screen, row, state, width, styles, true, fileName);
318
+ }
319
+ export default diffViewer;
320
+ //# sourceMappingURL=diffViewer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diffViewer.js","sourceRoot":"","sources":["../../src/ui/diffViewer.ts"],"names":[],"mappings":"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"}
package/dist/ui/index.js CHANGED
@@ -5,15 +5,18 @@
5
5
  * Components draw directly via screen.set() instead of returning styled lines.
6
6
  */
7
7
  import { state, markDirty } from '../state.js';
8
- import { cancelTask, fetchWidgets } from '../protocol.js';
8
+ import { cancelTask } from '../protocol.js';
9
9
  import { isCurrentTaskRunning, clearMessages } from '../actions/messages.js';
10
10
  import welcome from './welcome.js';
11
11
  import input from './input.js';
12
12
  import sessions from './sessions.js';
13
- import backgroundTasks from './backgroundTasks.js';
14
13
  import promptPicker from './promptPicker.js';
15
14
  import promptInput from './promptInput.js';
16
15
  import filePicker, { initFilePicker } from './filePicker.js';
16
+ import localCommands from './localCommands.js';
17
+ import diffViewer from './diffViewer.js';
18
+ import resumeTask from './resumeTask.js';
19
+ import config from './config.js';
17
20
  import messages from './messages.js';
18
21
  // Styles (initialized by initStyles)
19
22
  let styles = {};
@@ -21,12 +24,21 @@ let styles = {};
21
24
  * Which component handles input in the "active" slot
22
25
  */
23
26
  function getActiveComponent() {
24
- if (state.overlay === 'widgets')
25
- return backgroundTasks;
27
+ if (state.overlay === 'config')
28
+ return config;
26
29
  if (state.overlay === 'sessions')
27
30
  return sessions;
28
31
  if (state.overlay === 'filePicker')
29
32
  return filePicker;
33
+ if (state.overlay === 'localCommands')
34
+ return localCommands;
35
+ if (state.overlay === 'diffViewer')
36
+ return diffViewer;
37
+ if (state.overlay === 'resumeTask')
38
+ return resumeTask;
39
+ if (state.pendingPrompt && state.pendingPrompt.promptType === 'wait_for_client') {
40
+ return resumeTask;
41
+ }
30
42
  if (state.pendingPrompt) {
31
43
  const currentQ = state.pendingPrompt.questions?.[state.pendingPrompt.currentQuestionIndex];
32
44
  if (currentQ?.options && currentQ.options.length > 0 && !state.promptFreeInput) {
@@ -47,6 +59,7 @@ export function initStyles(pool, theme = 'dark') {
47
59
  text: pool.intern({ color: fg }),
48
60
  dim: pool.intern({ color: muted, dim: true }),
49
61
  border: pool.intern({ color: muted, dim: true }),
62
+ faintBorder: pool.intern({ color: 'gray', dim: true }),
50
63
  // Welcome box
51
64
  title: pool.intern({ color: fg, bold: true }),
52
65
  label: pool.intern({ color: muted, dim: true }),
@@ -75,7 +88,7 @@ export function initStyles(pool, theme = 'dark') {
75
88
  mdText: pool.intern({ color: fg }),
76
89
  mdBold: pool.intern({ color: fg, bold: true }),
77
90
  mdItalic: pool.intern({ color: fg, italic: true }),
78
- mdCode: pool.intern({ color: fg, bold: true }),
91
+ mdCode: pool.intern({ color: fg, dim: true }),
79
92
  mdCodeDelim: pool.intern({ color: fg, dim: true }),
80
93
  mdCodeBlock: pool.intern({ color: fg, dim: true }),
81
94
  mdHeading: pool.intern({ color: fg, bold: true }),
@@ -84,6 +97,10 @@ export function initStyles(pool, theme = 'dark') {
84
97
  mdH3: pool.intern({ color: fg, bold: true, italic: true }),
85
98
  mdH5: pool.intern({ color: fg, italic: true }),
86
99
  mdLink: pool.intern({ color: fg, underline: true }),
100
+ mdLinkBold: pool.intern({ color: fg, underline: true, bold: true }),
101
+ mdLinkItalic: pool.intern({ color: fg, underline: true, italic: true }),
102
+ mdLinkCode: pool.intern({ color: fg, underline: true, dim: true }),
103
+ mdLinkBoldItalic: pool.intern({ color: fg, underline: true, bold: true, italic: true }),
87
104
  mdLinkUrl: pool.intern({ color: fg, dim: true }),
88
105
  mdStrikethrough: pool.intern({ color: fg, strikethrough: true }),
89
106
  mdBlockquote: pool.intern({ color: fg }),
@@ -94,6 +111,20 @@ export function initStyles(pool, theme = 'dark') {
94
111
  mdTableRow: pool.intern({ color: fg }),
95
112
  mdHr: pool.intern({ color: muted, dim: true }),
96
113
  mdListBullet: pool.intern({ color: muted, dim: true }),
114
+ // Diff viewer — no background
115
+ diffAdded: pool.intern({ color: 'green' }),
116
+ diffAddedIndicator: pool.intern({ color: 'green', bold: true }),
117
+ diffRemoved: pool.intern({ color: 'red' }),
118
+ diffRemovedIndicator: pool.intern({ color: 'red', bold: true }),
119
+ // Diff viewer — with background (composite styles)
120
+ diffAddedBg: pool.intern({ bgRgb: [20, 40, 20] }),
121
+ diffAddedNumBg: pool.intern({ color: 'green', bgRgb: [20, 40, 20] }),
122
+ diffAddedTextBg: pool.intern({ color: fg, bgRgb: [20, 40, 20] }),
123
+ diffAddedIndicatorBg: pool.intern({ color: 'green', bgRgb: [20, 40, 20] }),
124
+ diffRemovedBg: pool.intern({ bgRgb: [40, 20, 20] }),
125
+ diffRemovedNumBg: pool.intern({ color: 'red', bgRgb: [40, 20, 20] }),
126
+ diffRemovedTextBg: pool.intern({ color: fg, bgRgb: [40, 20, 20] }),
127
+ diffRemovedIndicatorBg: pool.intern({ color: 'red', bgRgb: [40, 20, 20] }),
97
128
  };
98
129
  }
99
130
  /**
@@ -133,9 +164,11 @@ export function draw(screen) {
133
164
  screen.clearAll();
134
165
  const layout = state.layout;
135
166
  let y = 0;
136
- // Draw welcome box
167
+ // Draw welcome box (skip in fullscreen diffViewer — it's hidden behind the overlay)
168
+ const skipWelcome = (state.overlay === 'diffViewer' && state.diffViewerFullscreen)
169
+ || (state.overlay === 'localCommands' && state.localCommandsFullscreen);
137
170
  const welcomeHeight = welcome.height(state);
138
- if (welcomeHeight > 0) {
171
+ if (welcomeHeight > 0 && !skipWelcome) {
139
172
  welcome.draw(screen, y, state, layout, styles);
140
173
  y += welcomeHeight;
141
174
  }
@@ -256,20 +289,6 @@ export function handleKey(str, key) {
256
289
  markDirty();
257
290
  return {};
258
291
  }
259
- // Ctrl+W toggles widgets
260
- if (key.ctrl && key.name === 'w') {
261
- if (state.overlay === 'widgets') {
262
- state.overlay = null;
263
- }
264
- else {
265
- state.overlay = 'widgets';
266
- state.widgetsIndex = 1;
267
- state.widgetsPage = 0;
268
- fetchWidgets();
269
- }
270
- markDirty();
271
- return {};
272
- }
273
292
  // Ctrl+F toggles file picker
274
293
  if (key.ctrl && key.name === 'f') {
275
294
  if (state.overlay === 'filePicker') {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ui/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ui/index.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * Input Bar Component — full-screen draw() API
3
- * Supports multi-line input with Ctrl+J for newlines, visual wrapping, and collapsed paste blocks
3
+ * Supports multi-line input with Shift+Enter for newlines, visual wrapping, and collapsed paste blocks
4
4
  */
5
5
  import type { UIComponent } from '../types.js';
6
6
  declare const input: UIComponent;
package/dist/ui/input.js CHANGED
@@ -1,11 +1,12 @@
1
1
  /**
2
2
  * Input Bar Component — full-screen draw() API
3
- * Supports multi-line input with Ctrl+J for newlines, visual wrapping, and collapsed paste blocks
3
+ * Supports multi-line input with Shift+Enter for newlines, visual wrapping, and collapsed paste blocks
4
4
  */
5
5
  import { drawText, drawHLine } from './primitives.js';
6
6
  import { markDirty } from '../state.js';
7
7
  import { isCurrentTaskRunning } from '../actions/messages.js';
8
8
  import { SLASH_COMMANDS, COLON_COMMANDS, filterCommands } from '../commands.js';
9
+ import { displayWidth } from '../charWidth.js';
9
10
  function getHintMode(state) {
10
11
  // Contextual overrides take priority
11
12
  if (state.statusMessage)
@@ -48,7 +49,8 @@ const PASTE_REGEX = /\x00PASTE(\d+)\x00/g;
48
49
  function getDisplayText(input, pastedBlocks) {
49
50
  return input.replace(PASTE_REGEX, (_, id) => {
50
51
  const block = pastedBlocks.find(b => b.id === parseInt(id));
51
- return block ? `[ Pasted text #${id} +${block.lineCount} lines ]` : '';
52
+ const displayNum = block ? pastedBlocks.indexOf(block) + 1 : 0;
53
+ return block ? `[ Pasted text #${displayNum} +${block.lineCount} lines ]` : '';
52
54
  });
53
55
  }
54
56
  function expandPastedBlocks(input, pastedBlocks) {
@@ -68,12 +70,26 @@ function wrapLines(lines, maxWidth) {
68
70
  if (ln.length === 0) {
69
71
  wrapped.push('');
70
72
  }
71
- else if (ln.length <= maxWidth) {
73
+ else if (displayWidth(ln) <= maxWidth) {
72
74
  wrapped.push(ln);
73
75
  }
74
76
  else {
75
- for (let i = 0; i < ln.length; i += maxWidth) {
76
- wrapped.push(ln.slice(i, i + maxWidth));
77
+ let remaining = ln;
78
+ while (remaining.length > 0) {
79
+ let chunk = '';
80
+ let chunkWidth = 0;
81
+ for (const ch of remaining) {
82
+ const cw = displayWidth(ch);
83
+ if (chunkWidth + cw > maxWidth)
84
+ break;
85
+ chunk += ch;
86
+ chunkWidth += cw;
87
+ }
88
+ if (chunk.length === 0) {
89
+ chunk = [...remaining][0];
90
+ }
91
+ wrapped.push(chunk);
92
+ remaining = remaining.slice(chunk.length);
77
93
  }
78
94
  }
79
95
  }
@@ -82,10 +98,14 @@ function wrapLines(lines, maxWidth) {
82
98
  function getWrappedCursorPos(lines, cursorLine, cursorCol, maxWidth) {
83
99
  let visualLine = 0;
84
100
  for (let i = 0; i < cursorLine; i++) {
85
- visualLine += Math.max(1, Math.ceil((lines[i].length || 1) / maxWidth));
101
+ const lineWidth = displayWidth(lines[i]) || 1;
102
+ visualLine += Math.max(1, Math.ceil(lineWidth / maxWidth));
86
103
  }
87
- visualLine += Math.floor(cursorCol / maxWidth);
88
- return { line: visualLine, column: cursorCol % maxWidth };
104
+ const currentLine = lines[cursorLine] || '';
105
+ const beforeCursor = [...currentLine].slice(0, cursorCol).join('');
106
+ const cursorDisplayCol = displayWidth(beforeCursor);
107
+ visualLine += Math.floor(cursorDisplayCol / maxWidth);
108
+ return { line: visualLine, column: cursorDisplayCol % maxWidth };
89
109
  }
90
110
  function getCursorPosition(text, cursor) {
91
111
  const lines = text.split('\n');
@@ -190,8 +210,6 @@ const input = {
190
210
  drawText(screen, col1 + 3, hintY + 1, ' cancel/clear', styles.hint);
191
211
  drawText(screen, col2, hintY + 1, '^V', styles.value);
192
212
  drawText(screen, col2 + 2, hintY + 1, ' paste image', styles.hint);
193
- drawText(screen, col3, hintY + 1, '^W', styles.value);
194
- drawText(screen, col3 + 2, hintY + 1, ' widgets', styles.hint);
195
213
  // Row 3: / and : commands
196
214
  drawText(screen, col1, hintY + 2, '/', styles.value);
197
215
  drawText(screen, col1 + 1, hintY + 2, ' commands', styles.hint);
@@ -211,17 +229,14 @@ const input = {
211
229
  else if (isCurrentTaskRunning()) {
212
230
  drawText(screen, 2, hintY, 'Esc to interrupt', styles.hint);
213
231
  }
214
- else if (logicalLines.length > 1 || state.input.includes('\n')) {
215
- drawText(screen, 2, hintY, 'Enter to send, Ctrl+J for newline', styles.hint);
216
- }
217
232
  break;
218
233
  }
219
234
  }
220
235
  },
221
236
  handleKey(str, key, state) {
222
237
  const pastedBlocks = state.pastedBlocks || [];
223
- // Ctrl+J: insert newline
224
- if (key.ctrl && key.name === 'j') {
238
+ // Shift+Enter or Ctrl+Enter: insert newline
239
+ if ((key.shift || key.ctrl) && key.name === 'return') {
225
240
  state.input = state.input.slice(0, state.cursor) + '\n' + state.input.slice(state.cursor);
226
241
  state.cursor++;
227
242
  markDirty();
@@ -270,6 +285,16 @@ const input = {
270
285
  markDirty();
271
286
  return { handled: true };
272
287
  }
288
+ // Ctrl+Backspace: clear current line (back to previous newline)
289
+ if (key.ctrl && key.name === 'backspace') {
290
+ const before = state.input.slice(0, state.cursor);
291
+ const lastNewline = before.lastIndexOf('\n');
292
+ const lineStart = lastNewline + 1;
293
+ state.input = state.input.slice(0, lineStart) + state.input.slice(state.cursor);
294
+ state.cursor = lineStart;
295
+ markDirty();
296
+ return { handled: true };
297
+ }
273
298
  // Backspace (delete paste block atomically)
274
299
  if (key.name === 'backspace') {
275
300
  if (state.cursor > 0) {