@dirgha/code 1.23.0 → 1.24.0

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 (97) hide show
  1. package/dist/cli/flows/wizard.js +1 -0
  2. package/dist/cli/flows/wizard.js.map +1 -1
  3. package/dist/cli/interactive.js +16 -0
  4. package/dist/cli/interactive.js.map +1 -1
  5. package/dist/cli/main.js +14 -6
  6. package/dist/cli/main.js.map +1 -1
  7. package/dist/cli/setup.js +1 -0
  8. package/dist/cli/setup.js.map +1 -1
  9. package/dist/cli/slash/fleet.js +9 -2
  10. package/dist/cli/slash/fleet.js.map +1 -1
  11. package/dist/cli/slash/models.js +335 -5
  12. package/dist/cli/slash/models.js.map +1 -1
  13. package/dist/cli/slash/provider.d.ts +1 -0
  14. package/dist/cli/slash/provider.js +33 -1
  15. package/dist/cli/slash/provider.js.map +1 -1
  16. package/dist/context/_fts.js +4 -1
  17. package/dist/context/_fts.js.map +1 -1
  18. package/dist/daemon/server.js +17 -3
  19. package/dist/daemon/server.js.map +1 -1
  20. package/dist/intelligence/prices.js +9 -1
  21. package/dist/intelligence/prices.js.map +1 -1
  22. package/dist/kernel/abort-utils.d.ts +4 -0
  23. package/dist/kernel/abort-utils.js +45 -0
  24. package/dist/kernel/abort-utils.js.map +1 -0
  25. package/dist/kernel/agent-loop.js +46 -10
  26. package/dist/kernel/agent-loop.js.map +1 -1
  27. package/dist/kernel/tool-timeout.d.ts +27 -0
  28. package/dist/kernel/tool-timeout.js +53 -0
  29. package/dist/kernel/tool-timeout.js.map +1 -0
  30. package/dist/providers/custom-provider.d.ts +31 -0
  31. package/dist/providers/custom-provider.js +72 -0
  32. package/dist/providers/custom-provider.js.map +1 -0
  33. package/dist/providers/dispatch.d.ts +1 -1
  34. package/dist/providers/dispatch.js +10 -1
  35. package/dist/providers/dispatch.js.map +1 -1
  36. package/dist/providers/family-fallback.js +5 -0
  37. package/dist/providers/family-fallback.js.map +1 -1
  38. package/dist/providers/gemini.js +33 -3
  39. package/dist/providers/gemini.js.map +1 -1
  40. package/dist/providers/index.d.ts +5 -0
  41. package/dist/providers/index.js +14 -0
  42. package/dist/providers/index.js.map +1 -1
  43. package/dist/providers/machine1.d.ts +30 -0
  44. package/dist/providers/machine1.js +341 -0
  45. package/dist/providers/machine1.js.map +1 -0
  46. package/dist/providers/openai-compat.d.ts +1 -0
  47. package/dist/providers/openai-compat.js +30 -9
  48. package/dist/providers/openai-compat.js.map +1 -1
  49. package/dist/providers/openrouter.js +4 -1
  50. package/dist/providers/openrouter.js.map +1 -1
  51. package/dist/state/db.js +22 -0
  52. package/dist/state/db.js.map +1 -1
  53. package/dist/state/index.js +8 -4
  54. package/dist/state/index.js.map +1 -1
  55. package/dist/tools/checkpoint.js +16 -2
  56. package/dist/tools/checkpoint.js.map +1 -1
  57. package/dist/tools/git.js +2 -1
  58. package/dist/tools/git.js.map +1 -1
  59. package/dist/tools/multimodal.js +21 -5
  60. package/dist/tools/multimodal.js.map +1 -1
  61. package/dist/tools/permission.js +5 -4
  62. package/dist/tools/permission.js.map +1 -1
  63. package/dist/tools/rtk.js +8 -2
  64. package/dist/tools/rtk.js.map +1 -1
  65. package/dist/tools/search-glob.js +10 -6
  66. package/dist/tools/search-glob.js.map +1 -1
  67. package/dist/tools/shell.js +5 -5
  68. package/dist/tools/shell.js.map +1 -1
  69. package/dist/tui/approval.js +31 -3
  70. package/dist/tui/approval.js.map +1 -1
  71. package/dist/tui/ink/App.js +31 -7
  72. package/dist/tui/ink/App.js.map +1 -1
  73. package/dist/tui/ink/components/InputBox.d.ts +4 -0
  74. package/dist/tui/ink/components/InputBox.js +22 -6
  75. package/dist/tui/ink/components/InputBox.js.map +1 -1
  76. package/dist/tui/ink/components/PromptQueueIndicator.js +1 -1
  77. package/dist/tui/ink/components/PromptQueueIndicator.js.map +1 -1
  78. package/dist/tui/ink/components/StatusBar.d.ts +3 -7
  79. package/dist/tui/ink/components/StatusBar.js +2 -9
  80. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  81. package/dist/tui/ink/index.js +19 -13
  82. package/dist/tui/ink/index.js.map +1 -1
  83. package/dist/tui/ink/ink-approval-bus.d.ts +2 -0
  84. package/dist/tui/ink/ink-approval-bus.js +10 -0
  85. package/dist/tui/ink/ink-approval-bus.js.map +1 -1
  86. package/dist/tui/ink/markdown/display.js +9 -2
  87. package/dist/tui/ink/markdown/display.js.map +1 -1
  88. package/dist/tui/ink/markdown/split-point.js +8 -13
  89. package/dist/tui/ink/markdown/split-point.js.map +1 -1
  90. package/dist/tui/ink/use-overlays.js +13 -9
  91. package/dist/tui/ink/use-overlays.js.map +1 -1
  92. package/dist/tui/ink/use-tool-progress.d.ts +7 -0
  93. package/dist/tui/ink/use-tool-progress.js +39 -0
  94. package/dist/tui/ink/use-tool-progress.js.map +1 -0
  95. package/dist/tui/ink/use-transcript-scroll.js +14 -6
  96. package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
  97. package/package.json +3 -2
@@ -137,8 +137,30 @@ export function InputBox(props) {
137
137
  }
138
138
  props.onChange(sanitized);
139
139
  }, [props.onChange]);
140
+ // Always-active: Ctrl+Y must work even while agent is busy.
141
+ // Also handles up-arrow dequeue-for-edit while busy — that key event can
142
+ // never arrive in the focus-gated useInput below because focus=!busy.
143
+ useInput((_ch, key) => {
144
+ if (key.ctrl && _ch === "y") {
145
+ if (props.onRequestYoloToggle)
146
+ props.onRequestYoloToggle();
147
+ return;
148
+ }
149
+ // Up arrow on empty input while busy: pull last queued message back for
150
+ // editing. Must live here (isActive: true) because the focus-gated handler
151
+ // below is inactive whenever busy=true.
152
+ if (key.upArrow &&
153
+ props.busy &&
154
+ props.value === "" &&
155
+ (props.queueLength ?? 0) > 0) {
156
+ if (props.onDequeueForEdit)
157
+ props.onDequeueForEdit();
158
+ }
159
+ }, { isActive: true });
140
160
  useInput((inputCh, key) => {
141
161
  // Up/down arrow prompt-history recall (Gemini CLI parity).
162
+ // (Up-arrow dequeue-for-edit while busy is handled in the always-active
163
+ // useInput above, because this handler is inactive when busy=true.)
142
164
  if (key.upArrow && history.length > 0) {
143
165
  if (historyIdx === null) {
144
166
  savedInputRef.current = props.value;
@@ -194,12 +216,6 @@ export function InputBox(props) {
194
216
  armTimerRef.current = setTimeout(() => setCtrlCArmed(false), CTRL_C_TIMEOUT_MS);
195
217
  return;
196
218
  }
197
- // Ctrl+Y — toggle YOLO mode at any time.
198
- if (key.ctrl && inputCh === "y") {
199
- if (props.onRequestYoloToggle)
200
- props.onRequestYoloToggle();
201
- return;
202
- }
203
219
  // Ctrl+U — trigger self-upgrade.
204
220
  if (key.ctrl && inputCh === "u") {
205
221
  if (props.onRequestUpgrade)
@@ -1 +1 @@
1
- {"version":3,"file":"InputBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/InputBox.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"InputBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/InputBox.tsx"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ export function PromptQueueIndicator(props) {
9
9
  return null;
10
10
  const visible = props.queued.slice(0, MAX_VISIBLE);
11
11
  const overflow = Math.max(0, props.queued.length - MAX_VISIBLE);
12
- return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: palette.textMuted, children: ["queued (", props.queued.length, ") \u2014 runs after current turn"] }), visible.map((p, i) => (_jsxs(Text, { color: palette.textMuted, children: [' ', "\u2022 ", truncate(p)] }, i))), overflow > 0 && (_jsxs(Text, { color: palette.textMuted, dimColor: true, children: [' ', "+", overflow, " more"] }))] }));
12
+ return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: palette.textMuted, children: ["queued (", props.queued.length, ") \u2014 runs after current turn \u00B7 \u2191 to edit last"] }), visible.map((p, i) => (_jsxs(Text, { color: palette.textMuted, children: [' ', "\u2022 ", truncate(p)] }, i))), overflow > 0 && (_jsxs(Text, { color: palette.textMuted, dimColor: true, children: [' ', "+", overflow, " more"] }))] }));
13
13
  }
14
14
  function truncate(s) {
15
15
  const flat = s.replace(/\s+/g, ' ').trim();
@@ -1 +1 @@
1
- {"version":3,"file":"PromptQueueIndicator.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/PromptQueueIndicator.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,oBAAoB,CAAC,KAAY;IAC/C,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE3C,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC,CAAC;IAEhE,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,aACrC,MAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,SAAS,yBACnB,KAAK,CAAC,MAAM,CAAC,MAAM,wCACvB,EACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,MAAC,IAAI,IAAS,KAAK,EAAE,OAAO,CAAC,SAAS,aACnC,IAAI,aAAI,QAAQ,CAAC,CAAC,CAAC,KADX,CAAC,CAEL,CACR,CAAC,EACD,QAAQ,GAAG,CAAC,IAAI,CACf,MAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,mBACrC,IAAI,OAAG,QAAQ,aACX,CACR,IACG,CACP,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,OAAO,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC;AAClF,CAAC"}
1
+ {"version":3,"file":"PromptQueueIndicator.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/PromptQueueIndicator.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,oBAAoB,CAAC,KAAY;IAC/C,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE3C,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC,CAAC;IAEhE,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,aACrC,MAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,SAAS,yBACnB,KAAK,CAAC,MAAM,CAAC,MAAM,mEACvB,EACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,MAAC,IAAI,IAAS,KAAK,EAAE,OAAO,CAAC,SAAS,aACnC,IAAI,aAAI,QAAQ,CAAC,CAAC,CAAC,KADX,CAAC,CAEL,CACR,CAAC,EACD,QAAQ,GAAG,CAAC,IAAI,CACf,MAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,mBACrC,IAAI,OAAG,QAAQ,aACX,CACR,IACG,CACP,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,OAAO,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC;AAClF,CAAC"}
@@ -1,11 +1,5 @@
1
- /**
2
- * Status bar rendered below the input box.
3
- *
4
- * Left cluster: cwd basename + provider id.
5
- * Right cluster: model label + cumulative tokens + cost.
6
- * When busy, a subtle spinner frame appears on the right.
7
- */
8
1
  import * as React from "react";
2
+ import type { ActiveTool } from "../use-tool-progress.js";
9
3
  import type { RenderMetricsGetters } from "../use-render-metrics.js";
10
4
  export interface StatusBarProps {
11
5
  model: string;
@@ -32,5 +26,7 @@ export interface StatusBarProps {
32
26
  showMetrics?: boolean;
33
27
  /** Render-metrics getters — populated when showMetrics is true. */
34
28
  renderMetrics?: RenderMetricsGetters;
29
+ /** Active tool info — shows tool name and elapsed time when defined. */
30
+ activeTool?: ActiveTool;
35
31
  }
36
32
  export declare const StatusBar: React.NamedExoticComponent<StatusBarProps>;
@@ -1,11 +1,4 @@
1
1
  import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
2
- /**
3
- * Status bar rendered below the input box.
4
- *
5
- * Left cluster: cwd basename + provider id.
6
- * Right cluster: model label + cumulative tokens + cost.
7
- * When busy, a subtle spinner frame appears on the right.
8
- */
9
2
  import * as React from "react";
10
3
  import { Box, Text, useStdout } from "ink";
11
4
  import { useTheme } from "../theme-context.js";
@@ -99,8 +92,8 @@ export const StatusBar = React.memo(function StatusBar(props) {
99
92
  })();
100
93
  // Slim status bar — only what's load-bearing:
101
94
  // left: ⏵⏵ MODE · cwd [overflow]
102
- // right: spinner (when busy) · short model · context-meter or cost
103
- return (_jsxs(Box, { width: cols, paddingX: 1, justifyContent: "space-between", children: [_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: modeColour, bold: true, children: [ms.symbol, " ", ms.label] }), _jsx(Text, { color: palette.textMuted, dimColor: true, children: "\u00B7" }), _jsx(Text, { color: palette.textMuted, children: cwdLabel(props.cwd) }), props.overflowDetected && (_jsx(Text, { color: palette.status.warning, children: "[!]" }))] }), _jsxs(Box, { gap: 1, children: [props.busy && _jsx(SpinnerGlyph, { isActive: true }), typeof props.turnCount === "number" &&
95
+ // right: spinner (when busy) · tool name + elapsed · short model · context-meter or cost
96
+ return (_jsxs(Box, { width: cols, paddingX: 1, justifyContent: "space-between", children: [_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: modeColour, bold: true, children: [ms.symbol, " ", ms.label] }), _jsx(Text, { color: palette.textMuted, dimColor: true, children: "\u00B7" }), _jsx(Text, { color: palette.textMuted, children: cwdLabel(props.cwd) }), props.overflowDetected && (_jsx(Text, { color: palette.status.warning, children: "[!]" }))] }), _jsxs(Box, { gap: 1, children: [props.busy && _jsx(SpinnerGlyph, { isActive: true }), props.activeTool && (_jsxs(Text, { color: palette.textMuted, dimColor: true, children: [props.activeTool.name, " (", Math.round(props.activeTool.elapsedMs / 1000), "s)"] })), typeof props.turnCount === "number" &&
104
97
  typeof props.maxTurns === "number" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: `Turn ${props.turnCount}/${props.maxTurns}` })), _jsx(Text, { color: palette.brand, children: modelDisplay }), props.busy && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: "\u00B7 Ctrl+C to stop" })), metricsLabel !== "" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: metricsLabel })), tokRateLabel !== "" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: tokRateLabel })), contextMeter !== "" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: contextMeter })), costLabel !== "" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: costLabel }))] })] }));
105
98
  });
106
99
  //# sourceMappingURL=StatusBar.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":"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"}
@@ -8,7 +8,6 @@
8
8
  import * as React from "react";
9
9
  import { render } from "ink";
10
10
  import { createEventStream } from "../../kernel/event-stream.js";
11
- import { closeSession } from "../../state/index.js";
12
11
  import { App, VERSION } from "./App.js";
13
12
  import { renderLogoString } from "./components/Logo.js";
14
13
  import { createDefaultSlashRegistry, registerBuiltinSlashCommands, } from "../../cli/slash.js";
@@ -52,27 +51,31 @@ export async function runInkTUI(opts) {
52
51
  process.stdout.write("\x1b[?1049l");
53
52
  }
54
53
  };
55
- const doExit = () => {
56
- const s = opts.sessionHandle?.session;
54
+ const sessionHandle = { session: null };
55
+ // Register alt-buffer restore + session flush on the synchronous `exit`
56
+ // event so the terminal is always left in a usable state regardless of
57
+ // how the process terminates (SIGINT via main.ts's mcpShutdownOnSignal,
58
+ // SIGTERM, uncaught exception, or normal exit). Writing the escape
59
+ // sequence twice is harmless — `restore()` is idempotent.
60
+ //
61
+ // We do NOT register our own SIGINT/SIGTERM `process.once` handlers here:
62
+ // main.ts already owns signal dispatch. Registering a second `once` for
63
+ // the same signal would cause the second handler to fire on the *next*
64
+ // signal (after the first listener was consumed), producing confusing
65
+ // double-exit behaviour. The `exit` listener below is sufficient.
66
+ const onProcessExit = () => {
67
+ restore();
68
+ const s = sessionHandle.session;
57
69
  if (s) {
58
70
  try {
59
71
  s.close();
60
- void closeSession(s.id);
61
72
  }
62
73
  catch {
63
74
  /* best-effort */
64
75
  }
65
76
  }
66
- restore();
67
- process.exit(s ? 0 : 1);
68
77
  };
69
- process.once("SIGINT", () => {
70
- doExit();
71
- });
72
- process.once("SIGTERM", () => {
73
- doExit();
74
- });
75
- const sessionHandle = { session: null };
78
+ process.on("exit", onProcessExit);
76
79
  const element = React.createElement(App, {
77
80
  events,
78
81
  registry: opts.registry,
@@ -101,6 +104,9 @@ export async function runInkTUI(opts) {
101
104
  }
102
105
  finally {
103
106
  events.close();
107
+ // Remove the exit listener — normal teardown through waitUntilExit
108
+ // handles cleanup here; we don't need the safety-net to fire too.
109
+ process.removeListener("exit", onProcessExit);
104
110
  restore();
105
111
  }
106
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tui/ink/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tui/ink/index.ts"],"names":[],"mappings":"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"}
@@ -31,6 +31,8 @@ export interface InkApprovalBus extends ApprovalBus {
31
31
  alwaysApprove(toolName: string): void;
32
32
  /** Mark deny-all so future requests resolve as deny without prompting. */
33
33
  denyAll(): void;
34
+ /** Toggle global auto-approve on (true) or off (false) for mid-turn YOLO. */
35
+ setApproveAll(enabled: boolean): void;
34
36
  }
35
37
  export declare function createInkApprovalBus(autoApprove?: Set<string>): InkApprovalBus;
36
38
  export {};
@@ -23,12 +23,16 @@ export function createInkApprovalBus(autoApprove = new Set()) {
23
23
  const resolvers = new Map();
24
24
  const listeners = new Set();
25
25
  let denied = false;
26
+ let approveAll = false;
26
27
  const emit = (req) => {
27
28
  for (const l of listeners)
28
29
  l(req);
29
30
  };
30
31
  return {
31
32
  requiresApproval(toolName) {
33
+ // When approveAll is set, skip approval gate entirely.
34
+ if (approveAll)
35
+ return false;
32
36
  // When denyAll() was called, return true so the kernel calls request(),
33
37
  // which returns 'deny'. Returning false would skip the approval gate
34
38
  // entirely and let the tool execute unconditionally.
@@ -37,6 +41,9 @@ export function createInkApprovalBus(autoApprove = new Set()) {
37
41
  return !autoApprove.has(toolName);
38
42
  },
39
43
  async request(req) {
44
+ // Honor approve-all without prompting (mid-turn YOLO toggle).
45
+ if (approveAll)
46
+ return 'approve';
40
47
  // Honor deny-all without prompting.
41
48
  if (denied)
42
49
  return 'deny';
@@ -73,6 +80,9 @@ export function createInkApprovalBus(autoApprove = new Set()) {
73
80
  alwaysApprove(toolName) {
74
81
  autoApprove.add(toolName);
75
82
  },
83
+ setApproveAll(enabled) {
84
+ approveAll = enabled;
85
+ },
76
86
  denyAll() {
77
87
  denied = true;
78
88
  // Settle any pending requests as 'deny'.
@@ -1 +1 @@
1
- {"version":3,"file":"ink-approval-bus.js","sourceRoot":"","sources":["../../../src/tui/ink/ink-approval-bus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAkBH,MAAM,UAAU,oBAAoB,CAAC,cAA2B,IAAI,GAAG,EAAE;IACvE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyC,CAAC;IACnE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAY,CAAC;IACtC,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,MAAM,IAAI,GAAG,CAAC,GAA2B,EAAQ,EAAE;QACjD,KAAK,MAAM,CAAC,IAAI,SAAS;YAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB,CAAC,QAAgB;YAC/B,wEAAwE;YACxE,qEAAqE;YACrE,qDAAqD;YACrD,IAAI,MAAM;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,oCAAoC;YACpC,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;YAC1B,0DAA0D;YAC1D,8CAA8C;YAC9C,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAC;YAEhD,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,EAAE;gBAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,QAA0B,EAAE,EAAE;oBACnD,0DAA0D;oBAC1D,IAAI,QAAQ,KAAK,cAAc;wBAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC3D,IAAI,QAAQ,KAAK,aAAa;wBAAE,MAAM,GAAG,IAAI,CAAC;oBAC9C,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,SAAS,CAAC,QAAkB;YAC1B,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,CAAC,EAAU,EAAE,QAA0B;YAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrB,8DAA8D;YAC9D,0DAA0D;YAC1D,IAAI,CAAC,IAAI,CAAC,CAAC;YACX,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC;QAED,aAAa,CAAC,QAAgB;YAC5B,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO;YACL,MAAM,GAAG,IAAI,CAAC;YACd,yCAAyC;YACzC,KAAK,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;gBACvC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"ink-approval-bus.js","sourceRoot":"","sources":["../../../src/tui/ink/ink-approval-bus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAoBH,MAAM,UAAU,oBAAoB,CAAC,cAA2B,IAAI,GAAG,EAAE;IACvE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyC,CAAC;IACnE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAY,CAAC;IACtC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,MAAM,IAAI,GAAG,CAAC,GAA2B,EAAQ,EAAE;QACjD,KAAK,MAAM,CAAC,IAAI,SAAS;YAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB,CAAC,QAAgB;YAC/B,uDAAuD;YACvD,IAAI,UAAU;gBAAE,OAAO,KAAK,CAAC;YAC7B,wEAAwE;YACxE,qEAAqE;YACrE,qDAAqD;YACrD,IAAI,MAAM;gBAAE,OAAO,IAAI,CAAC;YACxB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,8DAA8D;YAC9D,IAAI,UAAU;gBAAE,OAAO,SAAS,CAAC;YACjC,oCAAoC;YACpC,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;YAC1B,0DAA0D;YAC1D,8CAA8C;YAC9C,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAC;YAEhD,OAAO,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,EAAE;gBAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,QAA0B,EAAE,EAAE;oBACnD,0DAA0D;oBAC1D,IAAI,QAAQ,KAAK,cAAc;wBAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC3D,IAAI,QAAQ,KAAK,aAAa;wBAAE,MAAM,GAAG,IAAI,CAAC;oBAC9C,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,SAAS,CAAC,QAAkB;YAC1B,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,CAAC,EAAU,EAAE,QAA0B;YAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrB,8DAA8D;YAC9D,0DAA0D;YAC1D,IAAI,CAAC,IAAI,CAAC,CAAC;YACX,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC;QAED,aAAa,CAAC,QAAgB;YAC5B,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAED,aAAa,CAAC,OAAgB;YAC5B,UAAU,GAAG,OAAO,CAAC;QACvB,CAAC;QAED,OAAO;YACL,MAAM,GAAG,IAAI,CAAC;YACd,yCAAyC;YACzC,KAAK,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;gBACvC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -24,12 +24,19 @@ import { IncrementalParser } from "./parser.js";
24
24
  import { RenderInline } from "./inline.js";
25
25
  import { CodeColorizer } from "./colorizer.js";
26
26
  import { TableRenderer } from "./table.js";
27
- const incremental = new IncrementalParser();
28
27
  export const MarkdownDisplay = React.memo(function MarkdownDisplay(props) {
29
28
  const { text, palette, width = 80 } = props;
29
+ // Per-instance incremental parser — a module-level singleton would be shared
30
+ // across all MarkdownDisplay instances (multiple message blocks) and corrupt
31
+ // each other's cached state during concurrent streaming.
32
+ const parserRef = React.useRef(null);
33
+ if (parserRef.current === null)
34
+ parserRef.current = new IncrementalParser();
35
+ // useMemo keeps parse() out of the render body so it doesn't mutate mutable
36
+ // parser state during React's render phase (purity requirement).
37
+ const blocks = React.useMemo(() => (text ? parserRef.current.parse(text) : []), [text]);
30
38
  if (!text)
31
39
  return null;
32
- const blocks = incremental.parse(text);
33
40
  return (_jsx(Box, { flexDirection: "column", children: blocks.map((b, i) => (_jsx(BlockView, { block: b, palette: palette, width: width, idx: i }, i))) }));
34
41
  });
35
42
  function BlockView({ block, palette, width, idx, }) {
@@ -1 +1 @@
1
- {"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/tui/ink/markdown/display.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/tui/ink/markdown/display.tsx"],"names":[],"mappings":"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"}
@@ -47,14 +47,12 @@ function isIndexInsideCodeBlock(content, index) {
47
47
  if (fenceStart >= index)
48
48
  break;
49
49
  const hasLanguage = fenceMatch[2].length > 0;
50
- const line = fenceMatch[0];
51
- // A fence with language or other content is an opener
52
- if (hasLanguage || line.trimEnd().length > 3) {
50
+ // A bare ``` is an opener when blockDepth==0, a closer when blockDepth>0.
51
+ if (hasLanguage || blockDepth === 0) {
53
52
  blockDepth++;
54
53
  }
55
54
  else {
56
- if (blockDepth > 0)
57
- blockDepth--;
55
+ blockDepth--;
58
56
  }
59
57
  }
60
58
  return blockDepth > 0;
@@ -72,19 +70,16 @@ function findEnclosingCodeBlockStart(content, cursor) {
72
70
  if (match.index >= cursor)
73
71
  break;
74
72
  const hasLanguage = match[2].length > 0;
75
- const line = match[0];
76
- // A fence with language or other content is an opener
77
- if (hasLanguage || line.trimEnd().length > 3) {
73
+ // A bare ``` is an opener when blockDepth==0, a closer when blockDepth>0.
74
+ if (hasLanguage || blockDepth === 0) {
78
75
  if (blockDepth === 0)
79
76
  blockStart = match.index;
80
77
  blockDepth++;
81
78
  }
82
79
  else {
83
- if (blockDepth > 0) {
84
- blockDepth--;
85
- if (blockDepth === 0)
86
- blockStart = -1;
87
- }
80
+ blockDepth--;
81
+ if (blockDepth === 0)
82
+ blockStart = -1;
88
83
  }
89
84
  }
90
85
  return blockDepth > 0 ? blockStart : -1;
@@ -1 +1 @@
1
- {"version":3,"file":"split-point.js","sourceRoot":"","sources":["../../../../src/tui/ink/markdown/split-point.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"split-point.js","sourceRoot":"","sources":["../../../../src/tui/ink/markdown/split-point.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,2DAA2D;AAC3D,8DAA8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAEzC,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,wEAAwE;IACxE,MAAM,mBAAmB,GAAG,2BAA2B,CACrD,OAAO,EACP,OAAO,CAAC,MAAM,CACf,CAAC;IACF,IAAI,mBAAmB,KAAK,CAAC,CAAC,EAAE,CAAC;QAC/B,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,0EAA0E;IAC1E,IAAI,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAChC,OAAO,UAAU,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACzD,IAAI,QAAQ,KAAK,CAAC,CAAC;YAAE,MAAM;QAC3B,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,2BAA2B;QAC3D,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YAChD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,8DAA8D;IAC9D,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAAC,OAAe,EAAE,KAAa;IAC5D,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,YAAY,GAAG,2CAA2C,CAAC;IACjE,IAAI,UAAkC,CAAC;IACvC,OAAO,CAAC,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC;QACpC,IAAI,UAAU,IAAI,KAAK;YAAE,MAAM;QAC/B,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7C,0EAA0E;QAC1E,IAAI,WAAW,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACpC,UAAU,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,UAAU,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,UAAU,GAAG,CAAC,CAAC;AACxB,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,OAAe,EAAE,MAAc;IAClE,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;IACpB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,OAAO,GAAG,2CAA2C,CAAC;IAC5D,IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM;YAAE,MAAM;QACjC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACxC,0EAA0E;QAC1E,IAAI,WAAW,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACpC,IAAI,UAAU,KAAK,CAAC;gBAAE,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;YAC/C,UAAU,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,UAAU,EAAE,CAAC;YACb,IAAI,UAAU,KAAK,CAAC;gBAAE,UAAU,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,OAAO,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC"}
@@ -13,23 +13,27 @@ export function useOverlays() {
13
13
  const [slashQuery, setSlashQuery] = React.useState(null);
14
14
  // Single effect for @-file and slash overlays to avoid racing reads/writes
15
15
  // on `active` when both tokens appear simultaneously (e.g. "/command @file").
16
+ // `active` is intentionally excluded from the dependency array: the effect
17
+ // only writes to it, never reads it in a way that requires re-running on
18
+ // every active change. Including it caused two renders per overlay activation
19
+ // (the setActive call triggers a re-run, which calls setActive again with the
20
+ // same value). The functional-update form with same-value guards prevents
21
+ // React from scheduling a redundant re-render.
16
22
  React.useEffect(() => {
17
23
  if (atQuery !== null) {
18
24
  // Only activate atfile if no higher-priority overlay is open.
19
- if (active === null || active === "slash")
20
- setActive("atfile");
25
+ setActive((cur) => cur === null || cur === "slash" ? "atfile" : cur);
21
26
  }
22
- else if (active === "atfile") {
23
- setActive(null);
27
+ else {
28
+ setActive((cur) => (cur === "atfile" ? null : cur));
24
29
  }
25
30
  if (slashQuery !== null) {
26
- if (active === null)
27
- setActive("slash");
31
+ setActive((cur) => (cur === null ? "slash" : cur));
28
32
  }
29
- else if (active === "slash") {
30
- setActive(null);
33
+ else {
34
+ setActive((cur) => (cur === "slash" ? null : cur));
31
35
  }
32
- }, [atQuery, slashQuery, active]);
36
+ }, [atQuery, slashQuery]);
33
37
  const openOverlay = React.useCallback((k) => {
34
38
  setActive(k);
35
39
  }, []);
@@ -1 +1 @@
1
- {"version":3,"file":"use-overlays.js","sourceRoot":"","sources":["../../../src/tui/ink/use-overlays.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAkC/B,MAAM,UAAU,WAAW;IACzB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAc,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAExE,2EAA2E;IAC3E,8EAA8E;IAC9E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,8DAA8D;YAC9D,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,OAAO;gBAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,MAAM,KAAK,IAAI;gBAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;aAAM,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAElC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CACnC,CAAC,CAA0C,EAAQ,EAAE;QACnD,SAAS,CAAC,CAAC,CAAC,CAAC;IACf,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,GAAS,EAAE;QAChD,SAAS,CAAC,IAAI,CAAC,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,aAAa,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CACzC,CAAC,KAAa,EAAE,QAAgB,EAAU,EAAE;QAC1C,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,KAAK,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7B,iEAAiE;QACjE,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAClB,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAAE,GAAG,IAAI,CAAC,CAAC;QACpE,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IACjE,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,CAAC,WAAW,CAC5C,CAAC,KAAa,EAAE,QAAgB,EAAU,EAAE;QAC1C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,QAAQ,EAAE,CAAC;QAClD,8DAA8D;QAC9D,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAAE,GAAG,IAAI,CAAC,CAAC;QACpE,OAAO,IAAI,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3C,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAClB,GAAG,EAAE,CAAC,CAAC;QACL,MAAM;QACN,SAAS;QACT,OAAO;QACP,UAAU;QACV,UAAU;QACV,aAAa;QACb,WAAW;QACX,YAAY;QACZ,iBAAiB;QACjB,oBAAoB;KACrB,CAAC,EACF;QACE,MAAM;QACN,OAAO;QACP,UAAU;QACV,WAAW;QACX,YAAY;QACZ,iBAAiB;QACjB,oBAAoB;KACrB,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"use-overlays.js","sourceRoot":"","sources":["../../../src/tui/ink/use-overlays.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import type { EventStream } from "../../kernel/event-stream.js";
2
+ export interface ActiveTool {
3
+ id: string;
4
+ name: string;
5
+ elapsedMs: number;
6
+ }
7
+ export declare function useToolProgress(events: EventStream): ActiveTool[];
@@ -0,0 +1,39 @@
1
+ import { useState, useEffect, useRef } from "react";
2
+ export function useToolProgress(events) {
3
+ const [tools, setTools] = useState([]);
4
+ // Map<id, { name, startedAt }>
5
+ const activeRef = useRef(new Map());
6
+ // Subscribe to the event stream
7
+ useEffect(() => {
8
+ // Clear any stale tools from a previous subscription
9
+ activeRef.current.clear();
10
+ const unsubscribe = events.subscribe((event) => {
11
+ // Narrow the event shape – the kernel guarantees these shapes.
12
+ if (event.type === "tool_exec_start") {
13
+ const { id, name } = event;
14
+ activeRef.current.set(id, { name, startedAt: Date.now() });
15
+ }
16
+ else if (event.type === "tool_exec_end") {
17
+ const { id } = event;
18
+ activeRef.current.delete(id);
19
+ }
20
+ });
21
+ return unsubscribe;
22
+ }, [events]);
23
+ // Update elapsed times every second
24
+ useEffect(() => {
25
+ const interval = setInterval(() => {
26
+ const now = Date.now();
27
+ const entries = [];
28
+ for (const [id, { name, startedAt }] of activeRef.current.entries()) {
29
+ entries.push({ id, name, elapsedMs: now - startedAt, startedAt });
30
+ }
31
+ // Sort by startedAt ascending so the oldest running tool appears first
32
+ entries.sort((a, b) => a.startedAt - b.startedAt);
33
+ setTools(entries.map(({ id, name, elapsedMs }) => ({ id, name, elapsedMs })));
34
+ }, 1000);
35
+ return () => clearInterval(interval);
36
+ }, []);
37
+ return tools;
38
+ }
39
+ //# sourceMappingURL=use-tool-progress.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"use-tool-progress.js","sourceRoot":"","sources":["../../../src/tui/ink/use-tool-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AASnD,MAAM,UAAU,eAAe,CAAC,MAAmB;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,EAAE,CAAC,CAAA;IAEpD,+BAA+B;IAC/B,MAAM,SAAS,GAAG,MAAM,CACtB,IAAI,GAAG,EAAE,CACV,CAAA;IAED,gCAAgC;IAChC,SAAS,CAAC,GAAG,EAAE;QACb,qDAAqD;QACrD,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAEzB,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7C,+DAA+D;YAC/D,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACrC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAqC,CAAA;gBAC1D,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC5D,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC1C,MAAM,EAAE,EAAE,EAAE,GAAG,KAAuB,CAAA;gBACtC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,WAAW,CAAA;IACpB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEZ,oCAAoC;IACpC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,OAAO,GAAyE,EAAE,CAAA;YAExF,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,GAAG,SAAS,EAAE,SAAS,EAAE,CAAC,CAAA;YACnE,CAAC;YAED,uEAAuE;YACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAA;YAEjD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;QAC/E,CAAC,EAAE,IAAI,CAAC,CAAA;QAER,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,KAAK,CAAA;AACd,CAAC"}
@@ -14,7 +14,7 @@ import { useInput, useStdout } from "ink";
14
14
  export function useTranscriptScroll(itemCount, autoScroll, inputFocus) {
15
15
  const { stdout } = useStdout();
16
16
  const rows = stdout?.rows ?? 24;
17
- const pageStep = Math.max(1, Math.floor(rows / 2));
17
+ const pageStep = Math.max(1, Math.floor(rows / 6));
18
18
  const [scrollOffset, setScrollOffset] = React.useState(0);
19
19
  const userScrolledRef = React.useRef(false);
20
20
  const prevItemCountRef = React.useRef(itemCount);
@@ -23,13 +23,17 @@ export function useTranscriptScroll(itemCount, autoScroll, inputFocus) {
23
23
  prevItemCountRef.current = itemCount;
24
24
  if (itemCount > prev && autoScroll && !userScrolledRef.current) {
25
25
  setScrollOffset(0);
26
+ // keep the ref in sync with the state we just set
27
+ userScrolledRef.current = false;
26
28
  }
27
29
  }, [itemCount, autoScroll]);
28
30
  const isAtBottom = scrollOffset === 0;
29
31
  const doScrollUp = React.useCallback(() => {
30
- setScrollOffset((prev) => Math.min(itemCount - 1, prev + 1));
32
+ // Clamp to 0 so an empty transcript (itemCount === 0) never sets
33
+ // scrollOffset to -1, which would break the isAtBottom invariant.
34
+ setScrollOffset((prev) => Math.max(0, Math.min(Math.max(0, itemCount - rows), prev + 1)));
31
35
  userScrolledRef.current = true;
32
- }, [itemCount]);
36
+ }, [itemCount, rows]);
33
37
  const doScrollDown = React.useCallback(() => {
34
38
  setScrollOffset((prev) => {
35
39
  const next = Math.max(0, prev - 1);
@@ -39,9 +43,9 @@ export function useTranscriptScroll(itemCount, autoScroll, inputFocus) {
39
43
  });
40
44
  }, []);
41
45
  const pageUp = React.useCallback(() => {
42
- setScrollOffset((prev) => Math.min(itemCount - 1, prev + pageStep));
46
+ setScrollOffset((prev) => Math.max(0, Math.min(Math.max(0, itemCount - rows), prev + pageStep)));
43
47
  userScrolledRef.current = true;
44
- }, [itemCount, pageStep]);
48
+ }, [itemCount, rows, pageStep]);
45
49
  const pageDown = React.useCallback(() => {
46
50
  setScrollOffset((prev) => {
47
51
  const next = Math.max(0, prev - pageStep);
@@ -54,7 +58,8 @@ export function useTranscriptScroll(itemCount, autoScroll, inputFocus) {
54
58
  userScrolledRef.current = false;
55
59
  setScrollOffset(0);
56
60
  }, []);
57
- useInput((_ch, key) => {
61
+ // Register the page‑up / page‑down listener and clean it up on unmount.
62
+ const unsubscribeInput = useInput((_ch, key) => {
58
63
  if (inputFocus) {
59
64
  if (key.ctrl && key.pageUp) {
60
65
  pageUp();
@@ -72,6 +77,9 @@ export function useTranscriptScroll(itemCount, autoScroll, inputFocus) {
72
77
  }
73
78
  }
74
79
  }, { isActive: true });
80
+ React.useEffect(() => {
81
+ return unsubscribeInput;
82
+ }, [unsubscribeInput]);
75
83
  return {
76
84
  scrollOffset,
77
85
  isAtBottom,