forgedock 1.1.4 → 1.1.6

package/bin/hooks/pre-tool-use.mjs

@@ -188,6 +188,10 @@ async function isForgeDockManagedCwd() {
 /**
  * Check whether a gh pr create command targets a forbidden base branch.
  *
+ * Allows staging → main PRs (the deploy path) by detecting --head staging
+ * or falling back to the current git branch. Feature branches targeting
+ * main are still hard-blocked.
+ *
  * @param {string} command
  * @returns {string|null} Error message to show, or null if allowed.
  */
@@ -199,6 +203,12 @@ function checkPrTarget(command) {
   if (!base) return null; // no --base flag — gh will use the default
 
   if (FORBIDDEN_PR_BASES.includes(base.toLowerCase())) {
+    // Allow staging → main (the deploy path, not a pipeline violation).
+    const head = extractFlag(command, "--head") || extractFlag(command, "-H") || currentGitBranch();
+    if (head && /^staging$/.test(head)) {
+      return null; // deploy flow — allowed
+    }
+
     return [
       `[ForgeDock] BLOCKED: PR targets "${base}" — pipeline rule violation.`,
       ``,
@@ -206,6 +216,7 @@ function checkPrTarget(command) {
       `A PR to "${base}" is a hard pipeline violation. Fix the --base flag.`,
       ``,
       `Allowed targets: staging | milestone/<slug>`,
+      `Exception: staging → main (deploy flow) is allowed.`,
     ].join("\n");
   }
 
@@ -315,6 +326,27 @@ function checkLabelTransition(command) {
   return null; // valid transition — allow
 }
 
+// ---------------------------------------------------------------------------
+// Git helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Return the current git branch name, or null on any failure.
+ * Used to detect the staging → main deploy path.
+ */
+function currentGitBranch() {
+  try {
+    const { execFileSync: exec } = _require("child_process");
+    return exec("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 5000,
+    }).trim() || null;
+  } catch {
+    return null;
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------

package/commands/autopilot.md

@@ -387,12 +387,47 @@ while true; do
     break
   fi
 
-  # Step 1: Orchestrate all open fast-lane issues in parallel via /orchestrate
-  echo "=== Fast Lane Iteration $FAST_LANE_ITERATIONS: Orchestrating $OPEN_UNMILESTONED issues ==="
+  # Step 1: Drive all open fast-lane issues through the durable engine.
+  # Each issue is dispatched individually via `forgedock run-issue` so the engine's
+  # phase table (fail-closed review gate, deterministic resume, lease-based concurrency)
+  # enforces every transition — not the LLM interpreting work-on.md.
+  # Fallback: if forgedock CLI is unavailable, delegate to /orchestrate (markdown-spec path).
+  echo "=== Fast Lane Iteration $FAST_LANE_ITERATIONS: Dispatching $OPEN_UNMILESTONED issues via engine ==="
+
+  FORGEDOCK_AVAILABLE=$(command -v forgedock >/dev/null 2>&1 && echo "true" || echo "false")
+
   if [ "$DRY_RUN" = "false" ]; then
-    Skill("orchestrate", args="fast-lane")
+    if [ "$FORGEDOCK_AVAILABLE" = "true" ]; then
+      # Engine-first dispatch: enumerate issues and run each through the durable engine.
+      # Issues are dispatched concurrently — the engine holds per-issue leases.
+      FAST_LANE_ISSUE_NUMS=$(gh issue list $GH_FLAG \
+        --state open \
+        --limit 200 \
+        --json number,milestone,labels \
+        --jq '[.[] | select(
+          .milestone == null and
+          (.labels | map(.name) | any(. == "workflow:merged" or . == "workflow:invalid" or . == "workflow:decomposed" or . == "needs-human") | not)
+        )] | .[].number' \
+        2>/dev/null || echo '')
+
+      for ISSUE_NUM in $FAST_LANE_ISSUE_NUMS; do
+        echo "Dispatching #$ISSUE_NUM via forgedock run-issue --lane staging"
+        forgedock run-issue "$ISSUE_NUM" --lane staging &
+      done
+
+      # Wait for all engine workers to complete before proceeding to deploy step.
+      wait
+      echo "Engine dispatch complete for fast-lane iteration $FAST_LANE_ITERATIONS"
+    else
+      echo "WARNING: forgedock CLI not in PATH — falling back to Skill(orchestrate, fast-lane)"
+      Skill("orchestrate", args="fast-lane")
+    fi
   else
-    echo "[DRY-RUN] Would invoke: Skill(orchestrate, fast-lane)"
+    if [ "$FORGEDOCK_AVAILABLE" = "true" ]; then
+      echo "[DRY-RUN] Would dispatch each fast-lane issue via: forgedock run-issue <issue> --lane staging"
+    else
+      echo "[DRY-RUN] Would invoke: Skill(orchestrate, fast-lane)"
+    fi
   fi
 
   # Step 2: Deploy staging→main if staging has new commits
@@ -481,12 +516,43 @@ echo "$MILESTONES" | jq -c '.[]' | while IFS= read -r milestone; do
 
   echo "=== Processing milestone: '$MS_TITLE' ($MS_PCT% complete, $MS_OPEN open) ==="
 
-  # Step 1: Orchestrate open issues in this milestone
+  # Step 1: Drive open issues in this milestone through the durable engine.
+  # Same engine-first dispatch as Phase 2 — fail-closed gates apply to milestone issues too.
+  # Fallback: if forgedock CLI is unavailable, delegate to /orchestrate.
   if [ "$MS_OPEN" -gt 0 ]; then
+    FORGEDOCK_AVAILABLE=$(command -v forgedock >/dev/null 2>&1 && echo "true" || echo "false")
+
     if [ "$DRY_RUN" = "false" ]; then
-      Skill("orchestrate", args="milestone $MS_SLUG")
+      if [ "$FORGEDOCK_AVAILABLE" = "true" ]; then
+        MS_ISSUE_NUMS=$(gh issue list $GH_FLAG \
+          --state open \
+          --limit 200 \
+          --json number,milestone,labels \
+          --jq --arg slug "$MS_SLUG" \
+          '[.[] | select(
+            .milestone != null and
+            (.milestone.title | ascii_downcase | gsub("[^a-z0-9]+"; "-") | ltrimstr("-") | rtrimstr("-")) == $slug and
+            (.labels | map(.name) | any(. == "workflow:merged" or . == "workflow:invalid" or . == "workflow:decomposed" or . == "needs-human") | not)
+          )] | .[].number' \
+          2>/dev/null || echo '')
+
+        for ISSUE_NUM in $MS_ISSUE_NUMS; do
+          echo "Dispatching #$ISSUE_NUM via forgedock run-issue --lane milestone/$MS_SLUG"
+          forgedock run-issue "$ISSUE_NUM" --lane "milestone/$MS_SLUG" &
+        done
+
+        wait
+        echo "Engine dispatch complete for milestone '$MS_TITLE'"
+      else
+        echo "WARNING: forgedock CLI not in PATH — falling back to Skill(orchestrate, milestone $MS_SLUG)"
+        Skill("orchestrate", args="milestone $MS_SLUG")
+      fi
     else
-      echo "[DRY-RUN] Would invoke: Skill(orchestrate, milestone $MS_SLUG)"
+      if [ "$FORGEDOCK_AVAILABLE" = "true" ]; then
+        echo "[DRY-RUN] Would dispatch each milestone issue via: forgedock run-issue <issue> --lane milestone/$MS_SLUG"
+      else
+        echo "[DRY-RUN] Would invoke: Skill(orchestrate, milestone $MS_SLUG)"
+      fi
     fi
   else
     echo "Milestone '$MS_TITLE' has no open issues — checking if branch needs deploy"

package/commands/deploy-pr.md

@@ -392,8 +392,11 @@ while [ "$REVIEW_ITER" -lt "$MAX_REVIEW_ITER" ] && [ "$REVIEW_GATE_PASSED" = "fa
       # This loop's next iteration will re-read the latest PR state.
     fi
   else
-    echo "WARNING: Could not determine review verdict from FORGE:REVIEW comment. Assuming APPROVED."
-    REVIEW_GATE_PASSED=true
+    # Fail-closed: unknown verdict must block merge, not grant it.
+    # If FORGE:REVIEW comment is missing, malformed, or unparseable for any reason
+    # (race condition, context compaction, skill error, comment format mismatch),
+    # treat it as a failed review — REVIEW_GATE_PASSED remains false.
+    echo "ERROR: Could not determine review verdict from FORGE:REVIEW comment. Blocking merge — review verdict is required. (#1714)"
   fi
 done
 

package/commands/orchestrate/phase-3-dependency.md

@@ -443,15 +443,19 @@ Proceed? (yes / adjust / pick specific issues)
 
 ---
 
-## Engine mode (headless)
+## Engine mode (default)
 
-When running headless/CI, dispatch each issue via the durable execution engine instead of spawning prose agents:
+Dispatch each issue via the durable execution engine. This is the **default execution mode** for both interactive (`/autopilot`, `/orchestrate`) and headless/CI paths:
 
 ```bash
 forgedock run-issue <issue> --lane <staging|milestone/slug>
 ```
 
-The engine drives every phase transition deterministically, mirrors state to the `FORGE:STATE` block on the issue, and holds a lease. To recover stalls, scan in-flight issues' `FORGE:STATE`; any issue with an expired lease and a non-terminal state is re-dispatched with the same `forgedock run-issue <issue>` command — it resumes from the last committed phase (idempotent). This replaces the label-heuristic "already in progress" check and the resume-with-nagging loop.
+The engine drives every phase transition deterministically, mirrors state to the `FORGE:STATE` block on the issue, and holds a lease. Its **fail-closed review gate** (`phases.mjs → detectOutcome`) means the PR must be confirmed merged before the phase is committed — missing or unparseable review comments are treated as failures, not approvals. To recover stalls, scan in-flight issues' `FORGE:STATE`; any issue with an expired lease and a non-terminal state is re-dispatched with the same `forgedock run-issue <issue>` command — it resumes from the last committed phase (idempotent). This replaces the label-heuristic "already in progress" check and the resume-with-nagging loop.
+
+**Why engine-first**: The engine's phase table enforces gate semantics in code — not via LLM interpretation of markdown specs. This eliminates the class of bug where the LLM assumes a review approved when the FORGE:REVIEW comment is absent or unreadable (issue #1714). Interactive sessions that run `/work-on` via Skill invocations additionally bridge to the engine run-log via the SubagentStop hook (`bin/hooks/interactive-engine.mjs`) — state is durable across compaction and context resets.
+
+**Fallback (no forgedock CLI)**: If `forgedock` is not in PATH, fall back to spawning Agent sub-agents that run `Skill("work-on", ...)` per issue. The SubagentStop hook still bridges these runs to the engine run-log for state persistence.
 
 ### Concurrency model: in-process worker pool + worktree-per-issue
 

package/commands/orchestrate/phase-4-execution.md

@@ -171,7 +171,31 @@ Use `${ISSUE_LANE[$NUM]}` and `${ISSUE_PR_BASE[$NUM]}` to populate `{LANE}` and
 
 ### Step 4A: Dispatch ready issues
 
-**REMINDER: You MUST use the template below verbatim. Only fill in `{VARIABLES}`. Do NOT rewrite the agent prompt. Do NOT write custom implementation instructions. The agent MUST invoke `/work-on` via the Skill tool — this is the HARD RULE from the top of this file.**
+**Engine-first dispatch (default)**: When `forgedock` is in PATH, dispatch each ready issue via the durable engine rather than spawning prose Agent sub-agents. The engine's phase table enforces gate semantics in code — its fail-closed review gate and deterministic phase ordering are not subject to LLM interpretation.
+
+```bash
+# Engine-first dispatch: check CLI availability, then dispatch ready issues in parallel
+FORGEDOCK_AVAILABLE=$(command -v forgedock >/dev/null 2>&1 && echo "true" || echo "false")
+
+if [ "$FORGEDOCK_AVAILABLE" = "true" ]; then
+  for NUM in {ready_issue_numbers}; do
+    LANE="${ISSUE_LANE[$NUM]}"
+    PR_BASE="${ISSUE_PR_BASE[$NUM]}"
+    echo "Dispatching #$NUM via forgedock run-issue --lane $PR_BASE"
+    forgedock run-issue "$NUM" --lane "$PR_BASE" &
+  done
+  wait
+  echo "Engine dispatch complete — advancing to Step 4B (completion sweep)"
+else
+  echo "WARNING: forgedock CLI not in PATH — falling back to Agent-spawn path (markdown-spec execution)"
+  # Fall through to Agent-spawn template below. The SubagentStop hook (bin/hooks/interactive-engine.mjs)
+  # bridges these runs to the engine run-log for state persistence even on the fallback path.
+fi
+```
+
+**Agent-spawn path (fallback when forgedock CLI unavailable)**: When `FORGEDOCK_AVAILABLE=false`, spawn Agent sub-agents per issue using the template below. This preserves engine state via the SubagentStop hook even without the CLI.
+
+**REMINDER: You MUST use the template below verbatim when on the Agent-spawn fallback path. Only fill in `{VARIABLES}`. Do NOT rewrite the agent prompt. Do NOT write custom implementation instructions. The agent MUST invoke `/work-on` via the Skill tool — this is the HARD RULE from the top of this file.**
 
 For each **ready** issue (all predecessors resolved or no predecessors), spawn an Agent sub-agent that runs the full `/work-on` pipeline. On the initial dispatch, this is every issue with an empty predecessor set. On subsequent dispatches (triggered by agent completions in Step 4B), this is every newly-unblocked issue.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgedock",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Autonomous dev pipeline for Claude Code. GitHub as institutional memory — every issue, PR, and annotation survives context resets and makes the next agent smarter.",
   "bin": {
     "forgedock": "bin/forgedock.mjs"