@imdeadpool/guardex 7.0.23 → 7.0.25

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

@@ -0,0 +1,54 @@
+{
+  "iconDefinitions": {
+    "_gitguardex_agent": {
+      "iconPath": "./icons/agent.svg"
+    },
+    "_gitguardex_branch": {
+      "iconPath": "./icons/branch.svg"
+    },
+    "_gitguardex_config": {
+      "iconPath": "./icons/config.svg"
+    },
+    "_gitguardex_hook": {
+      "iconPath": "./icons/hook.svg"
+    },
+    "_gitguardex_openspec": {
+      "iconPath": "./icons/openspec.svg"
+    },
+    "_gitguardex_plan": {
+      "iconPath": "./icons/plan.svg"
+    },
+    "_gitguardex_spec": {
+      "iconPath": "./icons/spec.svg"
+    }
+  },
+  "folderNames": {
+    ".agents": "_gitguardex_agent",
+    ".githooks": "_gitguardex_hook",
+    ".omc": "_gitguardex_agent",
+    ".omx": "_gitguardex_agent",
+    "agent-worktrees": "_gitguardex_branch",
+    "changes": "_gitguardex_openspec",
+    "plan": "_gitguardex_plan",
+    "rules": "_gitguardex_spec",
+    "specs": "_gitguardex_spec"
+  },
+  "fileNames": {
+    ".openspec.yaml": "_gitguardex_config",
+    "AGENT.lock": "_gitguardex_agent",
+    "AGENTS.md": "_gitguardex_agent",
+    "CLAUDE.md": "_gitguardex_agent",
+    "config.yaml": "_gitguardex_config",
+    "context-docs-cue.md": "_gitguardex_spec",
+    "post-checkout": "_gitguardex_hook",
+    "pre-commit": "_gitguardex_hook",
+    "pre-push": "_gitguardex_hook",
+    "proposal.md": "_gitguardex_openspec",
+    "spec.md": "_gitguardex_spec",
+    "tasks.md": "_gitguardex_plan",
+    "plan.md": "_gitguardex_plan"
+  },
+  "fileExtensions": {
+    "openspec.yaml": "_gitguardex_config"
+  }
+}

package/templates/vscode/guardex-active-agents/fileicons/icons/agent.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#75beff" d="M8 1.5a3 3 0 0 1 3 3v1a3 3 0 1 1-6 0v-1a3 3 0 0 1 3-3Z"/>
+  <path fill="#3794ff" d="M2.5 14c.5-2.8 2.6-4.5 5.5-4.5s5 1.7 5.5 4.5H2.5Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/branch.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#89d185" d="M4 3.5a2 2 0 1 1 2.5 1.94v3.12A4 4 0 0 0 10 4.6V3h1.5v1.6a5.5 5.5 0 0 1-5 5.47v.49A2 2 0 1 1 4 12.5a2 2 0 0 1 1-1.73V5.23a2 2 0 0 1-1-1.73Zm2-.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm0 9a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Z"/>
+  <path fill="#4ec9b0" d="M10.5 1.5H14V5h-3.5V1.5Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/config.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#c586c0" d="M7.2 1h1.6l.4 1.7a5.4 5.4 0 0 1 1.2.5l1.5-.9 1.1 1.1-.9 1.5c.2.4.4.8.5 1.2l1.7.4v1.6l-1.7.4c-.1.4-.3.8-.5 1.2l.9 1.5-1.1 1.1-1.5-.9c-.4.2-.8.4-1.2.5L8.8 15H7.2l-.4-1.7a5.4 5.4 0 0 1-1.2-.5l-1.5.9L3 12.6l.9-1.5a5.4 5.4 0 0 1-.5-1.2l-1.7-.4V7.9l1.7-.4c.1-.4.3-.8.5-1.2L3 4.8l1.1-1.1 1.5.9c.4-.2.8-.4 1.2-.5L7.2 1Z"/>
+  <circle cx="8" cy="8" r="2.2" fill="#1e1e1e"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/hook.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#ffcc66" d="M8.6 1.5 3.5 8.6h3.2L5.7 14.5l6.8-8.2H9.1l1.4-4.8H8.6Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/openspec.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#4ec9b0" d="M3 1.5h7l3 3V14.5H3V1.5Z"/>
+  <path fill="#3794ff" d="M9.5 2.2v3h3L9.5 2.2Z"/>
+  <path fill="#ffcc66" d="m6.9 10.6-2-2 1-1 1 1 3.2-3.2 1 1-4.2 4.2Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/plan.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#dcdcaa" d="M2 2h12v12H2V2Zm2 2v8h2.5V4H4Zm4 0v8h4V4H8Z"/>
+  <path fill="#ce9178" d="M8 6h4v1.5H8V6Zm0 3h4v1.5H8V9Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/fileicons/icons/spec.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="#b5cea8" d="M3 1.5h10v13H3v-13Z"/>
+  <path fill="#1e1e1e" d="M5 4h6v1.2H5V4Zm0 2.8h6V8H5V6.8Zm0 2.8h4.5v1.2H5V9.6Z"/>
+</svg>

package/templates/vscode/guardex-active-agents/media/active-agents-hivemind.svg

@@ -0,0 +1,14 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill="currentColor"
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M12 4.25C9.96 4.25 8.31 5.9 8.31 7.94C8.31 9.32 9.08 10.53 10.22 11.16V12.55C8.15 13.19 6.69 15.12 6.69 17.29V18.31C6.69 19.02 7.27 19.6 7.98 19.6H9.06V20.46C9.06 20.89 9.41 21.25 9.85 21.25H14.15C14.59 21.25 14.94 20.89 14.94 20.46V19.6H16.02C16.73 19.6 17.31 19.02 17.31 18.31V17.29C17.31 15.12 15.85 13.19 13.78 12.55V11.16C14.92 10.53 15.69 9.32 15.69 7.94C15.69 5.9 14.04 4.25 12 4.25Z"
+  />
+  <path
+    d="M9.88 19.6H14.12"
+    stroke="currentColor"
+    stroke-width="1.4"
+    stroke-linecap="round"
+  />
+</svg>

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

@@ -1,9 +1,9 @@
 {
   "name": "gitguardex-active-agents",
   "displayName": "GitGuardex Active Agents",
-  "description": "Shows live Guardex sandbox sessions and repo changes inside VS Code Source Control.",
+  "description": "Shows live Guardex sandbox sessions and repo changes in a dedicated VS Code Active Agents sidebar.",
   "publisher": "recodeee",
-  "version": "0.0.7",
+  "version": "0.0.17",
   "license": "MIT",
   "icon": "icon.png",
   "engines": {
@@ -31,6 +31,11 @@
         "command": "gitguardex.activeAgents.refresh",
         "title": "Refresh Active Agents"
       },
+      {
+        "command": "gitguardex.activeAgents.restart",
+        "title": "Restart Active Agents",
+        "icon": "$(debug-restart)"
+      },
       {
         "command": "gitguardex.activeAgents.commitSelectedSession",
         "title": "Commit Selected Session",
@@ -61,16 +66,27 @@
         "icon": "$(debug-stop)"
       },
       {
-        "command": "gitguardex.activeAgents.openSessionDiff",
-        "title": "Open Diff",
-        "icon": "$(diff)"
+        "command": "gitguardex.activeAgents.showSessionTerminal",
+        "title": "Show Terminal",
+        "icon": "$(terminal)"
       }
     ],
+    "viewsContainers": {
+      "activitybar": [
+        {
+          "id": "gitguardex.activeAgentsContainer",
+          "title": "Active Agents",
+          "icon": "media/active-agents-hivemind.svg"
+        }
+      ]
+    },
     "views": {
-      "scm": [
+      "gitguardex.activeAgentsContainer": [
         {
           "id": "gitguardex.activeAgents",
           "name": "Active Agents",
+          "contextualTitle": "Active Agents",
+          "icon": "media/active-agents-hivemind.svg",
           "visibility": "visible"
         }
       ]
@@ -78,7 +94,7 @@
     "viewsWelcome": [
       {
         "view": "gitguardex.activeAgents",
-        "contents": "No live Guardex agents are visible in this workspace yet.\n\nThis view tracks Guardex session files and managed worktree telemetry, not every repo visible in Source Control.\n\n[Start agent](command:gitguardex.activeAgents.startAgent)\n[Open guide](https://github.com/recodeee/gitguardex/blob/main/vscode/guardex-active-agents/README.md#quick-start)\n[Refresh](command:gitguardex.activeAgents.refresh)"
+        "contents": "No live Guardex agents are visible in this workspace yet.\n\nThis sidebar tracks Guardex session files and managed worktree telemetry without taking over Source Control.\n\n[Start agent](command:gitguardex.activeAgents.startAgent)\n[Open guide](https://github.com/recodeee/gitguardex/blob/main/vscode/guardex-active-agents/README.md#quick-start)\n[Refresh](command:gitguardex.activeAgents.refresh)"
       }
     ],
     "menus": {
@@ -88,12 +104,24 @@
           "when": "view == gitguardex.activeAgents && guardex.hasAgents",
           "group": "navigation@1"
         },
+        {
+          "command": "gitguardex.activeAgents.restart",
+          "when": "view == gitguardex.activeAgents",
+          "group": "navigation@8"
+        },
         {
           "command": "gitguardex.activeAgents.refresh",
           "when": "view == gitguardex.activeAgents",
           "group": "navigation@9"
         }
       ],
+      "extension/context": [
+        {
+          "command": "gitguardex.activeAgents.restart",
+          "when": "extension == recodeee.gitguardex-active-agents && extensionStatus == installed",
+          "group": "2_configure@2"
+        }
+      ],
       "view/item/context": [
         {
           "command": "gitguardex.activeAgents.openWorktree",
@@ -106,22 +134,22 @@
           "group": "inline"
         },
         {
-          "command": "gitguardex.activeAgents.finishSession",
+          "command": "gitguardex.activeAgents.showSessionTerminal",
           "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
           "group": "inline"
         },
         {
-          "command": "gitguardex.activeAgents.syncSession",
+          "command": "gitguardex.activeAgents.finishSession",
           "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
           "group": "inline"
         },
         {
-          "command": "gitguardex.activeAgents.stopSession",
+          "command": "gitguardex.activeAgents.syncSession",
           "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
           "group": "inline"
         },
         {
-          "command": "gitguardex.activeAgents.openSessionDiff",
+          "command": "gitguardex.activeAgents.stopSession",
           "when": "view == gitguardex.activeAgents && viewItem == gitguardex.session",
           "group": "inline"
         }

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

@@ -76,6 +76,46 @@ function toPositiveInteger(value) {
   return Number.isInteger(normalized) && normalized > 0 ? normalized : null;
 }
 
+function toBoundedInteger(value, min, max) {
+  const normalized = Number.parseInt(String(value ?? ''), 10);
+  if (!Number.isInteger(normalized) || normalized < min || normalized > max) {
+    return null;
+  }
+  return normalized;
+}
+
+function normalizeStringList(values) {
+  if (!Array.isArray(values)) {
+    return [];
+  }
+
+  return values
+    .map((value) => toNonEmptyString(value))
+    .filter(Boolean);
+}
+
+function normalizeSessionHealthPayload(input) {
+  if (!input || typeof input !== 'object' || Array.isArray(input)) {
+    return null;
+  }
+
+  const rawScores = input.scores && typeof input.scores === 'object' && !Array.isArray(input.scores)
+    ? input.scores
+    : null;
+  const score = toBoundedInteger(input.score ?? input.total ?? rawScores?.total, 0, 100);
+  if (score === null) {
+    return null;
+  }
+
+  return {
+    score,
+    label: toNonEmptyString(input.label),
+    primaryDriver: toNonEmptyString(input.primaryDriver),
+    secondaries: normalizeStringList(input.secondaries),
+    outputLine: toNonEmptyString(input.outputLine),
+  };
+}
+
 function normalizeTaskMode(value) {
   const normalized = toNonEmptyString(value).toLowerCase();
   return normalized === 'caveman' || normalized === 'omx' ? normalized : '';
@@ -126,6 +166,17 @@ function normalizeRelativePath(value) {
   return toNonEmptyString(value).replace(/\\/g, '/').replace(/^\.\//, '');
 }
 
+function normalizeProjectPath(value) {
+  const normalized = toNonEmptyString(value);
+  if (!normalized) {
+    return '';
+  }
+
+  return path.isAbsolute(normalized)
+    ? path.resolve(normalized)
+    : normalizeRelativePath(normalized);
+}
+
 function readJsonFile(filePath) {
   try {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'));
@@ -742,8 +793,12 @@ function buildSessionRecord(input) {
     repoRoot,
     branch,
     taskName: toNonEmptyString(input.taskName, 'task'),
-    latestTaskPreview: '',
+    latestTaskPreview: toNonEmptyString(input.latestTaskPreview),
     agentName: toNonEmptyString(input.agentName, 'agent'),
+    projectName: toNonEmptyString(input.projectName),
+    projectPath: normalizeProjectPath(input.projectPath),
+    snapshotName: toNonEmptyString(input.snapshotName),
+    snapshotEmail: toNonEmptyString(input.snapshotEmail || input.email),
     worktreePath,
     pid,
     cliName: toNonEmptyString(input.cliName, 'codex'),
@@ -753,6 +808,7 @@ function buildSessionRecord(input) {
     startedAt: startedAt.toISOString(),
     lastHeartbeatAt: lastHeartbeatAt.toISOString(),
     state: normalizeAdvisoryState(input.state),
+    sessionHealth: normalizeSessionHealthPayload(input.sessionHealth || input.sessionSeverity),
   };
 }
 
@@ -792,8 +848,12 @@ function normalizeSessionRecord(input, options = {}) {
     repoRoot: path.resolve(repoRoot),
     branch,
     taskName: toNonEmptyString(input.taskName, 'task'),
-    latestTaskPreview: '',
+    latestTaskPreview: toNonEmptyString(input.latestTaskPreview),
     agentName: toNonEmptyString(input.agentName, 'agent'),
+    projectName: toNonEmptyString(input.projectName),
+    projectPath: normalizeProjectPath(input.projectPath),
+    snapshotName: toNonEmptyString(input.snapshotName),
+    snapshotEmail: toNonEmptyString(input.snapshotEmail || input.email),
     worktreePath: path.resolve(worktreePath),
     pid,
     cliName: toNonEmptyString(input.cliName, 'codex'),
@@ -813,6 +873,7 @@ function normalizeSessionRecord(input, options = {}) {
     lockSnapshotCount: 0,
     lockSessionCount: 0,
     collaboration: false,
+    sessionHealth: normalizeSessionHealthPayload(input.sessionHealth || input.sessionSeverity),
   };
 }
 
@@ -867,6 +928,23 @@ function deriveAgentNameFromBranch(branch) {
   return 'agent';
 }
 
+function isManagedAgentBranch(branch) {
+  return toNonEmptyString(branch).startsWith('agent/');
+}
+
+function deriveManagedWorktreeStartedAt(worktreePath, now = Date.now()) {
+  try {
+    const stats = fs.statSync(worktreePath);
+    if (Number.isFinite(stats.mtimeMs)) {
+      return new Date(stats.mtimeMs).toISOString();
+    }
+  } catch (_error) {
+    // Directory mtime is best-effort context only; fall back to current scan time.
+  }
+
+  return new Date(now).toISOString();
+}
+
 function flattenTelemetrySnapshotSessions(lockPayload) {
   const flattened = [];
   const snapshots = Array.isArray(lockPayload?.snapshots) ? lockPayload.snapshots : [];
@@ -880,6 +958,9 @@ function flattenTelemetrySnapshotSessions(lockPayload) {
         projectPath: toNonEmptyString(session?.projectPath),
         snapshotName: toNonEmptyString(snapshot?.snapshotName),
         email: toNonEmptyString(snapshot?.email),
+        sessionHealth: normalizeSessionHealthPayload(
+          session?.sessionHealth || session?.sessionSeverity || snapshot?.sessionHealth || snapshot?.sessionSeverity,
+        ),
       });
     }
   }
@@ -898,7 +979,19 @@ function sortSessionsByTimestamp(sessions) {
 }
 
 function deriveLockTaskAnchor(entries, fallbackTaskName, fallbackTimestamp) {
-  const sortedEntries = [...entries].sort((left, right) => {
+  const sortedEntries = sortTelemetryEntriesForAnchor(entries);
+
+  const latestEntry = sortedEntries[0] || null;
+  return {
+    taskName: latestEntry?.taskPreview || fallbackTaskName || 'task',
+    latestTaskPreview: latestEntry?.taskPreview || '',
+    timestamp: latestEntry?.taskUpdatedAt || fallbackTimestamp || '',
+    sessionHealth: latestEntry?.sessionHealth || null,
+  };
+}
+
+function sortTelemetryEntriesForAnchor(entries) {
+  return [...entries].sort((left, right) => {
     const timeDelta = Date.parse(right.taskUpdatedAt || '') - Date.parse(left.taskUpdatedAt || '');
     if (timeDelta !== 0) {
       return timeDelta;
@@ -908,12 +1001,23 @@ function deriveLockTaskAnchor(entries, fallbackTaskName, fallbackTimestamp) {
     }
     return (right.projectPath || '').localeCompare(left.projectPath || '');
   });
+}
 
-  const latestEntry = sortedEntries[0] || null;
+function deriveLockSnapshotIdentity(entries) {
+  const latestEntry = sortTelemetryEntriesForAnchor(entries)
+    .find((entry) => entry?.snapshotName || entry?.email) || null;
   return {
-    taskName: latestEntry?.taskPreview || fallbackTaskName || 'task',
-    latestTaskPreview: latestEntry?.taskPreview || '',
-    timestamp: latestEntry?.taskUpdatedAt || fallbackTimestamp || '',
+    snapshotName: toNonEmptyString(latestEntry?.snapshotName),
+    snapshotEmail: toNonEmptyString(latestEntry?.email),
+  };
+}
+
+function deriveLockProjectMetadata(entries) {
+  const latestEntry = sortTelemetryEntriesForAnchor(entries)
+    .find((entry) => entry?.projectPath || entry?.projectName) || null;
+  return {
+    projectName: toNonEmptyString(latestEntry?.projectName),
+    projectPath: normalizeProjectPath(latestEntry?.projectPath),
   };
 }
 
@@ -927,6 +1031,8 @@ function buildWorktreeLockSession(repoRoot, worktreePath, lockPayload, options =
     : `agent/telemetry/${path.basename(worktreePath)}`;
   const label = deriveSessionLabel(effectiveBranch, worktreePath);
   const taskAnchor = deriveLockTaskAnchor(telemetryEntries, label, telemetryUpdatedAt);
+  const snapshotIdentity = deriveLockSnapshotIdentity(telemetryEntries);
+  const projectMetadata = deriveLockProjectMetadata(telemetryEntries);
   const startedAt = taskAnchor.timestamp || telemetryUpdatedAt || new Date(now).toISOString();
 
   const session = {
@@ -936,6 +1042,10 @@ function buildWorktreeLockSession(repoRoot, worktreePath, lockPayload, options =
     taskName: taskAnchor.taskName,
     latestTaskPreview: taskAnchor.latestTaskPreview,
     agentName: deriveAgentNameFromBranch(effectiveBranch),
+    projectName: projectMetadata.projectName,
+    projectPath: projectMetadata.projectPath,
+    snapshotName: snapshotIdentity.snapshotName,
+    snapshotEmail: snapshotIdentity.snapshotEmail,
     worktreePath: path.resolve(worktreePath),
     pid: null,
     cliName: 'codex',
@@ -955,6 +1065,56 @@ function buildWorktreeLockSession(repoRoot, worktreePath, lockPayload, options =
     lockSnapshotCount: toPositiveInteger(lockPayload?.snapshotCount) || 0,
     lockSessionCount: toPositiveInteger(lockPayload?.sessionCount) || telemetryEntries.length,
     collaboration: Boolean(lockPayload?.collaboration),
+    sessionHealth: taskAnchor.sessionHealth || normalizeSessionHealthPayload(
+      lockPayload?.sessionHealth || lockPayload?.sessionSeverity,
+    ),
+  };
+
+  session.elapsedLabel = formatElapsedFrom(session.startedAt, now);
+  Object.assign(session, deriveSessionActivity(session, { now }));
+  return session;
+}
+
+function buildManagedWorktreeSession(repoRoot, worktreePath, options = {}) {
+  const now = options.now || Date.now();
+  const branch = readWorktreeBranch(worktreePath);
+  if (!branch || branch === 'HEAD' || !isManagedAgentBranch(branch)) {
+    return null;
+  }
+
+  const label = deriveSessionLabel(branch, worktreePath);
+  const startedAt = deriveManagedWorktreeStartedAt(worktreePath, now);
+  const session = {
+    schemaVersion: SESSION_SCHEMA_VERSION,
+    repoRoot: path.resolve(repoRoot),
+    branch,
+    taskName: label,
+    latestTaskPreview: '',
+    agentName: deriveAgentNameFromBranch(branch),
+    projectName: '',
+    projectPath: '',
+    snapshotName: '',
+    snapshotEmail: '',
+    worktreePath: path.resolve(worktreePath),
+    pid: null,
+    cliName: 'gx',
+    taskMode: '',
+    openspecTier: '',
+    taskRoutingReason: '',
+    startedAt,
+    lastHeartbeatAt: '',
+    state: '',
+    filePath: path.join(worktreePath, '.git'),
+    label,
+    changedPaths: [],
+    worktreeChangedPaths: [],
+    sourceKind: 'managed-worktree',
+    telemetryUpdatedAt: '',
+    telemetrySource: 'managed-worktree',
+    lockSnapshotCount: 0,
+    lockSessionCount: 0,
+    collaboration: false,
+    sessionHealth: null,
   };
 
   session.elapsedLabel = formatElapsedFrom(session.startedAt, now);
@@ -1004,6 +1164,48 @@ function readWorktreeLockSessions(repoRoot, options = {}) {
   return sortSessionsByTimestamp(sessions);
 }
 
+function readManagedWorktreeSessions(repoRoot, options = {}) {
+  const lockSessions = readWorktreeLockSessions(repoRoot, options);
+  const lockSessionsByWorktree = new Map(
+    lockSessions.map((session) => [path.resolve(session.worktreePath), session]),
+  );
+  const sessions = [];
+
+  for (const managedRoot of resolveManagedWorktreeRoots(repoRoot)) {
+    if (!fs.existsSync(managedRoot)) {
+      continue;
+    }
+
+    let entries;
+    try {
+      entries = fs.readdirSync(managedRoot, { withFileTypes: true });
+    } catch (_error) {
+      continue;
+    }
+
+    for (const entry of entries) {
+      if (!entry.isDirectory()) {
+        continue;
+      }
+
+      const worktreePath = path.join(managedRoot, entry.name);
+      const worktreeKey = path.resolve(worktreePath);
+      const lockSession = lockSessionsByWorktree.get(worktreeKey);
+      if (lockSession) {
+        sessions.push(lockSession);
+        continue;
+      }
+
+      const managedSession = buildManagedWorktreeSession(repoRoot, worktreePath, options);
+      if (managedSession) {
+        sessions.push(managedSession);
+      }
+    }
+  }
+
+  return sortSessionsByTimestamp(sessions);
+}
+
 function mergeSessionSources(primarySessions, lockSessions) {
   const lockSessionsByWorktree = new Map(
     lockSessions.map((session) => [path.resolve(session.worktreePath), session]),
@@ -1019,6 +1221,21 @@ function mergeSessionSources(primarySessions, lockSessions) {
     }
     if (lockSession) {
       consumedLockWorktrees.add(worktreeKey);
+      merged.push({
+        ...session,
+        latestTaskPreview: session.latestTaskPreview || lockSession.latestTaskPreview,
+        projectName: session.projectName || lockSession.projectName,
+        projectPath: session.projectPath || lockSession.projectPath,
+        snapshotName: session.snapshotName || lockSession.snapshotName,
+        snapshotEmail: session.snapshotEmail || lockSession.snapshotEmail,
+        telemetryUpdatedAt: session.telemetryUpdatedAt || lockSession.telemetryUpdatedAt,
+        telemetrySource: session.telemetrySource || lockSession.telemetrySource,
+        lockSnapshotCount: session.lockSnapshotCount || lockSession.lockSnapshotCount,
+        lockSessionCount: session.lockSessionCount || lockSession.lockSessionCount,
+        collaboration: session.collaboration || lockSession.collaboration,
+        sessionHealth: session.sessionHealth || lockSession.sessionHealth,
+      });
+      continue;
     }
     merged.push(session);
   }
@@ -1061,7 +1278,7 @@ function readActiveSessions(repoRoot, options = {}) {
 
   return mergeSessionSources(
     sortSessionsByTimestamp(sessionFileSessions),
-    readWorktreeLockSessions(repoRoot, { now }),
+    readManagedWorktreeSessions(repoRoot, { now }),
   );
 }
 
@@ -1096,6 +1313,7 @@ module.exports = {
   parseRepoChangeLine,
   previewChangedPaths,
   readActiveSessions,
+  readManagedWorktreeSessions,
   readWorktreeLockSessions,
   readRepoChanges,
   deriveRepoChangeStatus,