@pentoshi/clai 3.8.2 → 3.8.5

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 (45) hide show
  1. package/dist/agent/runner.js +9 -16
  2. package/dist/agent/runner.js.map +1 -1
  3. package/dist/store/history.d.ts +1 -1
  4. package/dist/store/history.js +4 -3
  5. package/dist/store/history.js.map +1 -1
  6. package/dist/tools/http.js +10 -1
  7. package/dist/tools/http.js.map +1 -1
  8. package/dist/tui/state.js +6 -0
  9. package/dist/tui/state.js.map +1 -1
  10. package/dist/tui-v2/actions/format-shortcuts.js +10 -6
  11. package/dist/tui-v2/actions/format-shortcuts.js.map +1 -1
  12. package/dist/tui-v2/app/App.js +3 -4
  13. package/dist/tui-v2/app/App.js.map +1 -1
  14. package/dist/tui-v2/components/composer/composer-input-box.d.ts +25 -0
  15. package/dist/tui-v2/components/composer/composer-input-box.js +31 -0
  16. package/dist/tui-v2/components/composer/composer-input-box.js.map +1 -0
  17. package/dist/tui-v2/components/toast/toast-host.d.ts +3 -3
  18. package/dist/tui-v2/components/toast/toast-host.js +9 -9
  19. package/dist/tui-v2/components/toast/toast-host.js.map +1 -1
  20. package/dist/tui-v2/components/transcript/transcript-view.js +1 -0
  21. package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
  22. package/dist/tui-v2/composer/composer-editor.d.ts +11 -2
  23. package/dist/tui-v2/composer/composer-editor.js +57 -62
  24. package/dist/tui-v2/composer/composer-editor.js.map +1 -1
  25. package/dist/tui-v2/composer/composer-wheel.d.ts +22 -4
  26. package/dist/tui-v2/composer/composer-wheel.js +69 -25
  27. package/dist/tui-v2/composer/composer-wheel.js.map +1 -1
  28. package/dist/tui-v2/composer/disable-native-textarea-scroll.d.ts +13 -0
  29. package/dist/tui-v2/composer/disable-native-textarea-scroll.js +31 -0
  30. package/dist/tui-v2/composer/disable-native-textarea-scroll.js.map +1 -0
  31. package/dist/tui-v2/composer/textarea-keybindings.d.ts +9 -8
  32. package/dist/tui-v2/composer/textarea-keybindings.js +22 -25
  33. package/dist/tui-v2/composer/textarea-keybindings.js.map +1 -1
  34. package/dist/tui-v2/layout/compute-layout.d.ts +3 -2
  35. package/dist/tui-v2/layout/compute-layout.js +3 -2
  36. package/dist/tui-v2/layout/compute-layout.js.map +1 -1
  37. package/dist/tui-v2/state/transcript-hydrate.d.ts +1 -1
  38. package/dist/tui-v2/state/transcript-hydrate.js +4 -0
  39. package/dist/tui-v2/state/transcript-hydrate.js.map +1 -1
  40. package/dist/types.d.ts +8 -0
  41. package/dist/types.js +9 -0
  42. package/dist/types.js.map +1 -1
  43. package/dist/version.generated.d.ts +2 -2
  44. package/dist/version.generated.js +2 -2
  45. package/package.json +1 -1
@@ -1,10 +1,14 @@
1
1
  /**
2
- * Wheel over the composer: scroll an overflowing draft in-place, or signal
3
- * that the chat transcript should scroll instead.
2
+ * Wheel over the composer: scroll a multi-line / overflowing draft in-place,
3
+ * or signal that the chat transcript may scroll (short single-line drafts).
4
4
  */
5
5
  export function composerDraftOverflows(contentLines, visibleRows) {
6
6
  return Math.max(1, contentLines) > Math.max(1, visibleRows);
7
7
  }
8
+ /** Multi-line draft (newlines or soft-wrap) owns the wheel — never the chat. */
9
+ export function composerOwnsWheel(contentLines) {
10
+ return Math.max(1, contentLines) > 1;
11
+ }
8
12
  /** Next viewport Y for an overflowing draft; undefined if nothing to scroll. */
9
13
  export function nextComposerScrollOffset(opts) {
10
14
  const height = Math.max(1, opts.viewportHeight);
@@ -20,35 +24,52 @@ export function nextComposerScrollOffset(opts) {
20
24
  return Math.min(maxOffset, cur + step);
21
25
  return undefined;
22
26
  }
27
+ /** Best-effort visual line count from the live editor (React state can lag). */
28
+ export function measureComposerLines(editor, contentLinesFallback) {
29
+ if (!editor)
30
+ return Math.max(1, contentLinesFallback);
31
+ const fromView = editor.editorView.getTotalVirtualLineCount?.() ??
32
+ editor.virtualLineCount ??
33
+ 0;
34
+ const logical = editor.lineCount ?? 0;
35
+ const hardBreaks = editor.plainText
36
+ ? Math.max(1, editor.plainText.split("\n").length)
37
+ : 1;
38
+ return Math.max(1, contentLinesFallback, fromView, logical, hardBreaks);
39
+ }
23
40
  /**
24
- * Scroll the draft when it overflows the visible rows.
25
- * Returns true when the wheel was consumed by the composer (not chat).
41
+ * Scroll the draft when the composer owns the wheel.
42
+ * Returns true when chat must NOT scroll (multi-line / overflow draft).
26
43
  */
27
44
  export function tryScrollComposerDraft(editor, opts) {
28
- if (!composerDraftOverflows(opts.contentLines, opts.visibleRows))
45
+ const lines = measureComposerLines(editor, opts.contentLines);
46
+ if (!composerOwnsWheel(lines) && !composerDraftOverflows(lines, opts.visibleRows)) {
29
47
  return false;
30
- try {
31
- const view = editor.editorView;
32
- const vp = view.getViewport();
33
- const total = view.getTotalVirtualLineCount?.() ??
34
- editor.virtualLineCount ??
35
- opts.contentLines;
36
- const nextY = nextComposerScrollOffset({
37
- offsetY: vp.offsetY,
38
- viewportHeight: vp.height || opts.visibleRows,
39
- totalLines: total,
40
- direction: opts.direction,
41
- delta: opts.delta,
42
- });
43
- if (nextY !== undefined) {
44
- view.setViewport(vp.offsetX, nextY, vp.width, vp.height, false);
45
- return true;
46
- }
47
- }
48
- catch {
49
- // Fall through to cursor-based scroll.
50
48
  }
51
49
  const steps = Math.max(1, opts.delta ?? 1) * 3;
50
+ if (composerDraftOverflows(lines, opts.visibleRows)) {
51
+ try {
52
+ const view = editor.editorView;
53
+ const vp = view.getViewport();
54
+ const total = view.getTotalVirtualLineCount?.() ??
55
+ editor.virtualLineCount ??
56
+ lines;
57
+ const nextY = nextComposerScrollOffset({
58
+ offsetY: vp.offsetY,
59
+ viewportHeight: vp.height || opts.visibleRows,
60
+ totalLines: total,
61
+ direction: opts.direction,
62
+ delta: opts.delta,
63
+ });
64
+ if (nextY !== undefined && nextY !== vp.offsetY) {
65
+ view.setViewport(vp.offsetX, nextY, vp.width, vp.height, false);
66
+ return true;
67
+ }
68
+ }
69
+ catch {
70
+ // Fall through to cursor-based scroll.
71
+ }
72
+ }
52
73
  if (opts.direction === "up") {
53
74
  for (let i = 0; i < steps; i++)
54
75
  editor.moveCursorUp();
@@ -61,4 +82,27 @@ export function tryScrollComposerDraft(editor, opts) {
61
82
  }
62
83
  return true;
63
84
  }
85
+ /** Wheel delta → transcript scroll steps (shared by composer + app). */
86
+ export function wheelChatDelta(direction, delta) {
87
+ const step = Math.max(1, delta ?? 1) * 3;
88
+ if (direction === "up")
89
+ return -step;
90
+ if (direction === "down")
91
+ return step;
92
+ return 0;
93
+ }
94
+ /**
95
+ * Resolve composer wheel: "draft" | "chat" | "none".
96
+ * Unfocused composer never scrolls the draft (avoids dual scroll with chat).
97
+ */
98
+ export function resolveComposerWheelTarget(opts) {
99
+ if (!opts.composerFocused || !opts.editor)
100
+ return "chat";
101
+ const lines = measureComposerLines(opts.editor, opts.contentLines);
102
+ if (composerOwnsWheel(lines) ||
103
+ composerDraftOverflows(lines, opts.visibleRows)) {
104
+ return "draft";
105
+ }
106
+ return "chat";
107
+ }
64
108
  //# sourceMappingURL=composer-wheel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"composer-wheel.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/composer-wheel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"composer-wheel.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/composer-wheel.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ /**
2
+ * OpenTUI EditBuffer always runs native `handleScroll` in `onMouseEvent`
3
+ * *after* JSX `onMouseScroll` listeners, and it never checks `scrollSpeed`.
4
+ * That dual-path is what made draft + chat both move when the pointer was
5
+ * over an unfocused composer.
6
+ *
7
+ * Patch the instance so scroll events skip native viewport motion; our
8
+ * composer wheel policy (focus-strict) is the only scroll path.
9
+ *
10
+ * Note: `onMouseEvent` is protected on TextareaRenderable — we patch via a
11
+ * structural cast so the public API stays untyped for that field.
12
+ */
13
+ export declare function disableNativeTextareaScroll(editor: object | null | undefined): () => void;
@@ -0,0 +1,31 @@
1
+ /**
2
+ * OpenTUI EditBuffer always runs native `handleScroll` in `onMouseEvent`
3
+ * *after* JSX `onMouseScroll` listeners, and it never checks `scrollSpeed`.
4
+ * That dual-path is what made draft + chat both move when the pointer was
5
+ * over an unfocused composer.
6
+ *
7
+ * Patch the instance so scroll events skip native viewport motion; our
8
+ * composer wheel policy (focus-strict) is the only scroll path.
9
+ *
10
+ * Note: `onMouseEvent` is protected on TextareaRenderable — we patch via a
11
+ * structural cast so the public API stays untyped for that field.
12
+ */
13
+ export function disableNativeTextareaScroll(editor) {
14
+ if (!editor)
15
+ return () => { };
16
+ const target = editor;
17
+ const proto = Object.getPrototypeOf(editor);
18
+ const original = proto?.onMouseEvent;
19
+ if (typeof original !== "function")
20
+ return () => { };
21
+ target.onMouseEvent = function patchedOnMouseEvent(event) {
22
+ // Swallow native draft wheel only — other mouse events stay intact.
23
+ if (event?.type === "scroll")
24
+ return;
25
+ return original.call(this, event);
26
+ };
27
+ return () => {
28
+ target.onMouseEvent = original.bind(editor);
29
+ };
30
+ }
31
+ //# sourceMappingURL=disable-native-textarea-scroll.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"disable-native-textarea-scroll.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/disable-native-textarea-scroll.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,MAAM,UAAU,2BAA2B,CACzC,MAAiC;IAEjC,IAAI,CAAC,MAAM;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAmB,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAqB,CAAC;IAChE,MAAM,QAAQ,GAAG,KAAK,EAAE,YAAY,CAAC;IACrC,IAAI,OAAO,QAAQ,KAAK,UAAU;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,YAAY,GAAG,SAAS,mBAAmB,CAEhD,KAAe;QAEf,oEAAoE;QACpE,IAAI,KAAK,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO;QACrC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC,CAAC;AACJ,CAAC"}
@@ -4,15 +4,16 @@
4
4
  *
5
5
  * OpenTUI's `TextareaRenderable` already implements move/select/word/delete/
6
6
  * undo semantics (INPUT-004/005) — this module only overrides the small set
7
- * of chords where the library default is backwards for a submit-on-Enter
8
- * composer (its default binds bare Enter to "newline" and Alt+Enter to
9
- * "submit"), plus macOS line-delete chords that conflict with chat scroll.
10
- * Everything else passes through untouched. The shape here mirrors
11
- * `@opentui/core`'s `KeyBinding<TextareaAction>` structurally without
12
- * importing it, keeping this module renderer-independent; the renderer glue
13
- * casts it at the one place it is consumed.
7
+ * of chords where the library default is wrong for a submit-on-Enter
8
+ * composer, plus explicit word vs line kill chords:
9
+ *
10
+ * Option/Alt + Backspace/Delete → delete one word
11
+ * Cmd (Mac) / Ctrl (Win) + Backspace/Delete → delete whole line
12
+ *
13
+ * Terminals report modifiers inconsistently: Option is usually `meta`, Cmd
14
+ * is usually `super` (and sometimes arrives as Ctrl+U for Backspace).
14
15
  */
15
- export type TextareaActionName = "submit" | "newline" | "delete-to-line-start" | "delete-to-line-end" | "delete-line";
16
+ export type TextareaActionName = "submit" | "newline" | "delete-to-line-start" | "delete-to-line-end" | "delete-line" | "delete-word-backward" | "delete-word-forward";
16
17
  export interface TextareaKeyBindingLike {
17
18
  readonly name: string;
18
19
  readonly ctrl?: boolean;
@@ -4,13 +4,14 @@
4
4
  *
5
5
  * OpenTUI's `TextareaRenderable` already implements move/select/word/delete/
6
6
  * undo semantics (INPUT-004/005) — this module only overrides the small set
7
- * of chords where the library default is backwards for a submit-on-Enter
8
- * composer (its default binds bare Enter to "newline" and Alt+Enter to
9
- * "submit"), plus macOS line-delete chords that conflict with chat scroll.
10
- * Everything else passes through untouched. The shape here mirrors
11
- * `@opentui/core`'s `KeyBinding<TextareaAction>` structurally without
12
- * importing it, keeping this module renderer-independent; the renderer glue
13
- * casts it at the one place it is consumed.
7
+ * of chords where the library default is wrong for a submit-on-Enter
8
+ * composer, plus explicit word vs line kill chords:
9
+ *
10
+ * Option/Alt + Backspace/Delete → delete one word
11
+ * Cmd (Mac) / Ctrl (Win) + Backspace/Delete → delete whole line
12
+ *
13
+ * Terminals report modifiers inconsistently: Option is usually `meta`, Cmd
14
+ * is usually `super` (and sometimes arrives as Ctrl+U for Backspace).
14
15
  */
15
16
  const ENTER_NAMES = ["return", "kpenter"];
16
17
  export function buildComposerTextareaOverrides() {
@@ -23,32 +24,28 @@ export function buildComposerTextareaOverrides() {
23
24
  overrides.push({ name, meta: true, action: "newline" });
24
25
  overrides.push({ name, ctrl: true, action: "newline" });
25
26
  }
26
- // Line kill: readline Ctrl+U and macOS Cmd+Backspace/Delete.
27
- // OpenTUI defaults map meta+backspace delete-word-backward; override to
28
- // delete-to-line-start so Cmd+Backspace matches macOS text fields. Explicit
29
- // ctrl+u keeps delete-to-line-start even if library defaults change.
30
- // (Chat jump-to-top is NOT bound globally on ctrl+u — see keymap.ts.)
31
- overrides.push({ name: "u", ctrl: true, action: "delete-to-line-start" });
27
+ // ── Word kill: Option/Alt (+Backspace/Delete)
28
+ // On macOS terminals, Option almost always arrives as `meta`.
32
29
  overrides.push({
33
30
  name: "backspace",
34
31
  meta: true,
35
- action: "delete-to-line-start",
36
- });
37
- overrides.push({
38
- name: "backspace",
39
- super: true,
40
- action: "delete-to-line-start",
32
+ action: "delete-word-backward",
41
33
  });
42
34
  overrides.push({
43
35
  name: "delete",
44
36
  meta: true,
45
- action: "delete-to-line-end",
46
- });
47
- overrides.push({
48
- name: "delete",
49
- super: true,
50
- action: "delete-to-line-end",
37
+ action: "delete-word-forward",
51
38
  });
39
+ // ── Full line kill: Cmd (super) and Ctrl (Windows / some terminals)
40
+ // OpenTUI default maps ctrl+backspace → word; override to whole line.
41
+ overrides.push({ name: "backspace", super: true, action: "delete-line" });
42
+ overrides.push({ name: "delete", super: true, action: "delete-line" });
43
+ overrides.push({ name: "backspace", ctrl: true, action: "delete-line" });
44
+ overrides.push({ name: "delete", ctrl: true, action: "delete-line" });
45
+ // readline Ctrl+U and many terminals' Cmd+Backspace → Ctrl+U encoding.
46
+ overrides.push({ name: "u", ctrl: true, action: "delete-line" });
47
+ // Ctrl+K keeps "kill to end of line" (readline) for power users.
48
+ overrides.push({ name: "k", ctrl: true, action: "delete-to-line-end" });
52
49
  return overrides;
53
50
  }
54
51
  //# sourceMappingURL=textarea-keybindings.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"textarea-keybindings.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/textarea-keybindings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAkBH,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAU,CAAC;AAEnD,MAAM,UAAU,8BAA8B;IAC5C,MAAM,SAAS,GAA6B,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,uEAAuE;QACvE,8DAA8D;QAC9D,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,6DAA6D;IAC7D,0EAA0E;IAC1E,4EAA4E;IAC5E,qEAAqE;IACrE,sEAAsE;IACtE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;IAC1E,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,sBAAsB;KAC/B,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,sBAAsB;KAC/B,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,oBAAoB;KAC7B,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,oBAAoB;KAC7B,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"textarea-keybindings.js","sourceRoot":"","sources":["../../../src/tui-v2/composer/textarea-keybindings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAoBH,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAU,CAAC;AAEnD,MAAM,UAAU,8BAA8B;IAC5C,MAAM,SAAS,GAA6B,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,uEAAuE;QACvE,8DAA8D;QAC9D,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,+CAA+C;IAC/C,8DAA8D;IAC9D,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,sBAAsB;KAC/B,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,qBAAqB;KAC9B,CAAC,CAAC;IAEH,qEAAqE;IACrE,sEAAsE;IACtE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC1E,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IACvE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IACzE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAEtE,uEAAuE;IACvE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IACjE,iEAAiE;IACjE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAExE,OAAO,SAAS,CAAC;AACnB,CAAC"}
@@ -50,9 +50,10 @@ export declare const STATUS_HEIGHT = 1;
50
50
  /**
51
51
  * Cap on editable composer text rows (not including border chrome).
52
52
  * Grows with Shift+Enter / wrap up to this; classic could take most of the
53
- * terminal — 16 keeps multi-line usable without eating the transcript.
53
+ * terminal — ~18 (~10% over the prior 16) keeps multi-line usable without
54
+ * eating the transcript.
54
55
  */
55
- export declare const COMPOSER_MAX_HEIGHT = 16;
56
+ export declare const COMPOSER_MAX_HEIGHT = 18;
56
57
  export declare const COMPOSER_MIN_HEIGHT = 1;
57
58
  /** Single editable line by default (classic Ink). Grows only if content needs it. */
58
59
  export declare const COMPOSER_PREFERRED_HEIGHT = 1;
@@ -19,9 +19,10 @@ export const STATUS_HEIGHT = 1;
19
19
  /**
20
20
  * Cap on editable composer text rows (not including border chrome).
21
21
  * Grows with Shift+Enter / wrap up to this; classic could take most of the
22
- * terminal — 16 keeps multi-line usable without eating the transcript.
22
+ * terminal — ~18 (~10% over the prior 16) keeps multi-line usable without
23
+ * eating the transcript.
23
24
  */
24
- export const COMPOSER_MAX_HEIGHT = 16;
25
+ export const COMPOSER_MAX_HEIGHT = 18;
25
26
  export const COMPOSER_MIN_HEIGHT = 1;
26
27
  /** Single editable line by default (classic Ink). Grows only if content needs it. */
27
28
  export const COMPOSER_PREFERRED_HEIGHT = 1;
@@ -1 +1 @@
1
- {"version":3,"file":"compute-layout.js","sourceRoot":"","sources":["../../../src/tui-v2/layout/compute-layout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compute-layout.js","sourceRoot":"","sources":["../../../src/tui-v2/layout/compute-layout.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@
5
5
  * model messages array (older / partial saves). We hydrate both so /history
6
6
  * restores prompts, tools, and assistant text — not just a notice.
7
7
  */
8
- import type { ChatMessage } from "../../types.js";
8
+ import { type ChatMessage } from "../../types.js";
9
9
  import type { TranscriptItem as ClassicTranscriptItem } from "../../tui/state.js";
10
10
  import { type ToolCallId } from "../../app/events/app-event.js";
11
11
  import { type FileChange } from "../../tools/file-diff.js";
@@ -5,6 +5,7 @@
5
5
  * model messages array (older / partial saves). We hydrate both so /history
6
6
  * restores prompts, tools, and assistant text — not just a notice.
7
7
  */
8
+ import { isInternalChatMessage } from "../../types.js";
8
9
  import { asToolCallId } from "../../app/events/app-event.js";
9
10
  import { formatToolArgs } from "../../agent/tool-call-parser.js";
10
11
  import { buildFileChange, isFileMutationTool, } from "../../tools/file-diff.js";
@@ -325,6 +326,9 @@ export function hydrateFromMessages(messages) {
325
326
  if (message.role === "system" || message.role === "tool")
326
327
  continue;
327
328
  if (message.role === "user") {
329
+ // Recovery / governor nudges stay model-only — never a YOU bubble.
330
+ if (isInternalChatMessage(message))
331
+ continue;
328
332
  sequence += 1;
329
333
  const id = `hist-user-${sequence}`;
330
334
  const item = {
@@ -1 +1 @@
1
- {"version":3,"file":"transcript-hydrate.js","sourceRoot":"","sources":["../../../src/tui-v2/state/transcript-hydrate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transcript-hydrate.js","sourceRoot":"","sources":["../../../src/tui-v2/state/transcript-hydrate.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -52,7 +52,15 @@ export interface ChatMessage {
52
52
  name?: string | undefined;
53
53
  /** For role "tool": whether the tool succeeded (Anthropic is_error). */
54
54
  ok?: boolean | undefined;
55
+ /**
56
+ * Model-only recovery / governor nudge. Kept in API history so the agent
57
+ * continues correctly, but never rendered as a YOU bubble or WARN notice
58
+ * in the chat transcript.
59
+ */
60
+ internal?: boolean | undefined;
55
61
  }
62
+ /** True for system-injected recovery prompts that must stay out of the chat UI. */
63
+ export declare function isInternalChatMessage(message: ChatMessage): boolean;
56
64
  /** Tool choice for native function calling (canonical names). */
57
65
  export type ToolChoice = "auto" | "none" | "required" | {
58
66
  type: "function";
package/dist/types.js CHANGED
@@ -12,4 +12,13 @@ export const providerIds = [
12
12
  "bynara",
13
13
  "qwen-cloud",
14
14
  ];
15
+ /** True for system-injected recovery prompts that must stay out of the chat UI. */
16
+ export function isInternalChatMessage(message) {
17
+ if (message.internal)
18
+ return true;
19
+ if (message.role !== "user")
20
+ return false;
21
+ // Legacy recovery texts that predate the `internal` flag.
22
+ return /^(?:You diagnosed an error and described the fix|You wrote a message but called NO tool|You described (?:an action|work|security work)|You claimed a search\/fetch|You wrote the plan as prose|INCOMPLETE: the user asked for a working product feature|This is a local app build: do not stop|The local HTTP probe failed|You have not finished the approved plan|Coverage looks thin \(ports|You are in plan mode and tried to finish without a durable plan)\b/i.test(message.content.trim());
23
+ }
15
24
  //# sourceMappingURL=types.js.map
package/dist/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,WAAW;IACX,QAAQ;IACR,aAAa;IACb,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,YAAY;CACJ,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM;IACN,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,WAAW;IACX,QAAQ;IACR,aAAa;IACb,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,YAAY;CACJ,CAAC;AAoEX,mFAAmF;AACnF,MAAM,UAAU,qBAAqB,CAAC,OAAoB;IACxD,IAAI,OAAO,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1C,0DAA0D;IAC1D,OAAO,ocAAoc,CAAC,IAAI,CAC9c,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CACvB,CAAC;AACJ,CAAC"}
@@ -2,5 +2,5 @@
2
2
  * AUTO-GENERATED by scripts/sync-version.mjs — do not edit by hand.
3
3
  * Source of truth: package.json "version".
4
4
  */
5
- export declare const VERSION: "3.8.2";
6
- export declare const VERSION_TAG: "v3.8.2";
5
+ export declare const VERSION: "3.8.5";
6
+ export declare const VERSION_TAG: "v3.8.5";
@@ -2,6 +2,6 @@
2
2
  * AUTO-GENERATED by scripts/sync-version.mjs — do not edit by hand.
3
3
  * Source of truth: package.json "version".
4
4
  */
5
- export const VERSION = "3.8.2";
6
- export const VERSION_TAG = "v3.8.2";
5
+ export const VERSION = "3.8.5";
6
+ export const VERSION_TAG = "v3.8.5";
7
7
  //# sourceMappingURL=version.generated.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pentoshi/clai",
3
- "version": "3.8.2",
3
+ "version": "3.8.5",
4
4
  "description": "A fast, cross-platform AI CLI assistant with ask and agent modes for shell tasks, file operations, and cybersecurity workflows.",
5
5
  "type": "module",
6
6
  "license": "MIT",