@imdeadpool/guardex 7.0.35 → 7.0.37

package/README.md

@@ -266,6 +266,19 @@ Being honest about where this still has issues:
 <details open>
 <summary><strong>v7.x</strong></summary>
 
+### 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
+  registry.
+- Synced the shipped Active Agents template with the canonical VS Code
+  extension source so Colony task counts and details install with the package.
+- No new CLI command behavior is introduced in this release lane.
+
+### v7.0.36
+- Bumped `@imdeadpool/guardex` from `7.0.35` to `7.0.36` so the latest
+  branch-finish cwd-prune fix can ship under a fresh npm version after PR #424.
+- No new CLI command surface is introduced in this release lane.
+
 ### v7.0.35
 - Bumped `@imdeadpool/guardex` from `7.0.34` to `7.0.35` so the current
   merged `main` payload can publish on a fresh npm version after PR #420.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imdeadpool/guardex",
-  "version": "7.0.35",
+  "version": "7.0.37",
   "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/templates/scripts/agent-branch-finish.sh

@@ -165,7 +165,11 @@ if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
 fi
 
 repo_root="$(git rev-parse --show-toplevel)"
-current_worktree="$(pwd -P)"
+# The physical cwd may be a subdirectory inside the source worktree. Cleanup
+# decisions need the enclosing worktree root, otherwise finishing from `src/`
+# can delete the caller's cwd and turn a successful merge into a false shell
+# failure.
+current_worktree="$repo_root"
 common_git_dir_raw="$(git -C "$repo_root" rev-parse --git-common-dir)"
 if [[ "$common_git_dir_raw" == /* ]]; then
   common_git_dir="$common_git_dir_raw"
@@ -223,7 +227,68 @@ if [[ "$SOURCE_BRANCH" == "$BASE_BRANCH" ]]; then
   exit 1
 fi
 
+cleanup_missing_merged_source_branch() {
+  local state_line=""
+  local parsed_state=""
+  local parsed_merged_at=""
+  local parsed_url=""
+  local remote_delete_output=""
+  local prune_args=()
+
+  if [[ "$MERGE_MODE" != "pr" || "$CLEANUP_AFTER_MERGE" -ne 1 ]]; then
+    return 1
+  fi
+  if ! command -v "$GH_BIN" >/dev/null 2>&1; then
+    return 1
+  fi
+
+  state_line="$("$GH_BIN" pr list \
+    --state merged \
+    --head "$SOURCE_BRANCH" \
+    --base "$BASE_BRANCH" \
+    --json state,mergedAt,url \
+    --jq 'sort_by(.mergedAt // "") | reverse | (.[0] // {}) | [(.state // ""), (.mergedAt // ""), (.url // "")] | join("\u001f")' \
+    2>/dev/null || true)"
+  if [[ -z "$state_line" ]]; then
+    return 1
+  fi
+
+  IFS=$'\x1f' read -r parsed_state parsed_merged_at parsed_url <<< "$state_line"
+  if [[ "$parsed_state" != "MERGED" && -z "$parsed_merged_at" ]]; then
+    return 1
+  fi
+
+  echo "[agent-branch-finish] Local source branch '${SOURCE_BRANCH}' is already absent, but a merged PR exists; continuing cleanup." >&2
+  if [[ -n "$parsed_url" ]]; then
+    echo "[agent-branch-finish] Merged PR: ${parsed_url}" >&2
+  fi
+
+  run_guardex_cli locks release --branch "$SOURCE_BRANCH" >/dev/null 2>&1 || true
+
+  if [[ "$PUSH_ENABLED" -eq 1 && "$DELETE_REMOTE_BRANCH" -eq 1 ]]; then
+    if git -C "$repo_root" ls-remote --exit-code --heads origin "$SOURCE_BRANCH" >/dev/null 2>&1; then
+      if ! remote_delete_output="$(git -C "$repo_root" push origin --delete "$SOURCE_BRANCH" 2>&1)"; then
+        echo "[agent-branch-finish] Warning: remote branch cleanup failed for '${SOURCE_BRANCH}'." >&2
+        [[ -n "$remote_delete_output" ]] && echo "$remote_delete_output" >&2
+      fi
+    fi
+  fi
+
+  prune_args=(worktree prune --base "$BASE_BRANCH" --only-dirty-worktrees --delete-branches)
+  if [[ "$DELETE_REMOTE_BRANCH" -eq 1 ]]; then
+    prune_args+=(--delete-remote-branches)
+  fi
+  if ! run_guardex_cli "${prune_args[@]}"; then
+    echo "[agent-branch-finish] Warning: automatic worktree prune failed." >&2
+    echo "[agent-branch-finish] You can run manual cleanup: gx cleanup --base ${BASE_BRANCH}" >&2
+  fi
+
+  echo "[agent-branch-finish] Merged '${SOURCE_BRANCH}' into '${BASE_BRANCH}' via pr flow and found source branch/worktree already cleaned."
+  exit 0
+}
+
 if ! git -C "$repo_root" show-ref --verify --quiet "refs/heads/${SOURCE_BRANCH}"; then
+  cleanup_missing_merged_source_branch
   echo "[agent-branch-finish] Local source branch does not exist: ${SOURCE_BRANCH}" >&2
   exit 1
 fi
@@ -787,6 +852,15 @@ if [[ -n "$base_worktree" ]] && is_clean_worktree "$base_worktree" && [[ "$PUSH_
 fi
 maybe_auto_commit_parent_gitlink "$base_worktree"
 
+# Pivot out of the agent worktree before prune calls that may remove it.
+# Without this, subprocess spawns can fail with ENOENT uv_cwd after cwd
+# disappears even when the merge succeeded.
+pivot_to_repo_root_before_prune() {
+  if [[ "$current_worktree" == "$source_worktree" && "$source_worktree" == "${agent_worktree_root}"/* ]]; then
+    cd "$repo_root" 2>/dev/null || true
+  fi
+}
+
 if [[ "$CLEANUP_AFTER_MERGE" -eq 1 ]]; then
   if [[ "$source_worktree" == "$repo_root" ]]; then
     if is_clean_worktree "$source_worktree"; then
@@ -830,17 +904,22 @@ if [[ "$CLEANUP_AFTER_MERGE" -eq 1 ]]; then
   if [[ "$DELETE_REMOTE_BRANCH" -eq 1 ]]; then
     prune_args+=(--delete-remote-branches)
   fi
+
+  pivot_to_repo_root_before_prune
   if ! run_guardex_cli worktree prune "${prune_args[@]}"; then
     echo "[agent-branch-finish] Warning: automatic worktree prune failed." >&2
     echo "[agent-branch-finish] You can run manual cleanup: gx cleanup --base ${BASE_BRANCH}" >&2
   fi
 
-  echo "[agent-branch-finish] Merged '${SOURCE_BRANCH}' into '${BASE_BRANCH}' via ${merge_status} flow and cleaned source branch/worktree."
-  if [[ "$source_worktree" == "$current_worktree" && "$source_worktree" == "${agent_worktree_root}"/* ]]; then
+  if [[ "$source_worktree" == "$current_worktree" && "$source_worktree" == "${agent_worktree_root}"/* && -d "$source_worktree" ]]; then
+    echo "[agent-branch-finish] Merged '${SOURCE_BRANCH}' into '${BASE_BRANCH}' via ${merge_status} flow and cleaned source branch/remote."
     echo "[agent-branch-finish] Current worktree '${source_worktree}' still exists because it is the active shell cwd." >&2
     echo "[agent-branch-finish] Leave this directory, then run: gx cleanup --base ${BASE_BRANCH}" >&2
+  else
+    echo "[agent-branch-finish] Merged '${SOURCE_BRANCH}' into '${BASE_BRANCH}' via ${merge_status} flow and cleaned source branch/worktree."
   fi
 else
+  pivot_to_repo_root_before_prune
   if ! run_guardex_cli worktree prune --base "$BASE_BRANCH"; then
     echo "[agent-branch-finish] Warning: temporary worktree prune failed." >&2
   fi

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

@@ -1,6 +1,8 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const cp = require('node:child_process');
+const http = require('node:http');
+const os = require('node:os');
 const vscode = require('vscode');
 const {
   clearWorktreeActivityCache,
@@ -40,6 +42,84 @@ const ACTIVE_AGENTS_EXTENSION_ID = 'Recodee.gitguardex-active-agents';
 const RESTART_EXTENSION_HOST_COMMAND = 'workbench.action.restartExtensionHost';
 const REFRESH_POLL_INTERVAL_MS = 30_000;
 const INSPECT_PANEL_VIEW_TYPE = 'gitguardex.activeAgents.inspect';
+const COLONY_DEFAULT_PORT = 37777;
+const COLONY_SNAPSHOT_TTL_MS = 5_000;
+const COLONY_FETCH_TIMEOUT_MS = 800;
+
+function colonyDataDir() {
+  return process.env.COLONY_HOME
+    || process.env.CAVEMEM_HOME
+    || path.join(os.homedir(), '.colony');
+}
+
+function readColonyPort() {
+  try {
+    const raw = fs.readFileSync(path.join(colonyDataDir(), 'settings.json'), 'utf8');
+    const parsed = JSON.parse(raw);
+    const port = Number(parsed?.workerPort);
+    return Number.isFinite(port) && port > 0 ? port : COLONY_DEFAULT_PORT;
+  } catch (_error) {
+    return COLONY_DEFAULT_PORT;
+  }
+}
+
+function fetchColonyJson(urlPath) {
+  return new Promise((resolve) => {
+    const req = http.get(
+      {
+        hostname: '127.0.0.1',
+        port: readColonyPort(),
+        path: urlPath,
+        timeout: COLONY_FETCH_TIMEOUT_MS,
+      },
+      (res) => {
+        if (res.statusCode !== 200) {
+          res.resume();
+          resolve(null);
+          return;
+        }
+        let body = '';
+        res.setEncoding('utf8');
+        res.on('data', (chunk) => {
+          body += chunk;
+        });
+        res.on('end', () => {
+          try {
+            resolve(JSON.parse(body));
+          } catch (_error) {
+            resolve(null);
+          }
+        });
+      },
+    );
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => {
+      req.destroy();
+      resolve(null);
+    });
+  });
+}
+
+const colonyTasksCache = new Map();
+
+async function readColonyTasksForRepo(repoRoot) {
+  const cached = colonyTasksCache.get(repoRoot);
+  if (cached && Date.now() - cached.at < COLONY_SNAPSHOT_TTL_MS) {
+    return cached.tasks;
+  }
+  const tasks = await fetchColonyJson(
+    `/api/colony/tasks?repo_root=${encodeURIComponent(repoRoot)}`,
+  );
+  const resolved = Array.isArray(tasks) ? tasks : [];
+  colonyTasksCache.set(repoRoot, { at: Date.now(), tasks: resolved });
+  return resolved;
+}
+
+function compactColonyBranchLabel(branch) {
+  if (typeof branch !== 'string' || !branch) return 'unknown';
+  const parts = branch.split('/').filter(Boolean);
+  return parts.length > 2 ? parts.slice(-2).join('/') : branch;
+}
 const GIT_CONFIGURATION_SECTION = 'git';
 const REPO_SCAN_IGNORED_FOLDERS_SETTING = 'repositoryScanIgnoredFolders';
 const BUNDLED_FILE_ICONS_MANIFEST_RELATIVE = path.join('fileicons', 'gitguardex-fileicons.json');
@@ -840,10 +920,18 @@ function buildOverviewDescription(summary) {
     formatCountLabel(summary?.workingCount || 0, 'working agent'),
     formatCountLabel(summary?.finishedCount || 0, 'finished agent'),
     formatCountLabel(summary?.idleCount || 0, 'idle agent'),
+    summary?.colonyTaskCount
+      ? formatCountLabel(summary.colonyTaskCount, 'colony task')
+      : '',
+    summary?.pendingHandoffCount
+      ? formatCountLabel(summary.pendingHandoffCount, 'pending handoff')
+      : '',
     formatCountLabel(summary?.unassignedChangeCount || 0, 'unassigned change'),
     formatCountLabel(summary?.lockedFileCount || 0, 'locked file'),
     formatCountLabel(summary?.conflictCount || 0, 'conflict'),
-  ].join(' · ');
+  ]
+    .filter(Boolean)
+    .join(' · ');
 }
 
 function buildRepoDescription(summary) {
@@ -1252,7 +1340,9 @@ class RepoItem extends vscode.TreeItem {
     this.changes = changes;
     this.unassignedChanges = options.unassignedChanges || [];
     this.lockEntries = options.lockEntries || [];
-    this.overview = options.overview || buildRepoOverview(sessions, this.unassignedChanges, this.lockEntries);
+    this.colonyTasks = Array.isArray(options.colonyTasks) ? options.colonyTasks : [];
+    this.overview = options.overview
+      || buildRepoOverview(sessions, this.unassignedChanges, this.lockEntries, this.colonyTasks);
     this.description = buildRepoDescription(this.overview);
     this.tooltip = buildRepoTooltip(repoRoot, this.overview);
     this.iconPath = themeIcon('repo');
@@ -2524,7 +2614,8 @@ function countChangedPaths(repoRoot, sessions, changes) {
   return changedKeys.size;
 }
 
-function buildRepoOverview(sessions, unassignedChanges, lockEntries) {
+function buildRepoOverview(sessions, unassignedChanges, lockEntries, colonyTasks = []) {
+  const colonyTaskList = Array.isArray(colonyTasks) ? colonyTasks : [];
   return {
     sessionCount: sessions.length,
     workingCount: countWorkingSessions(sessions),
@@ -2536,6 +2627,11 @@ function buildRepoOverview(sessions, unassignedChanges, lockEntries) {
       (total, session) => total + (session.conflictCount || 0),
       0,
     ) + (unassignedChanges || []).filter((change) => change.hasForeignLock).length,
+    colonyTaskCount: colonyTaskList.length,
+    pendingHandoffCount: colonyTaskList.reduce(
+      (total, task) => total + (task.pending_handoff_count || 0),
+      0,
+    ),
   };
 }
 
@@ -3023,12 +3119,14 @@ class ActiveAgentsProvider {
 
       const { repoRootChanges } = partitionChangesByOwnership(sessions, changes);
       const unassignedChanges = sortUnassignedChanges(repoRootChanges);
+      const colonyTasks = Array.isArray(entry.colonyTasks) ? entry.colonyTasks : [];
       return {
         ...entry,
         sessions,
         changes,
         unassignedChanges,
-        overview: buildRepoOverview(sessions, unassignedChanges, entry.lockEntries),
+        colonyTasks,
+        overview: buildRepoOverview(sessions, unassignedChanges, entry.lockEntries, colonyTasks),
       };
     });
 
@@ -3140,6 +3238,37 @@ class ActiveAgentsProvider {
           iconId: 'file-directory',
         }));
       }
+      const colonyTaskList = Array.isArray(element.colonyTasks) ? element.colonyTasks : [];
+      if (colonyTaskList.length > 0) {
+        const colonyItems = colonyTaskList.map((task) => {
+          const pendingLabel = task.pending_handoff_count > 0
+            ? formatCountLabel(task.pending_handoff_count, 'pending handoff')
+            : 'quiet';
+          const participantLabel =
+            (task.participants || []).map((p) => p.agent).filter(Boolean).join(', ')
+            || 'no participants';
+          return new DetailItem(
+            `#${task.id} · ${compactColonyBranchLabel(task.branch)}`,
+            `${participantLabel} · ${pendingLabel}`,
+            {
+              iconId: task.pending_handoff_count > 0 ? 'warning' : 'comment-discussion',
+              tooltip: [
+                task.branch,
+                `task #${task.id}`,
+                participantLabel,
+                task.pending_handoff_count > 0
+                  ? formatCountLabel(task.pending_handoff_count, 'pending handoff')
+                  : '',
+              ].filter(Boolean).join('\n'),
+            },
+          );
+        });
+        advancedItems.push(new SectionItem('Colony tasks', colonyItems, {
+          description: String(colonyItems.length),
+          collapsedState: vscode.TreeItemCollapsibleState.Collapsed,
+          iconId: 'organization',
+        }));
+      }
       if (advancedItems.length > 0) {
         sectionItems.push(new SectionItem('Advanced details', advancedItems, {
           description: String(advancedItems.length),
@@ -3166,24 +3295,29 @@ class ActiveAgentsProvider {
       overview: entry.overview,
       unassignedChanges: entry.unassignedChanges,
       lockEntries: entry.lockEntries,
+      colonyTasks: entry.colonyTasks,
     }));
   }
 
   async loadRepoEntries() {
     const repoEntries = await findRepoSessionEntries();
-    return repoEntries.map((entry) => {
-      const repoRoot = entry.repoRoot;
-      const lockRegistry = this.getLockRegistryForRepo(repoRoot);
-      const currentBranch = readCurrentBranch(repoRoot);
-      return {
-        repoRoot,
-        sessions: entry.sessions.map((session) => decorateSession(session, lockRegistry)),
-        changes: readRepoChanges(repoRoot).map((change) => (
-          decorateChange(change, lockRegistry, currentBranch)
-        )),
-        lockEntries: Array.from(lockRegistry.entriesByPath.entries()),
-      };
-    });
+    return Promise.all(
+      repoEntries.map(async (entry) => {
+        const repoRoot = entry.repoRoot;
+        const lockRegistry = this.getLockRegistryForRepo(repoRoot);
+        const currentBranch = readCurrentBranch(repoRoot);
+        const colonyTasks = await readColonyTasksForRepo(repoRoot);
+        return {
+          repoRoot,
+          sessions: entry.sessions.map((session) => decorateSession(session, lockRegistry)),
+          changes: readRepoChanges(repoRoot).map((change) => (
+            decorateChange(change, lockRegistry, currentBranch)
+          )),
+          lockEntries: Array.from(lockRegistry.entriesByPath.entries()),
+          colonyTasks,
+        };
+      }),
+    );
   }
 }