@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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WizardSteps.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/components/solid/WizardSteps.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"WizardSteps.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/components/solid/WizardSteps.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAWpD;;;;GAIG;AAEH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAwED,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,YAAY,CAAC;AAE1D,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACtD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;CAC1C;AAeD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,OA4C5D;AAGD,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AASD,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,OA0CxD;AAGD,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,OAmDxD;AAGD,MAAM,WAAW,oBAAqB,SAAQ,SAAS;IACrD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AA2BD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,OAqD1D;AAGD,MAAM,WAAW,oBAAqB,SAAQ,SAAS;IACrD,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAgBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,OAuD1D;AAGD,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,OAwCxD;AAGD,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AASD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,OA0ChE;AAGD,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC;AAgBD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,OA0C9D;AAGD,MAAM,WAAW,wBAAyB,SAAQ,SAAS;IACzD,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACnC;AAOD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,OA0ClE;AAGD,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AASD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,OAuG9D"}
|
|
@@ -2,15 +2,16 @@ import { jsxs as _jsxs, jsx as _jsx } from "@opentui/solid/jsx-runtime";
|
|
|
2
2
|
/** @jsxImportSource @opentui/solid */
|
|
3
3
|
import { TextAttributes } from "@opentui/core";
|
|
4
4
|
import { useKeyboard } from "@opentui/solid";
|
|
5
|
-
import { createEffect,
|
|
5
|
+
import { createEffect, createSignal } from "solid-js";
|
|
6
6
|
import { SelectInput } from "./SelectInput.js";
|
|
7
7
|
import { TextInput } from "./TextInput.js";
|
|
8
8
|
import { getModelOptions } from "../../utils/modelOptions.js";
|
|
9
9
|
import { useWizardScroll } from "./WizardPopup.js";
|
|
10
10
|
import { getAgentTerminalColor } from "../../../../utils/coding-agent-colors.js";
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
11
|
+
import { getVersionCache } from "../../utils/versionCache.js";
|
|
12
|
+
import { selectionStyle } from "../../core/theme.js";
|
|
13
|
+
import { versionInfoToSelectItem, createInstalledOption, } from "../../utils/versionFetcher.js";
|
|
14
|
+
import { getInstalledVersionCache } from "../../utils/installedVersionCache.js";
|
|
14
15
|
const useEnsureSelectionVisible = (options) => {
|
|
15
16
|
const scroll = useWizardScroll();
|
|
16
17
|
const ensureIndexVisible = (index) => {
|
|
@@ -206,7 +207,7 @@ export function AgentSelectStep(props) {
|
|
|
206
207
|
return (_jsxs("box", { flexDirection: "column", children: [_jsx("text", { fg: "cyan", attributes: TextAttributes.BOLD, children: "Select coding agent:" }), _jsx("text", { children: " " }), AGENTS.map((agent, index) => {
|
|
207
208
|
const isSelected = () => selectedIndex() === index;
|
|
208
209
|
const agentColor = getAgentTerminalColor(agent.value);
|
|
209
|
-
return isSelected() ? (_jsxs("text", { bg:
|
|
210
|
+
return isSelected() ? (_jsxs("text", { bg: selectionStyle.bg, fg: selectionStyle.fg, children: ["> ", agent.label] })) : (_jsxs("text", { fg: agentColor, children: [" ", agent.label] }));
|
|
210
211
|
}), _jsx("text", { children: " " }), _jsx("text", { attributes: TextAttributes.DIM, children: "[Enter] Select [Esc] Back" })] }));
|
|
211
212
|
}
|
|
212
213
|
function getModelItems(agentId) {
|
|
@@ -255,6 +256,28 @@ export function ModelSelectStep(props) {
|
|
|
255
256
|
};
|
|
256
257
|
return (_jsxs("box", { flexDirection: "column", children: [_jsx("text", { fg: "cyan", attributes: TextAttributes.BOLD, children: "Select Model:" }), _jsx("text", { children: " " }), _jsx(SelectInput, { items: models(), onSelect: (item) => props.onSelect(item.value), onChange: handleChange, focused: props.focused ?? true, selectRef: setSelectRef }), _jsx("text", { children: " " }), _jsx("text", { attributes: TextAttributes.DIM, children: "[Enter] Select [Esc] Back" })] }));
|
|
257
258
|
}
|
|
259
|
+
export function ModelInputStep(props) {
|
|
260
|
+
const [value, setValue] = createSignal("");
|
|
261
|
+
const scroll = useWizardScroll();
|
|
262
|
+
const placeholder = props.agentId === "opencode" ? "provider/model" : "model";
|
|
263
|
+
createEffect(() => {
|
|
264
|
+
if (props.focused === false) {
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
if (!scroll) {
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
scroll.ensureLineVisible(2);
|
|
271
|
+
});
|
|
272
|
+
const handleSubmit = (next) => {
|
|
273
|
+
const trimmed = next.trim();
|
|
274
|
+
if (!trimmed) {
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
277
|
+
props.onSubmit(trimmed);
|
|
278
|
+
};
|
|
279
|
+
return (_jsxs("box", { flexDirection: "column", children: [_jsx("text", { fg: "cyan", attributes: TextAttributes.BOLD, children: "Enter custom model:" }), _jsx("text", { children: " " }), _jsx(TextInput, { value: value(), onChange: setValue, onSubmit: handleSubmit, placeholder: placeholder, focused: props.focused ?? true }), _jsx("text", { children: " " }), _jsx("text", { attributes: TextAttributes.DIM, children: "[Enter] Submit [Esc] Back" })] }));
|
|
280
|
+
}
|
|
258
281
|
const REASONING_LEVELS = [
|
|
259
282
|
{ label: "low", value: "low", description: "Faster, less thorough" },
|
|
260
283
|
{ label: "medium", value: "medium", description: "Balanced" },
|
|
@@ -347,66 +370,23 @@ const LATEST_OPTION = {
|
|
|
347
370
|
value: "latest",
|
|
348
371
|
description: "Always fetch latest version",
|
|
349
372
|
};
|
|
350
|
-
// エージェントIDからパッケージ名を取得
|
|
351
|
-
function getPackageNameForAgent(agentId) {
|
|
352
|
-
const agent = BUILTIN_CODING_AGENTS.find((a) => a.id === agentId);
|
|
353
|
-
if (!agent || agent.type !== "bunx") {
|
|
354
|
-
return null;
|
|
355
|
-
}
|
|
356
|
-
const { packageName } = parsePackageCommand(agent.command);
|
|
357
|
-
return packageName;
|
|
358
|
-
}
|
|
359
|
-
// バージョン一覧を取得
|
|
360
|
-
async function fetchVersionOptions(agentId) {
|
|
361
|
-
const packageName = getPackageNameForAgent(agentId);
|
|
362
|
-
if (!packageName) {
|
|
363
|
-
return [];
|
|
364
|
-
}
|
|
365
|
-
const versions = await fetchPackageVersions(packageName);
|
|
366
|
-
return versions.map((v) => {
|
|
367
|
-
const item = {
|
|
368
|
-
label: v.isPrerelease ? `${v.version} (pre)` : v.version,
|
|
369
|
-
value: v.version,
|
|
370
|
-
};
|
|
371
|
-
if (v.publishedAt) {
|
|
372
|
-
item.description = new Date(v.publishedAt).toLocaleDateString();
|
|
373
|
-
}
|
|
374
|
-
return item;
|
|
375
|
-
});
|
|
376
|
-
}
|
|
377
|
-
// エージェントIDからコマンド名へのマッピング
|
|
378
|
-
const AGENT_COMMAND_MAP = {
|
|
379
|
-
"claude-code": "claude",
|
|
380
|
-
"codex-cli": "codex",
|
|
381
|
-
"gemini-cli": "gemini",
|
|
382
|
-
opencode: "opencode",
|
|
383
|
-
};
|
|
384
|
-
// インストール済みコマンド情報を取得(findCommandと統一)
|
|
385
|
-
async function fetchInstalledOption(agentId) {
|
|
386
|
-
const commandName = AGENT_COMMAND_MAP[agentId];
|
|
387
|
-
if (!commandName) {
|
|
388
|
-
return null;
|
|
389
|
-
}
|
|
390
|
-
const result = await findCommand(commandName);
|
|
391
|
-
if (result.source !== "installed" || !result.path) {
|
|
392
|
-
return null;
|
|
393
|
-
}
|
|
394
|
-
// バージョン表示(v1.0.3 → 1.0.3 形式に)
|
|
395
|
-
const version = result.version?.replace(/^v/, "") ?? "unknown";
|
|
396
|
-
return {
|
|
397
|
-
label: `installed@${version}`,
|
|
398
|
-
value: "installed",
|
|
399
|
-
description: result.path,
|
|
400
|
-
};
|
|
401
|
-
}
|
|
402
373
|
export function VersionSelectStep(props) {
|
|
403
374
|
const [selectedIndex, setSelectedIndex] = createSignal(0);
|
|
404
375
|
const [selectRef, setSelectRef] = createSignal(undefined);
|
|
405
|
-
// npm
|
|
406
|
-
const
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
376
|
+
// FR-029: Use cached versions from startup prefetch (no npm registry re-access)
|
|
377
|
+
const cachedVersions = () => {
|
|
378
|
+
const cached = getVersionCache(props.agentId);
|
|
379
|
+
if (!cached) {
|
|
380
|
+
return []; // FR-031: Fallback to empty, UI will show "latest" only
|
|
381
|
+
}
|
|
382
|
+
return cached.map(versionInfoToSelectItem);
|
|
383
|
+
};
|
|
384
|
+
// インストール済み情報は起動時にキャッシュ済み(FR-017)
|
|
385
|
+
const installedOption = () => {
|
|
386
|
+
const installed = getInstalledVersionCache(props.agentId);
|
|
387
|
+
return installed ? createInstalledOption(installed) : null;
|
|
388
|
+
};
|
|
389
|
+
// 全オプション(installed + latest + cached versions)
|
|
410
390
|
const allOptions = () => {
|
|
411
391
|
const options = [];
|
|
412
392
|
// installedオプション(インストール済みの場合のみ)
|
|
@@ -416,9 +396,9 @@ export function VersionSelectStep(props) {
|
|
|
416
396
|
}
|
|
417
397
|
// latestオプション(常に表示)
|
|
418
398
|
options.push(LATEST_OPTION);
|
|
419
|
-
// npm
|
|
420
|
-
const
|
|
421
|
-
options.push(...
|
|
399
|
+
// FR-029: Use cached versions (no npm registry re-access)
|
|
400
|
+
const cached = cachedVersions();
|
|
401
|
+
options.push(...cached);
|
|
422
402
|
return options;
|
|
423
403
|
};
|
|
424
404
|
useEnsureSelectionVisible({
|
|
@@ -449,11 +429,11 @@ export function VersionSelectStep(props) {
|
|
|
449
429
|
}
|
|
450
430
|
};
|
|
451
431
|
const statusText = () => {
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
if (
|
|
456
|
-
return "
|
|
432
|
+
// FR-029: No loading state since we use cached versions from startup
|
|
433
|
+
// FR-031: Show message if cache is empty (failed to fetch at startup)
|
|
434
|
+
const cached = cachedVersions();
|
|
435
|
+
if (cached.length === 0) {
|
|
436
|
+
return "Version list unavailable (using latest)";
|
|
457
437
|
}
|
|
458
438
|
return null;
|
|
459
439
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WizardSteps.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/solid/WizardSteps.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"WizardSteps.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/solid/WizardSteps.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,8 @@ export declare const colors: {
|
|
|
21
21
|
readonly selected: "cyan";
|
|
22
22
|
readonly highlighted: "cyan";
|
|
23
23
|
readonly disabled: "gray";
|
|
24
|
+
readonly selectionBackground: "cyan";
|
|
25
|
+
readonly selectionText: "black";
|
|
24
26
|
readonly branchFeature: "green";
|
|
25
27
|
readonly branchBugfix: "yellow";
|
|
26
28
|
readonly branchHotfix: "red";
|
|
@@ -42,6 +44,13 @@ export declare const colors: {
|
|
|
42
44
|
};
|
|
43
45
|
export type ColorName = keyof typeof colors;
|
|
44
46
|
export type ColorValue = (typeof colors)[ColorName];
|
|
47
|
+
export type LogLevelLabel = "TRACE" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL";
|
|
48
|
+
export declare const logLevelColors: Record<LogLevelLabel, ColorValue>;
|
|
49
|
+
export declare const selectionStyle: {
|
|
50
|
+
readonly fg: "black";
|
|
51
|
+
readonly bg: "cyan";
|
|
52
|
+
};
|
|
53
|
+
export declare const getLogLevelColor: (label?: string | null) => ColorValue;
|
|
45
54
|
/**
|
|
46
55
|
* ASCII icons used throughout the UI
|
|
47
56
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/core/theme.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH;;GAEG;AACH,eAAO,MAAM,MAAM
|
|
1
|
+
{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/core/theme.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH;;GAEG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDT,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,MAAM,CAAC;AAC5C,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;AAEpD,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,OAAO,GACP,OAAO,CAAC;AAEZ,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,aAAa,EAAE,UAAU,CAO5D,CAAC;AAEF,eAAO,MAAM,cAAc;;;CAGjB,CAAC;AAEX,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,GAAG,IAAI,KAAG,UAMxD,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyCR,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,KAAK,CAAC;AAM1C;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,MAAM,GACN,SAAS,GACT,OAAO,GACV,UAAU,CAWZ;AAMD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EACF,YAAY,GACZ,OAAO,GACP,QAAQ,GACR,UAAU,GACV,aAAa,GACb,aAAa,GAChB;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAUrC;AAMD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAC7C,UAAU,CAQZ;AAMD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG;IAC7E,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAOA;AAMD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,UAAU,CAAC;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAK5D,CAAC"}
|
|
@@ -28,6 +28,8 @@ export const colors = {
|
|
|
28
28
|
selected: "cyan",
|
|
29
29
|
highlighted: "cyan",
|
|
30
30
|
disabled: "gray",
|
|
31
|
+
selectionBackground: "cyan",
|
|
32
|
+
selectionText: "black",
|
|
31
33
|
// Branch type colors
|
|
32
34
|
branchFeature: "green",
|
|
33
35
|
branchBugfix: "yellow",
|
|
@@ -51,6 +53,25 @@ export const colors = {
|
|
|
51
53
|
progressPhase: "yellow",
|
|
52
54
|
progressTime: "magenta",
|
|
53
55
|
};
|
|
56
|
+
export const logLevelColors = {
|
|
57
|
+
TRACE: colors.textDim,
|
|
58
|
+
DEBUG: colors.info,
|
|
59
|
+
INFO: colors.success,
|
|
60
|
+
WARN: colors.warning,
|
|
61
|
+
ERROR: colors.error,
|
|
62
|
+
FATAL: colors.error,
|
|
63
|
+
};
|
|
64
|
+
export const selectionStyle = {
|
|
65
|
+
fg: colors.selectionText,
|
|
66
|
+
bg: colors.selectionBackground,
|
|
67
|
+
};
|
|
68
|
+
export const getLogLevelColor = (label) => {
|
|
69
|
+
if (!label) {
|
|
70
|
+
return colors.text;
|
|
71
|
+
}
|
|
72
|
+
const normalized = label.toUpperCase();
|
|
73
|
+
return logLevelColors[normalized] ?? colors.text;
|
|
74
|
+
};
|
|
54
75
|
// ========================================
|
|
55
76
|
// Icon Definitions
|
|
56
77
|
// ========================================
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../../src/cli/ui/core/theme.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,2CAA2C;AAC3C,oBAAoB;AACpB,2CAA2C;AAE3C;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,iBAAiB;IACjB,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,MAAM;IAEjB,gBAAgB;IAChB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,KAAK;IACZ,IAAI,EAAE,MAAM;IAEZ,oBAAoB;IACpB,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,MAAM;IAEjB,6BAA6B;IAC7B,QAAQ,EAAE,MAAM;IAChB,WAAW,EAAE,MAAM;IACnB,QAAQ,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../../src/cli/ui/core/theme.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { BranchItem, Statistics } from "../../types.js";
|
|
2
|
-
type IndicatorColor = "cyan" | "green" | "yellow" | "red";
|
|
2
|
+
type IndicatorColor = "cyan" | "green" | "yellow" | "red" | "brightGreen";
|
|
3
3
|
interface CleanupIndicator {
|
|
4
4
|
icon: string;
|
|
5
5
|
isSpinning?: boolean;
|
|
@@ -15,6 +15,7 @@ interface CleanupUIState {
|
|
|
15
15
|
footerMessage: CleanupFooterMessage | null;
|
|
16
16
|
inputLocked: boolean;
|
|
17
17
|
safetyLoading?: boolean;
|
|
18
|
+
safetyPendingBranches?: Set<string>;
|
|
18
19
|
}
|
|
19
20
|
export interface BranchListScreenProps {
|
|
20
21
|
branches: BranchItem[];
|
|
@@ -26,7 +27,7 @@ export interface BranchListScreenProps {
|
|
|
26
27
|
onCreateBranch?: (branch: BranchItem | null) => void;
|
|
27
28
|
onRefresh?: () => void;
|
|
28
29
|
onOpenProfiles?: () => void;
|
|
29
|
-
onOpenLogs?: () => void;
|
|
30
|
+
onOpenLogs?: (branch: BranchItem | null) => void;
|
|
30
31
|
loading?: boolean;
|
|
31
32
|
error?: Error | null;
|
|
32
33
|
lastUpdated?: Date | null;
|
|
@@ -40,6 +41,12 @@ export interface BranchListScreenProps {
|
|
|
40
41
|
helpVisible?: boolean;
|
|
41
42
|
/** ウィザードポップアップ表示中は入力を無効化 */
|
|
42
43
|
wizardVisible?: boolean;
|
|
44
|
+
/** 確認ダイアログ表示中は入力を無効化 */
|
|
45
|
+
confirmVisible?: boolean;
|
|
46
|
+
/** カーソル位置(外部から制御する場合) */
|
|
47
|
+
cursorPosition?: number;
|
|
48
|
+
/** カーソル位置変更時のコールバック */
|
|
49
|
+
onCursorPositionChange?: (index: number) => void;
|
|
43
50
|
}
|
|
44
51
|
export declare function BranchListScreen(props: BranchListScreenProps): any;
|
|
45
52
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BranchListScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/BranchListScreen.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAkB,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"BranchListScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/screens/solid/BranchListScreen.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAkB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAS7E,KAAK,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,aAAa,CAAC;AAE1E,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC7C,aAAa,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC3C,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,KAAK,IAAI,CAAC;IACrD,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,KAAK,IAAI,CAAC;IACjD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4BAA4B;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wBAAwB;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yBAAyB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uBAAuB;IACvB,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAClD;AAgPD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,OA+0B5D"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@opentui/solid/jsx-runtime";
|
|
2
2
|
/** @jsxImportSource @opentui/solid */
|
|
3
|
-
import { createEffect, createMemo, createSignal } from "solid-js";
|
|
3
|
+
import { createEffect, createMemo, createSignal, on } from "solid-js";
|
|
4
4
|
import { useKeyboard, useTerminalDimensions } from "@opentui/solid";
|
|
5
5
|
import { TextAttributes } from "@opentui/core";
|
|
6
|
-
import { getLatestActivityTimestamp } from "../../utils/branchFormatter.js";
|
|
6
|
+
import { formatLocalDateTime, getLatestActivityTimestamp, } from "../../utils/branchFormatter.js";
|
|
7
7
|
import stringWidth from "string-width";
|
|
8
8
|
import { getAgentTerminalColor } from "../../../../utils/coding-agent-colors.js";
|
|
9
9
|
import { Header } from "../../components/solid/Header.js";
|
|
10
|
+
import { selectionStyle } from "../../core/theme.js";
|
|
10
11
|
const VIEW_MODES = ["all", "local", "remote"];
|
|
11
12
|
const getCharWidth = (char) => stringWidth(char);
|
|
12
13
|
const measureDisplayWidth = (value) => stringWidth(value);
|
|
@@ -106,8 +107,8 @@ const fitSegmentsToWidth = (segments, width) => {
|
|
|
106
107
|
};
|
|
107
108
|
const applySelectionStyle = (segments) => segments.map((segment) => ({
|
|
108
109
|
text: segment.text,
|
|
109
|
-
fg:
|
|
110
|
-
bg:
|
|
110
|
+
fg: selectionStyle.fg,
|
|
111
|
+
bg: selectionStyle.bg,
|
|
111
112
|
}));
|
|
112
113
|
const CLEANUP_SPINNER_FRAMES = ["-", "\\", "|", "/"];
|
|
113
114
|
const CURSOR_FRAMES = ["|", " "];
|
|
@@ -185,7 +186,14 @@ export function BranchListScreen(props) {
|
|
|
185
186
|
const [filterQuery, setFilterQuery] = createSignal("");
|
|
186
187
|
const [filterMode, setFilterMode] = createSignal(false);
|
|
187
188
|
const [viewMode, setViewMode] = createSignal("all");
|
|
188
|
-
|
|
189
|
+
// カーソル位置: 外部制御(props.cursorPosition)が優先、なければ内部状態を使用
|
|
190
|
+
const [internalSelectedIndex, setInternalSelectedIndex] = createSignal(props.cursorPosition ?? 0);
|
|
191
|
+
const selectedIndex = () => props.cursorPosition ?? internalSelectedIndex();
|
|
192
|
+
const setSelectedIndex = (value) => {
|
|
193
|
+
const newValue = typeof value === "function" ? value(selectedIndex()) : value;
|
|
194
|
+
setInternalSelectedIndex(newValue);
|
|
195
|
+
props.onCursorPositionChange?.(newValue);
|
|
196
|
+
};
|
|
189
197
|
const [scrollOffset, setScrollOffset] = createSignal(0);
|
|
190
198
|
const [cleanupSpinnerIndex, setCleanupSpinnerIndex] = createSignal(0);
|
|
191
199
|
const [cursorIndex, setCursorIndex] = createSignal(0);
|
|
@@ -219,9 +227,14 @@ export function BranchListScreen(props) {
|
|
|
219
227
|
return Object.values(props.cleanupUI.indicators).some((indicator) => indicator.isSpinning);
|
|
220
228
|
});
|
|
221
229
|
const hasSpinningFooter = createMemo(() => props.cleanupUI?.footerMessage?.isSpinning ?? false);
|
|
222
|
-
const
|
|
223
|
-
|
|
224
|
-
|
|
230
|
+
const safetyPendingActive = createMemo(() => {
|
|
231
|
+
const pending = props.cleanupUI?.safetyPendingBranches;
|
|
232
|
+
if (pending) {
|
|
233
|
+
return pending.size > 0;
|
|
234
|
+
}
|
|
235
|
+
return props.cleanupUI?.safetyLoading === true;
|
|
236
|
+
});
|
|
237
|
+
const cleanupSpinnerActive = createMemo(() => hasSpinningIndicator() || hasSpinningFooter() || safetyPendingActive());
|
|
225
238
|
createEffect(() => {
|
|
226
239
|
let intervalTimer;
|
|
227
240
|
if (cleanupSpinnerActive()) {
|
|
@@ -280,12 +293,12 @@ export function BranchListScreen(props) {
|
|
|
280
293
|
}
|
|
281
294
|
return maxWidth;
|
|
282
295
|
});
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
296
|
+
// FR-037 / FR-037a: filterQueryまたはviewModeが実際に変更されたときのみカーソルをリセット
|
|
297
|
+
// defer: true により初回実行をスキップし、安全状態更新時のリセットを防止
|
|
298
|
+
createEffect(on(() => [filterQuery(), viewMode()], () => {
|
|
286
299
|
setSelectedIndex(0);
|
|
287
300
|
setScrollOffset(0);
|
|
288
|
-
});
|
|
301
|
+
}, { defer: true }));
|
|
289
302
|
createEffect(() => {
|
|
290
303
|
const total = filteredBranches().length;
|
|
291
304
|
if (total === 0) {
|
|
@@ -337,19 +350,17 @@ export function BranchListScreen(props) {
|
|
|
337
350
|
if (!timestamp || Number.isNaN(timestamp)) {
|
|
338
351
|
return "---";
|
|
339
352
|
}
|
|
340
|
-
const
|
|
341
|
-
|
|
342
|
-
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
343
|
-
const day = String(date.getDate()).padStart(2, "0");
|
|
344
|
-
const hours = String(date.getHours()).padStart(2, "0");
|
|
345
|
-
const minutes = String(date.getMinutes()).padStart(2, "0");
|
|
346
|
-
return `${year}-${month}-${day} ${hours}:${minutes}`;
|
|
353
|
+
const formatted = formatLocalDateTime(timestamp * 1000);
|
|
354
|
+
return formatted || "---";
|
|
347
355
|
};
|
|
348
356
|
useKeyboard((key) => {
|
|
349
357
|
// FR-044: ウィザードポップアップ表示中は入力を無効化
|
|
350
358
|
if (props.wizardVisible) {
|
|
351
359
|
return;
|
|
352
360
|
}
|
|
361
|
+
if (props.confirmVisible) {
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
353
364
|
if (props.helpVisible) {
|
|
354
365
|
return;
|
|
355
366
|
}
|
|
@@ -465,7 +476,8 @@ export function BranchListScreen(props) {
|
|
|
465
476
|
props.onOpenProfiles?.();
|
|
466
477
|
}
|
|
467
478
|
else if (key.name === "l" || key.sequence === "l") {
|
|
468
|
-
|
|
479
|
+
const selected = filteredBranches()[selectedIndex()] ?? null;
|
|
480
|
+
props.onOpenLogs?.(selected);
|
|
469
481
|
}
|
|
470
482
|
});
|
|
471
483
|
const visibleBranches = createMemo(() => {
|
|
@@ -495,7 +507,7 @@ export function BranchListScreen(props) {
|
|
|
495
507
|
let worktreeColor = "gray";
|
|
496
508
|
if (branch.worktreeStatus === "active") {
|
|
497
509
|
worktreeIcon = "w";
|
|
498
|
-
worktreeColor = "
|
|
510
|
+
worktreeColor = "brightGreen";
|
|
499
511
|
}
|
|
500
512
|
else if (branch.worktreeStatus === "inaccessible") {
|
|
501
513
|
worktreeIcon = "x";
|
|
@@ -503,6 +515,10 @@ export function BranchListScreen(props) {
|
|
|
503
515
|
}
|
|
504
516
|
const isRemoteBranch = branch.type === "remote";
|
|
505
517
|
const safetyLoading = props.cleanupUI?.safetyLoading === true;
|
|
518
|
+
const safetyPendingBranches = props.cleanupUI?.safetyPendingBranches;
|
|
519
|
+
const isSafetyPending = safetyPendingBranches
|
|
520
|
+
? safetyPendingBranches.has(branch.name)
|
|
521
|
+
: safetyLoading;
|
|
506
522
|
const spinnerFrame = cleanupSpinnerFrame();
|
|
507
523
|
let safeIcon = " ";
|
|
508
524
|
let safeColor;
|
|
@@ -510,6 +526,10 @@ export function BranchListScreen(props) {
|
|
|
510
526
|
safeIcon = " ";
|
|
511
527
|
safeColor = undefined;
|
|
512
528
|
}
|
|
529
|
+
else if (isSafetyPending) {
|
|
530
|
+
safeIcon = spinnerFrame ?? "-";
|
|
531
|
+
safeColor = undefined;
|
|
532
|
+
}
|
|
513
533
|
else if (hasUncommitted) {
|
|
514
534
|
safeIcon = "!";
|
|
515
535
|
safeColor = "red";
|
|
@@ -522,13 +542,9 @@ export function BranchListScreen(props) {
|
|
|
522
542
|
safeIcon = "*";
|
|
523
543
|
safeColor = "yellow";
|
|
524
544
|
}
|
|
525
|
-
else if (safetyLoading) {
|
|
526
|
-
safeIcon = spinnerFrame ?? "-";
|
|
527
|
-
safeColor = undefined;
|
|
528
|
-
}
|
|
529
545
|
else if (branch.safeToCleanup === true) {
|
|
530
|
-
safeIcon = "
|
|
531
|
-
safeColor =
|
|
546
|
+
safeIcon = "o";
|
|
547
|
+
safeColor = "brightGreen";
|
|
532
548
|
}
|
|
533
549
|
else {
|
|
534
550
|
safeIcon = "!";
|
|
@@ -693,6 +709,63 @@ export function BranchListScreen(props) {
|
|
|
693
709
|
}
|
|
694
710
|
return fitSegmentsToWidth(segments, layoutWidth());
|
|
695
711
|
});
|
|
712
|
+
const statusLegendSegments = createMemo(() => {
|
|
713
|
+
const segments = [];
|
|
714
|
+
const separator = " ";
|
|
715
|
+
appendSegment(segments, {
|
|
716
|
+
text: "Legend: ",
|
|
717
|
+
attributes: TextAttributes.DIM,
|
|
718
|
+
});
|
|
719
|
+
appendSegment(segments, {
|
|
720
|
+
text: "o",
|
|
721
|
+
fg: "brightGreen",
|
|
722
|
+
attributes: TextAttributes.BOLD,
|
|
723
|
+
});
|
|
724
|
+
appendSegment(segments, {
|
|
725
|
+
text: " Safe",
|
|
726
|
+
fg: "brightGreen",
|
|
727
|
+
});
|
|
728
|
+
appendSegment(segments, {
|
|
729
|
+
text: separator,
|
|
730
|
+
attributes: TextAttributes.DIM,
|
|
731
|
+
});
|
|
732
|
+
appendSegment(segments, {
|
|
733
|
+
text: "!",
|
|
734
|
+
fg: "red",
|
|
735
|
+
attributes: TextAttributes.BOLD,
|
|
736
|
+
});
|
|
737
|
+
appendSegment(segments, {
|
|
738
|
+
text: " Uncommitted",
|
|
739
|
+
fg: "red",
|
|
740
|
+
});
|
|
741
|
+
appendSegment(segments, {
|
|
742
|
+
text: separator,
|
|
743
|
+
attributes: TextAttributes.DIM,
|
|
744
|
+
});
|
|
745
|
+
appendSegment(segments, {
|
|
746
|
+
text: "!",
|
|
747
|
+
fg: "yellow",
|
|
748
|
+
attributes: TextAttributes.BOLD,
|
|
749
|
+
});
|
|
750
|
+
appendSegment(segments, {
|
|
751
|
+
text: " Unpushed",
|
|
752
|
+
fg: "yellow",
|
|
753
|
+
});
|
|
754
|
+
appendSegment(segments, {
|
|
755
|
+
text: separator,
|
|
756
|
+
attributes: TextAttributes.DIM,
|
|
757
|
+
});
|
|
758
|
+
appendSegment(segments, {
|
|
759
|
+
text: "*",
|
|
760
|
+
fg: "yellow",
|
|
761
|
+
attributes: TextAttributes.BOLD,
|
|
762
|
+
});
|
|
763
|
+
appendSegment(segments, {
|
|
764
|
+
text: " Unmerged",
|
|
765
|
+
fg: "yellow",
|
|
766
|
+
});
|
|
767
|
+
return fitSegmentsToWidth(segments, layoutWidth());
|
|
768
|
+
});
|
|
696
769
|
const footerSegments = createMemo(() => {
|
|
697
770
|
const segments = [];
|
|
698
771
|
const separator = " ";
|
|
@@ -738,7 +811,7 @@ export function BranchListScreen(props) {
|
|
|
738
811
|
? { activeProfile: props.activeProfile }
|
|
739
812
|
: {}) }), renderSegmentLine(filterLineSegments()), renderSegmentLine(statsSegments()), _jsxs("box", { flexDirection: "column", flexGrow: 1, children: [Boolean(props.loading) && props.branches.length === 0 ? (_jsx(LoadingIndicator, { isLoading: true, message: "Loading Git information...", width: layoutWidth(), ...(props.loadingIndicatorDelay !== undefined
|
|
740
813
|
? { delay: props.loadingIndicatorDelay }
|
|
741
|
-
: {}) })) : (
|
|
814
|
+
: {}) })) : (renderSegmentLine(statusLegendSegments())), props.error && (_jsxs(_Fragment, { children: [_jsx("text", { fg: "red", attributes: TextAttributes.BOLD, children: padLine(`Error: ${props.error.message}`, layoutWidth()) }), process.env.DEBUG && props.error.stack && (_jsxs(_Fragment, { children: [_jsx("text", { attributes: TextAttributes.DIM, children: padLine("", layoutWidth()) }), props.error.stack.split("\n").map((line) => (_jsx("text", { fg: "gray", attributes: TextAttributes.DIM, children: padLine(line, layoutWidth()) })))] }))] })), !props.loading && !props.error && props.branches.length === 0 && (_jsx("text", { attributes: TextAttributes.DIM, children: padLine("No branches found", layoutWidth()) })), !props.loading &&
|
|
742
815
|
!props.error &&
|
|
743
816
|
props.branches.length > 0 &&
|
|
744
817
|
filteredBranches().length === 0 &&
|