@dirgha/code 1.20.38 → 1.21.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 +0 -50
- package/README.md +4 -8
- package/dist/auth/keypool.js +26 -40
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +11 -16
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.js +2 -23
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +24 -40
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +18 -12
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +0 -4
- package/dist/cli/interactive.js +1 -29
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +18 -69
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/fleet.js +1 -19
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +2 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +7 -4
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash.js +10 -26
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +8 -28
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +0 -4
- package/dist/cli/subcommands/doctor.js +21 -82
- 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 +0 -23
- package/dist/cli/subcommands/memory.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +1 -2
- package/dist/cli/subcommands/telemetry.js +34 -47
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +23 -40
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +22 -45
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +18 -31
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +20 -31
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +1 -8
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +1 -11
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +30 -67
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +3 -15
- package/dist/context/primer.js.map +1 -1
- package/dist/fleet/apply-back.js +1 -5
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +0 -2
- package/dist/fleet/cli-command.js +1 -15
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +2 -35
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +2 -1
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +0 -4
- package/dist/fleet/state.js +2 -11
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +0 -4
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +0 -4
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/failover-chain.js +1 -10
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/health-monitor.d.ts +8 -8
- package/dist/intelligence/health-monitor.js +74 -105
- package/dist/intelligence/health-monitor.js.map +1 -1
- package/dist/intelligence/prices.d.ts +4 -6
- package/dist/intelligence/prices.js +10 -36
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +17 -60
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +16 -29
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +6 -7
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +16 -19
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +38 -46
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.js +1 -15
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/index.d.ts +0 -11
- package/dist/providers/index.js +2 -29
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.js +2 -4
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +1 -1
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/audit-log.d.ts +0 -15
- package/dist/safety/audit-log.js +0 -21
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db.js +5 -60
- package/dist/state/db.js.map +1 -1
- package/dist/tools/browser.js +16 -24
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +1 -6
- package/dist/tools/checkpoint.js +62 -79
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +3 -1
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +21 -25
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +0 -2
- package/dist/tools/exec.js +0 -13
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +5 -3
- package/dist/tools/fs-edit.js +23 -8
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +8 -6
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +28 -37
- 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 +6 -12
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +2 -5
- package/dist/tools/index.js +4 -7
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +12 -11
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +9 -22
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +24 -42
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +32 -56
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -7
- package/dist/tools/shell.js +61 -114
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.d.ts +1 -2
- package/dist/tui/ink/App.js +82 -194
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +8 -23
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +25 -16
- 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 +16 -18
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +0 -20
- package/dist/tui/ink/components/Logo.js +1 -67
- 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 +26 -34
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +1 -3
- package/dist/tui/ink/components/PasteCollapse.js +9 -11
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +14 -34
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +0 -7
- package/dist/tui/ink/components/StatusBar.js +5 -11
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +4 -15
- package/dist/tui/ink/components/ThinkingBlock.js +17 -34
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +13 -23
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/index.js +1 -14
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/theme-context.js +3 -6
- package/dist/tui/ink/theme-context.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +2 -6
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +0 -2
- package/dist/tui/ink/use-event-projection.js +2 -21
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-overlays.js +17 -16
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/package.json +6 -5
- package/dist/state/db-telemetry.d.ts +0 -21
- package/dist/state/db-telemetry.js +0 -116
- package/dist/state/db-telemetry.js.map +0 -1
- package/dist/telemetry/gateway-push.d.ts +0 -17
- package/dist/telemetry/gateway-push.js +0 -48
- package/dist/telemetry/gateway-push.js.map +0 -1
- package/dist/telemetry/index.d.ts +0 -9
- package/dist/telemetry/index.js +0 -9
- package/dist/telemetry/index.js.map +0 -1
- package/dist/tools/github.d.ts +0 -13
- package/dist/tools/github.js +0 -257
- package/dist/tools/github.js.map +0 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +0 -19
- package/dist/tui/ink/components/VirtualTranscript.js +0 -31
- package/dist/tui/ink/components/VirtualTranscript.js.map +0 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +0 -13
- package/dist/tui/ink/markdown/syntax-highlight.js +0 -91
- package/dist/tui/ink/markdown/syntax-highlight.js.map +0 -1
- package/dist/tui/ink/use-elapsed.d.ts +0 -14
- package/dist/tui/ink/use-elapsed.js +0 -61
- package/dist/tui/ink/use-elapsed.js.map +0 -1
- package/dist/tui/ink/use-flicker-detector.d.ts +0 -12
- package/dist/tui/ink/use-flicker-detector.js +0 -37
- package/dist/tui/ink/use-flicker-detector.js.map +0 -1
- package/dist/tui/ink/use-render-metrics.d.ts +0 -14
- package/dist/tui/ink/use-render-metrics.js +0 -106
- package/dist/tui/ink/use-render-metrics.js.map +0 -1
- package/dist/tui/ink/use-transcript-scroll.d.ts +0 -19
- package/dist/tui/ink/use-transcript-scroll.js +0 -83
- package/dist/tui/ink/use-transcript-scroll.js.map +0 -1
- package/dist/utils/env.d.ts +0 -1
- package/dist/utils/env.js +0 -60
- package/dist/utils/env.js.map +0 -1
- package/dist/utils/fs.d.ts +0 -10
- package/dist/utils/fs.js +0 -37
- package/dist/utils/fs.js.map +0 -1
|
@@ -1,29 +1,4 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
/**
|
|
3
|
-
* Logo: single-item banner shown once at startup.
|
|
4
|
-
*
|
|
5
|
-
* Width-adaptive: wide ASCII block on terminals >= 60 cols, compact
|
|
6
|
-
* one-liner otherwise. Default colour scheme is the violet-storm
|
|
7
|
-
* gradient from the v2 origin commit (28f2bc3) — kept fixed across
|
|
8
|
-
* themes because the brand wordmark should read the same regardless
|
|
9
|
-
* of which palette the user prefers for chrome. Themes that ship
|
|
10
|
-
* their own logo gradient (cosmic, ember, sakura, …) override below.
|
|
11
|
-
*
|
|
12
|
-
* Two render paths:
|
|
13
|
-
* - `Logo` React component — kept for tests / non-Ink callers that
|
|
14
|
-
* still mount the component directly.
|
|
15
|
-
* - `renderLogoString(themeName, version, cols)` — emits the same
|
|
16
|
-
* content as a plain ANSI-coloured string. The Ink entry point
|
|
17
|
-
* uses this to print the banner BEFORE Ink mounts, so the logo
|
|
18
|
-
* lives in terminal scrollback and Ink never re-emits it on
|
|
19
|
-
* viewport overflow. (`use-flicker-detector.ts` already warns
|
|
20
|
-
* when content height > terminal rows, which is exactly the
|
|
21
|
-
* condition that triggers Ink's `clearTerminal + fullStaticOutput
|
|
22
|
-
* + output` path at node_modules/ink/build/ink.js:121 — repaints
|
|
23
|
-
* the whole `<Static>` history every overflow frame and shows up
|
|
24
|
-
* as rapid logo flicker on small terminals.)
|
|
25
|
-
*/
|
|
26
|
-
import * as React from 'react';
|
|
27
2
|
import { Box, Text, useStdout } from 'ink';
|
|
28
3
|
import { useTheme } from '../theme-context.js';
|
|
29
4
|
const WIDE_ROWS = [
|
|
@@ -59,51 +34,10 @@ function skinFor(themeName) {
|
|
|
59
34
|
return SKINS[themeName];
|
|
60
35
|
return VIOLET_STORM;
|
|
61
36
|
}
|
|
62
|
-
function hexToAnsiFg(hex) {
|
|
63
|
-
const m = /^#?([0-9a-f]{6})$/i.exec(hex);
|
|
64
|
-
if (!m)
|
|
65
|
-
return "";
|
|
66
|
-
const v = parseInt(m[1], 16);
|
|
67
|
-
const r = (v >> 16) & 0xff;
|
|
68
|
-
const g = (v >> 8) & 0xff;
|
|
69
|
-
const b = v & 0xff;
|
|
70
|
-
return `\x1b[38;2;${r};${g};${b}m`;
|
|
71
|
-
}
|
|
72
|
-
const ANSI_RESET = "\x1b[0m";
|
|
73
|
-
const ANSI_BOLD = "\x1b[1m";
|
|
74
|
-
const TEXT_MUTED_HEX = "#7C7C7C";
|
|
75
|
-
/**
|
|
76
|
-
* Pure string version of the logo, mirroring the React layout one-for-one.
|
|
77
|
-
* Use this when you want to emit the banner via process.stdout.write()
|
|
78
|
-
* outside Ink's render tree.
|
|
79
|
-
*/
|
|
80
|
-
export function renderLogoString(themeName, version, cols) {
|
|
81
|
-
const skin = skinFor(themeName);
|
|
82
|
-
const border = hexToAnsiFg(skin.border);
|
|
83
|
-
const tag = hexToAnsiFg(skin.tag);
|
|
84
|
-
const muted = hexToAnsiFg(TEXT_MUTED_HEX);
|
|
85
|
-
if (cols < 60) {
|
|
86
|
-
const accent = hexToAnsiFg(skin.rows[2] ?? skin.tag);
|
|
87
|
-
return (` ${accent}${ANSI_BOLD}◆ DIRGHA CODE${ANSI_RESET}` +
|
|
88
|
-
`${muted} v${version}${ANSI_RESET}\n\n`);
|
|
89
|
-
}
|
|
90
|
-
const top = `${border} ╭${"─".repeat(58)}╮${ANSI_RESET}`;
|
|
91
|
-
const bottom = `${border} ╰${"─".repeat(58)}╯${ANSI_RESET}`;
|
|
92
|
-
const middle = WIDE_ROWS.map((row, i) => {
|
|
93
|
-
const colour = hexToAnsiFg(skin.rows[i] ?? skin.rows[0] ?? skin.tag);
|
|
94
|
-
return `${border} │${colour}${row}${border}│${ANSI_RESET}`;
|
|
95
|
-
}).join("\n");
|
|
96
|
-
const tagLine = ` ${tag}${ANSI_BOLD}Dirgha Code${ANSI_RESET}` +
|
|
97
|
-
`${muted} v${version}${ANSI_RESET}`;
|
|
98
|
-
return `${top}\n${middle}\n${bottom}\n${tagLine}\n\n`;
|
|
99
|
-
}
|
|
100
37
|
export function Logo({ version }) {
|
|
101
38
|
const { stdout } = useStdout();
|
|
102
39
|
const palette = useTheme();
|
|
103
|
-
|
|
104
|
-
// must not re-render. A ref avoids creating a reactive resize subscription.
|
|
105
|
-
const colsRef = React.useRef(stdout?.columns ?? 80);
|
|
106
|
-
const cols = colsRef.current;
|
|
40
|
+
const cols = stdout?.columns ?? 80;
|
|
107
41
|
// The palette doesn't carry its own name, so we infer the skin from
|
|
108
42
|
// a stable fingerprint: themes with a unique brand colour map to
|
|
109
43
|
// their named skin. Anything we don't recognise gets violet-storm.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logo.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/Logo.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"Logo.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/Logo.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
* Shape stays small (≤220 LOC); the catalogue itself is owned
|
|
17
17
|
* upstream so this file is purely presentational.
|
|
18
18
|
*/
|
|
19
|
-
import * as React from
|
|
19
|
+
import * as React from 'react';
|
|
20
20
|
export interface ModelEntry {
|
|
21
21
|
id: string;
|
|
22
22
|
provider: string;
|
|
23
|
-
tier?:
|
|
23
|
+
tier?: 'free' | 'basic' | 'pro' | 'premium';
|
|
24
24
|
label?: string;
|
|
25
25
|
}
|
|
26
26
|
export interface ModelPickerProps {
|
|
@@ -17,9 +17,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
17
17
|
* Shape stays small (≤220 LOC); the catalogue itself is owned
|
|
18
18
|
* upstream so this file is purely presentational.
|
|
19
19
|
*/
|
|
20
|
-
import * as React from
|
|
21
|
-
import { Box, Text, useInput, useStdout } from
|
|
22
|
-
import { useTheme } from
|
|
20
|
+
import * as React from 'react';
|
|
21
|
+
import { Box, Text, useInput, useStdout } from 'ink';
|
|
22
|
+
import { useTheme } from '../theme-context.js';
|
|
23
|
+
const TIER_COLOR = {
|
|
24
|
+
free: 'greenBright',
|
|
25
|
+
basic: 'cyan',
|
|
26
|
+
pro: 'magenta',
|
|
27
|
+
premium: 'yellow',
|
|
28
|
+
};
|
|
23
29
|
function groupByProvider(models) {
|
|
24
30
|
const map = new Map();
|
|
25
31
|
for (const m of models) {
|
|
@@ -34,44 +40,36 @@ export function ModelPicker(props) {
|
|
|
34
40
|
const palette = useTheme();
|
|
35
41
|
const cols = stdout?.columns ?? 80;
|
|
36
42
|
const width = Math.min(cols - 4, 80);
|
|
37
|
-
|
|
38
|
-
// hardcoded Ink color names so they respect the user's theme choice.
|
|
39
|
-
const tierColor = {
|
|
40
|
-
free: palette.status.success,
|
|
41
|
-
basic: palette.brand,
|
|
42
|
-
pro: palette.accent,
|
|
43
|
-
premium: palette.status.warning,
|
|
44
|
-
};
|
|
45
|
-
const [filter, setFilter] = React.useState("");
|
|
43
|
+
const [filter, setFilter] = React.useState('');
|
|
46
44
|
const filtered = React.useMemo(() => {
|
|
47
45
|
if (filter.length === 0)
|
|
48
46
|
return props.models;
|
|
49
47
|
const needle = filter.toLowerCase();
|
|
50
|
-
return props.models.filter(
|
|
48
|
+
return props.models.filter(m => m.id.toLowerCase().includes(needle) ||
|
|
51
49
|
m.provider.toLowerCase().includes(needle) ||
|
|
52
50
|
(m.label?.toLowerCase().includes(needle) ?? false));
|
|
53
51
|
}, [props.models, filter]);
|
|
54
|
-
const initial = Math.max(0, filtered.findIndex(
|
|
52
|
+
const initial = Math.max(0, filtered.findIndex(m => m.id === props.current));
|
|
55
53
|
const [cursor, setCursor] = React.useState(initial);
|
|
56
54
|
// Reset cursor when filter changes so it lands on the first match.
|
|
57
55
|
React.useEffect(() => {
|
|
58
|
-
setCursor(
|
|
56
|
+
setCursor(prev => Math.min(prev, Math.max(0, filtered.length - 1)));
|
|
59
57
|
}, [filtered.length]);
|
|
60
58
|
useInput((ch, key) => {
|
|
61
59
|
if (key.escape) {
|
|
62
60
|
if (filter.length > 0) {
|
|
63
|
-
setFilter(
|
|
61
|
+
setFilter('');
|
|
64
62
|
return;
|
|
65
63
|
}
|
|
66
64
|
props.onCancel();
|
|
67
65
|
return;
|
|
68
66
|
}
|
|
69
|
-
if (key.upArrow || (key.ctrl && ch ===
|
|
70
|
-
setCursor(
|
|
67
|
+
if (key.upArrow || (key.ctrl && ch === 'p')) {
|
|
68
|
+
setCursor(c => Math.max(0, c - 1));
|
|
71
69
|
return;
|
|
72
70
|
}
|
|
73
|
-
if (key.downArrow || (key.ctrl && ch ===
|
|
74
|
-
setCursor(
|
|
71
|
+
if (key.downArrow || (key.ctrl && ch === 'n')) {
|
|
72
|
+
setCursor(c => Math.min(Math.max(0, filtered.length - 1), c + 1));
|
|
75
73
|
return;
|
|
76
74
|
}
|
|
77
75
|
if (key.return) {
|
|
@@ -81,7 +79,7 @@ export function ModelPicker(props) {
|
|
|
81
79
|
return;
|
|
82
80
|
}
|
|
83
81
|
if (key.backspace || key.delete) {
|
|
84
|
-
setFilter(
|
|
82
|
+
setFilter(f => f.slice(0, -1));
|
|
85
83
|
return;
|
|
86
84
|
}
|
|
87
85
|
if (ch && /^[1-9]$/.test(ch) && filter.length === 0) {
|
|
@@ -95,7 +93,7 @@ export function ModelPicker(props) {
|
|
|
95
93
|
}
|
|
96
94
|
// Any printable char that wasn't a control key extends the filter.
|
|
97
95
|
if (ch && !key.ctrl && !key.meta && /^[\w@\-./:]$/.test(ch)) {
|
|
98
|
-
setFilter(
|
|
96
|
+
setFilter(f => f + ch);
|
|
99
97
|
}
|
|
100
98
|
}, { isActive: true });
|
|
101
99
|
const groups = groupByProvider(filtered);
|
|
@@ -103,16 +101,14 @@ export function ModelPicker(props) {
|
|
|
103
101
|
const titleWidth = width - 24;
|
|
104
102
|
// Build a flat row index so digit shortcuts map to the visible ordering.
|
|
105
103
|
let idx = 0;
|
|
106
|
-
return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: palette.accent, paddingX: 1, width: width, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: palette.accent, bold: true, children: "Select model" }), filter.length > 0 ? (_jsxs(Text, { color: palette.text.accent, children: [
|
|
104
|
+
return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: palette.accent, paddingX: 1, width: width, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: palette.accent, bold: true, children: "Select model" }), filter.length > 0 ? (_jsxs(Text, { color: palette.text.accent, children: [_jsx(Text, { color: palette.text.secondary, dimColor: true, children: "filter: " }), filter, _jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [' ', "(", filtered.length, ")"] })] })) : (_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [filtered.length, " models"] }))] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [filtered.length === 0 && (_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: ["No models match \"", filter, "\"."] })), groups.map(group => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: palette.text.secondary, dimColor: true, children: group.provider }), group.items.map(m => {
|
|
107
105
|
const myIdx = idx;
|
|
108
106
|
idx += 1;
|
|
109
107
|
const isCursor = myIdx === cursor;
|
|
110
108
|
const isCurrent = m.id === props.current;
|
|
111
|
-
const num = myIdx < 9 && filter.length === 0 ? String(myIdx + 1) :
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
: palette.text.secondary;
|
|
115
|
-
const lead = isCursor ? "▸" : isCurrent ? "●" : " ";
|
|
109
|
+
const num = myIdx < 9 && filter.length === 0 ? String(myIdx + 1) : ' ';
|
|
110
|
+
const tierColor = m.tier ? TIER_COLOR[m.tier] : palette.text.secondary;
|
|
111
|
+
const lead = isCursor ? '▸' : isCurrent ? '●' : ' ';
|
|
116
112
|
const titleColor = isCursor
|
|
117
113
|
? palette.text.primary
|
|
118
114
|
: isCurrent
|
|
@@ -122,11 +118,7 @@ export function ModelPicker(props) {
|
|
|
122
118
|
const truncatedTitle = title.length > titleWidth
|
|
123
119
|
? `${title.slice(0, titleWidth - 1)}…`
|
|
124
120
|
: title;
|
|
125
|
-
return (_jsxs(Box, { flexDirection: "row", paddingLeft: 1, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: isCursor
|
|
126
|
-
|
|
127
|
-
: isCurrent
|
|
128
|
-
? palette.text.accent
|
|
129
|
-
: palette.text.secondary, children: lead }) }), _jsx(Box, { minWidth: 2, children: _jsx(Text, { color: palette.text.secondary, dimColor: true, children: num }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: titleColor, bold: isCursor, children: truncatedTitle }) }), m.tier !== undefined && (_jsx(Box, { minWidth: 8, justifyContent: "flex-end", children: _jsx(Text, { color: tierLabel, dimColor: !isCursor, children: m.tier }) }))] }, m.id));
|
|
130
|
-
})] }, group.provider)))] }), _jsxs(Box, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: palette.border.default, flexDirection: "column", children: [_jsxs(Box, { children: [_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: ["\u2192", " "] }), _jsx(Text, { color: palette.text.accent, children: selected?.id ?? props.current })] }), _jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [_jsx(Text, { bold: true, color: palette.text.primary, children: "\u2191\u2193" }), " ", "nav", " ", _jsx(Text, { bold: true, color: palette.text.primary, children: "enter" }), " ", "pick", " ", _jsx(Text, { bold: true, color: palette.text.primary, children: "1-9" }), " ", "jump"] }), _jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [_jsx(Text, { bold: true, color: palette.text.primary, children: "type" }), " ", "filter", " ", _jsx(Text, { bold: true, color: palette.text.primary, children: "esc" }), " ", filter ? "clear" : "cancel"] })] })] })] }));
|
|
121
|
+
return (_jsxs(Box, { flexDirection: "row", paddingLeft: 1, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: isCursor ? palette.text.accent : isCurrent ? palette.text.accent : palette.text.secondary, children: lead }) }), _jsx(Box, { minWidth: 2, children: _jsx(Text, { color: palette.text.secondary, dimColor: true, children: num }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: titleColor, bold: isCursor, children: truncatedTitle }) }), m.tier !== undefined && (_jsx(Box, { minWidth: 8, justifyContent: "flex-end", children: _jsx(Text, { color: tierColor, dimColor: !isCursor, children: m.tier }) }))] }, m.id));
|
|
122
|
+
})] }, group.provider)))] }), _jsxs(Box, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: palette.border.default, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: palette.text.secondary, dimColor: true, children: "\u2192 " }), _jsx(Text, { color: palette.text.accent, children: selected?.id ?? props.current })] }), _jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [_jsx(Text, { bold: true, color: palette.text.primary, children: "\u2191\u2193" }), " nav", ' ', _jsx(Text, { bold: true, color: palette.text.primary, children: "enter" }), " pick", ' ', _jsx(Text, { bold: true, color: palette.text.primary, children: "1-9" }), " jump"] }), _jsxs(Text, { color: palette.text.secondary, dimColor: true, children: [_jsx(Text, { bold: true, color: palette.text.primary, children: "type" }), " filter", ' ', _jsx(Text, { bold: true, color: palette.text.primary, children: "esc" }), " ", filter ? 'clear' : 'cancel'] })] })] })] }));
|
|
131
123
|
}
|
|
132
124
|
//# sourceMappingURL=ModelPicker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelPicker.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ModelPicker.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAgB/C,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"ModelPicker.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/ModelPicker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,7 @@
|
|
|
8
8
|
* The real content lives in the backing buffer passed to `onSubmit`, so
|
|
9
9
|
* Enter still submits the full text — only the rendering is collapsed.
|
|
10
10
|
*/
|
|
11
|
-
import * as React from
|
|
12
|
-
import type { Palette } from "../../theme.js";
|
|
11
|
+
import * as React from 'react';
|
|
13
12
|
export declare const PASTE_LINE_THRESHOLD = 4;
|
|
14
13
|
export declare const PASTE_CHAR_THRESHOLD = 200;
|
|
15
14
|
export interface PasteSegment {
|
|
@@ -28,7 +27,6 @@ export interface PasteCollapseViewProps {
|
|
|
28
27
|
value: string;
|
|
29
28
|
segment: PasteSegment;
|
|
30
29
|
expanded: boolean;
|
|
31
|
-
palette: Palette;
|
|
32
30
|
}
|
|
33
31
|
/**
|
|
34
32
|
* Renders the buffer with the pasted region collapsed behind a
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { Box, Text } from
|
|
2
|
+
import { Box, Text } from 'ink';
|
|
3
3
|
export const PASTE_LINE_THRESHOLD = 4;
|
|
4
4
|
export const PASTE_CHAR_THRESHOLD = 200;
|
|
5
5
|
/**
|
|
@@ -14,13 +14,11 @@ export function detectPaste(prev, next) {
|
|
|
14
14
|
}
|
|
15
15
|
// Locate the insertion point by finding the longest common prefix + suffix.
|
|
16
16
|
let prefix = 0;
|
|
17
|
-
while (prefix < prev.length &&
|
|
18
|
-
prefix < next.length &&
|
|
19
|
-
prev[prefix] === next[prefix])
|
|
17
|
+
while (prefix < prev.length && prefix < next.length && prev[prefix] === next[prefix])
|
|
20
18
|
prefix += 1;
|
|
21
19
|
let suffix = 0;
|
|
22
|
-
while (suffix < prev.length - prefix &&
|
|
23
|
-
suffix < next.length - prefix &&
|
|
20
|
+
while (suffix < (prev.length - prefix) &&
|
|
21
|
+
suffix < (next.length - prefix) &&
|
|
24
22
|
prev[prev.length - 1 - suffix] === next[next.length - 1 - suffix])
|
|
25
23
|
suffix += 1;
|
|
26
24
|
const start = prefix;
|
|
@@ -36,11 +34,11 @@ export function detectPaste(prev, next) {
|
|
|
36
34
|
};
|
|
37
35
|
}
|
|
38
36
|
function countLines(s) {
|
|
39
|
-
if (s ===
|
|
37
|
+
if (s === '')
|
|
40
38
|
return 0;
|
|
41
39
|
let n = 1;
|
|
42
40
|
for (let i = 0; i < s.length; i += 1)
|
|
43
|
-
if (s[i] ===
|
|
41
|
+
if (s[i] === '\n')
|
|
44
42
|
n += 1;
|
|
45
43
|
return n;
|
|
46
44
|
}
|
|
@@ -50,12 +48,12 @@ function countLines(s) {
|
|
|
50
48
|
* hint so the user knows Ctrl+E toggles it.
|
|
51
49
|
*/
|
|
52
50
|
export function PasteCollapseView(props) {
|
|
53
|
-
const { value, segment, expanded
|
|
51
|
+
const { value, segment, expanded } = props;
|
|
54
52
|
if (expanded) {
|
|
55
|
-
return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: value }), _jsxs(Text, { color:
|
|
53
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: value }), _jsxs(Text, { color: "gray", dimColor: true, children: ["[", segment.lines, " line", segment.lines === 1 ? '' : 's', ", ", segment.chars, " chars expanded \u00B7 Ctrl+E to collapse]"] })] }));
|
|
56
54
|
}
|
|
57
55
|
const before = value.slice(0, segment.start);
|
|
58
56
|
const after = value.slice(segment.end);
|
|
59
|
-
return (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", children: [_jsx(Text, { children: before }), _jsxs(Text, { color:
|
|
57
|
+
return (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", children: [_jsx(Text, { children: before }), _jsxs(Text, { color: "yellow", children: ["[", segment.lines, " line", segment.lines === 1 ? '' : 's', " pasted, ", segment.chars, " chars]"] }), _jsx(Text, { children: after }), _jsx(Text, { color: "gray", dimColor: true, children: " \u00B7 Ctrl+E expand" })] }));
|
|
60
58
|
}
|
|
61
59
|
//# sourceMappingURL=PasteCollapse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PasteCollapse.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/PasteCollapse.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"PasteCollapse.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/PasteCollapse.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Self-contained spinner glyph component.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* Each instance runs its own 80ms interval so the rest of the App tree
|
|
5
|
+
* is never re-rendered on spinner ticks. All instances share a module-level
|
|
6
|
+
* start timestamp so they rotate in lockstep — no visual strobing when
|
|
7
|
+
* multiple tools run simultaneously.
|
|
8
8
|
*
|
|
9
9
|
* Usage:
|
|
10
10
|
* <SpinnerGlyph isActive={busy} />
|
|
@@ -2,10 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
/**
|
|
3
3
|
* Self-contained spinner glyph component.
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* Each instance runs its own 80ms interval so the rest of the App tree
|
|
6
|
+
* is never re-rendered on spinner ticks. All instances share a module-level
|
|
7
|
+
* start timestamp so they rotate in lockstep — no visual strobing when
|
|
8
|
+
* multiple tools run simultaneously.
|
|
9
9
|
*
|
|
10
10
|
* Usage:
|
|
11
11
|
* <SpinnerGlyph isActive={busy} />
|
|
@@ -14,43 +14,23 @@ import * as React from "react";
|
|
|
14
14
|
import { Text } from "ink";
|
|
15
15
|
import { SPINNER_FRAMES } from "../spinner-context.js";
|
|
16
16
|
const SPINNER_INTERVAL_MS = 80;
|
|
17
|
-
let
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
_globalInterval = setInterval(() => {
|
|
24
|
-
_globalFrame = (_globalFrame + 1) % SPINNER_FRAMES.length;
|
|
25
|
-
for (const notify of _subscribers)
|
|
26
|
-
notify();
|
|
27
|
-
}, SPINNER_INTERVAL_MS);
|
|
28
|
-
}
|
|
29
|
-
function stopGlobalInterval() {
|
|
30
|
-
if (_globalInterval === null)
|
|
31
|
-
return;
|
|
32
|
-
clearInterval(_globalInterval);
|
|
33
|
-
_globalInterval = null;
|
|
17
|
+
let GLOBAL_START = 0;
|
|
18
|
+
function computeFrame() {
|
|
19
|
+
if (GLOBAL_START === 0)
|
|
20
|
+
GLOBAL_START = Date.now();
|
|
21
|
+
const elapsed = Date.now() - GLOBAL_START;
|
|
22
|
+
return Math.floor(elapsed / SPINNER_INTERVAL_MS) % SPINNER_FRAMES.length;
|
|
34
23
|
}
|
|
35
24
|
export function SpinnerGlyph({ isActive, color, bold, }) {
|
|
36
|
-
const [,
|
|
25
|
+
const [frame, setFrame] = React.useState(computeFrame);
|
|
37
26
|
React.useEffect(() => {
|
|
38
27
|
if (!isActive) {
|
|
39
|
-
|
|
28
|
+
setFrame(0);
|
|
40
29
|
return;
|
|
41
30
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
_subscribers.add(notify);
|
|
46
|
-
startGlobalInterval();
|
|
47
|
-
return () => {
|
|
48
|
-
_subscribers.delete(notify);
|
|
49
|
-
if (_subscribers.size === 0)
|
|
50
|
-
stopGlobalInterval();
|
|
51
|
-
};
|
|
31
|
+
const t = setInterval(() => setFrame(computeFrame()), SPINNER_INTERVAL_MS);
|
|
32
|
+
return () => clearInterval(t);
|
|
52
33
|
}, [isActive]);
|
|
53
|
-
const frame = _globalFrame;
|
|
54
34
|
return (_jsx(Text, { color: color, bold: bold, children: isActive
|
|
55
35
|
? (SPINNER_FRAMES[frame] ?? SPINNER_FRAMES[0])
|
|
56
36
|
: SPINNER_FRAMES[0] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpinnerGlyph.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/SpinnerGlyph.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,IAAI,YAAY,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SpinnerGlyph.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/SpinnerGlyph.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,IAAI,YAAY,GAAG,CAAC,CAAC;AAQrB,SAAS,YAAY;IACnB,IAAI,YAAY,KAAK,CAAC;QAAE,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC;IAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,mBAAmB,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAC3B,QAAQ,EACR,KAAK,EACL,IAAI,GACc;IAClB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEvD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,CAAC,CAAC,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC3E,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,CACL,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,YAC3B,QAAQ;YACP,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAChB,CACR,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
* When busy, a subtle spinner frame appears on the right.
|
|
7
7
|
*/
|
|
8
8
|
import * as React from "react";
|
|
9
|
-
import type { RenderMetricsGetters } from "../use-render-metrics.js";
|
|
10
9
|
export interface StatusBarProps {
|
|
11
10
|
model: string;
|
|
12
11
|
provider: string;
|
|
@@ -26,11 +25,5 @@ export interface StatusBarProps {
|
|
|
26
25
|
/** Current turn index (1-based) and maximum turns for this loop. */
|
|
27
26
|
turnCount?: number;
|
|
28
27
|
maxTurns?: number;
|
|
29
|
-
/** Flicker detector: true when frame overflow is detected. */
|
|
30
|
-
overflowDetected?: boolean;
|
|
31
|
-
/** Toggle for render-metrics display (Alt+M). */
|
|
32
|
-
showMetrics?: boolean;
|
|
33
|
-
/** Render-metrics getters — populated when showMetrics is true. */
|
|
34
|
-
renderMetrics?: RenderMetricsGetters;
|
|
35
28
|
}
|
|
36
29
|
export declare const StatusBar: React.NamedExoticComponent<StatusBarProps>;
|
|
@@ -9,6 +9,7 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
|
9
9
|
import * as React from "react";
|
|
10
10
|
import { Box, Text, useStdout } from "ink";
|
|
11
11
|
import { useTheme } from "../theme-context.js";
|
|
12
|
+
import { SpinnerContext } from "../spinner-context.js";
|
|
12
13
|
import { SpinnerGlyph } from "./SpinnerGlyph.js";
|
|
13
14
|
function formatTokens(n) {
|
|
14
15
|
if (n < 1000)
|
|
@@ -47,6 +48,7 @@ export const StatusBar = React.memo(function StatusBar(props) {
|
|
|
47
48
|
const { stdout } = useStdout();
|
|
48
49
|
const palette = useTheme();
|
|
49
50
|
const cols = stdout?.columns ?? 80;
|
|
51
|
+
const { busy: _spinnerBusy } = React.useContext(SpinnerContext);
|
|
50
52
|
const totalTokens = props.inputTokens + props.outputTokens;
|
|
51
53
|
const costLabel = props.costUsd > 0 ? `$${props.costUsd.toFixed(3)}` : "";
|
|
52
54
|
// Strip provider prefix so the footer reads short and human.
|
|
@@ -89,18 +91,10 @@ export const StatusBar = React.memo(function StatusBar(props) {
|
|
|
89
91
|
: mode === "yolo"
|
|
90
92
|
? palette.error
|
|
91
93
|
: palette.textMuted;
|
|
92
|
-
const metricsLabel = (() => {
|
|
93
|
-
if (!props.showMetrics || !props.renderMetrics)
|
|
94
|
-
return "";
|
|
95
|
-
const avg = props.renderMetrics.avgFrameTimeMs();
|
|
96
|
-
const p99 = props.renderMetrics.p99FrameTimeMs();
|
|
97
|
-
const fps = avg > 0 ? (1000 / avg).toFixed(1) : "0";
|
|
98
|
-
return `FPS: ${fps} | avg: ${avg}ms | p99: ${p99}ms`;
|
|
99
|
-
})();
|
|
100
94
|
// Slim status bar — only what's load-bearing:
|
|
101
|
-
// left: ⏵⏵ MODE · cwd
|
|
95
|
+
// left: ⏵⏵ MODE · cwd
|
|
102
96
|
// 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) })
|
|
104
|
-
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" })),
|
|
97
|
+
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(SpinnerGlyph, { isActive: true }), typeof props.turnCount === "number" &&
|
|
98
|
+
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 }))] })] }));
|
|
105
99
|
});
|
|
106
100
|
//# 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;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"StatusBar.js","sourceRoot":"","sources":["../../../../src/tui/ink/components/StatusBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Thinking block
|
|
2
|
+
* Thinking block: dim italic render of reasoning tokens.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* updates live; after streaming the block stays visible for context.
|
|
8
|
-
*
|
|
9
|
-
* ThinkingBlockGroup merges 3+ consecutive blocks into single grouped rows.
|
|
4
|
+
* Collapsed by default to a char-count summary (`thinking… (N chars)`)
|
|
5
|
+
* to stop reasoning-heavy models from flooding the screen. Press Enter
|
|
6
|
+
* (Return) on a collapsed block to expand it, Enter again to collapse.
|
|
10
7
|
*/
|
|
11
8
|
import * as React from "react";
|
|
12
9
|
export interface ThinkingBlockProps {
|
|
13
10
|
content: string;
|
|
14
|
-
isStreaming?: boolean;
|
|
15
11
|
}
|
|
16
12
|
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>;
|