@warpgogol/forge 2.19.0 → 2.21.0

package/README.md

@@ -20,7 +20,7 @@ Replace `[describe your project]` with your idea — a game, a library, a knowle
 
 ## What you can build with Forge
 
-Forge supports four kinds of projects. You pick one when you start — everything else is automatic.
+Forge supports five kinds of projects. You pick one when you start — everything else is automatic.
 
 | Project type | What it is | Example ideas |
 | --- | --- | --- |
@@ -28,6 +28,7 @@ Forge supports four kinds of projects. You pick one when you start — everythin
 | **Governance / library** | A code library or governance-only project — no website, no game, no video, just structure and documentation | npm package, internal toolkit, documentation hub |
 | **Godot game** | A desktop or mobile game built with Godot 4.x and C# — 2D, 3D, platformer, RPG | Top-down adventure, 3D platformer, puzzle game |
 | **Knowledge system** | An evidence-backed knowledge base — structured datasets where claims are backed by registered source provenance | Game knowledge base, domain ontology, curated reference dataset |
+| **TypeScript library** | A generic TypeScript monorepo with best-practice validators — tsconfig, import boundaries, phantom deps, package exports, strict mode, barrel safety | Internal toolkit, shared library, TypeScript monorepo |
 
 Each project type gets its own scaffold: the right folder structure, the right dependencies, the right tools. You don't need to know what any of those are — Forge sets them up for you.
 
@@ -46,6 +47,7 @@ For full project lifecycle management — missions, releases, deployment, certif
 | [`@warpgogol/werkstatt-phaser-game`](https://github.com/syrokomskyi/werkstatt-phaser-game) | Phaser game plugin — phaser validators, Vite build, deploy adapters | Browser game projects (`phaser-turborepo`) |
 | [`@warpgogol/werkstatt-godot-game`](https://github.com/syrokomskyi/werkstatt-godot-game) | Godot plugin — scene validators, dotnet build, itch.io deploy, Godot skills | Godot game projects (`godot-csharp`) |
 | [`@warpgogol/werkstatt-knowledge`](https://github.com/syrokomskyi/werkstatt-knowledge) | Knowledge plugin — source binding, canonical verification, extraction, materialization, release checks | Knowledge system projects (`knowledge-typescript-turborepo`) |
+| [`@warpgogol/werkstatt-typescript`](https://github.com/syrokomskyi/werkstatt-typescript) | TypeScript plugin — tsconfig, import boundaries, phantom deps, package exports, strict mode, barrel validators | TypeScript TurboRepo projects (`typescript-turborepo`) |
 
 ### When you need these packages
 
@@ -65,6 +67,11 @@ pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-godot-game
 pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-knowledge
 ```
 
+```sh
+# TypeScript TurboRepo project
+pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-typescript
+```
+
 > **Note for agents:** When scaffolding a new project with `forge create`, always install the engine and matching stack plugin after the scaffold completes. The `forge.yaml` bindings reference commands from these packages (e.g. `pnpm exec werkstatt run rfc.validate`), and they will fail if the packages are not installed.
 
 ---
@@ -217,6 +224,7 @@ You need to run one command in the terminal to create your project. After that,
    | Browser game (2D, arcade, puzzle)   | `--profile phaser-turborepo`               |
    | Godot game (desktop, mobile, 2D/3D) | `--profile godot-csharp`                   |
    | Knowledge system (evidence-backed)  | `--profile knowledge-typescript-turborepo` |
+   | TypeScript library (monorepo)       | `--profile typescript-turborepo`           |
    | Library or governance-only project  | `--profile forge-shell`                    |
 
 2. **Open the project folder in your AI IDE.** Open the folder from step 1 in Windsurf or your preferred IDE.
@@ -297,6 +305,9 @@ pnpm dlx @warpgogol/forge@latest create --in-place --profile godot-csharp
 mkdir my-knowledge-base && cd my-knowledge-base
 pnpm dlx @warpgogol/forge@latest create --in-place --profile knowledge-typescript-turborepo
 
+mkdir my-ts-project && cd my-ts-project
+pnpm dlx @warpgogol/forge@latest create --in-place --profile typescript-turborepo
+
 # Override the project name (derived from folder name by default)
 pnpm dlx @warpgogol/forge@latest create --in-place --profile forge-shell --name my-custom-name
 ```
@@ -346,6 +357,7 @@ A stack profile defines the project scaffold: directory structure, dependencies,
 | `phaser-turborepo` | Browser game | Phaser + TypeScript + pnpm + Turborepo | `games/my-game` | Browser games, interactive experiences |
 | `godot-csharp` | Godot game | Godot 4.x + C# + pnpm + Turborepo | `games/my-game` | Desktop/mobile games, Godot-based interactive projects |
 | `knowledge-typescript-turborepo` | Knowledge system | TypeScript + pnpm + Turborepo | `knowledge/my-kb` | Evidence-backed knowledge bases, structured datasets with source provenance |
+| `typescript-turborepo` | TypeScript library | TypeScript + pnpm + Turborepo | — | Generic TypeScript TurboRepo monorepo with best-practice validators |
 
 ```sh
 # List available profiles (after install)

package/README.uk.md

@@ -20,7 +20,7 @@ Install https://npmjs.com/package/@warpgogol/forge in this folder and set up my
 
 ## Що можна створити за допомогою Forge
 
-Forge підтримує чотири типи проєктів. Ви обираєте один на старті — все інше відбувається автоматично.
+Forge підтримує п'ять типів проєктів. Ви обираєте один на старті — все інше відбувається автоматично.
 
 | Тип проєкту | Що це | Приклади |
 | --- | --- | --- |
@@ -28,6 +28,7 @@ Forge підтримує чотири типи проєктів. Ви обира
 | **Управління / бібліотека** | Бібліотека коду або проєкт лише з управлінською структурою — без сайту, без гри, без відео, лише структура та документація | npm-пакет, внутрішній інструмент, центр документації |
 | **Гра Godot** | Десктопна або мобільна гра на Godot 4.x з C# — 2D, 3D, платформер, RPG | Пригода з виглядом зверху, 3D-платформер, головоломка |
 | **Система знань** | База знань з підтримкою доказів — структуровані набори даних, де твердження підтверджені зареєстрованими джерелами | База знань гри, доменна онтологія, куратований довідковий набір даних |
+| **Бібліотека TypeScript** | Універсальний TypeScript монорепозиторій з валідаторами найкращих практик — tsconfig, межі імпортів, фантомні залежності, експорти пакетів, strict mode, безпека barrel-експортів | Внутрішній інструмент, спільна бібліотека, TypeScript монорепозиторій |
 
 Кожен тип проєкту отримує власний каркас: правильну структуру папок, правильні залежності, правильні інструменти. Вам не потрібно знати, що це таке — Forge налаштує все за вас.
 
@@ -46,6 +47,7 @@ Forge — це **шар управління**: навички, RFC/ADR робо
 | [`@warpgogol/werkstatt-phaser-game`](https://github.com/syrokomskyi/werkstatt-phaser-game) | Плагін Phaser-гри — валідатори phaser, збірка Vite, адаптери розгортання | Проєкти браузерних ігор (`phaser-turborepo`) |
 | [`@warpgogol/werkstatt-godot-game`](https://github.com/syrokomskyi/werkstatt-godot-game) | Плагін Godot — валідатори сцен, збірка dotnet, розгортання itch.io, навички Godot | Проєкти ігор Godot (`godot-csharp`) |
 | [`@warpgogol/werkstatt-knowledge`](https://github.com/syrokomskyi/werkstatt-knowledge) | Плагін системи знань — прив'язка джерел, канонічна верифікація, екстракція, матеріалізація, перевірки релізу | Проєкти систем знань (`knowledge-typescript-turborepo`) |
+| [`@warpgogol/werkstatt-typescript`](https://github.com/syrokomskyi/werkstatt-typescript) | Плагін TypeScript — tsconfig, межі імпортів, фантомні залежності, експорти пакетів, strict mode, barrel-валідатори | Проєкти TypeScript TurboRepo (`typescript-turborepo`) |
 
 ### Коли потрібні ці пакети
 
@@ -63,6 +65,9 @@ pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-godot-game
 
 # Проєкт системи знань
 pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-knowledge
+
+# Проєкт TypeScript TurboRepo
+pnpm add -D @warpgogol/werkstatt @warpgogol/werkstatt-typescript
 ```
 
 > **Примітка для агентів:** Після створення проєкту командою `forge create` завжди встановлюйте рушій та відповідний плагін стеку. Прив'язки в `forge.yaml` посилаються на команди з цих пакунків (напр. `pnpm exec werkstatt run rfc.validate`), і вони не працюватимуть, якщо пакунки не встановлені.
@@ -343,6 +348,7 @@ pnpm exec forge skill.list
 | `phaser-turborepo` | Браузерна гра | Phaser + TypeScript + pnpm + Turborepo | `games/my-game` | Браузерні ігри, інтерактивні досвіди |
 | `godot-csharp` | Гра Godot | Godot 4.x + C# + pnpm + Turborepo | `games/my-game` | Десктопні/мобільні ігри, інтерактивні проєкти на Godot |
 | `knowledge-typescript-turborepo` | Система знань | TypeScript + pnpm + Turborepo | `knowledge/my-kb` | Бази знань з підтримкою доказів, структуровані набори даних з джерельною простежуваністю |
+| `typescript-turborepo` | Бібліотека TypeScript | TypeScript + pnpm + Turborepo | — | Універсальний TypeScript TurboRepo монорепозиторій з валідаторами найкращих практик |
 
 ```sh
 # Список доступних профілів (після встановлення)

package/os/adr/adr.module.ts

@@ -87,6 +87,8 @@ export const forgeAdrModule: ForgeModule = {
 
     registry.registerCommand({
       name: "adr.validate",
+      contract: "adr",
+      rules: [],
       description:
         "Validate ADR frontmatter schema, required markdown sections, " +
         "referential integrity (supersedes/supersededBy), and id/filename consistency. " +

package/os/compass/compass.module.ts

@@ -62,6 +62,8 @@ export const forgeCompassModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "compass.validate",
+      contract: "compass",
+      rules: [],
       description:
         "Validate authored source files against current Compass scaffolding requirements.",
       scope: "workspace",
@@ -77,6 +79,8 @@ export const forgeCompassModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "compass.changesummary.validate",
+      contract: "compass",
+      rules: [],
       description:
         "Validate CHANGE_SUMMARY blocks for boilerplate items and over-cap unprotected items (RFC-0349).",
       scope: "workspace",
@@ -171,6 +175,8 @@ export const forgeCompassModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "compass.audit.validate",
+      contract: "compass",
+      rules: [],
       description:
         "Validate that no authored file is audit-overdue per the revision threshold (RFC-0352). Warns by default, fails with --strict.",
       scope: "workspace",

package/os/core/core.module.ts

@@ -190,6 +190,8 @@ export const forgeCoreModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "forge.skill.validate",
+      contract: "forge",
+      rules: [],
       description:
         "Validate all forge skills against frontmatter contract and invariants SKILL-01..SKILL-20.",
       scope: "workspace",
@@ -209,6 +211,8 @@ export const forgeCoreModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "forge.port.validate",
+      contract: "forge",
+      rules: [],
       description: "Validate a single ported skill or command for compliance with forge contracts.",
       scope: "workspace",
       supportsAllSites: false,
@@ -296,7 +300,7 @@ export const forgeCoreModule: ForgeModule = {
           kind: "string",
           required: true,
           description:
-            "Stack profile id. Required. Available: forge-shell, phaser-turborepo, godot-csharp.",
+            "Stack profile id. Required. Available: forge-shell, phaser-turborepo, godot-csharp, knowledge-typescript-turborepo, typescript-turborepo.",
         },
         name: {
           kind: "string",
@@ -374,6 +378,8 @@ export const forgeCoreModule: ForgeModule = {
     };
     registry.registerCommand({
       name: "forge.profile.validate",
+      contract: "forge",
+      rules: [],
       description:
         "Validate profile YAML files under packages/forge/profiles/ against the stack-profile schema (RFC-0640).",
       scope: "workspace",
@@ -437,6 +443,8 @@ export const forgeCoreModule: ForgeModule = {
     // ── forge.validate (RFC-0674, RFC-0677) ───────────────────────────────────
     registry.registerCommand({
       name: "forge.validate",
+      contract: "forge",
+      rules: [],
       description:
         "Execute validate commands for all artifacts declared in the active stack profile. Use --dry-run to print resolved commands. Use --artifact to validate a single artifact.",
       scope: "workspace",
@@ -464,6 +472,8 @@ export const forgeCoreModule: ForgeModule = {
     const { runDeterminismCheck } = await import("./handlers/determinism-check.ts");
     registry.registerCommand({
       name: "forge.determinism.check",
+      contract: "forge",
+      rules: [],
       description:
         "Verify artifact determinism by building twice and comparing output hashes. Reads determinism.inputs glob patterns from the active stack profile. Use --dry-run to print resolved inputs, --artifact to check a single artifact.",
       scope: "workspace",
@@ -519,6 +529,8 @@ export const forgeCoreModule: ForgeModule = {
     const { runAssetsCheck } = await import("./handlers/assets-check.ts");
     registry.registerCommand({
       name: "forge.assets.check",
+      contract: "forge",
+      rules: [],
       description:
         "Check for missing, orphaned, and unreferenced assets. Use --strict to fail on orphaned assets, --dry-run to skip hashing.",
       scope: "workspace",
@@ -641,6 +653,8 @@ export const forgeCoreModule: ForgeModule = {
     // ── pinned.validate ─────────────────────────────────────────────────────
     registry.registerCommand({
       name: "pinned.validate",
+      contract: "pinned",
+      rules: [],
       description:
         "Validate working tree against .forge/pinned.yaml manifest. " +
         "Checks staged changes (default) or last commit (--mode ci) for " +
@@ -726,6 +740,8 @@ export const forgeCoreModule: ForgeModule = {
     const { runForgeAutonomyValidate } = await import("./handlers/forge-autonomy-validate.ts");
     registry.registerCommand({
       name: "forge.autonomy.validate",
+      contract: "forge",
+      rules: [],
       description:
         "Scan packages/forge/os/** for forbidden @warpgogol/werkstatt-engine imports outside os/werkstatt/. " +
         "Enforces FORGE-AUTONOMY-01 (RFC-0940, DNA-64). @warpgogol/werkstatt-shared is exempt. " +

package/os/naming/naming.module.ts

@@ -20,6 +20,8 @@ export const forgeNamingModule: ForgeModule = {
     const { runNamingConventionLint } = await import("./naming-convention.ts");
     registry.registerCommand({
       name: "naming.convention.lint",
+      contract: "naming",
+      rules: [],
       description:
         "Validate all filenames use kebab-case (no underscores) across registered workspace roots.",
       scope: "workspace",

package/os/notes/notes.module.ts

@@ -50,6 +50,8 @@ export const forgeNotesModule: ForgeModule = {
 
     registry.registerCommand({
       name: "note.link.validate",
+      contract: "note",
+      rules: [],
       description:
         "Validate wikilink integrity across a markdown note vault. Scans [[wikilinks]] and resolves each against the note graph.",
       scope: "workspace",
@@ -71,6 +73,8 @@ export const forgeNotesModule: ForgeModule = {
 
     registry.registerCommand({
       name: "note.frontmatter.validate",
+      contract: "note",
+      rules: [],
       description:
         "Validate frontmatter consistency across a markdown note vault. Checks for required fields in YAML frontmatter.",
       scope: "workspace",

package/os/plugin/plugin.module.ts

@@ -236,6 +236,8 @@ export const forgePluginModule: ForgeModule = {
   async register(registry) {
     registry.registerCommand({
       name: "forge.plugin.validate",
+      contract: "forge",
+      rules: [],
       description:
         "Validate forge.plugin.yaml manifests for all declared skill packs (RFC-0941). Checks manifest schema (id: kebab-case, version: semver) and reports missing or invalid manifests.",
       scope: "workspace",

package/os/program/program.module.ts

@@ -26,6 +26,8 @@ export const forgeProgramModule: ForgeModule = {
 
     registry.registerCommand({
       name: "program.packet.validate",
+      contract: "program",
+      rules: [],
       description:
         "Validate a program packet against schema, source hashes, branch/head, " +
         "and state machine rules. Read-only. " +

package/os/rfc/acceptance.ts

@@ -158,7 +158,7 @@ async function spawnSiteKernel(
     .trim()
     .split(/\s+/)
     .filter(Boolean);
-  const binPath = path.join(workspaceRoot, "packages", "werkstatt", "bin", "werkstatt.mjs");
+  const binPath = path.join(workspaceRoot, "packages", "werkstatt-engine", "bin", "werkstatt.mjs");
 
   return new Promise((resolve) => {
     const child = spawn(process.execPath, [binPath, ...args], {

package/os/rfc/rfc.module.ts

@@ -114,6 +114,8 @@ export const forgeRfcModule: ForgeModule = {
     // ── rfc.validate ─────────────────────────────────────────────────────────
     registry.registerCommand({
       name: "rfc.validate",
+      contract: "rfc",
+      rules: [],
       description:
         "Validate RFC frontmatter schema, required markdown sections, " +
         "referential integrity (supersedes/supersededBy), date consistency, " +
@@ -130,6 +132,8 @@ export const forgeRfcModule: ForgeModule = {
     // ── rfc.command-lifecycle.validate ───────────────────────────────────────
     registry.registerCommand({
       name: "rfc.command-lifecycle.validate",
+      contract: "rfc",
+      rules: [],
       description:
         "Validate RFC commands.proposed/added/changed/removed lifecycle metadata " +
         "against live registered commands. Emits RFC-CMD-* diagnostics.",
@@ -145,6 +149,8 @@ export const forgeRfcModule: ForgeModule = {
     // ── rfc.check ────────────────────────────────────────────────────────────
     registry.registerCommand({
       name: "rfc.check",
+      contract: "rfc",
+      rules: [],
       description:
         "Validate that artifacts declared by accepted/implemented RFCs exist on disk. " +
         "Checks files from 'File system responsibilities' tables and feature flag references. " +
@@ -184,6 +190,8 @@ export const forgeRfcModule: ForgeModule = {
     // ── rfc.index.validate ───────────────────────────────────────────────────
     registry.registerCommand({
       name: "rfc.index.validate",
+      contract: "rfc",
+      rules: [],
       description:
         "Validate that docs/rfcs/index.yaml exists, is parseable, and its entry count " +
         "matches the number of RFC files on disk. Reports RFC-IDX-01 (missing), " +
@@ -254,6 +262,8 @@ export const forgeRfcModule: ForgeModule = {
     // ── rfc.dna.trace.validate ───────────────────────────────────────────────
     registry.registerCommand({
       name: "rfc.dna.trace.validate",
+      contract: "rfc",
+      rules: [],
       description:
         "RFC-0331: validate the bidirectional DNA-trace matrix — which RFCs satisfy each DNA " +
         "invariant and which invariants each RFC claims to satisfy. Reports DNA-TRACE-01 " +

package/os/session/session.module.ts

@@ -80,6 +80,8 @@ export const forgeSessionModule: ForgeModule = {
 
     registry.registerCommand({
       name: "session.validate",
+      contract: "session",
+      rules: [],
       description:
         "Validate session frontmatter schema (SES-01), id-filename match (SES-02), " +
         "RFC-id existence (SES-03), raw file hygiene (SES-04), and non-markdown " +

package/os/spec/live-spec-merge.test.ts

@@ -157,6 +157,50 @@ nonGoals: []
 Content.
 `;
 
+const SAMPLE_RFC_9004 = `---
+id: RFC-9004
+title: "Second RFC with same headings"
+status: implemented
+kind: architecture
+scope: workspace
+owners:
+  - architecture
+reviewers:
+  - human:test
+createdAt: 2026-08-06
+updatedAt: 2026-08-06
+implementedAt: 2026-08-06
+versionBump: patch
+liveSpec: true
+packagesImpacted:
+  - packages/forge
+commands:
+  proposed: []
+  added: []
+  changed: []
+  removed: []
+appsImpacted: []
+successSignals: []
+nonGoals: []
+---
+
+# RFC-9004: Second RFC with same headings
+
+## Design
+
+### CLI surface
+
+Different CLI content from RFC-9004.
+
+### TypeScript contracts
+
+Different types from RFC-9004.
+
+## Rollout
+
+Some rollout.
+`;
+
 async function setupWorkspace(): Promise<string> {
   const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "spec-live-test-"));
   const rfcDir = path.join(tmpDir, "docs/rfcs");
@@ -164,6 +208,7 @@ async function setupWorkspace(): Promise<string> {
   await fs.writeFile(path.join(rfcDir, "rfc-9001-test-rfc-for-living-specs.md"), SAMPLE_RFC);
   await fs.writeFile(path.join(rfcDir, "rfc-9002-test-rfc-without-livespec.md"), SAMPLE_RFC_NO_LIVE_SPEC);
   await fs.writeFile(path.join(rfcDir, "rfc-9003-rejected-rfc-with-livespec.md"), SAMPLE_RFC_REJECTED);
+  await fs.writeFile(path.join(rfcDir, "rfc-9004-second-rfc-with-same-headings.md"), SAMPLE_RFC_9004);
   return tmpDir;
 }
 
@@ -258,4 +303,35 @@ describe("spec.live.merge", () => {
     expect(result.exitCode).toBe(1);
     expect(result.summary).toContain("not found");
   });
+
+  it("namespaces headings by RFC ID and allows multiple RFCs with same heading names", async () => {
+    // First merge creates the spec with RFC-9001 headings
+    const input1: ForgeCommandInput = { argv: [], flags: { id: "RFC-9001" } };
+    await runSpecLiveMerge(input1, makeContext(tmpDir));
+
+    // Second merge with RFC-9004 (same heading names) should NOT conflict
+    const input2: ForgeCommandInput = { argv: [], flags: { id: "RFC-9004" } };
+    const result = await runSpecLiveMerge(input2, makeContext(tmpDir));
+
+    expect(result.exitCode).toBe(0);
+    expect(result.data?.conflicts.length).toBe(0);
+    expect(result.data?.deltas.length).toBeGreaterThan(0);
+
+    const specFile = path.join(tmpDir, "docs/specs/live/forge.md");
+    const content = await fs.readFile(specFile, "utf-8");
+    expect(content).toContain("CLI surface (RFC-9001)");
+    expect(content).toContain("CLI surface (RFC-9004)");
+  });
+
+  it("re-merges namespaced headings without conflicts on subsequent docs.archive runs", async () => {
+    // Initial merges
+    await runSpecLiveMerge({ argv: [], flags: { id: "RFC-9001" } }, makeContext(tmpDir));
+    await runSpecLiveMerge({ argv: [], flags: { id: "RFC-9004" } }, makeContext(tmpDir));
+
+    // Re-merge RFC-9001 (simulates docs.archive re-running all merges)
+    const result = await runSpecLiveMerge({ argv: [], flags: { id: "RFC-9001" } }, makeContext(tmpDir));
+
+    expect(result.exitCode).toBe(0);
+    expect(result.data?.conflicts.length).toBe(0);
+  });
 });

package/os/spec/live-spec-merge.ts

@@ -1,15 +1,16 @@
 /*
 <MODULE_CONTRACT>
 <purpose>spec.live.merge handler — extracts deltas from an RFC's ## Design section,
-classifies them as ADDED/MODIFIED/REMOVED, applies to a living spec, handles conflicts
-with all-or-nothing semantics, and writes atomically (RFC-0711).</purpose>
+classifies them as ADDED/MODIFIED/REMOVED, applies to a living spec with RFC-namespaced
+headings, and writes atomically (RFC-0711).</purpose>
 <non-goals>
   <item>Do not handle docs.archive integration — that is in core.module.ts.</item>
   <item>Do not validate living specs — that is spec.live.validate.</item>
 </non-goals>
 </MODULE_CONTRACT>
 <CHANGE_SUMMARY>
-  <item>RFC-0711: initial spec.live.merge handler with delta extraction, classification, conflict detection, and atomic writes.</item>
+  <item>RFC-0711: initial spec.live.merge handler with delta extraction, classification, and atomic writes.</item>
+  <item>RFC-0957: namespace headings by RFC ID, remove conflict detection (structurally impossible with namespacing).</item>
 </CHANGE_SUMMARY>
 */
 
@@ -29,7 +30,6 @@ import type {
   LivingSpec,
   LivingSpecHistoryEntry,
   DeltaOperation,
-  DeltaConflict,
   SpecLiveMergeResult,
 } from "./live-spec-types.ts";
 
@@ -162,6 +162,13 @@ function escapeRegex(str: string): string {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
+function namespaceHeadings(content: string, rfcId: string): string {
+  return content.replace(/^(#{3,})\s+(.+)$/gm, (_match, hashes: string, text: string) => {
+    if (/\(RFC-\d{4}\)$/.test(text)) return `${hashes} ${text}`;
+    return `${hashes} ${text} (${rfcId})`;
+  });
+}
+
 function findRfcFile(rfcDir: string, rfcId: string): Promise<string | null> {
   return (async () => {
     const files = await listRfcFiles(rfcDir);
@@ -252,8 +259,8 @@ export async function runSpecLiveMerge(
     };
   }
 
-  const designSection = extractDesignSection(parsed.body);
-  if (!designSection) {
+  const rawDesignSection = extractDesignSection(parsed.body);
+  if (!rawDesignSection) {
     return {
       data: {
         command: "spec.live.merge",
@@ -268,6 +275,7 @@ export async function runSpecLiveMerge(
     };
   }
 
+  const designSection = namespaceHeadings(rawDesignSection, rfcId);
   const rfcHeadings = parseHeadings(designSection);
   const liveSpecsDir = path.join(workspaceRoot, LIVE_SPECS_DIR);
   const specFilePath = path.join(liveSpecsDir, `${domain}.md`);
@@ -279,7 +287,6 @@ export async function runSpecLiveMerge(
   }
 
   const operations: DeltaOperation[] = [];
-  const conflicts: DeltaConflict[] = [];
   const today = new Date().toISOString().slice(0, 10);
 
   if (!existingSpec) {
@@ -329,54 +336,12 @@ export async function runSpecLiveMerge(
   for (const heading of rfcHeadings) {
     const existing = findHeadingInSpec(existingSpec, heading.text);
     if (existing) {
-      let lastRfc: string | undefined;
-      for (let i = existingSpec.history.length - 1; i >= 0; i--) {
-        const entry = existingSpec.history[i]!;
-        if (entry.operation !== "removed") {
-          lastRfc = entry.rfc;
-          break;
-        }
-      }
-      if (lastRfc && lastRfc !== rfcId) {
-        conflicts.push({
-          heading: heading.text,
-          existingRfc: lastRfc,
-          newRfc: rfcId,
-          resolution: "pending",
-        });
-      }
       operations.push({ type: "modified", heading: heading.text, rfc: rfcId });
     } else {
       operations.push({ type: "added", heading: heading.text, rfc: rfcId });
     }
   }
 
-  if (conflicts.length > 0) {
-    const result: SpecLiveMergeResult = {
-      command: "spec.live.merge",
-      domain,
-      operation: "modified",
-      deltas: operations,
-      conflicts,
-      dryRun,
-    };
-
-    if (outputFormat === "pretty") {
-      logger.error(
-        `spec.live.merge: ${conflicts.length} conflict(s) detected — merge aborted (all-or-nothing)`,
-      );
-      for (const c of conflicts) {
-        logger.error(`  conflict: heading "${c.heading}" last modified by ${c.existingRfc}, now ${c.newRfc}`);
-      }
-    }
-
-    return {
-      data: result,
-      exitCode: 1,
-      summary: `spec.live.merge: ${conflicts.length} conflict(s) — merge aborted`,
-    };
-  }
-
   const updatedBody = applyDeltasToSpecBody(existingSpec.body, rfcHeadings, operations);
 
   const updatedSpec: LivingSpec = {

package/os/spec/spec.module.ts

@@ -29,6 +29,8 @@ export const forgeSpecModule: ForgeModule = {
 
     registry.registerCommand({
       name: "spec.validate",
+      contract: "spec",
+      rules: [],
       description:
         "Validate vendored spec packages under docs/specs/. " +
         "Checks integrity (SHA-256), schema, dependency graph (acyclic), " +
@@ -123,6 +125,8 @@ export const forgeSpecModule: ForgeModule = {
 
     registry.registerCommand({
       name: "spec.live.validate",
+      contract: "spec",
+      rules: [],
       description:
         "Validate all living feature specs in docs/specs/live/. " +
         "Checks V-LS-01 (frontmatter), V-LS-02 (domain/filename match), " +

package/os/werkstatt/werkstatt.module.ts

@@ -51,6 +51,8 @@ export const forgeWerkstattModule: ForgeModule = {
     });
     registry.registerCommand({
       name: "werkstatt.operation.validate",
+      contract: "werkstatt",
+      rules: [],
       description:
         "Validate that mutating Werkstatt commands use shared lock/idempotency/atomic-write helpers (RFC-0362).",
       scope: "workspace",

package/os/workflow/workflow.module.ts

@@ -22,6 +22,8 @@ export const forgeWorkflowModule: ForgeModule = {
       await import("./handlers.ts");
     registry.registerCommand({
       name: "workflow.lint",
+      contract: "workflow",
+      rules: [],
       description:
         "Validate .agents/workflows AND .agents/workflows-amend markdown frontmatter, command references, " +
         "and per-chain phase links (RFC-0075 + RFC-0136).",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warpgogol/forge",
-  "version": "2.19.0",
+  "version": "2.21.0",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",

package/profiles/godot-csharp.yaml

@@ -81,7 +81,7 @@ prerequisites:
 workspaceTypes:
   - id: game
     detect:
-      glob: "project.godot"
+      glob: project.godot
     skills:
       - godot-feature
       - godot-scene-review
@@ -93,13 +93,13 @@ invariants:
     check:
       kind: filename-pattern
       glob: "**/*.tscn"
-      pattern: "^Scenes/"
+      pattern: ^Scenes/
   - id: GODOT-02
     rule: The .godot/ directory must not be committed to git
     severity: error
     check:
       kind: gitignore-entry
-      pattern: ".godot/"
+      pattern: .godot/
   - id: GODOT-03
     rule: No hardcoded API keys or secrets in C# source files
     severity: error
@@ -111,7 +111,7 @@ invariants:
     severity: warning
     check:
       kind: file-contains
-      glob: "project.godot"
+      glob: project.godot
       pattern: ""
 workspace:
   dirs: