@warpgogol/forge 2.9.4 → 2.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warpgogol/forge",
-  "version": "2.9.4",
+  "version": "2.9.6",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -19,127 +19,127 @@
     "type": "git",
     "url": "git+https://github.com/syrokomskyi/forge.git"
   },
-  "main": "./src/index.ts",
-  "types": "./src/index.ts",
+  "main": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts",
   "bin": {
     "forge": "./bin/cli.js"
   },
   "exports": {
     ".": {
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/src/index.js"
     },
     "./types": {
-      "types": "./src/types.ts",
-      "default": "./src/types.ts"
+      "types": "./dist/src/types.d.ts",
+      "default": "./dist/src/types.js"
     },
     "./utils": {
-      "types": "./src/utils/index.ts",
-      "default": "./src/utils/index.ts"
+      "types": "./dist/src/utils/index.d.ts",
+      "default": "./dist/src/utils/index.js"
     },
     "./config": {
-      "types": "./src/config/forge-config.ts",
-      "default": "./src/config/forge-config.ts"
+      "types": "./dist/src/config/forge-config.d.ts",
+      "default": "./dist/src/config/forge-config.js"
     },
     "./os/core": {
-      "types": "./os/core/core.module.ts",
-      "default": "./os/core/core.module.ts"
+      "types": "./dist/os/core/core.module.d.ts",
+      "default": "./dist/os/core/core.module.js"
     },
     "./os/compass": {
-      "types": "./os/compass/index.ts",
-      "default": "./os/compass/index.ts"
+      "types": "./dist/os/compass/index.d.ts",
+      "default": "./dist/os/compass/index.js"
     },
     "./os/naming": {
-      "types": "./os/naming/index.ts",
-      "default": "./os/naming/index.ts"
+      "types": "./dist/os/naming/index.d.ts",
+      "default": "./dist/os/naming/index.js"
     },
     "./os/naming-module": {
-      "types": "./os/naming/naming.module.ts",
-      "default": "./os/naming/naming.module.ts"
+      "types": "./dist/os/naming/naming.module.d.ts",
+      "default": "./dist/os/naming/naming.module.js"
     },
     "./os/rfc": {
-      "types": "./os/rfc/index.ts",
-      "default": "./os/rfc/index.ts"
+      "types": "./dist/os/rfc/index.d.ts",
+      "default": "./dist/os/rfc/index.js"
     },
     "./os/rfc-module": {
-      "types": "./os/rfc/rfc.module.ts",
-      "default": "./os/rfc/rfc.module.ts"
+      "types": "./dist/os/rfc/rfc.module.d.ts",
+      "default": "./dist/os/rfc/rfc.module.js"
     },
     "./os/werkstatt": {
-      "types": "./os/werkstatt/index.ts",
-      "default": "./os/werkstatt/index.ts"
+      "types": "./dist/os/werkstatt/index.d.ts",
+      "default": "./dist/os/werkstatt/index.js"
     },
     "./os/workflow": {
-      "types": "./os/workflow/index.ts",
-      "default": "./os/workflow/index.ts"
+      "types": "./dist/os/workflow/index.d.ts",
+      "default": "./dist/os/workflow/index.js"
     },
     "./os/workflow-module": {
-      "types": "./os/workflow/workflow.module.ts",
-      "default": "./os/workflow/workflow.module.ts"
+      "types": "./dist/os/workflow/workflow.module.d.ts",
+      "default": "./dist/os/workflow/workflow.module.js"
     },
     "./os/spec-module": {
-      "types": "./os/spec/spec.module.ts",
-      "default": "./os/spec/spec.module.ts"
+      "types": "./dist/os/spec/spec.module.d.ts",
+      "default": "./dist/os/spec/spec.module.js"
     },
     "./os/adr": {
-      "types": "./os/adr/index.ts",
-      "default": "./os/adr/index.ts"
+      "types": "./dist/os/adr/index.d.ts",
+      "default": "./dist/os/adr/index.js"
     },
     "./os/adr-module": {
-      "types": "./os/adr/adr.module.ts",
-      "default": "./os/adr/adr.module.ts"
+      "types": "./dist/os/adr/adr.module.d.ts",
+      "default": "./dist/os/adr/adr.module.js"
     },
     "./os/plan": {
-      "types": "./os/plan/index.ts",
-      "default": "./os/plan/index.ts"
+      "types": "./dist/os/plan/index.d.ts",
+      "default": "./dist/os/plan/index.js"
     },
     "./os/plan-module": {
-      "types": "./os/plan/plan.module.ts",
-      "default": "./os/plan/plan.module.ts"
+      "types": "./dist/os/plan/plan.module.d.ts",
+      "default": "./dist/os/plan/plan.module.js"
     },
     "./os/audit": {
-      "types": "./os/audit/index.ts",
-      "default": "./os/audit/index.ts"
+      "types": "./dist/os/audit/index.d.ts",
+      "default": "./dist/os/audit/index.js"
     },
     "./os/audit-module": {
-      "types": "./os/audit/audit.module.ts",
-      "default": "./os/audit/audit.module.ts"
+      "types": "./dist/os/audit/audit.module.d.ts",
+      "default": "./dist/os/audit/audit.module.js"
     },
     "./os/session": {
-      "types": "./os/session/index.ts",
-      "default": "./os/session/index.ts"
+      "types": "./dist/os/session/index.d.ts",
+      "default": "./dist/os/session/index.js"
     },
     "./os/session-module": {
-      "types": "./os/session/session.module.ts",
-      "default": "./os/session/session.module.ts"
+      "types": "./dist/os/session/session.module.d.ts",
+      "default": "./dist/os/session/session.module.js"
     },
     "./os/mission": {
-      "types": "./os/mission/index.ts",
-      "default": "./os/mission/index.ts"
+      "types": "./dist/os/mission/index.d.ts",
+      "default": "./dist/os/mission/index.js"
     },
     "./os/mission-module": {
-      "types": "./os/mission/mission.module.ts",
-      "default": "./os/mission/mission.module.ts"
+      "types": "./dist/os/mission/mission.module.d.ts",
+      "default": "./dist/os/mission/mission.module.js"
     },
     "./os/exploration": {
-      "types": "./os/exploration/index.ts",
-      "default": "./os/exploration/index.ts"
+      "types": "./dist/os/exploration/index.d.ts",
+      "default": "./dist/os/exploration/index.js"
     },
     "./os/exploration-module": {
-      "types": "./os/exploration/exploration.module.ts",
-      "default": "./os/exploration/exploration.module.ts"
+      "types": "./dist/os/exploration/exploration.module.d.ts",
+      "default": "./dist/os/exploration/exploration.module.js"
     },
     "./os/notes": {
-      "types": "./os/notes/index.ts",
-      "default": "./os/notes/index.ts"
+      "types": "./dist/os/notes/index.d.ts",
+      "default": "./dist/os/notes/index.js"
     },
     "./os/notes-module": {
-      "types": "./os/notes/notes.module.ts",
-      "default": "./os/notes/notes.module.ts"
+      "types": "./dist/os/notes/notes.module.d.ts",
+      "default": "./dist/os/notes/notes.module.js"
     },
     "./os/program": {
-      "types": "./os/program/program.module.ts",
-      "default": "./os/program/program.module.ts"
+      "types": "./dist/os/program/program.module.d.ts",
+      "default": "./dist/os/program/program.module.js"
     }
   },
   "files": [
@@ -154,16 +154,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "build": "pnpm exec tsc -p tsconfig.json",
-    "build:check": "pnpm exec tsc -p tsconfig.json --noEmit",
-    "lint": "pnpm exec eslint \"src/**/*.ts\" \"os/**/*.ts\"",
-    "typecheck": "pnpm exec tsc -p tsconfig.json --noEmit",
-    "test": "vitest run --passWithNoTests",
-    "test:watch": "vitest",
-    "test:tarball:node24": "node test-fixtures/node24-consumer/smoke.mjs",
-    "prepublishOnly": "pnpm exec tsc -p tsconfig.json"
-  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.700.0",
     "trash": "^10.1.1",
@@ -184,127 +174,15 @@
     "node": ">=24 <25"
   },
   "publishConfig": {
-    "access": "public",
-    "main": "./dist/src/index.js",
-    "types": "./dist/src/index.d.ts",
-    "exports": {
-      ".": {
-        "types": "./dist/src/index.d.ts",
-        "default": "./dist/src/index.js"
-      },
-      "./types": {
-        "types": "./dist/src/types.d.ts",
-        "default": "./dist/src/types.js"
-      },
-      "./utils": {
-        "types": "./dist/src/utils/index.d.ts",
-        "default": "./dist/src/utils/index.js"
-      },
-      "./config": {
-        "types": "./dist/src/config/forge-config.d.ts",
-        "default": "./dist/src/config/forge-config.js"
-      },
-      "./os/core": {
-        "types": "./dist/os/core/core.module.d.ts",
-        "default": "./dist/os/core/core.module.js"
-      },
-      "./os/compass": {
-        "types": "./dist/os/compass/index.d.ts",
-        "default": "./dist/os/compass/index.js"
-      },
-      "./os/naming": {
-        "types": "./dist/os/naming/index.d.ts",
-        "default": "./dist/os/naming/index.js"
-      },
-      "./os/naming-module": {
-        "types": "./dist/os/naming/naming.module.d.ts",
-        "default": "./dist/os/naming/naming.module.js"
-      },
-      "./os/rfc": {
-        "types": "./dist/os/rfc/index.d.ts",
-        "default": "./dist/os/rfc/index.js"
-      },
-      "./os/rfc-module": {
-        "types": "./dist/os/rfc/rfc.module.d.ts",
-        "default": "./dist/os/rfc/rfc.module.js"
-      },
-      "./os/werkstatt": {
-        "types": "./dist/os/werkstatt/index.d.ts",
-        "default": "./dist/os/werkstatt/index.js"
-      },
-      "./os/workflow": {
-        "types": "./dist/os/workflow/index.d.ts",
-        "default": "./dist/os/workflow/index.js"
-      },
-      "./os/workflow-module": {
-        "types": "./dist/os/workflow/workflow.module.d.ts",
-        "default": "./dist/os/workflow/workflow.module.js"
-      },
-      "./os/spec-module": {
-        "types": "./dist/os/spec/spec.module.d.ts",
-        "default": "./dist/os/spec/spec.module.js"
-      },
-      "./os/adr": {
-        "types": "./dist/os/adr/index.d.ts",
-        "default": "./dist/os/adr/index.js"
-      },
-      "./os/adr-module": {
-        "types": "./dist/os/adr/adr.module.d.ts",
-        "default": "./dist/os/adr/adr.module.js"
-      },
-      "./os/plan": {
-        "types": "./dist/os/plan/index.d.ts",
-        "default": "./dist/os/plan/index.js"
-      },
-      "./os/plan-module": {
-        "types": "./dist/os/plan/plan.module.d.ts",
-        "default": "./dist/os/plan/plan.module.js"
-      },
-      "./os/audit": {
-        "types": "./dist/os/audit/index.d.ts",
-        "default": "./dist/os/audit/index.js"
-      },
-      "./os/audit-module": {
-        "types": "./dist/os/audit/audit.module.d.ts",
-        "default": "./dist/os/audit/audit.module.js"
-      },
-      "./os/session": {
-        "types": "./dist/os/session/index.d.ts",
-        "default": "./dist/os/session/index.js"
-      },
-      "./os/session-module": {
-        "types": "./dist/os/session/session.module.d.ts",
-        "default": "./dist/os/session/session.module.js"
-      },
-      "./os/mission": {
-        "types": "./dist/os/mission/index.d.ts",
-        "default": "./dist/os/mission/index.js"
-      },
-      "./os/mission-module": {
-        "types": "./dist/os/mission/mission.module.d.ts",
-        "default": "./dist/os/mission/mission.module.js"
-      },
-      "./os/exploration": {
-        "types": "./dist/os/exploration/index.d.ts",
-        "default": "./dist/os/exploration/index.js"
-      },
-      "./os/exploration-module": {
-        "types": "./dist/os/exploration/exploration.module.d.ts",
-        "default": "./dist/os/exploration/exploration.module.js"
-      },
-      "./os/notes": {
-        "types": "./dist/os/notes/index.d.ts",
-        "default": "./dist/os/notes/index.js"
-      },
-      "./os/notes-module": {
-        "types": "./dist/os/notes/notes.module.d.ts",
-        "default": "./dist/os/notes/notes.module.js"
-      },
-      "./os/program": {
-        "types": "./dist/os/program/program.module.d.ts",
-        "default": "./dist/os/program/program.module.js"
-      }
-    }
+    "access": "public"
   },
-  "packageManager": "pnpm@11.10.0"
-}
+  "scripts": {
+    "build": "pnpm exec tsc -p tsconfig.json",
+    "build:check": "pnpm exec tsc -p tsconfig.json --noEmit",
+    "lint": "pnpm exec eslint \"src/**/*.ts\" \"os/**/*.ts\"",
+    "typecheck": "pnpm exec tsc -p tsconfig.json --noEmit",
+    "test": "vitest run --passWithNoTests",
+    "test:watch": "vitest",
+    "test:tarball:node24": "node test-fixtures/node24-consumer/smoke.mjs"
+  }
+}

package/skills/_shared/fo-pipeline-conventions.md

@@ -92,15 +92,15 @@ Every `run_command` call MUST use a 6-minute (360 000 ms) execution budget. This
 3. **If completed**: Read the output and proceed normally.
 4. **If still running after 6 min**: Abandon the command — do not wait further. Try an alternative approach (different command, different scope, or skip the step). If no alternative exists, retry the same command once with the same 6-min budget.
 5. **Max retries**: 2 attempts per command. After 2 failed attempts, report to the operator and ask how to proceed.
-6. **No infinite waits**: NEVER call `command_status` with `WaitDurationSeconds` > 60. NEVER use `Blocking: true` for commands that may hang (builds, checks, `site-kernel run`, `astro check`, `tsc`, `pnpm install`).
+6. **No infinite waits**: NEVER call `command_status` with `WaitDurationSeconds` > 60. NEVER use `Blocking: true` for commands that may hang (builds, checks, long-running CLI commands, `astro check`, `tsc`, `pnpm install`).
 7. **Exceptions**: `Blocking: true` is allowed only for trivially fast commands (e.g., `node --version`, `git log -n 1`, `git status --short`) that are guaranteed to complete in seconds.
 
 ### Rationale
 
 - The `run_command` tool has no built-in timeout parameter. `WaitMsBeforeAsync` is the only mechanism to regain control after a fixed duration.
 - Abandoning a still-running process is acceptable — the process may complete in the background, but the agent is unblocked and can retry or try an alternative.
-- This covers all command classes: `pnpm exec werkstatt run ...`, `pnpm --filter <pkg> run build:check`, `astro check`, `git`, `pnpm install`, etc.
-- Site-kernel commands already have internal `timeoutMs`, but the agent-side 6-min budget is a safety net for ALL commands, not just site-kernel.
+- This covers all command classes: `pnpm exec forge ...`, `pnpm --filter <pkg> run build:check`, `astro check`, `git`, `pnpm install`, etc.
+- Project CLI commands may have internal `timeoutMs`, but the agent-side 6-min budget is a safety net for ALL commands, not just project CLI.
 
 ## Binding resolution and degradation
 
@@ -140,8 +140,8 @@ Skills reference bindings by key, never by value. To resolve a binding:
 
 A skill needs to run `rfc.validate` for `RFC-XXXX`:
 
-1. Read `forge.yaml` → `bindings.commands.validateRfc` = `"pnpm exec werkstatt run rfc.validate {id} --json"`
-2. Substitute `{id}` → `"pnpm exec werkstatt run rfc.validate RFC-XXXX --json"`
+1. Read `forge.yaml` → `bindings.commands.validateRfc` = `"forge rfc.validate {id} --json"`
+2. Substitute `{id}` → `"forge rfc.validate RFC-XXXX --json"`
 3. Run the resolved command.
 
 If `bindings.commands.validateRfc` were `null`, the skill would skip the step and report: `Degraded: commands.validateRfc — not configured in forge.yaml`.

package/skills/fo/fo-extract-dna/SKILL.md

@@ -52,7 +52,7 @@ Before proposing any candidate, read `ref(forge.yaml bindings.paths.invariantsFi
 - Which invariants are marked "Foundational invariant (pre-RFC)" vs "Established by RFC-XXXX".
 - Which invariants have been "Reclassified to feature".
 
-Also read the RFC template (`os/rfc/rfc-0000-template.md` inside `@warpgogol/forge`) to understand the `satisfies` field and the "DNA-N established by this RFC" marker pattern.
+Also read the RFC template (`docs/rfcs/rfc-0000-template.md`) to understand the `satisfies` field and the "DNA-N established by this RFC" marker pattern.
 
 ### 3. Discover DNA candidates
 

package/skills/fo/fo-idea-audit/AUDIT-AXES.md

@@ -7,7 +7,7 @@ Load this file when running step 4 of `fo-idea-audit`. For each axis, check ever
 Beyond V-13 (required sections exist) and V-14 (≥3 acceptance items), check that each section contains real content, not template placeholders or empty HTML comments:
 
 - **Decision** is a single decision in present tense ("The kernel gains…"), not a wishlist or "we should".
-- **CLI surface** shows exact `pnpm exec werkstatt run …` invocations with flags and scope.
+- **CLI surface** shows exact project CLI invocations with flags and scope.
 - **TypeScript contracts** are minimal type signatures, not full implementations.
 - **File system responsibilities** table names concrete paths the RFC touches.
 - **Output format** documents the `--json` shape.

package/skills/fo/fo-idea-create-adr/SKILL.md

@@ -54,7 +54,7 @@ If any item is false, use `fo-idea-create-rfc` instead and stop.
 - **title** (required) — short imperative sentence.
 - **scope** — `package`, `app`, or `workspace`. Default `package`.
 - **decider** — default `architecture`. The named decider is the only role that may move the ADR out of `proposed`.
-- **reviewers** — default empty. When the operator has not specified a reviewer, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md` (currently `human:andrii-syrokomskyi`). Set all listed default reviewers.
+- **reviewers** — default empty. When the operator has not specified a reviewer, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md`. Set all listed default reviewers.
 - **related** — any RFCs, ADRs, DNA invariants, or specs this decision relates to.
 
 ### 4. Grill the concept (skip if invoked with an accepted decision)

package/skills/fo/fo-idea-create-rfc/SKILL.md

@@ -52,7 +52,7 @@ Ask the user for, or infer from context:
 - **liveSpec** — for feature-level RFCs (not governance/policy), suggest `liveSpec: true` to auto-derive a living spec domain from `packagesImpacted[0]`, or `liveSpec: <domain>` for an explicit domain. This enables automatic delta-merge into `docs/specs/live/<domain>.md` when the RFC is implemented.
 - **satisfies** — for `architecture` or `contract` RFCs, at least one `DNA-NN` invariant from `ref(forge.yaml bindings.paths.invariantsFile)`.
 - **related** — relevant RFCs, DNA ids, anti-patterns, specs.
-- **reviewer** — if the caller specifies a reviewer identity, use it. If not, default to `human:andrii-syrokomskyi` (matching the default in `os/rfc/rfc-0000-template.md` inside `@warpgogol/forge`) **only when the skill is also responsible for moving the RFC out of draft**. For a pure draft scaffold, leave `reviewers: []`.
+- **reviewer** — if the caller specifies a reviewer identity, use it. If not, read the default reviewer(s) from the `reviewers` field comment in `docs/rfcs/rfc-0000-template.md` **only when the skill is also responsible for moving the RFC out of draft**. For a pure draft scaffold, leave `reviewers: []`.
 
 ### 3. Grill the concept
 
@@ -78,7 +78,7 @@ ref(forge.yaml bindings.commands.validateRfc) --create --title="<title>" --kind=
 
 ### 5. Fill every section
 
-Read the generated file and the full template (`os/rfc/rfc-0000-template.md` inside `@warpgogol/forge`) as a guide. Replace placeholder text in every required section:
+Read the generated file and the full template (`docs/rfcs/rfc-0000-template.md`) as a guide. Replace placeholder text in every required section:
 
 - **Context** — the concrete situation, not a generic preamble.
 - **Problem** — the exact risk or gap this RFC closes.
@@ -129,7 +129,7 @@ Stage only the RFC file — do not stage unrelated changes. Another agent may be
 - Use the **full** RFC template for every RFC. Lightweight local decisions now use ADRs instead.
 - Do not change `status` past `draft`.
 - Do not add self-authorizing language such as "implementation may start before acceptance."
-- Do not default `reviewers` on drafts unless the skill is explicitly performing a status transition and the caller has not supplied a reviewer — in that case use `human:andrii-syrokomskyi`.
+- Do not default `reviewers` on drafts unless the skill is explicitly performing a status transition and the caller has not supplied a reviewer — in that case read the default reviewer(s) from the `reviewers` field comment in `docs/rfcs/rfc-0000-template.md`.
 - Keep `rfc.validate` clean before presenting the draft.
 - **Commit the RFC draft.** The RFC file must be committed after creation and validation — never left in the working tree.
 - **Never manually determine the RFC number.** Always use `rfc.create` (step 4) to assign the number. The RFC number space includes archived RFCs under `docs/rfcs/archive/` — a top-level-only scan of `docs/rfcs/` misses them and produces duplicate IDs. `rfc.create` scans the full tree recursively and picks the correct next number.

package/skills/fo/fo-idea-implement/ADR-FLOW.md

@@ -18,7 +18,7 @@ If the ADR is `proposed` or `reviewing`, transition it to `accepted`:
 
 1. Set `status: accepted` in the frontmatter.
 2. Set `updatedAt: <today's date>`.
-3. If `reviewers` is empty, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md` (currently `human:andrii-syrokomskyi`). Set all listed default reviewers.
+3. If `reviewers` is empty, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md`. Set all listed default reviewers.
 4. Commit:
 
    ```txt
@@ -56,7 +56,7 @@ After implementation is complete, run heavy checks for the impacted workspaces o
 1. ADR validation:
 
    ```sh
-   pnpm exec werkstatt run adr.validate <adr-id> --json
+   ref(forge.yaml bindings.commands.validateAdr)
    ```
 
 2. Determine impacted packages/apps from the ADR's `scope` and the files touched during implementation. Build only those workspaces:

package/skills/fo/fo-idea-implement/SKILL.md

@@ -308,7 +308,7 @@ If the ADR is `proposed` or `reviewing`, transition it to `accepted`:
 
 1. Set `status: accepted` in the frontmatter.
 2. Set `updatedAt: <today's date>`.
-3. If `reviewers` is empty, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md` (currently `human:andrii-syrokomskyi`). Set all listed default reviewers.
+3. If `reviewers` is empty, read the default reviewer(s) from the `reviewers` field comment in `docs/adrs/adr-0000-template.md`. Set all listed default reviewers.
 4. Commit:
 
    ```txt

package/skills/fo/fo-idea-plan/SKILL.md

@@ -60,7 +60,7 @@ If all checks pass, proceed to step 0.3.
 If the RFC is `draft` or `reviewing` and has `enhancedAt` — the user's instruction to plan IS the architecture acceptance. Transition the RFC to `accepted`:
 
 1. Set `status: accepted`.
-2. Set `reviewers` — if the operator specified a reviewer at invocation, use that. Otherwise, read the default reviewer(s) from the `reviewers` field comment in `os/rfc/rfc-0000-template.md` inside `@warpgogol/forge` (currently `human:andrii-syrokomskyi`). Set all listed default reviewers.
+2. Set `reviewers` — if the operator specified a reviewer at invocation, use that. Otherwise, read the default reviewer(s) from the `reviewers` field comment in `docs/rfcs/rfc-0000-template.md`. Set all listed default reviewers.
 3. Set `updatedAt` to today's date.
 4. Commit:
 
@@ -245,5 +245,5 @@ When an RFC was planned in this session, prefer implementing it in this session
 - The plan MUST NOT propose changing DNA invariants without a new superseding RFC.
 - The plan MUST respect RFC-XXXX: only `accepted → implemented` is agent-permitted; all other status transitions are human-only. The `draft → accepted` transition in step 0.3 is an exception authorized by the user's explicit instruction to plan the RFC.
 - The plan MUST reference the RFC's acceptance criteria as the source of truth for completion.
-- **Default reviewer source.** When transitioning `draft → accepted` and the operator has not specified a reviewer, read the default reviewer(s) from the `reviewers` field comment in `os/rfc/rfc-0000-template.md` inside `@warpgogol/forge` (currently `human:andrii-syrokomskyi`). Set all listed default reviewers.
+- **Default reviewer source.** When transitioning `draft → accepted` and the operator has not specified a reviewer, read the default reviewer(s) from the `reviewers` field comment in `docs/rfcs/rfc-0000-template.md`. Set all listed default reviewers.
 - **No pauses for recoverable tool errors.** If a tool call fails with a recoverable error — e.g. `write_to_file` content too long, JSON truncation, line count/character limit exceeded, or similar — do not stop and ask the user. Recover autonomously: split the content into smaller writes, use `edit`/`multi_edit`, decompose oversized files, and retry immediately. The operator's default answer to "Shall I proceed?" is always "yes".

package/skills/fo/fo-step-commit/SKILL.md

@@ -34,8 +34,8 @@ After every standalone operator request that produces file changes, perform the
 2. **Verify diff before staging.** Run `git diff` (not just `git diff --cached`) on every file the agent touched in this request, in each dirty tree. Confirm the changes are the agent's own work and not foreign changes from another session. If foreign changes are found, exclude them from staging.
 3. **Stage only agent-changed files.** Stage only the files the agent modified in this request. Never use `git add -A` or `git add .` — another agent or session may have unrelated changes in the working tree. Stage files by explicit path: `git add <path1> <path2> ...`.
 4. **Form commit message.** Write a conventional commit message (`fix:`, `feat:`, `refactor:`, `docs:`, `chore:`) based on the work performed in this request. The agent determines the type and description from the context of the request.
-5. **Commit in monorepo.** Use `pnpm exec werkstatt run ecosystem.commit --message="<message>"` (NOT raw `git commit`) as required by the canonical commit-discipline contract. Stage files with `git add <paths>` first, then run ecosystem.commit.
-6. **Commit in mission workpiece (if applicable).** If the agent changed files in the active mission workpiece, commit there via `pnpm exec werkstatt run mission.git.commit --mission=<missionId> --message="<message>"` as required by the canonical commit-discipline contract.
+5. **Commit in monorepo.** Use `pnpm exec werkstatt run ecosystem.commit --message "<message>"` to commit in the werkstatt monorepo. This handles platform-scope version bumps and X-Platform-Bump trailers automatically. Stage files with `git add <paths>` first (the pre-commit hook blocks raw `git commit` for platform-scope files). For non-platform-only changes (docs/**), `ecosystem.commit` delegates to a plain `git commit` without version bump.
+6. **Commit in mission workpiece (if applicable).** If the agent changed files in the active mission workpiece, commit there via `git commit` in the workpiece directory.
 7. **Verify clean trees.** After all commits, run `bash scripts/check-clean-trees.sh` again. If any tree is still dirty, report to the operator.
 
 ## What this skill does NOT do

package/src/onboarding/create.ts

@@ -297,7 +297,7 @@ export async function runCreate(
 
   if (initResult.status !== "pass") {
     if (outputFormat === "pretty") {
-      logger.error(`Init failed with ${initResult.errors.length} error(s):`);
+      logger.error(`Init failed with ${initResult.errors.length} error${initResult.errors.length === 1 ? "" : "s"}:`);
       for (const err of initResult.errors.slice(0, 5)) {
         logger.error(`  ${err}`);
       }

package/src/onboarding/doctor.ts

@@ -1136,7 +1136,7 @@ export async function runDoctor(
 
     const parts: string[] = [];
     if (allViolations.length > 0) {
-      parts.push(`${allViolations.length} violation(s)`);
+      parts.push(`${allViolations.length} violation${allViolations.length === 1 ? "" : "s"}`);
       for (const v of allViolations.slice(0, 3)) {
         parts.push(`${v.invariantId}: ${v.file} — ${v.message}`);
       }

package/src/onboarding/init.ts

@@ -1,6 +1,6 @@
 /*
 <MODULE_CONTRACT>
-<purpose>forge.init — deploys forge into a project: creates forge.yaml, PREFERENCES.md, copies skills to .agents/skills/, creates docs directories, copies RFC template. Config-driven via resolveForgeRoot and loadForgeConfig.</purpose>
+<purpose>forge.init — deploys forge into a project: creates forge.yaml, PREFERENCES.md, copies skills to .agents/skills/, creates docs directories, copies RFC and ADR templates. Config-driven via resolveForgeRoot and loadForgeConfig.</purpose>
 <non-goals>
   <item>Do not overwrite existing forge.yaml, PREFERENCES.md, or kernel.config.ts — skip with warning.</item>
   <item>Do not generate AGENTS.md — that is forge.agents.generate's responsibility.</item>
@@ -334,6 +334,35 @@ export function runInit(
     }
   }
 
+  // 5. Copy neutral RFC and ADR templates into the project's docs directories.
+  // Templates are copied from the forge package so new projects can create
+  // RFCs and ADRs without falling back to the forge package's internal copy.
+  // Existing templates are never overwritten.
+  const templatesToCopy = [
+    {
+      src: path.join(forgeRoot, "os", "rfc", "rfc-0000-template.md"),
+      destRel: `${config.paths.rfcsDir}/rfc-0000-template.md`,
+      label: "docs/rfcs/rfc-0000-template.md",
+    },
+    {
+      src: path.join(forgeRoot, "os", "adr", "adr-0000-template.md"),
+      destRel: `${config.paths.adrsDir}/adr-0000-template.md`,
+      label: "docs/adrs/adr-0000-template.md",
+    },
+  ];
+  for (const { src, destRel, label } of templatesToCopy) {
+    const destPath = path.join(workspaceRoot, destRel);
+    if (fs.existsSync(destPath)) {
+      skipped.push(`${label} (already exists)`);
+    } else if (fs.existsSync(src)) {
+      fs.mkdirSync(path.dirname(destPath), { recursive: true });
+      fs.writeFileSync(destPath, fs.readFileSync(src, "utf8"), "utf8");
+      created.push(label);
+    } else {
+      errors.push(`Template source not found: ${src}`);
+    }
+  }
+
   return {
     command: "forge.init",
     status: errors.length === 0 ? "pass" : "fail",

package/src/onboarding/profile-validate.ts

@@ -111,7 +111,7 @@ export async function runProfileValidate(
     for (const p of profileResults) {
       const icon = p.valid ? "✓" : "✖";
       const fn = p.valid ? logger.success : logger.error;
-      fn(`${icon} ${p.id}: ${p.valid ? "valid" : `${p.errors.length} error(s)`}`);
+      fn(`${icon} ${p.id}: ${p.valid ? "valid" : `${p.errors.length} error${p.errors.length === 1 ? "" : "s"}`}`);
       for (const err of p.errors) {
         logger.error(`  - ${err}`);
       }

package/src/utils/fs-trash.ts

@@ -16,9 +16,9 @@ Windows.</purpose>
 */
 
 import { existsSync } from "node:fs";
-import trash from "trash";
 
 export async function trashPath(targetPath: string): Promise<void> {
   if (!existsSync(targetPath)) return;
+  const { default: trash } = await import("trash");
   await trash(targetPath, { glob: false });
 }

package/src/validators/note-frontmatter-validate.ts

@@ -136,7 +136,7 @@ export function runNoteFrontmatterValidate(
     exitCode: violations.length > 0 ? 1 : 0,
     summary:
       violations.length > 0
-        ? `note.frontmatter.validate: ${violations.length} violation(s) found`
+        ? `note.frontmatter.validate: ${violations.length} violation${violations.length === 1 ? "" : "s"} found`
         : "note.frontmatter.validate: OK — 0 violations",
   };
 }

package/src/validators/note-link-validate.ts

@@ -139,7 +139,7 @@ export function runNoteLinkValidate(
     exitCode: violations.length > 0 ? 1 : 0,
     summary:
       violations.length > 0
-        ? `note.link.validate: ${violations.length} violation(s) found`
+        ? `note.link.validate: ${violations.length} violation${violations.length === 1 ? "" : "s"} found`
         : "note.link.validate: OK — 0 violations",
   };
 }