defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Revert "Add stale worktree detection to list command"

Browse Source 
This reverts commit 003c42bc03.
This commit is contained in:
Chris Wanstrath 2026-03-11 13:57:27 -07:00
parent ea2a3752fe
commit 56742224a5
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands/list.ts
View File

@ -46,7 +46,6 @@ export async function action(opts: { json?: boolean }) {
// Determine status for each session in parallel // Determine status for each session in parallel
const statusEntries = await Promise.all( const statusEntries = await Promise.all(
sessions.map(async (s): Promise<[string, string]> => { sessions.map(async (s): Promise<[string, string]> => {
if (!(await git.isValidWorktree(s.worktree))) return [s.branch, "stale"]
if (await vm.isClaudeActive(s.worktree, s.branch)) return [s.branch, "active"] if (await vm.isClaudeActive(s.worktree, s.branch)) return [s.branch, "active"]
const dirty = await git.isDirty(s.worktree) const dirty = await git.isDirty(s.worktree)
if (dirty) return [s.branch, "dirty"] if (dirty) return [s.branch, "dirty"]
@ -62,8 +61,8 @@ export async function action(opts: { json?: boolean }) {
return return
} }
const icons: Record<string, string> = { idle: `${dim}◯${reset}`, active: `${cyan}◎${reset}`, dirty: `${yellow}◐${reset}`, saved: `${green}●${reset}`, stale: `${red}✖${reset}` } const icons: Record<string, string> = { idle: `${dim}◯${reset}`, active: `${cyan}◎${reset}`, dirty: `${yellow}◐${reset}`, saved: `${green}●${reset}` }
const branchColors: Record<string, string> = { idle: dim, active: cyan, dirty: yellow, saved: green, stale: red } const branchColors: Record<string, string> = { idle: dim, active: cyan, dirty: yellow, saved: green }
const branchWidth = Math.max(6, ...sessions.map((s) => s.branch.length)) const branchWidth = Math.max(6, ...sessions.map((s) => s.branch.length))
const cols = process.stdout.columns || 80 const cols = process.stdout.columns || 80
const prefixWidth = branchWidth + 4 const prefixWidth = branchWidth + 4
@ -71,7 +70,7 @@ export async function action(opts: { json?: boolean }) {
console.log(` ${dim}${"BRANCH".padEnd(branchWidth)} PROMPT${reset}`) console.log(` ${dim}${"BRANCH".padEnd(branchWidth)} PROMPT${reset}`)
for (const s of sessions) { for (const s of sessions) {
const prompt = status === "stale" ? "broken worktree — close with -f to clean up" : (s.prompt ?? "").split("\n")[0] const prompt = (s.prompt ?? "").split("\n")[0]
const status = statuses[s.branch] const status = statuses[s.branch]
const icon = icons[status] const icon = icons[status]
const bc = branchColors[status] const bc = branchColors[status]
@ -80,9 +79,7 @@ export async function action(opts: { json?: boolean }) {
console.log(`${icon} ${bc}${s.branch.padEnd(branchWidth)}${reset} ${dim}${truncated}${reset}`) console.log(`${icon} ${bc}${s.branch.padEnd(branchWidth)}${reset} ${dim}${truncated}${reset}`)
} }
const hasStale = Object.values(statuses).includes("stale") console.log(`\n${dim}◯ idle${reset} · ${cyan}◎ active${reset} · ${yellow}◐ unsaved${reset} · ${green}● saved${reset}`)
const legend = `${dim}◯ idle${reset} · ${cyan}◎ active${reset} · ${yellow}◐ unsaved${reset} · ${green}● saved${reset}`
console.log(`\n${legend}${hasStale ? ` · ${red}✖ stale${reset} (run ${dim}sandlot close -f <branch>${reset} to clean up)` : ""}`)
if ((await vm.status()) !== "running") { if ((await vm.status()) !== "running") {
console.log(`\n${red}VM is not running.${reset}`) console.log(`\n${red}VM is not running.${reset}`)

9
src/git.ts
View File

@ -189,12 +189,6 @@ export async function rebaseAbort(cwd: string): Promise<void> {
} }
/** Check if a worktree has uncommitted changes. */ /** Check if a worktree has uncommitted changes. */
/** Check if a worktree path is a valid git directory. */
export async function isValidWorktree(worktreePath: string): Promise<boolean> {
const result = await $`git -C ${worktreePath} rev-parse --git-dir`.nothrow().quiet()
return result.exitCode === 0
}
export async function isDirty(worktreePath: string): Promise<boolean> { export async function isDirty(worktreePath: string): Promise<boolean> {
const result = await $`git -C ${worktreePath} status --porcelain`.nothrow().quiet() const result = await $`git -C ${worktreePath} status --porcelain`.nothrow().quiet()
if (result.exitCode !== 0) return false if (result.exitCode !== 0) return false
@ -233,8 +227,7 @@ export async function fileDiff(ref1: string, ref2: string, file: string, cwd: st
/** Check if a branch has commits beyond main. */ /** Check if a branch has commits beyond main. */
export async function hasNewCommits(worktreePath: string): Promise<boolean> { export async function hasNewCommits(worktreePath: string): Promise<boolean> {
let main: string const main = await mainBranch(worktreePath)
try { main = await mainBranch(worktreePath) } catch { return false }
const result = await $`git -C ${worktreePath} rev-list ${main}..HEAD --count`.nothrow().quiet() const result = await $`git -C ${worktreePath} rev-list ${main}..HEAD --count`.nothrow().quiet()
if (result.exitCode !== 0) return false if (result.exitCode !== 0) return false
return parseInt(result.text().trim(), 10) > 0 return parseInt(result.text().trim(), 10) > 0