forge-pipeline 0.4.1 → 0.5.1

package/forge

@@ -246,17 +246,25 @@ show_plan_summary() {
 }
 
 wait_for_approval() {
-  printf "${BOLD}${YELLOW}Approve and continue? [Y/n] ${RESET}"
+  printf "  ${BOLD}[Y]${RESET} Approve and continue\n"
+  printf "  ${BOLD}[f]${RESET} Give feedback (architect + challenger will revise)\n"
+  printf "  ${BOLD}[n]${RESET} Abort\n"
+  echo ""
+  printf "${BOLD}${YELLOW}Your choice [Y/f/n]: ${RESET}"
   local answer
   read -r answer </dev/tty
   case "$answer" in
+    f|F|feedback)
+      return 1  # signal feedback requested
+      ;;
     n|N|no|No|NO)
-      log_info "Aborted. Edit .forge/spec/spec.md, then run 'forge start' again."
+      log_info "Aborted. Run 'forge start' again when ready."
       exit 0
       ;;
     *)
       log_success "Approved. Continuing..."
       echo ""
+      return 0
       ;;
   esac
 }
@@ -636,26 +644,63 @@ run_pipeline() {
   # Preflight
   preflight_check
 
-  # Phase 0: Spec Creation
+  # Phase 0: Spec Creation (with feedback loop)
   run_phase_spec "$user_prompt" || { log_error "Phase 0 failed"; exit 1; }
   check_global_timeout
 
-  # ── Approval gate (after spec, before planning + execution) ──
-  if [ "$AUTO_APPROVE" = true ]; then
-    log_info "Auto-approve enabled, skipping review."
+  if [ "$AUTO_APPROVE" != true ]; then
+    while true; do
+      echo ""
+      printf "${BOLD}${CYAN}═══════════════════════════════════════${RESET}\n"
+      printf "${BOLD}${CYAN}  SPEC REVIEW${RESET}\n"
+      printf "${BOLD}${CYAN}═══════════════════════════════════════${RESET}\n"
+      echo ""
+      echo "  The spec has been written to:"
+      printf "  ${BOLD}.forge/spec/spec.md${RESET}\n"
+      echo ""
+      echo "  Review it, then choose an option below."
+      echo ""
+
+      if wait_for_approval; then
+        break  # approved
+      fi
+
+      # Feedback requested — collect it
+      echo ""
+      printf "${BOLD}${YELLOW}Enter your feedback (press Enter twice to submit):${RESET}\n"
+      local feedback=""
+      local empty_count=0
+      while IFS= read -r line </dev/tty; do
+        if [ -z "$line" ]; then
+          empty_count=$((empty_count + 1))
+          if [ "$empty_count" -ge 1 ] && [ -n "$feedback" ]; then
+            break
+          fi
+        else
+          empty_count=0
+        fi
+        if [ -n "$feedback" ]; then
+          feedback="${feedback}\n${line}"
+        else
+          feedback="$line"
+        fi
+      done
+
+      if [ -z "$feedback" ]; then
+        log_warn "No feedback provided. Showing options again."
+        continue
+      fi
+
+      # Save feedback and run single revision pass
+      printf '%b\n' "$feedback" > "$FORGE_ROOT/.forge/spec/user-feedback.md"
+      log_info "Feedback saved. Revising spec..."
+      echo ""
+
+      run_phase_spec_revise || { log_error "Spec revision failed"; exit 1; }
+      check_global_timeout
+    done
   else
-    echo ""
-    printf "${BOLD}${CYAN}═══════════════════════════════════════${RESET}\n"
-    printf "${BOLD}${CYAN}  SPEC REVIEW${RESET}\n"
-    printf "${BOLD}${CYAN}═══════════════════════════════════════${RESET}\n"
-    echo ""
-    echo "  The spec has been written to:"
-    echo "  ${BOLD}.forge/spec/spec.md${RESET}"
-    echo ""
-    echo "  Review it, then approve to continue."
-    echo "  If you edit the spec, changes will be used as-is."
-    echo ""
-    wait_for_approval
+    log_info "Auto-approve enabled, skipping review."
   fi
 
   # Phase 1: Planning

package/lib/phases/00_spec.sh

@@ -107,3 +107,40 @@ run_phase_spec() {
 
     return 0
 }
+
+##
+# Single-pass spec revision from user feedback.
+# Runs one architect pass (with user feedback) + one challenger pass.
+##
+run_phase_spec_revise() {
+    log_phase "0" "SPEC REVISION (user feedback)"
+
+    # ── Architect revision with user feedback ─────────────────────
+    local prompt
+    prompt="$(generate_architect_revision_prompt)"
+
+    spawn_agent_foreground "architect" "$FORGE_ROOT" "$prompt" "$(build_allowed_tools architect)"
+
+    if [[ ! -f "${FORGE_ROOT}/.forge/spec/spec.md" ]]; then
+        log_error "Architect did not produce spec.md during revision"
+        return 1
+    fi
+
+    # ── Challenger validation ─────────────────────────────────────
+    local challenger_prompt
+    challenger_prompt="$(generate_challenger_prompt)"
+
+    spawn_agent_foreground "challenger" "$FORGE_ROOT" "$challenger_prompt" "$(build_allowed_tools challenger)"
+
+    if [[ -f "${FORGE_ROOT}/.forge/spec/review.json" ]]; then
+        local verdict
+        verdict="$(json_get "${FORGE_ROOT}/.forge/spec/review.json" "verdict")"
+        if [[ "$verdict" == "approved" ]]; then
+            log_success "Revised spec approved by challenger"
+        else
+            log_warn "Challenger flagged issues but proceeding (user-driven revision)"
+        fi
+    fi
+
+    return 0
+}

package/lib/prompts.sh

@@ -147,6 +147,21 @@ generate_architect_prompt() {
   prompt+="$key_files"
   prompt+=$'\n```\n\n'
 
+  # User feedback (from approval gate, if any)
+  if [[ -f "${FORGE_ROOT}/.forge/spec/user-feedback.md" ]]; then
+    prompt+="## USER FEEDBACK"$'\n\n'
+    prompt+="The user reviewed a previous version of the spec and provided this feedback. Address it carefully:"$'\n\n'
+    prompt+=$(cat "${FORGE_ROOT}/.forge/spec/user-feedback.md" 2>/dev/null)
+    prompt+=$'\n\n'
+  fi
+
+  # Previous spec (if re-running after feedback)
+  if [[ -f "${FORGE_ROOT}/.forge/spec/spec.md" ]]; then
+    prompt+="## PREVIOUS SPEC (revise this)"$'\n\n'
+    prompt+=$(cat "${FORGE_ROOT}/.forge/spec/spec.md" 2>/dev/null)
+    prompt+=$'\n\n'
+  fi
+
   # Instruction
   prompt+="## INSTRUCTION"$'\n\n'
   prompt+="Write your spec to ${FORGE_ROOT}/.forge/spec/spec.md"$'\n'
@@ -188,9 +203,17 @@ generate_architect_revision_prompt() {
   prompt+=$(cat "${FORGE_ROOT}/.forge/repo-tree.txt" 2>/dev/null)
   prompt+=$'\n```\n\n'
 
+  # User feedback (from approval gate, if any)
+  if [[ -f "${FORGE_ROOT}/.forge/spec/user-feedback.md" ]]; then
+    prompt+="## USER FEEDBACK"$'\n\n'
+    prompt+="The user also provided direct feedback. Prioritize this over challenger feedback:"$'\n\n'
+    prompt+=$(cat "${FORGE_ROOT}/.forge/spec/user-feedback.md" 2>/dev/null)
+    prompt+=$'\n\n'
+  fi
+
   # Instruction
   prompt+="## INSTRUCTION"$'\n\n'
-  prompt+="Update your spec at ${FORGE_ROOT}/.forge/spec/spec.md addressing the challenger's feedback."$'\n'
+  prompt+="Update your spec at ${FORGE_ROOT}/.forge/spec/spec.md addressing all feedback."$'\n'
 
   prompt+="$ANTI_ATTRIBUTION_RULES"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-pipeline",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "Autonomous multi-agent coding pipeline",
   "bin": {
     "forge": "./bin/forge.js"