@imdeadpool/guardex 7.0.38 → 7.0.39

package/README.md

@@ -266,6 +266,12 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imdeadpool/guardex",
-  "version": "7.0.38",
+  "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() : '',
@@ -3466,7 +3467,7 @@ function pivot(rawArgs) {
   }
   const stdoutText = String(result.stdout || '');
   const wtMatch = stdoutText.match(/^\[agent-branch-start\] Worktree:\s+(.+)$/m);
-  const branchMatch = stdoutText.match(/^\[agent-branch-start\] Created branch:\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');

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

@@ -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;
@@ -3434,6 +3502,8 @@ class ActiveAgentsRefreshController {
     this.inspectPanelManager = inspectPanelManager;
     this.refreshTimer = null;
     this.sessionWatchers = new Map();
+    this.closedMissingWorktreeRepositories = new Set();
+    this.observedWorktreePaths = new Set();
   }
 
   scheduleRefresh() {
@@ -3456,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)) {
@@ -3468,8 +3553,20 @@ 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) {
@@ -3477,12 +3574,25 @@ class ActiveAgentsRefreshController {
         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);

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.20",
+  "version": "0.0.21",
   "license": "MIT",
   "icon": "icon.png",
   "engines": {