@shepai/cli 1.38.0 → 1.39.0

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.js

@@ -5,7 +5,7 @@
  * and error handling so every node follows the same patterns.
  */
 import yaml from 'js-yaml';
-import { readFileSync, writeFileSync } from 'node:fs';
+import { readFileSync, writeFileSync, renameSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { reportNodeStart } from '../heartbeat.js';
@@ -81,9 +81,8 @@ export function safeYamlLoad(content) {
  * - allowPlan: when true, skip interrupt after plan phase
  * - allowMerge: when true, skip interrupt after merge phase
  *
- * Nodes not covered by a gate (analyze, research) never interrupt.
- * The implement node always interrupts when gates are present
- * (unless all three gates are true, meaning fully autonomous).
+ * Nodes not covered by a gate (analyze, research, implement) never interrupt.
+ * Implementation always proceeds to merge; the merge node handles its own gate.
  *
  */
 export function shouldInterrupt(nodeName, gates) {
@@ -97,8 +96,6 @@ export function shouldInterrupt(nodeName, gates) {
         return !gates.allowPlan;
     if (nodeName === 'merge')
         return !gates.allowMerge;
-    if (nodeName === 'implement')
-        return true;
     return false;
 }
 const API_ERROR_RE = /API Error: (400|429|5\d{2})/;
@@ -169,6 +166,38 @@ export function getCompletedPhases(specDir) {
         return [];
     }
 }
+/**
+ * Remove a phase from completedPhases in feature.yaml.
+ * Used when a phase is rejected and needs to re-execute.
+ */
+export function clearCompletedPhase(specDir, phaseId, log) {
+    try {
+        const content = readSpecFile(specDir, 'feature.yaml');
+        if (!content)
+            return;
+        const data = yaml.load(content);
+        if (!data || typeof data !== 'object')
+            return;
+        const status = (data.status ?? {});
+        const completedPhases = Array.isArray(status.completedPhases)
+            ? status.completedPhases.filter((p) => p !== phaseId)
+            : [];
+        data.status = { ...status, completedPhases };
+        writeFileSync(join(specDir, 'feature.yaml'), yaml.dump(data, { indent: 2, lineWidth: -1 }), 'utf-8');
+    }
+    catch (err) {
+        log?.error(`Failed to clear completed phase: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+/**
+ * Type guard to detect rejection payloads from interrupt() return value.
+ */
+export function isRejectionPayload(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'rejected' in value &&
+        value.rejected === true);
+}
 /**
  * Mark a phase as complete in feature.yaml by adding its ID to completedPhases.
  */
@@ -194,6 +223,26 @@ export function markPhaseComplete(specDir, phaseId, log) {
         log?.error(`Failed to mark phase complete: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
+/**
+ * Write a spec file atomically using temp-file-then-rename pattern.
+ * Prevents corruption on crash mid-write.
+ */
+export function writeSpecFileAtomic(specDir, filename, content) {
+    const targetPath = join(specDir, filename);
+    const tempPath = join(specDir, `.${filename}.tmp`);
+    try {
+        writeFileSync(tempPath, content, 'utf-8');
+        renameSync(tempPath, targetPath);
+    }
+    finally {
+        try {
+            unlinkSync(tempPath);
+        }
+        catch {
+            // Temp file already renamed or doesn't exist
+        }
+    }
+}
 /**
  * Execute a node with consistent logging and error handling.
  *
@@ -210,16 +259,46 @@ export function executeNode(nodeName, executor, buildPrompt) {
         // Update feature lifecycle to reflect the current phase
         await updateNodeLifecycle(nodeName);
         // On resume from interrupt, LangGraph re-executes the node function from
-        // the top. Skip the expensive executor call if this phase already completed
-        // (markPhaseComplete is called before interrupt, so completed = done but
-        // awaiting approval; the approval has now been granted).
+        // the top. Instead of re-executing within this invocation (which would
+        // require a second interrupt() call and trigger the stale-replay bug),
+        // we return early. Rejection sets _needsReexecution=true so a conditional
+        // edge in the graph routes back to this node for a fresh invocation.
         const completedPhases = getCompletedPhases(state.specDir);
         if (completedPhases.includes(nodeName)) {
-            log.info('Phase already completed (resuming from approval), skipping execution');
-            return {
-                currentNode: nodeName,
-                messages: [`[${nodeName}] Approved — continuing`],
-            };
+            if (shouldInterrupt(nodeName, state.approvalGates)) {
+                if (state._approvalAction === 'rejected') {
+                    const feedback = state._rejectionFeedback ?? '(no feedback)';
+                    log.info(`Phase rejected with feedback: "${feedback}" — scheduling re-execution`);
+                    clearCompletedPhase(state.specDir, nodeName, log);
+                    // Return early — the conditional edge will route back to this node
+                    // for a fresh invocation with a clean interrupt index.
+                    return {
+                        currentNode: nodeName,
+                        messages: [`[${nodeName}] Rejected — will re-execute`],
+                        _approvalAction: null,
+                        _rejectionFeedback: null,
+                        _needsReexecution: true,
+                    };
+                }
+                else {
+                    log.info('Phase approved, skipping re-execution');
+                    return {
+                        currentNode: nodeName,
+                        messages: [`[${nodeName}] Approved — continuing`],
+                        _approvalAction: null,
+                        _rejectionFeedback: null,
+                        _needsReexecution: false,
+                    };
+                }
+            }
+            else {
+                log.info('Phase already completed (no gate), skipping execution');
+                return {
+                    currentNode: nodeName,
+                    messages: [`[${nodeName}] Approved — continuing`],
+                    _needsReexecution: false,
+                };
+            }
         }
         const startTime = Date.now();
         // Record phase start (no-op if timing context not set)
@@ -236,13 +315,19 @@ export function executeNode(nodeName, executor, buildPrompt) {
             // Record phase completion
             await recordPhaseEnd(timingId, durationMs);
             // Mark phase complete BEFORE interrupting so that on resume the
-            // node detects the work is already done and skips re-execution.
+            // node detects the work is already done and returns early.
             markPhaseComplete(state.specDir, nodeName, log);
             const nodeResult = {
                 currentNode: nodeName,
                 messages: [`[${nodeName}] Complete (${result.result.length} chars, ${elapsed}s)`],
+                _approvalAction: null,
+                _rejectionFeedback: null,
+                _needsReexecution: false,
             };
-            // Human-in-the-loop: interrupt after node execution for review
+            // Human-in-the-loop: interrupt after node execution for review.
+            // This is the ONLY interrupt() call in the entire execution path.
+            // On resume, the node returns early (above) without calling interrupt(),
+            // so there is no stale interrupt replay.
             if (shouldInterrupt(nodeName, state.approvalGates)) {
                 log.info('Interrupting for human approval');
                 await recordApprovalWaitStart(timingId);

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/requirements.prompt.d.ts

@@ -2,7 +2,8 @@
  * Requirements Phase Prompt
  *
  * Instructs the agent to build comprehensive requirements from the analysis,
- * including product questions with AI-recommended default answers.
+ * including product questions with structured QuestionOption[] arrays
+ * and AI-recommended default answers.
  * Writes back to spec.yaml with full requirements.
  */
 import type { FeatureAgentState } from '../../state.js';

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/requirements.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requirements.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/requirements.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAoIxE"}
+{"version":3,"file":"requirements.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/requirements.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAkKxE"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/requirements.prompt.js

@@ -2,14 +2,40 @@
  * Requirements Phase Prompt
  *
  * Instructs the agent to build comprehensive requirements from the analysis,
- * including product questions with AI-recommended default answers.
+ * including product questions with structured QuestionOption[] arrays
+ * and AI-recommended default answers.
  * Writes back to spec.yaml with full requirements.
  */
+import yaml from 'js-yaml';
 import { readSpecFile } from '../node-helpers.js';
 export function buildRequirementsPrompt(state) {
     const specContent = readSpecFile(state.specDir, 'spec.yaml');
+    // Extract rejection feedback if present
+    let rejectionFeedbackSection = '';
+    try {
+        const specData = yaml.load(specContent);
+        const rejectionFeedback = specData?.rejectionFeedback;
+        if (rejectionFeedback && rejectionFeedback.length > 0) {
+            const entries = rejectionFeedback
+                .map((entry) => `- **Iteration ${entry.iteration}** (${entry.timestamp}): ${entry.message}`)
+                .join('\n');
+            rejectionFeedbackSection = `
+## Previous Rejection Feedback
+
+The user has previously rejected this PRD with the following feedback. You MUST address these concerns in your revised output:
+
+${entries}
+
+Focus on the most recent feedback (highest iteration number) while ensuring earlier feedback is still addressed.
+
+`;
+        }
+    }
+    catch {
+        // If YAML parsing fails, continue without rejection feedback
+    }
     return `You are a product analyst performing the REQUIREMENTS phase of feature development.
-
+${rejectionFeedbackSection}
 ## Your Task
 
 1. Read the current spec with codebase analysis below
@@ -29,13 +55,20 @@ ${specContent}
 - **Non-functional requirements (NFR-N)**: performance, security, UX, maintainability constraints
 - **Success criteria**: measurable checkboxes that define "done"
 
-### Product Questions with AI Defaults
+### Product Questions with Structured Options
 For every ambiguous product decision, create an openQuestion entry with:
 - A clear question
 - resolved: true (your recommendation is the default)
-- Your recommended answer with reasoning
+- Structured options array with EXACTLY ONE option marked selected: true
+- A selectionRationale explaining the recommendation
+- An answer field containing the text of the selected option (for backward compatibility)
+
+Each option MUST have:
+- \`option\`: Short label for the approach (2-5 words)
+- \`description\`: Explanation of this option's trade-offs and benefits
+- \`selected\`: boolean — exactly ONE option per question must be true
 
-The user can later review and override these defaults. This is the AI-recommended path — not the only option.
+The user can later review and override these defaults via interactive TUI.
 
 ## Output Instructions
 
@@ -63,32 +96,25 @@ Write the COMPLETE file. Preserve name/number/branch/technologies from analysis
     - question: 'Should X use approach A, B, or C?'
       resolved: true
       options:
-        - option: Approach A
-          description: (What approach A means and its trade-offs)
+        - option: 'Approach A'
+          description: 'Benefits of A, when to use it, trade-offs'
           selected: true
-        - option: Approach B
-          description: (What approach B means and its trade-offs)
-          selected: false
-        - option: Approach C
-          description: (What approach C means and its trade-offs)
+        - option: 'Approach B'
+          description: 'Benefits of B, when to use it, trade-offs'
           selected: false
-      selectionRationale: >
-        (Detailed reasoning for why approach A is recommended.
-        Reference codebase patterns where relevant.)
+      selectionRationale: 'Approach A is recommended because [detailed reasoning]'
+      answer: 'Approach A'
     - question: 'What level of Y is needed?'
       resolved: true
       options:
-        - option: Level X
-          description: (What level X means and its trade-offs)
-          selected: true
-        - option: Level Y
-          description: (What level Y means and its trade-offs)
-          selected: false
-        - option: Level Z
-          description: (What level Z means and its trade-offs)
+        - option: 'Basic'
+          description: 'Minimal implementation, fast to build'
           selected: false
-      selectionRationale: >
-        (Detailed reasoning for why level X is recommended.)
+        - option: 'Advanced'
+          description: 'Full-featured, handles edge cases'
+          selected: true
+      selectionRationale: 'Advanced is recommended because [reasoning]'
+      answer: 'Advanced'
 
   content: |
     ## Problem Statement
@@ -132,8 +158,8 @@ Write the COMPLETE file. Preserve name/number/branch/technologies from analysis
 ## Constraints
 
 - Write ONLY to ${state.specDir}/spec.yaml
-- Every open question MUST have an AI-recommended default answer (resolved: true)
-- Every open question MUST have exactly 3 options to choose from
+- Every open question MUST have structured options with exactly ONE option marked selected: true
+- Every open question MUST also have an \`answer\` field matching the selected option text
 - Requirements must be specific and testable, not vague
 - Do NOT create any other files
 - Do NOT modify any source code`;

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.d.ts

@@ -24,6 +24,9 @@ export declare function clearPhaseTimingContext(): void;
 /**
  * Record the start of a phase. Returns the timing record ID (for later update)
  * or null if context is not set or save fails.
+ *
+ * Automatically appends an iteration suffix (`:2`, `:3`, …) when the same
+ * phase has already been recorded for this run (e.g. after a rejection loop).
  */
 export declare function recordPhaseStart(phase: string): Promise<string | null>;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"phase-timing-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AAMrH;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAG7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqB5E;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/F;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}
+{"version":3,"file":"phase-timing-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AAMrH;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAG7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AA+BD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsB5E;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/F;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.js

@@ -33,9 +33,35 @@ export function clearPhaseTimingContext() {
     contextRepository = undefined;
     lastTimingId = null;
 }
+/**
+ * Compute the iteration-aware phase name.
+ *
+ * Queries existing PhaseTiming rows for the current run, counts how many
+ * share the same base phase name, and appends `:N` for iterations > 1.
+ *
+ * Examples:
+ *   - First "requirements" execution  → "requirements"
+ *   - Second "requirements" execution → "requirements:2"
+ *   - Third "requirements" execution  → "requirements:3"
+ */
+async function resolveIterationPhase(phase, runId, repository) {
+    try {
+        const existing = await repository.findByRunId(runId);
+        // Count rows whose phase is the base name or matches the base:N pattern
+        const count = existing.filter((t) => t.phase === phase || t.phase.startsWith(`${phase}:`)).length;
+        return count === 0 ? phase : `${phase}:${count + 1}`;
+    }
+    catch {
+        // On error, fall back to bare phase name
+        return phase;
+    }
+}
 /**
  * Record the start of a phase. Returns the timing record ID (for later update)
  * or null if context is not set or save fails.
+ *
+ * Automatically appends an iteration suffix (`:2`, `:3`, …) when the same
+ * phase has already been recorded for this run (e.g. after a rejection loop).
  */
 export async function recordPhaseStart(phase) {
     if (!contextRunId || !contextRepository)
@@ -43,10 +69,11 @@ export async function recordPhaseStart(phase) {
     const id = randomUUID();
     const now = new Date();
     try {
+        const iterationPhase = await resolveIterationPhase(phase, contextRunId, contextRepository);
         await contextRepository.save({
             id,
             agentRunId: contextRunId,
-            phase,
+            phase: iterationPhase,
             startedAt: now,
             createdAt: now,
             updatedAt: now,

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

@@ -38,6 +38,9 @@ export declare const FeatureAgentAnnotation: import("@langchain/langgraph").Anno
     validationRetries: import("@langchain/langgraph").BinaryOperatorAggregate<number, number>;
     lastValidationTarget: import("@langchain/langgraph").BinaryOperatorAggregate<string, string>;
     lastValidationErrors: import("@langchain/langgraph").BinaryOperatorAggregate<string[], string[]>;
+    _approvalAction: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    _rejectionFeedback: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
+    _needsReexecution: import("@langchain/langgraph").BinaryOperatorAggregate<boolean, boolean>;
     prUrl: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;
     prNumber: import("@langchain/langgraph").BinaryOperatorAggregate<number | null, number | null>;
     commitHash: import("@langchain/langgraph").BinaryOperatorAggregate<string | null, string | null>;

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDjC,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,MAAM,8BAA8B,CAAC;AAElE;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqEjC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,OAAO,sBAAsB,CAAC,KAAK,CAAC"}

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

@@ -37,6 +37,19 @@ export const FeatureAgentAnnotation = Annotation.Root({
         reducer: (_prev, next) => next,
         default: () => [],
     }),
+    // --- Approval action channels (set by Command({update}) on resume) ---
+    _approvalAction: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    _rejectionFeedback: Annotation({
+        reducer: (_prev, next) => (next !== undefined ? next : _prev),
+        default: () => null,
+    }),
+    _needsReexecution: Annotation({
+        reducer: (_prev, next) => next,
+        default: () => false,
+    }),
     // --- Merge and workflow state channels ---
     prUrl: Annotation({
         reducer: (_prev, next) => (next !== undefined ? next : _prev),

package/dist/src/presentation/cli/commands/agent/reject.command.js

@@ -25,7 +25,7 @@ export function createRejectCommand() {
                 return;
             }
             const useCase = container.resolve(RejectAgentRunUseCase);
-            const result = await useCase.execute(resolved.run.id, opts.reason);
+            const result = await useCase.execute(resolved.run.id, opts.reason ?? 'Rejected by user');
             if (result.rejected) {
                 messages.success(`Rejected ${colors.accent(resolved.run.id.substring(0, 8))}: ${result.reason}`);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"reject.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/reject.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,mBAAmB,IAAI,OAAO,CAsC7C"}
+{"version":3,"file":"reject.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/reject.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,mBAAmB,IAAI,OAAO,CAwC7C"}

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

@@ -16,7 +16,7 @@ export function createRejectCommand() {
     return new Command('reject')
         .description('Reject a feature waiting for review')
         .argument('[id]', 'Feature ID (auto-resolves if omitted)')
-        .option('--reason <text>', 'Rejection reason')
+        .requiredOption('--reason <text>', 'Rejection feedback (required)')
         .action(async (featureId, options) => {
         try {
             const featureRepo = container.resolve('IFeatureRepository');
@@ -35,10 +35,12 @@ export function createRejectCommand() {
             }
             messages.newline();
             messages.warning(`Rejected: ${feature.name}`);
-            if (options.reason) {
-                console.log(`  ${colors.muted('Reason:')} ${options.reason}`);
+            console.log(`  ${colors.muted('Reason:')}    ${options.reason}`);
+            console.log(`  ${colors.muted('Iteration:')} ${result.iteration}`);
+            if (result.iterationWarning) {
+                messages.warning('Warning: 5+ iterations. Consider refining the prompt instead.');
             }
-            console.log(`  ${colors.muted('Agent:')}  cancelled`);
+            console.log(`  ${colors.muted('Agent:')}     re-running requirements`);
             messages.newline();
         }
         catch (error) {

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

@@ -1,8 +1,9 @@
 /**
  * Feature Review Command
  *
- * Shows the current state of a feature waiting for approval,
- * including which phase triggered the interrupt and generated content.
+ * Interactive review of a feature waiting for approval.
+ * Routes to phase-specific TUI wizard (PRD, Plan, or Merge),
+ * then calls approve or reject use case based on user action.
  *
  * Usage:
  *   shep feat review [id]

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

@@ -1 +1 @@
-{"version":3,"file":"review.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/review.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,mBAAmB,IAAI,OAAO,CAqC7C"}
+{"version":3,"file":"review.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/review.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiEpC,wBAAgB,mBAAmB,IAAI,OAAO,CA2E7C"}

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

@@ -1,19 +1,60 @@
 /**
  * Feature Review Command
  *
- * Shows the current state of a feature waiting for approval,
- * including which phase triggered the interrupt and generated content.
+ * Interactive review of a feature waiting for approval.
+ * Routes to phase-specific TUI wizard (PRD, Plan, or Merge),
+ * then calls approve or reject use case based on user action.
  *
  * Usage:
  *   shep feat review [id]
  */
 import { Command } from 'commander';
 import { container } from '../../../../../packages/core/src/infrastructure/di/container.js';
+import { ReviewFeatureUseCase } from '../../../../../packages/core/src/application/use-cases/agents/review-feature.use-case.js';
+import { ApproveAgentRunUseCase } from '../../../../../packages/core/src/application/use-cases/agents/approve-agent-run.use-case.js';
+import { RejectAgentRunUseCase } from '../../../../../packages/core/src/application/use-cases/agents/reject-agent-run.use-case.js';
 import { resolveWaitingFeature } from './resolve-waiting-feature.js';
+import { prdReviewWizard } from '../../../tui/wizards/prd-review.wizard.js';
+import { planReviewWizard } from '../../../tui/wizards/plan-review.wizard.js';
+import { mergeReviewWizard } from '../../../tui/wizards/merge-review.wizard.js';
 import { colors, messages } from '../../ui/index.js';
+function parsePhase(runResult) {
+    return runResult?.startsWith('node:') ? runResult.slice(5) : 'unknown';
+}
+async function runPhaseWizard(phase, featureId, repoPath) {
+    if (phase === 'requirements') {
+        const reviewUseCase = container.resolve(ReviewFeatureUseCase);
+        const reviewResult = await reviewUseCase.execute(featureId, repoPath);
+        if (!reviewResult.success) {
+            throw new Error(reviewResult.reason);
+        }
+        return prdReviewWizard(reviewResult.questions);
+    }
+    if (phase === 'plan') {
+        const result = await planReviewWizard();
+        return { action: result.action, feedback: result.feedback };
+    }
+    if (phase === 'merge') {
+        const result = await mergeReviewWizard();
+        return { action: result.action, feedback: result.feedback };
+    }
+    throw new Error(`Unknown approval phase: ${phase}`);
+}
+function phaseNextStep(phase) {
+    switch (phase) {
+        case 'requirements':
+            return 'research';
+        case 'plan':
+            return 'implementation';
+        case 'merge':
+            return 'merge';
+        default:
+            return 'next step';
+    }
+}
 export function createReviewCommand() {
     return new Command('review')
-        .description('Review a feature waiting for approval')
+        .description('Interactive review of a feature waiting for approval')
         .argument('[id]', 'Feature ID (auto-resolves if omitted)')
         .action(async (featureId) => {
         try {
@@ -26,19 +67,53 @@ export function createReviewCommand() {
                 featureRepo,
                 runRepo,
             });
-            const phase = run.result?.startsWith('node:') ? run.result.slice(5) : 'unknown';
+            const phase = parsePhase(run.result);
             messages.newline();
-            messages.info(`Feature waiting for approval: ${colors.accent(feature.name)}`);
-            console.log(`  ${colors.muted('ID:')}     ${feature.id.slice(0, 8)}`);
+            messages.info(`Reviewing: ${colors.accent(feature.name)}`);
             console.log(`  ${colors.muted('Phase:')}  ${colors.warning(phase)}`);
             console.log(`  ${colors.muted('Branch:')} ${colors.accent(feature.branch)}`);
-            if (feature.specPath) {
-                console.log(`  ${colors.muted('Specs:')}  ${feature.specPath}`);
-            }
-            messages.newline();
-            console.log(`  ${colors.muted('To approve:')} shep feat approve ${feature.id.slice(0, 8)}`);
-            console.log(`  ${colors.muted('To reject:')}  shep feat reject ${feature.id.slice(0, 8)}`);
             messages.newline();
+            const wizardResult = await runPhaseWizard(phase, feature.id, repoPath);
+            if (wizardResult.action === 'approve') {
+                const approveUseCase = container.resolve(ApproveAgentRunUseCase);
+                const payload = wizardResult.changedSelections && wizardResult.changedSelections.length > 0
+                    ? { approved: true, changedSelections: wizardResult.changedSelections }
+                    : undefined;
+                const approveResult = await approveUseCase.execute(run.id, payload);
+                if (approveResult.approved) {
+                    messages.newline();
+                    messages.success(`Approved: ${feature.name}`);
+                    if (wizardResult.changedSelections && wizardResult.changedSelections.length > 0) {
+                        console.log(`  ${colors.muted('Changes:')} ${wizardResult.changedSelections.length} selection(s) updated`);
+                    }
+                    if (wizardResult.feedback) {
+                        console.log(`  ${colors.muted('Comment:')} ${wizardResult.feedback}`);
+                    }
+                    console.log(`  ${colors.muted('Agent:')}   proceeding to ${phaseNextStep(phase)}`);
+                    messages.newline();
+                }
+                else {
+                    throw new Error(approveResult.reason);
+                }
+            }
+            else {
+                const rejectUseCase = container.resolve(RejectAgentRunUseCase);
+                const rejectResult = await rejectUseCase.execute(run.id, wizardResult.feedback);
+                if (rejectResult.rejected) {
+                    messages.newline();
+                    messages.warning(`Rejected: ${feature.name}`);
+                    console.log(`  ${colors.muted('Feedback:')} ${wizardResult.feedback}`);
+                    console.log(`  ${colors.muted('Iteration:')} ${rejectResult.iteration}`);
+                    if (rejectResult.iterationWarning) {
+                        messages.warning('Warning: 5+ iterations. Consider refining the prompt instead.');
+                    }
+                    console.log(`  ${colors.muted('Agent:')}    re-running ${phase}`);
+                    messages.newline();
+                }
+                else {
+                    throw new Error(rejectResult.reason);
+                }
+            }
         }
         catch (error) {
             const err = error instanceof Error ? error : new Error(String(error));

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;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsTpC,wBAAgB,iBAAiB,IAAI,OAAO,CAwJ3C"}
+{"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;AA+VpC,wBAAgB,iBAAiB,IAAI,OAAO,CAyJ3C"}