@akiojin/gwt 4.11.6 → 4.12.1
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/bin/gwt.js +36 -10
- package/dist/claude.d.ts +1 -0
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +81 -24
- package/dist/claude.js.map +1 -1
- package/dist/cli/ui/App.solid.d.ts.map +1 -1
- package/dist/cli/ui/App.solid.js +280 -50
- package/dist/cli/ui/App.solid.js.map +1 -1
- package/dist/cli/ui/components/solid/QuickStartStep.d.ts.map +1 -1
- package/dist/cli/ui/components/solid/QuickStartStep.js +35 -22
- package/dist/cli/ui/components/solid/QuickStartStep.js.map +1 -1
- package/dist/cli/ui/components/solid/SelectInput.d.ts.map +1 -1
- package/dist/cli/ui/components/solid/SelectInput.js +2 -1
- package/dist/cli/ui/components/solid/SelectInput.js.map +1 -1
- package/dist/cli/ui/components/solid/WizardController.d.ts.map +1 -1
- package/dist/cli/ui/components/solid/WizardController.js +67 -13
- package/dist/cli/ui/components/solid/WizardController.js.map +1 -1
- package/dist/cli/ui/components/solid/WizardSteps.d.ts +5 -0
- package/dist/cli/ui/components/solid/WizardSteps.d.ts.map +1 -1
- package/dist/cli/ui/components/solid/WizardSteps.js +50 -70
- package/dist/cli/ui/components/solid/WizardSteps.js.map +1 -1
- package/dist/cli/ui/core/theme.d.ts +9 -0
- package/dist/cli/ui/core/theme.d.ts.map +1 -1
- package/dist/cli/ui/core/theme.js +21 -0
- package/dist/cli/ui/core/theme.js.map +1 -1
- package/dist/cli/ui/screens/solid/BranchListScreen.d.ts +9 -2
- package/dist/cli/ui/screens/solid/BranchListScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/BranchListScreen.js +101 -28
- package/dist/cli/ui/screens/solid/BranchListScreen.js.map +1 -1
- package/dist/cli/ui/screens/solid/ConfirmScreen.d.ts +2 -1
- package/dist/cli/ui/screens/solid/ConfirmScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/ConfirmScreen.js +11 -3
- package/dist/cli/ui/screens/solid/ConfirmScreen.js.map +1 -1
- package/dist/cli/ui/screens/solid/EnvironmentScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/EnvironmentScreen.js +9 -10
- package/dist/cli/ui/screens/solid/EnvironmentScreen.js.map +1 -1
- package/dist/cli/ui/screens/solid/LogScreen.d.ts +7 -1
- package/dist/cli/ui/screens/solid/LogScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/LogScreen.js +254 -16
- package/dist/cli/ui/screens/solid/LogScreen.js.map +1 -1
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.js +8 -5
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.js.map +1 -1
- package/dist/cli/ui/screens/solid/SelectorScreen.d.ts.map +1 -1
- package/dist/cli/ui/screens/solid/SelectorScreen.js +12 -4
- package/dist/cli/ui/screens/solid/SelectorScreen.js.map +1 -1
- package/dist/cli/ui/types.d.ts +1 -0
- package/dist/cli/ui/types.d.ts.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.d.ts +1 -0
- package/dist/cli/ui/utils/branchFormatter.d.ts.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.js +29 -7
- package/dist/cli/ui/utils/branchFormatter.js.map +1 -1
- package/dist/cli/ui/utils/continueSession.d.ts +14 -0
- package/dist/cli/ui/utils/continueSession.d.ts.map +1 -1
- package/dist/cli/ui/utils/continueSession.js +61 -3
- package/dist/cli/ui/utils/continueSession.js.map +1 -1
- package/dist/cli/ui/utils/installedVersionCache.d.ts +33 -0
- package/dist/cli/ui/utils/installedVersionCache.d.ts.map +1 -0
- package/dist/cli/ui/utils/installedVersionCache.js +59 -0
- package/dist/cli/ui/utils/installedVersionCache.js.map +1 -0
- package/dist/cli/ui/utils/modelOptions.d.ts.map +1 -1
- package/dist/cli/ui/utils/modelOptions.js +16 -0
- package/dist/cli/ui/utils/modelOptions.js.map +1 -1
- package/dist/cli/ui/utils/versionCache.d.ts +37 -0
- package/dist/cli/ui/utils/versionCache.d.ts.map +1 -0
- package/dist/cli/ui/utils/versionCache.js +70 -0
- package/dist/cli/ui/utils/versionCache.js.map +1 -0
- package/dist/cli/ui/utils/versionFetcher.d.ts +41 -0
- package/dist/cli/ui/utils/versionFetcher.d.ts.map +1 -0
- package/dist/cli/ui/utils/versionFetcher.js +89 -0
- package/dist/cli/ui/utils/versionFetcher.js.map +1 -0
- package/dist/codex.d.ts +1 -0
- package/dist/codex.d.ts.map +1 -1
- package/dist/codex.js +95 -25
- package/dist/codex.js.map +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +10 -1
- package/dist/config/index.js.map +1 -1
- package/dist/gemini.d.ts +1 -0
- package/dist/gemini.d.ts.map +1 -1
- package/dist/gemini.js +36 -3
- package/dist/gemini.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +35 -2
- package/dist/index.js.map +1 -1
- package/dist/launcher.d.ts.map +1 -1
- package/dist/launcher.js +43 -8
- package/dist/launcher.js.map +1 -1
- package/dist/logging/agentOutput.d.ts +21 -0
- package/dist/logging/agentOutput.d.ts.map +1 -0
- package/dist/logging/agentOutput.js +164 -0
- package/dist/logging/agentOutput.js.map +1 -0
- package/dist/logging/formatter.d.ts.map +1 -1
- package/dist/logging/formatter.js +18 -4
- package/dist/logging/formatter.js.map +1 -1
- package/dist/logging/logger.d.ts.map +1 -1
- package/dist/logging/logger.js +2 -0
- package/dist/logging/logger.js.map +1 -1
- package/dist/logging/reader.d.ts +22 -0
- package/dist/logging/reader.d.ts.map +1 -1
- package/dist/logging/reader.js +116 -1
- package/dist/logging/reader.js.map +1 -1
- package/dist/opentui/index.solid.js +2575 -888
- package/dist/services/codingAgentResolver.d.ts.map +1 -1
- package/dist/services/codingAgentResolver.js +8 -6
- package/dist/services/codingAgentResolver.js.map +1 -1
- package/dist/services/dependency-installer.js +2 -2
- package/dist/services/dependency-installer.js.map +1 -1
- package/dist/shared/codingAgentConstants.d.ts +3 -0
- package/dist/shared/codingAgentConstants.d.ts.map +1 -1
- package/dist/shared/codingAgentConstants.js +66 -0
- package/dist/shared/codingAgentConstants.js.map +1 -1
- package/dist/utils/bun-runtime.d.ts +12 -0
- package/dist/utils/bun-runtime.d.ts.map +1 -0
- package/dist/utils/bun-runtime.js +13 -0
- package/dist/utils/bun-runtime.js.map +1 -0
- package/dist/utils/session/common.d.ts +8 -0
- package/dist/utils/session/common.d.ts.map +1 -1
- package/dist/utils/session/common.js +22 -0
- package/dist/utils/session/common.js.map +1 -1
- package/dist/utils/session/parsers/claude.d.ts +10 -4
- package/dist/utils/session/parsers/claude.d.ts.map +1 -1
- package/dist/utils/session/parsers/claude.js +64 -18
- package/dist/utils/session/parsers/claude.js.map +1 -1
- package/dist/utils/session/parsers/codex.d.ts.map +1 -1
- package/dist/utils/session/parsers/codex.js +47 -28
- package/dist/utils/session/parsers/codex.js.map +1 -1
- package/dist/utils/session/parsers/gemini.d.ts.map +1 -1
- package/dist/utils/session/parsers/gemini.js +43 -6
- package/dist/utils/session/parsers/gemini.js.map +1 -1
- package/dist/utils/session/parsers/opencode.d.ts.map +1 -1
- package/dist/utils/session/parsers/opencode.js +43 -6
- package/dist/utils/session/parsers/opencode.js.map +1 -1
- package/dist/utils/session/types.d.ts +7 -0
- package/dist/utils/session/types.d.ts.map +1 -1
- package/dist/web/client/src/components/ui/alert.d.ts +1 -1
- package/dist/worktree.d.ts +4 -1
- package/dist/worktree.d.ts.map +1 -1
- package/dist/worktree.js +21 -15
- package/dist/worktree.js.map +1 -1
- package/package.json +2 -1
- package/src/claude.ts +99 -28
- package/src/cli/ui/App.solid.tsx +373 -51
- package/src/cli/ui/__tests__/solid/AppSolid.cleanup.test.tsx +921 -1
- package/src/cli/ui/__tests__/solid/BranchListScreen.test.tsx +105 -5
- package/src/cli/ui/__tests__/solid/ConfirmScreen.test.tsx +77 -0
- package/src/cli/ui/__tests__/solid/LogScreen.test.tsx +351 -0
- package/src/cli/ui/__tests__/solid/components/QuickStartStep.test.tsx +73 -2
- package/src/cli/ui/__tests__/solid/components/WizardController.test.tsx +71 -0
- package/src/cli/ui/__tests__/solid/components/WizardSteps.test.tsx +95 -2
- package/src/cli/ui/__tests__/utils/branchFormatter.test.ts +72 -45
- package/src/cli/ui/components/solid/QuickStartStep.tsx +35 -23
- package/src/cli/ui/components/solid/SearchInput.tsx +1 -1
- package/src/cli/ui/components/solid/SelectInput.tsx +4 -0
- package/src/cli/ui/components/solid/WizardController.tsx +85 -12
- package/src/cli/ui/components/solid/WizardSteps.tsx +78 -90
- package/src/cli/ui/core/theme.ts +32 -0
- package/src/cli/ui/hooks/solid/useAsyncOperation.ts +8 -6
- package/src/cli/ui/hooks/solid/useGitOperations.ts +6 -5
- package/src/cli/ui/screens/solid/BranchListScreen.tsx +135 -32
- package/src/cli/ui/screens/solid/ConfirmScreen.tsx +20 -8
- package/src/cli/ui/screens/solid/EnvironmentScreen.tsx +22 -20
- package/src/cli/ui/screens/solid/LogScreen.tsx +364 -35
- package/src/cli/ui/screens/solid/ProfileEnvScreen.tsx +19 -15
- package/src/cli/ui/screens/solid/SelectorScreen.tsx +25 -14
- package/src/cli/ui/screens/solid/SettingsScreen.tsx +5 -3
- package/src/cli/ui/types.ts +1 -0
- package/src/cli/ui/utils/__tests__/branchFormatter.test.ts +53 -6
- package/src/cli/ui/utils/__tests__/installedVersionCache.test.ts +46 -0
- package/src/cli/ui/utils/branchFormatter.ts +35 -7
- package/src/cli/ui/utils/continueSession.ts +90 -3
- package/src/cli/ui/utils/installedVersionCache.ts +84 -0
- package/src/cli/ui/utils/modelOptions.test.ts +6 -0
- package/src/cli/ui/utils/modelOptions.ts +16 -0
- package/src/cli/ui/utils/versionCache.ts +93 -0
- package/src/cli/ui/utils/versionFetcher.ts +120 -0
- package/src/codex.ts +124 -26
- package/src/config/__tests__/saveSession.test.ts +2 -2
- package/src/config/index.ts +11 -1
- package/src/gemini.ts +50 -4
- package/src/index.test.ts +16 -10
- package/src/index.ts +41 -1
- package/src/launcher.ts +49 -8
- package/src/logging/agentOutput.ts +216 -0
- package/src/logging/formatter.ts +23 -4
- package/src/logging/logger.ts +2 -0
- package/src/logging/reader.ts +165 -1
- package/src/services/__tests__/BatchMergeService.test.ts +34 -14
- package/src/services/codingAgentResolver.ts +12 -5
- package/src/services/dependency-installer.ts +2 -2
- package/src/shared/codingAgentConstants.ts +73 -0
- package/src/utils/bun-runtime.ts +29 -0
- package/src/utils/session/common.ts +28 -0
- package/src/utils/session/parsers/claude.ts +79 -29
- package/src/utils/session/parsers/codex.ts +49 -26
- package/src/utils/session/parsers/gemini.ts +46 -5
- package/src/utils/session/parsers/opencode.ts +46 -5
- package/src/utils/session/types.ts +4 -0
- package/src/worktree.ts +28 -15
|
@@ -1,47 +1,248 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "@opentui/solid/jsx-runtime";
|
|
2
2
|
/** @jsxImportSource @opentui/solid */
|
|
3
3
|
import { useKeyboard } from "@opentui/solid";
|
|
4
|
-
import { createMemo } from "solid-js";
|
|
4
|
+
import { createEffect, createMemo, createSignal, mergeProps } from "solid-js";
|
|
5
5
|
import { TextAttributes } from "@opentui/core";
|
|
6
6
|
import { Header } from "../../components/solid/Header.js";
|
|
7
7
|
import { Footer } from "../../components/solid/Footer.js";
|
|
8
8
|
import { useTerminalSize } from "../../hooks/solid/useTerminalSize.js";
|
|
9
9
|
import { useScrollableList } from "../../hooks/solid/useScrollableList.js";
|
|
10
|
-
|
|
10
|
+
import stringWidth from "string-width";
|
|
11
|
+
import { getLogLevelColor, selectionStyle } from "../../core/theme.js";
|
|
12
|
+
const LEVEL_ORDER = ["ALL", "INFO+", "WARN+", "ERROR+"];
|
|
13
|
+
const LEVEL_THRESHOLDS = {
|
|
14
|
+
ALL: 0,
|
|
15
|
+
"INFO+": 30,
|
|
16
|
+
"WARN+": 40,
|
|
17
|
+
"ERROR+": 50,
|
|
18
|
+
};
|
|
19
|
+
const LEVEL_LABEL_VALUES = {
|
|
20
|
+
TRACE: 10,
|
|
21
|
+
DEBUG: 20,
|
|
22
|
+
INFO: 30,
|
|
23
|
+
WARN: 40,
|
|
24
|
+
ERROR: 50,
|
|
25
|
+
FATAL: 60,
|
|
26
|
+
};
|
|
27
|
+
const measureWidth = (value) => stringWidth(value);
|
|
28
|
+
const truncateToWidth = (value, maxWidth) => {
|
|
29
|
+
if (maxWidth <= 0) {
|
|
30
|
+
return "";
|
|
31
|
+
}
|
|
32
|
+
if (measureWidth(value) <= maxWidth) {
|
|
33
|
+
return value;
|
|
34
|
+
}
|
|
35
|
+
const ellipsis = "...";
|
|
36
|
+
const ellipsisWidth = measureWidth(ellipsis);
|
|
37
|
+
if (ellipsisWidth >= maxWidth) {
|
|
38
|
+
return ellipsis.slice(0, maxWidth);
|
|
39
|
+
}
|
|
40
|
+
let currentWidth = 0;
|
|
41
|
+
let result = "";
|
|
42
|
+
for (const char of Array.from(value)) {
|
|
43
|
+
const charWidth = measureWidth(char);
|
|
44
|
+
if (currentWidth + charWidth + ellipsisWidth > maxWidth) {
|
|
45
|
+
break;
|
|
46
|
+
}
|
|
47
|
+
result += char;
|
|
48
|
+
currentWidth += charWidth;
|
|
49
|
+
}
|
|
50
|
+
return `${result}${ellipsis}`;
|
|
51
|
+
};
|
|
52
|
+
const padToWidth = (value, width) => {
|
|
53
|
+
if (width <= 0) {
|
|
54
|
+
return "";
|
|
55
|
+
}
|
|
56
|
+
const truncated = truncateToWidth(value, width);
|
|
57
|
+
const padding = Math.max(0, width - measureWidth(truncated));
|
|
58
|
+
return `${truncated}${" ".repeat(padding)}`;
|
|
59
|
+
};
|
|
60
|
+
const appendSegment = (segments, segment) => {
|
|
61
|
+
if (!segment.text) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
segments.push(segment);
|
|
65
|
+
};
|
|
66
|
+
const measureSegmentsWidth = (segments) => segments.reduce((total, segment) => total + measureWidth(segment.text), 0);
|
|
67
|
+
const truncateSegmentsToWidth = (segments, maxWidth) => {
|
|
68
|
+
if (maxWidth <= 0) {
|
|
69
|
+
return [];
|
|
70
|
+
}
|
|
71
|
+
const result = [];
|
|
72
|
+
let currentWidth = 0;
|
|
73
|
+
for (const segment of segments) {
|
|
74
|
+
if (currentWidth >= maxWidth) {
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
const segmentWidth = measureWidth(segment.text);
|
|
78
|
+
if (currentWidth + segmentWidth <= maxWidth) {
|
|
79
|
+
result.push(segment);
|
|
80
|
+
currentWidth += segmentWidth;
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
const remaining = maxWidth - currentWidth;
|
|
84
|
+
const truncated = truncateToWidth(segment.text, remaining);
|
|
85
|
+
if (truncated) {
|
|
86
|
+
result.push({ ...segment, text: truncated });
|
|
87
|
+
currentWidth += measureWidth(truncated);
|
|
88
|
+
}
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
91
|
+
return result;
|
|
92
|
+
};
|
|
93
|
+
const segmentsToText = (segments) => segments.map((segment) => segment.text).join("");
|
|
94
|
+
const padLine = (value, width) => {
|
|
95
|
+
const padding = Math.max(0, width - measureWidth(value));
|
|
96
|
+
return padding > 0 ? `${value}${" ".repeat(padding)}` : value;
|
|
97
|
+
};
|
|
98
|
+
const resolveEntryLevel = (entry) => {
|
|
99
|
+
const rawLevel = entry.raw?.level;
|
|
100
|
+
if (typeof rawLevel === "number") {
|
|
101
|
+
return rawLevel;
|
|
102
|
+
}
|
|
103
|
+
const label = entry.levelLabel?.toUpperCase() ?? "";
|
|
104
|
+
return LEVEL_LABEL_VALUES[label] ?? 0;
|
|
105
|
+
};
|
|
106
|
+
export function LogScreen(props) {
|
|
107
|
+
const merged = mergeProps({
|
|
108
|
+
loading: false,
|
|
109
|
+
error: null,
|
|
110
|
+
branchLabel: null,
|
|
111
|
+
sourceLabel: null,
|
|
112
|
+
tailing: false,
|
|
113
|
+
helpVisible: false,
|
|
114
|
+
}, props);
|
|
11
115
|
const terminal = useTerminalSize();
|
|
116
|
+
const [filterQuery, setFilterQuery] = createSignal("");
|
|
117
|
+
const [filterMode, setFilterMode] = createSignal(false);
|
|
118
|
+
const [levelMode, setLevelMode] = createSignal("ALL");
|
|
119
|
+
const filteredEntries = createMemo(() => {
|
|
120
|
+
let result = merged.entries;
|
|
121
|
+
const threshold = LEVEL_THRESHOLDS[levelMode()];
|
|
122
|
+
if (threshold > 0) {
|
|
123
|
+
result = result.filter((entry) => resolveEntryLevel(entry) >= threshold);
|
|
124
|
+
}
|
|
125
|
+
const query = filterQuery().trim().toLowerCase();
|
|
126
|
+
if (!query) {
|
|
127
|
+
return result;
|
|
128
|
+
}
|
|
129
|
+
return result.filter((entry) => {
|
|
130
|
+
const target = `${entry.category} ${entry.levelLabel} ${entry.message}`.toLowerCase();
|
|
131
|
+
return target.includes(query);
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
const totalCount = createMemo(() => merged.entries.length);
|
|
135
|
+
const filteredCount = createMemo(() => filteredEntries().length);
|
|
136
|
+
const showFilterCount = createMemo(() => filterMode() || filterQuery().trim().length > 0);
|
|
137
|
+
const levelWidth = createMemo(() => {
|
|
138
|
+
const MIN = 5;
|
|
139
|
+
return Math.max(MIN, ...filteredEntries().map((entry) => measureWidth(entry.levelLabel)));
|
|
140
|
+
});
|
|
141
|
+
const categoryWidth = createMemo(() => {
|
|
142
|
+
const MIN = 4;
|
|
143
|
+
const MAX = 20;
|
|
144
|
+
const maxWidth = Math.max(MIN, ...filteredEntries().map((entry) => measureWidth(entry.category)));
|
|
145
|
+
return Math.min(MAX, maxWidth);
|
|
146
|
+
});
|
|
12
147
|
const listHeight = createMemo(() => {
|
|
13
148
|
const headerRows = 2;
|
|
14
|
-
const infoRows =
|
|
149
|
+
const infoRows = 3;
|
|
15
150
|
const footerRows = 1;
|
|
16
|
-
const notificationRows = notification ? 1 : 0;
|
|
151
|
+
const notificationRows = merged.notification ? 1 : 0;
|
|
17
152
|
const reserved = headerRows + infoRows + footerRows + notificationRows;
|
|
18
153
|
return Math.max(1, terminal().rows - reserved);
|
|
19
154
|
});
|
|
20
155
|
const list = useScrollableList({
|
|
21
|
-
items:
|
|
156
|
+
items: filteredEntries,
|
|
22
157
|
visibleCount: listHeight,
|
|
23
158
|
});
|
|
24
|
-
const currentEntry = createMemo(() =>
|
|
159
|
+
const currentEntry = createMemo(() => filteredEntries()[list.selectedIndex()]);
|
|
160
|
+
createEffect(() => {
|
|
161
|
+
filterQuery();
|
|
162
|
+
levelMode();
|
|
163
|
+
list.setSelectedIndex(0);
|
|
164
|
+
list.setScrollOffset(0);
|
|
165
|
+
});
|
|
25
166
|
const updateSelectedIndex = (value) => {
|
|
26
167
|
list.setSelectedIndex(value);
|
|
27
168
|
};
|
|
28
169
|
useKeyboard((key) => {
|
|
29
|
-
if (helpVisible) {
|
|
170
|
+
if (merged.helpVisible) {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
if (filterMode()) {
|
|
174
|
+
if (key.name === "down") {
|
|
175
|
+
updateSelectedIndex((prev) => prev + 1);
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
if (key.name === "up") {
|
|
179
|
+
updateSelectedIndex((prev) => prev - 1);
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
if (key.name === "escape") {
|
|
183
|
+
if (filterQuery()) {
|
|
184
|
+
setFilterQuery("");
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
setFilterMode(false);
|
|
188
|
+
}
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
if (key.name === "backspace") {
|
|
192
|
+
setFilterQuery((prev) => prev.slice(0, -1));
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
if (key.name === "return" || key.name === "linefeed") {
|
|
196
|
+
setFilterMode(false);
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
if (key.sequence &&
|
|
200
|
+
key.sequence.length === 1 &&
|
|
201
|
+
!key.ctrl &&
|
|
202
|
+
!key.meta &&
|
|
203
|
+
!key.super &&
|
|
204
|
+
!key.hyper) {
|
|
205
|
+
setFilterQuery((prev) => prev + key.sequence);
|
|
206
|
+
}
|
|
30
207
|
return;
|
|
31
208
|
}
|
|
32
209
|
if (key.name === "escape" || key.name === "q") {
|
|
33
|
-
onBack();
|
|
210
|
+
merged.onBack();
|
|
34
211
|
return;
|
|
35
212
|
}
|
|
36
213
|
if (key.name === "c") {
|
|
37
214
|
const entry = currentEntry();
|
|
38
215
|
if (entry) {
|
|
39
|
-
onCopy(entry);
|
|
216
|
+
merged.onCopy(entry);
|
|
40
217
|
}
|
|
41
218
|
return;
|
|
42
219
|
}
|
|
43
220
|
if (key.name === "d") {
|
|
44
|
-
onPickDate?.();
|
|
221
|
+
merged.onPickDate?.();
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
224
|
+
if (key.name === "f") {
|
|
225
|
+
setFilterMode(true);
|
|
226
|
+
return;
|
|
227
|
+
}
|
|
228
|
+
if (key.name === "v") {
|
|
229
|
+
setLevelMode((prev) => {
|
|
230
|
+
const index = LEVEL_ORDER.indexOf(prev);
|
|
231
|
+
const nextIndex = (index + 1) % LEVEL_ORDER.length;
|
|
232
|
+
return LEVEL_ORDER[nextIndex] ?? "ALL";
|
|
233
|
+
});
|
|
234
|
+
return;
|
|
235
|
+
}
|
|
236
|
+
if (key.name === "r") {
|
|
237
|
+
merged.onReload?.();
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
if (key.name === "t") {
|
|
241
|
+
merged.onToggleTail?.();
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
if (key.name === "x") {
|
|
245
|
+
merged.onReset?.();
|
|
45
246
|
return;
|
|
46
247
|
}
|
|
47
248
|
if (key.name === "down") {
|
|
@@ -65,13 +266,13 @@ export function LogScreen({ entries, loading = false, error = null, onBack, onSe
|
|
|
65
266
|
return;
|
|
66
267
|
}
|
|
67
268
|
if (key.name === "end") {
|
|
68
|
-
updateSelectedIndex(
|
|
269
|
+
updateSelectedIndex(filteredEntries().length - 1);
|
|
69
270
|
return;
|
|
70
271
|
}
|
|
71
272
|
if (key.name === "return" || key.name === "linefeed") {
|
|
72
273
|
const entry = currentEntry();
|
|
73
274
|
if (entry) {
|
|
74
|
-
onSelect(entry);
|
|
275
|
+
merged.onSelect(entry);
|
|
75
276
|
}
|
|
76
277
|
}
|
|
77
278
|
});
|
|
@@ -80,16 +281,53 @@ export function LogScreen({ entries, loading = false, error = null, onBack, onSe
|
|
|
80
281
|
{ key: "enter", description: "Detail" },
|
|
81
282
|
{ key: "c", description: "Copy" },
|
|
82
283
|
{ key: "d", description: "Date" },
|
|
284
|
+
{ key: "f", description: "Filter" },
|
|
285
|
+
{ key: "v", description: "Level" },
|
|
286
|
+
{ key: "r", description: "Reload" },
|
|
287
|
+
{ key: "t", description: "Tail" },
|
|
288
|
+
{ key: "x", description: "Reset" },
|
|
83
289
|
{ key: "esc", description: "Back" },
|
|
84
290
|
];
|
|
85
291
|
return actions;
|
|
86
292
|
});
|
|
87
|
-
|
|
293
|
+
const formatEntrySegments = (entry) => {
|
|
294
|
+
const levelText = padToWidth(entry.levelLabel, levelWidth());
|
|
295
|
+
const categoryText = padToWidth(entry.category, categoryWidth());
|
|
296
|
+
const segments = [];
|
|
297
|
+
appendSegment(segments, { text: `[${entry.timeLabel}] ` });
|
|
298
|
+
appendSegment(segments, { text: "[" });
|
|
299
|
+
appendSegment(segments, {
|
|
300
|
+
text: levelText,
|
|
301
|
+
fg: getLogLevelColor(entry.levelLabel),
|
|
302
|
+
});
|
|
303
|
+
appendSegment(segments, { text: "] " });
|
|
304
|
+
appendSegment(segments, { text: "[" });
|
|
305
|
+
appendSegment(segments, { text: categoryText });
|
|
306
|
+
appendSegment(segments, { text: "] " });
|
|
307
|
+
appendSegment(segments, { text: entry.message });
|
|
308
|
+
const maxWidth = terminal().columns;
|
|
309
|
+
if (measureSegmentsWidth(segments) <= maxWidth) {
|
|
310
|
+
return segments;
|
|
311
|
+
}
|
|
312
|
+
return truncateSegmentsToWidth(segments, maxWidth);
|
|
313
|
+
};
|
|
314
|
+
const filterLabel = createMemo(() => {
|
|
315
|
+
if (filterQuery()) {
|
|
316
|
+
return filterQuery();
|
|
317
|
+
}
|
|
318
|
+
return filterMode() ? "(type to filter)" : "(press f to filter)";
|
|
319
|
+
});
|
|
320
|
+
return (_jsxs("box", { flexDirection: "column", height: terminal().rows, children: [_jsx(Header, { title: "gwt - Log Viewer", titleColor: "cyan", version: merged.version }), merged.notification ? (_jsx("text", { fg: merged.notification.tone === "error" ? "red" : "green", children: merged.notification.message })) : null, _jsxs("box", { flexDirection: "row", children: [_jsx("text", { attributes: TextAttributes.DIM, children: "Branch: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: merged.branchLabel ?? "(none)" }), _jsx("text", { attributes: TextAttributes.DIM, children: " Source: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: merged.sourceLabel ?? "(none)" })] }), _jsxs("box", { flexDirection: "row", children: [_jsx("text", { attributes: TextAttributes.DIM, children: "Date: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: merged.selectedDate ?? "---" }), _jsx("text", { attributes: TextAttributes.DIM, children: " Total: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: totalCount() }), _jsx("text", { attributes: TextAttributes.DIM, children: " Level: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: levelMode() }), _jsx("text", { attributes: TextAttributes.DIM, children: " Tail: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: merged.tailing ? "ON" : "OFF" })] }), _jsxs("box", { flexDirection: "row", children: [_jsx("text", { attributes: TextAttributes.DIM, children: "Filter: " }), _jsx("text", { attributes: TextAttributes.BOLD, children: filterLabel() }), showFilterCount() ? (_jsx("text", { attributes: TextAttributes.DIM, children: ` (Showing ${filteredCount()} of ${totalCount()})` })) : null] }), _jsxs("box", { flexDirection: "column", flexGrow: 1, children: [merged.loading ? (_jsx("text", { fg: "gray", children: "Loading logs..." })) : filteredEntries().length === 0 ? (_jsx("text", { fg: "gray", children: "No logs available." })) : (_jsx("box", { flexDirection: "column", children: list.visibleItems().map((entry, index) => {
|
|
88
321
|
const absoluteIndex = list.scrollOffset() + index;
|
|
89
322
|
const isSelected = absoluteIndex === list.selectedIndex();
|
|
323
|
+
const segments = formatEntrySegments(entry);
|
|
324
|
+
const lineText = segmentsToText(segments);
|
|
325
|
+
const selectedContent = padLine(lineText, terminal().columns);
|
|
90
326
|
return (_jsx("text", { ...(isSelected
|
|
91
|
-
? { fg:
|
|
92
|
-
: {}),
|
|
93
|
-
|
|
327
|
+
? { fg: selectionStyle.fg, bg: selectionStyle.bg }
|
|
328
|
+
: {}), wrapMode: "none", width: terminal().columns, children: isSelected
|
|
329
|
+
? selectedContent
|
|
330
|
+
: segments.map((segment) => segment.fg ? (_jsx("span", { style: { fg: segment.fg }, children: segment.text })) : (segment.text)) }));
|
|
331
|
+
}) })), merged.error ? _jsx("text", { fg: "red", children: merged.error }) : null] }), _jsx(Footer, { actions: footerActions() })] }));
|
|
94
332
|
}
|
|
95
333
|
//# sourceMappingURL=LogScreen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/LogScreen.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LogScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/LogScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProfileEnvScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/ProfileEnvScreen.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ProfileEnvScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/ProfileEnvScreen.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAKD,wBAAgB,gBAAgB,CAAC,EAC/B,WAAW,EACX,SAAS,EACT,KAAK,EACL,MAAM,EACN,QAAQ,EACR,WAAW,EACX,MAAM,EACN,OAAO,EACP,WAAmB,GACpB,EAAE,qBAAqB,OA2JvB"}
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs } from "@opentui/solid/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/solid/jsx-runtime";
|
|
2
2
|
/** @jsxImportSource @opentui/solid */
|
|
3
|
-
import { TextAttributes } from "@opentui/core";
|
|
4
3
|
import { useKeyboard } from "@opentui/solid";
|
|
5
4
|
import { createMemo } from "solid-js";
|
|
6
5
|
import { Header } from "../../components/solid/Header.js";
|
|
7
6
|
import { Footer } from "../../components/solid/Footer.js";
|
|
8
7
|
import { useTerminalSize } from "../../hooks/solid/useTerminalSize.js";
|
|
9
8
|
import { useScrollableList } from "../../hooks/solid/useScrollableList.js";
|
|
9
|
+
import stringWidth from "string-width";
|
|
10
|
+
import { selectionStyle } from "../../core/theme.js";
|
|
10
11
|
const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
|
|
11
12
|
export function ProfileEnvScreen({ profileName, variables, onAdd, onEdit, onDelete, onViewOsEnv, onBack, version, helpVisible = false, }) {
|
|
12
13
|
const terminal = useTerminalSize();
|
|
14
|
+
const padLine = (value, width) => {
|
|
15
|
+
const padding = Math.max(0, width - stringWidth(value));
|
|
16
|
+
return padding > 0 ? `${value}${" ".repeat(padding)}` : value;
|
|
17
|
+
};
|
|
13
18
|
const listHeight = createMemo(() => {
|
|
14
19
|
const headerRows = 2;
|
|
15
20
|
const footerRows = 1;
|
|
@@ -104,9 +109,7 @@ export function ProfileEnvScreen({ profileName, variables, onAdd, onEdit, onDele
|
|
|
104
109
|
return (_jsxs("box", { flexDirection: "column", height: terminal().rows, children: [_jsx(Header, { title: `gwt - Profile: ${profileName}`, titleColor: "cyan", version: version }), _jsx("box", { flexDirection: "column", flexGrow: 1, children: variables.length === 0 ? (_jsx("text", { fg: "gray", children: "No variables in profile." })) : (_jsx("box", { flexDirection: "column", children: list.visibleItems().map((variable, index) => {
|
|
105
110
|
const absoluteIndex = list.scrollOffset() + index;
|
|
106
111
|
const isSelected = absoluteIndex === list.selectedIndex();
|
|
107
|
-
|
|
108
|
-
const color = isSelected ? "cyan" : undefined;
|
|
109
|
-
return (_jsxs("box", { flexDirection: "row", children: [_jsx("text", { ...(color ? { fg: color } : {}), ...(attributes !== undefined ? { attributes } : {}), children: variable.key }), _jsxs("text", { ...(color ? { fg: color } : {}), ...(attributes !== undefined ? { attributes } : {}), children: ["=", variable.value] })] }));
|
|
112
|
+
return (_jsx("box", { flexDirection: "row", children: isSelected ? (_jsx("text", { fg: selectionStyle.fg, bg: selectionStyle.bg, children: padLine(`${variable.key}=${variable.value}`, terminal().columns) })) : (_jsxs(_Fragment, { children: [_jsx("text", { children: variable.key }), _jsxs("text", { children: ["=", variable.value] })] })) }));
|
|
110
113
|
}) })) }), _jsx(Footer, { actions: footerActions() })] }));
|
|
111
114
|
}
|
|
112
115
|
//# sourceMappingURL=ProfileEnvScreen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProfileEnvScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/ProfileEnvScreen.tsx"],"names":[],"mappings":";AAAA,sCAAsC;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ProfileEnvScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/ProfileEnvScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectorScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/SelectorScreen.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SelectorScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/SelectorScreen.tsx"],"names":[],"mappings":"AAWA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAUD,wBAAgB,cAAc,CAAC,EAC7B,KAAK,EACL,WAAW,EACX,KAAK,EACL,QAAQ,EACR,MAAM,EACN,OAAO,EACP,YAAsC,EACtC,aAAa,EAAE,eAAe,EAC9B,qBAAqB,EACrB,eAAuB,EACvB,WAAmB,GACpB,EAAE,mBAAmB,OAiIrB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs } from "@opentui/solid/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@opentui/solid/jsx-runtime";
|
|
2
2
|
/** @jsxImportSource @opentui/solid */
|
|
3
3
|
import { useKeyboard } from "@opentui/solid";
|
|
4
4
|
import { createEffect, createMemo } from "solid-js";
|
|
@@ -7,7 +7,13 @@ import { Header } from "../../components/solid/Header.js";
|
|
|
7
7
|
import { Footer } from "../../components/solid/Footer.js";
|
|
8
8
|
import { useTerminalSize } from "../../hooks/solid/useTerminalSize.js";
|
|
9
9
|
import { useScrollableList } from "../../hooks/solid/useScrollableList.js";
|
|
10
|
+
import stringWidth from "string-width";
|
|
11
|
+
import { selectionStyle } from "../../core/theme.js";
|
|
10
12
|
const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
|
|
13
|
+
const padLine = (value, width) => {
|
|
14
|
+
const padding = Math.max(0, width - stringWidth(value));
|
|
15
|
+
return padding > 0 ? `${value}${" ".repeat(padding)}` : value;
|
|
16
|
+
};
|
|
11
17
|
export function SelectorScreen({ title, description, items, onSelect, onBack, version, emptyMessage = "No options available.", selectedIndex: controlledIndex, onSelectedIndexChange, showDescription = false, helpVisible = false, }) {
|
|
12
18
|
const terminal = useTerminalSize();
|
|
13
19
|
const listHeight = createMemo(() => {
|
|
@@ -82,9 +88,11 @@ export function SelectorScreen({ title, description, items, onSelect, onBack, ve
|
|
|
82
88
|
return (_jsxs("box", { flexDirection: "column", height: terminal().rows, children: [_jsx(Header, { title: title, titleColor: "cyan", version: version }), description && _jsx("text", { children: description }), _jsx("box", { flexDirection: "column", flexGrow: 1, children: items.length === 0 ? (_jsx("text", { fg: "gray", children: emptyMessage })) : (_jsx("box", { flexDirection: "column", children: list.visibleItems().map((item, index) => {
|
|
83
89
|
const absoluteIndex = list.scrollOffset() + index;
|
|
84
90
|
const isSelected = absoluteIndex === selectedIndex();
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
91
|
+
const descriptionText = showDescription && item.description
|
|
92
|
+
? ` - ${item.description}`
|
|
93
|
+
: "";
|
|
94
|
+
const fullLine = `${item.label}${descriptionText}`;
|
|
95
|
+
return (_jsx("box", { flexDirection: "row", children: isSelected ? (_jsx("text", { fg: selectionStyle.fg, bg: selectionStyle.bg, children: padLine(fullLine, terminal().columns) })) : (_jsxs(_Fragment, { children: [_jsx("text", { children: item.label }), showDescription && item.description ? (_jsx("text", { attributes: TextAttributes.DIM, children: ` - ${item.description}` })) : null] })) }));
|
|
88
96
|
}) })) }), _jsx(Footer, { actions: footerActions() })] }));
|
|
89
97
|
}
|
|
90
98
|
//# sourceMappingURL=SelectorScreen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectorScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/SelectorScreen.tsx"],"names":[],"mappings":";AAAA,sCAAsC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"SelectorScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/SelectorScreen.tsx"],"names":[],"mappings":"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"}
|
package/dist/cli/ui/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/ui/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/ui/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { BranchInfo, BranchItem, WorktreeInfo } from "../types.js";
|
|
|
2
2
|
export interface FormatOptions {
|
|
3
3
|
hasChanges?: boolean;
|
|
4
4
|
}
|
|
5
|
+
export declare function formatLocalDateTime(timestampMs: number): string;
|
|
5
6
|
/**
|
|
6
7
|
* Calculate the latest activity timestamp for a branch.
|
|
7
8
|
* Returns the maximum of git commit timestamp and tool usage timestamp (in seconds).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branchFormatter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAEV,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAoCD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAOrE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE,aAAkB,GAC1B,UAAU,CA6DZ;AA2DD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,UAAU,EAAE,EACtB,WAAW,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa,GACjD,UAAU,EAAE,CAGd"}
|
|
1
|
+
{"version":3,"file":"branchFormatter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAEV,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAoCD,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAM/D;AAsBD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAOrE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE,aAAkB,GAC1B,UAAU,CA6DZ;AA2DD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,UAAU,EAAE,EACtB,WAAW,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa,GACjD,UAAU,EAAE,CAGd"}
|
|
@@ -9,14 +9,36 @@ function mapToolLabel(toolId, toolLabel) {
|
|
|
9
9
|
return toolLabel;
|
|
10
10
|
return "Custom";
|
|
11
11
|
}
|
|
12
|
+
const LOCAL_DATE_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
|
|
13
|
+
year: "numeric",
|
|
14
|
+
month: "2-digit",
|
|
15
|
+
day: "2-digit",
|
|
16
|
+
hour: "2-digit",
|
|
17
|
+
minute: "2-digit",
|
|
18
|
+
hour12: false,
|
|
19
|
+
});
|
|
20
|
+
const formatLocalDateTimeParts = (date) => {
|
|
21
|
+
const parts = LOCAL_DATE_TIME_FORMATTER.formatToParts(date);
|
|
22
|
+
const get = (type) => parts.find((part) => part.type === type)?.value;
|
|
23
|
+
const year = get("year");
|
|
24
|
+
const month = get("month");
|
|
25
|
+
const day = get("day");
|
|
26
|
+
const hour = get("hour");
|
|
27
|
+
const minute = get("minute");
|
|
28
|
+
if (!year || !month || !day || !hour || !minute) {
|
|
29
|
+
return LOCAL_DATE_TIME_FORMATTER.format(date);
|
|
30
|
+
}
|
|
31
|
+
return `${year}-${month}-${day} ${hour}:${minute}`;
|
|
32
|
+
};
|
|
33
|
+
export function formatLocalDateTime(timestampMs) {
|
|
34
|
+
const date = new Date(timestampMs);
|
|
35
|
+
if (Number.isNaN(date.getTime())) {
|
|
36
|
+
return "";
|
|
37
|
+
}
|
|
38
|
+
return formatLocalDateTimeParts(date);
|
|
39
|
+
}
|
|
12
40
|
function formatTimestamp(ts) {
|
|
13
|
-
|
|
14
|
-
const year = date.getFullYear();
|
|
15
|
-
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
16
|
-
const day = String(date.getDate()).padStart(2, "0");
|
|
17
|
-
const hours = String(date.getHours()).padStart(2, "0");
|
|
18
|
-
const minutes = String(date.getMinutes()).padStart(2, "0");
|
|
19
|
-
return `${year}-${month}-${day} ${hours}:${minutes}`;
|
|
41
|
+
return formatLocalDateTime(ts);
|
|
20
42
|
}
|
|
21
43
|
function buildLastToolUsageLabel(usage) {
|
|
22
44
|
if (!usage)
|