@akiojin/gwt 4.10.0 → 4.11.6
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/README.ja.md +4 -4
- package/README.md +4 -4
- package/dist/claude.d.ts +1 -0
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +52 -49
- package/dist/claude.js.map +1 -1
- package/dist/cli/ui/App.solid.d.ts +29 -0
- package/dist/cli/ui/App.solid.d.ts.map +1 -0
- package/dist/cli/ui/App.solid.js +1197 -0
- package/dist/cli/ui/App.solid.js.map +1 -0
- package/dist/cli/ui/components/solid/Footer.d.ts +10 -0
- package/dist/cli/ui/components/solid/Footer.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/Footer.js +10 -0
- package/dist/cli/ui/components/solid/Footer.js.map +1 -0
- package/dist/cli/ui/components/{parts → solid}/Header.d.ts +1 -6
- package/dist/cli/ui/components/solid/Header.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/Header.js +13 -0
- package/dist/cli/ui/components/solid/Header.js.map +1 -0
- package/dist/cli/ui/components/solid/HelpOverlay.d.ts +8 -0
- package/dist/cli/ui/components/solid/HelpOverlay.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/HelpOverlay.js +118 -0
- package/dist/cli/ui/components/solid/HelpOverlay.js.map +1 -0
- package/dist/cli/ui/components/solid/QuickStartStep.d.ts +17 -0
- package/dist/cli/ui/components/solid/QuickStartStep.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/QuickStartStep.js +139 -0
- package/dist/cli/ui/components/solid/QuickStartStep.js.map +1 -0
- package/dist/cli/ui/components/solid/SelectInput.d.ts +22 -0
- package/dist/cli/ui/components/solid/SelectInput.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/SelectInput.js +44 -0
- package/dist/cli/ui/components/solid/SelectInput.js.map +1 -0
- package/dist/cli/ui/components/solid/TextInput.d.ts +12 -0
- package/dist/cli/ui/components/solid/TextInput.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/TextInput.js +9 -0
- package/dist/cli/ui/components/solid/TextInput.js.map +1 -0
- package/dist/cli/ui/components/solid/WizardController.d.ts +34 -0
- package/dist/cli/ui/components/solid/WizardController.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/WizardController.js +215 -0
- package/dist/cli/ui/components/solid/WizardController.js.map +1 -0
- package/dist/cli/ui/components/solid/WizardPopup.d.ts +26 -0
- package/dist/cli/ui/components/solid/WizardPopup.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/WizardPopup.js +68 -0
- package/dist/cli/ui/components/solid/WizardPopup.js.map +1 -0
- package/dist/cli/ui/components/solid/WizardSteps.d.ts +52 -0
- package/dist/cli/ui/components/solid/WizardSteps.d.ts.map +1 -0
- package/dist/cli/ui/components/solid/WizardSteps.js +462 -0
- package/dist/cli/ui/components/solid/WizardSteps.js.map +1 -0
- package/dist/cli/ui/core/index.d.ts +12 -0
- package/dist/cli/ui/core/index.d.ts.map +1 -0
- package/dist/cli/ui/core/index.js +15 -0
- package/dist/cli/ui/core/index.js.map +1 -0
- package/dist/cli/ui/core/keybindings.d.ts +106 -0
- package/dist/cli/ui/core/keybindings.d.ts.map +1 -0
- package/dist/cli/ui/core/keybindings.js +270 -0
- package/dist/cli/ui/core/keybindings.js.map +1 -0
- package/dist/cli/ui/core/theme.d.ts +114 -0
- package/dist/cli/ui/core/theme.d.ts.map +1 -0
- package/dist/cli/ui/core/theme.js +170 -0
- package/dist/cli/ui/core/theme.js.map +1 -0
- package/dist/cli/ui/core/types.d.ts +156 -0
- package/dist/cli/ui/core/types.d.ts.map +1 -0
- package/dist/cli/ui/core/types.js +10 -0
- package/dist/cli/ui/core/types.js.map +1 -0
- package/dist/cli/ui/hooks/solid/useScrollableList.d.ts +26 -0
- package/dist/cli/ui/hooks/solid/useScrollableList.d.ts.map +1 -0
- package/dist/cli/ui/hooks/solid/useScrollableList.js +89 -0
- package/dist/cli/ui/hooks/solid/useScrollableList.js.map +1 -0
- package/dist/cli/ui/hooks/solid/useTerminalSize.d.ts +10 -0
- package/dist/cli/ui/hooks/solid/useTerminalSize.d.ts.map +1 -0
- package/dist/cli/ui/hooks/solid/useTerminalSize.js +16 -0
- package/dist/cli/ui/hooks/solid/useTerminalSize.js.map +1 -0
- package/dist/cli/ui/index.solid.d.ts +5 -0
- package/dist/cli/ui/index.solid.d.ts.map +1 -0
- package/dist/cli/ui/index.solid.js +21 -0
- package/dist/cli/ui/index.solid.js.map +1 -0
- package/dist/cli/ui/{components/screens → screens/solid}/BranchListScreen.d.ts +8 -22
- package/dist/cli/ui/screens/solid/BranchListScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/BranchListScreen.js +756 -0
- package/dist/cli/ui/screens/solid/BranchListScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/ConfirmScreen.d.ts +10 -0
- package/dist/cli/ui/screens/solid/ConfirmScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/ConfirmScreen.js +37 -0
- package/dist/cli/ui/screens/solid/ConfirmScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/EnvironmentScreen.d.ts +14 -0
- package/dist/cli/ui/screens/solid/EnvironmentScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/EnvironmentScreen.js +91 -0
- package/dist/cli/ui/screens/solid/EnvironmentScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/ErrorScreen.d.ts +8 -0
- package/dist/cli/ui/screens/solid/ErrorScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/ErrorScreen.js +18 -0
- package/dist/cli/ui/screens/solid/ErrorScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/InputScreen.d.ts +13 -0
- package/dist/cli/ui/screens/solid/InputScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/InputScreen.js +17 -0
- package/dist/cli/ui/screens/solid/InputScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/LoadingIndicator.d.ts +9 -0
- package/dist/cli/ui/screens/solid/LoadingIndicator.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/LoadingIndicator.js +43 -0
- package/dist/cli/ui/screens/solid/LoadingIndicator.js.map +1 -0
- package/dist/cli/ui/{components/screens → screens/solid}/LogDetailScreen.d.ts +2 -2
- package/dist/cli/ui/screens/solid/LogDetailScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/LogDetailScreen.js +34 -0
- package/dist/cli/ui/screens/solid/LogDetailScreen.js.map +1 -0
- package/dist/cli/ui/{components/screens/LogListScreen.d.ts → screens/solid/LogScreen.d.ts} +4 -4
- package/dist/cli/ui/screens/solid/LogScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/LogScreen.js +95 -0
- package/dist/cli/ui/screens/solid/LogScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.d.ts +17 -0
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.js +112 -0
- package/dist/cli/ui/screens/solid/ProfileEnvScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/ProfileScreen.d.ts +17 -0
- package/dist/cli/ui/screens/solid/ProfileScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/ProfileScreen.js +50 -0
- package/dist/cli/ui/screens/solid/ProfileScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/SelectorScreen.d.ts +20 -0
- package/dist/cli/ui/screens/solid/SelectorScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/SelectorScreen.js +90 -0
- package/dist/cli/ui/screens/solid/SelectorScreen.js.map +1 -0
- package/dist/cli/ui/screens/solid/WorktreeCreateScreen.d.ts +13 -0
- package/dist/cli/ui/screens/solid/WorktreeCreateScreen.d.ts.map +1 -0
- package/dist/cli/ui/screens/solid/WorktreeCreateScreen.js +59 -0
- package/dist/cli/ui/screens/solid/WorktreeCreateScreen.js.map +1 -0
- package/dist/cli/ui/stores/appStore.d.ts +143 -0
- package/dist/cli/ui/stores/appStore.d.ts.map +1 -0
- package/dist/cli/ui/stores/appStore.js +158 -0
- package/dist/cli/ui/stores/appStore.js.map +1 -0
- package/dist/cli/ui/stores/branchStore.d.ts +159 -0
- package/dist/cli/ui/stores/branchStore.d.ts.map +1 -0
- package/dist/cli/ui/stores/branchStore.js +275 -0
- package/dist/cli/ui/stores/branchStore.js.map +1 -0
- package/dist/cli/ui/stores/index.d.ts +11 -0
- package/dist/cli/ui/stores/index.d.ts.map +1 -0
- package/dist/cli/ui/stores/index.js +14 -0
- package/dist/cli/ui/stores/index.js.map +1 -0
- package/dist/cli/ui/stores/uiStore.d.ts +146 -0
- package/dist/cli/ui/stores/uiStore.d.ts.map +1 -0
- package/dist/cli/ui/stores/uiStore.js +166 -0
- package/dist/cli/ui/stores/uiStore.js.map +1 -0
- package/dist/cli/ui/types.d.ts +16 -1
- package/dist/cli/ui/types.d.ts.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.d.ts.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.js +7 -210
- package/dist/cli/ui/utils/branchFormatter.js.map +1 -1
- package/dist/cli/ui/utils/continueSession.d.ts +4 -0
- package/dist/cli/ui/utils/continueSession.d.ts.map +1 -1
- package/dist/cli/ui/utils/continueSession.js +30 -0
- package/dist/cli/ui/utils/continueSession.js.map +1 -1
- package/dist/client/assets/{index-ChHC-Puh.css → index-BbfV7Wuj.css} +1 -1
- package/dist/client/assets/index-CoAyq5x1.js +78 -0
- package/dist/client/index.html +2 -2
- package/dist/codex.d.ts +1 -0
- package/dist/codex.d.ts.map +1 -1
- package/dist/codex.js +86 -45
- package/dist/codex.js.map +1 -1
- package/dist/config/builtin-coding-agents.js +4 -4
- package/dist/config/builtin-coding-agents.js.map +1 -1
- package/dist/config/index.d.ts +2 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +2 -0
- 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 +42 -37
- package/dist/gemini.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +122 -102
- package/dist/index.js.map +1 -1
- package/dist/launcher.d.ts.map +1 -1
- package/dist/launcher.js +18 -3
- package/dist/launcher.js.map +1 -1
- package/dist/logging/logger.d.ts.map +1 -1
- package/dist/logging/logger.js +26 -9
- package/dist/logging/logger.js.map +1 -1
- package/dist/opentui/highlights-eq9cgrbb.scm +604 -0
- package/dist/opentui/highlights-ghv9g403.scm +205 -0
- package/dist/opentui/highlights-hk7bwhj4.scm +284 -0
- package/dist/opentui/highlights-r812a2qc.scm +150 -0
- package/dist/opentui/highlights-x6tmsnaa.scm +115 -0
- package/dist/opentui/index.solid.d.ts +2 -0
- package/dist/opentui/index.solid.d.ts.map +1 -0
- package/dist/opentui/index.solid.js +52034 -0
- package/dist/opentui/index.solid.js.map +1 -0
- package/dist/opentui/injections-73j83es3.scm +27 -0
- package/dist/opentui/tree-sitter-javascript-nd0q4pe9.wasm +0 -0
- package/dist/opentui/tree-sitter-markdown-411r6y9b.wasm +0 -0
- package/dist/opentui/tree-sitter-markdown_inline-j5349f42.wasm +0 -0
- package/dist/opentui/tree-sitter-typescript-zxjzwt75.wasm +0 -0
- package/dist/opentui/tree-sitter-zig-e78zbjpm.wasm +0 -0
- package/dist/repositories/worktree.repository.d.ts +1 -0
- package/dist/repositories/worktree.repository.d.ts.map +1 -1
- package/dist/repositories/worktree.repository.js +7 -0
- package/dist/repositories/worktree.repository.js.map +1 -1
- package/dist/services/codingAgentResolver.d.ts +2 -0
- package/dist/services/codingAgentResolver.d.ts.map +1 -1
- package/dist/services/codingAgentResolver.js +30 -4
- package/dist/services/codingAgentResolver.js.map +1 -1
- package/dist/services/dependency-installer.d.ts.map +1 -1
- package/dist/services/dependency-installer.js +0 -5
- package/dist/services/dependency-installer.js.map +1 -1
- package/dist/types/api.d.ts +3 -0
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/coding-agent.d.ts +62 -0
- package/dist/types/coding-agent.d.ts.map +1 -0
- package/dist/types/coding-agent.js +29 -0
- package/dist/types/coding-agent.js.map +1 -0
- package/dist/types/tools.d.ts +17 -0
- package/dist/types/tools.d.ts.map +1 -1
- package/dist/utils/coding-agent-colors.d.ts +88 -0
- package/dist/utils/coding-agent-colors.d.ts.map +1 -0
- package/dist/utils/coding-agent-colors.js +137 -0
- package/dist/utils/coding-agent-colors.js.map +1 -0
- package/dist/utils/command.d.ts +1 -1
- package/dist/utils/command.js +1 -1
- package/dist/utils/error-utils.d.ts +27 -0
- package/dist/utils/error-utils.d.ts.map +1 -0
- package/dist/utils/error-utils.js +98 -0
- package/dist/utils/error-utils.js.map +1 -0
- package/dist/utils/npmRegistry.d.ts +61 -0
- package/dist/utils/npmRegistry.d.ts.map +1 -0
- package/dist/utils/npmRegistry.js +180 -0
- package/dist/utils/npmRegistry.js.map +1 -0
- package/dist/utils/prompt.d.ts +1 -1
- package/dist/utils/prompt.js +1 -1
- package/dist/utils/session/parsers/codex.d.ts.map +1 -1
- package/dist/utils/session/parsers/codex.js +8 -1
- package/dist/utils/session/parsers/codex.js.map +1 -1
- package/dist/utils/terminal.d.ts +1 -0
- package/dist/utils/terminal.d.ts.map +1 -1
- package/dist/utils/terminal.js +20 -0
- package/dist/utils/terminal.js.map +1 -1
- package/dist/utils.d.ts +9 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +33 -2
- package/dist/utils.js.map +1 -1
- package/dist/web/client/src/components/CodingAgentLaunchModal.d.ts.map +1 -1
- package/dist/web/client/src/components/CodingAgentLaunchModal.js +7 -16
- package/dist/web/client/src/components/CodingAgentLaunchModal.js.map +1 -1
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.d.ts.map +1 -1
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.js +7 -2
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.js.map +1 -1
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.d.ts.map +1 -1
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js +2 -1
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js.map +1 -1
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts +2 -2
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts.map +1 -1
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js +5 -5
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js.map +1 -1
- package/dist/web/client/src/lib/coding-agent-colors.d.ts +86 -0
- package/dist/web/client/src/lib/coding-agent-colors.d.ts.map +1 -0
- package/dist/web/client/src/lib/coding-agent-colors.js +135 -0
- package/dist/web/client/src/lib/coding-agent-colors.js.map +1 -0
- package/dist/web/client/src/pages/BranchDetailPage.js +10 -10
- package/dist/web/client/src/pages/BranchDetailPage.js.map +1 -1
- package/dist/web/server/pty/manager.d.ts +2 -0
- package/dist/web/server/pty/manager.d.ts.map +1 -1
- package/dist/web/server/pty/manager.js +104 -0
- package/dist/web/server/pty/manager.js.map +1 -1
- package/dist/web/server/routes/sessions.d.ts.map +1 -1
- package/dist/web/server/routes/sessions.js +5 -1
- package/dist/web/server/routes/sessions.js.map +1 -1
- package/dist/web/server/services/branches.d.ts.map +1 -1
- package/dist/web/server/services/branches.js +10 -8
- package/dist/web/server/services/branches.js.map +1 -1
- package/dist/web/server/services/worktrees.js +2 -2
- package/dist/web/server/services/worktrees.js.map +1 -1
- package/dist/worktree.d.ts +47 -1
- package/dist/worktree.d.ts.map +1 -1
- package/dist/worktree.js +280 -94
- package/dist/worktree.js.map +1 -1
- package/package.json +12 -14
- package/src/claude.ts +68 -70
- package/src/cli/ui/App.solid.tsx +1823 -0
- package/src/cli/ui/__tests__/solid/AppSolid.cleanup.test.tsx +255 -0
- package/src/cli/ui/__tests__/solid/BranchListScreen.test.tsx +243 -0
- package/src/cli/ui/__tests__/solid/components/QuickStartStep.test.tsx +237 -0
- package/src/cli/ui/__tests__/solid/components/WizardPopup.test.tsx +231 -0
- package/src/cli/ui/__tests__/solid/components/WizardSteps.test.tsx +238 -0
- package/src/cli/ui/__tests__/utils/branchFormatter.test.ts +7 -289
- package/src/cli/ui/__tests__/utils/clipboard.test.ts +3 -3
- package/src/cli/ui/__tests__/utils/statisticsCalculator.test.ts +1 -1
- package/src/cli/ui/components/solid/Footer.tsx +36 -0
- package/src/cli/ui/components/{parts → solid}/Header.tsx +17 -28
- package/src/cli/ui/components/solid/HelpOverlay.tsx +194 -0
- package/src/cli/ui/components/solid/QuickStartStep.tsx +197 -0
- package/src/cli/ui/components/{parts → solid}/ScrollableList.tsx +7 -8
- package/src/cli/ui/components/solid/SearchInput.tsx +42 -0
- package/src/cli/ui/components/solid/SelectInput.tsx +84 -0
- package/src/cli/ui/components/solid/Stats.tsx +92 -0
- package/src/cli/ui/components/solid/TextInput.tsx +49 -0
- package/src/cli/ui/components/solid/WizardController.tsx +384 -0
- package/src/cli/ui/components/solid/WizardPopup.tsx +135 -0
- package/src/cli/ui/components/solid/WizardSteps.tsx +793 -0
- package/src/cli/ui/core/index.ts +17 -0
- package/src/cli/ui/core/keybindings.ts +367 -0
- package/src/cli/ui/core/theme.ts +234 -0
- package/src/cli/ui/core/types.ts +235 -0
- package/src/cli/ui/hooks/solid/useAsyncOperation.ts +76 -0
- package/src/cli/ui/hooks/solid/useFilter.ts +86 -0
- package/src/cli/ui/hooks/solid/useGitOperations.ts +80 -0
- package/src/cli/ui/hooks/solid/useKeyHandler.ts +103 -0
- package/src/cli/ui/hooks/solid/useScrollableList.ts +149 -0
- package/src/cli/ui/hooks/solid/useSelection.ts +77 -0
- package/src/cli/ui/hooks/solid/useTerminalSize.ts +22 -0
- package/src/cli/ui/index.solid.ts +28 -0
- package/src/cli/ui/screens/solid/BranchListScreen.tsx +1050 -0
- package/src/cli/ui/screens/solid/ConfirmScreen.tsx +74 -0
- package/src/cli/ui/screens/solid/EnvironmentScreen.tsx +159 -0
- package/src/cli/ui/screens/solid/ErrorScreen.tsx +42 -0
- package/src/cli/ui/screens/solid/InputScreen.tsx +55 -0
- package/src/cli/ui/screens/solid/LoadingIndicator.tsx +77 -0
- package/src/cli/ui/screens/solid/LogDetailScreen.tsx +75 -0
- package/src/cli/ui/screens/solid/LogScreen.tsx +175 -0
- package/src/cli/ui/screens/solid/ProfileEnvScreen.tsx +192 -0
- package/src/cli/ui/screens/solid/ProfileScreen.tsx +98 -0
- package/src/cli/ui/screens/solid/SelectorScreen.tsx +170 -0
- package/src/cli/ui/screens/solid/SettingsScreen.tsx +50 -0
- package/src/cli/ui/screens/solid/WorktreeCreateScreen.tsx +136 -0
- package/src/cli/ui/screens/solid/WorktreeDeleteScreen.tsx +40 -0
- package/src/cli/ui/stores/appStore.ts +208 -0
- package/src/cli/ui/stores/branchStore.ts +357 -0
- package/src/cli/ui/stores/index.ts +31 -0
- package/src/cli/ui/stores/uiStore.ts +226 -0
- package/src/cli/ui/types.ts +20 -3
- package/src/cli/ui/utils/__tests__/branchFormatter.test.ts +180 -0
- package/src/cli/ui/utils/branchFormatter.ts +8 -215
- package/src/cli/ui/utils/continueSession.ts +44 -0
- package/src/cli/ui/utils/modelOptions.test.ts +1 -1
- package/src/codex.ts +100 -43
- package/src/config/__tests__/saveSession.test.ts +143 -0
- package/src/config/builtin-coding-agents.ts +4 -4
- package/src/config/index.ts +4 -0
- package/src/gemini.ts +58 -43
- package/src/index.test.ts +12 -12
- package/src/index.ts +164 -142
- package/src/launcher.ts +22 -3
- package/src/logging/logger.ts +32 -10
- package/src/opentui/index.solid.ts +1 -0
- package/src/repositories/worktree.repository.ts +8 -0
- package/src/services/__tests__/BatchMergeService.test.ts +62 -66
- package/src/services/__tests__/WorktreeOrchestrator.test.ts +8 -7
- package/src/services/codingAgentResolver.ts +30 -4
- package/src/services/dependency-installer.ts +0 -7
- package/src/types/api.ts +3 -0
- package/src/types/coding-agent.ts +85 -0
- package/src/types/tools.ts +19 -0
- package/src/utils/__tests__/npmRegistry.test.ts +250 -0
- package/src/utils/__tests__/prompt.test.ts +4 -5
- package/src/utils/coding-agent-colors.ts +165 -0
- package/src/utils/command.ts +1 -1
- package/src/utils/error-utils.ts +133 -0
- package/src/utils/npmRegistry.ts +249 -0
- package/src/utils/prompt.ts +1 -1
- package/src/utils/session/parsers/codex.ts +9 -1
- package/src/utils/terminal.ts +24 -0
- package/src/utils.test.ts +1 -1
- package/src/utils.ts +37 -4
- package/src/web/client/src/components/CodingAgentLaunchModal.tsx +12 -21
- package/src/web/client/src/components/branch-detail/BranchInfoCards.tsx +16 -1
- package/src/web/client/src/components/branch-detail/SessionHistoryTable.tsx +7 -1
- package/src/web/client/src/components/branch-detail/ToolLauncher.tsx +11 -6
- package/src/web/client/src/lib/coding-agent-colors.ts +149 -0
- package/src/web/client/src/pages/BranchDetailPage.tsx +11 -11
- package/src/web/server/pty/manager.ts +139 -0
- package/src/web/server/routes/sessions.ts +6 -0
- package/src/web/server/services/branches.ts +11 -8
- package/src/web/server/services/worktrees.ts +2 -2
- package/src/worktree.ts +366 -107
- package/dist/cli/ui/components/App.d.ts +0 -25
- package/dist/cli/ui/components/App.d.ts.map +0 -1
- package/dist/cli/ui/components/App.js +0 -1006
- package/dist/cli/ui/components/App.js.map +0 -1
- package/dist/cli/ui/components/common/Confirm.d.ts +0 -13
- package/dist/cli/ui/components/common/Confirm.d.ts.map +0 -1
- package/dist/cli/ui/components/common/Confirm.js +0 -20
- package/dist/cli/ui/components/common/Confirm.js.map +0 -1
- package/dist/cli/ui/components/common/ErrorBoundary.d.ts +0 -23
- package/dist/cli/ui/components/common/ErrorBoundary.d.ts.map +0 -1
- package/dist/cli/ui/components/common/ErrorBoundary.js +0 -37
- package/dist/cli/ui/components/common/ErrorBoundary.js.map +0 -1
- package/dist/cli/ui/components/common/Input.d.ts +0 -19
- package/dist/cli/ui/components/common/Input.d.ts.map +0 -1
- package/dist/cli/ui/components/common/Input.js +0 -22
- package/dist/cli/ui/components/common/Input.js.map +0 -1
- package/dist/cli/ui/components/common/LoadingIndicator.d.ts +0 -19
- package/dist/cli/ui/components/common/LoadingIndicator.d.ts.map +0 -1
- package/dist/cli/ui/components/common/LoadingIndicator.js +0 -61
- package/dist/cli/ui/components/common/LoadingIndicator.js.map +0 -1
- package/dist/cli/ui/components/common/Select.d.ts +0 -38
- package/dist/cli/ui/components/common/Select.d.ts.map +0 -1
- package/dist/cli/ui/components/common/Select.js +0 -151
- package/dist/cli/ui/components/common/Select.js.map +0 -1
- package/dist/cli/ui/components/common/SpinnerIcon.d.ts +0 -20
- package/dist/cli/ui/components/common/SpinnerIcon.d.ts.map +0 -1
- package/dist/cli/ui/components/common/SpinnerIcon.js +0 -61
- package/dist/cli/ui/components/common/SpinnerIcon.js.map +0 -1
- package/dist/cli/ui/components/parts/Footer.d.ts +0 -15
- package/dist/cli/ui/components/parts/Footer.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/Footer.js +0 -20
- package/dist/cli/ui/components/parts/Footer.js.map +0 -1
- package/dist/cli/ui/components/parts/Header.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/Header.js +0 -24
- package/dist/cli/ui/components/parts/Header.js.map +0 -1
- package/dist/cli/ui/components/parts/MergeStatusList.d.ts +0 -13
- package/dist/cli/ui/components/parts/MergeStatusList.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/MergeStatusList.js +0 -52
- package/dist/cli/ui/components/parts/MergeStatusList.js.map +0 -1
- package/dist/cli/ui/components/parts/ProgressBar.d.ts +0 -13
- package/dist/cli/ui/components/parts/ProgressBar.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/ProgressBar.js +0 -53
- package/dist/cli/ui/components/parts/ProgressBar.js.map +0 -1
- package/dist/cli/ui/components/parts/ScrollableList.d.ts +0 -12
- package/dist/cli/ui/components/parts/ScrollableList.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/ScrollableList.js +0 -11
- package/dist/cli/ui/components/parts/ScrollableList.js.map +0 -1
- package/dist/cli/ui/components/parts/Stats.d.ts +0 -10
- package/dist/cli/ui/components/parts/Stats.d.ts.map +0 -1
- package/dist/cli/ui/components/parts/Stats.js +0 -55
- package/dist/cli/ui/components/parts/Stats.js.map +0 -1
- package/dist/cli/ui/components/screens/BatchMergeProgressScreen.d.ts +0 -17
- package/dist/cli/ui/components/screens/BatchMergeProgressScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/BatchMergeProgressScreen.js +0 -42
- package/dist/cli/ui/components/screens/BatchMergeProgressScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/BatchMergeResultScreen.d.ts +0 -17
- package/dist/cli/ui/components/screens/BatchMergeResultScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/BatchMergeResultScreen.js +0 -72
- package/dist/cli/ui/components/screens/BatchMergeResultScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/BranchCreatorScreen.d.ts +0 -18
- package/dist/cli/ui/components/screens/BranchCreatorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/BranchCreatorScreen.js +0 -151
- package/dist/cli/ui/components/screens/BranchCreatorScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/BranchListScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js +0 -476
- package/dist/cli/ui/components/screens/BranchListScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts +0 -30
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js +0 -148
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.d.ts +0 -27
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.js +0 -93
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/EnvironmentProfileScreen.d.ts +0 -19
- package/dist/cli/ui/components/screens/EnvironmentProfileScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/EnvironmentProfileScreen.js +0 -577
- package/dist/cli/ui/components/screens/EnvironmentProfileScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.d.ts +0 -45
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js +0 -95
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/LogDatePickerScreen.d.ts +0 -10
- package/dist/cli/ui/components/screens/LogDatePickerScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/LogDatePickerScreen.js +0 -44
- package/dist/cli/ui/components/screens/LogDatePickerScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/LogDetailScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/LogDetailScreen.js +0 -34
- package/dist/cli/ui/components/screens/LogDetailScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/LogListScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/LogListScreen.js +0 -107
- package/dist/cli/ui/components/screens/LogListScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.d.ts +0 -24
- package/dist/cli/ui/components/screens/ModelSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js +0 -197
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/PRCleanupScreen.d.ts +0 -29
- package/dist/cli/ui/components/screens/PRCleanupScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/PRCleanupScreen.js +0 -92
- package/dist/cli/ui/components/screens/PRCleanupScreen.js.map +0 -1
- package/dist/cli/ui/components/screens/SessionSelectorScreen.d.ts +0 -31
- package/dist/cli/ui/components/screens/SessionSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/SessionSelectorScreen.js +0 -67
- package/dist/cli/ui/components/screens/SessionSelectorScreen.js.map +0 -1
- package/dist/cli/ui/hooks/useAppInput.d.ts +0 -21
- package/dist/cli/ui/hooks/useAppInput.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useAppInput.js +0 -138
- package/dist/cli/ui/hooks/useAppInput.js.map +0 -1
- package/dist/cli/ui/hooks/useBatchMerge.d.ts +0 -17
- package/dist/cli/ui/hooks/useBatchMerge.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useBatchMerge.js +0 -77
- package/dist/cli/ui/hooks/useBatchMerge.js.map +0 -1
- package/dist/cli/ui/hooks/useGitData.d.ts +0 -21
- package/dist/cli/ui/hooks/useGitData.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useGitData.js +0 -229
- package/dist/cli/ui/hooks/useGitData.js.map +0 -1
- package/dist/cli/ui/hooks/useProfiles.d.ts +0 -41
- package/dist/cli/ui/hooks/useProfiles.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useProfiles.js +0 -136
- package/dist/cli/ui/hooks/useProfiles.js.map +0 -1
- package/dist/cli/ui/hooks/useScreenState.d.ts +0 -12
- package/dist/cli/ui/hooks/useScreenState.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useScreenState.js +0 -30
- package/dist/cli/ui/hooks/useScreenState.js.map +0 -1
- package/dist/cli/ui/hooks/useTerminalSize.d.ts +0 -9
- package/dist/cli/ui/hooks/useTerminalSize.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useTerminalSize.js +0 -24
- package/dist/cli/ui/hooks/useTerminalSize.js.map +0 -1
- package/dist/cli/ui/hooks/useToolStatus.d.ts +0 -30
- package/dist/cli/ui/hooks/useToolStatus.d.ts.map +0 -1
- package/dist/cli/ui/hooks/useToolStatus.js +0 -49
- package/dist/cli/ui/hooks/useToolStatus.js.map +0 -1
- package/dist/cli/ui/screens/BranchActionSelectorScreen.d.ts +0 -24
- package/dist/cli/ui/screens/BranchActionSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/screens/BranchActionSelectorScreen.js +0 -65
- package/dist/cli/ui/screens/BranchActionSelectorScreen.js.map +0 -1
- package/dist/client/assets/index-LNPtOrn3.js +0 -78
- package/src/cli/ui/__tests__/SKIPPED_TESTS.md +0 -119
- package/src/cli/ui/__tests__/acceptance/branchList.acceptance.test.tsx.skip +0 -239
- package/src/cli/ui/__tests__/acceptance/navigation.acceptance.test.tsx +0 -225
- package/src/cli/ui/__tests__/acceptance/realtimeUpdate.acceptance.test.tsx.skip +0 -219
- package/src/cli/ui/__tests__/components/App.protected-branch.test.tsx +0 -212
- package/src/cli/ui/__tests__/components/App.shortcuts.test.tsx +0 -440
- package/src/cli/ui/__tests__/components/App.test.tsx +0 -365
- package/src/cli/ui/__tests__/components/ModelSelectorScreen.initial.test.tsx +0 -91
- package/src/cli/ui/__tests__/components/common/Confirm.test.tsx +0 -80
- package/src/cli/ui/__tests__/components/common/ErrorBoundary.test.tsx +0 -104
- package/src/cli/ui/__tests__/components/common/Input.test.tsx +0 -100
- package/src/cli/ui/__tests__/components/common/LoadingIndicator.test.tsx +0 -148
- package/src/cli/ui/__tests__/components/common/Select.memo.test.tsx +0 -255
- package/src/cli/ui/__tests__/components/common/Select.test.tsx +0 -335
- package/src/cli/ui/__tests__/components/parts/Footer.test.tsx +0 -65
- package/src/cli/ui/__tests__/components/parts/Header.test.tsx +0 -55
- package/src/cli/ui/__tests__/components/parts/ScrollableList.test.tsx +0 -69
- package/src/cli/ui/__tests__/components/parts/Stats.test.tsx +0 -148
- package/src/cli/ui/__tests__/components/screens/BranchCreatorScreen.test.tsx +0 -253
- package/src/cli/ui/__tests__/components/screens/BranchListScreen.test.tsx +0 -1070
- package/src/cli/ui/__tests__/components/screens/BranchQuickStartScreen.test.tsx +0 -142
- package/src/cli/ui/__tests__/components/screens/CodingAgentSelectorScreen.test.tsx +0 -174
- package/src/cli/ui/__tests__/components/screens/ExecutionModeSelectorScreen.test.tsx +0 -182
- package/src/cli/ui/__tests__/components/screens/LogDetailScreen.test.tsx +0 -57
- package/src/cli/ui/__tests__/components/screens/LogListScreen.test.tsx +0 -102
- package/src/cli/ui/__tests__/components/screens/PRCleanupScreen.test.tsx +0 -216
- package/src/cli/ui/__tests__/components/screens/SessionSelectorScreen.test.tsx +0 -147
- package/src/cli/ui/__tests__/hooks/useGitData.nonblocking.test.tsx +0 -206
- package/src/cli/ui/__tests__/hooks/useGitData.test.ts +0 -197
- package/src/cli/ui/__tests__/hooks/useGitData.test.ts.skip +0 -228
- package/src/cli/ui/__tests__/hooks/useScreenState.test.ts +0 -147
- package/src/cli/ui/__tests__/hooks/useTerminalSize.test.ts +0 -99
- package/src/cli/ui/__tests__/integration/branchList.test.tsx.skip +0 -253
- package/src/cli/ui/__tests__/integration/edgeCases.test.tsx +0 -436
- package/src/cli/ui/__tests__/integration/navigation.test.tsx +0 -514
- package/src/cli/ui/__tests__/integration/realtimeUpdate.test.tsx +0 -509
- package/src/cli/ui/__tests__/integration/realtimeUpdate.test.tsx.skip +0 -216
- package/src/cli/ui/__tests__/performance/branchList.performance.test.tsx +0 -193
- package/src/cli/ui/__tests__/performance/useMemoOptimization.test.tsx +0 -234
- package/src/cli/ui/components/App.tsx +0 -1478
- package/src/cli/ui/components/common/Confirm.tsx +0 -44
- package/src/cli/ui/components/common/ErrorBoundary.tsx +0 -60
- package/src/cli/ui/components/common/Input.tsx +0 -58
- package/src/cli/ui/components/common/LoadingIndicator.tsx +0 -98
- package/src/cli/ui/components/common/Select.tsx +0 -247
- package/src/cli/ui/components/common/SpinnerIcon.tsx +0 -86
- package/src/cli/ui/components/parts/Footer.tsx +0 -41
- package/src/cli/ui/components/parts/Header.test.tsx +0 -75
- package/src/cli/ui/components/parts/MergeStatusList.tsx +0 -75
- package/src/cli/ui/components/parts/ProgressBar.tsx +0 -73
- package/src/cli/ui/components/parts/Stats.tsx +0 -88
- package/src/cli/ui/components/screens/BatchMergeProgressScreen.tsx +0 -74
- package/src/cli/ui/components/screens/BatchMergeResultScreen.tsx +0 -108
- package/src/cli/ui/components/screens/BranchCreatorScreen.tsx +0 -242
- package/src/cli/ui/components/screens/BranchListScreen.tsx +0 -744
- package/src/cli/ui/components/screens/BranchQuickStartScreen.tsx +0 -244
- package/src/cli/ui/components/screens/CodingAgentSelectorScreen.tsx +0 -159
- package/src/cli/ui/components/screens/EnvironmentProfileScreen.tsx +0 -928
- package/src/cli/ui/components/screens/ExecutionModeSelectorScreen.tsx +0 -176
- package/src/cli/ui/components/screens/LogDatePickerScreen.tsx +0 -83
- package/src/cli/ui/components/screens/LogDetailScreen.tsx +0 -67
- package/src/cli/ui/components/screens/LogListScreen.tsx +0 -192
- package/src/cli/ui/components/screens/ModelSelectorScreen.tsx +0 -320
- package/src/cli/ui/components/screens/PRCleanupScreen.tsx +0 -171
- package/src/cli/ui/components/screens/SessionSelectorScreen.tsx +0 -135
- package/src/cli/ui/hooks/useAppInput.ts +0 -172
- package/src/cli/ui/hooks/useBatchMerge.ts +0 -96
- package/src/cli/ui/hooks/useGitData.ts +0 -347
- package/src/cli/ui/hooks/useProfiles.ts +0 -211
- package/src/cli/ui/hooks/useScreenState.ts +0 -44
- package/src/cli/ui/hooks/useTerminalSize.ts +0 -33
- package/src/cli/ui/hooks/useToolStatus.ts +0 -68
- package/src/cli/ui/screens/BranchActionSelectorScreen.tsx +0 -111
- package/src/cli/ui/screens/__tests__/BranchActionSelectorScreen.test.tsx +0 -264
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branches.js","sourceRoot":"","sources":["../../../../src/web/server/services/branches.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,2BAA2B,EAC3B,eAAe,EACf,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM/D,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAEnE,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,QAAQ,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAE7D,yCAAyC;IACzC,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,4EAA4E,EAC5E,KAAK,CACN,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,cAAc,EAAE;QAChB,uBAAuB,EAAE;KAC1B,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,
|
|
1
|
+
{"version":3,"file":"branches.js","sourceRoot":"","sources":["../../../../src/web/server/services/branches.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ export async function listWorktrees() {
|
|
|
14
14
|
path: wt.path,
|
|
15
15
|
branchName: wt.branch,
|
|
16
16
|
head: wt.head,
|
|
17
|
-
isLocked: false,
|
|
18
|
-
isPrunable: false,
|
|
17
|
+
isLocked: wt.isLocked ?? false,
|
|
18
|
+
isPrunable: wt.isPrunable ?? false,
|
|
19
19
|
isProtected: isProtectedBranchName(wt.branch),
|
|
20
20
|
createdAt: null, // git worktreeからは取得不可
|
|
21
21
|
lastAccessedAt: null, // git worktreeからは取得不可
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../../../src/web/server/services/worktrees.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,uBAAuB,EACvB,cAAc,IAAI,kBAAkB,EACpC,cAAc,IAAI,kBAAkB,EACpC,oBAAoB,EACpB,qBAAqB,GAEtB,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,SAAS,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAElD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,UAAU,EAAE,EAAE,CAAC,MAAM;QACrB,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../../../src/web/server/services/worktrees.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,uBAAuB,EACvB,cAAc,IAAI,kBAAkB,EACpC,cAAc,IAAI,kBAAkB,EACpC,oBAAoB,EACpB,qBAAqB,GAEtB,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,SAAS,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAElD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,UAAU,EAAE,EAAE,CAAC,MAAM;QACrB,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,QAAQ,EAAE,EAAE,CAAC,QAAQ,IAAI,KAAK;QAC9B,UAAU,EAAE,EAAE,CAAC,UAAU,IAAI,KAAK;QAClC,WAAW,EAAE,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC;QAC7C,SAAS,EAAE,IAAI,EAAE,sBAAsB;QACvC,cAAc,EAAE,IAAI,EAAE,sBAAsB;QAC5C,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAY;IAEZ,MAAM,SAAS,GAAG,MAAM,aAAa,EAAE,CAAC;IACxC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,YAAqB;IAErB,cAAc;IACd,IAAI,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,gDAAgD,UAAU,kFAAkF,CAC7I,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,GAC3C,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAElC,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,iBAAiB,EAAE;QACnB,gBAAgB,EAAE;KACnB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEtE,MAAM,kBAAkB,CAAC;QACvB,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,WAAW,EAAE,YAAY;QACzB,UAAU,EAAE,aAAa,IAAI,MAAM;KACpC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC"}
|
package/dist/worktree.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WorktreeConfig, CleanupTarget } from "./cli/ui/types.js";
|
|
1
|
+
import { WorktreeConfig, CleanupTarget, CleanupStatus } from "./cli/ui/types.js";
|
|
2
2
|
export type { WorktreeConfig };
|
|
3
3
|
export declare const PROTECTED_BRANCHES: string[];
|
|
4
4
|
export declare function isProtectedBranchName(branchName: string): boolean;
|
|
@@ -15,9 +15,13 @@ export interface WorktreeInfo {
|
|
|
15
15
|
path: string;
|
|
16
16
|
branch: string;
|
|
17
17
|
head: string;
|
|
18
|
+
locked?: boolean;
|
|
19
|
+
prunable?: boolean;
|
|
18
20
|
isAccessible?: boolean;
|
|
19
21
|
invalidReason?: string;
|
|
20
22
|
hasUncommittedChanges?: boolean;
|
|
23
|
+
isLocked?: boolean;
|
|
24
|
+
isPrunable?: boolean;
|
|
21
25
|
}
|
|
22
26
|
/**
|
|
23
27
|
* 追加のworktree(メインworktreeを除く)の一覧を取得
|
|
@@ -60,6 +64,48 @@ export declare function generateAlternativeWorktreePath(basePath: string): Promi
|
|
|
60
64
|
*/
|
|
61
65
|
export declare function createWorktree(config: WorktreeConfig): Promise<void>;
|
|
62
66
|
export declare function removeWorktree(worktreePath: string, force?: boolean): Promise<void>;
|
|
67
|
+
export interface RepairResult {
|
|
68
|
+
repairedCount: number;
|
|
69
|
+
failedCount: number;
|
|
70
|
+
failures: Array<{
|
|
71
|
+
path: string;
|
|
72
|
+
error: string;
|
|
73
|
+
}>;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Worktreeパス修復の結果
|
|
77
|
+
*/
|
|
78
|
+
export interface RepairPathResult {
|
|
79
|
+
/** 修復成功 (git worktree repair) */
|
|
80
|
+
repaired: boolean;
|
|
81
|
+
/** 古いメタデータ削除成功 (git worktree remove --force) */
|
|
82
|
+
removed: boolean;
|
|
83
|
+
/** 修復後の新しいパス (repaired=trueの場合のみ) */
|
|
84
|
+
newPath?: string;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* 単一のworktreeパスを修復する共通関数
|
|
88
|
+
*
|
|
89
|
+
* パターンA: 期待されるパスにディレクトリが存在する
|
|
90
|
+
* → git worktree repair <expectedPath> で修復
|
|
91
|
+
*
|
|
92
|
+
* パターンB: ディレクトリが存在しない(リモート環境で作成されたメタデータのみ残っている)
|
|
93
|
+
* → git worktree remove --force <currentPath> でメタデータを削除
|
|
94
|
+
*
|
|
95
|
+
* @param branch ブランチ名
|
|
96
|
+
* @param currentPath 現在gitメタデータに記録されているパス
|
|
97
|
+
* @param repoRoot リポジトリルートパス
|
|
98
|
+
* @returns 修復結果
|
|
99
|
+
*/
|
|
100
|
+
export declare function repairWorktreePath(branch: string, currentPath: string, repoRoot: string): Promise<RepairPathResult>;
|
|
101
|
+
/**
|
|
102
|
+
* Worktreeのパス不整合を修復
|
|
103
|
+
* 共通関数repairWorktreePathを使用して各ブランチを修復
|
|
104
|
+
* @param targetBranches 修復対象のブランチ名配列
|
|
105
|
+
* @returns 修復結果(成功数、失敗数、失敗詳細)
|
|
106
|
+
*/
|
|
107
|
+
export declare function repairWorktrees(targetBranches: string[]): Promise<RepairResult>;
|
|
108
|
+
export declare function getCleanupStatus(): Promise<CleanupStatus[]>;
|
|
63
109
|
/**
|
|
64
110
|
* マージ済みPRに関連するworktreeおよびローカルブランチのクリーンアップ候補を取得
|
|
65
111
|
* @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
|
package/dist/worktree.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../src/worktree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../src/worktree.ts"],"names":[],"mappings":"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"}
|
package/dist/worktree.js
CHANGED
|
@@ -2,6 +2,8 @@ import { execa } from "execa";
|
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import chalk from "chalk";
|
|
5
|
+
import { createLogger } from "./logging/logger.js";
|
|
6
|
+
const logger = createLogger({ category: "worktree" });
|
|
5
7
|
import { getPullRequestByBranch } from "./github.js";
|
|
6
8
|
import { hasUncommittedChanges, hasUnpushedCommits, hasUnpushedCommitsInRepo, getLocalBranches, checkRemoteBranchExists, branchHasUniqueCommitsComparedToBase, getRepositoryRoot, getWorktreeRoot, ensureGitignoreEntry, branchExists, getCurrentBranch, getCurrentBranchName, } from "./git.js";
|
|
7
9
|
import { getConfig } from "./config/index.js";
|
|
@@ -23,6 +25,47 @@ async function getUpstreamBranch(branch) {
|
|
|
23
25
|
return null;
|
|
24
26
|
}
|
|
25
27
|
}
|
|
28
|
+
const parseRemoteRef = (ref) => {
|
|
29
|
+
const segments = ref.split("/");
|
|
30
|
+
if (segments.length < 2) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
const [remote, ...rest] = segments;
|
|
34
|
+
const branch = rest.join("/");
|
|
35
|
+
if (!remote || !branch) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
return { remote, branch };
|
|
39
|
+
};
|
|
40
|
+
async function resolveUpstreamStatus(branch, repoRoot) {
|
|
41
|
+
const upstream = await getUpstreamBranch(branch);
|
|
42
|
+
if (!upstream) {
|
|
43
|
+
return { upstream: null, hasUpstream: false };
|
|
44
|
+
}
|
|
45
|
+
const parsed = parseRemoteRef(upstream);
|
|
46
|
+
if (!parsed) {
|
|
47
|
+
return { upstream, hasUpstream: false };
|
|
48
|
+
}
|
|
49
|
+
if (parsed.branch !== branch) {
|
|
50
|
+
return { upstream, hasUpstream: false };
|
|
51
|
+
}
|
|
52
|
+
const exists = await checkRemoteBranchExists(parsed.branch, parsed.remote, {
|
|
53
|
+
cwd: repoRoot,
|
|
54
|
+
});
|
|
55
|
+
return { upstream, hasUpstream: exists };
|
|
56
|
+
}
|
|
57
|
+
const buildCleanupReasons = ({ hasUniqueCommits, hasUncommitted, hasUnpushed, hasUpstream, }) => {
|
|
58
|
+
if (!hasUpstream) {
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
if (!hasUniqueCommits && !hasUncommitted && !hasUnpushed) {
|
|
62
|
+
return ["no-diff-with-base"];
|
|
63
|
+
}
|
|
64
|
+
if (hasUniqueCommits && !hasUncommitted && !hasUnpushed) {
|
|
65
|
+
return ["remote-synced"];
|
|
66
|
+
}
|
|
67
|
+
return [];
|
|
68
|
+
};
|
|
26
69
|
// 保護対象のブランチ(クリーンアップから除外)
|
|
27
70
|
export const PROTECTED_BRANCHES = ["main", "master", "develop"];
|
|
28
71
|
export function isProtectedBranchName(branchName) {
|
|
@@ -77,7 +120,13 @@ async function listWorktrees() {
|
|
|
77
120
|
if (currentWorktree.path) {
|
|
78
121
|
worktrees.push(currentWorktree);
|
|
79
122
|
}
|
|
80
|
-
currentWorktree = {
|
|
123
|
+
currentWorktree = {
|
|
124
|
+
path: line.substring(9),
|
|
125
|
+
locked: false,
|
|
126
|
+
prunable: false,
|
|
127
|
+
isLocked: false,
|
|
128
|
+
isPrunable: false,
|
|
129
|
+
};
|
|
81
130
|
}
|
|
82
131
|
else if (line.startsWith("HEAD ")) {
|
|
83
132
|
currentWorktree.head = line.substring(5);
|
|
@@ -85,6 +134,29 @@ async function listWorktrees() {
|
|
|
85
134
|
else if (line.startsWith("branch ")) {
|
|
86
135
|
currentWorktree.branch = line.substring(7).replace("refs/heads/", "");
|
|
87
136
|
}
|
|
137
|
+
else if (line === "locked" || line.startsWith("locked ")) {
|
|
138
|
+
currentWorktree.locked = true;
|
|
139
|
+
currentWorktree.isLocked = true;
|
|
140
|
+
if (line.startsWith("locked ")) {
|
|
141
|
+
const reason = line.substring(7).trim();
|
|
142
|
+
if (reason) {
|
|
143
|
+
currentWorktree.invalidReason ??= reason;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
else if (line === "prunable" || line.startsWith("prunable ")) {
|
|
148
|
+
currentWorktree.prunable = true;
|
|
149
|
+
currentWorktree.isPrunable = true;
|
|
150
|
+
if (line.startsWith("prunable ")) {
|
|
151
|
+
const reason = line.substring(9).trim();
|
|
152
|
+
if (reason) {
|
|
153
|
+
currentWorktree.invalidReason ??= reason;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
else if (line.startsWith("reason ")) {
|
|
158
|
+
currentWorktree.invalidReason = line.substring(7);
|
|
159
|
+
}
|
|
88
160
|
else if (line === "") {
|
|
89
161
|
if (currentWorktree.path) {
|
|
90
162
|
worktrees.push(currentWorktree);
|
|
@@ -118,13 +190,19 @@ export async function listAdditionalWorktrees() {
|
|
|
118
190
|
.filter((worktree) => worktree.path !== repoRoot)
|
|
119
191
|
.map((worktree) => {
|
|
120
192
|
// パスの存在を確認
|
|
121
|
-
const
|
|
193
|
+
const exists = fs.existsSync(worktree.path);
|
|
194
|
+
const isAccessible = exists && !worktree.prunable;
|
|
122
195
|
const result = {
|
|
123
196
|
...worktree,
|
|
124
197
|
isAccessible,
|
|
125
198
|
};
|
|
126
199
|
if (!isAccessible) {
|
|
127
|
-
|
|
200
|
+
if (!exists) {
|
|
201
|
+
result.invalidReason = "Path not accessible in current environment";
|
|
202
|
+
}
|
|
203
|
+
else if (worktree.prunable && !result.invalidReason) {
|
|
204
|
+
result.invalidReason = "Worktree is marked prunable";
|
|
205
|
+
}
|
|
128
206
|
}
|
|
129
207
|
return result;
|
|
130
208
|
});
|
|
@@ -387,6 +465,119 @@ export async function removeWorktree(worktreePath, force = false) {
|
|
|
387
465
|
throw new WorktreeError(`Failed to remove worktree at ${worktreePath}`, error);
|
|
388
466
|
}
|
|
389
467
|
}
|
|
468
|
+
/**
|
|
469
|
+
* 単一のworktreeパスを修復する共通関数
|
|
470
|
+
*
|
|
471
|
+
* パターンA: 期待されるパスにディレクトリが存在する
|
|
472
|
+
* → git worktree repair <expectedPath> で修復
|
|
473
|
+
*
|
|
474
|
+
* パターンB: ディレクトリが存在しない(リモート環境で作成されたメタデータのみ残っている)
|
|
475
|
+
* → git worktree remove --force <currentPath> でメタデータを削除
|
|
476
|
+
*
|
|
477
|
+
* @param branch ブランチ名
|
|
478
|
+
* @param currentPath 現在gitメタデータに記録されているパス
|
|
479
|
+
* @param repoRoot リポジトリルートパス
|
|
480
|
+
* @returns 修復結果
|
|
481
|
+
*/
|
|
482
|
+
export async function repairWorktreePath(branch, currentPath, repoRoot) {
|
|
483
|
+
const expectedPath = await generateWorktreePath(repoRoot, branch);
|
|
484
|
+
const fsSync = await import("node:fs");
|
|
485
|
+
if (fsSync.existsSync(expectedPath)) {
|
|
486
|
+
// パターンA: ディレクトリが存在する → repair
|
|
487
|
+
logger.info({ branch, expectedPath, currentPath }, "repairWorktreePath: directory exists, attempting repair");
|
|
488
|
+
try {
|
|
489
|
+
await execa("git", ["worktree", "repair", expectedPath], {
|
|
490
|
+
cwd: repoRoot,
|
|
491
|
+
});
|
|
492
|
+
return { repaired: true, removed: false, newPath: expectedPath };
|
|
493
|
+
}
|
|
494
|
+
catch (error) {
|
|
495
|
+
logger.warn({ branch, expectedPath, error }, "repairWorktreePath: repair failed");
|
|
496
|
+
return { repaired: false, removed: false };
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
else {
|
|
500
|
+
// パターンB: ディレクトリが存在しない → 古いメタデータを削除
|
|
501
|
+
logger.info({ branch, currentPath, expectedPath }, "repairWorktreePath: directory not found, removing stale metadata");
|
|
502
|
+
try {
|
|
503
|
+
await execa("git", ["worktree", "remove", "--force", currentPath], {
|
|
504
|
+
cwd: repoRoot,
|
|
505
|
+
});
|
|
506
|
+
return { repaired: false, removed: true };
|
|
507
|
+
}
|
|
508
|
+
catch (error) {
|
|
509
|
+
logger.warn({ branch, currentPath, error }, "repairWorktreePath: remove failed");
|
|
510
|
+
return { repaired: false, removed: false };
|
|
511
|
+
}
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
/**
|
|
515
|
+
* Worktreeのパス不整合を修復
|
|
516
|
+
* 共通関数repairWorktreePathを使用して各ブランチを修復
|
|
517
|
+
* @param targetBranches 修復対象のブランチ名配列
|
|
518
|
+
* @returns 修復結果(成功数、失敗数、失敗詳細)
|
|
519
|
+
*/
|
|
520
|
+
export async function repairWorktrees(targetBranches) {
|
|
521
|
+
const result = {
|
|
522
|
+
repairedCount: 0,
|
|
523
|
+
failedCount: 0,
|
|
524
|
+
failures: [],
|
|
525
|
+
};
|
|
526
|
+
if (targetBranches.length === 0) {
|
|
527
|
+
return result;
|
|
528
|
+
}
|
|
529
|
+
// 修復前のworktree一覧を取得(現在のパスを知るため)
|
|
530
|
+
const beforeWorktrees = await listAdditionalWorktrees();
|
|
531
|
+
const worktreePathMap = new Map(beforeWorktrees.map((w) => [w.branch, w.path]));
|
|
532
|
+
// デバッグログ: worktreeリストのブランチ名を出力
|
|
533
|
+
logger.info({
|
|
534
|
+
targetBranches,
|
|
535
|
+
worktreeBranches: beforeWorktrees.map((w) => ({
|
|
536
|
+
branch: w.branch,
|
|
537
|
+
path: w.path,
|
|
538
|
+
isAccessible: w.isAccessible,
|
|
539
|
+
})),
|
|
540
|
+
}, "repairWorktrees: before state");
|
|
541
|
+
const repoRoot = await getRepositoryRoot();
|
|
542
|
+
// 対象ブランチごとに共通関数を使用して修復
|
|
543
|
+
for (const branch of targetBranches) {
|
|
544
|
+
const currentPath = worktreePathMap.get(branch);
|
|
545
|
+
if (!currentPath) {
|
|
546
|
+
logger.warn({ branch }, "repairWorktrees: branch not found in worktrees");
|
|
547
|
+
result.failedCount++;
|
|
548
|
+
result.failures.push({
|
|
549
|
+
path: branch,
|
|
550
|
+
error: "Branch not found in worktrees",
|
|
551
|
+
});
|
|
552
|
+
continue;
|
|
553
|
+
}
|
|
554
|
+
const repairResult = await repairWorktreePath(branch, currentPath, repoRoot);
|
|
555
|
+
if (repairResult.repaired) {
|
|
556
|
+
result.repairedCount++;
|
|
557
|
+
}
|
|
558
|
+
else if (repairResult.removed) {
|
|
559
|
+
// メタデータ削除は「修復」としてカウント(新規作成が可能になるため)
|
|
560
|
+
result.repairedCount++;
|
|
561
|
+
}
|
|
562
|
+
else {
|
|
563
|
+
result.failedCount++;
|
|
564
|
+
result.failures.push({
|
|
565
|
+
path: branch,
|
|
566
|
+
error: "Worktree repair failed",
|
|
567
|
+
});
|
|
568
|
+
}
|
|
569
|
+
}
|
|
570
|
+
// 修復後のアクセス可能性を確認(デバッグログ用)
|
|
571
|
+
const afterWorktrees = await listAdditionalWorktrees();
|
|
572
|
+
logger.info({
|
|
573
|
+
afterWorktrees: afterWorktrees.map((w) => ({
|
|
574
|
+
branch: w.branch,
|
|
575
|
+
path: w.path,
|
|
576
|
+
isAccessible: w.isAccessible,
|
|
577
|
+
})),
|
|
578
|
+
}, "repairWorktrees: after state");
|
|
579
|
+
return result;
|
|
580
|
+
}
|
|
390
581
|
async function getWorktreesWithPRStatus() {
|
|
391
582
|
const worktrees = await listAdditionalWorktrees();
|
|
392
583
|
const worktreesWithPR = [];
|
|
@@ -406,14 +597,14 @@ async function getWorktreesWithPRStatus() {
|
|
|
406
597
|
* worktreeに存在しないローカルブランチのクリーンアップ候補を取得
|
|
407
598
|
* @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
|
|
408
599
|
*/
|
|
409
|
-
async function
|
|
600
|
+
async function getOrphanedLocalBranchStatuses({ baseBranch, repoRoot, }) {
|
|
410
601
|
try {
|
|
411
602
|
// 並列実行で高速化
|
|
412
603
|
const [localBranches, worktrees] = await Promise.all([
|
|
413
604
|
getLocalBranches(),
|
|
414
605
|
listAdditionalWorktrees(),
|
|
415
606
|
]);
|
|
416
|
-
const
|
|
607
|
+
const statuses = [];
|
|
417
608
|
const worktreeBranches = new Set(worktrees.map((w) => w.branch).filter(Boolean));
|
|
418
609
|
if (process.env.DEBUG_CLEANUP) {
|
|
419
610
|
console.log(chalk.cyan("Debug: Orphaned branch scan - Available local branches:"));
|
|
@@ -437,44 +628,36 @@ async function getOrphanedLocalBranches({ baseBranch, repoRoot, }) {
|
|
|
437
628
|
catch {
|
|
438
629
|
hasUnpushed = true;
|
|
439
630
|
}
|
|
440
|
-
const
|
|
441
|
-
const
|
|
442
|
-
const comparisonBase = upstreamBranch ?? baseBranch;
|
|
631
|
+
const { upstream, hasUpstream } = await resolveUpstreamStatus(localBranch.name, repoRoot);
|
|
632
|
+
const comparisonBase = upstream ?? baseBranch;
|
|
443
633
|
const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(localBranch.name, comparisonBase, repoRoot);
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
634
|
+
const reasons = buildCleanupReasons({
|
|
635
|
+
hasUniqueCommits,
|
|
636
|
+
hasUncommitted: false,
|
|
637
|
+
hasUnpushed,
|
|
638
|
+
hasUpstream,
|
|
639
|
+
});
|
|
447
640
|
if (process.env.DEBUG_CLEANUP) {
|
|
448
641
|
console.log(chalk.gray(`Debug: Checking orphaned branch ${localBranch.name} -> reasons: ${reasons.join(", ")}`));
|
|
449
642
|
}
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
worktreePath: null, // worktreeは存在しない
|
|
463
|
-
branch: localBranch.name,
|
|
464
|
-
pullRequest: null,
|
|
465
|
-
hasUncommittedChanges: false, // worktreeが存在しないため常にfalse
|
|
466
|
-
hasUnpushedCommits: hasUnpushed,
|
|
467
|
-
cleanupType: "branch-only",
|
|
468
|
-
hasRemoteBranch,
|
|
469
|
-
reasons,
|
|
470
|
-
});
|
|
471
|
-
}
|
|
643
|
+
statuses.push({
|
|
644
|
+
worktreePath: null, // worktreeは存在しない
|
|
645
|
+
branch: localBranch.name,
|
|
646
|
+
hasUncommittedChanges: false, // worktreeが存在しないため常にfalse
|
|
647
|
+
hasUnpushedCommits: hasUnpushed,
|
|
648
|
+
cleanupType: "branch-only",
|
|
649
|
+
hasRemoteBranch: hasUpstream,
|
|
650
|
+
hasUniqueCommits,
|
|
651
|
+
hasUpstream,
|
|
652
|
+
upstream,
|
|
653
|
+
reasons,
|
|
654
|
+
});
|
|
472
655
|
}
|
|
473
656
|
}
|
|
474
657
|
if (process.env.DEBUG_CLEANUP) {
|
|
475
|
-
console.log(chalk.cyan(`Debug: Found ${
|
|
658
|
+
console.log(chalk.cyan(`Debug: Found ${statuses.length} orphaned branch statuses`));
|
|
476
659
|
}
|
|
477
|
-
return
|
|
660
|
+
return statuses;
|
|
478
661
|
}
|
|
479
662
|
catch (error) {
|
|
480
663
|
console.error(chalk.red("Error: Failed to get orphaned local branches"));
|
|
@@ -484,53 +667,39 @@ async function getOrphanedLocalBranches({ baseBranch, repoRoot, }) {
|
|
|
484
667
|
return [];
|
|
485
668
|
}
|
|
486
669
|
}
|
|
487
|
-
|
|
488
|
-
* マージ済みPRに関連するworktreeおよびローカルブランチのクリーンアップ候補を取得
|
|
489
|
-
* @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
|
|
490
|
-
*/
|
|
491
|
-
export async function getMergedPRWorktrees() {
|
|
670
|
+
export async function getCleanupStatus() {
|
|
492
671
|
const [config, repoRoot, worktreesWithPR] = await Promise.all([
|
|
493
672
|
getConfig(),
|
|
494
673
|
getRepositoryRoot(),
|
|
495
674
|
getWorktreesWithPRStatus(),
|
|
496
675
|
]);
|
|
497
676
|
const baseBranch = config.defaultBaseBranch || GIT_CONFIG.DEFAULT_BASE_BRANCH;
|
|
498
|
-
const
|
|
677
|
+
const orphanedStatuses = await getOrphanedLocalBranchStatuses({
|
|
499
678
|
baseBranch,
|
|
500
679
|
repoRoot,
|
|
501
680
|
});
|
|
502
|
-
const
|
|
681
|
+
const statuses = [];
|
|
503
682
|
if (process.env.DEBUG_CLEANUP) {
|
|
504
683
|
console.log(chalk.cyan("Debug: Available worktrees:"));
|
|
505
684
|
worktreesWithPR.forEach((w) => console.log(` ${w.branch} -> ${w.worktreePath}`));
|
|
506
685
|
}
|
|
507
686
|
for (const worktree of worktreesWithPR) {
|
|
508
|
-
// 保護対象ブランチはスキップ
|
|
509
|
-
if (isProtectedBranchName(worktree.branch)) {
|
|
510
|
-
if (process.env.DEBUG_CLEANUP) {
|
|
511
|
-
console.log(chalk.yellow(`Debug: Skipping protected branch ${worktree.branch}`));
|
|
512
|
-
}
|
|
513
|
-
continue;
|
|
514
|
-
}
|
|
515
687
|
if (process.env.DEBUG_CLEANUP) {
|
|
516
688
|
console.log(chalk.gray(`Debug: Checking worktree ${worktree.branch}`));
|
|
517
689
|
}
|
|
518
|
-
const cleanupReasons = [];
|
|
519
690
|
// worktreeパスの存在を確認
|
|
520
|
-
const
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
: typeof fs.default
|
|
691
|
+
const fsSync = await import("node:fs");
|
|
692
|
+
const existsSync = typeof fsSync.existsSync === "function"
|
|
693
|
+
? fsSync.existsSync
|
|
694
|
+
: typeof fsSync.default
|
|
525
695
|
?.existsSync === "function"
|
|
526
|
-
?
|
|
527
|
-
.existsSync
|
|
696
|
+
? fsSync
|
|
697
|
+
.default.existsSync
|
|
528
698
|
: null;
|
|
529
699
|
const isAccessible = existsSync ? existsSync(worktree.worktreePath) : false;
|
|
530
700
|
let hasUncommitted = false;
|
|
531
701
|
let hasUnpushed = false;
|
|
532
702
|
if (isAccessible) {
|
|
533
|
-
// worktreeが存在する場合のみ状態をチェック
|
|
534
703
|
try {
|
|
535
704
|
[hasUncommitted, hasUnpushed] = await Promise.all([
|
|
536
705
|
hasUncommittedChanges(worktree.worktreePath),
|
|
@@ -538,59 +707,76 @@ export async function getMergedPRWorktrees() {
|
|
|
538
707
|
]);
|
|
539
708
|
}
|
|
540
709
|
catch (error) {
|
|
541
|
-
// エラーが発生した場合はデフォルト値を使用
|
|
542
710
|
if (process.env.DEBUG_CLEANUP) {
|
|
543
711
|
console.log(chalk.yellow(`Debug: Failed to check status for worktree ${worktree.worktreePath}: ${error instanceof Error ? error.message : String(error)}`));
|
|
544
712
|
}
|
|
545
713
|
}
|
|
546
714
|
}
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
hasRemoteBranch = await checkRemoteBranchExists(worktree.branch);
|
|
550
|
-
}
|
|
551
|
-
catch {
|
|
552
|
-
hasRemoteBranch = false;
|
|
553
|
-
}
|
|
554
|
-
const upstreamBranch = await getUpstreamBranch(worktree.branch);
|
|
555
|
-
const comparisonBase = upstreamBranch ?? baseBranch;
|
|
715
|
+
const { upstream, hasUpstream } = await resolveUpstreamStatus(worktree.branch, repoRoot);
|
|
716
|
+
const comparisonBase = upstream ?? baseBranch;
|
|
556
717
|
const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(worktree.branch, comparisonBase, repoRoot);
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
cleanupReasons.push("remote-synced");
|
|
564
|
-
}
|
|
718
|
+
const reasons = buildCleanupReasons({
|
|
719
|
+
hasUniqueCommits,
|
|
720
|
+
hasUncommitted,
|
|
721
|
+
hasUnpushed,
|
|
722
|
+
hasUpstream,
|
|
723
|
+
});
|
|
565
724
|
if (process.env.DEBUG_CLEANUP) {
|
|
566
|
-
console.log(chalk.gray(`Debug: Cleanup reasons for ${worktree.branch}: ${
|
|
725
|
+
console.log(chalk.gray(`Debug: Cleanup reasons for ${worktree.branch}: ${reasons.length > 0 ? reasons.join(", ") : "none"}`));
|
|
567
726
|
}
|
|
568
|
-
|
|
569
|
-
continue;
|
|
570
|
-
}
|
|
571
|
-
const target = {
|
|
727
|
+
statuses.push({
|
|
572
728
|
worktreePath: worktree.worktreePath,
|
|
573
729
|
branch: worktree.branch,
|
|
574
|
-
pullRequest: null,
|
|
575
730
|
hasUncommittedChanges: hasUncommitted,
|
|
576
731
|
hasUnpushedCommits: hasUnpushed,
|
|
577
732
|
cleanupType: "worktree-and-branch",
|
|
578
|
-
hasRemoteBranch,
|
|
733
|
+
hasRemoteBranch: hasUpstream,
|
|
734
|
+
hasUniqueCommits,
|
|
735
|
+
hasUpstream,
|
|
736
|
+
upstream,
|
|
579
737
|
isAccessible,
|
|
580
|
-
reasons
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
}
|
|
585
|
-
cleanupTargets.push(target);
|
|
738
|
+
reasons,
|
|
739
|
+
...(isAccessible
|
|
740
|
+
? {}
|
|
741
|
+
: { invalidReason: "Path not accessible in current environment" }),
|
|
742
|
+
});
|
|
586
743
|
}
|
|
587
|
-
|
|
588
|
-
cleanupTargets.push(...orphanedBranches);
|
|
744
|
+
statuses.push(...orphanedStatuses);
|
|
589
745
|
if (process.env.DEBUG_CLEANUP) {
|
|
590
|
-
const worktreeTargets =
|
|
591
|
-
const branchOnlyTargets =
|
|
592
|
-
console.log(chalk.cyan(`Debug: Found ${
|
|
746
|
+
const worktreeTargets = statuses.filter((t) => t.cleanupType === "worktree-and-branch" && t.reasons.length > 0).length;
|
|
747
|
+
const branchOnlyTargets = statuses.filter((t) => t.cleanupType === "branch-only" && t.reasons.length > 0).length;
|
|
748
|
+
console.log(chalk.cyan(`Debug: Found ${worktreeTargets + branchOnlyTargets} cleanup targets (${worktreeTargets} worktree+branch, ${branchOnlyTargets} branch-only)`));
|
|
593
749
|
}
|
|
750
|
+
return statuses;
|
|
751
|
+
}
|
|
752
|
+
/**
|
|
753
|
+
* マージ済みPRに関連するworktreeおよびローカルブランチのクリーンアップ候補を取得
|
|
754
|
+
* @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
|
|
755
|
+
*/
|
|
756
|
+
export async function getMergedPRWorktrees() {
|
|
757
|
+
const statuses = await getCleanupStatus();
|
|
758
|
+
const cleanupTargets = statuses
|
|
759
|
+
.filter((status) => status.reasons.length > 0)
|
|
760
|
+
.filter((status) => !isProtectedBranchName(status.branch))
|
|
761
|
+
.map((status) => {
|
|
762
|
+
const target = {
|
|
763
|
+
worktreePath: status.worktreePath,
|
|
764
|
+
branch: status.branch,
|
|
765
|
+
pullRequest: null,
|
|
766
|
+
hasUncommittedChanges: status.hasUncommittedChanges,
|
|
767
|
+
hasUnpushedCommits: status.hasUnpushedCommits,
|
|
768
|
+
cleanupType: status.cleanupType,
|
|
769
|
+
hasRemoteBranch: status.hasRemoteBranch,
|
|
770
|
+
reasons: status.reasons,
|
|
771
|
+
};
|
|
772
|
+
if (status.isAccessible !== undefined) {
|
|
773
|
+
target.isAccessible = status.isAccessible;
|
|
774
|
+
}
|
|
775
|
+
if (status.invalidReason) {
|
|
776
|
+
target.invalidReason = status.invalidReason;
|
|
777
|
+
}
|
|
778
|
+
return target;
|
|
779
|
+
});
|
|
594
780
|
return cleanupTargets;
|
|
595
781
|
}
|
|
596
782
|
//# sourceMappingURL=worktree.js.map
|