@akiojin/gwt 2.6.0 → 2.7.4
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 +1 -1
- package/README.md +2 -2
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +5 -6
- package/dist/claude.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js +15 -23
- package/dist/cli/ui/components/screens/BranchListScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.d.ts +1 -1
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js +2 -2
- package/dist/cli/ui/components/screens/ExecutionModeSelectorScreen.js.map +1 -1
- package/dist/cli/ui/hooks/useGitData.d.ts.map +1 -1
- package/dist/cli/ui/hooks/useGitData.js +11 -3
- package/dist/cli/ui/hooks/useGitData.js.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.d.ts.map +1 -1
- package/dist/cli/ui/utils/branchFormatter.js +8 -8
- package/dist/cli/ui/utils/branchFormatter.js.map +1 -1
- package/dist/web/server/services/branches.d.ts.map +1 -1
- package/dist/web/server/services/branches.js +9 -2
- package/dist/web/server/services/branches.js.map +1 -1
- package/package.json +1 -8
- package/src/claude.ts +6 -8
- package/src/cli/ui/__tests__/components/screens/BranchListScreen.test.tsx +0 -14
- package/src/cli/ui/__tests__/components/screens/ExecutionModeSelectorScreen.test.tsx +1 -1
- package/src/cli/ui/__tests__/integration/navigation.test.tsx +5 -0
- package/src/cli/ui/__tests__/utils/branchFormatter.test.ts +25 -0
- package/src/cli/ui/components/screens/BranchListScreen.tsx +17 -35
- package/src/cli/ui/components/screens/ExecutionModeSelectorScreen.tsx +2 -2
- package/src/cli/ui/hooks/useGitData.ts +12 -3
- package/src/cli/ui/utils/branchFormatter.ts +9 -8
- package/src/web/server/services/branches.ts +13 -2
package/README.ja.md
CHANGED
|
@@ -114,7 +114,7 @@ gwt -v
|
|
|
114
114
|
2. CIワークフロー（Test、Lint）が自動実行
|
|
115
115
|
3. すべてのCIチェックが成功し、競合がない場合、PRが自動的に`develop`にマージされる
|
|
116
116
|
4. 変更は`develop`に蓄積され、リリース準備ができるまで待機
|
|
117
|
-
5. `/release
|
|
117
|
+
5. `/release`コマンドを使用してRelease PRを作成し、release-pleaseをトリガー
|
|
118
118
|
|
|
119
119
|
**自動マージの無効化:**
|
|
120
120
|
|
package/README.md
CHANGED
|
@@ -139,7 +139,7 @@ The repository includes an automated PR merge workflow that streamlines the deve
|
|
|
139
139
|
2. CI workflows (Test, Lint) run automatically
|
|
140
140
|
3. When all CI checks pass and no conflicts exist, the PR is automatically merged to `develop`
|
|
141
141
|
4. Changes accumulate on `develop` until ready for release
|
|
142
|
-
5. Use `/release` command to
|
|
142
|
+
5. Use `/release` command to create Release PR and trigger release-please
|
|
143
143
|
|
|
144
144
|
**Disabling auto-merge:**
|
|
145
145
|
|
|
@@ -305,7 +305,7 @@ bun run start
|
|
|
305
305
|
|
|
306
306
|
## Release Process
|
|
307
307
|
|
|
308
|
-
We ship releases through
|
|
308
|
+
We ship releases through release-please. End users can simply install the latest published package (via npm or the GitHub Releases tab) and rely on versioned artifacts. Maintainers who need the full workflow should read [docs/release-guide.md](./docs/release-guide.md) (日本語版: [docs/release-guide.ja.md](./docs/release-guide.ja.md)) and the in-depth specs under `specs/SPEC-57fde06f/`.
|
|
309
309
|
|
|
310
310
|
## Troubleshooting
|
|
311
311
|
|
package/dist/claude.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"AAMA,qBAAa,WAAY,SAAQ,KAAK;IAG3B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CACX,GACL,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"AAMA,qBAAa,WAAY,SAAQ,KAAK;IAG3B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CACX,GACL,OAAO,CAAC,IAAI,CAAC,CA+Of;AAiBD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAe9D"}
|
package/dist/claude.js
CHANGED
|
@@ -119,6 +119,9 @@ export async function launchClaudeCode(worktreePath, options = {}) {
|
|
|
119
119
|
...process.env,
|
|
120
120
|
...(options.envOverrides ?? {}),
|
|
121
121
|
};
|
|
122
|
+
const launchEnv = options.skipPermissions && !baseEnv.IS_SANDBOX
|
|
123
|
+
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
124
|
+
: baseEnv;
|
|
122
125
|
const childStdio = createChildStdio();
|
|
123
126
|
// Auto-detect locally installed claude command
|
|
124
127
|
const hasLocalClaude = await isClaudeCommandAvailable();
|
|
@@ -132,9 +135,7 @@ export async function launchClaudeCode(worktreePath, options = {}) {
|
|
|
132
135
|
stdin: childStdio.stdin,
|
|
133
136
|
stdout: childStdio.stdout,
|
|
134
137
|
stderr: childStdio.stderr,
|
|
135
|
-
env:
|
|
136
|
-
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
137
|
-
: baseEnv,
|
|
138
|
+
env: launchEnv,
|
|
138
139
|
});
|
|
139
140
|
}
|
|
140
141
|
else {
|
|
@@ -153,9 +154,7 @@ export async function launchClaudeCode(worktreePath, options = {}) {
|
|
|
153
154
|
stdin: childStdio.stdin,
|
|
154
155
|
stdout: childStdio.stdout,
|
|
155
156
|
stderr: childStdio.stderr,
|
|
156
|
-
env:
|
|
157
|
-
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
158
|
-
: baseEnv,
|
|
157
|
+
env: launchEnv,
|
|
159
158
|
});
|
|
160
159
|
}
|
|
161
160
|
}
|
package/dist/claude.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BranchListScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/BranchListScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAS9D,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"BranchListScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/BranchListScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAS9D,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAyC7D,KAAK,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;AAE1D,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,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;CACtB;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,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,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;IAE1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,OAAe,EACf,KAAY,EACZ,WAAkB,EAClB,qBAA2B,EAC3B,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACtB,eAAe,EACf,uBAAuB,GACxB,EAAE,qBAAqB,qBAiUvB"}
|
|
@@ -12,12 +12,8 @@ import chalk from "chalk";
|
|
|
12
12
|
const WIDTH_OVERRIDES = {
|
|
13
13
|
// Remote icon
|
|
14
14
|
"☁": 1,
|
|
15
|
-
"☁️": 1,
|
|
16
|
-
"☁︎": 1,
|
|
17
15
|
// Unpushed icon
|
|
18
16
|
"⬆": 1,
|
|
19
|
-
"⬆️": 1,
|
|
20
|
-
"⬆︎": 1,
|
|
21
17
|
// Branch type icons
|
|
22
18
|
"⚡": 1,
|
|
23
19
|
"✨": 1,
|
|
@@ -35,15 +31,15 @@ const WIDTH_OVERRIDES = {
|
|
|
35
31
|
"✅": 1,
|
|
36
32
|
"⚠️": 1,
|
|
37
33
|
};
|
|
34
|
+
const getCharWidth = (char) => {
|
|
35
|
+
const baseWidth = stringWidth(char);
|
|
36
|
+
const override = WIDTH_OVERRIDES[char];
|
|
37
|
+
return override !== undefined ? Math.max(baseWidth, override) : baseWidth;
|
|
38
|
+
};
|
|
38
39
|
const measureDisplayWidth = (value) => {
|
|
39
40
|
let width = 0;
|
|
40
41
|
for (const char of Array.from(value)) {
|
|
41
|
-
|
|
42
|
-
if (override !== undefined) {
|
|
43
|
-
width += override;
|
|
44
|
-
continue;
|
|
45
|
-
}
|
|
46
|
-
width += stringWidth(char);
|
|
42
|
+
width += getCharWidth(char);
|
|
47
43
|
}
|
|
48
44
|
return width;
|
|
49
45
|
};
|
|
@@ -176,8 +172,7 @@ export function BranchListScreen({ branches, stats, onSelect, onNavigate, onClea
|
|
|
176
172
|
let currentWidth = 0;
|
|
177
173
|
let result = "";
|
|
178
174
|
for (const char of Array.from(value)) {
|
|
179
|
-
const
|
|
180
|
-
const charWidth = override !== undefined ? override : stringWidth(char);
|
|
175
|
+
const charWidth = getCharWidth(char);
|
|
181
176
|
if (currentWidth + charWidth + ellipsisWidth > maxWidth) {
|
|
182
177
|
break;
|
|
183
178
|
}
|
|
@@ -187,7 +182,8 @@ export function BranchListScreen({ branches, stats, onSelect, onNavigate, onClea
|
|
|
187
182
|
return result + ellipsis;
|
|
188
183
|
}, []);
|
|
189
184
|
const renderBranchRow = useCallback((item, isSelected, context) => {
|
|
190
|
-
|
|
185
|
+
// Use a small safety margin to avoid terminal-dependent wrapping
|
|
186
|
+
const columns = Math.max(20, context.columns - 1);
|
|
191
187
|
const arrow = isSelected ? ">" : " ";
|
|
192
188
|
const timestampText = formatLatestCommit(item.latestCommitTimestamp);
|
|
193
189
|
const timestampWidth = stringWidth(timestampText);
|
|
@@ -214,19 +210,15 @@ export function BranchListScreen({ branches, stats, onSelect, onNavigate, onClea
|
|
|
214
210
|
const indicatorPrefix = indicatorIcon ? `${indicatorIcon} ` : "";
|
|
215
211
|
const staticPrefix = `${arrow} ${indicatorPrefix}`;
|
|
216
212
|
const staticPrefixWidth = measureDisplayWidth(staticPrefix);
|
|
217
|
-
const
|
|
218
|
-
const maxLabelWidth = Math.max(0,
|
|
213
|
+
const maxLeftDisplayWidth = Math.max(0, columns - timestampWidth - 1);
|
|
214
|
+
const maxLabelWidth = Math.max(0, maxLeftDisplayWidth - staticPrefixWidth);
|
|
219
215
|
const truncatedLabel = truncateToWidth(item.label, maxLabelWidth);
|
|
220
216
|
const leftText = `${staticPrefix}${truncatedLabel}`;
|
|
221
|
-
const leftMeasuredWidth = stringWidth(leftText);
|
|
222
217
|
const leftDisplayWidth = measureDisplayWidth(leftText);
|
|
223
|
-
const
|
|
224
|
-
|
|
225
|
-
const
|
|
226
|
-
const
|
|
227
|
-
const cursorAdjust = cursorShift > 0 ? `\u001b[${cursorShift}C` : "";
|
|
228
|
-
let line = `${leftText}${gap}${cursorAdjust}${timestampText}`;
|
|
229
|
-
const paddingWidth = Math.max(0, columns - stringWidth(line));
|
|
218
|
+
const gapWidth = Math.max(1, columns - leftDisplayWidth - timestampWidth);
|
|
219
|
+
let line = `${leftText}${" ".repeat(gapWidth)}${timestampText}`;
|
|
220
|
+
const totalDisplayWidth = leftDisplayWidth + gapWidth + timestampWidth;
|
|
221
|
+
const paddingWidth = Math.max(0, columns - totalDisplayWidth);
|
|
230
222
|
if (paddingWidth > 0) {
|
|
231
223
|
line += " ".repeat(paddingWidth);
|
|
232
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BranchListScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/BranchListScreen.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BranchListScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/BranchListScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export interface ExecutionModeSelectorScreenProps {
|
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
23
|
* ExecutionModeSelectorScreen - Screen for selecting execution mode (2-step)
|
|
24
|
-
* Step 1: Select mode (
|
|
24
|
+
* Step 1: Select mode (New/Continue/Resume)
|
|
25
25
|
* Step 2: Select skip permissions (Yes/No)
|
|
26
26
|
* Layout: Header + Selection + Footer
|
|
27
27
|
*/
|
|
@@ -6,7 +6,7 @@ import { Select } from "../common/Select.js";
|
|
|
6
6
|
import { useTerminalSize } from "../../hooks/useTerminalSize.js";
|
|
7
7
|
/**
|
|
8
8
|
* ExecutionModeSelectorScreen - Screen for selecting execution mode (2-step)
|
|
9
|
-
* Step 1: Select mode (
|
|
9
|
+
* Step 1: Select mode (New/Continue/Resume)
|
|
10
10
|
* Step 2: Select skip permissions (Yes/No)
|
|
11
11
|
* Layout: Header + Selection + Footer
|
|
12
12
|
*/
|
|
@@ -31,7 +31,7 @@ export function ExecutionModeSelectorScreen({ onBack, onSelect, version, }) {
|
|
|
31
31
|
// Execution mode options (Step 1)
|
|
32
32
|
const modeItems = [
|
|
33
33
|
{
|
|
34
|
-
label: "
|
|
34
|
+
label: "New",
|
|
35
35
|
value: "normal",
|
|
36
36
|
description: "Start fresh session",
|
|
37
37
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecutionModeSelectorScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/ExecutionModeSelectorScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AA2BjE;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAAC,EAC1C,MAAM,EACN,QAAQ,EACR,OAAO,GAC0B;IACjC,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,EAAE,CAAC;IACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAQ,CAAC,CAAC,CAAC;IAC3C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAuB,IAAI,CAAC,CAAC;IAE7E,wBAAwB;IACxB,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,oBAAoB;gBACpB,OAAO,CAAC,CAAC,CAAC,CAAC;gBACX,eAAe,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,6BAA6B;gBAC7B,MAAM,EAAE,CAAC;YACX,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,SAAS,GAAwB;QACrC;YACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"ExecutionModeSelectorScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/ExecutionModeSelectorScreen.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGitData.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/hooks/useGitData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useGitData.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/hooks/useGitData.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,IAAI,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5E,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,gBAAgB,CAuIxE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useState, useEffect, useCallback } from "react";
|
|
2
|
-
import { getAllBranches, hasUnpushedCommitsInRepo, getRepositoryRoot, } from "../../../git.js";
|
|
2
|
+
import { getAllBranches, hasUnpushedCommitsInRepo, getRepositoryRoot, fetchAllRemotes, } from "../../../git.js";
|
|
3
3
|
import { listAdditionalWorktrees } from "../../../worktree.js";
|
|
4
4
|
import { getPullRequestByBranch } from "../../../github.js";
|
|
5
5
|
/**
|
|
@@ -17,6 +17,16 @@ export function useGitData(options) {
|
|
|
17
17
|
setLoading(true);
|
|
18
18
|
setError(null);
|
|
19
19
|
try {
|
|
20
|
+
const repoRoot = await getRepositoryRoot();
|
|
21
|
+
// リモートブランチの最新情報を取得（失敗してもローカル表示は継続）
|
|
22
|
+
try {
|
|
23
|
+
await fetchAllRemotes({ cwd: repoRoot });
|
|
24
|
+
}
|
|
25
|
+
catch (fetchError) {
|
|
26
|
+
if (process.env.DEBUG) {
|
|
27
|
+
console.warn("Failed to fetch remote branches", fetchError);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
20
30
|
const [branchesData, worktreesData] = await Promise.all([
|
|
21
31
|
getAllBranches(),
|
|
22
32
|
listAdditionalWorktrees(),
|
|
@@ -35,8 +45,6 @@ export function useGitData(options) {
|
|
|
35
45
|
};
|
|
36
46
|
worktreeMap.set(worktree.branch, uiWorktreeInfo);
|
|
37
47
|
}
|
|
38
|
-
// Get repository root for unpushed commits check
|
|
39
|
-
const repoRoot = await getRepositoryRoot();
|
|
40
48
|
// Attach worktree info and check unpushed/PR status for local branches
|
|
41
49
|
const enrichedBranches = await Promise.all(branchesData.map(async (branch) => {
|
|
42
50
|
const worktreeInfo = worktreeMap.get(branch.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGitData.js","sourceRoot":"","sources":["../../../../src/cli/ui/hooks/useGitData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,cAAc,EACd,wBAAwB,EACxB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"useGitData.js","sourceRoot":"","sources":["../../../../src/cli/ui/hooks/useGitData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branchFormatter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAGV,YAAY,EACb,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"branchFormatter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAGV,YAAY,EACb,MAAM,aAAa,CAAC;AA6DrB,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,UAAU,EAClB,OAAO,GAAE,aAAkB,GAC1B,UAAU,CAiGZ;AA0DD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,UAAU,EAAE,EACtB,WAAW,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAa,GACjD,UAAU,EAAE,CAGd"}
|
|
@@ -22,17 +22,12 @@ const changeIcons = {
|
|
|
22
22
|
warning: "⚠️",
|
|
23
23
|
};
|
|
24
24
|
const remoteIcon = "☁";
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
// keep the column layout consistent across environments.
|
|
25
|
+
// Emoji width varies by terminal. Provide explicit minimum widths so we never
|
|
26
|
+
// underestimate and accidentally push the row past the terminal columns.
|
|
28
27
|
const iconWidthOverrides = {
|
|
29
28
|
// Remote icon
|
|
30
29
|
[remoteIcon]: 1,
|
|
31
|
-
"☁️": 1,
|
|
32
|
-
"☁︎": 1,
|
|
33
30
|
// Unpushed icon
|
|
34
|
-
"⬆️": 1,
|
|
35
|
-
"⬆︎": 1,
|
|
36
31
|
"⬆": 1,
|
|
37
32
|
// Branch type icons
|
|
38
33
|
"⚡": 1,
|
|
@@ -51,6 +46,11 @@ const iconWidthOverrides = {
|
|
|
51
46
|
"✅": 1,
|
|
52
47
|
"⚠️": 1,
|
|
53
48
|
};
|
|
49
|
+
const getIconWidth = (icon) => {
|
|
50
|
+
const baseWidth = stringWidth(icon);
|
|
51
|
+
const override = iconWidthOverrides[icon];
|
|
52
|
+
return override !== undefined ? Math.max(baseWidth, override) : baseWidth;
|
|
53
|
+
};
|
|
54
54
|
/**
|
|
55
55
|
* Converts BranchInfo to BranchItem with display properties
|
|
56
56
|
*/
|
|
@@ -59,7 +59,7 @@ export function formatBranchItem(branch, options = {}) {
|
|
|
59
59
|
const COLUMN_WIDTH = 2; // Fixed width for each icon column
|
|
60
60
|
// Helper to pad icon to fixed width
|
|
61
61
|
const padIcon = (icon) => {
|
|
62
|
-
const width =
|
|
62
|
+
const width = getIconWidth(icon);
|
|
63
63
|
const padding = Math.max(0, COLUMN_WIDTH - width);
|
|
64
64
|
return icon + " ".repeat(padding);
|
|
65
65
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branchFormatter.js","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,gBAAgB;AAChB,MAAM,WAAW,GAA+B;IAC9C,IAAI,EAAE,GAAG;IACT,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,aAAa,GAAuD;IACxE,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;CACnB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,GAAG;IACb,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,
|
|
1
|
+
{"version":3,"file":"branchFormatter.js","sourceRoot":"","sources":["../../../../src/cli/ui/utils/branchFormatter.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,gBAAgB;AAChB,MAAM,WAAW,GAA+B;IAC9C,IAAI,EAAE,GAAG;IACT,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,aAAa,GAAuD;IACxE,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;CACnB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,GAAG;IACb,OAAO,EAAE,IAAI;CACd,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,8EAA8E;AAC9E,yEAAyE;AACzE,MAAM,kBAAkB,GAA2B;IACjD,cAAc;IACd,CAAC,UAAU,CAAC,EAAE,CAAC;IACf,gBAAgB;IAChB,GAAG,EAAE,CAAC;IACN,oBAAoB;IACpB,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,wBAAwB;IACxB,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,sBAAsB;IACtB,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;CACR,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC,CAAC;AAMF;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAkB,EAClB,UAAyB,EAAE;IAE3B,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC;IAC/C,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,mCAAmC;IAE3D,oCAAoC;IACpC,MAAM,OAAO,GAAG,CAAC,IAAY,EAAU,EAAE;QACvC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC,CAAC;QAClD,OAAO,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,8CAA8C;IAC9C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAE/D,iCAAiC;IACjC,IAAI,cAA8B,CAAC;IACnC,IAAI,YAAoB,CAAC;IACzB,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;YAC3C,cAAc,GAAG,cAAc,CAAC;YAChC,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,QAAQ,CAAC;YAC1B,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,qEAAqE;IACrE,IAAI,WAAmB,CAAC;IACxB,IAAI,UAAU,EAAE,CAAC;QACf,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACrC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,YAAY,KAAK,KAAK,EAAE,CAAC;QACnD,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QAC5B,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAED,wBAAwB;IACxB,IAAI,aAAqB,CAAC;IAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED,uCAAuC;IACvC,uDAAuD;IACvD,MAAM,KAAK,GAAG,GAAG,cAAc,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAE7F,kCAAkC;IAClC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3C,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,CAAC,IAAI,CACR,cAAc,KAAK,QAAQ;YACzB,CAAC,CAAC,aAAa,CAAC,MAAM;YACtB,CAAC,CAAC,aAAa,CAAC,YAAY,CAC/B,CAAC;IACJ,CAAC;IACD,oCAAoC;IACpC,IAAI,UAAU,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACrC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,YAAY,KAAK,KAAK,EAAE,CAAC;QACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;SAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,OAAO;QACL,sCAAsC;QACtC,GAAG,MAAM;QACT,yBAAyB;QACzB,KAAK;QACL,cAAc;QACd,UAAU;QACV,KAAK;QACL,KAAK,EAAE,MAAM,CAAC,IAAI;KACnB,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,YAAY,CACnB,QAAsB,EACtB,WAAsC;IAEtC,8BAA8B;IAC9B,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC;IAEpE,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,wCAAwC;QACxC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,SAAS;YAAE,OAAO,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS;YAAE,OAAO,CAAC,CAAC;QAE1C,oCAAoC;QACpC,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM;YAAE,OAAO,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM;YAAE,OAAO,CAAC,CAAC;QAEjE,4DAA4D;QAC5D,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;gBAAE,OAAO,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS;gBAAE,OAAO,CAAC,CAAC;QACzE,CAAC;QAED,4CAA4C;QAC5C,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC7D,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC7D,IAAI,YAAY,IAAI,CAAC,YAAY;YAAE,OAAO,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,YAAY,IAAI,YAAY;YAAE,OAAO,CAAC,CAAC;QAE5C,+DAA+D;QAC/D,MAAM,OAAO,GAAG,CAAC,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,CAAC,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,OAAO,OAAO,GAAG,OAAO,CAAC;QAC3B,CAAC;QAED,qDAAqD;QACrD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;QACpC,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;QACpC,IAAI,QAAQ,IAAI,CAAC,QAAQ;YAAE,OAAO,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,IAAI,QAAQ;YAAE,OAAO,CAAC,CAAC;QAEpC,gCAAgC;QAChC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAsB,EACtB,cAAyC,IAAI,GAAG,EAAE;IAElD,MAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC3D,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/branches.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAkBtE;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/branches.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAkBtE;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAqFtD;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAiD3B;AAsCD;;GAEG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB"}
|
|
@@ -22,10 +22,17 @@ function mapPullRequestState(state) {
|
|
|
22
22
|
* すべてのブランチ一覧を取得（マージステータスとWorktree情報付き）
|
|
23
23
|
*/
|
|
24
24
|
export async function listBranches() {
|
|
25
|
-
const
|
|
25
|
+
const repoRoot = await getRepositoryRoot();
|
|
26
|
+
// リモートブランチの最新情報を取得（失敗してもローカル情報にはフォールバック）
|
|
27
|
+
try {
|
|
28
|
+
await fetchAllRemotes({ cwd: repoRoot });
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
console.warn("Failed to fetch remote branches for Web UI; falling back to local branches", error);
|
|
32
|
+
}
|
|
33
|
+
const [branches, worktrees] = await Promise.all([
|
|
26
34
|
getAllBranches(),
|
|
27
35
|
listAdditionalWorktrees(),
|
|
28
|
-
getRepositoryRoot(),
|
|
29
36
|
]);
|
|
30
37
|
const divergenceMap = await buildDivergenceMap(branches, repoRoot);
|
|
31
38
|
const upstreamMap = await collectUpstreamMap(repoRoot);
|
|
@@ -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;AAO/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,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"branches.js","sourceRoot":"","sources":["../../../../src/web/server/services/branches.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@akiojin/gwt",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.4",
|
|
4
4
|
"description": "Interactive Git worktree manager for Claude Code with graphical branch selection",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -79,12 +79,6 @@
|
|
|
79
79
|
"@commitlint/cli": "^20.1.0",
|
|
80
80
|
"@commitlint/config-conventional": "^20.0.0",
|
|
81
81
|
"@playwright/test": "^1.51.0",
|
|
82
|
-
"@semantic-release/changelog": "^6.0.3",
|
|
83
|
-
"@semantic-release/commit-analyzer": "^13.0.1",
|
|
84
|
-
"@semantic-release/git": "^10.0.1",
|
|
85
|
-
"@semantic-release/github": "^12.0.0",
|
|
86
|
-
"@semantic-release/npm": "^13.1.1",
|
|
87
|
-
"@semantic-release/release-notes-generator": "^14.1.0",
|
|
88
82
|
"@testing-library/jest-dom": "^6.9.1",
|
|
89
83
|
"@testing-library/react": "^16.3.0",
|
|
90
84
|
"@types/node": "^24.10.1",
|
|
@@ -106,7 +100,6 @@
|
|
|
106
100
|
"lint-staged": "^16.2.7",
|
|
107
101
|
"prettier": "^3.6.2",
|
|
108
102
|
"rimraf": "^6.0.1",
|
|
109
|
-
"semantic-release": "^25.0.1",
|
|
110
103
|
"typescript": "^5.8.3",
|
|
111
104
|
"vite": "^7.2.4",
|
|
112
105
|
"vitest": "^4.0.8"
|
package/src/claude.ts
CHANGED
|
@@ -150,6 +150,10 @@ export async function launchClaudeCode(
|
|
|
150
150
|
...process.env,
|
|
151
151
|
...(options.envOverrides ?? {}),
|
|
152
152
|
};
|
|
153
|
+
const launchEnv =
|
|
154
|
+
options.skipPermissions && !baseEnv.IS_SANDBOX
|
|
155
|
+
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
156
|
+
: baseEnv;
|
|
153
157
|
|
|
154
158
|
const childStdio = createChildStdio();
|
|
155
159
|
|
|
@@ -168,10 +172,7 @@ export async function launchClaudeCode(
|
|
|
168
172
|
stdin: childStdio.stdin,
|
|
169
173
|
stdout: childStdio.stdout,
|
|
170
174
|
stderr: childStdio.stderr,
|
|
171
|
-
env:
|
|
172
|
-
isRoot && options.skipPermissions
|
|
173
|
-
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
174
|
-
: baseEnv,
|
|
175
|
+
env: launchEnv,
|
|
175
176
|
} as any);
|
|
176
177
|
} else {
|
|
177
178
|
// Fallback to bunx
|
|
@@ -207,10 +208,7 @@ export async function launchClaudeCode(
|
|
|
207
208
|
stdin: childStdio.stdin,
|
|
208
209
|
stdout: childStdio.stdout,
|
|
209
210
|
stderr: childStdio.stderr,
|
|
210
|
-
env:
|
|
211
|
-
isRoot && options.skipPermissions
|
|
212
|
-
? { ...baseEnv, IS_SANDBOX: "1" }
|
|
213
|
-
: baseEnv,
|
|
211
|
+
env: launchEnv,
|
|
214
212
|
} as any);
|
|
215
213
|
}
|
|
216
214
|
} finally {
|
|
@@ -313,16 +313,6 @@ describe("BranchListScreen", () => {
|
|
|
313
313
|
// Note: ink-testing-library may not render all branches due to viewport constraints
|
|
314
314
|
expect(timestampLines.length).toBeGreaterThanOrEqual(2);
|
|
315
315
|
|
|
316
|
-
// Icons that should be treated as width 1
|
|
317
|
-
const iconOverrides = new Set([
|
|
318
|
-
"\u2B06", // ⬆
|
|
319
|
-
"\u2601", // ☁
|
|
320
|
-
"\u26A1", // ⚡
|
|
321
|
-
"\u2728", // ✨
|
|
322
|
-
"\u2B50", // ⭐
|
|
323
|
-
"\u2705", // ✅
|
|
324
|
-
"\u26A0", // ⚠
|
|
325
|
-
]);
|
|
326
316
|
const timestampWidths = timestampLines.map((line) => {
|
|
327
317
|
const match = line.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/);
|
|
328
318
|
const index = match?.index ?? 0;
|
|
@@ -330,10 +320,6 @@ describe("BranchListScreen", () => {
|
|
|
330
320
|
|
|
331
321
|
let width = 0;
|
|
332
322
|
for (const char of Array.from(beforeTimestamp)) {
|
|
333
|
-
if (iconOverrides.has(char)) {
|
|
334
|
-
width += 1;
|
|
335
|
-
continue;
|
|
336
|
-
}
|
|
337
323
|
width += stringWidth(char);
|
|
338
324
|
}
|
|
339
325
|
return width;
|
|
@@ -32,7 +32,7 @@ describe("ExecutionModeSelectorScreen", () => {
|
|
|
32
32
|
<ExecutionModeSelectorScreen onBack={onBack} onSelect={onSelect} />,
|
|
33
33
|
);
|
|
34
34
|
|
|
35
|
-
expect(getByText(/
|
|
35
|
+
expect(getByText(/New/i)).toBeDefined();
|
|
36
36
|
expect(getByText(/Continue/i)).toBeDefined();
|
|
37
37
|
expect(getByText(/Resume/i)).toBeDefined();
|
|
38
38
|
});
|
|
@@ -25,6 +25,7 @@ vi.mock("../../../../git.ts", () => ({
|
|
|
25
25
|
getAllBranches: vi.fn(),
|
|
26
26
|
getRepositoryRoot: vi.fn(async () => "/repo"),
|
|
27
27
|
deleteBranch: vi.fn(async () => undefined),
|
|
28
|
+
fetchAllRemotes: vi.fn(async () => undefined),
|
|
28
29
|
}));
|
|
29
30
|
|
|
30
31
|
const { mockIsProtectedBranchName, mockSwitchToProtectedBranch } = vi.hoisted(
|
|
@@ -60,6 +61,7 @@ import {
|
|
|
60
61
|
getAllBranches,
|
|
61
62
|
getRepositoryRoot,
|
|
62
63
|
deleteBranch,
|
|
64
|
+
fetchAllRemotes,
|
|
63
65
|
} from "../../../../git.ts";
|
|
64
66
|
import {
|
|
65
67
|
listAdditionalWorktrees,
|
|
@@ -72,6 +74,7 @@ import {
|
|
|
72
74
|
const mockedGetAllBranches = getAllBranches as Mock;
|
|
73
75
|
const mockedGetRepositoryRoot = getRepositoryRoot as Mock;
|
|
74
76
|
const mockedDeleteBranch = deleteBranch as Mock;
|
|
77
|
+
const mockedFetchAllRemotes = fetchAllRemotes as Mock;
|
|
75
78
|
const mockedListAdditionalWorktrees = listAdditionalWorktrees as Mock;
|
|
76
79
|
const mockedCreateWorktree = createWorktree as Mock;
|
|
77
80
|
const mockedGenerateWorktreePath = generateWorktreePath as Mock;
|
|
@@ -95,6 +98,7 @@ describe("Navigation Integration Tests", () => {
|
|
|
95
98
|
mockedListAdditionalWorktrees.mockReset();
|
|
96
99
|
mockedGetRepositoryRoot.mockReset();
|
|
97
100
|
mockedDeleteBranch.mockReset();
|
|
101
|
+
mockedFetchAllRemotes.mockReset();
|
|
98
102
|
mockedCreateWorktree.mockReset();
|
|
99
103
|
mockedGenerateWorktreePath.mockReset();
|
|
100
104
|
mockedGetMergedPRWorktrees.mockReset();
|
|
@@ -267,6 +271,7 @@ describe("Protected Branch Navigation (T103)", () => {
|
|
|
267
271
|
mockedListAdditionalWorktrees.mockReset();
|
|
268
272
|
mockedGetRepositoryRoot.mockReset();
|
|
269
273
|
mockedDeleteBranch.mockReset();
|
|
274
|
+
mockedFetchAllRemotes.mockReset();
|
|
270
275
|
mockedCreateWorktree.mockReset();
|
|
271
276
|
mockedGenerateWorktreePath.mockReset();
|
|
272
277
|
mockedGetMergedPRWorktrees.mockReset();
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
formatBranchItems,
|
|
5
5
|
} from "../../utils/branchFormatter.js";
|
|
6
6
|
import type { BranchInfo } from "../../types.js";
|
|
7
|
+
import stringWidth from "string-width";
|
|
7
8
|
|
|
8
9
|
describe("branchFormatter", () => {
|
|
9
10
|
describe("formatBranchItem", () => {
|
|
@@ -127,6 +128,30 @@ describe("branchFormatter", () => {
|
|
|
127
128
|
expect(remoteResult.label).toMatch(/☁(?:️|︎)?\s+origin/);
|
|
128
129
|
});
|
|
129
130
|
|
|
131
|
+
it("should keep icon columns fixed-width when using wide emoji icons", () => {
|
|
132
|
+
const branchInfo: BranchInfo = {
|
|
133
|
+
name: "feature/wide-icons",
|
|
134
|
+
type: "remote",
|
|
135
|
+
branchType: "feature",
|
|
136
|
+
isCurrent: false,
|
|
137
|
+
hasUnpushedCommits: true,
|
|
138
|
+
worktree: {
|
|
139
|
+
path: "/path/to/worktree",
|
|
140
|
+
locked: false,
|
|
141
|
+
prunable: false,
|
|
142
|
+
isAccessible: true,
|
|
143
|
+
},
|
|
144
|
+
};
|
|
145
|
+
|
|
146
|
+
const result = formatBranchItem(branchInfo, { hasChanges: true });
|
|
147
|
+
|
|
148
|
+
// Four icon columns should occupy exactly 8 columns (4 * COLUMN_WIDTH)
|
|
149
|
+
const iconBlockWidth =
|
|
150
|
+
stringWidth(result.label) - stringWidth(branchInfo.name);
|
|
151
|
+
|
|
152
|
+
expect(iconBlockWidth).toBe(8);
|
|
153
|
+
});
|
|
154
|
+
|
|
130
155
|
it("should include worktree status icon when provided", () => {
|
|
131
156
|
const branchInfo: BranchInfo = {
|
|
132
157
|
name: "feature/test",
|
|
@@ -14,12 +14,8 @@ import chalk from "chalk";
|
|
|
14
14
|
const WIDTH_OVERRIDES: Record<string, number> = {
|
|
15
15
|
// Remote icon
|
|
16
16
|
"☁": 1,
|
|
17
|
-
"☁️": 1,
|
|
18
|
-
"☁︎": 1,
|
|
19
17
|
// Unpushed icon
|
|
20
18
|
"⬆": 1,
|
|
21
|
-
"⬆️": 1,
|
|
22
|
-
"⬆︎": 1,
|
|
23
19
|
// Branch type icons
|
|
24
20
|
"⚡": 1,
|
|
25
21
|
"✨": 1,
|
|
@@ -38,15 +34,16 @@ const WIDTH_OVERRIDES: Record<string, number> = {
|
|
|
38
34
|
"⚠️": 1,
|
|
39
35
|
};
|
|
40
36
|
|
|
37
|
+
const getCharWidth = (char: string): number => {
|
|
38
|
+
const baseWidth = stringWidth(char);
|
|
39
|
+
const override = WIDTH_OVERRIDES[char];
|
|
40
|
+
return override !== undefined ? Math.max(baseWidth, override) : baseWidth;
|
|
41
|
+
};
|
|
42
|
+
|
|
41
43
|
const measureDisplayWidth = (value: string): number => {
|
|
42
44
|
let width = 0;
|
|
43
45
|
for (const char of Array.from(value)) {
|
|
44
|
-
|
|
45
|
-
if (override !== undefined) {
|
|
46
|
-
width += override;
|
|
47
|
-
continue;
|
|
48
|
-
}
|
|
49
|
-
width += stringWidth(char);
|
|
46
|
+
width += getCharWidth(char);
|
|
50
47
|
}
|
|
51
48
|
return width;
|
|
52
49
|
};
|
|
@@ -266,8 +263,7 @@ export function BranchListScreen({
|
|
|
266
263
|
let result = "";
|
|
267
264
|
|
|
268
265
|
for (const char of Array.from(value)) {
|
|
269
|
-
const
|
|
270
|
-
const charWidth = override !== undefined ? override : stringWidth(char);
|
|
266
|
+
const charWidth = getCharWidth(char);
|
|
271
267
|
if (currentWidth + charWidth + ellipsisWidth > maxWidth) {
|
|
272
268
|
break;
|
|
273
269
|
}
|
|
@@ -280,7 +276,8 @@ export function BranchListScreen({
|
|
|
280
276
|
|
|
281
277
|
const renderBranchRow = useCallback(
|
|
282
278
|
(item: BranchItem, isSelected: boolean, context: { columns: number }) => {
|
|
283
|
-
|
|
279
|
+
// Use a small safety margin to avoid terminal-dependent wrapping
|
|
280
|
+
const columns = Math.max(20, context.columns - 1);
|
|
284
281
|
const arrow = isSelected ? ">" : " ";
|
|
285
282
|
const timestampText = formatLatestCommit(item.latestCommitTimestamp);
|
|
286
283
|
const timestampWidth = stringWidth(timestampText);
|
|
@@ -308,32 +305,17 @@ export function BranchListScreen({
|
|
|
308
305
|
const indicatorPrefix = indicatorIcon ? `${indicatorIcon} ` : "";
|
|
309
306
|
const staticPrefix = `${arrow} ${indicatorPrefix}`;
|
|
310
307
|
const staticPrefixWidth = measureDisplayWidth(staticPrefix);
|
|
311
|
-
|
|
312
|
-
const
|
|
313
|
-
staticPrefixWidth,
|
|
314
|
-
columns - timestampWidth - 1,
|
|
315
|
-
);
|
|
316
|
-
const maxLabelWidth = Math.max(0, availableLeftWidth - staticPrefixWidth);
|
|
308
|
+
const maxLeftDisplayWidth = Math.max(0, columns - timestampWidth - 1);
|
|
309
|
+
const maxLabelWidth = Math.max(0, maxLeftDisplayWidth - staticPrefixWidth);
|
|
317
310
|
const truncatedLabel = truncateToWidth(item.label, maxLabelWidth);
|
|
318
311
|
const leftText = `${staticPrefix}${truncatedLabel}`;
|
|
319
312
|
|
|
320
|
-
const leftMeasuredWidth = stringWidth(leftText);
|
|
321
313
|
const leftDisplayWidth = measureDisplayWidth(leftText);
|
|
322
|
-
const
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
const
|
|
327
|
-
1,
|
|
328
|
-
columns - leftDisplayWidth - timestampWidth,
|
|
329
|
-
);
|
|
330
|
-
const cursorShift = Math.max(0, displayGapWidth - baseGapWidth);
|
|
331
|
-
|
|
332
|
-
const gap = " ".repeat(baseGapWidth);
|
|
333
|
-
const cursorAdjust = cursorShift > 0 ? `\u001b[${cursorShift}C` : "";
|
|
334
|
-
|
|
335
|
-
let line = `${leftText}${gap}${cursorAdjust}${timestampText}`;
|
|
336
|
-
const paddingWidth = Math.max(0, columns - stringWidth(line));
|
|
314
|
+
const gapWidth = Math.max(1, columns - leftDisplayWidth - timestampWidth);
|
|
315
|
+
|
|
316
|
+
let line = `${leftText}${" ".repeat(gapWidth)}${timestampText}`;
|
|
317
|
+
const totalDisplayWidth = leftDisplayWidth + gapWidth + timestampWidth;
|
|
318
|
+
const paddingWidth = Math.max(0, columns - totalDisplayWidth);
|
|
337
319
|
if (paddingWidth > 0) {
|
|
338
320
|
line += " ".repeat(paddingWidth);
|
|
339
321
|
}
|
|
@@ -32,7 +32,7 @@ export interface ExecutionModeSelectorScreenProps {
|
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
34
|
* ExecutionModeSelectorScreen - Screen for selecting execution mode (2-step)
|
|
35
|
-
* Step 1: Select mode (
|
|
35
|
+
* Step 1: Select mode (New/Continue/Resume)
|
|
36
36
|
* Step 2: Select skip permissions (Yes/No)
|
|
37
37
|
* Layout: Header + Selection + Footer
|
|
38
38
|
*/
|
|
@@ -62,7 +62,7 @@ export function ExecutionModeSelectorScreen({
|
|
|
62
62
|
// Execution mode options (Step 1)
|
|
63
63
|
const modeItems: ExecutionModeItem[] = [
|
|
64
64
|
{
|
|
65
|
-
label: "
|
|
65
|
+
label: "New",
|
|
66
66
|
value: "normal",
|
|
67
67
|
description: "Start fresh session",
|
|
68
68
|
},
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
getAllBranches,
|
|
4
4
|
hasUnpushedCommitsInRepo,
|
|
5
5
|
getRepositoryRoot,
|
|
6
|
+
fetchAllRemotes,
|
|
6
7
|
} from "../../../git.js";
|
|
7
8
|
import { listAdditionalWorktrees } from "../../../worktree.js";
|
|
8
9
|
import { getPullRequestByBranch } from "../../../github.js";
|
|
@@ -40,6 +41,17 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
|
|
|
40
41
|
setError(null);
|
|
41
42
|
|
|
42
43
|
try {
|
|
44
|
+
const repoRoot = await getRepositoryRoot();
|
|
45
|
+
|
|
46
|
+
// リモートブランチの最新情報を取得（失敗してもローカル表示は継続）
|
|
47
|
+
try {
|
|
48
|
+
await fetchAllRemotes({ cwd: repoRoot });
|
|
49
|
+
} catch (fetchError) {
|
|
50
|
+
if (process.env.DEBUG) {
|
|
51
|
+
console.warn("Failed to fetch remote branches", fetchError);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
43
55
|
const [branchesData, worktreesData] = await Promise.all([
|
|
44
56
|
getAllBranches(),
|
|
45
57
|
listAdditionalWorktrees(),
|
|
@@ -61,9 +73,6 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
|
|
|
61
73
|
worktreeMap.set(worktree.branch, uiWorktreeInfo);
|
|
62
74
|
}
|
|
63
75
|
|
|
64
|
-
// Get repository root for unpushed commits check
|
|
65
|
-
const repoRoot = await getRepositoryRoot();
|
|
66
|
-
|
|
67
76
|
// Attach worktree info and check unpushed/PR status for local branches
|
|
68
77
|
const enrichedBranches = await Promise.all(
|
|
69
78
|
branchesData.map(async (branch) => {
|
|
@@ -34,17 +34,12 @@ const changeIcons = {
|
|
|
34
34
|
|
|
35
35
|
const remoteIcon = "☁";
|
|
36
36
|
|
|
37
|
-
//
|
|
38
|
-
//
|
|
39
|
-
// keep the column layout consistent across environments.
|
|
37
|
+
// Emoji width varies by terminal. Provide explicit minimum widths so we never
|
|
38
|
+
// underestimate and accidentally push the row past the terminal columns.
|
|
40
39
|
const iconWidthOverrides: Record<string, number> = {
|
|
41
40
|
// Remote icon
|
|
42
41
|
[remoteIcon]: 1,
|
|
43
|
-
"☁️": 1,
|
|
44
|
-
"☁︎": 1,
|
|
45
42
|
// Unpushed icon
|
|
46
|
-
"⬆️": 1,
|
|
47
|
-
"⬆︎": 1,
|
|
48
43
|
"⬆": 1,
|
|
49
44
|
// Branch type icons
|
|
50
45
|
"⚡": 1,
|
|
@@ -64,6 +59,12 @@ const iconWidthOverrides: Record<string, number> = {
|
|
|
64
59
|
"⚠️": 1,
|
|
65
60
|
};
|
|
66
61
|
|
|
62
|
+
const getIconWidth = (icon: string): number => {
|
|
63
|
+
const baseWidth = stringWidth(icon);
|
|
64
|
+
const override = iconWidthOverrides[icon];
|
|
65
|
+
return override !== undefined ? Math.max(baseWidth, override) : baseWidth;
|
|
66
|
+
};
|
|
67
|
+
|
|
67
68
|
export interface FormatOptions {
|
|
68
69
|
hasChanges?: boolean;
|
|
69
70
|
}
|
|
@@ -80,7 +81,7 @@ export function formatBranchItem(
|
|
|
80
81
|
|
|
81
82
|
// Helper to pad icon to fixed width
|
|
82
83
|
const padIcon = (icon: string): string => {
|
|
83
|
-
const width =
|
|
84
|
+
const width = getIconWidth(icon);
|
|
84
85
|
const padding = Math.max(0, COLUMN_WIDTH - width);
|
|
85
86
|
return icon + " ".repeat(padding);
|
|
86
87
|
};
|
|
@@ -37,10 +37,21 @@ function mapPullRequestState(state: string): "open" | "merged" | "closed" {
|
|
|
37
37
|
* すべてのブランチ一覧を取得（マージステータスとWorktree情報付き）
|
|
38
38
|
*/
|
|
39
39
|
export async function listBranches(): Promise<Branch[]> {
|
|
40
|
-
const
|
|
40
|
+
const repoRoot = await getRepositoryRoot();
|
|
41
|
+
|
|
42
|
+
// リモートブランチの最新情報を取得（失敗してもローカル情報にはフォールバック）
|
|
43
|
+
try {
|
|
44
|
+
await fetchAllRemotes({ cwd: repoRoot });
|
|
45
|
+
} catch (error) {
|
|
46
|
+
console.warn(
|
|
47
|
+
"Failed to fetch remote branches for Web UI; falling back to local branches",
|
|
48
|
+
error,
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const [branches, worktrees] = await Promise.all([
|
|
41
53
|
getAllBranches(),
|
|
42
54
|
listAdditionalWorktrees(),
|
|
43
|
-
getRepositoryRoot(),
|
|
44
55
|
]);
|
|
45
56
|
const divergenceMap = await buildDivergenceMap(branches, repoRoot);
|
|
46
57
|
const upstreamMap = await collectUpstreamMap(repoRoot);
|