diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 83c7c060..6f04657d 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -124,7 +124,7 @@ Orchestration logic that commands reference. Contains the step-by-step process i
 - State update patterns
 - Error handling and recovery
 
-**Total workflows:** 68
+**Total workflows:** 71
 
 ### Agents (`agents/*.md`)
 
@@ -134,7 +134,7 @@ Specialized agent definitions with frontmatter specifying:
 - `tools` — Allowed tool access (Read, Write, Edit, Bash, Grep, Glob, WebSearch, etc.)
 - `color` — Terminal output color for visual distinction
 
-**Total agents:** 24
+**Total agents:** 31
 
 ### References (`get-shit-done/references/*.md`)
 
@@ -413,10 +413,10 @@ UI-SPEC.md (per phase) ───────────────────
 ├── get-shit-done/
 │   ├── bin/gsd-tools.cjs           # CLI utility
 │   ├── bin/lib/*.cjs               # 19 domain modules
-│   ├── workflows/*.md              # 68 workflow definitions
+│   ├── workflows/*.md              # 71 workflow definitions
 │   ├── references/*.md             # 35 shared reference docs
 │   └── templates/                  # Planning artifact templates
-├── agents/*.md                     # 24 agent definitions
+├── agents/*.md                     # 31 agent definitions
 ├── hooks/
 │   ├── gsd-statusline.js           # Statusline hook
 │   ├── gsd-context-monitor.js      # Context warning hook
diff --git a/get-shit-done/bin/lib/init.cjs b/get-shit-done/bin/lib/init.cjs
index b00b9b3d..2a007321 100644
--- a/get-shit-done/bin/lib/init.cjs
+++ b/get-shit-done/bin/lib/init.cjs
@@ -1658,14 +1658,14 @@ function buildSkillManifest(cwd, skillsDir = null) {
       kind: 'skills',
     },
     {
-      root: '~/.claude/get-shit-done/skills',
+      root: '.claude/get-shit-done/skills',
       path: path.join(os.homedir(), '.claude', 'get-shit-done', 'skills'),
       scope: 'import-only',
       kind: 'skills',
       deprecated: true,
     },
     {
-      root: '~/.claude/commands/gsd',
+      root: '.claude/commands/gsd',
       path: path.join(os.homedir(), '.claude', 'commands', 'gsd'),
       scope: 'legacy-commands',
       kind: 'commands',
diff --git a/tests/architecture-counts.test.cjs b/tests/architecture-counts.test.cjs
new file mode 100644
index 00000000..9b2ea8b6
--- /dev/null
+++ b/tests/architecture-counts.test.cjs
@@ -0,0 +1,59 @@
+'use strict';
+
+/**
+ * Guards ARCHITECTURE.md component counts against drift.
+ *
+ * Both sides are computed at test runtime — no hardcoded numbers.
+ * Parsing ARCHITECTURE.md: regex extracts the documented count.
+ * Filesystem count: readdirSync filters to *.md files.
+ *
+ * To add a new component: append a row to COMPONENTS below and update
+ * docs/ARCHITECTURE.md with a matching "**Total <label>:** N" line.
+ */
+
+const { describe, test } = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const path = require('path');
+
+const ROOT = path.join(__dirname, '..');
+const ARCH_MD = path.join(ROOT, 'docs', 'ARCHITECTURE.md');
+const ARCH_CONTENT = fs.readFileSync(ARCH_MD, 'utf-8');
+
+/** Components whose counts must stay in sync with ARCHITECTURE.md. */
+const COMPONENTS = [
+  { label: 'commands',  dir: 'commands/gsd' },
+  { label: 'workflows', dir: 'get-shit-done/workflows' },
+  { label: 'agents',    dir: 'agents' },
+];
+
+/**
+ * Parse "**Total <label>:** N" from ARCHITECTURE.md.
+ * Returns the integer N, or throws if the pattern is missing.
+ */
+function parseDocCount(label) {
+  const match = ARCH_CONTENT.match(new RegExp(`\\*\\*Total ${label}:\\*\\*\\s+(\\d+)`));
+  assert.ok(match, `ARCHITECTURE.md is missing "**Total ${label}:** N" — add it`);
+  return parseInt(match[1], 10);
+}
+
+/**
+ * Count *.md files in a directory (non-recursive).
+ */
+function countMdFiles(relDir) {
+  return fs.readdirSync(path.join(ROOT, relDir)).filter((f) => f.endsWith('.md')).length;
+}
+
+describe('ARCHITECTURE.md component counts', () => {
+  for (const { label, dir } of COMPONENTS) {
+    test(`Total ${label} matches ${dir}/*.md file count`, () => {
+      const documented = parseDocCount(label);
+      const actual = countMdFiles(dir);
+      assert.strictEqual(
+        documented,
+        actual,
+        `docs/ARCHITECTURE.md says "Total ${label}: ${documented}" but ${dir}/ has ${actual} .md files — update ARCHITECTURE.md`
+      );
+    });
+  }
+});
diff --git a/tests/skill-manifest.test.cjs b/tests/skill-manifest.test.cjs
index 77ec7e55..40844c43 100644
--- a/tests/skill-manifest.test.cjs
+++ b/tests/skill-manifest.test.cjs
@@ -97,7 +97,7 @@ describe('skill-manifest', () => {
         deprecated: importedSkill.deprecated,
       },
       {
-        root: '~/.claude/get-shit-done/skills',
+        root: '.claude/get-shit-done/skills',
         scope: 'import-only',
         installed: false,
         deprecated: true,