@dirgha/code 1.22.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.
- package/CHANGELOG.md +171 -0
- package/README.md +8 -4
- package/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.d.ts +36 -5
- package/dist/cli/config.js +31 -3
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +40 -24
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +13 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +61 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -23
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -0
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +28 -3
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/index.d.ts +2 -1
- package/dist/cli/slash/index.js +3 -1
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/models.js +339 -7
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +4 -7
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.d.ts +1 -0
- package/dist/cli/slash/provider.js +33 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/sandbox.d.ts +21 -0
- package/dist/cli/slash/sandbox.js +84 -0
- package/dist/cli/slash/sandbox.js.map +1 -0
- package/dist/cli/slash.d.ts +5 -0
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +28 -8
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +4 -0
- package/dist/cli/subcommands/doctor.js +117 -21
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.js +6 -6
- package/dist/cli/subcommands/feature-setup.js.map +1 -1
- package/dist/cli/subcommands/memory.js +23 -0
- package/dist/cli/subcommands/memory.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/_fts.js +4 -1
- package/dist/context/_fts.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +44 -21
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +1 -0
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +8 -1
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -1
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.d.ts +17 -0
- package/dist/context/primer.js +50 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +4 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/embeddings/iface.d.ts +26 -0
- package/dist/embeddings/iface.js +15 -0
- package/dist/embeddings/iface.js.map +1 -0
- package/dist/embeddings/local.d.ts +24 -0
- package/dist/embeddings/local.js +112 -0
- package/dist/embeddings/local.js.map +1 -0
- package/dist/embeddings/remote.d.ts +31 -0
- package/dist/embeddings/remote.js +88 -0
- package/dist/embeddings/remote.js.map +1 -0
- package/dist/embeddings/select.d.ts +24 -0
- package/dist/embeddings/select.js +39 -0
- package/dist/embeddings/select.js.map +1 -0
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/failover-chain.js +10 -1
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +45 -11
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/abort-utils.d.ts +4 -0
- package/dist/kernel/abort-utils.js +45 -0
- package/dist/kernel/abort-utils.js.map +1 -0
- package/dist/kernel/agent-loop.js +104 -25
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/tool-timeout.d.ts +27 -0
- package/dist/kernel/tool-timeout.js +53 -0
- package/dist/kernel/tool-timeout.js.map +1 -0
- package/dist/kernel/types.d.ts +3 -0
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/custom-provider.d.ts +31 -0
- package/dist/providers/custom-provider.js +72 -0
- package/dist/providers/custom-provider.js.map +1 -0
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +25 -2
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/family-fallback.js +5 -0
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini.js +33 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/index.d.ts +16 -0
- package/dist/providers/index.js +43 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/machine1.d.ts +30 -0
- package/dist/providers/machine1.js +341 -0
- package/dist/providers/machine1.js.map +1 -0
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +32 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +5 -2
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.js +11 -1
- package/dist/state/db-telemetry.js.map +1 -1
- package/dist/state/db.d.ts +7 -0
- package/dist/state/db.js +147 -3
- package/dist/state/db.js.map +1 -1
- package/dist/state/index.js +8 -4
- package/dist/state/index.js.map +1 -1
- package/dist/state/sync-index.d.ts +74 -0
- package/dist/state/sync-index.js +246 -0
- package/dist/state/sync-index.js.map +1 -0
- package/dist/state/transaction.d.ts +62 -0
- package/dist/state/transaction.js +65 -0
- package/dist/state/transaction.js.map +1 -0
- package/dist/state/vec.d.ts +28 -0
- package/dist/state/vec.js +113 -0
- package/dist/state/vec.js.map +1 -0
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +94 -63
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/db-workspace-info.d.ts +10 -0
- package/dist/tools/db-workspace-info.js +76 -0
- package/dist/tools/db-workspace-info.js.map +1 -0
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +6 -1
- package/dist/tools/exec.js +46 -4
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +13 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/github.d.ts +13 -0
- package/dist/tools/github.js +257 -0
- package/dist/tools/github.js.map +1 -0
- package/dist/tools/graph-neighbors.d.ts +9 -0
- package/dist/tools/graph-neighbors.js +77 -0
- package/dist/tools/graph-neighbors.js.map +1 -0
- package/dist/tools/graph-traverse.d.ts +10 -0
- package/dist/tools/graph-traverse.js +90 -0
- package/dist/tools/graph-traverse.js.map +1 -0
- package/dist/tools/index.d.ts +10 -2
- package/dist/tools/index.js +17 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/kb-search.d.ts +13 -0
- package/dist/tools/kb-search.js +113 -0
- package/dist/tools/kb-search.js.map +1 -0
- package/dist/tools/multimodal.js +30 -15
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/permission.js +5 -4
- package/dist/tools/permission.js.map +1 -1
- package/dist/tools/registry.d.ts +10 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.js +28 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +46 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +7 -1
- package/dist/tools/shell.js +178 -61
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/transactional-write.d.ts +10 -0
- package/dist/tools/transactional-write.js +132 -0
- package/dist/tools/transactional-write.js.map +1 -0
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.d.ts +2 -1
- package/dist/tui/ink/App.js +333 -79
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +20 -3
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +38 -21
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +20 -0
- package/dist/tui/ink/components/Logo.js +67 -1
- package/dist/tui/ink/components/Logo.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js.map +1 -1
- package/dist/tui/ink/components/SandboxPicker.d.ts +18 -0
- package/dist/tui/ink/components/SandboxPicker.js +77 -0
- package/dist/tui/ink/components/SandboxPicker.js.map +1 -0
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -11
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +21 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +5 -3
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/index.js +36 -14
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.d.ts +2 -0
- package/dist/tui/ink/ink-approval-bus.js +10 -0
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/markdown/display.js +9 -2
- package/dist/tui/ink/markdown/display.js.map +1 -1
- package/dist/tui/ink/markdown/split-point.js +8 -13
- package/dist/tui/ink/markdown/split-point.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/theme-context.js +6 -3
- package/dist/tui/ink/theme-context.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +6 -2
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-elapsed.d.ts +9 -1
- package/dist/tui/ink/use-elapsed.js +17 -2
- package/dist/tui/ink/use-elapsed.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +10 -0
- package/dist/tui/ink/use-event-projection.js +111 -12
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.js +9 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -1
- package/dist/tui/ink/use-overlays.d.ts +2 -2
- package/dist/tui/ink/use-overlays.js +20 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +18 -5
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +39 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +14 -6
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +12 -8
|
@@ -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,15 +1,7 @@
|
|
|
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";
|
|
12
|
-
import { SpinnerContext } from "../spinner-context.js";
|
|
13
5
|
import { SpinnerGlyph } from "./SpinnerGlyph.js";
|
|
14
6
|
function formatTokens(n) {
|
|
15
7
|
if (n < 1000)
|
|
@@ -48,7 +40,6 @@ export const StatusBar = React.memo(function StatusBar(props) {
|
|
|
48
40
|
const { stdout } = useStdout();
|
|
49
41
|
const palette = useTheme();
|
|
50
42
|
const cols = stdout?.columns ?? 80;
|
|
51
|
-
const { busy: _spinnerBusy } = React.useContext(SpinnerContext);
|
|
52
43
|
const totalTokens = props.inputTokens + props.outputTokens;
|
|
53
44
|
const costLabel = props.costUsd > 0 ? `$${props.costUsd.toFixed(3)}` : "";
|
|
54
45
|
// Strip provider prefix so the footer reads short and human.
|
|
@@ -101,8 +92,8 @@ export const StatusBar = React.memo(function StatusBar(props) {
|
|
|
101
92
|
})();
|
|
102
93
|
// Slim status bar — only what's load-bearing:
|
|
103
94
|
// left: ⏵⏵ MODE · cwd [overflow]
|
|
104
|
-
// right: spinner (when busy) · short model · context-meter or cost
|
|
105
|
-
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" &&
|
|
106
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 }))] })] }));
|
|
107
98
|
});
|
|
108
99
|
//# sourceMappingURL=StatusBar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Thinking block
|
|
2
|
+
* Thinking block — Gemini CLI-style always-visible reasoning display.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* Thinking content is shown as a clean bubble: first line is a bold
|
|
5
|
+
* summary heading, the remainder is in a left-bordered italic block.
|
|
6
|
+
* Always visible — no toggle/collapse. During streaming the heading
|
|
7
|
+
* updates live; after streaming the block stays visible for context.
|
|
8
|
+
*
|
|
9
|
+
* ThinkingBlockGroup merges 3+ consecutive blocks into single grouped rows.
|
|
7
10
|
*/
|
|
8
11
|
import * as React from "react";
|
|
9
12
|
export interface ThinkingBlockProps {
|
|
10
13
|
content: string;
|
|
14
|
+
isStreaming?: boolean;
|
|
11
15
|
}
|
|
12
16
|
export declare const ThinkingBlock: React.NamedExoticComponent<ThinkingBlockProps>;
|
|
17
|
+
export interface ThinkingBlockGroupProps {
|
|
18
|
+
blocks: {
|
|
19
|
+
id: string;
|
|
20
|
+
content: string;
|
|
21
|
+
}[];
|
|
22
|
+
}
|
|
23
|
+
export declare const ThinkingBlockGroup: React.NamedExoticComponent<ThinkingBlockGroupProps>;
|
|
@@ -1,27 +1,44 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/**
|
|
3
|
-
* Thinking block
|
|
3
|
+
* Thinking block — Gemini CLI-style always-visible reasoning display.
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* Thinking content is shown as a clean bubble: first line is a bold
|
|
6
|
+
* summary heading, the remainder is in a left-bordered italic block.
|
|
7
|
+
* Always visible — no toggle/collapse. During streaming the heading
|
|
8
|
+
* updates live; after streaming the block stays visible for context.
|
|
9
|
+
*
|
|
10
|
+
* ThinkingBlockGroup merges 3+ consecutive blocks into single grouped rows.
|
|
8
11
|
*/
|
|
9
12
|
import * as React from "react";
|
|
10
|
-
import { Box, Text
|
|
13
|
+
import { Box, Text } from "ink";
|
|
14
|
+
import { useTheme } from "../theme-context.js";
|
|
15
|
+
function splitContent(content) {
|
|
16
|
+
const lines = content.trim().split("\n");
|
|
17
|
+
if (lines.length <= 1)
|
|
18
|
+
return { summary: "", body: content.trim() };
|
|
19
|
+
return {
|
|
20
|
+
summary: lines[0].trim(),
|
|
21
|
+
body: lines.slice(1).join("\n").trim(),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
11
24
|
export const ThinkingBlock = React.memo(function ThinkingBlock({ content, }) {
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (
|
|
25
|
+
const palette = useTheme();
|
|
26
|
+
if (!content)
|
|
27
|
+
return null;
|
|
28
|
+
const { summary, body } = splitContent(content);
|
|
29
|
+
return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 1, children: [summary.length > 0 && (_jsx(Box, { paddingLeft: 2, marginBottom: body.length > 0 ? 0 : 0, children: _jsx(Text, { color: palette.text.primary, bold: true, italic: true, children: summary }) })), body.length > 0 && (_jsx(Box, { borderStyle: "single", borderLeft: true, borderRight: false, borderTop: false, borderBottom: false, borderColor: palette.border.default, paddingLeft: 1, marginLeft: 2, children: _jsx(Text, { color: palette.text.secondary, italic: true, wrap: "wrap", children: body }) })), summary.length === 0 && body.length === 0 && (_jsx(Text, { color: palette.text.secondary, italic: true, children: content }))] }));
|
|
30
|
+
});
|
|
31
|
+
export const ThinkingBlockGroup = React.memo(function ThinkingBlockGroup({ blocks, }) {
|
|
32
|
+
const palette = useTheme();
|
|
33
|
+
if (blocks.length === 0)
|
|
21
34
|
return null;
|
|
22
|
-
|
|
23
|
-
|
|
35
|
+
// One block with content — delegate to ThinkingBlock.
|
|
36
|
+
if (blocks.length === 1) {
|
|
37
|
+
return _jsx(ThinkingBlock, { content: blocks[0].content });
|
|
24
38
|
}
|
|
25
|
-
return (
|
|
39
|
+
return (_jsx(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 1, children: blocks.map((block, i) => {
|
|
40
|
+
const { summary, body } = splitContent(block.content);
|
|
41
|
+
return (_jsxs(Box, { flexDirection: "column", children: [summary.length > 0 && (_jsx(Box, { paddingLeft: 2, marginBottom: body.length > 0 ? 0 : 0, children: _jsx(Text, { color: palette.text.primary, bold: true, italic: true, children: summary }) })), body.length > 0 && (_jsx(Box, { borderStyle: "single", borderLeft: true, borderRight: false, borderTop: false, borderBottom: false, borderColor: palette.border.default, paddingLeft: 1, marginLeft: 2, marginBottom: i < blocks.length - 1 ? 1 : 0, children: _jsx(Text, { color: palette.text.secondary, italic: true, wrap: "wrap", children: body }) }))] }, block.id));
|
|
42
|
+
}) }));
|
|
26
43
|
});
|
|
27
44
|
//# sourceMappingURL=ThinkingBlock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThinkingBlock.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ThinkingBlock.tsx"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"ThinkingBlock.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ThinkingBlock.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,9 @@ import * as React from "react";
|
|
|
16
16
|
import { Box, Text } from "ink";
|
|
17
17
|
import { iconFor } from "../icons.js";
|
|
18
18
|
import { useTheme } from "../theme-context.js";
|
|
19
|
-
import { SpinnerContext } from "../spinner-context.js";
|
|
20
19
|
import { SpinnerGlyph } from "./SpinnerGlyph.js";
|
|
21
20
|
import { useElapsed } from "../use-elapsed.js";
|
|
21
|
+
import { highlightContent, colorForKind, isCodeFile, } from "../markdown/syntax-highlight.js";
|
|
22
22
|
const TOOL_LABEL = {
|
|
23
23
|
fs_read: "Read",
|
|
24
24
|
fs_write: "Write",
|
|
@@ -30,9 +30,8 @@ const TOOL_LABEL = {
|
|
|
30
30
|
git: "Git",
|
|
31
31
|
task: "Task",
|
|
32
32
|
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
const DIFF_HUNK_COLOUR = "#00ffff";
|
|
33
|
+
// Diff colours are computed from the theme palette inside the component.
|
|
34
|
+
// Module-level constants removed — see renderDiffLines for theme usage.
|
|
36
35
|
function prettyName(name) {
|
|
37
36
|
return TOOL_LABEL[name] ?? name.replace(/_/g, " ");
|
|
38
37
|
}
|
|
@@ -54,16 +53,19 @@ function isDiffOutput(props) {
|
|
|
54
53
|
return true;
|
|
55
54
|
return false;
|
|
56
55
|
}
|
|
57
|
-
function renderDiffLines(text, limit) {
|
|
56
|
+
function renderDiffLines(text, limit, palette) {
|
|
57
|
+
const addColour = palette.status.success ?? "#50fa7b";
|
|
58
|
+
const delColour = palette.status.error ?? "#ff5555";
|
|
59
|
+
const hunkColour = palette.ui.focus ?? "#00ffff";
|
|
58
60
|
const lines = text.split("\n").slice(0, limit);
|
|
59
61
|
return lines.map((line, i) => {
|
|
60
62
|
let colour;
|
|
61
63
|
if (line.startsWith("+") && !line.startsWith("+++"))
|
|
62
|
-
colour =
|
|
64
|
+
colour = addColour;
|
|
63
65
|
else if (line.startsWith("-") && !line.startsWith("---"))
|
|
64
|
-
colour =
|
|
66
|
+
colour = delColour;
|
|
65
67
|
else if (/^@@\s/.test(line))
|
|
66
|
-
colour =
|
|
68
|
+
colour = hunkColour;
|
|
67
69
|
return (_jsx(Box, { flexDirection: "row", children: _jsx(Text, { color: colour, dimColor: !colour, children: line || " " }) }, i));
|
|
68
70
|
});
|
|
69
71
|
}
|
|
@@ -78,7 +80,6 @@ function diffShortPreview(text, maxLen = 80) {
|
|
|
78
80
|
}
|
|
79
81
|
export const ToolBox = React.memo(function ToolBox(props) {
|
|
80
82
|
const palette = useTheme();
|
|
81
|
-
const { busy: _spinnerBusy } = React.useContext(SpinnerContext);
|
|
82
83
|
const isRunning = props.status !== "done" &&
|
|
83
84
|
props.status !== "error" &&
|
|
84
85
|
props.status !== "blocked";
|
|
@@ -101,7 +102,7 @@ export const ToolBox = React.memo(function ToolBox(props) {
|
|
|
101
102
|
: props.status === "done"
|
|
102
103
|
? palette.border.default
|
|
103
104
|
: palette.ui.focus;
|
|
104
|
-
const liveElapsed = useElapsed(props.startedAt);
|
|
105
|
+
const liveElapsed = useElapsed(props.startedAt, props.status === "running");
|
|
105
106
|
const elapsedLabel = props.status === "blocked"
|
|
106
107
|
? ""
|
|
107
108
|
: props.status === "running"
|
|
@@ -115,8 +116,15 @@ export const ToolBox = React.memo(function ToolBox(props) {
|
|
|
115
116
|
: diffMode && props.outputPreview
|
|
116
117
|
? diffShortPreview(props.outputPreview, 80)
|
|
117
118
|
: "";
|
|
118
|
-
return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColour, paddingX: 1, marginBottom: 1, children: [_jsxs(Box, { gap: 1, children: [icon !== null ? (_jsx(Text, { color: iconColour, children: icon })) : (_jsx(SpinnerGlyph, { isActive: isRunning
|
|
119
|
-
? palette.
|
|
120
|
-
: palette.text.
|
|
119
|
+
return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColour, paddingX: 1, marginBottom: 1, children: [_jsxs(Box, { gap: 1, children: [icon !== null ? (_jsx(Text, { color: iconColour, children: icon })) : (_jsx(SpinnerGlyph, { isActive: isRunning, color: palette.ui.focus })), _jsx(Text, { color: props.status === "error"
|
|
120
|
+
? palette.status.error
|
|
121
|
+
: palette.text.accent, bold: true, children: iconFor(props.name) }), _jsx(Text, { color: props.status === "error"
|
|
122
|
+
? palette.status.error
|
|
123
|
+
: props.status === "done" || props.status === "blocked"
|
|
124
|
+
? palette.text.secondary
|
|
125
|
+
: palette.text.primary, bold: props.status !== "blocked", dimColor: props.status === "blocked", children: prettyName(props.name) }), props.argSummary !== undefined && props.argSummary.length > 0 && (_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: ["(", props.argSummary, ")"] })), elapsedLabel !== "" && (_jsx(Text, { color: palette.text.secondary, dimColor: true, children: elapsedLabel })), props.status === "blocked" && (_jsx(Text, { color: palette.status.warning, children: "(blocked)" }))] }), preview !== "" && !diffMode && (_jsx(Box, { children: props.name === "fs_read" &&
|
|
126
|
+
props.argSummary &&
|
|
127
|
+
isCodeFile(props.argSummary) &&
|
|
128
|
+
props.outputPreview ? (_jsx(Text, { children: highlightContent(props.outputPreview, props.argSummary).map((tok, i) => (_jsx(Text, { color: colorForKind(tok.kind, palette), children: tok.value }, i))) })) : (_jsx(Text, { color: palette.text.secondary, dimColor: true, children: preview })) })), diffMode && props.outputPreview && (_jsx(Box, { flexDirection: "column", children: renderDiffLines(props.outputPreview, 30, palette) }))] }));
|
|
121
129
|
});
|
|
122
130
|
//# sourceMappingURL=ToolBox.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolBox.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ToolBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolBox.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,4 +16,4 @@ export interface VirtualTranscriptProps {
|
|
|
16
16
|
autoScroll: boolean;
|
|
17
17
|
inputFocus: boolean;
|
|
18
18
|
}
|
|
19
|
-
export declare
|
|
19
|
+
export declare const VirtualTranscript: React.NamedExoticComponent<VirtualTranscriptProps>;
|
|
@@ -12,7 +12,7 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
12
12
|
import * as React from "react";
|
|
13
13
|
import { Box, Text, useStdout } from "ink";
|
|
14
14
|
import { useTranscriptScroll } from "../use-transcript-scroll.js";
|
|
15
|
-
export function VirtualTranscript(props) {
|
|
15
|
+
export const VirtualTranscript = React.memo(function VirtualTranscript(props) {
|
|
16
16
|
const { items, renderItem, autoScroll, inputFocus } = props;
|
|
17
17
|
const { stdout } = useStdout();
|
|
18
18
|
const rows = stdout?.rows ?? 24;
|
|
@@ -20,10 +20,12 @@ export function VirtualTranscript(props) {
|
|
|
20
20
|
const buffer = 5;
|
|
21
21
|
const visibleCount = Math.max(1, rows - buffer);
|
|
22
22
|
const endIdx = items.length - scrollOffset;
|
|
23
|
-
|
|
23
|
+
// visibleCount already subtracts buffer. Only subtract one more buffer
|
|
24
|
+
// (not two) so the viewport doesn't shrink by double.
|
|
25
|
+
const visibleStart = Math.max(0, endIdx - visibleCount);
|
|
24
26
|
const paddedStart = Math.max(0, visibleStart - buffer);
|
|
25
27
|
const visibleItems = items.slice(paddedStart, endIdx);
|
|
26
28
|
const aboveCount = paddedStart;
|
|
27
29
|
return (_jsxs(Box, { flexDirection: "column", children: [aboveCount > 0 && (_jsx(Box, { children: _jsxs(Text, { dimColor: true, children: ["[", aboveCount, " item", aboveCount !== 1 ? "s" : "", " above]"] }) })), visibleItems.map((item) => (_jsx(React.Fragment, { children: renderItem(item) }, item.id))), !isAtBottom && scrollOffset > 0 && (_jsx(Box, { children: _jsxs(Text, { dimColor: true, children: ["[", scrollOffset, " item", scrollOffset !== 1 ? "s" : "", " below]"] }) }))] }));
|
|
28
|
-
}
|
|
30
|
+
});
|
|
29
31
|
//# sourceMappingURL=VirtualTranscript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualTranscript.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/VirtualTranscript.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AASlE,MAAM,
|
|
1
|
+
{"version":3,"file":"VirtualTranscript.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/VirtualTranscript.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AASlE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,iBAAiB,CACpE,KAA6B;IAE7B,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;IAEhC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,mBAAmB,CACtD,KAAK,CAAC,MAAM,EACZ,UAAU,EACV,UAAU,CACX,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,CAAC;IACjB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;IAC3C,uEAAuE;IACvE,sDAAsD;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,WAAW,CAAC;IAE/B,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,UAAU,GAAG,CAAC,IAAI,CACjB,KAAC,GAAG,cACF,MAAC,IAAI,IAAC,QAAQ,wBACV,UAAU,WAAO,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eACzC,GACH,CACP,EACA,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC1B,KAAC,KAAK,CAAC,QAAQ,cAAgB,UAAU,CAAC,IAAI,CAAC,IAA1B,IAAI,CAAC,EAAE,CAAqC,CAClE,CAAC,EACD,CAAC,UAAU,IAAI,YAAY,GAAG,CAAC,IAAI,CAClC,KAAC,GAAG,cACF,MAAC,IAAI,IAAC,QAAQ,wBACV,YAAY,WAAO,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,eAC7C,GACH,CACP,IACG,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/dist/tui/ink/index.js
CHANGED
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
import * as React from "react";
|
|
9
9
|
import { render } from "ink";
|
|
10
10
|
import { createEventStream } from "../../kernel/event-stream.js";
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
11
|
+
import { App, VERSION } from "./App.js";
|
|
12
|
+
import { renderLogoString } from "./components/Logo.js";
|
|
13
13
|
import { createDefaultSlashRegistry, registerBuiltinSlashCommands, } from "../../cli/slash.js";
|
|
14
14
|
export { App } from "./App.js";
|
|
15
15
|
export { Logo } from "./components/Logo.js";
|
|
@@ -31,32 +31,51 @@ export async function runInkTUI(opts) {
|
|
|
31
31
|
if (useAltBuffer) {
|
|
32
32
|
process.stdout.write("\x1b[?1049h");
|
|
33
33
|
}
|
|
34
|
+
// Emit the brand logo to stdout BEFORE Ink mounts. Keeping the logo
|
|
35
|
+
// out of Ink's render tree avoids the re-emission flicker users hit
|
|
36
|
+
// when transcripts overflow the viewport: Ink's onRender prepends
|
|
37
|
+
// `fullStaticOutput` (which would include the logo if it lived in
|
|
38
|
+
// `<Static>`) on every overflow redraw — see
|
|
39
|
+
// node_modules/ink/build/ink.js:118-125. The logo now sits in
|
|
40
|
+
// terminal scrollback (or alt buffer scrollback) and Ink never
|
|
41
|
+
// touches it.
|
|
42
|
+
if (process.stdout.isTTY) {
|
|
43
|
+
const cols = process.stdout.columns ?? 80;
|
|
44
|
+
process.stdout.write(renderLogoString(opts.config.theme, VERSION, cols));
|
|
45
|
+
// OSC 0: set both window title and icon name. Updated to include
|
|
46
|
+
// the session title once the model emits one (see App.tsx).
|
|
47
|
+
process.stdout.write("\x1b]0;Dirgha\x07");
|
|
48
|
+
}
|
|
34
49
|
const restore = () => {
|
|
35
50
|
if (useAltBuffer) {
|
|
36
51
|
process.stdout.write("\x1b[?1049l");
|
|
37
52
|
}
|
|
38
53
|
};
|
|
39
|
-
const
|
|
40
|
-
|
|
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;
|
|
41
69
|
if (s) {
|
|
42
70
|
try {
|
|
43
71
|
s.close();
|
|
44
|
-
void closeSession(s.id);
|
|
45
72
|
}
|
|
46
73
|
catch {
|
|
47
74
|
/* best-effort */
|
|
48
75
|
}
|
|
49
76
|
}
|
|
50
|
-
restore();
|
|
51
|
-
process.exit(s ? 0 : 1);
|
|
52
77
|
};
|
|
53
|
-
process.
|
|
54
|
-
doExit();
|
|
55
|
-
});
|
|
56
|
-
process.once("SIGTERM", () => {
|
|
57
|
-
doExit();
|
|
58
|
-
});
|
|
59
|
-
const sessionHandle = { session: null };
|
|
78
|
+
process.on("exit", onProcessExit);
|
|
60
79
|
const element = React.createElement(App, {
|
|
61
80
|
events,
|
|
62
81
|
registry: opts.registry,
|
|
@@ -85,6 +104,9 @@ export async function runInkTUI(opts) {
|
|
|
85
104
|
}
|
|
86
105
|
finally {
|
|
87
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);
|
|
88
110
|
restore();
|
|
89
111
|
}
|
|
90
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tui/ink/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAKjE,OAAO,EAAE,
|
|
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;
|
|
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":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAA6B,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/tui/ink/markdown/display.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAA6B,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAQ3C,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,eAAe,CAChE,KAAoB;IAEpB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAC5C,6EAA6E;IAC7E,6EAA6E;IAC7E,yDAAyD;IACzD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAA2B,IAAI,CAAC,CAAC;IAC/D,IAAI,SAAS,CAAC,OAAO,KAAK,IAAI;QAAE,SAAS,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC5E,4EAA4E;IAC5E,iEAAiE;IACjE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAC1B,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,OAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,CAAC,IAAI,CAAC,CACP,CAAC;IACF,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACxB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACpB,KAAC,SAAS,IAAS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAnD,CAAC,CAAsD,CACxE,CAAC,GACE,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AASH,SAAS,SAAS,CAAC,EACjB,KAAK,EACL,OAAO,EACP,KAAK,EACL,GAAG,GACY;IACf,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,KAAC,GAAG,IAAC,MAAM,EAAE,CAAC,GAAI,CAAC;QAE5B,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,MAAM,GACV,KAAK,CAAC,KAAK,KAAK,CAAC;gBACf,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM;gBACrB,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;oBACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM;oBACrB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,CACL,KAAC,GAAG,IACF,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC5B,YAAY,EAAE,CAAC,EACf,aAAa,EAAC,QAAQ,YAEtB,MAAC,IAAI,eACH,MAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,mBACrC,MAAM,EAAE,GAAG,IACP,EACP,KAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAE,MAAM,YACtB,KAAC,YAAY,IACX,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,IAAI,GAAG,EAAE,GACpB,GACG,IACF,GACH,CACP,CAAC;QACJ,CAAC;QAED,KAAK,WAAW;YACd,OAAO,CACL,KAAC,GAAG,cACF,KAAC,YAAY,IACX,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,IAAI,GAAG,EAAE,GACpB,GACE,CACP,CAAC;QAEJ,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,OAAO,CACL,MAAC,GAAG,IACF,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,CAAC,EACX,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EACnC,cAAc,QACd,aAAa,EAAC,QAAQ,aAErB,IAAI,IAAI,CACP,KAAC,GAAG,cACF,KAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,kBAC1C,IAAI,GACA,GACH,CACP,EACD,KAAC,aAAa,IAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,IAC3D,CACP,CAAC;QACJ,CAAC;QAED,KAAK,MAAM;YACT,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACxB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAC5B,KAAC,WAAW,IAEV,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAC9C,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC,EAAE,IALpB,CAAC,CAMN,CACH,CAAC,GACE,CACP,CAAC;QAEJ,KAAK,MAAM;YACT,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAE,CAAC,YACb,KAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,YAChC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAC7C,GACH,CACP,CAAC;QAEJ,KAAK,OAAO;YACV,OAAO,CACL,KAAC,aAAa,IACZ,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,KAAK,GACf,CACH,CAAC;QAEJ,KAAK,YAAY;YACf,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,OAAO,EAAE,CAAC,aACjC,KAAC,GAAG,IAAC,WAAW,EAAE,CAAC,YACjB,KAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,uBAAU,GACtC,EACN,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,YACrC,KAAC,IAAI,IAAC,MAAM,QAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,YACxC,KAAC,YAAY,IACX,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EACjC,SAAS,EAAE,IAAI,GAAG,EAAE,GACpB,GACG,GACH,IACF,CACP,CAAC;IACN,CAAC;AACH,CAAC;AAUD,SAAS,WAAW,CAAC,EACnB,IAAI,EACJ,OAAO,EACP,OAAO,EACP,WAAW,EACX,SAAS,GACQ;IACjB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO;QACpB,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG;QAC9C,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,WAAW,EAAE,MAAM,GAAG,CAAC,aAC9C,KAAC,GAAG,IAAC,WAAW,EAAE,CAAC,YACjB,KAAC,IAAI,IAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,YAAG,MAAM,GAAQ,GAC7C,EACN,KAAC,GAAG,IAAC,QAAQ,EAAE,CAAC,YACd,KAAC,YAAY,IACX,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,GACpB,GACE,IACF,CACP,CAAC;AACJ,CAAC"}
|