@dirgha/code 1.16.1 → 1.17.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/dist/cli/config.d.ts +3 -3
- package/dist/cli/config.js +34 -14
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/interactive.js +129 -116
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +8 -0
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/cost.d.ts +6 -0
- package/dist/cli/slash/cost.js +12 -0
- package/dist/cli/slash/cost.js.map +1 -0
- package/dist/cli/slash/export.d.ts +2 -0
- package/dist/cli/slash/export.js +151 -0
- package/dist/cli/slash/export.js.map +1 -0
- package/dist/cli/slash/fs.d.ts +2 -0
- package/dist/cli/slash/fs.js +145 -0
- package/dist/cli/slash/fs.js.map +1 -0
- package/dist/cli/slash/index.d.ts +29 -25
- package/dist/cli/slash/index.js +32 -24
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/mcp.d.ts +2 -0
- package/dist/cli/slash/mcp.js +93 -0
- package/dist/cli/slash/mcp.js.map +1 -0
- package/dist/cli/slash/models.d.ts +1 -1
- package/dist/cli/slash/models.js +21 -20
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash.d.ts +5 -5
- package/dist/cli/slash.js +53 -22
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/models.js +6 -2
- package/dist/cli/subcommands/models.js.map +1 -1
- package/dist/cli/update-check.d.ts +1 -0
- package/dist/cli/update-check.js +77 -0
- package/dist/cli/update-check.js.map +1 -0
- package/dist/context/default-soul.md +1 -1
- package/dist/context/ledger.d.ts +12 -2
- package/dist/context/ledger.js +92 -32
- package/dist/context/ledger.js.map +1 -1
- package/dist/context/memory.d.ts +7 -2
- package/dist/context/memory.js +71 -50
- package/dist/context/memory.js.map +1 -1
- package/dist/context/primer.d.ts +4 -2
- package/dist/context/primer.js +18 -10
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +8 -7
- package/dist/context/session.js +40 -23
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.d.ts +4 -4
- package/dist/daemon/server.js +66 -36
- package/dist/daemon/server.js.map +1 -1
- package/dist/fleet/templates.d.ts +18 -0
- package/dist/fleet/templates.js +103 -0
- package/dist/fleet/templates.js.map +1 -0
- package/dist/intelligence/prices.js +819 -193
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/intelligence/smart-router.d.ts +3 -1
- package/dist/intelligence/smart-router.js +34 -12
- package/dist/intelligence/smart-router.js.map +1 -1
- package/dist/kernel/agent-loop.d.ts +11 -0
- package/dist/kernel/agent-loop.js +40 -2
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/types.d.ts +28 -27
- package/dist/lsp/client.d.ts +76 -0
- package/dist/lsp/client.js +332 -0
- package/dist/lsp/client.js.map +1 -0
- package/dist/lsp/detector.d.ts +13 -0
- package/dist/lsp/detector.js +152 -0
- package/dist/lsp/detector.js.map +1 -0
- package/dist/lsp/index.d.ts +25 -0
- package/dist/lsp/index.js +127 -0
- package/dist/lsp/index.js.map +1 -0
- package/dist/providers/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +70 -31
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/family-fallback.d.ts +12 -0
- package/dist/providers/family-fallback.js +73 -0
- package/dist/providers/family-fallback.js.map +1 -0
- package/dist/providers/health.d.ts +13 -0
- package/dist/providers/health.js +71 -0
- package/dist/providers/health.js.map +1 -0
- package/dist/providers/index.d.ts +15 -12
- package/dist/providers/index.js +63 -40
- package/dist/providers/index.js.map +1 -1
- package/dist/subagents/delegator.d.ts +2 -2
- package/dist/subagents/delegator.js +29 -14
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/subagents/loop-detector.d.ts +30 -0
- package/dist/subagents/loop-detector.js +62 -0
- package/dist/subagents/loop-detector.js.map +1 -0
- package/dist/tools/exec.d.ts +8 -4
- package/dist/tools/exec.js +10 -1
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +1 -1
- package/dist/tools/fs-edit.js +30 -17
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/index.d.ts +26 -18
- package/dist/tools/index.js +31 -18
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp-definition.d.ts +2 -0
- package/dist/tools/lsp-definition.js +48 -0
- package/dist/tools/lsp-definition.js.map +1 -0
- package/dist/tools/lsp-hover.d.ts +2 -0
- package/dist/tools/lsp-hover.js +68 -0
- package/dist/tools/lsp-hover.js.map +1 -0
- package/dist/tools/lsp-references.d.ts +2 -0
- package/dist/tools/lsp-references.js +48 -0
- package/dist/tools/lsp-references.js.map +1 -0
- package/dist/tools/lsp-symbols.d.ts +2 -0
- package/dist/tools/lsp-symbols.js +62 -0
- package/dist/tools/lsp-symbols.js.map +1 -0
- package/dist/tools/registry.d.ts +3 -2
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -1
- package/dist/tools/shell.js +55 -36
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.d.ts +2 -0
- package/dist/tui/ink/App.js +28 -8
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +5 -2
- package/dist/tui/ink/components/StatusBar.js +48 -27
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.d.ts +5 -0
- package/dist/tui/ink/components/ToolBox.js +45 -4
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.d.ts +1 -0
- package/dist/tui/ink/components/ToolGroup.js +20 -2
- package/dist/tui/ink/components/ToolGroup.js.map +1 -1
- package/dist/tui/ink/components/vim-bindings.d.ts +1 -1
- package/dist/tui/ink/components/vim-bindings.js +107 -40
- package/dist/tui/ink/components/vim-bindings.js.map +1 -1
- package/dist/tui/ink/index.d.ts +19 -18
- package/dist/tui/ink/index.js +26 -19
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +1 -0
- package/dist/tui/ink/use-event-projection.js +25 -1
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,10 +6,21 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
6
6
|
* Right cluster: model label + cumulative tokens + cost.
|
|
7
7
|
* When busy, a subtle spinner frame appears on the right.
|
|
8
8
|
*/
|
|
9
|
-
import * as React from
|
|
10
|
-
import { Box, Text, useStdout } from
|
|
11
|
-
import { useTheme } from
|
|
12
|
-
const SPINNER_FRAMES = [
|
|
9
|
+
import * as React from "react";
|
|
10
|
+
import { Box, Text, useStdout } from "ink";
|
|
11
|
+
import { useTheme } from "../theme-context.js";
|
|
12
|
+
const SPINNER_FRAMES = [
|
|
13
|
+
"⠋",
|
|
14
|
+
"⠙",
|
|
15
|
+
"⠹",
|
|
16
|
+
"⠸",
|
|
17
|
+
"⠼",
|
|
18
|
+
"⠴",
|
|
19
|
+
"⠦",
|
|
20
|
+
"⠧",
|
|
21
|
+
"⠇",
|
|
22
|
+
"⠏",
|
|
23
|
+
];
|
|
13
24
|
function formatTokens(n) {
|
|
14
25
|
if (n < 1000)
|
|
15
26
|
return String(n);
|
|
@@ -18,24 +29,29 @@ function formatTokens(n) {
|
|
|
18
29
|
return `${(n / 1_000_000).toFixed(2)}M`;
|
|
19
30
|
}
|
|
20
31
|
function cwdLabel(cwd) {
|
|
21
|
-
const parts = cwd.split(
|
|
22
|
-
return parts[parts.length - 1] ??
|
|
32
|
+
const parts = cwd.split("/").filter(Boolean);
|
|
33
|
+
return parts[parts.length - 1] ?? "~";
|
|
23
34
|
}
|
|
24
35
|
// Drop the provider prefix from a model id so the footer reads short
|
|
25
36
|
// and human. e.g. `moonshotai/kimi-k2-instruct` → `kimi-k2-instruct`,
|
|
26
37
|
// `accounts/fireworks/models/deepseek-v3` → `deepseek-v3`.
|
|
27
38
|
function shortModel(model) {
|
|
28
|
-
const slash = model.lastIndexOf(
|
|
39
|
+
const slash = model.lastIndexOf("/");
|
|
29
40
|
return slash === -1 ? model : model.slice(slash + 1);
|
|
30
41
|
}
|
|
31
42
|
function modeStyle(mode) {
|
|
32
43
|
switch (mode) {
|
|
33
|
-
case
|
|
34
|
-
|
|
35
|
-
case
|
|
36
|
-
|
|
37
|
-
case
|
|
38
|
-
|
|
44
|
+
case "yolo":
|
|
45
|
+
return { label: "YOLO", symbol: "⏵⏵" };
|
|
46
|
+
case "plan":
|
|
47
|
+
return { label: "PLAN", symbol: "◔" };
|
|
48
|
+
case "verify":
|
|
49
|
+
return { label: "VERIFY", symbol: "✓" };
|
|
50
|
+
case "ask":
|
|
51
|
+
return { label: "ASK", symbol: "?" };
|
|
52
|
+
case "act":
|
|
53
|
+
default:
|
|
54
|
+
return { label: "ACT", symbol: "▸" };
|
|
39
55
|
}
|
|
40
56
|
}
|
|
41
57
|
export function StatusBar(props) {
|
|
@@ -47,12 +63,12 @@ export function StatusBar(props) {
|
|
|
47
63
|
if (!props.busy)
|
|
48
64
|
return;
|
|
49
65
|
const t = setInterval(() => {
|
|
50
|
-
setFrame(f => (f + 1) % SPINNER_FRAMES.length);
|
|
66
|
+
setFrame((f) => (f + 1) % SPINNER_FRAMES.length);
|
|
51
67
|
}, 80);
|
|
52
68
|
return () => clearInterval(t);
|
|
53
69
|
}, [props.busy]);
|
|
54
70
|
const totalTokens = props.inputTokens + props.outputTokens;
|
|
55
|
-
const costLabel = props.costUsd > 0 ? `$${props.costUsd.toFixed(3)}` :
|
|
71
|
+
const costLabel = props.costUsd > 0 ? `$${props.costUsd.toFixed(3)}` : "";
|
|
56
72
|
// Strip provider prefix so the footer reads short and human.
|
|
57
73
|
const modelDisplay = (() => {
|
|
58
74
|
const s = shortModel(props.model);
|
|
@@ -61,7 +77,7 @@ export function StatusBar(props) {
|
|
|
61
77
|
// Context meter: "12k/128k" — only renders when both ends are known.
|
|
62
78
|
const contextMeter = props.contextWindow && props.contextWindow > 0 && totalTokens > 0
|
|
63
79
|
? `${formatTokens(totalTokens)}/${formatTokens(props.contextWindow)}`
|
|
64
|
-
:
|
|
80
|
+
: "";
|
|
65
81
|
// tok/s readout — only meaningful while a turn is streaming AND we
|
|
66
82
|
// have at least one token + non-zero elapsed time. Below 250ms we'd
|
|
67
83
|
// get extreme rates from a single chunk, so suppress until warmed up.
|
|
@@ -69,29 +85,34 @@ export function StatusBar(props) {
|
|
|
69
85
|
const t = props.liveOutputTokens;
|
|
70
86
|
const ms = props.liveDurationMs;
|
|
71
87
|
if (!props.busy)
|
|
72
|
-
return
|
|
73
|
-
if (typeof t !==
|
|
74
|
-
return
|
|
88
|
+
return "";
|
|
89
|
+
if (typeof t !== "number" || typeof ms !== "number")
|
|
90
|
+
return "";
|
|
75
91
|
if (t <= 0 || ms <= 0)
|
|
76
|
-
return
|
|
92
|
+
return "";
|
|
77
93
|
if (ms < 250)
|
|
78
|
-
return
|
|
94
|
+
return ""; // warmup: avoid spurious 1000+ tok/s readings
|
|
79
95
|
const rate = Math.round((t / ms) * 1000);
|
|
80
96
|
return `${rate} tok/s`;
|
|
81
97
|
})();
|
|
82
98
|
// Mode badge: ALWAYS visible so the user knows what posture the
|
|
83
99
|
// agent is in. YOLO surfaces in the palette's error colour as a
|
|
84
100
|
// danger reminder; PLAN/ASK in accent; ACT in muted to stay calm.
|
|
85
|
-
const mode = props.mode ??
|
|
101
|
+
const mode = props.mode ?? "act";
|
|
86
102
|
const ms = modeStyle(mode);
|
|
87
|
-
const modeColour = mode ===
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
103
|
+
const modeColour = mode === "plan"
|
|
104
|
+
? palette.accent
|
|
105
|
+
: mode === "verify"
|
|
106
|
+
? palette.brand
|
|
107
|
+
: mode === "ask"
|
|
108
|
+
? palette.brand
|
|
109
|
+
: mode === "yolo"
|
|
110
|
+
? palette.error
|
|
91
111
|
: palette.textMuted;
|
|
92
112
|
// Slim status bar — only what's load-bearing:
|
|
93
113
|
// left: ⏵⏵ MODE · cwd
|
|
94
114
|
// right: spinner (when busy) · short model · context-meter or cost
|
|
95
|
-
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) })] }), _jsxs(Box, { gap: 1, children: [props.busy && _jsx(Text, { color: palette.brand, children: SPINNER_FRAMES[frame] }),
|
|
115
|
+
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) })] }), _jsxs(Box, { gap: 1, children: [props.busy && (_jsx(Text, { color: palette.brand, children: SPINNER_FRAMES[frame] })), typeof props.turnCount === "number" &&
|
|
116
|
+
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" })), 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 }))] })] }));
|
|
96
117
|
}
|
|
97
118
|
//# sourceMappingURL=StatusBar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":";AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,10 @@
|
|
|
6
6
|
* on completion we show ✓ or ✗ plus the elapsed time and a short
|
|
7
7
|
* output preview. No state is owned here — App is the source of truth
|
|
8
8
|
* so history stays immutable after scroll-off.
|
|
9
|
+
*
|
|
10
|
+
* Diff-aware rendering: when outputKind is "diff" or the output
|
|
11
|
+
* contains unified-diff markers, lines are coloured green (+) /
|
|
12
|
+
* red (-) / cyan (@@) to match monorepo patterns.
|
|
9
13
|
*/
|
|
10
14
|
import * as React from "react";
|
|
11
15
|
export type ToolStatus = "pending" | "running" | "done" | "error";
|
|
@@ -14,6 +18,7 @@ export interface ToolBoxProps {
|
|
|
14
18
|
status: ToolStatus;
|
|
15
19
|
argSummary?: string;
|
|
16
20
|
outputPreview?: string;
|
|
21
|
+
outputKind?: "text" | "diff";
|
|
17
22
|
durationMs?: number;
|
|
18
23
|
startedAt: number;
|
|
19
24
|
}
|
|
@@ -7,6 +7,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
7
7
|
* on completion we show ✓ or ✗ plus the elapsed time and a short
|
|
8
8
|
* output preview. No state is owned here — App is the source of truth
|
|
9
9
|
* so history stays immutable after scroll-off.
|
|
10
|
+
*
|
|
11
|
+
* Diff-aware rendering: when outputKind is "diff" or the output
|
|
12
|
+
* contains unified-diff markers, lines are coloured green (+) /
|
|
13
|
+
* red (-) / cyan (@@) to match monorepo patterns.
|
|
10
14
|
*/
|
|
11
15
|
import * as React from "react";
|
|
12
16
|
import { Box, Text } from "ink";
|
|
@@ -35,6 +39,9 @@ const TOOL_LABEL = {
|
|
|
35
39
|
git: "Git",
|
|
36
40
|
task: "Task",
|
|
37
41
|
};
|
|
42
|
+
const DIFF_ADD_COLOUR = "#50fa7b";
|
|
43
|
+
const DIFF_DEL_COLOUR = "#ff5555";
|
|
44
|
+
const DIFF_HUNK_COLOUR = "#00ffff";
|
|
38
45
|
function prettyName(name) {
|
|
39
46
|
return TOOL_LABEL[name] ?? name.replace(/_/g, " ");
|
|
40
47
|
}
|
|
@@ -46,6 +53,38 @@ function formatElapsed(ms) {
|
|
|
46
53
|
return `${s}s`;
|
|
47
54
|
return `${Math.floor(s / 60)}m ${s % 60}s`;
|
|
48
55
|
}
|
|
56
|
+
function hasDiffMarkers(text) {
|
|
57
|
+
return /^[+-]|^@@\s/m.test(text);
|
|
58
|
+
}
|
|
59
|
+
function isDiffOutput(props) {
|
|
60
|
+
if (props.outputKind === "diff")
|
|
61
|
+
return true;
|
|
62
|
+
if (props.outputPreview && hasDiffMarkers(props.outputPreview))
|
|
63
|
+
return true;
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
function renderDiffLines(text, limit) {
|
|
67
|
+
const lines = text.split("\n").slice(0, limit);
|
|
68
|
+
return lines.map((line, i) => {
|
|
69
|
+
let colour;
|
|
70
|
+
if (line.startsWith("+") && !line.startsWith("+++"))
|
|
71
|
+
colour = DIFF_ADD_COLOUR;
|
|
72
|
+
else if (line.startsWith("-") && !line.startsWith("---"))
|
|
73
|
+
colour = DIFF_DEL_COLOUR;
|
|
74
|
+
else if (/^@@\s/.test(line))
|
|
75
|
+
colour = DIFF_HUNK_COLOUR;
|
|
76
|
+
return (_jsx(Box, { flexDirection: "row", children: _jsx(Text, { color: colour, dimColor: !colour, children: line || " " }) }, i));
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
/** Short single-line preview for collapsed diff output. */
|
|
80
|
+
function diffShortPreview(text, maxLen = 80) {
|
|
81
|
+
const first = text
|
|
82
|
+
.split("\n")
|
|
83
|
+
.find((l) => l.startsWith("+") || l.startsWith("-"));
|
|
84
|
+
if (!first)
|
|
85
|
+
return text.replace(/\s+/g, " ").slice(0, maxLen);
|
|
86
|
+
return first.replace(/\s+/g, " ").slice(0, maxLen) + "\u2026";
|
|
87
|
+
}
|
|
49
88
|
export function ToolBox(props) {
|
|
50
89
|
const palette = useTheme();
|
|
51
90
|
const [frame, setFrame] = React.useState(0);
|
|
@@ -79,11 +118,13 @@ export function ToolBox(props) {
|
|
|
79
118
|
: props.durationMs !== undefined
|
|
80
119
|
? formatElapsed(props.durationMs)
|
|
81
120
|
: "";
|
|
82
|
-
// tick is read so React treats it as a live dep; silences unused var lints.
|
|
83
121
|
void tick;
|
|
84
|
-
const
|
|
122
|
+
const diffMode = isDiffOutput(props);
|
|
123
|
+
const preview = !diffMode && props.outputPreview
|
|
85
124
|
? props.outputPreview.replace(/\s+/g, " ").slice(0, 80)
|
|
86
|
-
:
|
|
87
|
-
|
|
125
|
+
: diffMode && props.outputPreview
|
|
126
|
+
? diffShortPreview(props.outputPreview, 80)
|
|
127
|
+
: "";
|
|
128
|
+
return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColour, paddingX: 1, marginBottom: 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: iconColour, children: icon }), _jsx(Text, { color: palette.accent, bold: true, children: iconFor(props.name) }), _jsx(Text, { color: props.status === "done" ? palette.textMuted : palette.textPrimary, bold: true, children: prettyName(props.name) }), props.argSummary !== undefined && props.argSummary.length > 0 && (_jsxs(Text, { color: palette.textMuted, dimColor: true, children: ["(", props.argSummary, ")"] })), elapsedLabel !== "" && (_jsx(Text, { color: palette.textMuted, dimColor: true, children: elapsedLabel }))] }), preview !== "" && !diffMode && (_jsx(Box, { children: _jsx(Text, { color: palette.textMuted, dimColor: true, children: preview }) })), diffMode && props.outputPreview && (_jsx(Box, { flexDirection: "column", children: renderDiffLines(props.outputPreview, 30) }))] }));
|
|
88
129
|
}
|
|
89
130
|
//# sourceMappingURL=ToolBox.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolBox.tsx"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"ToolBox.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolBox.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,9 @@ const TOOL_LABEL = {
|
|
|
30
30
|
git: "Git",
|
|
31
31
|
task: "Task",
|
|
32
32
|
};
|
|
33
|
+
const DIFF_ADD_COLOUR = "#50fa7b";
|
|
34
|
+
const DIFF_DEL_COLOUR = "#ff5555";
|
|
35
|
+
const DIFF_HUNK_COLOUR = "#00ffff";
|
|
33
36
|
export function ToolGroup(props) {
|
|
34
37
|
const palette = useTheme();
|
|
35
38
|
if (props.tools.length === 0)
|
|
@@ -74,10 +77,25 @@ function FullToolRow({ tool, divider, palette, }) {
|
|
|
74
77
|
? formatElapsed(Date.now() - tool.startedAt)
|
|
75
78
|
: "";
|
|
76
79
|
const label = TOOL_LABEL[tool.name] ?? tool.name.replace(/_/g, " ");
|
|
77
|
-
const
|
|
80
|
+
const diffMode = tool.outputKind === "diff" ||
|
|
81
|
+
(tool.outputPreview !== undefined &&
|
|
82
|
+
/^[+-]|^@@\s/m.test(tool.outputPreview));
|
|
83
|
+
const preview = !diffMode && tool.outputPreview
|
|
78
84
|
? tool.outputPreview.replace(/\s+/g, " ").slice(0, 200)
|
|
79
85
|
: "";
|
|
80
|
-
|
|
86
|
+
const diffLines = diffMode && tool.outputPreview
|
|
87
|
+
? tool.outputPreview.split("\n").slice(0, 30)
|
|
88
|
+
: [];
|
|
89
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: glyphColour, bold: tool.status !== "running", children: glyph }) }), _jsx(Text, { color: palette.text.accent, children: iconFor(tool.name) }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, color: nameColour, children: label }), tool.argSummary && tool.argSummary.length > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: palette.text.secondary, children: tool.argSummary })] })), elapsed && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: palette.text.secondary, dimColor: true, children: elapsed })] }))] }), preview && (_jsx(Box, { paddingLeft: 4, children: _jsxs(Text, { color: palette.text.secondary, dimColor: true, children: ["\u23BF ", preview] }) })), diffLines.length > 0 && (_jsx(Box, { paddingLeft: 4, flexDirection: "column", children: diffLines.map((line, i) => {
|
|
90
|
+
let colour;
|
|
91
|
+
if (line.startsWith("+") && !line.startsWith("+++"))
|
|
92
|
+
colour = DIFF_ADD_COLOUR;
|
|
93
|
+
else if (line.startsWith("-") && !line.startsWith("---"))
|
|
94
|
+
colour = DIFF_DEL_COLOUR;
|
|
95
|
+
else if (/^@@\s/.test(line))
|
|
96
|
+
colour = DIFF_HUNK_COLOUR;
|
|
97
|
+
return (_jsx(Box, { flexDirection: "row", children: _jsx(Text, { color: colour, dimColor: !colour, children: line || " " }) }, i));
|
|
98
|
+
}) })), divider && (_jsx(Box, { children: _jsx(Text, { color: palette.border.default, dimColor: true, children: " " }) }))] }));
|
|
81
99
|
}
|
|
82
100
|
function pickGroupColour(tools, palette) {
|
|
83
101
|
if (tools.some((t) => t.status === "error"))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolGroup.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ToolGroup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
* The reducer keeps a pending prefix so multi-key motions like `dd`,
|
|
22
22
|
* `dw`, and `yy` work across two keystrokes.
|
|
23
23
|
*/
|
|
24
|
-
export type VimMode =
|
|
24
|
+
export type VimMode = "INSERT" | "NORMAL";
|
|
25
25
|
export interface VimState {
|
|
26
26
|
mode: VimMode;
|
|
27
27
|
cursor: number;
|
|
@@ -21,24 +21,58 @@
|
|
|
21
21
|
* The reducer keeps a pending prefix so multi-key motions like `dd`,
|
|
22
22
|
* `dw`, and `yy` work across two keystrokes.
|
|
23
23
|
*/
|
|
24
|
+
const graphemeSeg = new Intl.Segmenter("en", { granularity: "grapheme" });
|
|
25
|
+
function graphemePrev(value, cursor) {
|
|
26
|
+
if (cursor <= 0)
|
|
27
|
+
return 0;
|
|
28
|
+
let prev = 0;
|
|
29
|
+
for (const s of graphemeSeg.segment(value)) {
|
|
30
|
+
if (s.index >= cursor)
|
|
31
|
+
break;
|
|
32
|
+
prev = s.index;
|
|
33
|
+
}
|
|
34
|
+
return prev;
|
|
35
|
+
}
|
|
36
|
+
function graphemeNext(value, cursor) {
|
|
37
|
+
if (cursor >= value.length)
|
|
38
|
+
return value.length;
|
|
39
|
+
for (const s of graphemeSeg.segment(value)) {
|
|
40
|
+
if (s.index > cursor)
|
|
41
|
+
return s.index;
|
|
42
|
+
}
|
|
43
|
+
return value.length;
|
|
44
|
+
}
|
|
45
|
+
function deleteGraphemeAt(value, cursor) {
|
|
46
|
+
if (cursor >= value.length)
|
|
47
|
+
return value;
|
|
48
|
+
for (const s of graphemeSeg.segment(value)) {
|
|
49
|
+
if (s.index === cursor) {
|
|
50
|
+
return value.slice(0, cursor) + value.slice(cursor + s.segment.length);
|
|
51
|
+
}
|
|
52
|
+
if (s.index > cursor) {
|
|
53
|
+
return value.slice(0, s.index) + value.slice(s.index + s.segment.length);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return value;
|
|
57
|
+
}
|
|
24
58
|
export function createVimState() {
|
|
25
|
-
return { mode:
|
|
59
|
+
return { mode: "INSERT", cursor: 0, pending: "", register: "" };
|
|
26
60
|
}
|
|
27
61
|
function nextWord(value, from) {
|
|
28
62
|
let i = from;
|
|
29
63
|
// Skip the current word.
|
|
30
|
-
while (i < value.length && /\S/.test(value[i] ??
|
|
64
|
+
while (i < value.length && /\S/.test(value[i] ?? ""))
|
|
31
65
|
i += 1;
|
|
32
66
|
// Skip whitespace to the next word.
|
|
33
|
-
while (i < value.length && /\s/.test(value[i] ??
|
|
67
|
+
while (i < value.length && /\s/.test(value[i] ?? ""))
|
|
34
68
|
i += 1;
|
|
35
69
|
return i;
|
|
36
70
|
}
|
|
37
71
|
function prevWord(value, from) {
|
|
38
72
|
let i = Math.max(0, from - 1);
|
|
39
|
-
while (i > 0 && /\s/.test(value[i] ??
|
|
73
|
+
while (i > 0 && /\s/.test(value[i] ?? ""))
|
|
40
74
|
i -= 1;
|
|
41
|
-
while (i > 0 && /\S/.test(value[i - 1] ??
|
|
75
|
+
while (i > 0 && /\S/.test(value[i - 1] ?? ""))
|
|
42
76
|
i -= 1;
|
|
43
77
|
return i;
|
|
44
78
|
}
|
|
@@ -49,17 +83,17 @@ function prevWord(value, from) {
|
|
|
49
83
|
*/
|
|
50
84
|
export function applyVimKey(value, state, ch) {
|
|
51
85
|
const pending = state.pending;
|
|
52
|
-
const clearPending = { ...state, pending:
|
|
86
|
+
const clearPending = { ...state, pending: "" };
|
|
53
87
|
// Multi-key prefixes resolve first.
|
|
54
|
-
if (pending ===
|
|
55
|
-
if (ch ===
|
|
88
|
+
if (pending === "d") {
|
|
89
|
+
if (ch === "d") {
|
|
56
90
|
return {
|
|
57
|
-
value:
|
|
91
|
+
value: "",
|
|
58
92
|
state: { ...clearPending, cursor: 0, register: value },
|
|
59
93
|
handled: true,
|
|
60
94
|
};
|
|
61
95
|
}
|
|
62
|
-
if (ch ===
|
|
96
|
+
if (ch === "w") {
|
|
63
97
|
const to = nextWord(value, state.cursor);
|
|
64
98
|
return {
|
|
65
99
|
value: value.slice(0, state.cursor) + value.slice(to),
|
|
@@ -70,62 +104,95 @@ export function applyVimKey(value, state, ch) {
|
|
|
70
104
|
// Unknown d-prefix → abort.
|
|
71
105
|
return { value, state: clearPending, handled: true };
|
|
72
106
|
}
|
|
73
|
-
if (pending ===
|
|
74
|
-
if (ch ===
|
|
75
|
-
return {
|
|
107
|
+
if (pending === "y") {
|
|
108
|
+
if (ch === "y") {
|
|
109
|
+
return {
|
|
110
|
+
value,
|
|
111
|
+
state: { ...clearPending, register: value },
|
|
112
|
+
handled: true,
|
|
113
|
+
};
|
|
76
114
|
}
|
|
77
115
|
return { value, state: clearPending, handled: true };
|
|
78
116
|
}
|
|
79
|
-
if (pending ===
|
|
80
|
-
if (ch ===
|
|
117
|
+
if (pending === ":") {
|
|
118
|
+
if (ch === "q") {
|
|
81
119
|
return { value, state: clearPending, handled: true, exitRequested: true };
|
|
82
120
|
}
|
|
83
121
|
return { value, state: clearPending, handled: true };
|
|
84
122
|
}
|
|
85
123
|
switch (ch) {
|
|
86
|
-
case
|
|
87
|
-
return {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
124
|
+
case "h":
|
|
125
|
+
return {
|
|
126
|
+
value,
|
|
127
|
+
state: { ...clearPending, cursor: graphemePrev(value, state.cursor) },
|
|
128
|
+
handled: true,
|
|
129
|
+
};
|
|
130
|
+
case "l":
|
|
131
|
+
return {
|
|
132
|
+
value,
|
|
133
|
+
state: { ...clearPending, cursor: graphemeNext(value, state.cursor) },
|
|
134
|
+
handled: true,
|
|
135
|
+
};
|
|
136
|
+
case "j":
|
|
137
|
+
case "k":
|
|
92
138
|
// Single-line buffer: treat as no-op but still consume.
|
|
93
139
|
return { value, state: clearPending, handled: true };
|
|
94
|
-
case
|
|
140
|
+
case "0":
|
|
95
141
|
return { value, state: { ...clearPending, cursor: 0 }, handled: true };
|
|
96
|
-
case
|
|
97
|
-
return {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
case
|
|
142
|
+
case "$":
|
|
143
|
+
return {
|
|
144
|
+
value,
|
|
145
|
+
state: { ...clearPending, cursor: value.length },
|
|
146
|
+
handled: true,
|
|
147
|
+
};
|
|
148
|
+
case "w":
|
|
149
|
+
return {
|
|
150
|
+
value,
|
|
151
|
+
state: { ...clearPending, cursor: nextWord(value, state.cursor) },
|
|
152
|
+
handled: true,
|
|
153
|
+
};
|
|
154
|
+
case "b":
|
|
155
|
+
return {
|
|
156
|
+
value,
|
|
157
|
+
state: { ...clearPending, cursor: prevWord(value, state.cursor) },
|
|
158
|
+
handled: true,
|
|
159
|
+
};
|
|
160
|
+
case "x": {
|
|
103
161
|
if (state.cursor >= value.length)
|
|
104
162
|
return { value, state: clearPending, handled: true };
|
|
105
|
-
const nv = value
|
|
163
|
+
const nv = deleteGraphemeAt(value, state.cursor);
|
|
106
164
|
return {
|
|
107
165
|
value: nv,
|
|
108
166
|
state: { ...clearPending, cursor: Math.min(state.cursor, nv.length) },
|
|
109
167
|
handled: true,
|
|
110
168
|
};
|
|
111
169
|
}
|
|
112
|
-
case
|
|
113
|
-
if (state.register ===
|
|
170
|
+
case "p": {
|
|
171
|
+
if (state.register === "")
|
|
114
172
|
return { value, state: clearPending, handled: true };
|
|
115
|
-
const nv = value.slice(0, state.cursor) +
|
|
173
|
+
const nv = value.slice(0, state.cursor) +
|
|
174
|
+
state.register +
|
|
175
|
+
value.slice(state.cursor);
|
|
116
176
|
return {
|
|
117
177
|
value: nv,
|
|
118
|
-
state: {
|
|
178
|
+
state: {
|
|
179
|
+
...clearPending,
|
|
180
|
+
cursor: state.cursor + state.register.length,
|
|
181
|
+
},
|
|
119
182
|
handled: true,
|
|
120
183
|
};
|
|
121
184
|
}
|
|
122
|
-
case
|
|
123
|
-
case
|
|
124
|
-
case
|
|
185
|
+
case "d":
|
|
186
|
+
case "y":
|
|
187
|
+
case ":":
|
|
125
188
|
return { value, state: { ...state, pending: ch }, handled: true };
|
|
126
|
-
case
|
|
127
|
-
return {
|
|
128
|
-
|
|
189
|
+
case "i":
|
|
190
|
+
return {
|
|
191
|
+
value,
|
|
192
|
+
state: { ...clearPending, mode: "INSERT" },
|
|
193
|
+
handled: true,
|
|
194
|
+
};
|
|
195
|
+
case "/":
|
|
129
196
|
// Search stub — consume so it doesn't fall through to text input.
|
|
130
197
|
return { value, state: clearPending, handled: true };
|
|
131
198
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vim-bindings.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/vim-bindings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;
|
|
1
|
+
{"version":3,"file":"vim-bindings.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/vim-bindings.ts"],"names":[],"mappings":"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"}
|