@imdeadpool/guardex 7.0.26 → 7.0.31

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

@@ -3,11 +3,13 @@ const path = require('node:path');
 const cp = require('node:child_process');
 const vscode = require('vscode');
 const {
+  clearWorktreeActivityCache,
   formatElapsedFrom,
   readActiveSessions,
   readRepoChanges,
   readSessionInspectData,
   sanitizeBranchForFile,
+  sessionFilePathForBranch,
 } = require('./session-schema.js');
 
 const SESSION_DECORATION_SCHEME = 'gitguardex-agent';
@@ -54,6 +56,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: 'idle', label: 'THINKING' },
   { kind: 'stalled', label: 'STALLED' },
   { kind: 'dead', label: 'DEAD' },
@@ -61,10 +64,12 @@ const SESSION_ACTIVITY_GROUPS = [
 const SESSION_ACTIVITY_ICON_IDS = {
   blocked: 'warning',
   working: 'loading~spin',
+  finished: 'pass-filled',
   idle: 'comment-discussion',
   stalled: 'clock',
   dead: 'error',
 };
+const DISMISSABLE_SESSION_ACTIVITY_KINDS = new Set(['stalled', 'dead']);
 const SESSION_PROVIDER_BRANDS = {
   openai: {
     id: 'openai',
@@ -105,6 +110,10 @@ function iconColorId(iconId) {
       return 'terminal.ansiCyan';
     case 'list-tree':
       return 'terminal.ansiBlue';
+    case 'pass-filled':
+    case 'pass':
+    case 'check':
+      return 'testing.iconPassed';
     default:
       return '';
   }
@@ -465,9 +474,15 @@ function agentBadgeFromBranch(branch) {
 
 function buildActiveAgentsStatusSummary(summary) {
   const workingCount = summary?.workingCount || 0;
+  const finishedCount = summary?.finishedCount || 0;
   const idleCount = summary?.idleCount || 0;
-  if (workingCount > 0 || idleCount > 0) {
-    return `$(git-branch) ${workingCount} working · ${idleCount} idle`;
+  if (workingCount > 0 || finishedCount > 0 || idleCount > 0) {
+    const parts = [`${workingCount} working`];
+    if (finishedCount > 0) {
+      parts.push(`${finishedCount} finished`);
+    }
+    parts.push(`${idleCount} idle`);
+    return `$(git-branch) ${parts.join(' · ')}`;
   }
   return `$(git-branch) ${formatCountLabel(summary?.sessionCount || 0, 'tracked session')}`;
 }
@@ -487,6 +502,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?.idleCount || 0, 'idle session'),
     formatCountLabel(summary?.unassignedChangeCount || 0, 'unassigned change'),
     formatCountLabel(summary?.lockedFileCount || 0, 'locked file'),
@@ -531,6 +547,10 @@ function countWorkingSessions(sessions) {
   )).length;
 }
 
+function countFinishedSessions(sessions) {
+  return sessions.filter((session) => session.activityKind === 'finished').length;
+}
+
 function countIdleSessions(sessions) {
   return sessions.filter((session) => (
     session.activityKind === 'idle' || session.activityKind === 'stalled'
@@ -568,6 +588,9 @@ function sessionFreshnessLabel(session, now = Date.now()) {
   if (session.activityKind === 'blocked') {
     return 'Needs attention';
   }
+  if (session.activityKind === 'finished') {
+    return 'Finished';
+  }
   if (session.activityKind === 'stalled') {
     return 'Possibly stale';
   }
@@ -595,6 +618,8 @@ function sessionStatusLabel(session) {
       return 'Blocked';
     case 'working':
       return 'Working';
+    case 'finished':
+      return 'Finished';
     case 'idle':
       return 'Idle';
     case 'stalled':
@@ -693,6 +718,14 @@ function changeRiskBadges(change) {
   ].filter(Boolean));
 }
 
+function changeNeedsWarningIcon(change) {
+  return Boolean(
+    change?.protectedBranch
+    || change?.hasForeignLock
+    || (!change?.hasForeignLock && change?.lockOwnerBranch),
+  );
+}
+
 function buildSessionCardDescription(session) {
   const provider = resolveSessionProvider(session);
   const statusAgentLabel = `${sessionStatusLabel(session)}: ${session.agentName || 'agent'}`;
@@ -793,6 +826,7 @@ function buildWorktreeBranchDescription(sessions) {
 function buildOverviewDescription(summary) {
   return [
     formatCountLabel(summary?.workingCount || 0, 'working agent'),
+    formatCountLabel(summary?.finishedCount || 0, 'finished agent'),
     formatCountLabel(summary?.idleCount || 0, 'idle agent'),
     formatCountLabel(summary?.unassignedChangeCount || 0, 'unassigned change'),
     formatCountLabel(summary?.lockedFileCount || 0, 'locked file'),
@@ -912,6 +946,9 @@ function workingSessionSortKey(session) {
   if (session.deltaLabel === 'New') {
     return 3;
   }
+  if (session.activityKind === 'finished') {
+    return 5;
+  }
   return 4;
 }
 
@@ -1289,7 +1326,7 @@ class SessionItem extends vscode.TreeItem {
       : buildSessionCardDescription(session);
     this.tooltip = buildSessionTooltip(session, this.description);
     this.iconPath = themeIcon(resolveSessionActivityIconId(session.activityKind));
-    this.contextValue = 'gitguardex.session';
+    this.contextValue = sessionContextValue(session);
     this.command = {
       command: 'gitguardex.activeAgents.openWorktree',
       title: 'Open Agent Worktree',
@@ -1298,6 +1335,35 @@ class SessionItem extends vscode.TreeItem {
   }
 }
 
+function sessionContextValue(session) {
+  const activityKind = typeof session?.activityKind === 'string' ? session.activityKind.trim() : '';
+  return activityKind
+    ? `gitguardex.session.${activityKind}`
+    : 'gitguardex.session';
+}
+
+function canDismissSession(session) {
+  return DISMISSABLE_SESSION_ACTIVITY_KINDS.has(session?.activityKind);
+}
+
+function buildDismissSessionDetail(session, statePath) {
+  const repoRoot = typeof session?.repoRoot === 'string' ? session.repoRoot.trim() : '';
+  const relativeStatePath = repoRoot
+    ? path.relative(repoRoot, statePath) || path.basename(statePath)
+    : path.basename(statePath);
+  const detailParts = [
+    `Remove ${relativeStatePath} and hide this session from Active Agents.`,
+  ];
+
+  if (session?.activityKind === 'stalled') {
+    detailParts.push('This dismisses the stale sidebar row only; use Stop if you want to interrupt a live agent.');
+  } else {
+    detailParts.push('This clears the stale session record from the sidebar.');
+  }
+
+  return detailParts.join(' ');
+}
+
 class FolderItem extends vscode.TreeItem {
   constructor(label, relativePath, items, options = {}) {
     super(
@@ -1845,6 +1911,51 @@ async function stopSession(session, refresh) {
   }
 }
 
+async function dismissSession(session, refresh) {
+  if (!canDismissSession(session)) {
+    showSessionMessage('Only stalled or dead sessions can be dismissed.');
+    return;
+  }
+
+  const repoRoot = typeof session?.repoRoot === 'string' ? session.repoRoot.trim() : '';
+  if (!repoRoot) {
+    showSessionMessage('Cannot dismiss session: missing repo root.');
+    return;
+  }
+  if (!session?.branch) {
+    showSessionMessage('Cannot dismiss session: missing branch name.');
+    return;
+  }
+
+  const statePath = sessionFilePathForBranch(repoRoot, session.branch);
+  if (!fs.existsSync(statePath)) {
+    clearWorktreeActivityCache(session.worktreePath);
+    refresh();
+    showSessionMessage(`Session record already gone for ${sessionDisplayLabel(session)}.`);
+    return;
+  }
+
+  const confirmed = await vscode.window.showWarningMessage(
+    `Dismiss ${sessionDisplayLabel(session)}?`,
+    {
+      modal: true,
+      detail: buildDismissSessionDetail(session, statePath),
+    },
+    'Dismiss',
+  );
+  if (confirmed !== 'Dismiss') {
+    return;
+  }
+
+  try {
+    fs.unlinkSync(statePath);
+    clearWorktreeActivityCache(session.worktreePath);
+    refresh();
+  } catch (error) {
+    showSessionMessage(`Failed to dismiss session ${sessionDisplayLabel(session)}: ${error.message}`);
+  }
+}
+
 function readGitDirPath(targetPath) {
   const normalizedTargetPath = typeof targetPath === 'string' ? targetPath.trim() : '';
   if (!normalizedTargetPath) {
@@ -2405,6 +2516,7 @@ function buildRepoOverview(sessions, unassignedChanges, lockEntries) {
   return {
     sessionCount: sessions.length,
     workingCount: countWorkingSessions(sessions),
+    finishedCount: countFinishedSessions(sessions),
     idleCount: countIdleSessions(sessions),
     unassignedChangeCount: (unassignedChanges || []).length,
     lockedFileCount: Array.isArray(lockEntries) ? lockEntries.length : 0,
@@ -2719,7 +2831,7 @@ function buildUnassignedChangeNodes(changes) {
   return sortUnassignedChanges(changes).map((change) => new ChangeItem(change, {
     label: compactRelativePath(change.relativePath),
     description: buildUnassignedChangeDescription(change),
-    iconId: changeRiskBadges(change).length > 0 ? 'warning' : undefined,
+    iconId: changeNeedsWarningIcon(change) ? 'warning' : undefined,
   }));
 }
 
@@ -2775,6 +2887,7 @@ class ActiveAgentsProvider {
     this.viewSummary = {
       sessionCount: 0,
       workingCount: 0,
+      finishedCount: 0,
       idleCount: 0,
       unassignedChangeCount: 0,
       lockedFileCount: 0,
@@ -2793,6 +2906,7 @@ class ActiveAgentsProvider {
     this.updateViewState({
       sessionCount: 0,
       workingCount: 0,
+      finishedCount: 0,
       idleCount: 0,
       unassignedChangeCount: 0,
       lockedFileCount: 0,
@@ -2915,6 +3029,10 @@ class ActiveAgentsProvider {
     const summary = {
       sessionCount: repoEntries.reduce((total, entry) => total + entry.sessions.length, 0),
       workingCount: repoEntries.reduce((total, entry) => total + entry.overview.workingCount, 0),
+      finishedCount: repoEntries.reduce(
+        (total, entry) => total + (entry.overview.finishedCount || 0),
+        0,
+      ),
       idleCount: repoEntries.reduce((total, entry) => total + entry.overview.idleCount, 0),
       unassignedChangeCount: repoEntries.reduce(
         (total, entry) => total + entry.overview.unassignedChangeCount,
@@ -2964,6 +3082,7 @@ class ActiveAgentsProvider {
           }),
         ], {
           description: '1',
+          collapsedState: vscode.TreeItemCollapsibleState.Collapsed,
         }),
       ];
 
@@ -2971,6 +3090,7 @@ class ActiveAgentsProvider {
       if (workingNowItems.length > 0) {
         sectionItems.push(new SectionItem('Working now', workingNowItems, {
           description: String(workingNowItems.length),
+          collapsedState: vscode.TreeItemCollapsibleState.Collapsed,
           iconId: 'loading~spin',
         }));
       }
@@ -3011,7 +3131,7 @@ class ActiveAgentsProvider {
       if (advancedItems.length > 0) {
         sectionItems.push(new SectionItem('Advanced details', advancedItems, {
           description: String(advancedItems.length),
-          collapsedState: vscode.TreeItemCollapsibleState.Collapsed,
+          collapsedState: vscode.TreeItemCollapsibleState.Expanded,
           iconId: 'list-tree',
         }));
       }
@@ -3358,6 +3478,7 @@ function activate(context) {
     vscode.commands.registerCommand('gitguardex.activeAgents.finishSession', finishSession),
     vscode.commands.registerCommand('gitguardex.activeAgents.syncSession', syncSession),
     vscode.commands.registerCommand('gitguardex.activeAgents.stopSession', (session) => stopSession(session, refresh)),
+    vscode.commands.registerCommand('gitguardex.activeAgents.dismissSession', (session) => dismissSession(session, refresh)),
     vscode.workspace.onDidChangeWorkspaceFolders(handleWorkspaceFoldersChanged),
     activeSessionsWatcher,
     lockWatcher,

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": "recodeee",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "license": "MIT",
   "icon": "icon.png",
   "engines": {
@@ -65,6 +65,11 @@
         "title": "Stop",
         "icon": "$(debug-stop)"
       },
+      {
+        "command": "gitguardex.activeAgents.dismissSession",
+        "title": "Dismiss",
+        "icon": "$(trash)"
+      },
       {
         "command": "gitguardex.activeAgents.showSessionTerminal",
         "title": "Show Terminal",
@@ -125,32 +130,37 @@
       "view/item/context": [
         {
           "command": "gitguardex.activeAgents.openWorktree",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
           "group": "inline"
         },
         {
           "command": "gitguardex.activeAgents.inspect",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
           "group": "inline"
         },
         {
           "command": "gitguardex.activeAgents.showSessionTerminal",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
           "group": "inline"
         },
         {
           "command": "gitguardex.activeAgents.finishSession",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
           "group": "inline"
         },
         {
           "command": "gitguardex.activeAgents.syncSession",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
           "group": "inline"
         },
         {
           "command": "gitguardex.activeAgents.stopSession",
-          "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session(\\.|$)/",
+          "group": "inline"
+        },
+        {
+          "command": "gitguardex.activeAgents.dismissSession",
+          "when": "view == gitguardex.activeAgents && viewItem =~ /^gitguardex\\.session\\.(stalled|dead)$/",
           "group": "inline"
         }
       ]

package/templates/vscode/guardex-active-agents/session-schema.js

@@ -700,17 +700,35 @@ function deriveSessionActivity(session, options = {}) {
       .filter(Boolean))]
       .sort((left, right) => left.localeCompare(right));
 
+    const workingLatestFileActivityMs = deriveLatestWorktreeFileActivity(session.worktreePath, {
+      now,
+      useCache: options.useCache,
+    });
+    const workingLastFileActivityAt = Number.isFinite(workingLatestFileActivityMs)
+      ? new Date(workingLatestFileActivityMs).toISOString()
+      : '';
+    const workingLastFileActivityLabel = workingLastFileActivityAt
+      ? formatElapsedFrom(workingLastFileActivityAt, now)
+      : '';
+    const workingFileActivityAgeMs = Number.isFinite(workingLatestFileActivityMs)
+      ? Math.max(0, now - workingLatestFileActivityMs)
+      : null;
+    const isFinishedUncommitted = workingFileActivityAgeMs !== null
+      && workingFileActivityAgeMs > IDLE_ACTIVITY_WINDOW_MS;
+
     return {
-      activityKind: 'working',
-      activityLabel: 'working',
+      activityKind: isFinishedUncommitted ? 'finished' : 'working',
+      activityLabel: isFinishedUncommitted ? 'finished' : 'working',
       activityCountLabel: formatFileCount(worktreeChangedPaths.length),
-      activitySummary: previewChangedPaths(worktreeChangedPaths),
+      activitySummary: isFinishedUncommitted && workingLastFileActivityLabel
+        ? `${previewChangedPaths(worktreeChangedPaths)} · idle ${workingLastFileActivityLabel}`
+        : previewChangedPaths(worktreeChangedPaths),
       changeCount: worktreeChangedPaths.length,
       changedPaths,
       worktreeChangedPaths: worktreeRelativePaths,
       pidAlive,
-      lastFileActivityAt: '',
-      lastFileActivityLabel: '',
+      lastFileActivityAt: workingLastFileActivityAt,
+      lastFileActivityLabel: workingLastFileActivityLabel,
     };
   }