Skip to content

fix(reset): clean up all team dirs on --reset, not just current window #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
namastex888 merged 5 commits into from
Mar 16, 2026
Merged

fix(reset): clean up all team dirs on --reset, not just current window #593

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff5951e
Merge pull request #539 from automagik-dev/fix/resolve-dev-main-conflict
namastex888 Mar 14, 2026
b4b58bb
Merge pull request #544 from automagik-dev/dev
namastex888 Mar 14, 2026
2b8f17f
Merge pull request #557 from automagik-dev/dev
namastex888 Mar 14, 2026
e8bbfd5
fix(reset): clean up all team dirs on --reset, not just current window
clawtom Mar 16, 2026
aeff40a
fix: use session ID instead of name in tmux calls to prevent injection
clawtom Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/genie-commands/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,16 @@ async function deriveWindowName(sessionName: string, workspaceDir: string, team?
async function handleReset(sessionName: string, windowName: string): Promise<void> {
const existing = await tmux.findSessionByName(sessionName);
if (existing) {
// Collect all window names BEFORE killing the session
const windows = await tmux.listWindows(existing.id);
console.log(`Resetting session "${sessionName}"...`);
await tmux.killSession(sessionName);
await tmux.killSession(existing.id);
// Delete native team dirs for ALL windows in the session
await Promise.all(windows.map((w) => deleteNativeTeam(w.name)));
} else {
// Session not running — still clean up the current window's team dir
await deleteNativeTeam(windowName);
}
await deleteNativeTeam(windowName);
}

function attachToWindow(sessionName: string, windowName: string): void {
Expand Down