YeonGyu-Kim
3ddc757b15
Root cause: bun build --target bun inlines top-level
var { spawn } = globalThis.Bun;
for every file that contains 'import { spawn } from "bun"'. On Node/Electron
where globalThis.Bun is undefined, this crashes with
Cannot destructure property 'spawn' of 'globalThis.Bun' as it is undefined.
26 source files had this import; the bundled output had 25 top-level destructures.
Fix:
- Add src/shared/bun-spawn-shim.ts: a thin wrapper that
- delegates to Bun.spawn/spawnSync when globalThis.Bun is present (real Bun)
- falls back to static ESM imports of node:child_process otherwise
- uses static 'import { spawn } from "node:child_process"' so Bun bundler
does NOT emit any globalThis.Bun destructures for this module
- Replace all 26 'from "bun"' spawn/spawnSync imports with relative paths to shim
- Replace 4 direct Bun.spawn() call sites with shim's spawn()
- Remove src/electron-compat.ts and script/prepend-electron-shim.ts (no longer needed)
- Update src/electron-compat.test.ts to assert 0 top-level globalThis.Bun destructures
Verification: grep -c '} = globalThis.Bun;' dist/index.js → 0 (was 25)
All 5921 tests pass (1 pre-existing timeout failure unrelated to this change).
Fixes #3797
79 lines
2.7 KiB
TypeScript
79 lines
2.7 KiB
TypeScript
import fs from "node:fs/promises"
|
|
import path from "node:path"
|
|
|
|
import type { TeamModeConfig } from "./manager"
|
|
import { spawn as bunSpawn } from "../../../shared/bun-spawn-shim"
|
|
|
|
async function runGit(args: string[]): Promise<{ code: number; stderr: string }> {
|
|
const process = bunSpawn({ cmd: ["git", ...args], stdout: "pipe", stderr: "pipe" })
|
|
const [exitCode, stderrText] = await Promise.all([process.exited, new Response(process.stderr).text()])
|
|
return { code: exitCode, stderr: stderrText }
|
|
}
|
|
|
|
export async function removeWorktree(worktreePath: string): Promise<void> {
|
|
await fs.rm(worktreePath, { recursive: true, force: true })
|
|
|
|
const rootLookup = bunSpawn({
|
|
cmd: ["git", "-C", worktreePath, "rev-parse", "--show-superproject-working-tree"],
|
|
stdout: "pipe",
|
|
stderr: "pipe",
|
|
})
|
|
const [rootExitCode, rootStdout] = await Promise.all([
|
|
rootLookup.exited,
|
|
new Response(rootLookup.stdout).text(),
|
|
new Response(rootLookup.stderr).text(),
|
|
])
|
|
const result =
|
|
rootExitCode === 0 && rootStdout.trim().length > 0
|
|
? await runGit(["-C", rootStdout.trim(), "worktree", "remove", "--force", worktreePath])
|
|
: await runGit(["worktree", "remove", "--force", worktreePath])
|
|
|
|
if (
|
|
result.code !== 0 &&
|
|
!result.stderr.includes("not a worktree") &&
|
|
!result.stderr.includes("not a working tree") &&
|
|
!result.stderr.includes("already removed")
|
|
) {
|
|
throw new Error(result.stderr.trim() || "git worktree remove failed")
|
|
}
|
|
|
|
if (rootExitCode === 0 && rootStdout.trim().length > 0) {
|
|
await runGit(["-C", rootStdout.trim(), "worktree", "prune"])
|
|
}
|
|
}
|
|
|
|
export async function findOrphanWorktrees(baseDir: string, _config: TeamModeConfig): Promise<string[]> {
|
|
const orphanWorktrees: string[] = []
|
|
const worktreesDir = path.join(baseDir, "worktrees")
|
|
|
|
let teamRunDirectories: string[]
|
|
try {
|
|
teamRunDirectories = await fs.readdir(worktreesDir)
|
|
} catch {
|
|
return orphanWorktrees
|
|
}
|
|
|
|
for (const teamRunId of teamRunDirectories) {
|
|
const teamRunPath = path.join(worktreesDir, teamRunId)
|
|
const memberNames = await fs.readdir(teamRunPath).catch(() => [])
|
|
|
|
for (const memberName of memberNames) {
|
|
const worktreePath = path.join(teamRunPath, memberName)
|
|
const statePath = path.join(baseDir, "runtime", teamRunId, "state.json")
|
|
|
|
try {
|
|
const stateContents = await fs.readFile(statePath, "utf8")
|
|
const state = JSON.parse(stateContents) as { status?: string }
|
|
|
|
if (state.status !== "active" && state.status !== "shutdown_requested") {
|
|
orphanWorktrees.push(worktreePath)
|
|
}
|
|
} catch {
|
|
orphanWorktrees.push(worktreePath)
|
|
}
|
|
}
|
|
}
|
|
|
|
return orphanWorktrees
|
|
}
|