@shepai/cli 1.142.0 → 1.142.1-pr455.16bd4d2

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts

@@ -1,8 +1,8 @@
 /**
  * Feature List Command
  *
- * Lists features in a formatted list with optional filtering.
- * Derives real-time status from the agent run (not stale Feature.lifecycle).
+ * Lists features in a hierarchical tree view: repo → feature → child → child…
+ * Repos and features are ordered by creation date descending.
  *
  * Usage: shep feat ls [options]
  *
@@ -11,5 +11,47 @@
  * $ shep feat ls --repo /path/to/project
  */
 import { Command } from 'commander';
+import type { Feature, AgentRun, PhaseTiming, Repository } from '../../../../../packages/core/src/domain/generated/output.js';
+/** Convert a date value (any type from domain) to a timestamp for sorting. */
+export declare function toTimestamp(val: unknown): number;
+interface Entry {
+    feature: Feature;
+    run: AgentRun | null;
+    phases: PhaseTiming[];
+}
+interface TreeNode {
+    entry: Entry;
+    children: TreeNode[];
+}
+interface RepoGroup {
+    repoPath: string;
+    repoName: string;
+    repoCreatedAt: number;
+    roots: TreeNode[];
+}
+interface FlatRow {
+    entry: Entry;
+    parentIsLast: boolean[];
+    isLast: boolean;
+}
+/**
+ * Build a recursive feature tree within a single repo group.
+ * Features with a parentId that matches another feature in the group become children.
+ * All levels are sorted by createdAt descending.
+ */
+export declare function buildTree(entries: Entry[]): TreeNode[];
+/**
+ * Group entries by repositoryPath and sort repos by createdAt desc.
+ * Uses the Repository entity's createdAt if available; falls back to the
+ * newest feature's createdAt in that repo group.
+ */
+export declare function groupByRepo(entries: Entry[], repos: Repository[]): RepoGroup[];
+/** Flatten a tree into rows with prefix context for rendering. */
+export declare function flattenTree(nodes: TreeNode[], parentIsLast: boolean[]): FlatRow[];
+/** Build the tree-drawing prefix string for a given depth context. */
+export declare function buildTreePrefix(parentIsLast: boolean[], isLast: boolean): string;
+/** Render a single feature row as a formatted string. */
+export declare function renderFeatureRow(entry: Entry, treePrefix: string): string;
 export declare function createLsCommand(): Command;
+export {};
 //# sourceMappingURL=ls.command.d.ts.map

package/dist/src/presentation/cli/commands/feat/ls.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkLpC,wBAAgB,eAAe,IAAI,OAAO,CAwGzC"}
+{"version":3,"file":"ls.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/ls.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAyJ/F,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAOhD;AAiBD,UAAU,KAAK;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,EAAE,CAAC;CACtB;AAED,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED,UAAU,OAAO;IACf,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,EAAE,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAgCtD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CA8B9E;AAED,kEAAkE;AAClE,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAWjF;AAED,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAOhF;AAQD,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAazE;AAeD,wBAAgB,eAAe,IAAI,OAAO,CAiFzC"}

package/dist/src/presentation/cli/commands/feat/ls.command.js

@@ -1,8 +1,8 @@
 /**
  * Feature List Command
  *
- * Lists features in a formatted list with optional filtering.
- * Derives real-time status from the agent run (not stale Feature.lifecycle).
+ * Lists features in a hierarchical tree view: repo → feature → child → child…
+ * Repos and features are ordered by creation date descending.
  *
  * Usage: shep feat ls [options]
  *
@@ -14,7 +14,7 @@ import path from 'node:path';
 import { Command } from 'commander';
 import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
 import { ListFeaturesUseCase } from '../../../../../packages/core/src/application/use-cases/features/list-features.use-case.js';
-import { colors, symbols, messages, renderListView } from '../../ui/index.js';
+import { colors, symbols, messages, fmt } from '../../ui/index.js';
 /** Map graph node names to human-readable phase labels (active). */
 const NODE_TO_PHASE = {
     analyze: 'Analyzing',
@@ -33,21 +33,10 @@ const NODE_TO_REVIEW = {
     implement: 'Review Merge',
     merge: 'Review Merge',
 };
-/** Status priority for sorting (lower = higher priority). */
-const STATUS_PRIORITY = {
-    running: 0,
-    pending: 0,
-    waiting_approval: 1,
-    failed: 2,
-    interrupted: 2,
-    completed: 3,
-};
 /**
  * Derive the display status from the agent run.
- * Returns the current graph node as a phase label with an activity indicator.
  */
 function formatStatus(feature, run) {
-    // Blocked features show "Waiting" — the parent relationship is conveyed by tree indentation
     if (feature.lifecycle === 'Archived') {
         return `${colors.muted(symbols.dotEmpty)} ${colors.muted('Archived')}`;
     }
@@ -124,7 +113,6 @@ function formatElapsed(run, phaseTimings) {
         const totalMs = phaseTimings.reduce((sum, pt) => {
             if (pt.durationMs != null)
                 return sum + Number(pt.durationMs);
-            // Phase still running — add live delta
             if (pt.startedAt)
                 return sum + (now - new Date(pt.startedAt).getTime());
             return sum;
@@ -132,7 +120,6 @@ function formatElapsed(run, phaseTimings) {
         const isRunning = run?.status === 'running' || run?.status === 'pending';
         return isRunning ? colors.info(formatDuration(totalMs)) : colors.muted(formatDuration(totalMs));
     }
-    // Fallback to run timestamps if no phase timings
     if (!run?.startedAt)
         return '';
     const started = new Date(run.startedAt).getTime();
@@ -160,11 +147,149 @@ function formatGates(feature) {
     const push = feature.push ? colors.accent('■') : colors.muted('□');
     return `${gate(allowPrd)} ${gate(allowPlan)} ${gate(allowMerge)} ${push}`;
 }
-/** Get sort priority for a run status (lower = shown first). */
-function getStatusPriority(run) {
-    if (!run)
-        return 4;
-    return STATUS_PRIORITY[run.status] ?? 4;
+/** Convert a date value (any type from domain) to a timestamp for sorting. */
+export function toTimestamp(val) {
+    if (!val)
+        return 0;
+    try {
+        return new Date(val).getTime();
+    }
+    catch {
+        return 0;
+    }
+}
+/** Strip ANSI escape sequences to get visible character count. */
+function stripAnsi(text) {
+    // eslint-disable-next-line no-control-regex
+    return text.replace(/\x1B\[[0-9;]*m/g, '');
+}
+/** Pad a string that may contain ANSI codes to a given visible width. */
+function ansiPad(text, width) {
+    const visible = stripAnsi(text).length;
+    if (visible >= width)
+        return text;
+    return text + ' '.repeat(width - visible);
+}
+/**
+ * Build a recursive feature tree within a single repo group.
+ * Features with a parentId that matches another feature in the group become children.
+ * All levels are sorted by createdAt descending.
+ */
+export function buildTree(entries) {
+    const byId = new Map();
+    for (const e of entries)
+        byId.set(e.feature.id, e);
+    const childrenByParent = new Map();
+    const rootEntries = [];
+    for (const e of entries) {
+        const pid = e.feature.parentId;
+        if (pid && byId.has(pid)) {
+            const list = childrenByParent.get(pid) ?? [];
+            list.push(e);
+            childrenByParent.set(pid, list);
+        }
+        else {
+            rootEntries.push(e);
+        }
+    }
+    function sortDesc(arr) {
+        return [...arr].sort((a, b) => toTimestamp(b.feature.createdAt) - toTimestamp(a.feature.createdAt));
+    }
+    function buildNodes(arr) {
+        return sortDesc(arr).map((e) => ({
+            entry: e,
+            children: buildNodes(childrenByParent.get(e.feature.id) ?? []),
+        }));
+    }
+    return buildNodes(rootEntries);
+}
+/**
+ * Group entries by repositoryPath and sort repos by createdAt desc.
+ * Uses the Repository entity's createdAt if available; falls back to the
+ * newest feature's createdAt in that repo group.
+ */
+export function groupByRepo(entries, repos) {
+    const repoByPath = new Map();
+    for (const r of repos) {
+        repoByPath.set(r.path.replace(/\\/g, '/'), r);
+    }
+    const groupMap = new Map();
+    for (const e of entries) {
+        const repoPath = e.feature.repositoryPath.replace(/\\/g, '/');
+        const list = groupMap.get(repoPath) ?? [];
+        list.push(e);
+        groupMap.set(repoPath, list);
+    }
+    const groups = [];
+    for (const [repoPath, groupEntries] of groupMap) {
+        const repo = repoByPath.get(repoPath);
+        const repoCreatedAt = repo
+            ? toTimestamp(repo.createdAt)
+            : Math.max(...groupEntries.map((e) => toTimestamp(e.feature.createdAt)));
+        groups.push({
+            repoPath,
+            repoName: path.basename(repoPath),
+            repoCreatedAt,
+            roots: buildTree(groupEntries),
+        });
+    }
+    groups.sort((a, b) => b.repoCreatedAt - a.repoCreatedAt);
+    return groups;
+}
+/** Flatten a tree into rows with prefix context for rendering. */
+export function flattenTree(nodes, parentIsLast) {
+    const result = [];
+    for (let i = 0; i < nodes.length; i++) {
+        const node = nodes[i];
+        const isLast = i === nodes.length - 1;
+        result.push({ entry: node.entry, parentIsLast, isLast });
+        if (node.children.length > 0) {
+            result.push(...flattenTree(node.children, [...parentIsLast, isLast]));
+        }
+    }
+    return result;
+}
+/** Build the tree-drawing prefix string for a given depth context. */
+export function buildTreePrefix(parentIsLast, isLast) {
+    let prefix = '';
+    for (const wasLast of parentIsLast) {
+        prefix += wasLast ? '   ' : '│  ';
+    }
+    prefix += isLast ? '└─ ' : '├─ ';
+    return prefix;
+}
+// Column widths for feature rows
+const FIRST_COL_WIDTH = 44; // tree prefix + id + 2 spaces + name
+const STATUS_WIDTH = 22;
+const GATES_WIDTH = 10;
+const ELAPSED_WIDTH = 9;
+/** Render a single feature row as a formatted string. */
+export function renderFeatureRow(entry, treePrefix) {
+    const { feature, run, phases } = entry;
+    const shortId = colors.muted(feature.id.slice(0, 8));
+    const prefixPlusId = `${treePrefix}${shortId}  `;
+    const prefixPlusIdLen = stripAnsi(prefixPlusId).length;
+    const nameMax = Math.max(FIRST_COL_WIDTH - prefixPlusIdLen, 8);
+    const name = truncate(feature.name, nameMax);
+    const firstCol = ansiPad(prefixPlusId + name, FIRST_COL_WIDTH);
+    const status = ansiPad(formatStatus(feature, run), STATUS_WIDTH);
+    const gates = ansiPad(formatGates(feature), GATES_WIDTH);
+    const elapsed = ansiPad(formatElapsed(run, phases), ELAPSED_WIDTH);
+    const done = formatDone(run);
+    return `  ${firstCol}  ${status}  ${gates}  ${elapsed}  ${done}`;
+}
+/** Count total features across all repo groups. */
+function countFeatures(groups) {
+    let count = 0;
+    function countNodes(nodes) {
+        for (const n of nodes) {
+            count++;
+            countNodes(n.children);
+        }
+    }
+    for (const g of groups)
+        countNodes(g.roots);
+    return count;
 }
 export function createLsCommand() {
     return new Command('ls')
@@ -177,79 +302,54 @@ export function createLsCommand() {
             const useCase = container.resolve(ListFeaturesUseCase);
             const runRepo = container.resolve('IAgentRunRepository');
             const phaseRepo = container.resolve('IPhaseTimingRepository');
+            const repoRepo = container.resolve('IRepositoryRepository');
             const filters = {
                 ...(options.repo && { repositoryPath: options.repo }),
                 ...(options.includeDeleted && { includeDeleted: true }),
                 ...(options.showArchived && { includeArchived: true }),
             };
             const features = await useCase.execute(Object.keys(filters).length > 0 ? filters : undefined);
-            // Load agent runs and phase timings for all features in parallel
-            const [runs, timings] = await Promise.all([
+            // Load agent runs, phase timings, and repos in parallel
+            const [runs, timings, repos] = await Promise.all([
                 Promise.all(features.map((f) => f.agentRunId ? runRepo.findById(f.agentRunId) : Promise.resolve(null))),
                 Promise.all(features.map((f) => phaseRepo.findByFeatureId(f.id))),
+                repoRepo.list(),
             ]);
-            // Pair features with runs/timings and sort by status priority
-            const paired = features
-                .map((feature, i) => ({ feature, run: runs[i], phases: timings[i] }))
-                .sort((a, b) => getStatusPriority(a.run) - getStatusPriority(b.run));
-            const childrenByParent = new Map();
-            const roots = [];
-            for (const entry of paired) {
-                const pid = entry.feature.parentId;
-                if (pid && entry.feature.lifecycle === 'Blocked') {
-                    const list = childrenByParent.get(pid) ?? [];
-                    list.push(entry);
-                    childrenByParent.set(pid, list);
-                }
-                else {
-                    roots.push(entry);
-                }
-            }
-            // Flatten: parent then its blocked children
-            const ordered = [];
-            for (const entry of roots) {
-                ordered.push({ entry, indent: false });
-                const kids = childrenByParent.get(entry.feature.id);
-                if (kids) {
-                    for (const kid of kids) {
-                        ordered.push({ entry: kid, indent: true });
-                    }
-                    childrenByParent.delete(entry.feature.id);
-                }
+            const entries = features.map((feature, i) => ({
+                feature,
+                run: runs[i],
+                phases: timings[i],
+            }));
+            const groups = groupByRepo(entries, repos);
+            const total = countFeatures(groups);
+            if (total === 0) {
+                messages.newline();
+                messages.info('No features found');
+                messages.newline();
+                return;
             }
-            // Append orphaned blocked children (parent not in current list)
-            for (const kids of childrenByParent.values()) {
-                for (const kid of kids) {
-                    ordered.push({ entry: kid, indent: false });
+            const lines = [];
+            lines.push('');
+            lines.push(`  ${fmt.heading(`Features (${total})`)}`);
+            lines.push('');
+            // Column headers
+            const h1 = colors.muted('NAME'.padEnd(FIRST_COL_WIDTH));
+            const h2 = colors.muted('STATUS'.padEnd(STATUS_WIDTH));
+            const h3 = colors.muted('R P M ↑'.padEnd(GATES_WIDTH));
+            const h4 = colors.muted('ELAPSED'.padEnd(ELAPSED_WIDTH));
+            const h5 = colors.muted('DONE');
+            lines.push(`  ${h1}  ${h2}  ${h3}  ${h4}  ${h5}`);
+            for (const group of groups) {
+                lines.push('');
+                lines.push(`  ${fmt.heading(group.repoName)}  ${colors.muted(group.repoPath)}`);
+                const flatRows = flattenTree(group.roots, []);
+                for (const { entry, parentIsLast, isLast } of flatRows) {
+                    const treePrefix = buildTreePrefix(parentIsLast, isLast);
+                    lines.push(renderFeatureRow(entry, treePrefix));
                 }
             }
-            const rows = ordered.map(({ entry: { feature, run, phases }, indent }) => {
-                const repo = path.basename(feature.repositoryPath);
-                const prefix = indent ? `${colors.muted('└')} ` : '';
-                return [
-                    prefix + feature.id.slice(0, 8),
-                    prefix + truncate(feature.name, indent ? 28 : 30),
-                    formatStatus(feature, run),
-                    colors.muted(repo),
-                    formatGates(feature),
-                    formatElapsed(run, phases),
-                    formatDone(run),
-                ];
-            });
-            renderListView({
-                title: 'Features',
-                columns: [
-                    { label: 'ID', width: 10 },
-                    { label: 'Name', width: 32 },
-                    { label: 'Status', width: 21 },
-                    { label: 'Repo', width: 20 },
-                    { label: 'R P M ↑', width: 10 },
-                    { label: 'Elapsed', width: 10 },
-                    { label: 'Done', width: 12 },
-                ],
-                rows,
-                emptyMessage: 'No features found',
-            });
+            lines.push('');
+            console.log(lines.join('\n'));
         }
         catch (error) {
             const err = error instanceof Error ? error : new Error(String(error));

package/dist/src/presentation/web/app/api/sessions/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/sessions/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK3C,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAgTvC;;;;;GAKG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO;;;;YAnTpC,MAAM;mBACC,MAAM;iBACR,MAAM,GAAG,IAAI;sBACR,MAAM;wBACJ,MAAM,GAAG,IAAI;uBACd,MAAM,GAAG,IAAI;mBACjB,MAAM,GAAG,IAAI;qBACX,MAAM;kBACT,MAAM;;IAwUjB"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/sessions/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,eAAO,MAAM,OAAO,kBAAkB,CAAC;AA2VvC;;;;;GAKG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO;;;;YA9VpC,MAAM;mBACC,MAAM;iBACR,MAAM,GAAG,IAAI;sBACR,MAAM;wBACJ,MAAM,GAAG,IAAI;uBACd,MAAM,GAAG,IAAI;mBACjB,MAAM,GAAG,IAAI;qBACX,MAAM;kBACT,MAAM;;IAoXjB"}

package/dist/src/presentation/web/app/api/sessions/route.js

@@ -1,4 +1,5 @@
 import { NextResponse } from 'next/server';
+import { createHash } from 'node:crypto';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { readdir, stat } from 'node:fs/promises';
@@ -20,28 +21,58 @@ function cursorEncodePath(p) {
     return p.replace(/^\//, '').replace(/\./g, '').replace(/[/\\]/g, '-');
 }
 // ── Claude Code session scanner ───────────────────────────────────────
-async function scanClaudeSessions(repositoryPath, limit) {
-    const dirName = claudeEncodePath(repositoryPath);
-    const projectDir = join(homedir(), '.claude', 'projects', dirName);
-    let files;
+/**
+ * Collect .jsonl session files from a single Claude project directory.
+ */
+async function collectJsonlFiles(projectDir) {
+    let entries;
     try {
-        const entries = await readdir(projectDir);
-        files = entries.filter((e) => e.endsWith('.jsonl'));
+        entries = await readdir(projectDir);
     }
     catch {
         return [];
     }
-    // Stat all files for mtime sorting
-    const fileInfos = await Promise.allSettled(files.map(async (name) => {
+    const jsonlFiles = entries.filter((e) => e.endsWith('.jsonl'));
+    const fileInfos = await Promise.allSettled(jsonlFiles.map(async (name) => {
         const filePath = join(projectDir, name);
         const s = await stat(filePath);
         return { name, filePath, mtime: s.mtime.getTime() };
     }));
-    const valid = fileInfos
+    return fileInfos
         .filter((r) => r.status === 'fulfilled')
-        .map((r) => r.value)
-        .sort((a, b) => b.mtime - a.mtime)
-        .slice(0, limit);
+        .map((r) => r.value);
+}
+async function scanClaudeSessions(repositoryPath, limit, includeWorktrees = false) {
+    const dirName = claudeEncodePath(repositoryPath);
+    const projectsRoot = join(homedir(), '.claude', 'projects');
+    // Collect files from the exact directory
+    const primaryDir = join(projectsRoot, dirName);
+    let allFiles = await collectJsonlFiles(primaryDir);
+    // When includeWorktrees is set, also scan:
+    // 1. Directories whose name starts with the encoded repo path (git worktrees, .worktrees)
+    // 2. Shep worktree directories (~/.shep/repos/<hash>/wt/*) which use a hash of the repo path
+    if (includeWorktrees) {
+        try {
+            const allDirs = await readdir(projectsRoot);
+            // Match git-style worktrees (same prefix as repo path)
+            const prefixMatches = allDirs.filter((d) => d !== dirName && d.startsWith(dirName));
+            // Match shep worktrees: compute repo hash → find dirs starting with encoded shep path
+            const normalizedRepoPath = repositoryPath.replace(/\\/g, '/');
+            const repoHash = createHash('sha256').update(normalizedRepoPath).digest('hex').slice(0, 16);
+            const shepHome = join(homedir(), '.shep').replace(/\\/g, '/');
+            const shepWorktreePrefix = claudeEncodePath(join(shepHome, 'repos', repoHash));
+            const shepMatches = allDirs.filter((d) => d.startsWith(shepWorktreePrefix) && !prefixMatches.includes(d) && d !== dirName);
+            const worktreeDirs = [...prefixMatches, ...shepMatches];
+            const worktreeResults = await Promise.all(worktreeDirs.map((d) => collectJsonlFiles(join(projectsRoot, d))));
+            for (const files of worktreeResults) {
+                allFiles = allFiles.concat(files);
+            }
+        }
+        catch {
+            // projectsRoot doesn't exist — no sessions at all
+        }
+    }
+    const valid = allFiles.sort((a, b) => b.mtime - a.mtime).slice(0, limit);
     // Parse each file
     const results = await Promise.allSettled(valid.map(async (fi) => parseClaudeSession(fi.filePath, fi.name, fi.mtime, repositoryPath)));
     return results
@@ -238,13 +269,14 @@ export async function GET(request) {
     const url = new URL(request.url);
     const repositoryPath = url.searchParams.get('repositoryPath');
     const limit = parseInt(url.searchParams.get('limit') ?? '10', 10);
+    const includeWorktrees = url.searchParams.get('includeWorktrees') === 'true';
     if (!repositoryPath?.trim()) {
         return NextResponse.json({ error: 'repositoryPath is required' }, { status: 400 });
     }
     try {
         // Scan all providers in parallel
         const [claudeSessions, cursorSessions] = await Promise.all([
-            scanClaudeSessions(repositoryPath, limit),
+            scanClaudeSessions(repositoryPath, limit, includeWorktrees),
             scanCursorSessions(repositoryPath, limit),
         ]);
         // Merge and sort by mtime descending, apply limit

package/dist/src/presentation/web/components/common/feature-node/feature-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-node.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/feature-node.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AA6CnE,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,2CA8dA"}
+{"version":3,"file":"feature-node.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/feature-node.tsx"],"names":[],"mappings":"AAoCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AA6CnE,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,2CAgeA"}

package/dist/src/presentation/web/components/common/feature-node/feature-node.js

@@ -112,7 +112,7 @@ export function FeatureNode({ data, selected, }) {
                                                                     ? 'cursor-pointer opacity-80 transition-opacity hover:opacity-100'
                                                                     : 'cursor-default'), children: data.deployment.status === DeploymentState.Booting ? (_jsx(Loader2, { className: "h-3 w-3 animate-spin text-blue-500" })) : (_jsx(Globe, { className: "h-3 w-3 text-green-600" })) }) }), _jsx(TooltipContent, { side: "top", children: data.deployment.status === DeploymentState.Booting
                                                                 ? 'Deploying...'
-                                                                : (data.deployment.url ?? 'Live') })] }) })) : null, data.fastMode ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { "data-testid": "feature-node-fast-mode-badge", children: _jsx(Zap, { className: "h-3 w-3 text-amber-500" }) }) }), _jsx(TooltipContent, { side: "top", children: "Fast Mode" })] }) })) : null, data.repositoryPath ? (_jsx(FeatureSessionsDropdown, { repositoryPath: data.repositoryPath })) : null] }), data.state === 'deleting' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Loader2, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-gray-400" }), _jsx("span", { className: "text-muted-foreground", children: "Deleting\u2026" })] })) : data.state === 'creating' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Icon, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-teal-600 dark:text-teal-400" }), _jsx("span", { className: "font-medium text-teal-600 dark:text-teal-400", children: getBadgeText(data) })] })) : data.state === 'running' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Icon, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-teal-600 dark:text-teal-400" }), _jsx("span", { className: "font-medium text-teal-600 dark:text-teal-400", children: getBadgeText(data) })] })) : data.state === 'action-required' ? (_jsxs(Button, { variant: "default", size: "xs", "aria-label": getActionRequiredLabel(data), "data-testid": "feature-node-approve-button", 
+                                                                : (data.deployment.url ?? 'Live') })] }) })) : null, data.fastMode ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { "data-testid": "feature-node-fast-mode-badge", children: _jsx(Zap, { className: "h-3 w-3 text-amber-500" }) }) }), _jsx(TooltipContent, { side: "top", children: "Fast Mode" })] }) })) : null, (data.worktreePath ?? data.repositoryPath) ? (_jsx(FeatureSessionsDropdown, { repositoryPath: data.worktreePath ?? data.repositoryPath })) : null] }), data.state === 'deleting' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Loader2, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-gray-400" }), _jsx("span", { className: "text-muted-foreground", children: "Deleting\u2026" })] })) : data.state === 'creating' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Icon, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-teal-600 dark:text-teal-400" }), _jsx("span", { className: "font-medium text-teal-600 dark:text-teal-400", children: getBadgeText(data) })] })) : data.state === 'running' ? (_jsxs("div", { className: "flex items-center gap-1.5 text-xs", children: [_jsx(Icon, { className: "h-3.5 w-3.5 shrink-0 animate-spin text-teal-600 dark:text-teal-400" }), _jsx("span", { className: "font-medium text-teal-600 dark:text-teal-400", children: getBadgeText(data) })] })) : data.state === 'action-required' ? (_jsxs(Button, { variant: "default", size: "xs", "aria-label": getActionRequiredLabel(data), "data-testid": "feature-node-approve-button", 
                                         // eslint-disable-next-line @typescript-eslint/no-empty-function -- click bubbles to card's onNodeClick
                                         onClick: () => { }, className: "nodrag dark:bg-primary dark:text-primary-foreground dark:hover:bg-primary/90 cursor-pointer bg-neutral-900 text-[11px] text-white hover:bg-neutral-800", children: [_jsx(Eye, { className: "h-3 w-3" }), getActionRequiredLabel(data)] })) : data.state === 'error' && data.onRetry ? (_jsxs(Button, { variant: "outline", size: "xs", "aria-label": "Retry", "data-testid": "feature-node-retry-button", onClick: (e) => {
                                             e.stopPropagation();

package/dist/src/presentation/web/components/common/feature-node/feature-sessions-dropdown.d.ts

@@ -13,9 +13,11 @@ export interface SessionSummary {
 interface FeatureSessionsDropdownProps {
     repositoryPath: string;
     className?: string;
+    /** When true, also scan worktree session directories (used by repo nodes). */
+    includeWorktrees?: boolean;
     /** Callback to create a feature from a session. Only shown on repo nodes. */
     onCreateFromSession?: (session: SessionSummary, sessionFilePath: string) => void;
 }
-export declare function FeatureSessionsDropdown({ repositoryPath, className, onCreateFromSession, }: FeatureSessionsDropdownProps): import("react/jsx-runtime").JSX.Element;
+export declare function FeatureSessionsDropdown({ repositoryPath, className, includeWorktrees, onCreateFromSession, }: FeatureSessionsDropdownProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=feature-sessions-dropdown.d.ts.map

package/dist/src/presentation/web/components/common/feature-node/feature-sessions-dropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-sessions-dropdown.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/feature-sessions-dropdown.tsx"],"names":[],"mappings":"AA8BA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,4BAA4B;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;CAClF;AAmDD,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,SAAS,EACT,mBAAmB,GACpB,EAAE,4BAA4B,2CA2J9B"}
+{"version":3,"file":"feature-sessions-dropdown.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/feature-sessions-dropdown.tsx"],"names":[],"mappings":"AA8BA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,4BAA4B;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC;CAClF;AAmDD,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,mBAAmB,GACpB,EAAE,4BAA4B,2CAmK9B"}

package/dist/src/presentation/web/components/common/feature-node/feature-sessions-dropdown.js

@@ -56,7 +56,7 @@ async function copyToClipboard(text) {
 function stopNodeEvent(e) {
     e.stopPropagation();
 }
-export function FeatureSessionsDropdown({ repositoryPath, className, onCreateFromSession, }) {
+export function FeatureSessionsDropdown({ repositoryPath, className, includeWorktrees, onCreateFromSession, }) {
     const [sessions, setSessions] = useState([]);
     const [loading, setLoading] = useState(false);
     const [fetched, setFetched] = useState(false);
@@ -77,7 +77,11 @@ export function FeatureSessionsDropdown({ repositoryPath, className, onCreateFro
     // Populates count badge + active indicator, and pre-loads the dropdown.
     useEffect(() => {
         let cancelled = false;
-        const params = new URLSearchParams({ repositoryPath, limit: '10' });
+        const params = new URLSearchParams({
+            repositoryPath,
+            limit: '10',
+            ...(includeWorktrees && { includeWorktrees: 'true' }),
+        });
         fetch(`/api/sessions?${params.toString()}`)
             .then((res) => (res.ok ? res.json() : null))
             .then((data) => {
@@ -91,14 +95,18 @@ export function FeatureSessionsDropdown({ repositoryPath, className, onCreateFro
         return () => {
             cancelled = true;
         };
-    }, [repositoryPath]);
+    }, [repositoryPath, includeWorktrees]);
     // Re-fetch on dropdown open if not already loaded (e.g. path changed)
     const doFetch = useCallback(async () => {
         if (fetched)
             return;
         setLoading(true);
         try {
-            const params = new URLSearchParams({ repositoryPath, limit: '10' });
+            const params = new URLSearchParams({
+                repositoryPath,
+                limit: '10',
+                ...(includeWorktrees && { includeWorktrees: 'true' }),
+            });
             const res = await fetch(`/api/sessions?${params.toString()}`);
             if (res.ok) {
                 const data = (await res.json());
@@ -113,7 +121,7 @@ export function FeatureSessionsDropdown({ repositoryPath, className, onCreateFro
             setLoading(false);
             setFetched(true);
         }
-    }, [repositoryPath, fetched]);
+    }, [repositoryPath, fetched, includeWorktrees]);
     const handleOpenChange = useCallback((open) => {
         if (open)
             void doFetch();

package/dist/src/presentation/web/components/common/repository-node/repository-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository-node.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/repository-node.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAOnE,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,2CAyaA"}
+{"version":3,"file":"repository-node.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/repository-node/repository-node.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAOnE,wBAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,2CA0aA"}

package/dist/src/presentation/web/components/common/repository-node/repository-node.js

@@ -71,7 +71,7 @@ export function RepositoryNode({ data, selected, }) {
                         e.stopPropagation();
                         data.onClick?.();
                     }
-                }, className: cn('nodrag bg-card flex w-[26rem] cursor-pointer flex-col overflow-hidden rounded-xl border shadow-sm transition-[border-color,box-shadow] duration-200 dark:bg-neutral-800/80', selected && 'border-blue-400 dark:border-amber-500/60'), children: [_jsxs("div", { className: "flex items-center gap-3 px-4 py-3", children: [_jsx(Github, { className: "text-muted-foreground h-5 w-5 shrink-0" }), _jsx("span", { "data-testid": "repository-node-name", className: "min-w-0 truncate text-sm font-medium", children: data.name }), _jsxs("div", { className: cn('flex shrink-0 items-center gap-2', (data.repositoryPath ?? data.onAdd) && 'ml-auto'), onClick: (e) => e.stopPropagation(), children: [data.repositoryPath ? (_jsxs(_Fragment, { children: [_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open in IDE", onClick: actions.openInIde, loading: actions.ideLoading, error: !!actions.ideError, icon: Code2, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open in IDE" })] }) }), _jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open in Shell", onClick: actions.openInShell, loading: actions.shellLoading, error: !!actions.shellError, icon: Terminal, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open in Shell" })] }) }), _jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open Folder", onClick: actions.openFolder, loading: actions.folderLoading, error: !!actions.folderError, icon: FolderOpen, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open Folder" })] }) }), _jsx(FeatureSessionsDropdown, { repositoryPath: data.repositoryPath, onCreateFromSession: handleCreateFromSession })] })) : null, data.onAdd ? _jsx("div", { className: "ml-1.5" }) : null, data.onAdd ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("button", { "aria-label": "New feature", "data-testid": "repository-node-add-button", onClick: (e) => {
+                }, className: cn('nodrag bg-card flex w-[26rem] cursor-pointer flex-col overflow-hidden rounded-xl border shadow-sm transition-[border-color,box-shadow] duration-200 dark:bg-neutral-800/80', selected && 'border-blue-400 dark:border-amber-500/60'), children: [_jsxs("div", { className: "flex items-center gap-3 px-4 py-3", children: [_jsx(Github, { className: "text-muted-foreground h-5 w-5 shrink-0" }), _jsx("span", { "data-testid": "repository-node-name", className: "min-w-0 truncate text-sm font-medium", children: data.name }), _jsxs("div", { className: cn('flex shrink-0 items-center gap-2', (data.repositoryPath ?? data.onAdd) && 'ml-auto'), onClick: (e) => e.stopPropagation(), children: [data.repositoryPath ? (_jsxs(_Fragment, { children: [_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open in IDE", onClick: actions.openInIde, loading: actions.ideLoading, error: !!actions.ideError, icon: Code2, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open in IDE" })] }) }), _jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open in Shell", onClick: actions.openInShell, loading: actions.shellLoading, error: !!actions.shellError, icon: Terminal, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open in Shell" })] }) }), _jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("span", { className: "flex items-center", children: _jsx(ActionButton, { label: "Open Folder", onClick: actions.openFolder, loading: actions.folderLoading, error: !!actions.folderError, icon: FolderOpen, iconOnly: true, variant: "ghost", size: "icon-xs" }) }) }), _jsx(TooltipContent, { children: "Open Folder" })] }) }), _jsx(FeatureSessionsDropdown, { repositoryPath: data.repositoryPath, includeWorktrees: true, onCreateFromSession: handleCreateFromSession })] })) : null, data.onAdd ? _jsx("div", { className: "ml-1.5" }) : null, data.onAdd ? (_jsx(TooltipProvider, { children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("button", { "aria-label": "New feature", "data-testid": "repository-node-add-button", onClick: (e) => {
                                                             e.stopPropagation();
                                                             data.onAdd?.();
                                                         }, className: cn('flex h-6 shrink-0 cursor-pointer items-center gap-0.5 rounded bg-blue-500 px-1.5 text-[11px] font-bold text-white transition-colors hover:bg-blue-600 dark:bg-amber-500 dark:hover:bg-amber-400', data.pulseAdd && 'animate-pulse-cta'), children: [_jsx(Plus, { className: "h-3 w-3" }), _jsx("span", { className: "translate-y-px", children: "New" })] }) }), _jsx(TooltipContent, { side: "top", children: "New feature" })] }) })) : null] })] }), data.branch ? (_jsxs(_Fragment, { children: [_jsx("div", { "data-testid": "repository-node-git-info", className: "text-muted-foreground border-border/50 border-t px-4 py-2", children: _jsxs("div", { className: "flex items-center gap-3 text-xs", children: [_jsxs("span", { className: "flex items-center gap-1 truncate", "data-testid": "repository-node-branch", children: [_jsx(GitBranch, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "truncate", children: data.branch })] }), data.behindCount != null && data.behindCount > 0 ? (_jsxs("span", { className: "flex shrink-0 items-center gap-1 whitespace-nowrap text-amber-500", "data-testid": "repository-node-behind", children: [_jsx(ArrowDown, { className: "h-3 w-3 shrink-0" }), data.behindCount, " behind"] })) : null] }) }), data.commitMessage ? (_jsx("div", { "data-testid": "repository-node-commit-info", className: "text-muted-foreground border-border/50 border-t px-4 py-2", children: _jsxs("div", { className: "flex items-center gap-2 text-xs", children: [_jsx(GitCommitHorizontal, { className: "h-3 w-3 shrink-0" }), _jsx("span", { className: "min-w-0 truncate", "data-testid": "repository-node-commit-message", children: data.commitMessage }), data.committer ? (_jsxs("span", { className: "text-muted-foreground/70 ml-auto flex shrink-0 items-center gap-1", "data-testid": "repository-node-committer", children: [_jsx(User, { className: "h-3 w-3 shrink-0" }), _jsx("span", { children: data.committer })] })) : null] }) })) : null] })) : data.gitInfoStatus === 'not-a-repo' ? (