defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Fix list command to skip empty JSON output and batch stale-review cleanup

Browse Source 
Collapse redundant empty-session branch so --json falls through to the
normal serialization path instead of printing "[]" separately. Replace
per-branch load/save loop with a single state cycle to avoid racing
concurrent writes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Chris Wanstrath 2026-03-19 11:29:22 -07:00
parent e8e5b850a0
commit 2da22b940a
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/commands/list.ts
View File

@ -30,15 +30,11 @@ export async function action(opts: { json?: boolean }) {
} catch {}
}
if (sessions.length === 0) {
if (opts.json) {
console.log("[]")
} else {
if (sessions.length === 0 && !opts.json) {
console.log("◆ No active sessions.")
if ((await vm.status()) !== "running") {
console.log(`\n${red}VM is not running.${reset}`)
}
}
return
}
@ -61,13 +57,13 @@ export async function action(opts: { json?: boolean }) {
)
const statuses = Object.fromEntries(statusEntries)
// Clear stale in_review flags via setSession to avoid clobbering concurrent writes
// Clear stale in_review flags in a single load/save cycle
if (staleReviewBranches.length > 0) {
const fresh = await state.load(root)
for (const branch of staleReviewBranches) {
const fresh = await state.getSession(root, branch)
if (fresh) {
fresh.in_review = false
await state.setSession(root, fresh).catch(() => {})
if (fresh.sessions[branch]) fresh.sessions[branch].in_review = false
}
await state.save(root, fresh).catch(() => {})
}
if (opts.json) {
@ -76,13 +72,13 @@ export async function action(opts: { json?: boolean }) {
return
}
const styles: Record<string, { icon: string; color: string }> = {
idle: { icon: `${dim}◯${reset}`, color: dim },
active: { icon: `${cyan}◎${reset}`, color: cyan },
dirty: { icon: `${yellow}◐${reset}`, color: yellow },
saved: { icon: `${green}●${reset}`, color: green },
review: { icon: `${magenta}⦿${reset}`, color: magenta },
}
const styleDefs: [string, string, string][] = [
["idle", dim, "◯"], ["active", cyan, "◎"], ["dirty", yellow, "◐"],
["saved", green, "●"], ["review", magenta, "⦿"],
]
const styles = Object.fromEntries(
styleDefs.map(([k, c, ch]) => [k, { icon: `${c}${ch}${reset}`, color: c }])
)
const branchWidth = Math.max(6, ...sessions.map((s) => s.branch.length))
const cols = process.stdout.columns || 80
const prefixWidth = branchWidth + 4