@friedbotstudio/create-baseline 0.3.0 → 0.4.0

package/obj/template/manifest.json

@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "generated_at": "2026-05-17T19:24:12.190Z",
+  "generated_at": "2026-05-18T19:07:49.408Z",
   "files": {
     ".claude/agents/swarm-worker.md": "1735a220f268c9765cb22e0567b728803f2edd7776cbde51dd017a9f062ae41f",
     ".claude/bin/LICENSE": "a8dcf2775ab71a58c7d4cc935e3a8e9974e87bb7d6082ee25ef52f8140be8e07",
@@ -65,6 +65,19 @@
     ".claude/skills/audit-baseline/tests/preamble_check_test.sh": "73239378e51528c37f7843ff540ddfed2cd0ee1b8259589bc7cdaefd71424d95",
     ".claude/skills/brd/SKILL.md": "260e5d18396de21b6842ad0bc5fe74b0e124f3c2e2a4ac2867eeb543c7c2c0a3",
     ".claude/skills/brd/template.md": "be4095b4bed70fcebc821ad92b0217db4fee1afb9a341a9e704d2c1869ec6f43",
+    ".claude/skills/changelog/SKILL.md": "2a305b04be3fb44dd9766fae0344725600c2269276d5fe9496d068cebcc4969c",
+    ".claude/skills/changelog/changelog.mjs": "662ae8142ea55c70375e45d874f97b40bcb85b0d6e5378393be56aba1b254eee",
+    ".claude/skills/changelog/classifier.mjs": "e17cd4dacb48b5ebf3addd2f651e8e2465c10aa51958c11c9272faff32e379f2",
+    ".claude/skills/changelog/state-writer.mjs": "a773f14eb1d7d990f64eb54f70720451db279954ea5cbd025ca15f1a8d39449d",
+    ".claude/skills/changelog/tests/consent-expired_test.sh": "60351d32cb544af33a6929f898411e43d20ec258f620ebc08179754a74811cf1",
+    ".claude/skills/changelog/tests/golden-path_test.sh": "1ef7cdaae2dbeea25f7165b182e4b2cc80e69f3cc918089552145421fcc35d26",
+    ".claude/skills/changelog/tests/idempotent-reentry_test.sh": "af11b08744ab3743989f9ae8017b6f01a32373971f072c233ce28741783f5de0",
+    ".claude/skills/changelog/tests/keepachangelog-unreleased-preserved_test.mjs": "981e1831893449667b1460b13b9ef9275cc3bd23b22cd6a3cfa3d56d239ed0ad",
+    ".claude/skills/changelog/tests/non-git-shortcircuit_test.sh": "ec5760c8790a3cd5cb21e93bd1742a4f30115f0e4e4829a8f765fecb4ddba5f4",
+    ".claude/skills/changelog/tests/preview-only_test.sh": "b30a6c4b94a1cb87596af317f460c57c62ecde257dcd81447932564ce9e542d2",
+    ".claude/skills/changelog/tests/run.sh": "55ba1d59d67f3e43b07fae08a7059c4e04cfe963a09a2367528d509e748f3116",
+    ".claude/skills/changelog/unreleased-writer.mjs": "a03d9080317e2fc9c4895b7b8c68efc2ab90497a9265091f5981859cda3d6885",
+    ".claude/skills/changelog/version-preview.mjs": "3843093b08b5407012e53d601fa6d3d4d3ddc04ae4911d0e5ad015622585c67f",
     ".claude/skills/chore/SKILL.md": "3479c4ef4c7706928b54ed89678c3526c790e2aeb629674bd60e5a9e4b90d80d",
     ".claude/skills/claude-automation-recommender/LICENSE": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30",
     ".claude/skills/claude-automation-recommender/NOTICE": "2076093d5af61a10b585562e3b40fd76ce178c56e5eebde93efdc08b3c6bb81a",
@@ -75,7 +88,7 @@
     ".claude/skills/claude-automation-recommender/references/skills-reference.md": "b4b57d953526a07146d5757ca5332034b9b4b4eeba839e4bb08111398c94556f",
     ".claude/skills/claude-automation-recommender/references/subagent-templates.md": "7f9a107d8619ff96fea07d5a17da31b269cec0ee343e5a9ff643c0d6cb4ba944",
     ".claude/skills/code-structure/SKILL.md": "4fa79beb83f9171e973cd2373af12f007aeaf95d156edf3a8e7cf3e9c2c22ace",
-    ".claude/skills/commit/SKILL.md": "27efe44a50096be2a00e6ee2e7e4d7b158b3f0e8ed3bf18d65d5f03c02d0f8d1",
+    ".claude/skills/commit/SKILL.md": "7f22653ae6832a5fc5631774f78d3feabe47c5b21c5925ae8a77e656bbac1b9c",
     ".claude/skills/copywriting/LICENSE": "3d015bf779e8f6f4b9366e0862c0d560aa60979bbe8d90426cede05528dc5390",
     ".claude/skills/copywriting/NOTICE": "ffd65b16660e4e9cbf42c5ff9bdf67b482815ebedfb515bedb65c6eb54930a15",
     ".claude/skills/copywriting/SKILL.md": "4631aae3a65204a1dac89fbe7606481b867b30ae3f64482d337c1e6bd5b4c902",
@@ -108,7 +121,7 @@
     ".claude/skills/google-analytics/references/reporting.md": "37cb7cfd1dd547e86a41664ffe13893ef138194a2288d1a2c43c9195e8ec609f",
     ".claude/skills/google-analytics/references/setup.md": "26743b72341a5658e73c1f070b924de0f11b1681af06164cb13c19f2047a1087",
     ".claude/skills/google-analytics/references/user-tracking.md": "5a945df2a575291c6b35d24830b497915c82a843a93ee133577f1deda93f6d75",
-    ".claude/skills/harness/SKILL.md": "84c4498e51b9e1c098ddaa99e7b150ab015b8e5c341a2e57300dbafe812acf4d",
+    ".claude/skills/harness/SKILL.md": "af7cf374013d881d216462ccba353747e1727f670bd9b1c45b089ffde247d67a",
     ".claude/skills/humanizer/LICENSE": "5dd2bb7cb6b254edd93a87718efbfef8b81c8ef90e3f9180f06723683d7733a3",
     ".claude/skills/humanizer/NOTICE": "5bdb69381ab078e7fbb5fb910f10253baa6fe9dabb88143c6f613959e131cbb3",
     ".claude/skills/humanizer/SKILL.md": "398beef0cabe34df435972a13fb9ef21be74d942f93321b220a5dd393d554e40",
@@ -211,17 +224,18 @@
     ".claude/skills/technical-tutorials/references/audience-context.md": "7e00189e72d7a87a0cf59f8302aa4adad26222d3bbd14ddb498515f137a32775",
     ".claude/skills/technical-tutorials/references/audience-example.md": "610f559f691de5169f672e8f69b72fd44790e5e3f894cebb7e644c3331db419c",
     ".claude/skills/technical-tutorials/references/audience-template.md": "9e8da0e05544df3961d75fb3a7b1d6374b6a1c129ac2fc9862dc111b5a75e433",
-    ".claude/skills/triage/SKILL.md": "9416c9de58e3dbf8c3bcac4d6e258c9a8e9c38083bd75a35937eaae16b82b0db",
+    ".claude/skills/triage/SKILL.md": "499f82a26d77c60af827dd89a7fcb3eae0cd903e34c70740c297bc260aeed38e",
     ".claude/skills/verify/SKILL.md": "fcddba67cf7f3623fc8f8ae142303b16b9db0c9fc1652bc920e16c56fe4c7864",
     ".mcp.json": "8ebb7966045486187bbdf9bac643e690c4fbc7a9a70a8345e3665ba72fa19b96",
-    "CLAUDE.md": "27d7cd145d1ba2a1b9dcc006e0ff3faa1af6c1a92f7d935c4a7eafa87accefc4",
-    "docs/init/seed.md": "437a05e448f639f5214edda0dc155d9e2f7b5e88b2866333e6639e75ff8822ab"
+    "CLAUDE.md": "5aff9bb3534792961b3e5c79a23f7ae3a859bb22efc3553c62847f555c61a08d",
+    "docs/init/seed.md": "e0d708ccf06ae1ae124e0a3ada3e77bfbdbb9f2899a548a1729c9270a12f3e98"
   },
   "owners": {
     "skills": {
       "archive": "baseline",
       "audit-baseline": "baseline",
       "brd": "baseline",
+      "changelog": "baseline",
       "chore": "baseline",
       "claude-automation-recommender": "baseline",
       "code-structure": "baseline",
@@ -257,5 +271,5 @@
       "verify": "baseline"
     }
   },
-  "build_id": "gha-26000362681"
+  "build_id": "gha-26054481720"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friedbotstudio/create-baseline",
-  "version": "0.3.0",
-  "description": "Zero-dependency Node CLI scaffolder that materializes the Claude Code baseline (hooks, skills, commands, MCP servers, governance docs) into a target project. Run via `npx @friedbotstudio/create-baseline <target>`.",
+  "version": "0.4.0",
+  "description": "Node CLI scaffolder that materializes the Claude Code baseline (hooks, skills, commands, MCP servers, governance docs) into a target project, with branded interactive install / upgrade / doctor flows. Run via `npx @friedbotstudio/create-baseline <target>`.",
   "type": "module",
   "bin": {
     "create-baseline": "bin/cli.js"
@@ -43,6 +43,9 @@
     "email": "hello@friedbotstudio.com"
   },
   "homepage": "https://baseline.friedbotstudio.com",
+  "dependencies": {
+    "@clack/prompts": "1.4.0"
+  },
   "devDependencies": {
     "@11ty/eleventy": "3.1.5",
     "@semantic-release/changelog": "6.0.3",

package/src/CLAUDE.template.md

@@ -40,7 +40,7 @@ On every new session, before any work, you SHALL:
 
 1. **Read** `.claude/project.json` and check the `configured` field.
 2. **If `configured: false`** — `/init-project` has not run. The repository is in a sanctioned operating state called **project-agnostic mode**: hooks are active but `test_runner` and `lint_runner` run in guide mode and nothing is tailored to the user's stack. You SHALL greet the user with this exact framing:
-   > "This repo has the Claude Code baseline installed (22 hooks, 1 subagent, 36 skills). It's in **project-agnostic mode** — `test_runner` and `lint_runner` are in guide mode and nothing is tailored to your stack. Run **`/init-project`** to scout the codebase, run the recommender, and generate a config. Skip it if you want baseline-only behavior, but you'll miss stack-specific tailoring."
+   > "This repo has the Claude Code baseline installed (22 hooks, 1 subagent, 37 skills). It's in **project-agnostic mode** — `test_runner` and `lint_runner` are in guide mode and nothing is tailored to your stack. Run **`/init-project`** to scout the codebase, run the recommender, and generate a config. Skip it if you want baseline-only behavior, but you'll miss stack-specific tailoring."
    You SHALL then proceed with whatever the user asks. Project-agnostic mode is **allowed** — the user is not required to run `/init-project` to use the baseline. The `setup_guard` hook surfaces a one-shot reminder on Write/Edit/MultiEdit (rate-limited to 10 minutes); it does **not** block writes. Other guards (commit, env, spec-approval, verify-pass, track, swarm-boundary) remain hard regardless of `configured` state.
 3. **If `configured: true`** — read `docs/init/seed.md` §16 if present so you know what was added. Tell the user:
    > "Configured for `<stack>`. Run `/triage \"<request>\"` to start a workflow, or `/harness` for the full pipeline."
@@ -292,7 +292,7 @@ Cryptographic supply-chain attestation, signed lock files, and per-skill aggrega
 |---|---|
 | `.claude/hooks/` | 22 hook scripts (17 write/run-boundary + 4 lifecycle + 1 input-boundary). Bash + python3, no jq. |
 | `.claude/agents/` | 1 baseline subagent: `swarm-worker` (rendered from `src/agents/swarm-worker.template.md`) |
-| `.claude/skills/` | 36 skills: artifact (4) + phases (10) + workers (5) + spec helpers (4) + orchestration (3) + memory (1) + shared globals (7) + audit (1) + alt tracks (1) |
+| `.claude/skills/` | 37 skills: artifact (4) + phases (11) + workers (5) + spec helpers (4) + orchestration (3) + memory (1) + shared globals (7) + audit (1) + alt tracks (1) |
 | `.claude/commands/` | 5 consent/bootstrap gates: `approve-spec`, `approve-swarm`, `grant-commit`, `grant-push`, `init-project` |
 | `.claude/memory/` | 7 canonical knowledge files + `_pending.md` (staging) + `_resume.md` (continuity snapshot) + `README.md` |
 | `.claude/project.json` | per-project config (test/lint cmd, TDD globs, destructive patterns, swarm config, additions). Populated by `/init-project`. |

package/src/cli/merge.js

@@ -22,7 +22,8 @@ async function copyFile(src, dst) {
   await cp(src, dst, { force: true });
 }
 
-export async function threeWayMerge(templateDir, target, oldManifest, newManifest) {
+export async function threeWayMerge(templateDir, target, oldManifest, newManifest, opts = {}) {
+  const { dryRun = false, onSkipCustomized = null } = opts;
   const actions = [];
   const oldFiles = oldManifest?.files ?? {};
   const newFiles = newManifest?.files ?? {};
@@ -36,7 +37,7 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
       if (await pathExists(tgtPath)) {
         actions.push({ kind: ACTION_KINDS.NEVER_TOUCH_PRESERVE, path: rel, reason: 'NEVER_TOUCH path present in target' });
       } else if (rel in newFiles) {
-        await copyFile(tplPath, tgtPath);
+        if (!dryRun) await copyFile(tplPath, tgtPath);
         actions.push({ kind: ACTION_KINDS.NEVER_TOUCH_ADD, path: rel, reason: 'NEVER_TOUCH path absent; written from template' });
       }
       continue;
@@ -44,7 +45,7 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
 
     if (SPECIAL_MERGE.includes(rel)) {
       if (rel in newFiles && await pathExists(tplPath)) {
-        await deepMergeMcpServers(tplPath, tgtPath);
+        if (!dryRun) await deepMergeMcpServers(tplPath, tgtPath);
         actions.push({ kind: ACTION_KINDS.SPECIAL_MERGE, path: rel, reason: 'additive deep-merge applied' });
       }
       continue;
@@ -56,7 +57,7 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
     const tgtHash = targetExists ? await hashFile(tgtPath) : null;
 
     if (!targetExists && newHash) {
-      await copyFile(tplPath, tgtPath);
+      if (!dryRun) await copyFile(tplPath, tgtPath);
       actions.push({ kind: ACTION_KINDS.ADD, path: rel, reason: 'new in template; not present in target' });
       continue;
     }
@@ -67,13 +68,19 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
     }
 
     if (newHash && oldHash && tgtHash === oldHash) {
-      await copyFile(tplPath, tgtPath);
+      if (!dryRun) await copyFile(tplPath, tgtPath);
       actions.push({ kind: ACTION_KINDS.OVERWRITE, path: rel, reason: 'target untouched since last install; updated' });
       continue;
     }
 
     if (newHash && tgtHash && tgtHash !== oldHash) {
-      actions.push({ kind: ACTION_KINDS.SKIP_CUSTOMIZED, path: rel, reason: 'target customized since last install' });
+      const choice = onSkipCustomized ? await onSkipCustomized(rel) : 'keep-mine';
+      if (choice === 'take-theirs') {
+        if (!dryRun) await copyFile(tplPath, tgtPath);
+        actions.push({ kind: ACTION_KINDS.OVERWRITE, path: rel, reason: 'customized file; user chose take-theirs' });
+      } else {
+        actions.push({ kind: ACTION_KINDS.SKIP_CUSTOMIZED, path: rel, reason: 'target customized since last install' });
+      }
       continue;
     }
 
@@ -84,10 +91,8 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
       //     prune. Otherwise the user accumulates stale baseline files forever.
       //   - target customized (tgtHash != oldHash) → preserve to avoid
       //     destroying user work; report drift via exit 3.
-      // Pruning only runs when --merge already applies; there is no separate
-      // flag (decision recorded in README).
       if (targetExists && tgtHash === oldHash) {
-        await unlink(tgtPath);
+        if (!dryRun) await unlink(tgtPath);
         actions.push({ kind: ACTION_KINDS.PRUNE, path: rel, reason: 'removed from new template; target was untouched — deleted' });
       } else if (targetExists) {
         actions.push({ kind: ACTION_KINDS.PRUNE_SKIPPED_CUSTOMIZED, path: rel, reason: 'removed from new template; target customized — preserved' });
@@ -96,7 +101,7 @@ export async function threeWayMerge(templateDir, target, oldManifest, newManifes
     }
   }
 
-  if (newManifest) {
+  if (newManifest && !dryRun) {
     await mkdir(join(target, '.claude'), { recursive: true });
     await saveManifest(join(target, '.claude/.baseline-manifest.json'), newManifest);
   }

package/src/cli/tui/doctor.js

@@ -0,0 +1,56 @@
+// Domain — branded sectioned doctor report. Consumes the structured
+// DoctorReport from src/cli/doctor.js (unchanged) and writes a colorized,
+// sectioned rendering to stdout. The non-TTY plain path stays on doctor.js's
+// formatReport — this renderer is only invoked when stdout is a TTY.
+
+import { accent, muted, success, warn, error, accentLight } from './tokens.js';
+
+function brandHeader(target, manifestInfo) {
+  const lines = [accent('Baseline doctor')];
+  if (target) lines.push(muted(`target:   ${target}`));
+  if (manifestInfo) lines.push(muted(`manifest: ${manifestInfo}`));
+  return lines;
+}
+
+export function render(report) {
+  if (report.error) {
+    const headerLines = brandHeader(report.target);
+    process.stdout.write(headerLines.join('\n') + '\n\n');
+    process.stdout.write(`${error('doctor:')} ${report.error}\n`);
+    return;
+  }
+  const lines = brandHeader(report.target, `version ${report.manifestVersion}, installed ${report.generatedAt}`);
+  lines.push('');
+  lines.push(`  ${success('matched')}:    ${report.matched.length}`);
+  lines.push(`  ${accentLight('customized')}: ${report.customized.length}`);
+  lines.push(`  ${error('missing')}:    ${report.missing.length}`);
+  lines.push(`  ${warn('added')}:      ${report.added.length}`);
+
+  if (report.missing.length > 0) {
+    lines.push('');
+    lines.push(error('Missing (deleted from disk; exit 1):'));
+    for (const p of report.missing) lines.push(`  - ${p}`);
+  }
+  if (report.customized.length > 0) {
+    lines.push('');
+    const header = report.strict
+      ? accentLight('Customized (strict mode → exit 1):')
+      : accentLight('Customized (informational):');
+    lines.push(header);
+    if (Array.isArray(report.tampered) && report.tampered.length > 0) {
+      for (const entry of report.tampered) {
+        lines.push(`  ${warn('TAMPERED')}: ${entry.path}`);
+        lines.push(`    shipped=${muted(entry.shipped)}  observed=${muted(entry.observed)}`);
+      }
+    } else {
+      for (const p of report.customized) lines.push(`  - ${p}`);
+    }
+  }
+  if (report.added.length > 0) {
+    lines.push('');
+    lines.push(warn('Added under .claude/ since install (likely /init-project; informational):'));
+    for (const p of report.added) lines.push(`  - ${p}`);
+  }
+
+  process.stdout.write(lines.join('\n') + '\n');
+}

package/src/cli/tui/install.js

@@ -0,0 +1,79 @@
+// Domain — branded install flow. Composes the pure-data install + plantuml
+// foundations behind a clack-style presentation seam. The `prompts` parameter
+// defaults to @clack/prompts but is injected in tests.
+
+import * as clackModule from '@clack/prompts';
+import { readFile } from 'node:fs/promises';
+import { freshInstall, forceInstall } from '../install.js';
+import { fetchPlantumlIfMissing, FETCH_OUTCOMES } from '../plantuml.js';
+
+const SUCCESS = 0;
+const ERR_INSTALL_FAILED = 1;
+const ERR_PLANTUML_REQUIRED = 4;
+
+export async function run({ target, opts = {}, prompts = clackModule } = {}) {
+  if (!target || typeof target !== 'string') {
+    throw new Error('tui.install.run requires a non-empty string target');
+  }
+  if (!opts.templateDir) {
+    throw new Error('tui.install.run requires opts.templateDir');
+  }
+
+  const version = await readPackageVersion();
+  prompts.intro(`create-baseline v${version}`);
+
+  const spinner = prompts.spinner();
+  spinner.start('Copying baseline files');
+
+  try {
+    await copyTemplate(target, opts);
+  } catch (err) {
+    spinner.error('Install failed');
+    prompts.outro(err.message);
+    return ERR_INSTALL_FAILED;
+  }
+
+  const plantumlExit = await fetchPlantumlBranded(target, opts, prompts, spinner);
+  if (plantumlExit !== SUCCESS) return plantumlExit;
+
+  spinner.stop('Baseline installed');
+  prompts.outro(`Installed at ${target}`);
+  return SUCCESS;
+}
+
+async function copyTemplate(target, opts) {
+  const installOpts = { withNpmrc: !!opts.withNpmrc };
+  if (opts.force) await forceInstall(opts.templateDir, target, installOpts);
+  else await freshInstall(opts.templateDir, target, installOpts);
+}
+
+async function fetchPlantumlBranded(target, opts, prompts, spinner) {
+  if (opts.noPlantuml) return SUCCESS;
+  spinner.message('Fetching PlantUML jar');
+  const result = await fetchPlantumlIfMissing(target, {
+    noPlantuml: opts.noPlantuml,
+    requirePlantuml: opts.requirePlantuml,
+  });
+  if (result.outcome === FETCH_OUTCOMES.ERRORED_REQUIRE_PLANTUML) {
+    spinner.error('PlantUML required but unavailable');
+    prompts.outro(result.reason);
+    return ERR_PLANTUML_REQUIRED;
+  }
+  if (
+    result.outcome === FETCH_OUTCOMES.WARNED_NETWORK_FAILURE ||
+    result.outcome === FETCH_OUTCOMES.WARNED_HASH_MISMATCH
+  ) {
+    prompts.log.warn(`PlantUML jar: ${result.reason} — install continued`);
+  }
+  return SUCCESS;
+}
+
+async function readPackageVersion() {
+  try {
+    const url = new URL('../../../package.json', import.meta.url);
+    const pkg = JSON.parse(await readFile(url, 'utf8'));
+    return pkg.version || '0.0.0';
+  } catch {
+    return '0.0.0';
+  }
+}

package/src/cli/tui/meta.js

@@ -0,0 +1,30 @@
+// Domain — branded renderers for the meta commands (--help, --version).
+// In a TTY, a brand banner frames the canonical body; in non-TTY the body is
+// emitted unchanged so that piped consumers (`$(cli --version)`, `cli --help |
+// grep ...`) keep working byte-clean.
+
+import { accent, muted, rule } from './tokens.js';
+
+export function renderHelp(helpText, version) {
+  if (!process.stdout.isTTY) {
+    process.stdout.write(helpText.endsWith('\n') ? helpText : helpText + '\n');
+    return;
+  }
+  const banner = [
+    '',
+    `  ${accent('Baseline CLI')}  ${muted(`v${version}`)}`,
+    `  ${muted('@friedbotstudio/create-baseline')}`,
+    `  ${rule('─'.repeat(48))}`,
+    '',
+  ].join('\n');
+  process.stdout.write(banner + '\n');
+  process.stdout.write(helpText.endsWith('\n') ? helpText : helpText + '\n');
+}
+
+export function renderVersion(version) {
+  if (!process.stdout.isTTY) {
+    process.stdout.write(`${version}\n`);
+    return;
+  }
+  process.stdout.write(`${accent('baseline')} ${muted('v')}${version}\n`);
+}

package/src/cli/tui/tokens.js

@@ -0,0 +1,38 @@
+// Foundation — ANSI brand-color helpers for the TUI presentation layer.
+// Translates Friedbot Studio's oklch tokens (site-src/assets/site.css :root) to
+// 24-bit truecolor escape sequences. Respects NO_COLOR (https://no-color.org)
+// and skips emission when stdout is not a TTY.
+
+const NO_COLOR = process.env.NO_COLOR !== undefined && process.env.NO_COLOR !== '';
+
+// oklch -> approximate sRGB hex used in the rendered docs site:
+//   --accent       oklch(55.8% 0.187 41.5) ~ #c2410c   (orange-700)
+//   --accent-light oklch(70.3% 0.187 41.5) ~ #ea6a25   (orange-500)
+//   --muted        oklch(45% 0.026 257)    ~ #6b7280
+//   --cli-success  oklch(70% 0.15 145)     ~ #4ade80
+//   --warn         oklch(58% 0.13 60)      ~ #d97706
+//   --mac-red      oklch(70% 0.21 24)      ~ #ef4444
+//   --rule         oklch(89% 0.013 257)    ~ #d1d5db
+const RGB = {
+  accent: [194, 65, 12],
+  accentLight: [234, 106, 37],
+  muted: [107, 114, 128],
+  success: [74, 222, 128],
+  warn: [217, 119, 6],
+  error: [239, 68, 68],
+  rule: [209, 213, 219],
+};
+
+function paint(rgb, text) {
+  if (NO_COLOR || !process.stdout.isTTY) return text;
+  const [r, g, b] = rgb;
+  return `\x1b[38;2;${r};${g};${b}m${text}\x1b[0m`;
+}
+
+export const accent = (text) => paint(RGB.accent, text);
+export const accentLight = (text) => paint(RGB.accentLight, text);
+export const muted = (text) => paint(RGB.muted, text);
+export const success = (text) => paint(RGB.success, text);
+export const warn = (text) => paint(RGB.warn, text);
+export const error = (text) => paint(RGB.error, text);
+export const rule = (text) => paint(RGB.rule, text);

package/src/cli/tui/upgrade.js

@@ -0,0 +1,100 @@
+// Domain — branded upgrade flow with interactive per-file conflict resolution.
+// Plan/apply split:
+//   1. dry-run threeWayMerge → enumerate SKIP_CUSTOMIZED conflicts
+//   2. prompt the user once per conflict
+//   3. on cancel/abort: bail before any write
+//   4. on resolve: real threeWayMerge with onSkipCustomized backed by the Map
+
+import * as clackModule from '@clack/prompts';
+import { existsSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import { join, relative, sep } from 'node:path';
+import { threeWayMerge, ACTION_KINDS } from '../merge.js';
+import { loadManifest, buildManifestFromDir } from '../manifest.js';
+
+const SUCCESS = 0;
+const ERR_ABORT = 1;
+const ERR_NO_MANIFEST = 2;
+const ERR_DIVERGENCE = 3;
+
+const CHOICE_OPTIONS = [
+  { value: 'keep-mine', label: 'Keep mine', hint: 'preserve target file as-is' },
+  { value: 'take-theirs', label: 'Take theirs', hint: 'overwrite with new baseline' },
+  { value: 'abort', label: 'Abort', hint: 'exit without changes' },
+];
+
+export async function run({ target, opts = {}, prompts = clackModule } = {}) {
+  if (!target || typeof target !== 'string') {
+    throw new Error('tui.upgrade.run requires a non-empty string target');
+  }
+  if (!opts.templateDir) {
+    throw new Error('tui.upgrade.run requires opts.templateDir');
+  }
+
+  const manifestPath = join(target, '.claude/.baseline-manifest.json');
+  if (!existsSync(manifestPath)) {
+    prompts.log.error(`No baseline manifest at ${manifestPath}. Run a fresh install first.`);
+    return ERR_NO_MANIFEST;
+  }
+
+  prompts.intro('create-baseline upgrade');
+
+  const { oldManifest, newManifest } = await loadManifests(opts.templateDir, manifestPath);
+  const dryReport = await threeWayMerge(opts.templateDir, target, oldManifest, newManifest, { dryRun: true });
+  const conflicts = dryReport.actions.filter((a) => a.kind === ACTION_KINDS.SKIP_CUSTOMIZED);
+
+  const choices = new Map();
+  for (const conflict of conflicts) {
+    const choice = await prompts.select({
+      message: `${conflict.path} has been customized — choose:`,
+      options: CHOICE_OPTIONS,
+    });
+    if (prompts.isCancel(choice) || choice === 'abort') {
+      prompts.cancel('Upgrade aborted; tree unchanged.');
+      return ERR_ABORT;
+    }
+    choices.set(conflict.path, choice);
+  }
+
+  if (opts.dryRun) {
+    for (const action of dryReport.actions) {
+      prompts.log.info(`${action.kind.padEnd(24)} ${action.path}`);
+    }
+    prompts.outro('Dry run complete; no changes written.');
+    return SUCCESS;
+  }
+
+  const onSkipCustomized = (rel) => choices.get(rel) ?? 'keep-mine';
+  const finalReport = await threeWayMerge(opts.templateDir, target, oldManifest, newManifest, { onSkipCustomized });
+
+  const applied = finalReport.actions.filter((a) => isApplied(a.kind)).length;
+  const skipped = finalReport.actions.filter((a) => a.kind === ACTION_KINDS.SKIP_CUSTOMIZED).length;
+  prompts.outro(`Applied ${applied}; ${skipped} skipped.`);
+  return finalReport.exitCode === 3 ? ERR_DIVERGENCE : SUCCESS;
+}
+
+function isApplied(kind) {
+  return (
+    kind === ACTION_KINDS.ADD ||
+    kind === ACTION_KINDS.OVERWRITE ||
+    kind === ACTION_KINDS.PRUNE ||
+    kind === ACTION_KINDS.SPECIAL_MERGE ||
+    kind === ACTION_KINDS.NEVER_TOUCH_ADD
+  );
+}
+
+async function loadManifests(templateDir, manifestPath) {
+  const oldManifest = await loadManifest(manifestPath);
+  const tplFiles = await listShippedFiles(templateDir);
+  const newManifest = await buildManifestFromDir(templateDir, tplFiles);
+  return { oldManifest, newManifest };
+}
+
+async function listShippedFiles(root, base = root, acc = []) {
+  for (const entry of await readdir(root, { withFileTypes: true })) {
+    const full = join(root, entry.name);
+    if (entry.isDirectory()) await listShippedFiles(full, base, acc);
+    else if (entry.isFile()) acc.push(relative(base, full).split(sep).join('/'));
+  }
+  return acc;
+}

package/src/seed.template.md

@@ -11,7 +11,7 @@
 
 **Mandatory binding language.** Each numbered section (§) below specifies a binding requirement for the baseline. Implementations SHALL conform; `CLAUDE.md` Articles SHALL reference the corresponding §; project amendments (per `CLAUDE.md` Art. X) SHALL NOT contradict any § here.
 
-The baseline turns soft engineering rules (no unauthorized commits, no stubs, no mocks of internal code, no self-approved specs) into structural guarantees enforced by write-boundary hooks. Eleven workflow phases plus one stripped-down chore track (skips TDD; runs verify + archive mandatorily, simplify/integrate/document conditionally), seventeen write/run-boundary guards plus four lifecycle hooks plus one input-boundary hook (twenty-two hook scripts total — twenty `.sh` + two `.mjs` after the JS-port pilot), thirty-six skills, one subagent, and four consent gates. Decisions live in main context; the lone subagent (`swarm-worker`) executes pre-decided recipes in parallel worktrees during `/swarm-dispatch`. Every artifact is archived; every third-party API is looked up against live docs. Project memory accumulates across sessions in `.claude/memory/` — auto-extracted by a Stop hook, curated in main context via `/memory-flush`, self-healing via re-verification.
+The baseline turns soft engineering rules (no unauthorized commits, no stubs, no mocks of internal code, no self-approved specs) into structural guarantees enforced by write-boundary hooks. Eleven workflow phases plus one stripped-down chore track (skips TDD; runs verify + archive mandatorily, simplify/integrate/document conditionally), seventeen write/run-boundary guards plus four lifecycle hooks plus one input-boundary hook (twenty-two hook scripts total — twenty `.sh` + two `.mjs` after the JS-port pilot), thirty-seven skills, one subagent, and four consent gates. Decisions live in main context; the lone subagent (`swarm-worker`) executes pre-decided recipes in parallel worktrees during `/swarm-dispatch`. Every artifact is archived; every third-party API is looked up against live docs. Project memory accumulates across sessions in `.claude/memory/` — auto-extracted by a Stop hook, curated in main context via `/memory-flush`, self-healing via re-verification.
 
 ---
 
@@ -110,7 +110,7 @@ Applies to every language. Mappings for TSX, Node, Python, Go, Rust ship inside
 │   │   └── lib/common.sh       # shared helpers
 │   ├── agents/                 # 1 subagent: swarm-worker (rendered from src/agents/swarm-worker.template.md)
 │   ├── commands/               # 5 consent/bootstrap gates (user-only — structurally)
-│   ├── skills/                 # 36 skills: artifact (4) + phases (10) + workers (5) + spec helpers (4) + orchestration (3) + memory (1) + shared globals (7) + audit (1) + alt tracks (1)
+│   ├── skills/                 # 37 skills: artifact (4) + phases (11) + workers (5) + spec helpers (4) + orchestration (3) + memory (1) + shared globals (7) + audit (1) + alt tracks (1)
 │   ├── memory/                 # project memory: 7 canonical files + _pending.md (gitignored body) + README.md
 │   └── state/                  # runtime: workflow.json, approvals, swarm plans, verdicts, logs
 ├── src/                        # pristine ship-time templates (overlay source for `npx @friedbotstudio/create-baseline`)
@@ -181,7 +181,7 @@ The baseline ships exactly one subagent. The architectural reason: subagents los
 
 **Automated re-rendering by `/init-project`.** Step 6.4 re-renders `swarm-worker.md` from the template, driven by the recommender's `additions.swarm_worker_skills`. The recommender does **not** propose new subagent types — only stack-skill additions for the existing worker. Specialization happens via skills loaded into the worker's context, not via parallel agent personas; new decision-making roles belong in skills, which run in main context.
 
-### §4.3 Skills (36)
+### §4.3 Skills (37)
 
 Each at `.claude/skills/<name>/SKILL.md`, frontmatter `name` + `description`, plus optional `template.md` (artifact skills) or helper scripts.
 
@@ -516,7 +516,7 @@ Seed-level requirement: no stale workflow artifacts in the working tree after co
 
 **Step 4:** Write `src/agents/swarm-worker.template.md` (canonical-body store, per §4.2) — the only subagent template. Then render `.claude/agents/swarm-worker.md` from it with default tokens. The template carries four tokens — `{{NAME}}`, `{{DESCRIPTION}}`, `{{SKILLS}}`, `{{ROLE_LINE}}`. Default `SKILLS` is the YAML list block `  - scenario\n  - implement` (the worker's two mandatory sub-skills). Render-parity holds at this stage. `/init-project` later re-renders the worker with stack-aware tokens when the recommender flags stack-specific skills to preload via `additions.swarm_worker_skills`.
 
-**Step 5:** Write `.claude/skills/` for the 36 skills (§4.3) — 28 workflow/worker/orchestration/memory/alt-track skills you author plus 7 shared globals plus 1 audit skill. The breakdown: artifact drafting (4) + workflow phases (10) + phase workers (5: `scenario`, `implement`, `verify`, `prose`, `design-ui`) + spec helpers (4: `spec-lint`, `spec-render`, `spec-diagram-review`, `spec-traceability-review`) + orchestration (3: `harness`, `swarm-plan`, `swarm-dispatch`) + memory (1: `memory-flush`) + shared globals (7: `claude-automation-recommender`, `code-structure`, `humanizer`, `documentation`, `technical-tutorials`, `copywriting`, `impeccable`) + drift defender (1: `audit-baseline`) + alternate tracks (1: `chore`). The vendored `claude-automation-recommender` (Apache 2.0, from `claude-code-setup`), the writing/quality globals, and the design global ship unchanged with their licenses intact. Artifact skills (intake, brd, spec, rca) each ship a `template.md`. Helper scripts: swarm-plan gets `validate.sh`, swarm-dispatch gets `swarm_merge.sh`, spec-render gets `render.sh`, spec-lint gets `lint.sh`, archive gets `archive.sh`, audit-baseline gets `audit.sh`. All helper scripts `chmod +x`.
+**Step 5:** Write `.claude/skills/` for the 37 skills (§4.3) — 29 workflow/worker/orchestration/memory/alt-track skills you author (the +1 over 28 is the `changelog` Phase 11.5 skill) plus 7 shared globals plus 1 audit skill. The breakdown: artifact drafting (4) + workflow phases (10) + phase workers (5: `scenario`, `implement`, `verify`, `prose`, `design-ui`) + spec helpers (4: `spec-lint`, `spec-render`, `spec-diagram-review`, `spec-traceability-review`) + orchestration (3: `harness`, `swarm-plan`, `swarm-dispatch`) + memory (1: `memory-flush`) + shared globals (7: `claude-automation-recommender`, `code-structure`, `humanizer`, `documentation`, `technical-tutorials`, `copywriting`, `impeccable`) + drift defender (1: `audit-baseline`) + alternate tracks (1: `chore`). The vendored `claude-automation-recommender` (Apache 2.0, from `claude-code-setup`), the writing/quality globals, and the design global ship unchanged with their licenses intact. Artifact skills (intake, brd, spec, rca) each ship a `template.md`. Helper scripts: swarm-plan gets `validate.sh`, swarm-dispatch gets `swarm_merge.sh`, spec-render gets `render.sh`, spec-lint gets `lint.sh`, archive gets `archive.sh`, audit-baseline gets `audit.sh`. All helper scripts `chmod +x`.
 
 **Step 6:** Write `.claude/commands/*.md` for the 4 gates (§4.4). All carry `disable-model-invocation: true` as belt-and-braces; structural user-only is enforced by their directory.