@garygentry/feature-forge 0.2.14 → 0.3.1

package/adapters/pi/skills/forge-bootstrap/references/templates/ci/github-actions.yml

@@ -0,0 +1,12 @@
+name: ci
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      # <<MEMBER_STEPS>>

package/adapters/pi/skills/forge-bootstrap/references/templates/generic/run.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+# Entrypoint for the scaffolded baseline.
+echo "Hello from {{PROJECT_NAME}}"

package/adapters/pi/skills/forge-bootstrap/references/templates/generic/test.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+# Behavioral test: run the entrypoint and assert its output.
+set -eu
+
+actual="$(./run.sh)"
+expected="Hello from {{PROJECT_NAME}}"
+
+if [ "$actual" != "$expected" ]; then
+  printf 'FAIL: expected %s but got %s\n' "$expected" "$actual" >&2
+  exit 1
+fi
+
+printf 'PASS: run.sh produced the expected greeting\n'

package/adapters/pi/skills/forge-bootstrap/references/templates/go/go.mod

@@ -0,0 +1,3 @@
+module {{PKG}}
+
+go 1.21

package/adapters/pi/skills/forge-bootstrap/references/templates/go/main.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+// greet returns the project greeting for name.
+func greet(name string) string {
+	return "Hello from " + name
+}
+
+func main() {
+	fmt.Println(greet("{{PROJECT_NAME}}"))
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/go/main_test.go

@@ -0,0 +1,11 @@
+package main
+
+import "testing"
+
+func TestGreet(t *testing.T) {
+	got := greet("world")
+	want := "Hello from world"
+	if got != want {
+		t.Errorf("greet(\"world\") = %q, want %q", got, want)
+	}
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/hygiene/AGENTS.md

@@ -0,0 +1,35 @@
+# Agent Instructions — {{PROJECT_NAME}}
+
+## Project Purpose
+
+{{PURPOSE}}
+
+## Getting Started
+
+This project was scaffolded by forge-bootstrap. To continue development:
+
+1. Review `forge.config.json` for the project configuration.
+2. Run the forge pipeline (forge-1-prd → forge-0-epic → forge-3-specs → forge-4-backlog) to plan and implement features.
+3. Use `forge-5-loop` to drive autonomous implementation.
+
+## Conventions
+
+- Follow the patterns established in the existing codebase.
+- Keep `forge.config.json` up to date with any changes to stack or commands.
+
+## Specs are pre-implementation
+
+- Documents under `specs/` (PRDs, tech specs, numbered implementation specs) establish the backlog. They are **not** kept in sync with the code as it evolves.
+- Do not flag or "fix" divergence between a finalized spec and the implementation — code is the source of truth for behavior.
+- It's fine for `specs/` artifacts and `backlog.json` to reference specs for provenance, but implementation artifacts (source code, generated skills/agents, configs, docs) must not reference spec files, which may be archived or deleted after a feature ships.
+
+## Tooling feedback (feature-forge / rauf)
+
+This project is driven by the feature-forge pipeline and the rauf loop. Help improve those tools by capturing friction as you hit it — papercuts included, not just outright bugs.
+
+- **When to flag:** any forge/rauf command, skill, agent, or prompt that is confusing, buggy, missing a capability, forces a workaround, or produces a surprising result.
+- **Where to file** — route by which tool the friction is with:
+  - feature-forge (pipeline stages, forge skills/agents): https://github.com/garygentry/feature-forge/issues
+  - rauf (the autonomous loop runner, `rauf` CLI): https://github.com/garygentry/rauf/issues
+- **How:** capture it while fresh — *what you ran / what you expected / what actually happened / a fix idea* — then propose a titled issue and file it with `gh issue create` **on the human's go-ahead, not silently.**
+- **In an autonomous rauf iteration:** do **not** open issues mid-loop. Note the friction in `progress.md` for the human to triage later.

package/adapters/pi/skills/forge-bootstrap/references/templates/hygiene/CLAUDE.md

@@ -0,0 +1,36 @@
+# Claude Instructions — {{PROJECT_NAME}}
+
+## Project Purpose
+
+{{PURPOSE}}
+
+## Getting Started
+
+This project was scaffolded by forge-bootstrap. To continue development:
+
+1. Review `forge.config.json` for the project configuration.
+2. Run the forge pipeline (forge-1-prd → forge-0-epic → forge-3-specs → forge-4-backlog) to plan and implement features.
+3. Use `forge-5-loop` to drive autonomous implementation.
+
+## Working with Claude
+
+- Use `/skill:forge` to enter the forge pipeline for new features.
+- The `forge.config.json` at the project root defines the stack, commands, and pipeline settings.
+- Follow the patterns established in the existing codebase.
+
+## Specs are pre-implementation
+
+- Documents under `specs/` (PRDs, tech specs, numbered implementation specs) establish the backlog. They are **not** kept in sync with the code as it evolves.
+- Don't flag or "fix" divergence between a finalized spec and the implementation — code is the source of truth for behavior.
+- It's fine for `specs/` artifacts and `backlog.json` to reference specs for provenance, but implementation artifacts (source code, generated skills/agents, configs, docs) must not reference spec files, which may be archived or deleted after a feature ships.
+
+## Tooling feedback (feature-forge / rauf)
+
+I'm driving this project with the feature-forge pipeline and the rauf loop, and I want to keep improving them. When you hit friction with either tool, help me capture it — papercuts included, not just outright bugs.
+
+- **When to flag:** any forge/rauf command, skill, agent, or prompt that is confusing, buggy, missing a capability, forces a workaround, or produces a surprising result.
+- **Where to file** — route by which tool the friction is with:
+  - feature-forge (pipeline stages, `/skill:*`, forge skills/agents): https://github.com/garygentry/feature-forge/issues
+  - rauf (the autonomous loop runner, `rauf` CLI): https://github.com/garygentry/rauf/issues
+- **How:** capture it while fresh — *what you ran / what you expected / what actually happened / a fix idea* — then propose a titled issue and file it with `gh issue create` **once I give the go-ahead, not silently.**
+- **In an autonomous rauf iteration:** don't open issues mid-loop. Note the friction in `progress.md` for me to triage later.

package/adapters/pi/skills/forge-bootstrap/references/templates/hygiene/README.md

@@ -0,0 +1,11 @@
+# {{PROJECT_NAME}}
+
+{{PURPOSE}}
+
+## License
+
+This project is licensed under {{LICENSE}}.
+
+---
+
+_Scaffolded by [forge-bootstrap](https://github.com/feature-forge/feature-forge)._

package/adapters/pi/skills/forge-bootstrap/references/templates/licenses/Apache-2.0/LICENSE

@@ -0,0 +1,198 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship made available under
+      the License, as indicated by a copyright notice that is included in
+      or attached to the work (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean, as submitted to the Licensor for inclusion
+      in the Work by the copyright owner or by an individual or Legal Entity
+      authorized to submit on behalf of the copyright owner. For the purposes
+      of this definition, "submitted" means any form of electronic, verbal,
+      or written communication sent to the Licensor or its representatives,
+      including but not limited to communication on electronic mailing lists,
+      source code control systems, and issue tracking systems that are managed
+      by, or on behalf of, the Licensor for the purpose of discussing and
+      improving the Work, but excluding communication that is conspicuously
+      marked or designated in writing by the copyright owner as "Not a
+      Contribution."
+
+      "Contributor" shall mean Licensor and any Legal Entity on behalf of
+      whom a Contribution has been received by the Licensor and included
+      within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by the combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a cross-claim
+      or counterclaim in a lawsuit) alleging that the Work or any patent
+      claims embodied in the Work constitute direct or indirect patent
+      infringement, then any patent licenses granted to You under this
+      License for that Work shall terminate as of the date such litigation
+      is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or Derivative
+          Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, You must include a readable copy of the
+          attribution notices contained within such NOTICE file, in
+          at least one of the following places: within a NOTICE text
+          file distributed as part of the Derivative Works; within
+          the Source form or documentation, if provided along with the
+          Derivative Works; or, within a display generated by the
+          Derivative Works, if and wherever such third-party notices
+          normally appear. The contents of the NOTICE file are for
+          informational purposes only and do not modify the License.
+          You may add Your own attribution notices within Derivative
+          Works that You distribute, alongside or in addition to the
+          NOTICE text from the Work, provided that such additional
+          attribution notices cannot be construed as modifying the
+          License.
+
+      You may add Your own license statement for Your modifications and
+      may provide additional grant of rights to use, copy, modify, merge,
+      publish, distribute, sublicense, and/or sell copies of the
+      Contribution, and to permit persons to whom the Contribution is
+      furnished to do so, provided that Your use, reproduction, and
+      distribution of the Work otherwise complies with the conditions
+      stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any conditions of
+      TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining
+      the appropriateness of using or reproducing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or exemplary damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or all other
+      commercial damages or losses), even if such Contributor has been
+      advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may offer only
+      conditions consistent on your own behalf and on Your sole
+      responsibility, not on behalf of any other Contributor, and only if
+      You agree to indemnify, defend, and hold each Contributor harmless
+      for any liability incurred by, or claims asserted against, such
+      Contributor by reason of your accepting any such warranty or
+      additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format in use. We also recommend that
+      a file or directory name be included, with the "full path" if
+      practical.
+
+   Copyright {{YEAR}} {{AUTHOR}}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/adapters/pi/skills/forge-bootstrap/references/templates/licenses/MIT/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) {{YEAR}} {{AUTHOR}}
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/adapters/pi/skills/forge-bootstrap/references/templates/python/pyproject.toml

@@ -0,0 +1,24 @@
+[build-system]
+requires = ["setuptools>=68"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "{{PROJECT_NAME}}"
+version = "0.0.0"
+description = "{{PURPOSE}}"
+requires-python = ">=3.10"
+dependencies = []
+
+[project.optional-dependencies]
+dev = ["mypy>=1.8", "pytest>=8.0"]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.mypy]
+files = ["src", "tests"]
+strict = true
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+testpaths = ["tests"]

package/adapters/pi/skills/forge-bootstrap/references/templates/python/src/{{PKG}}/__init__.py

@@ -0,0 +1,5 @@
+"""Package root for {{PKG}}."""
+
+from {{PKG}}.main import greet
+
+__all__ = ["greet"]

package/adapters/pi/skills/forge-bootstrap/references/templates/python/src/{{PKG}}/main.py

@@ -0,0 +1,13 @@
+"""Entrypoint module."""
+
+
+def greet(name: str = "world") -> str:
+    """Return a greeting for ``name``.
+
+    Args:
+        name: The subject of the greeting.
+
+    Returns:
+        A greeting string.
+    """
+    return f"Hello from {name}"

package/adapters/pi/skills/forge-bootstrap/references/templates/python/tests/test_smoke.py

@@ -0,0 +1,8 @@
+"""Smoke test for the scaffolded baseline."""
+
+from {{PKG}}.main import greet
+
+
+def test_greet() -> None:
+    """greet returns the expected greeting."""
+    assert greet("world") == "Hello from world"

package/adapters/pi/skills/forge-bootstrap/references/templates/rust/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "{{PKG}}"
+version = "0.0.0"
+edition = "2021"
+description = "{{PURPOSE}}"
+
+[lib]
+name = "{{PKG}}"
+path = "src/lib.rs"
+
+[[bin]]
+name = "{{PKG}}"
+path = "src/main.rs"
+
+[dependencies]

package/adapters/pi/skills/forge-bootstrap/references/templates/rust/src/lib.rs

@@ -0,0 +1,7 @@
+//! Library root for the scaffolded baseline.
+
+/// Returns the project greeting for `name`.
+#[must_use]
+pub fn greet(name: &str) -> String {
+    format!("Hello from {name}")
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/rust/src/main.rs

@@ -0,0 +1,5 @@
+use {{PKG}}::greet;
+
+fn main() {
+    println!("{}", greet("{{PROJECT_NAME}}"));
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/rust/tests/smoke.rs

@@ -0,0 +1,6 @@
+use {{PKG}}::greet;
+
+#[test]
+fn greet_returns_greeting() {
+    assert_eq!(greet("world"), "Hello from world");
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/typescript/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "{{PROJECT_NAME}}",
+  "version": "0.0.0",
+  "private": true,
+  "description": "{{PURPOSE}}",
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run"
+  },
+  "devDependencies": {
+    "typescript": "^5.4.0",
+    "vitest": "^1.6.0"
+  }
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/typescript/src/index.ts

@@ -0,0 +1,4 @@
+/** Returns the project's greeting. */
+export function greet(name: string = "{{PROJECT_NAME}}"): string {
+  return `Hello from ${name}`;
+}

package/adapters/pi/skills/forge-bootstrap/references/templates/typescript/test/smoke.test.ts

@@ -0,0 +1,6 @@
+import { expect, test } from "vitest";
+import { greet } from "../src/index.js";
+
+test("greet returns a greeting", () => {
+  expect(greet("world")).toBe("Hello from world");
+});

package/adapters/pi/skills/forge-bootstrap/references/templates/typescript/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["vitest/globals"]
+  },
+  "include": ["src", "test"]
+}

package/adapters/pi/skills/forge-fix/SKILL.md

@@ -0,0 +1,98 @@
+---
+# GENERATED — DO NOT EDIT. Source: skills/forge-fix/SKILL.md. Regenerate: python3 scripts/build-adapters.py
+name: forge-fix
+description: Apply fixes from the most recent forge-verify findings document. Use when user runs /skill:forge-fix or asks to apply verification fixes for a forge feature. Do NOT trigger for general code fixes, bug fixes, or repairs outside the forge verification workflow.
+---
+
+# forge-fix — Apply Verification Fixes
+
+Apply fixes from the most recent forge-verify findings document, with step-level tracking for crash recovery.
+
+Usually invoked by the user, but an **`autoFix` caller** may also invoke this skill automatically
+when `autoFix: true` is configured **and** its preconditions hold (the findings document has zero
+unresolved decision points, the working tree is clean, and a mandatory re-verify passes afterward).
+Two callers drive that chain: an **authoring stage's in-stage auto-verify** (the primary path — see
+`references/stage-exit-protocol.md`, the in-stage verify block) and the **`/skill:forge`
+navigator's catch-up** (§3b). The **fix application** below is identical either way — this skill is
+not "auto-aware" about *applying* findings; it always applies the latest findings document. The
+**caller** owns the gating decisions, including the closing re-verify: the Step 6 gate is presented
+**only on a direct invocation**, because under an `autoFix` chain the caller (stage skill or
+navigator) runs the mandatory re-verify itself.
+
+## Prerequisites
+
+Read and follow `references/shared-conventions.md` for feature name validation, configuration reading, and force mode handling before proceeding.
+
+**Turn structure reminder:** Output analysis/context as text, then route ALL questions through `AskUserQuestion`. Never embed questions in text output — the user will not be prompted and the session will stall.
+
+## Step 1: Locate Findings Document
+
+1. Read `forge.config.json` for `specsDir` (default: `./specs`)
+2. Resolve the feature directory via the **Feature Directory Resolution** block in `references/shared-conventions.md` (a standalone feature resolves to its flat `{specsDir}/{feature}/` path exactly as today; an epic member resolves to its nested path). Then find the most recent `VERIFY-*-*.md` file in `{resolvedFeatureDir}/.verification/`.
+3. If no findings document exists, tell the user: "No verification findings found. Run `/skill:forge-verify {feature}` first."
+
+## Step 2: Parse Fix Execution Plan
+
+1. Read the "Fix Execution Plan" section of the findings document
+2. Identify all execution steps and their dependencies
+3. Check for a `## Fix Progress` section at the bottom of the findings document — if present, some steps were already applied in a previous interrupted run
+
+## Step 3: Handle User Decisions
+
+If the "User Decisions Required" section has unresolved items:
+1. Present each decision to the user with the context from the findings, using `AskUserQuestion` for each decision point. Follow the **Decision Support** protocol in `references/shared-conventions.md`: lead with a recommended option and put the trade-off in each option's description. When the findings provide clear evidence, recommend with confidence and cite it. When they don't, still offer a sensible default with the trade-offs, but flag it plainly as a judgment call rather than going neutral — a defaulted recommendation beats an unguided option dump.
+2. Wait for answers before proceeding
+3. Record decisions in the findings document under the "User Decisions Required" section (mark each as resolved)
+
+## Step 4: Execute Fix Steps
+
+For each step in the "Execution Steps" section, in order:
+
+1. **Check if already applied:** If the step appears in the "Fix Progress" section as `[APPLIED]`, skip it
+2. **Check dependencies:** If the step depends on another step, verify that step is marked as applied
+3. **Apply the fix:** Execute the change described in the step's "Action" field
+4. **Verify the change:** Re-read the modified file and check that the change is correct and consistent with the step's rationale
+5. **Record progress:** Append to the `## Fix Progress` section at the bottom of the findings document:
+   ```
+   - Step {N}: [APPLIED] {date} — {short summary of what was done}
+   ```
+6. If a step fails or produces unexpected results, STOP. Report the issue to the user. Do not continue to dependent steps.
+
+## Step 5: Update Pipeline State and Commit
+
+Follow the Git Commit Protocol in `references/shared-conventions.md`.
+
+1. Update `{resolvedFeatureDir}/.pipeline-state.json`:
+   - Set the relevant `forge-verify-*` entry status to `findings-applied`
+   - Record `fixedAt` timestamp
+   - Record `verifiedStageVersion` = the current `version` of the production stage entry
+     this verify covers (e.g. fixing `tech` findings → `stages["forge-2-tech"].version`).
+     This keeps the navigator's freshness ledger accurate after a fix, so the verified
+     stage reads as `fresh` and auto-verify does not needlessly re-fire on an unchanged
+     artifact. (If the fix itself bumped the production stage's `version`, use the new
+     value so the ledger reflects what was actually verified/fixed.)
+2. If `gitCommitAfterStage` is true, follow the Git Commit Protocol: stage files (`git add {resolvedFeatureDir}/` — or `{specsDir}/{epic}/` for an epic member so the member-state change commits atomically with the epic subtree), attempt commit with message `"{commitPrefix}({feature}): apply {mode} verification fixes"` (writing `commitHash: null` in that commit), then record the artifact-commit hash via the protocol's two-commit follow-up (never `--amend`) only on success.
+
+## Step 6: Re-verify Gate
+
+Fixes are applied and recorded (`findings-applied`), so the stage reads **fresh** in the navigator's ledger (Step 5 set `verifiedStageVersion` to the current version). A re-verify is nonetheless the only thing that *confirms* the fixes actually resolved the findings, so on a **direct/manual** `forge-fix` invocation, **prompt** it rather than leaving it as a passive suggestion — this is the same **Standard Verify Gate** the stage skills stamp (`references/stage-exit-protocol.md`).
+
+**Skip this gate when an `autoFix` caller invoked you as part of a chain** — the authoring stage's in-stage auto-verify (`references/stage-exit-protocol.md`, in-stage verify block) or the navigator's catch-up (`skills/forge/SKILL.md` §3b step 2b): there the caller owns the mandatory re-verify, so a second gate here would block the unattended flow or double the re-verify. Just return and let the caller proceed.
+
+On a direct invocation, present the gate using `AskUserQuestion` with these three options — but only when the host has a question mechanism **and** the clean-room path is available (the host's subagent mechanism plus a dispatchable `forge-verifier` subagent):
+- **Re-verify {feature} now** *(recommended)* — dispatch the clean-room `forge-verifier` subagent from this session in require-clean mode to confirm every finding is resolved; the digest returns here so any remaining issue keeps its context. One-time — it does **not** change config.
+- **Re-verify now + enable auto-verify going forward** — re-verify now **and** patch `"autoVerify": true` into `forge.config.json` in place (preserve formatting and every other key) so future stages verify automatically, no prompt. This complements the `forge-init` opt-in. **Do not auto-commit this config change** — treat it like `notes`: a user-facing edit the user commits on their own cadence, never folded into a stage's artifact commit.
+- **Skip for now** — proceed without re-verifying; the fixes are already recorded, so the stage stays `findings-applied` (fresh in the ledger). Run `/skill:forge {feature}` when you want pipeline status.
+
+**Host / clean-room fallback (not a user-selectable option):** if the question mechanism, the host's subagent mechanism, or the `forge-verifier` subagent is unavailable, do **not** run clean-room — degrade to printing `/skill:forge-verify {feature}` for the user to run inline/manually (mirroring `autoInvokeNextStage`), and offer the auto-verify enable as plain text only if a config write is possible.
+
+---
+
+## Host execution notes (Pi)
+
+This Pi bundle preserves Claude's `AskUserQuestion` references because it ships a Pi compatibility extension registering an `AskUserQuestion` tool. On Pi:
+
+- **User input:** use `AskUserQuestion` for genuine user decisions. It supports multiple questions, option descriptions, recommended ordering, multi-select, previews, and free-form Other/custom answers.
+- **Skill dispatch:** Pi uses `/skill:<name>` commands. If you cannot invoke a skill directly, print the exact `/skill:<name> ...` command for the user to run.
+- **Subagents:** this bundle declares its custom agents (`forge-researcher`, `forge-spec-writer`, `forge-verifier`) as package agents. If a `subagent` tool is registered, dispatch one with `{ agent: "forge-verifier", task: "..." }`, or fan several out concurrently with `{ tasks: [{ agent: "forge-spec-writer", task: "..." }, ...] }`. If no `subagent` tool is available, run that step inline yourself.
+- **Background / monitoring:** run long-lived commands in the foreground and report progress as it arrives.