rigjs 4.0.4 → 4.0.6

package/lib/wiki/README.md

@@ -11,9 +11,9 @@ Convention: **one file per subcommand**, plus a small set of shared infra files
 | File | Purpose |
 |---|---|
 | `index.ts` | Commander wiring. Builds the `rig wiki` subtree and attaches every action. Imported once from `lib/rig/index.ts`. |
-| `paths.ts` | Centralized filesystem paths (`~/.rig/`, launchd plist, Claude skills dir). Override with `RIG_HOME`. Also exports the launchd label. |
+| `paths.ts` | Centralized filesystem paths (`~/.rig/`, launchd plist, Claude skills dir). Override with `RIG_HOME`. Also exports the launchd label and `vaultConfigPath(vaultDir)` for `<vault>/.rig/config.yml`. |
 | `platform.ts` | `requireMacOS()` — hard-exits with code 32 on non-Darwin platforms. v1 is macOS-only by decision; see roadmap P5. |
-| `config.ts` | YAML read/write for `~/.rig/config.yml` (`RigConfig`, rig-global prefs) and `~/.rig/wikis.yml` (`Registry`, discovery-only path list). Per-vault settings live at `<vault>/.rig/config.yml` (`VaultConfig`). `loadWikiConfig()` composes the registry + each vault's config into the consumer-facing `WikiEntry[]`. `resolveWiki()` picks the target wiki for a command (flag → CWD walk → undefined). |
+| `config.ts` | YAML read/write for `~/.rig/config.yml` (`RigConfig`, rig-global prefs) and `<vault>/.rig/config.yml` (`VaultConfig`). `resolveVault()` walks up from CWD looking for a `.rig/config.yml`; `requireVault()` is the CLI-friendly variant that exits with a clear error on miss. **No global registry** — vault discovery is purely CWD-based. |
 | `db.ts` | Lazy-loaded `better-sqlite3` singleton. WAL mode. Idempotent migrations on every open. Exposes `getDb()`, `recordLastRun()`, `getLastRun()`. |
 | `qmd.ts` | Detects `qmd` on PATH, wraps `qmd query --json` and `qmd embed`. All callers must handle `installed=false` gracefully — qmd is optional. |
 
@@ -23,18 +23,22 @@ Convention: **one file per subcommand**, plus a small set of shared infra files
 
 | File | Subcommand | What it does |
 |---|---|---|
-| `init.ts` | `rig wiki init [path]` | Bootstraps a fresh wiki dir: `purpose.md` + `schema.md` from templates, empty `index.md` / `overview.md` / `log.md` / `reviews.md`, `raw/` + five `wiki/<sub>/` dirs, and seeds `<vault>/.rig/config.yml` with default include / exclude / schedule. Idempotent — never overwrites existing files. Does **not** register. |
-| `register.ts` | `rig wiki register [path]` | Ensures `<vault>/.rig/config.yml` exists (seeding defaults if absent), applies `--as <slug>` to its `name`, then appends the vault's absolute path to `~/.rig/wikis.yml`. Auto-detects the vault by walking up from CWD looking for `purpose.md`. |
-| `unregister.ts` | `rig wiki unregister <nameOrPath>` | Drops the vault path from `~/.rig/wikis.yml`. `<vault>/.rig/config.yml` and disk content are untouched. |
-| `list.ts` | `rig wiki list` | Prints a table: name, path, page count, last scan / ingest / lint. Banner row shows detected agent CLI, qmd status. |
-| `scan.ts` | `rig wiki scan [path]` | Walks `include` globs + `raw/`, sha256-compares against the `source_sha` table in `state.db`. Emits NEW / MODIFIED / DELETED / RAW DRIFT report. Returns exit code 10 if any RAW DRIFT (raw/ files are immutable). No agent calls. |
-| `fetch.ts` | `rig wiki fetch <url>` | (stub — P1) Agent-as-fetcher. Will WebFetch the URL via Claude adapter and write `raw/YYYY-MM-DD-<slug>.md` verbatim with frontmatter. **Never** summarizes. |
-| `ingest.ts` | `rig wiki ingest <source>` | (stub — P1) Two-step CoT (analysis → generation). Sandbox-copies the wiki dir, runs Claude adapter, then host-diffs sandbox vs original to extract writes. Filters out edits to `raw/` / `purpose.md` / `schema.md`. `--dry-run` prints diff without applying. |
-| `query.ts` | `rig wiki query "..."` | (stub — P1) Answer a question with `[[wikilink]]` citations. Prefers `qmd query --json` for retrieval; falls back to injecting `index.md` + `overview.md` + heuristic page picks. |
-| `lint.ts` | `rig wiki lint` | (stub — P1) Walks the wiki for contradictions, orphans, stale claims, broken `sources[]` refs, reviews.md backlog. Writes `lint-report-YYYY-MM-DD.md`. Non-zero exit on severe findings (code 11). |
-| `indexCmd.ts` | `rig wiki index` | qmd-only. Ensures the wiki's qmd collection exists, then runs `qmd embed`. When qmd is absent: warns and exits 0 (qmd is optional). Named `indexCmd` to avoid clashing with `index.ts`. |
-| `installSkill.ts` | `rig wiki install-skill` | Locates rig's bundled `.claude/skills/rig-wiki/` inside the rigjs install, then symlinks it into `~/.claude/skills/rig-wiki`. Lets every machine with rig installed get the slash command without manual copy. |
-| `uninstallSkill.ts` | `rig wiki uninstall-skill` | Removes the symlink. |
+| `init.ts` | `rig wiki init <path>` | Bootstraps a fresh vault: `purpose.md` + `schema.md` from templates, empty `index.md` / `overview.md` / `log.md` / `reviews.md`, `raw/` + five page-tree dirs (`sources/ entities/ concepts/ synthesis/ queries/`) directly at the vault root (no inner `wiki/` subdir), and seeds `<vault>/.rig/config.yml`. Idempotent — never overwrites existing files. |
+| `scan.ts` | `rig wiki scan` | Walks `include` globs from the vault's `root` (default: vault's parent dir), sha256-compares against the `source_sha` table in `state.db`. Auto-skips hidden segments (dot-prefixed) and gitignored paths. Emits NEW / MODIFIED / DELETED / RAW DRIFT report. Returns exit code 10 if any RAW DRIFT. No agent calls. |
+| `fetch.ts` | `rig wiki fetch <url>` | Verbatim download URL into `raw/YYYY-MM-DD-<slug>.md`. Default path uses Node fetch + HTML-strip; `--via-agent` uses Claude WebFetch. Never summarizes — that's `ingest`'s job. |
+| `ingest.ts` | `rig wiki ingest <source>` | Two-step CoT (analysis → generation). Spawns Claude in the vault dir, then host-diffs the writable surface (`sources/ entities/ concepts/ synthesis/ queries/` + `index.md` / `overview.md` / `log.md` / `reviews.md`) to extract writes. Filters out edits to `raw/` / `purpose.md` / `schema.md`. `--dry-run` prints diff without applying. |
+| `query.ts` | `rig wiki query "..."` | Vector retrieval via qmd. `--synth` adds a Claude-synthesized paragraph with `[[wikilink]]` citations. |
+| `lint.ts` | `rig wiki lint` | Walks the vault for frontmatter completeness, contradictions, orphans, broken `[[wikilinks]]`, missing `raw/` sources, reviews.md backlog. Writes `lint-report-YYYY-MM-DD.md`. Exit 11 on severe findings. |
+| `indexCmd.ts` | `rig wiki index` | qmd-only. Ensures the vault's qmd collection exists, then runs `qmd embed`. Named `indexCmd` to avoid clashing with `index.ts`. |
+| `rebuild.ts` | `rig wiki rebuild` | Clear `source_sha` rows + drop the per-vault qmd store + full re-embed. Use after switching embed model or onto a new device. |
+| `installSkill.ts` | `rig wiki install-skill [--project]` | Default: symlink bundled `rig-wiki` / `rig-crew` skills into `~/.claude/skills/`. With `--project`: install into `<cwd>/.claude/skills/` AND `<cwd>/.agents/skills/` (per-project override, covers both Claude Code and Codex). |
+| `uninstallSkill.ts` | `rig wiki uninstall-skill [--project]` | Mirror of install-skill. |
+
+### Commands intentionally NOT in this set
+
+`register`, `unregister`, `list` — there is no global registry. Vault discovery is by walking up from CWD looking for `<dir>/.rig/config.yml`. If you find yourself wanting to "list all wikis on this machine," that's a deliberate non-feature: each project's vault stands alone.
+
+`--wiki <name>` and `--all` flags — gone everywhere. A command operates on whatever vault `resolveVault()` finds from CWD, or errors with a clear message.
 
 ---
 
@@ -66,7 +70,7 @@ One adapter per agent CLI. Only Claude Code is implemented in v1; others are stu
 | `stop.ts` | `launchctl bootout` only. |
 | `status.ts` | `launchctl print gui/<uid>/<label>`, parses `state=` and `pid=`. |
 | `logs.ts` | Tails `~/.rig/logs/wiki-daemon.log` (with optional `-f`). |
-| `runner.ts` | **The launchd entry.** `launchctl` invokes `node <rigjs>/built/index.js wiki daemon runner`. v1: heartbeat-only loop that logs every 10 min and reloads `~/.rig/wikis.yml` + each vault's `.rig/config.yml`. P2 will add cron-based scan/lint scheduling and `auto-on-new` ingest rules. |
+| `runner.ts` | **The launchd entry.** `launchctl` invokes `node <rigjs>/built/index.js wiki daemon runner`. v1: heartbeat-only loop that tries to `resolveVault()` from its CWD at startup, logs the result, then ticks every 10 min. P2 will accept a `wiki.watchedVaults` list in `~/.rig/config.yml` and run cron-based scan/lint/ingest per entry. |
 
 ---
 

package/lib/wiki/config.ts

@@ -7,13 +7,13 @@ import { paths, vaultConfigPath } from './paths';
  * Two-layer config model.
  *
  *   ~/.rig/config.yml       — rig-global preferences (agent / qmd / logRotate).
- *   ~/.rig/wikis.yml        — registry: list of absolute vault paths only.
  *   <vault>/.rig/config.yml — per-vault settings (name, include, exclude,
  *                             schedule, ingestRules, optional scan root).
  *
- * A `WikiEntry` is the composed view returned to consumers (registry path
- * + vault config + defaults). Nothing about a wiki's identity or scope lives
- * outside the vault itself; the global registry is just a discovery list.
+ * There is **no global registry**. A vault is discovered by walking up from
+ * the current working directory looking for `.rig/config.yml`. Everything
+ * about a vault — its identity, its scope, its schedule — lives inside the
+ * vault dir itself.
  */
 
 export interface RigConfig {
@@ -35,17 +35,12 @@ export interface VaultConfig {
   ingestRules?: { match: string; mode: 'auto-on-new' | 'propose-only' }[];
 }
 
-/** Global registry persisted at `~/.rig/wikis.yml`. */
-export interface Registry {
-  wikis: string[]; // absolute vault paths
-}
-
 /** Composed view used by all wiki commands. */
 export interface WikiEntry {
   name: string;
   /** Absolute path to the vault dir. */
   path: string;
-  /** Absolute path to the scan root (resolved from VaultConfig.root). */
+  /** Absolute path to the scan root. */
   root: string;
   include: string[];
   exclude: string[];
@@ -53,10 +48,6 @@ export interface WikiEntry {
   ingestRules?: { match: string; mode: 'auto-on-new' | 'propose-only' }[];
 }
 
-export interface WikiConfig {
-  wikis: WikiEntry[];
-}
-
 const DEFAULT_RIG_CONFIG: RigConfig = {
   wiki: { defaultAgent: 'claude', qmd: { enabled: 'auto' }, logRotateMB: 50 },
 };
@@ -97,20 +88,6 @@ export function saveRigConfig(cfg: RigConfig): void {
   writeYaml(paths.config, cfg);
 }
 
-// ─────────────────────────── registry (paths only) ───────────────────────
-
-export function loadRegistry(): Registry {
-  ensureHomeDir();
-  const reg = readYaml<Registry>(paths.registry, { wikis: [] });
-  if (!Array.isArray(reg.wikis)) reg.wikis = [];
-  return reg;
-}
-
-export function saveRegistry(reg: Registry): void {
-  ensureHomeDir();
-  writeYaml(paths.registry, { wikis: reg.wikis });
-}
-
 // ─────────────────────────── per-vault config ────────────────────────────
 
 export function loadVaultConfig(vaultDir: string): VaultConfig | null {
@@ -123,56 +100,76 @@ export function saveVaultConfig(vaultDir: string, cfg: VaultConfig): void {
   writeYaml(vaultConfigPath(vaultDir), cfg);
 }
 
-// ───────────────────────────── composed view ─────────────────────────────
-
-const HARDCODED_EXCLUDES = ['node_modules/**', '.git/**'];
+// ─────────────────────────── vault discovery ─────────────────────────────
 
-function composeEntry(vaultPath: string): WikiEntry | null {
-  const vault = loadVaultConfig(vaultPath);
-  if (!vault) return null;
+function composeEntry(vaultPath: string, vault: VaultConfig): WikiEntry {
   const rootRel = vault.root ?? '..';
   const root = path.resolve(vaultPath, rootRel);
-  const vaultBasename = path.basename(vaultPath);
   return {
-    name: vault.name,
+    name: vault.name || path.basename(vaultPath),
     path: vaultPath,
     root,
     include: vault.include ?? ['**/*.md'],
-    exclude: vault.exclude ?? [`${vaultBasename}/**`, ...HARDCODED_EXCLUDES],
+    exclude: vault.exclude ?? [],
     schedule: vault.schedule ?? DEFAULT_SCHEDULE,
     ingestRules: vault.ingestRules ?? [{ match: 'raw/**/*.md', mode: 'auto-on-new' }],
   };
 }
 
 /**
- * Compose the list of registered wikis. Reads the registry and, for each
- * recorded path, loads the vault's own `.rig/config.yml`. Paths whose vault
- * config is missing or malformed are skipped silently (the user can re-run
- * `rig wiki register <path>` to repair).
+ * Walk up from `start` (default: CWD) looking for a vault. At each ancestor
+ * we check two patterns:
+ *
+ *   1. **The dir itself is the vault** — `<dir>/.rig/config.yml` exists.
+ *      Triggered when the user is inside the vault or below it.
+ *   2. **An immediate child is the vault** — some `<dir>/<child>/.rig/config.yml`
+ *      exists. Triggered when the user is at the project root (the common
+ *      case for `cd <project> && rig wiki *` where the vault is
+ *      `<project>/rig-wiki/`). If multiple children are vaults, the
+ *      lexicographically first wins.
+ *
+ * Returns the composed `WikiEntry`, or `undefined` if no vault is found.
+ *
+ * Callers that need a vault and don't have one must produce a helpful error
+ * themselves — `resolveVault` is a pure lookup and stays quiet.
  */
-export function loadWikiConfig(): WikiConfig {
-  const reg = loadRegistry();
-  const wikis: WikiEntry[] = [];
-  for (const p of reg.wikis) {
-    const entry = composeEntry(p);
-    if (entry) wikis.push(entry);
+export function resolveVault(start?: string): WikiEntry | undefined {
+  let dir = path.resolve(start || process.cwd());
+  while (true) {
+    // 1. Is `dir` itself a vault?
+    if (fs.existsSync(vaultConfigPath(dir))) {
+      const v = loadVaultConfig(dir);
+      if (v) return composeEntry(dir, v);
+    }
+    // 2. Does any immediate child of `dir` look like a vault?
+    try {
+      const entries = fs.readdirSync(dir, { withFileTypes: true })
+        .filter(e => e.isDirectory() && !e.name.startsWith('.'))
+        .map(e => e.name)
+        .sort();
+      for (const name of entries) {
+        const child = path.join(dir, name);
+        if (fs.existsSync(vaultConfigPath(child))) {
+          const v = loadVaultConfig(child);
+          if (v) return composeEntry(child, v);
+        }
+      }
+    } catch { /* unreadable dir — fall through to parent */ }
+
+    const parent = path.dirname(dir);
+    if (parent === dir) return undefined;
+    dir = parent;
   }
-  return { wikis };
 }
 
 /**
- * Resolve target wiki for a command:
- *   1. If `--wiki <name>` provided, look up by name.
- *   2. Otherwise walk up from CWD; first match wins (by vault `path` or `root`).
- *   3. Return undefined if nothing matches.
+ * Same as `resolveVault` but exits the process with a clear error when no
+ * vault is found. Use from CLI commands.
  */
-export function resolveWiki(cfg: WikiConfig, wikiFlag?: string): WikiEntry | undefined {
-  if (wikiFlag) return cfg.wikis.find(w => w.name === wikiFlag);
-  const cwd = process.cwd();
-  return cfg.wikis.find(w =>
-    cwd === w.path ||
-    cwd.startsWith(w.path + path.sep) ||
-    cwd === w.root ||
-    cwd.startsWith(w.root + path.sep),
-  );
+export function requireVault(): WikiEntry {
+  const v = resolveVault();
+  if (v) return v;
+  // eslint-disable-next-line no-console
+  console.error('No rig wiki vault found. cd into a vault directory (one that contains .rig/config.yml) or run `rig wiki init <path>` first.');
+  process.exit(1);
 }

package/lib/wiki/daemon/runner.ts

@@ -1,16 +1,19 @@
 import print from '../../print';
-import { loadWikiConfig } from '../config';
+import { resolveVault } from '../config';
 import { paths } from '../paths';
 import fs from 'fs';
-import path from 'path';
 
 /**
  * Daemon entry. launchctl invokes:
  *   node <rig-built>/index.js wiki daemon runner
  *
  * v1: minimal heartbeat loop that logs to ~/.rig/logs/wiki-daemon.log.
- * P2 will add: cron-job registration per wiki for `schedule.scan` / `schedule.lint`,
- * plus auto-on-new ingest from `ingestRules`.
+ * Without a global registry, the daemon resolves a vault from its CWD at
+ * startup (whatever directory it was launched from). If none is found, it
+ * still ticks but reports `(no vault)`.
+ *
+ * P2 will accept a configurable list of vault paths in ~/.rig/config.yml
+ * (`wiki.watchedVaults`) and run cron-based scan/lint/ingest per entry.
  */
 export default function daemonRunner(): void {
   fs.mkdirSync(paths.logs, { recursive: true });
@@ -18,15 +21,13 @@ export default function daemonRunner(): void {
     fs.appendFileSync(paths.daemonLog, `[${new Date().toISOString()}] ${msg}\n`);
 
   log('rig wiki daemon: starting (v1 heartbeat-only)');
+  const startVault = resolveVault();
+  log(`startup vault: ${startVault ? `${startVault.name} (${startVault.path})` : '(none)'}`);
 
-  let cfg = loadWikiConfig();
-  log(`registered wikis: ${cfg.wikis.map(w => w.name).join(', ') || '(none)'}`);
-
-  // Reload config every 10 minutes so daemon doesn't need restart when wikis change.
   setInterval(() => {
     try {
-      cfg = loadWikiConfig();
-      log(`heartbeat — wikis=${cfg.wikis.length}`);
+      const v = resolveVault();
+      log(`heartbeat — vault=${v ? v.name : '(none)'}`);
     } catch (e: any) {
       log(`heartbeat — config error: ${e.message}`);
     }
@@ -35,8 +36,5 @@ export default function daemonRunner(): void {
   process.on('SIGTERM', () => { log('SIGTERM — shutting down'); process.exit(0); });
   process.on('SIGINT',  () => { log('SIGINT — shutting down'); process.exit(0); });
 
-  // The interval keeps the event loop alive.
   print.info(`daemon up; logging to ${paths.daemonLog}`);
-  // eslint-disable-next-line no-void
-  void path; // unused-import placeholder, retained for future cron wiring
 }

package/lib/wiki/fetch.ts

@@ -15,10 +15,10 @@ import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
 import print from '../print';
-import { loadWikiConfig, resolveWiki, WikiEntry } from './config';
+import { requireVault, WikiEntry } from './config';
 import { adapters } from './agent/registry';
 
-interface FetchOpts { wiki?: string; json?: boolean; viaAgent?: boolean; slug?: string; }
+interface FetchOpts { json?: boolean; viaAgent?: boolean; slug?: string; }
 
 const FETCH_TIMEOUT_MS = 60 * 1000;
 const MAX_BYTES = 20 * 1024 * 1024; // 20MB cap to avoid pulling videos accidentally
@@ -28,12 +28,7 @@ export default async function wikiFetch(url: string, opts: FetchOpts): Promise<v
     print.error(`unsupported URL scheme: ${url}`);
     process.exit(1);
   }
-  const cfg = loadWikiConfig();
-  const target = resolveWiki(cfg, opts.wiki);
-  if (!target) {
-    print.error('no wiki resolved. Pass --wiki <name> or run from inside a registered project.');
-    process.exit(1);
-  }
+  const target = requireVault();
 
   const slug = opts.slug || urlToSlug(url);
   const today = new Date().toISOString().slice(0, 10);

package/lib/wiki/index.ts

@@ -1,7 +1,4 @@
 import wikiInit from './init';
-import wikiRegister from './register';
-import wikiUnregister from './unregister';
-import wikiList from './list';
 import wikiScan from './scan';
 import wikiFetch from './fetch';
 import wikiIngest from './ingest';
@@ -23,33 +20,16 @@ export function registerWikiCommands(program: any): void {
   const wiki = program.command('wiki').description('Karpathy-style LLM Wiki ops (macOS only in v1)');
 
   wiki.command('init <path>')
-    .description('bootstrap a wiki dir at <path> (required; refuses to default to CWD)')
+    .description('bootstrap a vault at <path> (recommended: `rig-wiki` at the project root)')
     .action(wikiInit);
 
-  wiki.command('register [path]')
-    .description('register a vault into ~/.rig/wikis.yml (settings live in <vault>/.rig/config.yml)')
-    .option('-n, --as <slug>', 'override the wiki name (`--name` would clash with commander)')
-    .option('-f, --force', 'overwrite an existing entry with the same name')
-    .action(wikiRegister);
-
-  wiki.command('unregister <nameOrPath>')
-    .description('remove a vault from ~/.rig/wikis.yml (vault contents on disk untouched)')
-    .action(wikiUnregister);
-
-  wiki.command('list')
-    .description('list registered wikis + daemon/agent/qmd status')
-    .action(wikiList);
-
-  wiki.command('scan [path]')
-    .description('compute NEW/MODIFIED/DELETED/RAW DRIFT report')
-    .option('-w, --wiki <name>', 'target wiki name')
-    .option('-a, --all', 'scan every registered wiki')
+  wiki.command('scan')
+    .description('compute NEW/MODIFIED/DELETED/RAW DRIFT report for the vault resolved from CWD')
     .option('--json', 'machine-readable output')
     .action(wikiScan);
 
   wiki.command('fetch <url>')
     .description('verbatim download URL into raw/YYYY-MM-DD-<slug>.md')
-    .option('-w, --wiki <name>', 'target wiki name')
     .option('--slug <slug>', 'override the auto-derived slug')
     .option('--via-agent', 'use Claude WebFetch for HTML→md conversion')
     .option('--json', 'machine-readable output')
@@ -57,14 +37,12 @@ export function registerWikiCommands(program: any): void {
 
   wiki.command('ingest <source>')
     .description('two-step CoT ingest of one source (preview diff, then apply)')
-    .option('-w, --wiki <name>', 'target wiki name')
     .option('--dry-run', 'print diff but do not apply')
     .option('--json', 'machine-readable output')
     .action(wikiIngest);
 
   wiki.command('query <q>')
     .description('semantic search — Qwen3 vector + Qwen3 reranker, cross-lingual CN/EN')
-    .option('-w, --wiki <name>', 'target wiki name')
     .option('-l, --limit <n>', 'top-k hits (1-50, default 10)', (v) => parseInt(v, 10))
     .option('--no-rerank', 'skip the reranker pass (faster, no reranker model load)')
     .option('-s, --synth', 'use Claude to synthesize a paragraph answer with citations')
@@ -73,32 +51,28 @@ export function registerWikiCommands(program: any): void {
 
   wiki.command('lint')
     .description('contradictions / orphans / stale claims / broken refs')
-    .option('-w, --wiki <name>', 'target wiki name')
-    .option('-a, --all', 'lint every registered wiki')
     .option('--json', 'machine-readable output')
     .action(wikiLint);
 
   wiki.command('index')
     .description('build/refresh qmd vector index (incremental by default)')
-    .option('-w, --wiki <name>', 'target wiki name')
-    .option('-a, --all', 'index every registered wiki')
     .option('-f, --force', 'force full re-embed (use after switching embed models)')
     .action(wikiIndex);
 
   wiki.command('rebuild')
     .description('refresh local caches (sha index + qmd vectors) — for new devices or after switching embed models')
-    .option('-w, --wiki <name>', 'target wiki name')
-    .option('-a, --all', 'rebuild every registered wiki')
     .option('--skip-embed', 'only clear ~/.rig/state.db rows, do not touch qmd at all')
     .action(wikiRebuild);
 
   wiki.command('install-skill')
-    .description('symlink bundled rig-wiki skill into ~/.claude/skills/')
+    .description('symlink bundled rig-wiki + rig-crew skills into ~/.claude/skills/ (or --project for the local project)')
     .option('-f, --force', 'replace an existing symlink')
+    .option('-p, --project', 'install into <cwd>/.claude/skills/ and <cwd>/.agents/skills/ (project-level override for Claude Code + Codex)')
     .action(wikiInstallSkill);
 
   wiki.command('uninstall-skill')
-    .description('remove the symlink from ~/.claude/skills/rig-wiki')
+    .description('remove the bundled skill symlinks (default: global; pass --project for the local project)')
+    .option('-p, --project', 'uninstall from <cwd>/.claude/skills/ and <cwd>/.agents/skills/')
     .action(wikiUninstallSkill);
 
   registerAgentCommands(wiki);

package/lib/wiki/indexCmd.ts

@@ -1,23 +1,16 @@
 import print from '../print';
-import { loadWikiConfig, resolveWiki, WikiEntry } from './config';
+import { requireVault } from './config';
 import { qmdEmbed } from './qmd';
 
-interface IndexOpts { wiki?: string; all?: boolean; force?: boolean; }
+interface IndexOpts { force?: boolean; }
 
 export default async function wikiIndex(opts: IndexOpts): Promise<void> {
-  const cfg = loadWikiConfig();
-  const targets: WikiEntry[] = opts.all
-    ? cfg.wikis
-    : [resolveWiki(cfg, opts.wiki)].filter(Boolean) as WikiEntry[];
-  if (targets.length === 0) {
-    print.error('no wiki resolved. Pass --wiki <name>, --all, or run from inside a registered project.');
+  const t = requireVault();
+  print.start(`qmd embed: ${t.name}`);
+  const res = await qmdEmbed(t.name, t.path, { force: !!opts.force });
+  if (res.ok) print.succeed(`qmd embed: ${t.name} done`);
+  else {
+    print.error(`qmd embed: ${t.name} failed: ${res.stderr.trim()}`);
     process.exit(1);
   }
-
-  for (const t of targets) {
-    print.start(`qmd embed: ${t.name}`);
-    const res = await qmdEmbed(t.name, t.path, { force: !!opts.force });
-    if (res.ok) print.succeed(`qmd embed: ${t.name} done`);
-    else { print.error(`qmd embed: ${t.name} failed: ${res.stderr.trim()}`); process.exitCode = 1; }
-  }
 }

package/lib/wiki/ingest.ts

@@ -16,29 +16,24 @@ import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
 import print from '../print';
-import { loadWikiConfig, resolveWiki, loadRigConfig, WikiEntry } from './config';
+import { requireVault, loadRigConfig, WikiEntry } from './config';
 import { paths } from './paths';
 import { recordLastRun } from './db';
 import { qmdEmbed } from './qmd';
 import { adapters } from './agent/registry';
 import { guardPath, refusalMessage } from './pathGuard';
 
-interface IngestOpts { wiki?: string; dryRun?: boolean; json?: boolean; }
+interface IngestOpts { dryRun?: boolean; json?: boolean; }
 
 const AGENT_TIMEOUT_MS = 15 * 60 * 1000;
 
 // LLM-writable surface — everything outside this set is filtered out of the
 // diff (raw/, purpose.md, schema.md, .gitignore, lint-report-*, proposals/).
 const WRITABLE_TOP = new Set(['index.md', 'overview.md', 'log.md', 'reviews.md']);
-const WRITABLE_DIRS = ['wiki/sources', 'wiki/entities', 'wiki/concepts', 'wiki/synthesis', 'wiki/queries'];
+const WRITABLE_DIRS = ['sources', 'entities', 'concepts', 'synthesis', 'queries'];
 
 export default async function wikiIngest(source: string, opts: IngestOpts): Promise<void> {
-  const cfg = loadWikiConfig();
-  const target = resolveWiki(cfg, opts.wiki);
-  if (!target) {
-    print.error('no wiki resolved. Pass --wiki <name> or run from inside a registered project.');
-    process.exit(1);
-  }
+  const target = requireVault();
 
   const absSource = path.isAbsolute(source) ? source : path.resolve(target.path, source);
   if (!fs.existsSync(absSource)) {
@@ -241,12 +236,12 @@ function buildPrompt(wiki: WikiEntry, sourceAbs: string): string {
     `  - In your head, list: entities mentioned, concepts touched, contradictions vs existing pages, items that need human review.`,
     ``,
     `Step 2 — GENERATION (write files):`,
-    `  - Create \`wiki/sources/<slug>.md\` summarizing this source. \`<slug>\` = source basename minus YYYY-MM-DD prefix and extension, kebab-case.`,
-    `  - For each new or affected entity / concept / synthesis page, create or UPDATE the corresponding file under \`wiki/entities/\`, \`wiki/concepts/\`, \`wiki/synthesis/\`.`,
+    `  - Create \`sources/<slug>.md\` summarizing this source. \`<slug>\` = source basename minus YYYY-MM-DD prefix and extension, kebab-case.`,
+    `  - For each new or affected entity / concept / synthesis page, create or UPDATE the corresponding file under \`entities/\`, \`concepts/\`, \`synthesis/\` (at the vault root — there is no \`wiki/\` subdir).`,
     `  - Update \`index.md\` and \`overview.md\` to reflect the new content.`,
     `  - If anything is unclear or contradictory, append a bullet to \`reviews.md\`. Do NOT silently merge contradictions.`,
     ``,
-    `Frontmatter — every wiki/**/*.md MUST have:`,
+    `Frontmatter — every page under sources/ entities/ concepts/ synthesis/ queries/ MUST have:`,
     '```yaml',
     `type: source | entity | concept | synthesis | query`,
     `sources: [<source-slug>, ...]      # source-slug is the source page slug, not raw filename`,
@@ -261,7 +256,7 @@ function buildPrompt(wiki: WikiEntry, sourceAbs: string): string {
     ``,
     `Hard rules — the host will REJECT any patch that violates these:`,
     `  - DO NOT modify \`raw/\`, \`purpose.md\`, or \`schema.md\`.`,
-    `  - Use kebab-case slugs; no spaces; no date prefixes inside \`wiki/\` filenames.`,
+    `  - Use kebab-case slugs; no spaces; no date prefixes in page filenames.`,
     `  - Link related pages with [[wikilink]]. Every wiki page should link to ≥1 other page.`,
     `  - For contradictions, write inline: \`> Contradiction: A vs B (see [[page-A]], [[page-B]])\`.`,
     ``,

package/lib/wiki/init.ts

@@ -19,7 +19,8 @@ const SCHEMA_TMPL = `# Schema
 
 ## Layers
 - raw/, purpose.md, schema.md: read-only for LLM
-- wiki/, index.md, overview.md, log.md, reviews.md: LLM is sole author
+- index.md, overview.md, log.md, reviews.md, sources/, entities/, concepts/,
+  synthesis/, queries/: LLM is sole author
 
 ## Page types
 - sources/<slug>.md     : 1-source summary
@@ -37,7 +38,7 @@ const SCHEMA_TMPL = `# Schema
 - last-updated: <ISO>
 
 ## Naming
-- kebab-case; no spaces; no dates in wiki/ filenames
+- kebab-case; no spaces; no dates in page filenames
 - raw/ filenames keep YYYY-MM-DD prefix
 
 ## Linking
@@ -56,7 +57,7 @@ const SCHEMA_TMPL = `# Schema
 
 const SUBDIRS = ['sources', 'entities', 'concepts', 'synthesis', 'queries'];
 
-// What lives inside the wiki dir but must not enter git / Obsidian Sync:
+// What lives inside the vault but must not enter git / Obsidian Sync:
 // - qmd's project-local vector cache (sqlite-vec, non-deterministic, rebuilds
 //   locally with `rig wiki index` / `rig wiki rebuild`)
 // - lint reports (auto-regenerated)
@@ -76,11 +77,19 @@ proposals/
 *.swp
 `;
 
+/**
+ * Sensible defaults for a fresh vault. The user can edit
+ * `<vault>/.rig/config.yml` afterwards.
+ *
+ * Note: hidden directories (any path segment starting with `.`) and files
+ * matched by the project's `.gitignore` are skipped automatically by the
+ * scanner — there is no need to add `.git/**` or `node_modules/**` here.
+ */
 const DEFAULT_VAULT_CONFIG = (vaultBasename: string): VaultConfig => ({
   name: vaultBasename,
   root: '..',
   include: ['**/*.md'],
-  exclude: [`${vaultBasename}/**`, 'node_modules/**', '.git/**'],
+  exclude: [`${vaultBasename}/**`],
   schedule: { scan: '0 */6 * * *', lint: '0 3 * * *', ingest: null },
   ingestRules: [{ match: 'raw/**/*.md', mode: 'auto-on-new' }],
 });
@@ -88,14 +97,14 @@ const DEFAULT_VAULT_CONFIG = (vaultBasename: string): VaultConfig => ({
 export default function wikiInit(givenPath?: string): void {
   if (!givenPath || !givenPath.trim()) {
     print.error('rig wiki init requires a target subdirectory.');
-    print.info('usage: rig wiki init <subdir>     (e.g. `rig wiki init knowledge` / `rig wiki init harness/llm-wiki`)');
-    print.info('refusing to default to CWD — that would litter the project root with wiki templates.');
+    print.info('usage: rig wiki init <subdir>     (recommended: `rig wiki init rig-wiki` at the project root)');
+    print.info('refusing to default to CWD — that would litter the project root with vault templates.');
     process.exit(1);
   }
   const root = path.resolve(givenPath);
   const guard = guardPath(root, process.cwd());
   if (!guard.ok) {
-    print.error('refusing to initialize a wiki at a hidden or gitignored path.');
+    print.error('refusing to initialize a vault at a hidden or gitignored path.');
     // eslint-disable-next-line no-console
     console.error(refusalMessage(root, guard));
     process.exit(1);
@@ -113,8 +122,9 @@ export default function wikiInit(givenPath?: string): void {
   fs.mkdirSync(path.join(root, 'raw'), { recursive: true });
   writeIfMissing(path.join(root, 'raw', '.gitkeep'), '');
 
+  // Page tree lives at the vault root — no extra `wiki/` nesting.
   for (const sub of SUBDIRS) {
-    const d = path.join(root, 'wiki', sub);
+    const d = path.join(root, sub);
     fs.mkdirSync(d, { recursive: true });
     writeIfMissing(path.join(d, '.gitkeep'), '');
   }
@@ -126,8 +136,9 @@ export default function wikiInit(givenPath?: string): void {
     saveVaultConfig(root, DEFAULT_VAULT_CONFIG(path.basename(root)));
   }
 
-  print.succeed(`wiki initialized at ${root}`);
-  print.info(`next: edit purpose.md + schema.md (and .rig/config.yml if scope differs from defaults), then \`rig wiki register ${shortPath(root)}\``);
+  print.succeed(`vault initialized at ${root}`);
+  print.info('next: edit purpose.md + schema.md (and .rig/config.yml if scope differs from defaults).');
+  print.info('discovery is automatic — cd into this dir (or any subdir) and run `rig wiki *` commands.');
   print.info('on a new device, after cloning, run `rig wiki rebuild` to refresh local caches.');
 }
 
@@ -135,8 +146,3 @@ function writeIfMissing(file: string, content: string) {
   if (fs.existsSync(file)) return;
   fs.writeFileSync(file, content, 'utf8');
 }
-
-function shortPath(p: string) {
-  const home = process.env.HOME || '';
-  return home && p.startsWith(home) ? '~' + p.slice(home.length) : p;
-}