@shepai/cli 1.52.2 → 1.53.0

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/state.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqEjC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,sBAAsB,CAAC,KAAK,CAAC"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/state.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE/E;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkFjC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,sBAAsB,CAAC,KAAK,CAAC"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/state.js

@@ -75,4 +75,17 @@ export const FeatureAgentAnnotation = Annotation.Root({
         reducer: (_prev, next) => next,
         default: () => false,
     }),
+    // --- CI watch/fix loop state ---
+    ciFixAttempts: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => 0,
+    }),
+    ciFixHistory: Annotation({
+        reducer: (prev, next) => [...prev, ...next],
+        default: () => [],
+    }),
+    ciFixStatus: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => 'idle',
+    }),
 });

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -23,6 +23,8 @@ export declare class GitPrService implements IGitPrService {
     deleteBranch(cwd: string, branch: string, deleteRemote?: boolean): Promise<void>;
     getPrDiffSummary(cwd: string, baseBranch: string): Promise<DiffSummary>;
     verifyMerge(cwd: string, featureBranch: string, baseBranch: string): Promise<boolean>;
+    getFailureLogs(runId: string, _branch: string, logMaxChars?: number): Promise<string>;
+    private truncateLog;
     private parseGitError;
     private parseGhError;
     private parsePrNumberFromUrl;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC9C,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuBjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAevE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW3F,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC9C,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAwCjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAevE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrF,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAW3F,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -155,7 +155,15 @@ let GitPrService = class GitPrService {
     }
     async watchCi(cwd, branch, timeoutMs) {
         try {
-            const args = ['run', 'watch', '--branch', branch];
+            // gh run watch requires a run ID — it does not support --branch.
+            // First, resolve the latest run ID for the branch via gh run list.
+            const { stdout: listOut } = await this.execFile('gh', ['run', 'list', '--branch', branch, '--json', 'databaseId', '--limit', '1'], { cwd });
+            const runs = JSON.parse(listOut);
+            if (runs.length === 0 || !runs[0].databaseId) {
+                return { status: 'pending' };
+            }
+            const runId = String(runs[0].databaseId);
+            const args = ['run', 'watch', runId, '--exit-status'];
             const { stdout } = await this.execFile('gh', args, {
                 cwd,
                 ...(timeoutMs ? { timeout: timeoutMs } : {}),
@@ -172,6 +180,10 @@ let GitPrService = class GitPrService {
             if (message.includes('timed out') || message.includes('timeout')) {
                 throw new GitPrError(message, GitPrErrorCode.CI_TIMEOUT, cause);
             }
+            // gh run watch --exit-status exits non-zero when the run fails
+            if (message.includes('exit code') || message.includes('exit status')) {
+                return { status: 'failure', logExcerpt: message };
+            }
             throw new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
         }
     }
@@ -202,6 +214,22 @@ let GitPrService = class GitPrService {
             return false;
         }
     }
+    async getFailureLogs(runId, _branch, logMaxChars = 50_000) {
+        try {
+            const { stdout } = await this.execFile('gh', ['run', 'view', runId, '--log-failed'], {
+                cwd: undefined,
+            });
+            return this.truncateLog(stdout, logMaxChars, runId);
+        }
+        catch (error) {
+            throw this.parseGhError(error);
+        }
+    }
+    truncateLog(output, maxChars, runId) {
+        if (output.length <= maxChars)
+            return output;
+        return `${output.slice(0, maxChars)}\n[Log truncated at ${maxChars} chars — full log available via gh run view ${runId}]`;
+    }
     parseGitError(error) {
         const message = error instanceof Error ? error.message : String(error);
         const cause = error instanceof Error ? error : undefined;

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;AA8JpC,wBAAgB,eAAe,IAAI,OAAO,CA8DzC"}
+{"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;AAmKpC,wBAAgB,eAAe,IAAI,OAAO,CAgGzC"}

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

@@ -46,6 +46,10 @@ const STATUS_PRIORITY = {
  * 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 === 'Blocked') {
+        return `${colors.warning(symbols.dotEmpty)} ${colors.warning('Blocked')}`;
+    }
     if (!run) {
         return `${colors.muted(symbols.dotEmpty)} ${colors.muted(feature.lifecycle)}`;
     }
@@ -172,11 +176,43 @@ export function createLsCommand() {
             const paired = features
                 .map((feature, i) => ({ feature, run: runs[i], phases: timings[i] }))
                 .sort((a, b) => getStatusPriority(a.run) - getStatusPriority(b.run));
-            const rows = paired.map(({ feature, run, phases }) => {
+            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);
+                }
+            }
+            // 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 rows = ordered.map(({ entry: { feature, run, phases }, indent }) => {
                 const repo = path.basename(feature.repositoryPath);
+                const prefix = indent ? `${colors.muted('└')} ` : '';
                 return [
-                    feature.id.slice(0, 8),
-                    truncate(feature.name, 30),
+                    prefix + feature.id.slice(0, 8),
+                    prefix + truncate(feature.name, indent ? 28 : 30),
                     formatStatus(feature, run),
                     colors.muted(repo),
                     formatGates(feature),

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

@@ -1 +1 @@
-{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/new.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8CpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAwF1C"}
+{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/new.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiDpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CA4G1C"}

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

@@ -14,6 +14,7 @@ import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
 import { CreateFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/features/create/create-feature.use-case.js';
+import { SdlcLifecycle } from '../../../../../packages/core/src/domain/generated/output.js';
 import { colors, messages, spinner } from '../../ui/index.js';
 import { getShepHomeDir } from '../../../../../packages/core/src/infrastructure/services/filesystem/shep-directory.service.js';
 import { getSettings, hasSettings } from '../../../../../packages/core/src/infrastructure/services/settings.service.js';
@@ -46,6 +47,7 @@ export function createNewCommand() {
         .option('--allow-plan', 'Auto-approve through planning, pause at implementation')
         .option('--allow-merge', 'Auto-approve merge phase')
         .option('--allow-all', 'Run fully autonomous (no approval pauses)')
+        .option('--parent <fid>', 'Parent feature ID (full or partial prefix)')
         .action(async (description, options) => {
         try {
             const useCase = container.resolve(CreateFeatureUseCase);
@@ -62,12 +64,25 @@ export function createNewCommand() {
                     allowMerge: options.allowMerge ?? defaults.allowMerge,
                 };
             const push = options.push ?? defaults.push;
+            // Resolve parent feature ID if --parent flag is provided
+            let parentId;
+            if (options.parent) {
+                const featureRepo = container.resolve('IFeatureRepository');
+                const parentFeature = await featureRepo.findByIdPrefix(options.parent);
+                if (!parentFeature) {
+                    messages.error(`Parent feature not found: ${options.parent}`);
+                    process.exitCode = 1;
+                    return;
+                }
+                parentId = parentFeature.id;
+            }
             const result = await spinner('Thinking', () => useCase.execute({
                 userInput: description,
                 repositoryPath: repoPath,
                 approvalGates,
                 push,
                 openPr,
+                ...(parentId !== undefined && { parentId }),
             }));
             const { feature, warning } = result;
             const repoHash = createHash('sha256').update(repoPath).digest('hex').slice(0, 16);
@@ -78,6 +93,9 @@ export function createNewCommand() {
                 messages.warning(warning);
             }
             messages.success('Feature created');
+            if (feature.lifecycle === SdlcLifecycle.Blocked) {
+                messages.info(`Feature created in Blocked state — waiting for parent to reach Implementation`);
+            }
             console.log(`  ${colors.muted('ID:')}       ${colors.accent(feature.id)}`);
             console.log(`  ${colors.muted('Name:')}     ${feature.name}`);
             console.log(`  ${colors.muted('Branch:')}   ${colors.accent(feature.branch)}`);

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

@@ -1 +1 @@
-{"version":3,"file":"show.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/show.command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,KAAK,EAEV,QAAQ,EACR,WAAW,EACX,sBAAsB,EACvB,MAAM,8BAA8B,CAAC;AAmOtC;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,QAAQ,GAAG,IAAI,EAC3B,UAAU,GAAE,sBAAsB,EAAO,GACxC,MAAM,EAAE,CAkJV;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAyJ3C"}
+{"version":3,"file":"show.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/show.command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,KAAK,EAEV,QAAQ,EACR,WAAW,EACX,sBAAsB,EACvB,MAAM,8BAA8B,CAAC;AAmOtC;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,QAAQ,GAAG,IAAI,EAC3B,UAAU,GAAE,sBAAsB,EAAO,GACxC,MAAM,EAAE,CAkJV;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAgL3C"}

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

@@ -368,6 +368,20 @@ export function createShowCommand() {
                 const lines = renderPhaseTimings(timings, run, rejections);
                 textBlocks.push({ title: 'Phase Timing', content: lines.join('\n') });
             }
+            if (feature.pr?.ciFixHistory && feature.pr.ciFixHistory.length > 0) {
+                const fixLines = feature.pr.ciFixHistory.map((r) => {
+                    const outcomeColor = r.outcome === 'fixed'
+                        ? colors.success
+                        : r.outcome === 'timeout'
+                            ? colors.warning
+                            : colors.error;
+                    return `  #${r.attempt}  ${outcomeColor(r.outcome)}  ${colors.muted(r.startedAt)}  ${r.failureSummary.slice(0, 60)}`;
+                });
+                textBlocks.push({
+                    title: 'CI Fix History',
+                    content: fixLines.join('\n'),
+                });
+            }
             if (run?.status === 'waiting_approval') {
                 const phase = run.result?.startsWith('node:')
                     ? (NODE_TO_PHASE[run.result.slice(5)] ?? run.result.slice(5))
@@ -456,6 +470,12 @@ export function createShowCommand() {
                                                     : colors.warning(feature.pr.ciStatus)
                                             : null,
                                     },
+                                    {
+                                        label: 'CI Fixes',
+                                        value: feature.pr.ciFixAttempts && feature.pr.ciFixAttempts > 0
+                                            ? `${feature.pr.ciFixAttempts} attempt(s)`
+                                            : null,
+                                    },
                                 ],
                             },
                         ]

package/dist/src/presentation/web/app/actions/create-feature.d.ts

@@ -15,6 +15,7 @@ interface CreateFeatureInput {
     };
     push?: boolean;
     openPr?: boolean;
+    parentId?: string;
 }
 export declare function createFeature(input: CreateFeatureInput): Promise<{
     feature?: Feature;

package/dist/src/presentation/web/app/actions/create-feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/create-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAEpE,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAqBD,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgChD"}
+{"version":3,"file":"create-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/create-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAEpE,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAQD,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAqBD,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkChD"}

package/dist/src/presentation/web/app/actions/create-feature.js

@@ -12,7 +12,7 @@ function composeUserInput(name, description, attachments) {
     return userInput;
 }
 export async function createFeature(input) {
-    const { name, description, repositoryPath, attachments, approvalGates, push, openPr } = input;
+    const { name, description, repositoryPath, attachments, approvalGates, push, openPr, parentId } = input;
     if (!name?.trim()) {
         return { error: 'name is required' };
     }
@@ -33,6 +33,7 @@ export async function createFeature(input) {
             approvalGates: gates,
             push: push ?? false,
             openPr: openPr ?? false,
+            ...(parentId ? { parentId } : {}),
         });
         return { feature: result.feature };
     }

package/dist/src/presentation/web/app/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/page.tsx"],"names":[],"mappings":"AAcA,uFAAuF;AACvF,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAsBvC,wBAA8B,QAAQ,qDAwHrC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/page.tsx"],"names":[],"mappings":"AAcA,uFAAuF;AACvF,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAsBvC,wBAA8B,QAAQ,qDAsJrC"}

package/dist/src/presentation/web/app/page.js

@@ -60,6 +60,14 @@ export default async function HomePage() {
                 : ((agentNode ? nodeToLifecyclePhase[agentNode] : undefined) ??
                     lifecycleMap[feature.lifecycle] ??
                     'requirements');
+            // Resolve blockedBy display name from parent feature
+            let blockedBy;
+            if (feature.parentId && feature.lifecycle === 'Blocked') {
+                const parentEntry = featuresWithRuns.find((e) => e.feature.id === feature.parentId);
+                if (parentEntry) {
+                    blockedBy = parentEntry.feature.name;
+                }
+            }
             const nodeData = {
                 name: feature.name,
                 description: feature.description ?? feature.slug,
@@ -72,6 +80,7 @@ export default async function HomePage() {
                 progress: deriveProgress(feature),
                 ...(run?.agentType && { agentType: run.agentType }),
                 ...(run?.error && { errorMessage: run.error }),
+                ...(blockedBy && { blockedBy }),
             };
             const featureNodeId = `feat-${feature.id}`;
             nodes.push({
@@ -80,14 +89,33 @@ export default async function HomePage() {
                 position: { x: 0, y: 0 },
                 data: nodeData,
             });
-            edges.push({
-                id: `edge-${repoNodeId}-${featureNodeId}`,
-                source: repoNodeId,
-                target: featureNodeId,
-                style: { strokeDasharray: '5 5' },
-            });
+            // Child features connect via parent→child dependency edge, not directly to repo
+            if (!feature.parentId) {
+                edges.push({
+                    id: `edge-${repoNodeId}-${featureNodeId}`,
+                    source: repoNodeId,
+                    target: featureNodeId,
+                    style: { strokeDasharray: '5 5' },
+                });
+            }
         });
     }
+    // Add parent→child dependency edges
+    for (const { feature } of featuresWithRuns) {
+        if (feature.parentId) {
+            const parentNodeId = `feat-${feature.parentId}`;
+            const childNodeId = `feat-${feature.id}`;
+            // Only add edge if both nodes exist on the canvas
+            if (nodes.some((n) => n.id === parentNodeId) && nodes.some((n) => n.id === childNodeId)) {
+                edges.push({
+                    id: `dep-${parentNodeId}-${childNodeId}`,
+                    source: parentNodeId,
+                    target: childNodeId,
+                    type: 'dependencyEdge',
+                });
+            }
+        }
+    }
     // Use dagre LR layout for compact, automatic positioning
     const laid = layoutWithDagre(nodes, edges, {
         direction: 'LR',

package/dist/src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.d.ts

@@ -1,6 +1,11 @@
 import type { FileAttachment } from '../../../../../../packages/core/src/infrastructure/services/file-dialog.service.js';
 import type { WorkflowDefaults } from '../../../app/actions/get-workflow-defaults.js';
 export type { FileAttachment } from '../../../../../../packages/core/src/infrastructure/services/file-dialog.service.js';
+/** Minimal feature descriptor for the parent selector. */
+export interface ParentFeatureOption {
+    id: string;
+    name: string;
+}
 export interface FeatureCreatePayload {
     name: string;
     description?: string;
@@ -13,6 +18,7 @@ export interface FeatureCreatePayload {
     };
     push: boolean;
     openPr: boolean;
+    parentId?: string;
 }
 export interface FeatureCreateDrawerProps {
     open: boolean;
@@ -21,6 +27,10 @@ export interface FeatureCreateDrawerProps {
     repositoryPath: string;
     isSubmitting?: boolean;
     workflowDefaults?: WorkflowDefaults;
+    /** List of existing features available for selection as a parent. */
+    features?: ParentFeatureOption[];
+    /** Pre-select a parent feature when the drawer opens (e.g. from (+) button on a feature node). */
+    initialParentId?: string;
 }
-export declare function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, isSubmitting, workflowDefaults, }: FeatureCreateDrawerProps): import("react/jsx-runtime").JSX.Element;
+export declare function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, isSubmitting, workflowDefaults, features, initialParentId, }: FeatureCreateDrawerProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=feature-create-drawer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"feature-create-drawer.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAG5E,YAAY,EAAE,cAAc,EAAE,MAAM,0DAA0D,CAAC;AAE/F,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE;QACb,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IACF,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB;AAcD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC/C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,cAAc,EACd,YAAoB,EACpB,gBAAgB,GACjB,EAAE,wBAAwB,2CA2O1B"}
+{"version":3,"file":"feature-create-drawer.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-create-drawer/feature-create-drawer.tsx"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAG5E,YAAY,EAAE,cAAc,EAAE,MAAM,0DAA0D,CAAC;AAE/F,0DAA0D;AAC1D,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE;QACb,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IACF,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAcD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC/C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,qEAAqE;IACrE,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACjC,kGAAkG;IAClG,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,cAAc,EACd,YAAoB,EACpB,gBAAgB,EAChB,QAAQ,EACR,eAAe,GAChB,EAAE,wBAAwB,2CAmR1B"}

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useCallback, useEffect } from 'react';
-import { XIcon, PlusIcon, FileIcon, FileTextIcon, ImageIcon, CodeIcon, Trash2Icon, } from 'lucide-react';
+import { useState, useCallback, useEffect, useRef } from 'react';
+import { XIcon, PlusIcon, FileIcon, FileTextIcon, ImageIcon, CodeIcon, Trash2Icon, ChevronsUpDown, CheckIcon, } from 'lucide-react';
 import { cn } from '../../../lib/utils.js';
 import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerDescription, DrawerFooter, } from '../../ui/drawer.js';
 import { Button } from '../../ui/button.js';
@@ -12,6 +12,7 @@ import { CheckboxGroup } from '../../ui/checkbox-group.js';
 import { CheckboxGroupItem } from '../../ui/checkbox-group-item.js';
 import { Separator } from '../../ui/separator.js';
 import { Badge } from '../../ui/badge.js';
+import { Popover, PopoverContent, PopoverTrigger } from '../../ui/popover.js';
 import { pickFiles } from './pick-files.js';
 const AUTO_APPROVE_OPTIONS = [
     { id: 'allowPrd', label: 'PRD', description: 'Auto-approve requirements move to planning.' },
@@ -23,7 +24,7 @@ const EMPTY_GATES = {
     allowPlan: false,
     allowMerge: false,
 };
-export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, isSubmitting = false, workflowDefaults, }) {
+export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, isSubmitting = false, workflowDefaults, features, initialParentId, }) {
     const defaultGates = workflowDefaults?.approvalGates ?? EMPTY_GATES;
     const defaultPush = workflowDefaults?.push ?? false;
     const defaultOpenPr = workflowDefaults?.openPr ?? false;
@@ -33,6 +34,7 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
     const [approvalGates, setApprovalGates] = useState({ ...defaultGates });
     const [push, setPush] = useState(defaultPush);
     const [openPr, setOpenPr] = useState(defaultOpenPr);
+    const [parentId, setParentId] = useState(undefined);
     // Sync state when workflowDefaults load asynchronously
     useEffect(() => {
         if (workflowDefaults) {
@@ -41,6 +43,12 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
             setOpenPr(workflowDefaults.openPr);
         }
     }, [workflowDefaults]);
+    // Pre-select parent when initialParentId changes (e.g. (+) button on feature node)
+    useEffect(() => {
+        if (open && initialParentId) {
+            setParentId(initialParentId);
+        }
+    }, [open, initialParentId]);
     const resetForm = useCallback(() => {
         setName('');
         setDescription('');
@@ -48,6 +56,7 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
         setApprovalGates({ ...defaultGates });
         setPush(defaultPush);
         setOpenPr(defaultOpenPr);
+        setParentId(undefined);
     }, [defaultGates, defaultPush, defaultOpenPr]);
     const handleOpenChange = useCallback((nextOpen) => {
         if (!nextOpen) {
@@ -72,8 +81,19 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
             },
             push: push || openPr,
             openPr,
+            ...(parentId ? { parentId } : {}),
         });
-    }, [name, description, attachments, approvalGates, repositoryPath, onSubmit, push, openPr]);
+    }, [
+        name,
+        description,
+        attachments,
+        approvalGates,
+        repositoryPath,
+        onSubmit,
+        push,
+        openPr,
+        parentId,
+    ]);
     const handleAddFiles = useCallback(async () => {
         try {
             const files = await pickFiles();
@@ -88,7 +108,34 @@ export function FeatureCreateDrawer({ open, onClose, onSubmit, repositoryPath, i
     const handleRemoveFile = useCallback((path) => {
         setAttachments((prev) => prev.filter((f) => f.path !== path));
     }, []);
-    return (_jsx(Drawer, { direction: "right", modal: false, handleOnly: true, open: open, onOpenChange: handleOpenChange, children: _jsxs(DrawerContent, { direction: "right", className: "w-96", showCloseButton: false, children: [_jsx("button", { type: "button", "aria-label": "Close", onClick: onClose, className: "ring-offset-background focus:ring-ring absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden", children: _jsx(XIcon, { className: "size-4" }) }), _jsxs(DrawerHeader, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "h-2.5 w-2.5 shrink-0 rounded-full bg-blue-500" }), _jsx(DrawerTitle, { children: "NEW FEATURE" })] }), _jsx(DrawerDescription, { asChild: true, children: _jsx("div", { children: _jsx(Badge, { variant: "secondary", children: "Creating..." }) }) })] }), _jsx(Separator, {}), _jsx("div", { className: "flex-1 overflow-y-auto p-4", children: _jsxs("form", { id: "create-feature-form", onSubmit: handleSubmit, className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { htmlFor: "feature-name", className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "FEATURE NAME" }), _jsx(Input, { id: "feature-name", placeholder: "e.g. GitHub OAuth Login", value: name, onChange: (e) => setName(e.target.value), required: true, disabled: isSubmitting })] }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { htmlFor: "feature-description", className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "DESCRIPTION" }), _jsx(Textarea, { id: "feature-description", placeholder: "Describe what this feature does...", value: description, onChange: (e) => setDescription(e.target.value), rows: 4, disabled: isSubmitting })] }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "APPROVE" }), _jsx(CheckboxGroup, { label: "Autonomous Mode", description: "YOLO!", parentAriaLabel: "Auto approve all", options: AUTO_APPROVE_OPTIONS, value: approvalGates, onValueChange: setApprovalGates, disabled: isSubmitting })] }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "GIT" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(CheckboxGroupItem, { id: "push", label: "Push", description: "Push branch to remote after implementation.", checked: push || openPr, onCheckedChange: setPush, disabled: openPr || isSubmitting }), _jsx(CheckboxGroupItem, { id: "open-pr", label: "Create PR", description: "Open a pull request after pushing.", checked: openPr, onCheckedChange: setOpenPr, disabled: isSubmitting })] })] }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: ["ATTACHMENTS", attachments.length > 0 && (_jsxs("span", { className: "text-muted-foreground/60 ml-1.5", children: ["(", attachments.length, ")"] }))] }), _jsxs(Button, { type: "button", variant: "outline", size: "xs", onClick: handleAddFiles, disabled: isSubmitting, children: [_jsx(PlusIcon, { className: "size-3" }), "Add Files"] })] }), attachments.length > 0 && (_jsx("div", { className: "flex flex-col gap-2", children: attachments.map((file) => (_jsx(AttachmentCard, { file: file, onRemove: () => handleRemoveFile(file.path), disabled: isSubmitting }, file.path))) }))] })] }) }), _jsx(Separator, {}), _jsxs(DrawerFooter, { className: "flex-row justify-end gap-2", children: [_jsx(Button, { variant: "outline", onClick: onClose, disabled: isSubmitting, children: "Cancel" }), _jsx(Button, { type: "submit", form: "create-feature-form", disabled: !name.trim() || isSubmitting, children: isSubmitting ? 'Creating...' : '+ Create Feature' })] })] }) }));
+    const hasFeatures = features && features.length > 0;
+    return (_jsx(Drawer, { direction: "right", modal: false, handleOnly: true, open: open, onOpenChange: handleOpenChange, children: _jsxs(DrawerContent, { direction: "right", className: "w-96", showCloseButton: false, children: [_jsx("button", { type: "button", "aria-label": "Close", onClick: onClose, className: "ring-offset-background focus:ring-ring absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden", children: _jsx(XIcon, { className: "size-4" }) }), _jsxs(DrawerHeader, { children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "h-2.5 w-2.5 shrink-0 rounded-full bg-blue-500" }), _jsx(DrawerTitle, { children: "NEW FEATURE" })] }), _jsx(DrawerDescription, { asChild: true, children: _jsx("div", { children: _jsx(Badge, { variant: "secondary", children: "Creating..." }) }) })] }), _jsx(Separator, {}), _jsx("div", { className: "flex-1 overflow-y-auto p-4", children: _jsxs("form", { id: "create-feature-form", onSubmit: handleSubmit, className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { htmlFor: "feature-name", className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "FEATURE NAME" }), _jsx(Input, { id: "feature-name", placeholder: "e.g. GitHub OAuth Login", value: name, onChange: (e) => setName(e.target.value), required: true, disabled: isSubmitting })] }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { htmlFor: "feature-description", className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "DESCRIPTION" }), _jsx(Textarea, { id: "feature-description", placeholder: "Describe what this feature does...", value: description, onChange: (e) => setDescription(e.target.value), rows: 4, disabled: isSubmitting })] }), hasFeatures ? (_jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { htmlFor: "parent-feature", className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "PARENT FEATURE" }), _jsx(ParentFeatureCombobox, { features: features, value: parentId, onChange: setParentId, disabled: isSubmitting })] })) : null, _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "APPROVE" }), _jsx(CheckboxGroup, { label: "Autonomous Mode", description: "YOLO!", parentAriaLabel: "Auto approve all", options: AUTO_APPROVE_OPTIONS, value: approvalGates, onValueChange: setApprovalGates, disabled: isSubmitting })] }), _jsxs("div", { className: "flex flex-col gap-1.5", children: [_jsx(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "GIT" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(CheckboxGroupItem, { id: "push", label: "Push", description: "Push branch to remote after implementation.", checked: push || openPr, onCheckedChange: setPush, disabled: openPr || isSubmitting }), _jsx(CheckboxGroupItem, { id: "open-pr", label: "Create PR", description: "Open a pull request after pushing.", checked: openPr, onCheckedChange: setOpenPr, disabled: isSubmitting })] })] }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs(Label, { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: ["ATTACHMENTS", attachments.length > 0 && (_jsxs("span", { className: "text-muted-foreground/60 ml-1.5", children: ["(", attachments.length, ")"] }))] }), _jsxs(Button, { type: "button", variant: "outline", size: "xs", onClick: handleAddFiles, disabled: isSubmitting, children: [_jsx(PlusIcon, { className: "size-3" }), "Add Files"] })] }), attachments.length > 0 && (_jsx("div", { className: "flex flex-col gap-2", children: attachments.map((file) => (_jsx(AttachmentCard, { file: file, onRemove: () => handleRemoveFile(file.path), disabled: isSubmitting }, file.path))) }))] })] }) }), _jsx(Separator, {}), _jsxs(DrawerFooter, { className: "flex-row justify-end gap-2", children: [_jsx(Button, { variant: "outline", onClick: onClose, disabled: isSubmitting, children: "Cancel" }), _jsx(Button, { type: "submit", form: "create-feature-form", disabled: !name.trim() || isSubmitting, children: isSubmitting ? 'Creating...' : '+ Create Feature' })] })] }) }));
+}
+function ParentFeatureCombobox({ features, value, onChange, disabled, }) {
+    const [open, setOpen] = useState(false);
+    const [query, setQuery] = useState('');
+    const inputRef = useRef(null);
+    const selectedFeature = features.find((f) => f.id === value);
+    const filtered = query.trim()
+        ? features.filter((f) => f.name.toLowerCase().includes(query.toLowerCase()) ||
+            f.id.toLowerCase().includes(query.toLowerCase()))
+        : features;
+    const handleSelect = useCallback((id) => {
+        onChange(id);
+        setOpen(false);
+        setQuery('');
+    }, [onChange]);
+    useEffect(() => {
+        if (open) {
+            setTimeout(() => inputRef.current?.focus(), 0);
+        }
+        else {
+            setQuery('');
+        }
+    }, [open]);
+    return (_jsxs(Popover, { open: open, onOpenChange: setOpen, children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs("button", { id: "parent-feature", type: "button", role: "combobox", "aria-expanded": open, "aria-label": "Parent Feature", disabled: disabled, "data-testid": "parent-feature-combobox", className: cn('border-input bg-background ring-offset-background focus:ring-ring flex h-9 w-full items-center justify-between rounded-md border px-3 py-2 text-sm focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50', !selectedFeature && 'text-muted-foreground'), children: [_jsx("span", { className: "truncate", children: selectedFeature
+                                ? `${selectedFeature.name} (${selectedFeature.id.slice(0, 8)})`
+                                : 'Select parent feature...' }), _jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), _jsx(PopoverContent, { className: "w-80 p-0", align: "start", "data-testid": "parent-feature-combobox-content", children: _jsxs("div", { className: "flex flex-col", children: [_jsx("div", { className: "border-b p-2", children: _jsx(Input, { ref: inputRef, placeholder: "Search features...", value: query, onChange: (e) => setQuery(e.target.value), className: "h-8 border-0 p-0 text-sm shadow-none focus-visible:ring-0", "data-testid": "parent-feature-search" }) }), _jsxs("div", { className: "max-h-48 overflow-y-auto py-1", role: "listbox", "aria-label": "Features", children: [_jsxs("button", { type: "button", role: "option", "aria-selected": value === undefined, onClick: () => handleSelect(undefined), className: cn('hover:bg-accent hover:text-accent-foreground flex w-full items-center gap-2 px-3 py-2 text-sm', value === undefined && 'bg-accent/50'), "data-testid": "parent-feature-option-none", children: [_jsx(CheckIcon, { className: cn('h-4 w-4 shrink-0', value !== undefined && 'invisible') }), _jsx("span", { className: "text-muted-foreground italic", children: "No parent" })] }), filtered.length === 0 && query ? (_jsx("p", { className: "text-muted-foreground px-3 py-2 text-sm", children: "No features found." })) : (filtered.map((f) => (_jsxs("button", { type: "button", role: "option", "aria-selected": value === f.id, onClick: () => handleSelect(f.id), className: cn('hover:bg-accent hover:text-accent-foreground flex w-full items-center gap-2 px-3 py-2 text-sm', value === f.id && 'bg-accent/50'), "data-testid": `parent-feature-option-${f.id}`, children: [_jsx(CheckIcon, { className: cn('h-4 w-4 shrink-0', value !== f.id && 'invisible') }), _jsxs("span", { className: "truncate", children: [f.name, ' ', _jsxs("span", { className: "text-muted-foreground font-mono text-xs", children: ["(", f.id.slice(0, 8), ")"] })] })] }, f.id))))] })] }) })] }));
 }
 /* ---------------------------------------------------------------------------
  * Private sub-components & utilities

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

@@ -1 +1 @@
-{"version":3,"file":"derive-feature-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/derive-feature-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CAuC9F;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAYvD"}
+{"version":3,"file":"derive-feature-state.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/derive-feature-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CA4C9F;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAYvD"}

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

@@ -17,6 +17,10 @@ import { SdlcLifecycle, AgentRunStatus, TaskState } from '../../../../../../pack
  * 6. No agent run → fall back to plan tasks / lifecycle
  */
 export function deriveNodeState(feature, agentRun) {
+    // Blocked lifecycle takes priority — child waiting on parent regardless of agent run
+    if (feature.lifecycle === SdlcLifecycle.Blocked) {
+        return 'blocked';
+    }
     if (agentRun) {
         switch (agentRun.status) {
             case AgentRunStatus.waitingApproval:

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

@@ -61,7 +61,7 @@ function getBadgeText(data) {
 export function FeatureNode({ data, selected, }) {
     const config = featureNodeStateConfig[data.state];
     const Icon = config.icon;
-    return (_jsxs("div", { className: "group relative", children: [data.showHandles ? (_jsx(Handle, { type: "target", position: Position.Left, isConnectable: false, className: "opacity-0!" })) : null, _jsxs("div", { "data-testid": "feature-node-card", "aria-busy": data.state === 'creating' ? 'true' : undefined, className: cn('bg-card flex min-h-35 w-72 flex-col rounded-lg border p-3 shadow-sm', selected && 'ring-primary ring-2'), children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("span", { "data-testid": "feature-node-lifecycle-label", className: cn('text-[10px] font-semibold tracking-wider'), children: lifecycleDisplayLabels[data.lifecycle] }), data.onSettings ? (_jsx("button", { type: "button", "aria-label": "Settings", "data-testid": "feature-node-settings-button", onClick: (e) => {
+    return (_jsxs("div", { className: "group relative", children: [data.showHandles ? (_jsx(Handle, { type: "target", position: Position.Left, isConnectable: false, className: "opacity-0!" })) : null, _jsxs("div", { "data-testid": "feature-node-card", "aria-busy": data.state === 'creating' ? 'true' : undefined, className: cn('bg-card flex min-h-35 w-72 flex-col rounded-lg border p-3 shadow-sm', selected && 'ring-primary ring-2'), children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsx("span", { "data-testid": "feature-node-lifecycle-label", className: cn('text-[10px] font-semibold tracking-wider'), children: data.state === 'blocked' ? 'BLOCKED' : lifecycleDisplayLabels[data.lifecycle] }), data.onSettings ? (_jsx("button", { type: "button", "aria-label": "Settings", "data-testid": "feature-node-settings-button", onClick: (e) => {
                                     e.stopPropagation();
                                     data.onSettings?.();
                                 }, className: "nodrag text-muted-foreground hover:text-foreground -mt-1 -mr-1 p-1", children: _jsx(Settings, { className: "h-3.5 w-3.5" }) })) : null] }), _jsx("h3", { className: "mt-1 truncate text-sm font-bold", children: data.name }), data.description ? (_jsx("p", { "data-testid": "feature-node-description", className: "text-muted-foreground mt-0.5 truncate text-xs", children: data.description })) : null, _jsx("div", { className: "mt-auto pt-2", children: data.state === 'creating' ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "mt-1.5 flex items-center gap-1.5 text-xs", children: [_jsx(Icon, { className: "h-3.5 w-3.5 shrink-0 animate-spin" }), _jsx("span", { className: "text-muted-foreground", children: getBadgeText(data) })] }), _jsx("div", { "data-testid": "feature-node-progress-bar", className: "bg-muted mt-1.5 h-1 w-full overflow-hidden rounded-full", children: _jsx("div", { className: "motion-safe:animate-indeterminate-progress bg-foreground/30 h-full w-1/3 rounded-full" }) })] })) : data.state === 'running' ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "mt-1.5 flex items-center gap-1.5 text-xs", children: [_jsx(AgentIcon, { agentType: data.agentType, className: "h-3.5 w-3.5 shrink-0" }), _jsx("span", { className: "text-muted-foreground", children: getBadgeText(data) })] }), _jsx("div", { "data-testid": "feature-node-progress-bar", className: "bg-muted mt-1.5 h-1 w-full overflow-hidden rounded-full", children: _jsx("div", { className: "animate-indeterminate-progress bg-foreground/30 h-full w-1/3 rounded-full" }) })] })) : config.showProgressBar ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "text-muted-foreground flex items-center justify-end text-[10px]", children: _jsxs("span", { children: [data.progress, "%"] }) }), _jsx("div", { "data-testid": "feature-node-progress-bar", className: "bg-muted mt-1.5 h-1 w-full overflow-hidden rounded-full", children: _jsx("div", { className: cn('h-full rounded-full transition-all', config.progressClass), style: { width: `${data.progress}%` } }) })] })) : (_jsxs(_Fragment, { children: [_jsx("div", { className: "text-muted-foreground text-[10px]", children: _jsx("span", { children: data.featureId }) }), _jsxs("div", { "data-testid": "feature-node-badge", className: (() => {

package/dist/src/presentation/web/components/features/control-center/control-center-inner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAgB1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAU5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CAiYzF"}
+{"version":3,"file":"control-center-inner.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/control-center-inner.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAgB1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAW5E,UAAU,uBAAuB;IAC/B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,YAAY,EAAE,IAAI,EAAE,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,uBAAuB,2CAmZzF"}