@imdeadpool/guardex 7.0.37 → 7.0.39

package/README.md

@@ -266,6 +266,18 @@ Being honest about where this still has issues:
 <details open>
 <summary><strong>v7.x</strong></summary>
 
+### v7.0.39
+- Bumped `@imdeadpool/guardex` from `7.0.38` to `7.0.39` so the current
+  `main` payload can publish under a fresh npm version after `7.0.38` reached
+  the registry.
+- No new CLI command behavior is introduced in this release lane.
+
+### v7.0.38
+- Bumped `@imdeadpool/guardex` from `7.0.37` to `7.0.38` so the current
+  `main` payload can publish under a fresh npm version after `7.0.37` reached
+  the registry.
+- No new CLI command behavior is introduced in this release lane.
+
 ### v7.0.37
 - Bumped `@imdeadpool/guardex` from `7.0.36` to `7.0.37` so the current
   package can publish under a fresh npm version after `7.0.36` reached the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imdeadpool/guardex",
-  "version": "7.0.37",
+  "version": "7.0.39",
   "description": "Guardian T-Rex for your multi-agent repo. Isolated worktrees, file locks, and PR-only merges stop parallel Codex & Claude agents from overwriting each other's work. Auto-wires Oh My Codex, Oh My Claude, OpenSpec, and Caveman.",
   "license": "MIT",
   "preferGlobal": true,

package/src/cli/main.js

@@ -408,8 +408,9 @@ function runSetupBootstrapInternal(options) {
 }
 
 function extractAgentBranchStartMetadata(output) {
-  const branchMatch = String(output || '').match(/^\[agent-branch-start\] Created branch: (.+)$/m);
-  const worktreeMatch = String(output || '').match(/^\[agent-branch-start\] Worktree: (.+)$/m);
+  const outputText = String(output || '');
+  const branchMatch = outputText.match(/^\[agent-branch-start\] (?:Created branch|Reusing existing branch): (.+)$/m);
+  const worktreeMatch = outputText.match(/^\[agent-branch-start\] Worktree: (.+)$/m);
   return {
     branch: branchMatch ? branchMatch[1].trim() : '',
     worktreePath: worktreeMatch ? worktreeMatch[1].trim() : '',
@@ -656,7 +657,7 @@ function runSetupInSandbox(options, blocked, repoLabel = '') {
   const nestedResult = run(
     process.execPath,
     [__filename, ...buildSandboxSetupArgs(options, sandboxTarget)],
-    { cwd: metadata.worktreePath },
+    { cwd: metadata.worktreePath, env: { GUARDEX_DOCTOR_SANDBOX: '1' } },
   );
   if (isSpawnFailure(nestedResult)) {
     throw nestedResult.error;
@@ -701,6 +702,12 @@ function runSetupInSandbox(options, blocked, repoLabel = '') {
     console.log(`[${TOOL_NAME}] ${autoFinishSummary.details[0]}`);
   }
 
+  const prunePayload = doctorModule.pruneStaleAgentWorktrees(scanResult.repoRoot, {
+    baseBranch: currentBaseBranch,
+    dryRun: syncOptions.dryRun,
+  });
+  printWorktreePruneSummary(prunePayload, { baseBranch: currentBaseBranch });
+
   const cleanupResult = cleanupProtectedBaseSandbox(blocked.repoRoot, metadata);
   console.log(
     `[${TOOL_NAME}] Protected-base setup sandbox cleanup: ${cleanupResult.note} ` +
@@ -1755,6 +1762,26 @@ function runScanInternal(options) {
   };
 }
 
+function printWorktreePruneSummary(payload, options = {}) {
+  if (!payload || payload.enabled === false) {
+    if (payload && payload.details && payload.details[0]) {
+      console.log(`[${TOOL_NAME}] ${payload.details[0]}`);
+    }
+    return;
+  }
+  if (!payload.ran) {
+    return;
+  }
+  const baseLabel = options.baseBranch ? ` (base=${options.baseBranch})` : '';
+  const tag = payload.status === 'failed' ? '⚠️' : (payload.status === 'dry-run' ? '🔍' : '🧹');
+  console.log(
+    `[${TOOL_NAME}] ${tag} Stale agent-worktree prune${baseLabel}: status=${payload.status}`,
+  );
+  for (const detail of payload.details || []) {
+    console.log(`[${TOOL_NAME}]   ${detail}`);
+  }
+}
+
 function printScanResult(scan, json = false) {
   if (json) {
     process.stdout.write(
@@ -2369,6 +2396,12 @@ function doctor(rawArgs) {
       configureHooks,
       autoFinishReadyAgentBranches: doctorModule.autoFinishReadyAgentBranches,
     });
+    const primaryBaseBranch = currentBranchName(blocked.repoRoot);
+    const prunePayload = doctorModule.pruneStaleAgentWorktrees(blocked.repoRoot, {
+      baseBranch: primaryBaseBranch,
+      dryRun: singleRepoOptions.dryRun,
+    });
+    printWorktreePruneSummary(prunePayload, { baseBranch: primaryBaseBranch });
     return;
   }
 
@@ -2390,6 +2423,12 @@ function doctor(rawArgs) {
       dryRun: singleRepoOptions.dryRun,
       waitForMerge: singleRepoOptions.waitForMerge,
     });
+  const prunePayload = scanResult.guardexEnabled === false
+    ? { enabled: false, ran: false, status: 'skipped', details: ['Guardex disabled for this repo.'] }
+    : doctorModule.pruneStaleAgentWorktrees(scanResult.repoRoot, {
+      baseBranch: currentBaseBranch,
+      dryRun: singleRepoOptions.dryRun,
+    });
   const safe = scanResult.guardexEnabled === false || (scanResult.errors === 0 && scanResult.warnings === 0);
   const musafe = safe;
 
@@ -2414,6 +2453,7 @@ function doctor(rawArgs) {
             findings: scanResult.findings,
           },
           autoFinish: autoFinishSummary,
+          worktreePrune: prunePayload,
         },
         null,
         2,
@@ -2434,6 +2474,7 @@ function doctor(rawArgs) {
     baseBranch: currentBaseBranch,
     verbose: singleRepoOptions.verboseAutoFinish,
   });
+  printWorktreePruneSummary(prunePayload, { baseBranch: currentBaseBranch });
   if (safe) {
     console.log(colorizeDoctorOutput(`[${TOOL_NAME}] ✅ Repo is fully safe.`, 'safe'));
   } else {
@@ -2967,6 +3008,12 @@ function setup(rawArgs) {
       aggregateErrors += sandboxResult.scanResult.errors;
       aggregateWarnings += sandboxResult.scanResult.warnings;
       lastScanResult = sandboxResult.scanResult;
+      const primaryBaseBranch = currentBranchName(blocked.repoRoot);
+      const prunePayload = doctorModule.pruneStaleAgentWorktrees(blocked.repoRoot, {
+        baseBranch: primaryBaseBranch,
+        dryRun: perRepoOptions.dryRun,
+      });
+      printWorktreePruneSummary(prunePayload, { baseBranch: primaryBaseBranch });
       continue;
     }
 
@@ -2992,6 +3039,13 @@ function setup(rawArgs) {
     printAutoFinishSummary(autoFinishSummary, {
       baseBranch: currentBaseBranch,
     });
+    const prunePayload = scanResult.guardexEnabled === false
+      ? { enabled: false, ran: false, status: 'skipped', details: ['Guardex disabled for this repo.'] }
+      : doctorModule.pruneStaleAgentWorktrees(scanResult.repoRoot, {
+        baseBranch: currentBaseBranch,
+        dryRun: perRepoOptions.dryRun,
+      });
+    printWorktreePruneSummary(prunePayload, { baseBranch: currentBaseBranch });
     printSetupRepoHints(scanResult.repoRoot, currentBaseBranch, repoLabel);
 
     aggregateErrors += scanResult.errors;
@@ -3380,6 +3434,64 @@ function branch(rawArgs) {
   );
 }
 
+// `gx pivot` — single-tool-call escape from a protected branch into an isolated
+// agent worktree. AI agents (Claude Code / Codex) cannot set the bypass env
+// vars from inside a tool call, so they need a whitelisted command that does
+// the whole hop: branch+worktree creation, dirty-tree migration, and a clean
+// trailer (`WORKTREE_PATH=...`, `BRANCH=...`, `NEXT_STEP=cd ...`) the agent can
+// parse to know exactly where to `cd`.
+//
+// On an existing agent/* branch, `gx pivot` short-circuits and just prints the
+// current worktree path — safe to call as a no-op.
+function pivot(rawArgs) {
+  const { target, passthrough } = extractTargetedArgs(rawArgs);
+  const repoRoot = resolveRepoRoot(target);
+  const headProc = run('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: repoRoot });
+  const currentBranch = String(headProc.stdout || '').trim();
+  if (currentBranch.startsWith('agent/')) {
+    const wtProc = run('git', ['rev-parse', '--show-toplevel'], { cwd: repoRoot });
+    const wtPath = String(wtProc.stdout || '').trim() || repoRoot;
+    process.stdout.write(`[${TOOL_NAME} pivot] Already on agent branch '${currentBranch}'.\n`);
+    process.stdout.write(`WORKTREE_PATH=${wtPath}\n`);
+    process.stdout.write(`BRANCH=${currentBranch}\n`);
+    process.stdout.write(`NEXT_STEP=cd "${wtPath}"\n`);
+    process.exitCode = 0;
+    return;
+  }
+  const result = runPackageAsset('branchStart', passthrough, { cwd: repoRoot });
+  if (result.stdout) process.stdout.write(result.stdout);
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.status !== 0) {
+    process.exitCode = result.status || 1;
+    return;
+  }
+  const stdoutText = String(result.stdout || '');
+  const wtMatch = stdoutText.match(/^\[agent-branch-start\] Worktree:\s+(.+)$/m);
+  const branchMatch = stdoutText.match(/^\[agent-branch-start\] (?:Created branch|Reusing existing branch):\s+(.+)$/m);
+  if (wtMatch) {
+    const wtPath = wtMatch[1].trim();
+    process.stdout.write('\n');
+    process.stdout.write(`WORKTREE_PATH=${wtPath}\n`);
+    if (branchMatch) process.stdout.write(`BRANCH=${branchMatch[1].trim()}\n`);
+    process.stdout.write(`NEXT_STEP=cd "${wtPath}"\n`);
+  }
+  process.exitCode = 0;
+}
+
+// `gx ship` — alias for the canonical "I am done" command. Defaults to
+// `finish --via-pr --wait-for-merge --cleanup` so AI agents don't strand
+// commits or worktrees by accident. Any explicit user-supplied flags survive.
+function ship(rawArgs) {
+  const args = Array.isArray(rawArgs) ? rawArgs.slice() : [];
+  const ensureFlag = (flag) => {
+    if (!args.includes(flag)) args.push(flag);
+  };
+  ensureFlag('--via-pr');
+  ensureFlag('--wait-for-merge');
+  ensureFlag('--cleanup');
+  return finish(args);
+}
+
 function locks(rawArgs) {
   const { target, passthrough } = extractTargetedArgs(rawArgs);
   const result = runPackageAsset('lockTool', passthrough, { cwd: resolveRepoRoot(target) });
@@ -3637,6 +3749,8 @@ async function main() {
   if (command === 'prompt') return prompt(rest);
   if (command === 'doctor') return doctor(rest);
   if (command === 'branch') return branch(rest);
+  if (command === 'pivot') return pivot(rest);
+  if (command === 'ship') return ship(rest);
   if (command === 'locks') return locks(rest);
   if (command === 'worktree') return worktree(rest);
   if (command === 'hook') return hook(rest);

package/src/context.js

@@ -338,6 +338,8 @@ const SUGGESTIBLE_COMMANDS = [
   'setup',
   'doctor',
   'branch',
+  'pivot',
+  'ship',
   'locks',
   'worktree',
   'hook',
@@ -383,7 +385,9 @@ const CLI_COMMAND_GROUPS = [
     label: 'Branch workflow',
     description: 'The sandbox → commit → PR → merge loop for agent-owned branches.',
     commands: [
+      ['pivot', 'Auto-pivot from a protected branch into a fresh agent worktree (single tool call for AI agents)'],
       ['branch', 'CLI-owned branch workflow surface (start/finish/merge)'],
+      ['ship', 'Stage + commit + push + PR + auto-merge + cleanup (alias for `finish --via-pr --wait-for-merge --cleanup`)'],
       ['finish', 'Commit + PR + merge completed agent branches (--all, --branch)'],
       ['merge', 'Create/reuse an integration lane and merge overlapping agent branches'],
       ['sync', 'Sync agent branches with origin/<base>'],

package/src/doctor/index.js

@@ -1006,6 +1006,70 @@ function autoFinishReadyAgentBranches(repoRoot, options = {}) {
   return summary;
 }
 
+function pruneStaleAgentWorktrees(repoRoot, options = {}) {
+  const summary = {
+    enabled: true,
+    ran: false,
+    status: 'skipped',
+    details: [],
+  };
+
+  const dryRun = Boolean(options.dryRun);
+  const baseBranch = String(options.baseBranch || '').trim();
+
+  if (String(process.env.GUARDEX_DOCTOR_SANDBOX || '') === '1') {
+    summary.enabled = false;
+    summary.details.push('Skipped stale-worktree prune inside doctor sandbox pass.');
+    return summary;
+  }
+
+  if (String(process.env.GUARDEX_SKIP_AUTO_WORKTREE_PRUNE || '') === '1') {
+    summary.enabled = false;
+    summary.details.push('Skipped stale-worktree prune (GUARDEX_SKIP_AUTO_WORKTREE_PRUNE=1).');
+    return summary;
+  }
+
+  const idleMinutesRaw = Number(options.idleMinutes);
+  const idleMinutes = Number.isFinite(idleMinutesRaw) && idleMinutesRaw >= 0
+    ? Math.floor(idleMinutesRaw)
+    : 60;
+
+  const args = [
+    '--idle-minutes', String(idleMinutes),
+    '--delete-branches',
+    '--delete-remote-branches',
+    '--include-pr-merged',
+    '--force-dirty',
+  ];
+  if (baseBranch && baseBranch !== 'HEAD' && !baseBranch.startsWith('agent/')) {
+    args.push('--base', baseBranch);
+  }
+  if (dryRun) {
+    args.push('--dry-run');
+  }
+
+  const runResult = runPackageAsset('worktreePrune', args, { cwd: repoRoot });
+  summary.ran = true;
+  const stdout = String(runResult.stdout || '').trim();
+  const stderr = String(runResult.stderr || '').trim();
+  if (stdout) {
+    for (const line of stdout.split('\n')) {
+      if (line.trim()) summary.details.push(line);
+    }
+  }
+  if (runResult.status === 0) {
+    summary.status = dryRun ? 'dry-run' : 'pruned';
+  } else {
+    summary.status = 'failed';
+    if (stderr) {
+      summary.details.push(`[error] ${stderr.split('\n').slice(-2).join(' | ')}`);
+    } else {
+      summary.details.push(`[error] worktreePrune exited with status ${runResult.status}`);
+    }
+  }
+  return summary;
+}
+
 function executeDoctorSandboxLifecycle(options, blocked, metadata, integrations) {
   const execution = createDoctorSandboxExecutionState();
   const dryRun = Boolean(options.dryRun);
@@ -1206,7 +1270,7 @@ function runDoctorInSandbox(options, blocked, rawIntegrations = {}) {
   const nestedResult = run(
     process.execPath,
     [require.main?.filename || process.argv[1], ...buildSandboxDoctorArgs(options, sandboxTarget)],
-    { cwd: metadata.worktreePath },
+    { cwd: metadata.worktreePath, env: { GUARDEX_DOCTOR_SANDBOX: '1' } },
   );
   if (isSpawnFailure(nestedResult)) {
     throw nestedResult.error;
@@ -1242,5 +1306,6 @@ module.exports = {
   emitDoctorSandboxJsonOutput,
   emitDoctorSandboxConsoleOutput,
   autoFinishReadyAgentBranches,
+  pruneStaleAgentWorktrees,
   runDoctorInSandbox,
 };

package/src/sandbox/index.js

@@ -65,8 +65,9 @@ function assertProtectedMainWriteAllowed(options, commandName) {
 }
 
 function extractAgentBranchStartMetadata(output) {
-  const branchMatch = String(output || '').match(/^\[agent-branch-start\] Created branch: (.+)$/m);
-  const worktreeMatch = String(output || '').match(/^\[agent-branch-start\] Worktree: (.+)$/m);
+  const outputText = String(output || '');
+  const branchMatch = outputText.match(/^\[agent-branch-start\] (?:Created branch|Reusing existing branch): (.+)$/m);
+  const worktreeMatch = outputText.match(/^\[agent-branch-start\] Worktree: (.+)$/m);
   return {
     branch: branchMatch ? branchMatch[1].trim() : '',
     worktreePath: worktreeMatch ? worktreeMatch[1].trim() : '',

package/templates/scripts/agent-branch-finish.sh

@@ -508,7 +508,7 @@ is_local_branch_delete_error() {
 
 is_remote_branch_missing_error() {
   local output="$1"
-  if [[ "$output" == *"remote ref does not exist"* ]] || [[ "$output" == *"failed to push some refs"* ]]; then
+  if [[ "$output" == *"remote ref does not exist"* ]]; then
     return 0
   fi
   return 1
@@ -893,8 +893,8 @@ if [[ "$CLEANUP_AFTER_MERGE" -eq 1 ]]; then
         if is_remote_branch_missing_error "$remote_delete_output"; then
           echo "[agent-branch-finish] Remote branch '${SOURCE_BRANCH}' was already deleted; continuing cleanup." >&2
         else
+          echo "[agent-branch-finish] Warning: remote branch cleanup failed for '${SOURCE_BRANCH}' after merge; continuing local cleanup." >&2
           echo "$remote_delete_output" >&2
-          exit 1
         fi
       fi
     fi

package/templates/scripts/agent-branch-merge.sh

@@ -288,7 +288,7 @@ if [[ -z "$TARGET_BRANCH" ]]; then
   fi
 
   printf '%s\n' "$start_output"
-  TARGET_BRANCH="$(printf '%s\n' "$start_output" | sed -n 's/^\[agent-branch-start\] Created branch: //p' | head -n 1)"
+  TARGET_BRANCH="$(printf '%s\n' "$start_output" | sed -n -E 's/^\[agent-branch-start\] (Created branch|Reusing existing branch): //p' | head -n 1)"
   target_worktree="$(printf '%s\n' "$start_output" | sed -n 's/^\[agent-branch-start\] Worktree: //p' | head -n 1)"
   if [[ -z "$TARGET_BRANCH" || -z "$target_worktree" ]]; then
     echo "[agent-branch-merge] Unable to parse target branch/worktree from agent-branch-start output." >&2

package/templates/scripts/agent-branch-start.sh

@@ -15,6 +15,7 @@ OPENSPEC_CHANGE_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CHANGE_SLUG:-}"
 OPENSPEC_CAPABILITY_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CAPABILITY_SLUG:-}"
 OPENSPEC_MASTERPLAN_LABEL_RAW="${GUARDEX_OPENSPEC_MASTERPLAN_LABEL-masterplan}"
 OPENSPEC_TIER_RAW="${GUARDEX_OPENSPEC_TIER:-T3}"
+REUSE_EXISTING_RAW="${GUARDEX_BRANCH_START_REUSE_EXISTING:-true}"
 PRINT_NAME_ONLY=0
 POSITIONAL_ARGS=()
 
@@ -58,6 +59,14 @@ while [[ $# -gt 0 ]]; do
       OPENSPEC_TIER_RAW="${2:-$OPENSPEC_TIER_RAW}"
       shift 2
       ;;
+    --reuse-existing|--reuse)
+      REUSE_EXISTING_RAW="true"
+      shift
+      ;;
+    --new|--no-reuse|--no-reuse-existing)
+      REUSE_EXISTING_RAW="false"
+      shift
+      ;;
     --in-place|--allow-in-place)
       echo "[agent-branch-start] In-place branch mode is disabled." >&2
       echo "[agent-branch-start] This command always creates an isolated worktree to keep your active checkout unchanged." >&2
@@ -78,7 +87,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     -*)
       echo "[agent-branch-start] Unknown option: $1" >&2
-      echo "Usage: $0 [task] [agent] [base] [--worktree-root <path>] [--print-name-only]" >&2
+      echo "Usage: $0 [task] [agent] [base] [--worktree-root <path>] [--reuse-existing|--new] [--print-name-only]" >&2
       exit 1
       ;;
     *)
@@ -90,7 +99,7 @@ done
 
 if [[ "${#POSITIONAL_ARGS[@]}" -gt 3 ]]; then
   echo "[agent-branch-start] Too many positional arguments." >&2
-  echo "Usage: $0 [task] [agent] [base] [--worktree-root <path>]" >&2
+  echo "Usage: $0 [task] [agent] [base] [--worktree-root <path>] [--reuse-existing|--new]" >&2
   exit 1
 fi
 
@@ -254,6 +263,7 @@ normalize_bool() {
 }
 
 OPENSPEC_AUTO_INIT="$(normalize_bool "$OPENSPEC_AUTO_INIT_RAW" "1")"
+REUSE_EXISTING_WORKTREE="$(normalize_bool "$REUSE_EXISTING_RAW" "1")"
 
 normalize_tier() {
   local raw="${1:-}"
@@ -370,6 +380,22 @@ resolve_worktree_leaf() {
   printf '%s' "${branch_name//\//__}"
 }
 
+print_reused_agent_worktree() {
+  local branch_name="$1"
+  local worktree_path="$2"
+
+  echo "[agent-branch-start] Reusing existing branch: ${branch_name}"
+  echo "[agent-branch-start] Worktree: ${worktree_path}"
+  echo "[agent-branch-start] OpenSpec tier: ${OPENSPEC_TIER}"
+  echo "[agent-branch-start] OpenSpec change: existing worktree"
+  echo "[agent-branch-start] OpenSpec plan: existing worktree"
+  echo "[agent-branch-start] Next steps:"
+  echo "  cd \"${worktree_path}\""
+  echo "  gx locks claim --branch \"${branch_name}\" <file...>"
+  echo "  # continue work in this existing sandbox"
+  echo "  gx branch finish --branch \"${branch_name}\" --via-pr --wait-for-merge"
+}
+
 has_local_changes() {
   local root="$1"
   if ! git -C "$root" diff --quiet; then
@@ -550,6 +576,12 @@ if [[ "$BASE_BRANCH_EXPLICIT" -eq 1 && -z "$BASE_BRANCH" ]]; then
   exit 1
 fi
 
+current_branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
+if [[ "$REUSE_EXISTING_WORKTREE" -eq 1 && "$current_branch" == agent/* ]]; then
+  print_reused_agent_worktree "$current_branch" "$repo_root"
+  exit 0
+fi
+
 task_slug="$(sanitize_slug "$TASK_NAME" "task")"
 agent_slug="$(normalize_role "$AGENT_NAME")"
 if [[ "$WORKTREE_ROOT_EXPLICIT" -eq 0 ]]; then
@@ -681,6 +713,7 @@ if [[ -n "$auto_transfer_stash_ref" ]]; then
   fi
 fi
 
+hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" ".venv"
 hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "node_modules"
 hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/frontend/node_modules"
 hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/backend/node_modules"

package/templates/vscode/guardex-active-agents/extension.js

@@ -136,7 +136,7 @@ const MANAGED_REPO_SCAN_IGNORED_FOLDERS = [
 const SESSION_ACTIVITY_GROUPS = [
   { kind: 'blocked', label: 'BLOCKED' },
   { kind: 'working', label: 'WORKING NOW' },
-  { kind: 'finished', label: 'FINISHED' },
+  { kind: 'finished', label: 'NEEDS CLEANUP' },
   { kind: 'idle', label: 'THINKING' },
   { kind: 'stalled', label: 'STALLED' },
   { kind: 'dead', label: 'DEAD' },
@@ -571,7 +571,7 @@ function buildActiveAgentsStatusSummary(summary) {
   if (workingCount > 0 || finishedCount > 0 || idleCount > 0) {
     const parts = [`${workingCount} working`];
     if (finishedCount > 0) {
-      parts.push(`${finishedCount} finished`);
+      parts.push(`${finishedCount} needs cleanup`);
     }
     parts.push(`${idleCount} idle`);
     return `$(git-branch) ${parts.join(' · ')}`;
@@ -594,7 +594,7 @@ function buildActiveAgentsStatusTooltip(selectedSession, summary) {
   return [
     formatCountLabel(activeCount, 'active agent'),
     formatCountLabel(summary?.workingCount || 0, 'working now session', 'working now sessions'),
-    formatCountLabel(summary?.finishedCount || 0, 'finished session'),
+    formatCountLabel(summary?.finishedCount || 0, 'needs cleanup session'),
     formatCountLabel(summary?.idleCount || 0, 'idle session'),
     formatCountLabel(summary?.unassignedChangeCount || 0, 'unassigned change'),
     formatCountLabel(summary?.lockedFileCount || 0, 'locked file'),
@@ -681,7 +681,7 @@ function sessionFreshnessLabel(session, now = Date.now()) {
     return 'Needs attention';
   }
   if (session.activityKind === 'finished') {
-    return 'Finished';
+    return 'Needs cleanup';
   }
   if (session.activityKind === 'stalled') {
     return 'Possibly stale';
@@ -711,7 +711,7 @@ function sessionStatusLabel(session) {
     case 'working':
       return 'Working';
     case 'finished':
-      return 'Finished';
+      return 'Needs cleanup';
     case 'idle':
       return 'Idle';
     case 'stalled':
@@ -918,7 +918,7 @@ function buildWorktreeBranchDescription(sessions) {
 function buildOverviewDescription(summary) {
   return [
     formatCountLabel(summary?.workingCount || 0, 'working agent'),
-    formatCountLabel(summary?.finishedCount || 0, 'finished agent'),
+    formatCountLabel(summary?.finishedCount || 0, 'needs cleanup agent'),
     formatCountLabel(summary?.idleCount || 0, 'idle agent'),
     summary?.colonyTaskCount
       ? formatCountLabel(summary.colonyTaskCount, 'colony task')
@@ -2395,6 +2395,74 @@ function isPathWithin(parentPath, targetPath) {
   return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath));
 }
 
+function normalizeAbsolutePath(value) {
+  return typeof value === 'string' && value.trim() ? path.resolve(value) : '';
+}
+
+function isManagedWorktreePath(worktreePath) {
+  const normalizedWorktreePath = normalizeAbsolutePath(worktreePath);
+  if (!normalizedWorktreePath) {
+    return false;
+  }
+
+  return MANAGED_WORKTREE_RELATIVE_ROOTS.some((relativeRoot) => {
+    const normalizedRelativeRoot = path.normalize(relativeRoot);
+    const marker = `${path.sep}${normalizedRelativeRoot}${path.sep}`;
+    return normalizedWorktreePath.includes(marker);
+  });
+}
+
+function removeDeletedWorktreeWorkspaceFolder(worktreePath) {
+  if (typeof vscode.workspace.updateWorkspaceFolders !== 'function') {
+    return false;
+  }
+
+  const normalizedWorktreePath = normalizeAbsolutePath(worktreePath);
+  if (!normalizedWorktreePath) {
+    return false;
+  }
+
+  const workspaceFolders = vscode.workspace.workspaceFolders || [];
+  const folderIndex = workspaceFolders.findIndex((folder) => (
+    normalizeAbsolutePath(folder?.uri?.fsPath) === normalizedWorktreePath
+  ));
+  if (folderIndex < 0) {
+    return false;
+  }
+
+  try {
+    return vscode.workspace.updateWorkspaceFolders(folderIndex, 1) === true;
+  } catch (_error) {
+    return false;
+  }
+}
+
+async function closeDeletedWorktreeRepository(worktreePath) {
+  const normalizedWorktreePath = normalizeAbsolutePath(worktreePath);
+  if (!normalizedWorktreePath || fs.existsSync(normalizedWorktreePath)) {
+    return false;
+  }
+
+  try {
+    await vscode.commands.executeCommand('git.close', vscode.Uri.file(normalizedWorktreePath));
+  } catch (_error) {
+    // The Git extension may have already removed this repository.
+  }
+
+  removeDeletedWorktreeWorkspaceFolder(normalizedWorktreePath);
+  return true;
+}
+
+function findDeletedManagedWorkspaceFolders() {
+  return (vscode.workspace.workspaceFolders || [])
+    .map((folder) => normalizeAbsolutePath(folder?.uri?.fsPath))
+    .filter((workspacePath) => (
+      workspacePath
+      && !fs.existsSync(workspacePath)
+      && isManagedWorktreePath(workspacePath)
+    ));
+}
+
 function localizeChangeForSession(session, change) {
   if (!change?.absolutePath || !isPathWithin(session.worktreePath, change.absolutePath)) {
     return null;
@@ -2925,7 +2993,9 @@ function buildWorkingNowNodes(sessions) {
 function buildIdleThinkingNodes(sessions) {
   const sessionEntries = sortSessionsForIdleThinking(
     sessions.filter((session) => !(
-      session.activityKind === 'working' || session.activityKind === 'blocked'
+      session.activityKind === 'working'
+      || session.activityKind === 'blocked'
+      || session.activityKind === 'finished'
     )),
   ).map((session) => ({
     projectRelativePath: resolveSessionProjectRelativePath(session),
@@ -2935,6 +3005,17 @@ function buildIdleThinkingNodes(sessions) {
   return buildProjectScopedItems(sessionEntries, { rootLabel: 'Repo root' });
 }
 
+function buildNeedsCleanupNodes(sessions) {
+  const sessionEntries = sessions
+    .filter((session) => session.activityKind === 'finished')
+    .map((session) => ({
+      projectRelativePath: resolveSessionProjectRelativePath(session),
+      sessions: [session],
+      item: new SessionItem(session, buildSessionDetailItems(session)),
+    }));
+  return buildProjectScopedItems(sessionEntries, { rootLabel: 'Repo root' });
+}
+
 function buildUnassignedChangeNodes(changes) {
   return sortUnassignedChanges(changes).map((change) => new ChangeItem(change, {
     label: compactRelativePath(change.relativePath),
@@ -3205,6 +3286,15 @@ class ActiveAgentsProvider {
         }));
       }
 
+      const needsCleanupItems = buildNeedsCleanupNodes(element.sessions);
+      if (needsCleanupItems.length > 0) {
+        sectionItems.push(new SectionItem('Needs cleanup', needsCleanupItems, {
+          description: String(needsCleanupItems.length),
+          collapsedState: vscode.TreeItemCollapsibleState.Collapsed,
+          iconId: 'pass-filled',
+        }));
+      }
+
       const idleThinkingItems = buildIdleThinkingNodes(element.sessions);
       if (idleThinkingItems.length > 0) {
         sectionItems.push(new SectionItem('Idle / thinking', idleThinkingItems, {
@@ -3412,6 +3502,8 @@ class ActiveAgentsRefreshController {
     this.inspectPanelManager = inspectPanelManager;
     this.refreshTimer = null;
     this.sessionWatchers = new Map();
+    this.closedMissingWorktreeRepositories = new Set();
+    this.observedWorktreePaths = new Set();
   }
 
   scheduleRefresh() {
@@ -3434,8 +3526,23 @@ class ActiveAgentsRefreshController {
     const repoEntries = await findRepoSessionEntries();
     const liveSessionKeys = new Set();
 
+    for (const workspacePath of findDeletedManagedWorkspaceFolders()) {
+      await this.closeMissingWorktreeRepository(workspacePath);
+    }
+
     for (const entry of repoEntries) {
       for (const session of entry.sessions) {
+        const worktreePath = sessionWorktreePath(session);
+        const normalizedWorktreePath = normalizeAbsolutePath(worktreePath);
+        if (normalizedWorktreePath && !fs.existsSync(normalizedWorktreePath)) {
+          await this.closeMissingWorktreeRepository(normalizedWorktreePath);
+          continue;
+        }
+        if (normalizedWorktreePath) {
+          this.closedMissingWorktreeRepositories.delete(normalizedWorktreePath);
+          this.observedWorktreePaths.add(normalizedWorktreePath);
+        }
+
         const sessionKey = resolveSessionWatcherKey(session);
         liveSessionKeys.add(sessionKey);
         if (this.sessionWatchers.has(sessionKey)) {
@@ -3446,21 +3553,46 @@ class ActiveAgentsRefreshController {
           resolveSessionGitIndexPath(session.worktreePath),
         );
         const disposables = bindRefreshWatcher(watcher, () => this.scheduleRefresh());
-        this.sessionWatchers.set(sessionKey, { watcher, disposables });
+        this.sessionWatchers.set(sessionKey, {
+          watcher,
+          disposables,
+          worktreePath: normalizedWorktreePath,
+        });
       }
     }
 
+    for (const observedWorktreePath of this.observedWorktreePaths) {
+      if (fs.existsSync(observedWorktreePath)) {
+        this.closedMissingWorktreeRepositories.delete(observedWorktreePath);
+        continue;
+      }
+      await this.closeMissingWorktreeRepository(observedWorktreePath);
+    }
+
     for (const [sessionKey, entry] of this.sessionWatchers) {
       if (liveSessionKeys.has(sessionKey)) {
         continue;
       }
 
+      if (entry.worktreePath && !fs.existsSync(entry.worktreePath)) {
+        await this.closeMissingWorktreeRepository(entry.worktreePath);
+      }
       disposeAll(entry.disposables);
       entry.watcher.dispose();
       this.sessionWatchers.delete(sessionKey);
     }
   }
 
+  async closeMissingWorktreeRepository(worktreePath) {
+    const normalizedWorktreePath = normalizeAbsolutePath(worktreePath);
+    if (!normalizedWorktreePath || this.closedMissingWorktreeRepositories.has(normalizedWorktreePath)) {
+      return;
+    }
+
+    this.closedMissingWorktreeRepositories.add(normalizedWorktreePath);
+    await closeDeletedWorktreeRepository(normalizedWorktreePath);
+  }
+
   dispose() {
     if (this.refreshTimer) {
       clearTimeout(this.refreshTimer);
@@ -3587,7 +3719,7 @@ function activate(context) {
     vscode.commands.registerCommand('gitguardex.activeAgents.refresh', refresh),
     vscode.commands.registerCommand('gitguardex.activeAgents.restart', restartActiveAgents),
     vscode.commands.registerCommand('gitguardex.activeAgents.focus', async () => {
-      await vscode.commands.executeCommand('workbench.view.extension.gitguardex.activeAgentsContainer');
+      await vscode.commands.executeCommand('workbench.view.extension.gitguardex-active-agents-container');
     }),
     vscode.commands.registerCommand('gitguardex.activeAgents.commitSelectedSession', commitSelectedSession),
     vscode.commands.registerCommand('gitguardex.activeAgents.openWorktree', async (session) => {

package/templates/vscode/guardex-active-agents/package.json

@@ -3,7 +3,7 @@
   "displayName": "GitGuardex Active Agents",
   "description": "Shows live Guardex sandbox sessions and repo changes in a dedicated VS Code Active Agents sidebar.",
   "publisher": "Recodee",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "license": "MIT",
   "icon": "icon.png",
   "engines": {
@@ -79,14 +79,14 @@
     "viewsContainers": {
       "activitybar": [
         {
-          "id": "gitguardex.activeAgentsContainer",
+          "id": "gitguardex-active-agents-container",
           "title": "Active Agents",
           "icon": "media/active-agents-hivemind.svg"
         }
       ]
     },
     "views": {
-      "gitguardex.activeAgentsContainer": [
+      "gitguardex-active-agents-container": [
         {
           "id": "gitguardex.activeAgents",
           "name": "Active Agents",