rigjs 4.0.14 → 4.0.15

package/lib/wiki/indexCmd.ts

@@ -7,7 +7,7 @@ interface IndexOpts { force?: boolean; }
 export default async function wikiIndex(opts: IndexOpts): Promise<void> {
   const t = requireVault();
   print.start(`qmd embed: ${t.name}`);
-  const res = await qmdEmbed(t.name, t.path, { force: !!opts.force });
+  const res = await qmdEmbed(t.name, t.path, t.root, { force: !!opts.force });
   if (res.ok) print.succeed(`qmd embed: ${t.name} done`);
   else {
     print.error(`qmd embed: ${t.name} failed: ${res.stderr.trim()}`);

package/lib/wiki/ingest.ts

@@ -112,7 +112,7 @@ export default async function wikiIngest(source: string, opts: IngestOpts): Prom
 
   // Real ingest — trigger incremental embed.
   print.info(`applied ${applied.length} file change${applied.length === 1 ? '' : 's'}; rejected ${rejected.length}.`);
-  const embedRes = await qmdEmbed(target.name, target.path);
+  const embedRes = await qmdEmbed(target.name, target.path, target.root);
   if (!embedRes.ok) {
     print.warn(`qmd embed failed after ingest: ${embedRes.stderr.trim().slice(0, 300)}`);
     print.warn('your wiki content is committed to disk; only the vector index is stale.');

package/lib/wiki/init.ts

@@ -109,10 +109,7 @@ cases.
 const SUBDIRS = ['sources', 'entities', 'concepts', 'synthesis', 'queries'];
 
 const GITIGNORE_TMPL = `# rig wiki — local-only artifacts (do not commit)
-# qmd vector cache (sqlite-vec, machine-specific, rebuildable)
-.qmd/index.sqlite*
-.qmd/*.sqlite-wal
-.qmd/*.sqlite-shm
+# (vector cache lives outside the vault at ~/.rig/<project>/wiki/)
 # auto-generated reports
 lint-report-*.md
 # daemon proposal queue (per-machine)

package/lib/wiki/qmd.ts

@@ -9,8 +9,13 @@
 //   - Embed: Qwen3-Embedding-0.6B   (~610MB, sets QMD_EMBED_MODEL)
 //   - Rerank: Qwen3-Reranker-0.6B   (~610MB, sets QMD_RERANK_MODEL)
 //
-// Per-wiki SQLite DB lives at `~/.rig/cache/qmd/<wiki>.sqlite`. Model GGUFs
-// cache in `~/.cache/qmd/models/` (hardcoded inside qmd).
+// Per-wiki SQLite DB lives at `~/.rig/<project>/wiki/<wiki>.sqlite`, where
+// `<project>` is the `name` from the nearest `package.json` walking up from
+// the vault root (fallback: vault-root basename). The extra `wiki/` segment
+// reserves room for other per-project rig artifacts as siblings. Legacy
+// `~/.rig/cache/qmd/<wiki>.sqlite` is migrated lazily on first open.
+//
+// Model GGUFs still cache in `~/.cache/qmd/models/` (hardcoded inside qmd).
 //
 // Concurrency note: qmd's `setConfigSource` is module-global; serialize
 // store lifetimes by opening + closing inside each call.
@@ -71,10 +76,58 @@ function qmdVersion(): string {
   return 'unknown';
 }
 
-function dbPathFor(wikiName: string): string {
-  const dir = path.join(paths.cache, 'qmd');
+/**
+ * Resolve the project name for a vault: read the `name` field from the
+ * nearest `package.json` walking up from `vaultRoot`. Falls back to
+ * `basename(vaultRoot)` if no package.json with a usable name is found.
+ * Scoped names (`@scope/foo`) are flattened to `scope_foo`.
+ */
+function resolveProjectName(vaultRoot: string): string {
+  let dir = path.resolve(vaultRoot);
+  while (true) {
+    const pkg = path.join(dir, 'package.json');
+    if (fs.existsSync(pkg)) {
+      try {
+        const parsed = JSON.parse(fs.readFileSync(pkg, 'utf8'));
+        if (typeof parsed.name === 'string' && parsed.name.trim()) {
+          return sanitizeSegment(parsed.name.trim());
+        }
+      } catch { /* malformed package.json — keep walking */ }
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return sanitizeSegment(path.basename(vaultRoot)) || 'unknown';
+}
+
+function sanitizeSegment(s: string): string {
+  // npm scoped names use `/`; flatten so we don't create unintended nesting.
+  // Also defang filesystem-hostile chars and leading dots.
+  return s
+    .replace(/^@/, '')
+    .replace(/[/\\]/g, '_')
+    .replace(/[<>:"|?*\x00-\x1f]/g, '_')
+    .replace(/^\.+/, '');
+}
+
+function dbPathFor(wikiName: string, vaultRoot: string): string {
+  const projectName = resolveProjectName(vaultRoot);
+  const dir = path.join(paths.home, projectName, 'wiki');
   fs.mkdirSync(dir, { recursive: true });
-  return path.join(dir, `${wikiName}.sqlite`);
+  const target = path.join(dir, `${wikiName}.sqlite`);
+  // One-shot migration from the legacy flat layout.
+  const legacy = path.join(paths.cache, 'qmd', `${wikiName}.sqlite`);
+  if (!fs.existsSync(target) && fs.existsSync(legacy)) {
+    for (const suffix of ['', '-wal', '-shm']) {
+      const src = legacy + suffix;
+      if (fs.existsSync(src)) {
+        try { fs.renameSync(src, target + suffix); }
+        catch { /* cross-device? leave the legacy file in place */ }
+      }
+    }
+  }
+  return target;
 }
 
 async function loadQmd(): Promise<{ createStore: any }> {
@@ -90,12 +143,13 @@ async function loadQmd(): Promise<{ createStore: any }> {
 export async function qmdEmbed(
   wikiName: string,
   dir: string,
+  vaultRoot: string,
   opts: { force?: boolean } = {}
 ): Promise<{ ok: boolean; stderr: string }> {
   try {
     const { createStore } = await loadQmd();
     const store = await createStore({
-      dbPath: dbPathFor(wikiName),
+      dbPath: dbPathFor(wikiName, vaultRoot),
       config: {
         collections: { [wikiName]: { path: dir, pattern: '**/*.md' } },
       },
@@ -134,6 +188,7 @@ export interface QmdHit {
 export async function qmdQuery(
   q: string,
   wikiName: string,
+  vaultRoot: string,
   opts: { limit?: number; candidateLimit?: number; rerank?: boolean } = {}
 ): Promise<QmdHit[] | null> {
   const limit = opts.limit ?? 10;
@@ -142,7 +197,7 @@ export async function qmdQuery(
 
   try {
     const { createStore } = await loadQmd();
-    const store = await createStore({ dbPath: dbPathFor(wikiName) });
+    const store = await createStore({ dbPath: dbPathFor(wikiName, vaultRoot) });
     try {
       const raw = await store.searchVector(q, { limit: candidateLimit, collection: wikiName });
       const candidates: QmdHit[] = Array.isArray(raw) ? raw.map(normalizeHit) : [];
@@ -191,8 +246,8 @@ function normalizeHit(h: any): QmdHit {
 }
 
 /** Wipe the per-wiki SQLite store on disk. Caller should then qmdEmbed. */
-export function qmdResetStore(wikiName: string): void {
-  const p = dbPathFor(wikiName);
+export function qmdResetStore(wikiName: string, vaultRoot: string): void {
+  const p = dbPathFor(wikiName, vaultRoot);
   for (const suffix of ['', '-wal', '-shm']) {
     const f = p + suffix;
     if (fs.existsSync(f)) fs.rmSync(f, { force: true });

package/lib/wiki/query.ts

@@ -30,7 +30,7 @@ export default async function wikiQuery(q: string, opts: QueryOpts): Promise<voi
   const target = requireVault();
 
   const limit = Math.max(1, Math.min(50, opts.limit || 10));
-  const hits = await qmdQuery(q, target.name, { limit, rerank: opts.rerank !== false });
+  const hits = await qmdQuery(q, target.name, target.root, { limit, rerank: opts.rerank !== false });
   if (hits === null) {
     print.error('qmd query failed. Run `rig wiki index` first to (re)build the vector store.');
     process.exit(1);

package/lib/wiki/rebuild.ts

@@ -2,7 +2,7 @@
 //
 // Use cases:
 //   1. New device: source markdown is checked out, but ~/.rig/state.db and
-//      ~/.rig/cache/qmd/<wiki>.sqlite are empty. Rebuild populates both.
+//      ~/.rig/<project>/wiki/<wiki>.sqlite are empty. Rebuild populates both.
 //   2. Switched embedding model: old vectors are now meaningless. Rebuild
 //      re-embeds against the current QMD_EMBED_MODEL.
 //   3. Local cache corruption: nuke and start over.
@@ -27,10 +27,10 @@ export default async function wikiRebuild(opts: RebuildOpts): Promise<void> {
   const del = db.prepare('DELETE FROM source_sha WHERE wiki = ?').run(t.name);
   print.info(`  cleared ${del.changes} source_sha rows for ${t.name}`);
 
-  qmdResetStore(t.name);
+  qmdResetStore(t.name, t.root);
 
   if (!opts.skipEmbed) {
-    const res = await qmdEmbed(t.name, t.path, { force: true });
+    const res = await qmdEmbed(t.name, t.path, t.root, { force: true });
     if (res.ok) print.info(`  qmd embed: ${t.name} done`);
     else {
       print.error(`  qmd embed: ${t.name} failed: ${res.stderr.trim()}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rigjs",
-  "version": "4.0.14",
-  "versionCode": 26052420,
+  "version": "4.0.15",
+  "versionCode": 26052422,
   "description": "A multi-repos dev tool based on yarn and git.Rigjs is intended to be the simplest way to develop,share and deliver codes between different developers or different projects.",
   "keywords": [
     "modular",