pi-vault-mind 0.8.0 → 0.8.3

package/dist/src/commands.js

@@ -8,10 +8,12 @@ import { DEFAULT_CONFIG } from "./types.js";
 import { CONFIG_FILES, EXT_ROOT, collectionNames, ensureDir, findConfig, getPiContextConfig, hasPiContextTools, loadConfig, } from "./utils.js";
 import { updateActiveCollectionWidget } from "./widget.js";
 import { cancelJobHelper, listJobs, retryJob, } from "./agent-queue.js";
+import { revokeToken, rotateToken } from "./auth.js";
 import { handleDiscoverSchema } from "./discover-schema.js";
 import { runAskIntake } from "./intake.js";
-import { connect, pullOllamaModel, testOllamaConnection } from "./lance.js";
+import { connect, searchHybrid } from "./lance.js";
 import { MODAL_TOKEN_ENV, createModalClient, isModalConfigured, resolveBaseUrl, resolveModalToken, resolveWorkspace, } from "./modal-config.js";
+import { runPersonalize } from "./personalize.js";
 import { createServerState } from "./server.js";
 import { createCollectionWizard, createInjectorWizard, openSettingsDashboard, setupWizard, } from "./settings-ui.js";
 import { reindexRemote, syncAll, syncCollection } from "./sync.js";
@@ -19,48 +21,51 @@ import { tombstoneEntryById } from "./tombstone.js";
 import { expandHome } from "./utils.js";
 import { createWatcherState, getWatcherStatus, startWatcher, stopWatcher } from "./watcher.js";
 // ── Shared helpers ───────────────────────────────────────────────────────────
-const WIKI_USAGE = [
+const VM_USAGE = [
     "**pi-vault-mind Commands**",
     "",
-    "  /wiki init                  Scaffold config + collections",
-    "  /wiki validate              Check LanceDB, config, and collection health",
-    "  /wiki approve [collection]  Batch-review pending entries",
-    "  /wiki tombstone <collection> <entry-id>  Redact an entry in place",
-    "  /wiki settings              Open interactive settings dashboard",
-    "  /wiki audit                 Audit config for missing defaults",
-    "  /wiki reindex               Rebuild FTS + vector indexes (replaces old /qmd-index)",
-    "  /wiki collection select     Select active collection",
-    "  /wiki collection create     Create a new collection (wizard)",
-    "  /wiki discover-schema       Infer schema from a JSONL file",
-    "  /wiki injector create       Create a new injector (wizard)",
-    "  /wiki context enable|disable  Enable/disable pi-context integration",
-    "  /wiki context status        Show pi-context integration status",
-    "  /wiki embedding status      Show embedding config + Ollama models",
-    "  /wiki embedding use         Switch provider (ollama | transformers | modal)",
-    "  /wiki embedding model       Set Ollama embedding model",
-    "  /wiki embedding models      List available Ollama models",
-    "  /wiki embedding pull        Pull a model from Ollama",
-    "  /wiki modal status          Show Modal config + health + remote collections",
-    "  /wiki modal config          Set Modal baseUrl/model/dim/sync/fallback",
-    "  /wiki modal sync            Pull server vectors into local LanceDB [--full]",
-    "  /wiki modal jobs <id>       Poll a Modal bulk job",
-    "  /wiki modal migrate <model> Change canonical model + re-embed (remote)",
-    "  /wiki watcher start          Start passive file watcher",
-    "  /wiki watcher stop           Stop passive file watcher",
-    "  /wiki watcher status         Show watcher status",
-    "  /wiki watcher queue [status] Show agent dispatch queue (pending|running|done|failed|cancelled|all)",
-    "  /wiki watcher retry <id>     Retry a failed or cancelled agent job",
-    "  /wiki watcher cancel <id>    Cancel a pending agent job",
-    "  /wiki server status          Show HTTP server status + port",
-    "  /wiki setup                  Interactive global config wizard",
-    "  /wiki setup --vault <path>   CLI: set vault path",
-    "  /wiki setup --provider <p>   CLI: set embedding provider",
-    "  /wiki help                  Show this help",
+    "  /vm init                    Scaffold config + collections",
+    "  /vm validate                Check LanceDB, config, and collection health",
+    "  /vm validate --audit         Audit config for missing defaults",
+    "  /vm approve [collection]    Batch-review pending entries",
+    "  /vm query <collection> <query>      Hybrid semantic + FTS search",
+    "  /vm tombstone <collection> <entry-id>  Redact an entry in place",
+    "  /vm settings                Open interactive settings dashboard",
+    "  /vm collection select       Select active collection",
+    "  /vm collection list         List configured collections",
+    "  /vm collection create       Create a new collection (wizard)",
+    "  /vm collection reindex      Rebuild FTS + vector indexes (replaces old /qmd-index)",
+    "  /vm discover-schema         Infer schema from a JSONL file",
+    "  /vm injector create         Create a new injector (wizard)",
+    "  /vm context enable|disable  Enable/disable pi-context integration",
+    "  /vm embedding status        Show embedding config",
+    "  /vm remote status          Show remote provider config + health + collections",
+    "  /vm remote config          Set remote provider baseUrl/model/dim/sync/fallback",
+    "  /vm remote auto            One-command remote setup (workspace → URL, model discovery)",
+    "  /vm remote sync            Pull server vectors into local LanceDB [--full]",
+    "  /vm remote jobs <id>       Poll a remote bulk embed job",
+    "  /vm watcher start          Start passive file watcher",
+    "  /vm watcher stop           Stop passive file watcher",
+    "  /vm watcher status         Show watcher status",
+    "  /vm watcher queue [status] Show agent dispatch queue (pending|running|done|failed|cancelled|all)",
+    "  /vm watcher retry <id>     Retry a failed or cancelled agent job",
+    "  /vm watcher cancel <id>    Cancel a pending agent job",
+    "  /vm server status          Show HTTP server status + port",
+    "  /vm personalize            Analyze vault and suggest personality tuning for system.md + AGENTS.md",
+    "  /vm setup                  Interactive global config wizard",
+    "  /vm setup --vault <path>   CLI: set vault path",
+    "  /vm setup --remoteUrl <url> CLI: set remote embedding URL",
+    "  /vm setup --localUrl <url> CLI: set local embedding URL",
+    "  /vm token                  Show API token source and masked value",
+    "  /vm token show             Show API token source and masked value",
+    "  /vm token rotate           Generate + persist a new API token (old token invalidated)",
+    "  /vm token revoke \u003cidentity\u003e  Remove PVM_TOKEN_\u003cIDENTITY\u003e from ~/.pi/agent/vault-mind.env",
+    "  /vm help                   Show this help",
 ].join("\n");
 export const auditConfig = async (ctx) => {
     const { project: cfgPath } = findConfig(ctx.cwd);
     if (!cfgPath) {
-        ctx.ui.notify("No project config file found to audit. Run /wiki init first.", "info");
+        ctx.ui.notify("No project config file found to audit. Run /vm init first.", "info");
         return;
     }
     const projectCfg = JSON.parse(fs.readFileSync(cfgPath, "utf-8"));
@@ -156,7 +161,7 @@ export const selectActiveCollection = async (ctx) => {
         ctx.ui.notify(`Active collection set to: ${result}`, "info");
     }
 };
-// ── /wiki init ──────────────────────────────────────────────────────────────
+// ── /vm init ──────────────────────────────────────────────────────────────
 /**
  * Vault-root `.gitignore` entries that keep pi-vault-mind compatible with
  * `obsidian-git` (and, transitively, Obsidian Sync setups that also back up via
@@ -230,12 +235,10 @@ const handleInit = async (_args, ctx, pi) => {
                     artifactPath: "collections/artifact.md",
                 },
             ],
-            wiki: {
+            vaultMind: {
                 dataDir: ".lancedb",
                 embedding: {
-                    provider: "transformers",
-                    ollamaModel: "embeddinggemma",
-                    ollamaHost: "http://127.0.0.1:11434",
+                    model: "embeddinggemma",
                 },
                 ftsEnabled: true,
                 graph: { enabled: true, canvasSync: false },
@@ -247,10 +250,12 @@ const handleInit = async (_args, ctx, pi) => {
     else {
         skipped.push(cfgDest);
     }
-    for (const [name, def] of Object.entries(cfg.collections)) {
+    // Reload the config we just wrote so we scaffold the collections it defines.
+    const effectiveCfg = fs.existsSync(cfgDest) ? loadConfig(ctx.cwd) : cfg;
+    for (const [name, def] of Object.entries(effectiveCfg.collections)) {
         ensureFile(def.path, name === "pending" ? "PENDING_LEDGER.jsonl" : "UCL_LEDGER.jsonl");
     }
-    for (const ij of cfg.injectors) {
+    for (const ij of effectiveCfg.injectors) {
         if (ij.artifactPath)
             ensureFile(ij.artifactPath, "ARTIFACT.md");
     }
@@ -270,7 +275,7 @@ const handleInit = async (_args, ctx, pi) => {
         skipped.push(gitignoreDest);
     }
     const msg = [
-        "Wiki scaffolding complete.",
+        "Vault-mind scaffolding complete.",
         "",
         "Created:",
         ...created.map((c) => `  • ${path.relative(ctx.cwd, c)}`),
@@ -303,20 +308,28 @@ const handleInit = async (_args, ctx, pi) => {
         }
     }
 };
-// ── /wiki validate ───────────────────────────────────────────────────────────
+// ── /vm validate ───────────────────────────────────────────────────────────
 const handleValidate = async (_args, ctx, pi) => {
+    const flags = new Set(_args
+        .trim()
+        .split(/\s+/)
+        .filter(Boolean)
+        .map((t) => t.toLowerCase()));
+    if (flags.has("--audit")) {
+        return auditConfig(ctx);
+    }
     const cfg = loadConfig(ctx.cwd);
     const lines = [];
     try {
-        await connect(cfg.wiki.dataDir);
-        lines.push(`✅ LanceDB: Connected to ${cfg.wiki.dataDir}`);
+        await connect(cfg.vaultMind.dataDir);
+        lines.push(`✅ LanceDB: Connected to ${cfg.vaultMind.dataDir}`);
     }
     catch (err) {
         lines.push(`❌ LanceDB: Connection failed. ${err.message}`);
     }
     // Check LanceDB tables
     try {
-        const db = await connect(cfg.wiki.dataDir);
+        const db = await connect(cfg.vaultMind.dataDir);
         const tableNames = await db.tableNames();
         lines.push(`📊 LanceDB tables: ${tableNames.length > 0 ? tableNames.join(", ") : "(none — created on first append)"}`);
     }
@@ -341,13 +354,13 @@ const handleValidate = async (_args, ctx, pi) => {
     lines.push(`       - Config enabled: ${contextCfg.enabled ? "✅ Yes" : "❌ No"}`);
     lines.push(`       - Will capture events: ${willCapture ? "✅ Yes — on next turn" : "❌ No"}`);
     if (hasContext && !contextCfg.enabled)
-        lines.push("       → Run /wiki context enable to activate");
+        lines.push("       → Run /vm context enable to activate");
     if (!hasContext && contextCfg.enabled)
         lines.push("       ⚠️  Config says enabled but tools missing. Install with: pi install npm:pi-context");
     if (ctx.hasUI)
         ctx.ui.notify(lines.join("\n"), "info");
 };
-// ── /wiki approve ────────────────────────────────────────────────────────────
+// ── /vm approve ────────────────────────────────────────────────────────────
 const handleApprove = async (args, ctx) => {
     const cfg = loadConfig(ctx.cwd);
     const pending = cfg.collections.pending;
@@ -394,11 +407,106 @@ const handleApprove = async (args, ctx) => {
     fs.writeFileSync(pending.path, rejected.join("\n") + (rejected.length > 0 ? "\n" : ""));
     ctx.ui.notify(`Approved ${approved} → "${targetName}". Rejected ${rejected.length}.`, "info");
 };
-// ── /wiki tombstone ─────────────────────────────────────────────────────────
+// ── /vm query ─────────────────────────────────────────────────────────────
+const handleQuery = async (args, ctx) => {
+    const parts = args.trim().split(/\s+/).filter(Boolean);
+    if (parts.length === 0) {
+        ctx.ui.notify("Usage: /vm query [collection] <query>", "error");
+        return;
+    }
+    const cfg = loadConfig(ctx.cwd);
+    let collection = getActiveCollection(ctx.cwd) || "main";
+    let query = args.trim();
+    if (parts.length > 1 && cfg.collections[parts[0]]) {
+        collection = parts[0];
+        query = parts.slice(1).join(" ");
+    }
+    const def = cfg.collections[collection];
+    if (!def) {
+        ctx.ui.notify(`Unknown collection "${collection}". Run /vm init first.`, "error");
+        return;
+    }
+    try {
+        const results = await searchHybrid(cfg.vaultMind.dataDir, collection, query, 20, cfg.vaultMind);
+        if (results.length === 0) {
+            ctx.ui.notify(`No results for "${query}" in "${collection}".`, "info");
+            return;
+        }
+        // Rich TUI table when UI is available; plain text fallback for RPC
+        if (ctx.hasUI) {
+            await renderQueryResults(ctx, collection, query, results);
+        }
+        else {
+            const lines = [
+                `**Search results (${results.length}) for "${query}" in "${collection}":**`,
+                "",
+            ];
+            for (const r of results) {
+                const row = r;
+                const fact = String(row.fact ?? row.text ?? "(no text)");
+                lines.push(`- ${fact.slice(0, 120)}${fact.length > 120 ? "..." : ""}`);
+            }
+            ctx.ui.notify(lines.join("\n"), "info");
+        }
+    }
+    catch (err) {
+        ctx.ui.notify(`Search failed: ${err.message}`, "error");
+    }
+};
+/** Render search results as a scrollable TUI table with column headers. */
+async function renderQueryResults(ctx, collection, query, results) {
+    // Infer columns from the first result
+    const first = results[0];
+    const keys = first ? Object.keys(first).filter((k) => !k.startsWith("_")) : [];
+    const displayKeys = keys.length > 0 ? keys : ["(raw)"];
+    // Build rows: each row is an array of truncated cell values
+    const colWidths = displayKeys.map((k) => Math.min(k.length + 2, 20));
+    const rows = [];
+    for (const r of results) {
+        const row = r;
+        const cells = displayKeys.map((k, i) => {
+            const raw = String(row[k] ?? "");
+            const max = colWidths[i];
+            return raw.length > max ? `${raw.slice(0, max - 1)}…` : raw.padEnd(max);
+        });
+        rows.push(cells);
+    }
+    // Header
+    const header = displayKeys.map((k, i) => k.padEnd(colWidths[i])).join(" ");
+    const divider = "─".repeat(header.length);
+    const lines = [
+        `${results.length} results for "${query}" in ${collection}`,
+        divider,
+        header,
+        divider,
+        ...rows.map((r) => r.join(" ")),
+    ];
+    await ctx.ui.custom((tui, theme, _keybindings, done) => {
+        const container = new Container();
+        let y = 0;
+        container.addChild(new Text(theme.fg("accent", lines[0]), 1, ++y));
+        container.addChild(new Text(theme.fg("dim", lines[1]), 1, ++y));
+        container.addChild(new Text(theme.fg("accent", lines[2]), 1, ++y));
+        container.addChild(new Text(theme.fg("dim", lines[3]), 1, ++y));
+        for (let i = 4; i < lines.length; i++) {
+            container.addChild(new Text(lines[i], 1, ++y));
+        }
+        container.addChild(new Text(theme.fg("dim", "esc to close"), 1, ++y));
+        return {
+            render: (w) => container.render(w),
+            handleInput: (data) => {
+                if (data === "\x1b")
+                    done(null);
+            },
+            invalidate: () => container.invalidate(),
+        };
+    }, { overlay: true });
+}
+// ── /vm tombstone ─────────────────────────────────────────────────────────
 const handleTombstone = async (args, ctx) => {
     const parts = args.trim().split(/\s+/).filter(Boolean);
     if (parts.length < 2) {
-        ctx.ui.notify("Usage: /wiki tombstone <collection> <entry-id>", "error");
+        ctx.ui.notify("Usage: /vm tombstone <collection> <entry-id>", "error");
         return;
     }
     const collection = parts[0];
@@ -412,7 +520,7 @@ const handleTombstone = async (args, ctx) => {
     const result = tombstoneEntryById(def.path, entryId);
     ctx.ui.notify(result.message, result.success ? "info" : "error");
 };
-// ── /wiki reindex ────────────────────────────────────────────────────────────
+// ── /vm reindex ────────────────────────────────────────────────────────────
 const handleReindex = async (args, ctx, pi) => {
     const cfg = loadConfig(ctx.cwd);
     const tokens = args.trim().split(/\s+/).filter(Boolean);
@@ -423,12 +531,12 @@ const handleReindex = async (args, ctx, pi) => {
     const collectionFilter = reindexAll || rebuildEmbeddings ? null : (tokens.find((t) => !t.startsWith("--")) ?? null);
     // Remote bulk re-index: read JSONL → submit Modal bulk job → poll → sync down.
     if (remote) {
-        if (cfg.wiki.embedding.provider !== "modal") {
-            ctx.ui.notify("--remote requires the modal provider. Run /wiki embedding use modal.", "error");
+        if (!cfg.vaultMind.embedding.remoteUrl) {
+            ctx.ui.notify("--remote requires remoteUrl. Set it up via /vm setup.", "error");
             return;
         }
-        if (!isModalConfigured(cfg.wiki)) {
-            ctx.ui.notify(`Modal not configured. Set baseUrl (/wiki modal config baseUrl) and ${MODAL_TOKEN_ENV}.`, "error");
+        if (!isModalConfigured(cfg.vaultMind)) {
+            ctx.ui.notify(`Remote provider not configured. Set baseUrl (/vm remote config baseUrl) and ${MODAL_TOKEN_ENV}.`, "error");
             return;
         }
         const names = reindexAll
@@ -466,7 +574,7 @@ const handleReindex = async (args, ctx, pi) => {
             continue;
         const tableName = `collection_${name}`;
         try {
-            const db = await connect(cfg.wiki.dataDir);
+            const db = await connect(cfg.vaultMind.dataDir);
             const existing = await db.tableNames();
             if (!existing.includes(tableName)) {
                 lines.push(`  ⚠️  ${tableName}: table not found (created on first append)`);
@@ -486,7 +594,7 @@ const handleReindex = async (args, ctx, pi) => {
             else {
                 // Rebuild FTS index
                 try {
-                    if (cfg.wiki.ftsEnabled !== false) {
+                    if (cfg.vaultMind.ftsEnabled !== false) {
                         await table.createIndex("fact", { config: lancedb.Index.fts(), replace: true });
                         lines.push(`  ✅ ${tableName}: FTS index rebuilt`);
                     }
@@ -515,7 +623,7 @@ const handleReindex = async (args, ctx, pi) => {
     if (reindexAll) {
         for (const graphTable of ["entities", "relations"]) {
             try {
-                const db = await connect(cfg.wiki.dataDir);
+                const db = await connect(cfg.vaultMind.dataDir);
                 const existing = await db.tableNames();
                 if (existing.includes(graphTable)) {
                     const table = await db.openTable(graphTable);
@@ -534,10 +642,10 @@ const handleReindex = async (args, ctx, pi) => {
     lines.unshift("**Reindex Report:**", "");
     lines.push("", rebuildEmbeddings
         ? "Entries will be re-embedded with current embedding model on next append."
-        : "Use /wiki reindex --reembed to regenerate embeddings after model switch.");
+        : "Use /vm reindex --reembed to regenerate embeddings after model switch.");
     ctx.ui.notify(lines.join("\n"), "info");
 };
-// ── /wiki embedding ──────────────────────────────────────────────────────────
+// ── /vm embedding ──────────────────────────────────────────────────────────
 const handleEmbedding = async (args, ctx, pi) => {
     const cfg = loadConfig(ctx.cwd);
     const parts = args.trim().split(/\s+/g);
@@ -545,151 +653,58 @@ const handleEmbedding = async (args, ctx, pi) => {
     const value = parts.slice(1).join(" ");
     const { project: cfgPath } = findConfig(ctx.cwd);
     if (!cfgPath) {
-        ctx.ui.notify("No config found. Run /wiki init first.", "error");
+        ctx.ui.notify("No config found. Run /vm init first.", "error");
         return;
     }
     switch (subcommand) {
         case "status": {
+            const emb = cfg.vaultMind.embedding;
             const lines = [
                 "**Embedding Configuration**",
                 "",
-                `Provider: ${cfg.wiki.embedding.provider}`,
-                cfg.wiki.embedding.provider === "ollama"
-                    ? `Model: ${cfg.wiki.embedding.ollamaModel || "embeddinggemma"}`
-                    : cfg.wiki.embedding.provider === "modal"
-                        ? `Model: ${cfg.wiki.embedding.modal?.model || "(default embeddinggemma)"}`
-                        : "Model: all-MiniLM-L6-v2 (384 dims)",
-                `FTS: ${cfg.wiki.ftsEnabled !== false ? "enabled" : "disabled"}`,
-                `Graph: ${cfg.wiki.graph?.enabled !== false ? "enabled" : "disabled"}`,
-                `Data Dir: ${cfg.wiki.dataDir}`,
+                `Remote URL: ${emb.remoteUrl || "none"}`,
+                `Local URL: ${emb.localUrl || "none"}`,
+                `Model: ${emb.model || "(default)"}`,
+                `API Key: ${emb.apiKey ? "configured" : "none"}`,
+                `Dim: ${emb.dim || "(native)"}`,
+                `FTS: ${cfg.vaultMind.ftsEnabled !== false ? "enabled" : "disabled"}`,
+                `Graph: ${cfg.vaultMind.graph?.enabled !== false ? "enabled" : "disabled"}`,
+                `Data Dir: ${cfg.vaultMind.dataDir}`,
             ];
-            if (cfg.wiki.embedding.provider === "modal") {
-                const modal = cfg.wiki.embedding.modal;
-                const tokenSrc = process.env[MODAL_TOKEN_ENV]
-                    ? `env ${MODAL_TOKEN_ENV} ✅`
-                    : modal?.apiToken
-                        ? "config (set env PVM_API_TOKEN to override)"
-                        : "❌ none (set PVM_API_TOKEN env)";
-                lines.push("", "**Modal:**", `  Base URL: ${modal?.baseUrl || "❌ not set"}`, `  Model: ${modal?.model || "(default embeddinggemma)"}`, `  Dim: ${modal?.dim ?? "(native)"}`, `  Token: ${tokenSrc}`, `  Fallback: ${modal?.fallback?.enabled === false ? "disabled" : modal?.fallback?.provider || "(none — degrade to FTS)"}`, `  Sync: auto=${modal?.sync?.autoSync ? "on" : "off"}, interval=${modal?.sync?.autoSyncIntervalMs ?? 300000}ms`);
-                const co = cfg.wiki.embedding.coalesce;
+            if (emb.modal) {
+                const modal = emb.modal;
+                lines.push("", "**Remote Provider (Modal):**", `  Workspace: ${modal.workspace || "(default)"}`, `  Fallback: ${modal.fallback?.enabled === false ? "disabled" : modal.fallback?.provider || "(none — degrade to FTS)"}`, `  Sync: auto=${modal.sync?.autoSync ? "on" : "off"}, interval=${modal.sync?.autoSyncIntervalMs ?? 300000}ms`);
+                const co = emb.coalesce;
                 if (co) {
                     lines.push(`  Coalesce: debounce=${co.debounceMs ?? 1000}ms, batch=${co.maxBatchSize ?? 64}, concurrency=${co.maxConcurrentFlushes ?? 2}, dedupe=${co.dedupe ?? true}, searchBypass=${co.searchBypass ?? true}`);
                 }
             }
-            else if (cfg.wiki.embedding.provider === "ollama" || !cfg.wiki.embedding.provider) {
-                const conn = await testOllamaConnection(pi);
-                lines.push("", "**Ollama Status:**", `  Reachable: ${conn.reachable ? "✅ Yes" : "❌ No"}`);
-                if (conn.error)
-                    lines.push(`  Error: ${conn.error}`);
-                if (conn.models.length > 0) {
-                    lines.push(`  Available models (${conn.models.length}):`);
-                    for (const m of conn.models.slice(0, 10)) {
-                        const isCurrent = m.name === cfg.wiki.embedding.ollamaModel;
-                        lines.push(`    ${isCurrent ? "★" : " "} ${m.name} (${m.size})`);
-                    }
-                    if (conn.models.length > 10)
-                        lines.push(`    ... and ${conn.models.length - 10} more`);
-                }
-                else {
-                    lines.push("  No models found. Pull one with: /wiki embedding pull embeddinggemma");
-                }
-            }
-            else {
-                lines.push("", "**Transformers:** Using Xenova/all-MiniLM-L6-v2 (384 dims)", "  Downloads on first use and caches locally.");
-            }
             ctx.ui.notify(lines.join("\n"), "info");
             return;
         }
-        case "use": {
-            if (!value || !["ollama", "transformers", "modal"].includes(value)) {
-                ctx.ui.notify("/wiki embedding use <ollama|transformers|modal>", "error");
-                return;
-            }
-            if (value === "ollama") {
-                const conn = await testOllamaConnection(pi);
-                if (!conn.reachable) {
-                    const confirm = await ctx.ui.confirm("Ollama Not Reachable", "Cannot connect to Ollama. Switch anyway?\n\nVerify with:\n  ollama list\n  ollama pull embeddinggemma");
-                    if (!confirm)
-                        return;
-                }
-            }
-            if (value === "modal") {
-                const modal = cfg.wiki.embedding.modal;
-                if (!modal?.baseUrl) {
-                    ctx.ui.notify("Modal needs a base URL. Set it with: /wiki modal config baseUrl <url>\n(Token via PVM_API_TOKEN env, preferred.)", "warning");
-                }
-            }
-            const existing = JSON.parse(fs.readFileSync(cfgPath, "utf-8"));
-            existing.wiki = existing.wiki || {};
-            existing.wiki.embedding = existing.wiki.embedding || {};
-            existing.wiki.embedding.provider = value;
-            fs.writeFileSync(cfgPath, `${JSON.stringify(existing, null, 2)}\n`, "utf-8");
-            ctx.ui.notify(`✅ Embedding provider set to: ${value}. Restart session for changes to take effect.`, "info");
-            return;
-        }
-        case "model": {
-            if (!value) {
-                ctx.ui.notify(`Current: ${cfg.wiki.embedding.ollamaModel || "embeddinggemma"}. Usage: /wiki embedding model <name>`, "info");
-                return;
-            }
-            const existing = JSON.parse(fs.readFileSync(cfgPath, "utf-8"));
-            existing.wiki = existing.wiki || {};
-            existing.wiki.embedding = existing.wiki.embedding || {};
-            existing.wiki.embedding.ollamaModel = value;
-            fs.writeFileSync(cfgPath, `${JSON.stringify(existing, null, 2)}\n`, "utf-8");
-            ctx.ui.notify(`✅ Ollama embedding model set to: ${value}`, "info");
-            return;
-        }
-        case "models": {
-            const conn = await testOllamaConnection(pi);
-            if (!conn.reachable) {
-                ctx.ui.notify("❌ Ollama not reachable.", "error");
-                return;
-            }
-            if (conn.models.length === 0) {
-                ctx.ui.notify("No models found. Pull one with: /wiki embedding pull embeddinggemma", "info");
-                return;
-            }
-            const lines = ["**Available Ollama Models:**", ""];
-            for (const m of conn.models) {
-                lines.push(`  ${m.name === cfg.wiki.embedding.ollamaModel ? "★" : " "} ${m.name} (${m.size})`);
-            }
-            ctx.ui.notify(lines.join("\n"), "info");
-            return;
-        }
-        case "pull": {
-            if (!value) {
-                ctx.ui.notify("/wiki embedding pull <model>. Try: embeddinggemma", "error");
-                return;
-            }
-            ctx.ui.notify(`Pulling "${value}" from Ollama... (this may take a while)`, "info");
-            const result = await pullOllamaModel(value, pi);
-            ctx.ui.notify(result.message, result.success ? "info" : "error");
-            return;
-        }
         default: {
-            ctx.ui.notify(`Unknown: ${subcommand}. Try: status, use, model, models, pull`, "error");
+            ctx.ui.notify(`Unknown: ${subcommand}. Try: status`, "error");
             return;
         }
     }
 };
-// ── /wiki modal ──────────────────────────────────────────────────────────────
+// ── /vm remote (Modal provider) ─────────────────────────────────────────────
 const MODAL_CONFIG_USAGE = [
-    "**/wiki modal config**",
+    "**/vm remote config**",
     "",
-    "  /wiki modal config baseUrl <url>        Set the Modal ASGI base URL",
-    "  /wiki modal config workspace <name>     Derive the Modal URL from workspace slug",
-    "  /wiki modal config model <name>         Set the canonical embedder (default embeddinggemma)",
-    "  /wiki modal config dim <n>              Set output dimension (omit for native)",
-    "  /wiki modal config fallback ollama|none  Set offline fallback provider",
-    "  /wiki modal config sync auto on|off     Toggle auto-sync",
-    "  /wiki modal config sync interval <ms>   Auto-sync interval",
-    "  /wiki modal config pageSize <n>         Sync page size",
-    "  /wiki modal config coalesce debounce <ms>  Coalescer debounce window",
-    "  /wiki modal config coalesce batch <n>   Coalescer max batch size",
-    "  /wiki modal config token                Show token guidance (use PVM_API_TOKEN env)",
+    "  /vm remote config baseUrl <url>        Set the remote ASGI base URL",
+    "  /vm remote config workspace <name>     Derive the Modal URL from workspace slug",
+    "  /vm remote config model <name>         Set the canonical embedder (default embeddinggemma)",
+    "  /vm remote config dim <n>              Set output dimension (omit for native)",
+    "  /vm remote config fallback ollama|none  Set offline fallback provider",
+    "  /vm remote config sync auto on|off     Toggle auto-sync",
+    "  /vm remote config sync interval <ms>   Auto-sync interval",
+    "  /vm remote config pageSize <n>         Sync page size",
+    "  /vm remote config coalesce debounce <ms>  Coalescer debounce window",
+    "  /vm remote config coalesce batch <n>   Coalescer max batch size",
+    "  /vm remote config token                Show token guidance (use PVM_API_TOKEN env)",
     "",
-    "  (no args) Show current Modal config",
+    "  (no args) Show current remote config",
 ].join("\n");
 /** Read the raw project config object (mutable). */
 const readProjectConfig = (cfgPath) => {
@@ -704,41 +719,41 @@ const writeProjectConfig = (cfgPath, obj) => {
     fs.writeFileSync(cfgPath, `${JSON.stringify(obj, null, 2)}\n`, "utf-8");
 };
 const modalSection = (obj) => {
-    obj.wiki = obj.wiki || {};
-    const wiki = obj.wiki;
-    wiki.embedding = wiki.embedding || {};
-    const emb = wiki.embedding;
+    obj.vaultMind = obj.vaultMind || {};
+    const vaultMind = obj.vaultMind;
+    vaultMind.embedding = vaultMind.embedding || {};
+    const emb = vaultMind.embedding;
     emb.modal = emb.modal || {};
     return emb.modal;
 };
 const handleModalConfig = async (args, ctx) => {
     const { project: cfgPath } = findConfig(ctx.cwd);
     if (!cfgPath) {
-        ctx.ui.notify("No config found. Run /wiki init first.", "error");
+        ctx.ui.notify("No config found. Run /vm init first.", "error");
         return;
     }
     const cfg = loadConfig(ctx.cwd);
     const parts = args.trim().split(/\s+/).filter(Boolean);
     const key = parts[0]?.toLowerCase();
-    const modal = cfg.wiki.embedding.modal ?? {};
+    const modal = cfg.vaultMind.embedding.modal ?? {};
     if (!key) {
-        const tokenSrc = resolveModalToken(cfg.wiki)
+        const tokenSrc = resolveModalToken(cfg.vaultMind)
             ? "env or ~/.pi/agent/vault-mind.env ✅"
             : modal.apiToken
                 ? "config (set PVM_API_TOKEN env/dotenv to override)"
                 : "❌ none (set PVM_API_TOKEN env or ~/.pi/agent/vault-mind.env)";
-        const derivedUrl = resolveBaseUrl(cfg.wiki);
+        const derivedUrl = resolveBaseUrl(cfg.vaultMind);
         const lines = [
             "**Modal Config:**",
             "",
-            `  workspace: ${resolveWorkspace(cfg.wiki) || "(not set)"}`,
+            `  workspace: ${resolveWorkspace(cfg.vaultMind) || "(not set)"}`,
             `  baseUrl: ${modal.baseUrl || (derivedUrl ? `${derivedUrl} (derived)` : "❌ not set")}`,
             `  model: ${modal.model || "(default embeddinggemma)"}`,
             `  dim: ${modal.dim ?? "(native)"}`,
             `  token: ${tokenSrc}`,
             `  fallback: ${modal.fallback?.enabled === false ? "disabled" : modal.fallback?.provider || "(none)"}`,
             `  sync: ${JSON.stringify(modal.sync ?? {})}`,
-            `  coalesce: ${JSON.stringify(cfg.wiki.embedding.coalesce ?? {})}`,
+            `  coalesce: ${JSON.stringify(cfg.vaultMind.embedding.coalesce ?? {})}`,
         ];
         ctx.ui.notify(lines.join("\n"), "info");
         return;
@@ -759,7 +774,7 @@ const handleModalConfig = async (args, ctx) => {
         case "url": {
             const url = parts[1];
             if (!url) {
-                ctx.ui.notify("/wiki modal config baseUrl <url>", "error");
+                ctx.ui.notify("/vm remote config baseUrl <url>", "error");
                 return;
             }
             m.baseUrl = url.replace(/\/$/, "");
@@ -769,7 +784,7 @@ const handleModalConfig = async (args, ctx) => {
         }
         case "model": {
             if (!parts[1]) {
-                ctx.ui.notify("/wiki modal config model <name>", "error");
+                ctx.ui.notify("/vm remote config model <name>", "error");
                 return;
             }
             m.model = parts[1];
@@ -793,7 +808,7 @@ const handleModalConfig = async (args, ctx) => {
                 m.fallback = { enabled: true, provider: v };
             }
             else {
-                ctx.ui.notify("/wiki modal config fallback <ollama|transformers|none>", "error");
+                ctx.ui.notify("/vm remote config fallback <ollama|transformers|none>", "error");
                 return;
             }
             writeProjectConfig(cfgPath, obj);
@@ -819,7 +834,7 @@ const handleModalConfig = async (args, ctx) => {
                 sync.collections = parts.slice(2);
             }
             else {
-                ctx.ui.notify("/wiki modal config sync <auto on|off|interval <ms>|pageSize <n>|collections ...>", "error");
+                ctx.ui.notify("/vm remote config sync <auto on|off|interval <ms>|pageSize <n>|collections ...>", "error");
                 return;
             }
             m.sync = sync;
@@ -829,8 +844,8 @@ const handleModalConfig = async (args, ctx) => {
         }
         case "coalesce": {
             const sub = parts[1]?.toLowerCase();
-            const wiki = obj.wiki || {};
-            const emb = wiki.embedding || {};
+            const vaultMind = obj.vaultMind || {};
+            const emb = vaultMind.embedding || {};
             const co = emb.coalesce || {};
             if (sub === "debounce") {
                 if (!setNum(co, "debounceMs", parts[2] ?? ""))
@@ -845,7 +860,7 @@ const handleModalConfig = async (args, ctx) => {
                     return;
             }
             else {
-                ctx.ui.notify("/wiki modal config coalesce <debounce|batch|concurrency> <n>", "error");
+                ctx.ui.notify("/vm remote config coalesce <debounce|batch|concurrency> <n>", "error");
                 return;
             }
             emb.coalesce = co;
@@ -868,24 +883,24 @@ const handleModal = async (args, ctx, pi) => {
     const rest = parts.slice(1).join(" ");
     switch (sub) {
         case "status": {
-            const modal = cfg.wiki.embedding.modal;
-            const tokenSrc = resolveModalToken(cfg.wiki)
+            const modal = cfg.vaultMind.embedding.modal;
+            const tokenSrc = resolveModalToken(cfg.vaultMind)
                 ? "env or ~/.pi/agent/vault-mind.env ✅"
                 : modal?.apiToken
                     ? "config"
                     : "❌ none";
-            const derivedUrl = resolveBaseUrl(cfg.wiki);
+            const derivedUrl = resolveBaseUrl(cfg.vaultMind);
             const lines = [
-                "**Modal Status**",
+                "**Remote Status**",
                 "",
-                `Configured: ${isModalConfigured(cfg.wiki) ? "✅" : "❌"}`,
-                `  workspace: ${resolveWorkspace(cfg.wiki) || "(not set)"}`,
+                `Configured: ${isModalConfigured(cfg.vaultMind) ? "✅" : "❌"}`,
+                `  workspace: ${resolveWorkspace(cfg.vaultMind) || "(not set)"}`,
                 `  baseUrl: ${modal?.baseUrl || (derivedUrl ? `${derivedUrl} (derived)` : "(not set)")}`,
                 `  model: ${modal?.model || "(default embeddinggemma)"}`,
                 `  dim: ${modal?.dim ?? "(native)"}`,
                 `  token: ${tokenSrc}`,
             ];
-            const client = createModalClient(cfg.wiki);
+            const client = createModalClient(cfg.vaultMind);
             if (client) {
                 try {
                     const health = await client.health();
@@ -911,8 +926,8 @@ const handleModal = async (args, ctx, pi) => {
             await handleModalConfig(rest, ctx);
             return;
         case "sync": {
-            if (!isModalConfigured(cfg.wiki)) {
-                ctx.ui.notify(`Modal not configured. Set baseUrl + ${MODAL_TOKEN_ENV} first.`, "error");
+            if (!isModalConfigured(cfg.vaultMind)) {
+                ctx.ui.notify(`Remote provider not configured. Set baseUrl + ${MODAL_TOKEN_ENV} first.`, "error");
                 return;
             }
             const syncTokens = rest.split(/\s+/).filter(Boolean);
@@ -938,12 +953,12 @@ const handleModal = async (args, ctx, pi) => {
         case "jobs": {
             const jobId = parts[1];
             if (!jobId) {
-                ctx.ui.notify("/wiki modal jobs <job_id>  — poll a Modal bulk job.\n(Server-side job listing is pending upstream.)", "info");
+                ctx.ui.notify("/vm remote jobs <job_id>  — poll a Modal bulk job.\n(Server-side job listing is pending upstream.)", "info");
                 return;
             }
-            const client = createModalClient(cfg.wiki);
+            const client = createModalClient(cfg.vaultMind);
             if (!client) {
-                ctx.ui.notify("Modal not configured.", "error");
+                ctx.ui.notify("Remote provider not configured.", "error");
                 return;
             }
             try {
@@ -965,20 +980,20 @@ const handleModal = async (args, ctx, pi) => {
         case "auto": {
             const cfgPath = findConfig(ctx.cwd).project;
             if (!cfgPath) {
-                ctx.ui.notify("No project config found. Run /wiki init first.", "error");
+                ctx.ui.notify("No project config found. Run /vm init first.", "error");
                 return;
             }
-            const workspace = resolveWorkspace(cfg.wiki);
-            if (!workspace && !cfg.wiki.embedding.modal?.baseUrl) {
-                ctx.ui.notify("Modal workspace or baseUrl not configured. Run:\n  /wiki modal config workspace <name>", "error");
+            const workspace = resolveWorkspace(cfg.vaultMind);
+            if (!workspace && !cfg.vaultMind.embedding.modal?.baseUrl) {
+                ctx.ui.notify("Modal workspace or baseUrl not configured. Run:\n  /vm remote config workspace <name>", "error");
             }
-            const token = resolveModalToken(cfg.wiki);
+            const token = resolveModalToken(cfg.vaultMind);
             if (!token) {
                 ctx.ui.notify("Modal token not found. Set PVM_API_TOKEN env or write it to ~/.pi/agent/vault-mind.env", "error");
                 return;
             }
             ctx.ui.notify("🔄 Auto-configuring Modal...", "info");
-            const client = createModalClient(cfg.wiki);
+            const client = createModalClient(cfg.vaultMind);
             if (!client) {
                 ctx.ui.notify("Could not create Modal client (missing workspace/baseUrl or token).", "error");
                 return;
@@ -1002,8 +1017,8 @@ const handleModal = async (args, ctx, pi) => {
             }
             const defaultModel = models.default || health.default_model || "embeddinggemma";
             const obj = readProjectConfig(cfgPath);
-            const wiki = obj.wiki || {};
-            const emb = wiki.embedding || {};
+            const vaultMind = obj.vaultMind || {};
+            const emb = vaultMind.embedding || {};
             emb.provider = "modal";
             const modalSec = emb.modal || {};
             if (workspace)
@@ -1020,16 +1035,16 @@ const handleModal = async (args, ctx, pi) => {
                 autoSyncIntervalMs: 300000,
             };
             emb.modal = modalSec;
-            wiki.embedding = emb;
-            obj.wiki = wiki;
+            vaultMind.embedding = emb;
+            obj.vaultMind = vaultMind;
             writeProjectConfig(cfgPath, obj);
             const lines = [
                 "✅ Modal auto-configured:",
-                `   baseUrl: ${resolveBaseUrl(cfg.wiki)}`,
+                `   baseUrl: ${resolveBaseUrl(cfg.vaultMind)}`,
                 `   model: ${defaultModel}`,
                 `   dim: ${models.default_dim ?? "native"}`,
                 "",
-                "Run /wiki modal status to verify.",
+                "Run /vm remote status to verify.",
             ];
             ctx.ui.notify(lines.join("\n"), "info");
             return;
@@ -1037,7 +1052,7 @@ const handleModal = async (args, ctx, pi) => {
         case "migrate": {
             const newModel = parts[1];
             if (!newModel) {
-                ctx.ui.notify("/wiki modal migrate <newModel> [dim]  — change the canonical model + re-embed (remote).\nOld namespace is left intact until verified.", "info");
+                ctx.ui.notify("/vm remote migrate <newModel> [dim]  — change the canonical model + re-embed (remote).\nOld namespace is left intact until verified.", "info");
                 return;
             }
             const newDim = parts[2] ? Number.parseInt(parts[2], 10) : undefined;
@@ -1077,17 +1092,17 @@ const handleModal = async (args, ctx, pi) => {
             return;
         }
         default:
-            ctx.ui.notify("Unknown /wiki modal subcommand. Try: status, config, sync, jobs, migrate", "error");
+            ctx.ui.notify("Unknown /vm remote subcommand. Try: status, config, sync, jobs, migrate", "error");
     }
 };
-// ── /wiki context ────────────────────────────────────────────────────────────
+// ── /vm context ────────────────────────────────────────────────────────────
 const handleContext = async (args, ctx, pi) => {
     const parts = args.trim().split(/\s+/g);
     const subcommand = parts[0]?.toLowerCase() || "status";
     const value = parts[1]?.toLowerCase();
     const { project: cfgPath } = findConfig(ctx.cwd);
     if (!cfgPath) {
-        ctx.ui.notify("No config found. Run /wiki init first.", "error");
+        ctx.ui.notify("No config found. Run /vm init first.", "error");
         return;
     }
     switch (subcommand) {
@@ -1155,22 +1170,40 @@ const _toggleContext = (cfgPath, enabled) => {
     };
     fs.writeFileSync(cfgPath, `${JSON.stringify(existing, null, 2)}\n`, "utf-8");
 };
-// ── /wiki collection ─────────────────────────────────────────────────────────────
-const handleCollection = async (args, ctx) => {
+// ── /vm collection ─────────────────────────────────────────────────────────────
+const handleCollection = async (args, ctx, pi) => {
     const parts = args.trim().split(/\s+/g);
     const subcommand = parts[0]?.toLowerCase() || "select";
     switch (subcommand) {
         case "select":
             await selectActiveCollection(ctx);
             return;
+        case "list": {
+            const cfg = loadConfig(ctx.cwd);
+            const names = Object.keys(cfg.collections);
+            if (names.length === 0) {
+                ctx.ui.notify("No collections configured.", "info");
+                return;
+            }
+            const lines = [
+                "**Configured collections:**",
+                "",
+                ...names.map((n) => `  • ${n} → ${cfg.collections[n].path}`),
+            ];
+            ctx.ui.notify(lines.join("\n"), "info");
+            return;
+        }
         case "create":
             await createCollectionWizard(ctx);
             return;
+        case "reindex":
+            await handleReindex(parts.slice(1).join(" "), ctx, pi);
+            return;
         default:
-            ctx.ui.notify(`Unknown: ${subcommand}. Try: select, create`, "error");
+            ctx.ui.notify(`Unknown: ${subcommand}. Try: select, list, create, reindex`, "error");
     }
 };
-// ── /wiki injector ───────────────────────────────────────────────────────────
+// ── /vm injector ───────────────────────────────────────────────────────────
 const handleInjector = async (args, ctx) => {
     const parts = args.trim().split(/\s+/g);
     const subcommand = parts[0]?.toLowerCase() || "create";
@@ -1184,7 +1217,7 @@ const handleInjector = async (args, ctx) => {
 };
 // ── Watcher ──────────────────────────────────────────────────────────────────
 export const watcherState = createWatcherState();
-/** Module-level server state, referenced by the /wiki server command.
+/** Module-level server state, referenced by the /vm server command.
  *  Port is set when the server starts in index.ts. */
 export const serverState = createServerState();
 const handleServer = (ctx) => {
@@ -1209,21 +1242,21 @@ const handleWatcher = async (args, ctx, pi) => {
     const subcommand = parts[0]?.toLowerCase() || "status";
     const defaultVaultPath = () => {
         const cfg = loadConfig(ctx.cwd);
-        const p = cfg.wiki.vaults?.default?.path;
+        const p = cfg.vaultMind.vaults?.default?.path;
         return p ? expandHome(p) : undefined;
     };
     switch (subcommand) {
         case "start": {
             const cfg = loadConfig(ctx.cwd);
-            if (!cfg.wiki.vaults || Object.keys(cfg.wiki.vaults).length === 0) {
-                ctx.ui.notify("No vaults configured. Add vaults to wiki.vaults in pi-vault-mind.config.json first.", "error");
+            if (!cfg.vaultMind.vaults || Object.keys(cfg.vaultMind.vaults).length === 0) {
+                ctx.ui.notify("No vaults configured. Add vaults to vaultMind.vaults in pi-vault-mind.config.json first.", "error");
                 return;
             }
             if (watcherState.running) {
                 ctx.ui.notify("Watcher is already running.", "info");
                 return;
             }
-            startWatcher(pi, cfg.wiki.vaults, watcherState);
+            startWatcher(pi, cfg.vaultMind.vaults, watcherState);
             ctx.ui.notify(getWatcherStatus(watcherState), "info");
             return;
         }
@@ -1239,7 +1272,7 @@ const handleWatcher = async (args, ctx, pi) => {
         case "queue": {
             const vaultPath = defaultVaultPath();
             if (!vaultPath) {
-                ctx.ui.notify("No default vault configured. Set one with /wiki setup --vault <path>.", "error");
+                ctx.ui.notify("No default vault configured. Set one with /vm setup --vault <path>.", "error");
                 return;
             }
             const statusArg = parts[1]?.toLowerCase();
@@ -1270,7 +1303,7 @@ const handleWatcher = async (args, ctx, pi) => {
         case "retry": {
             const id = parts[1];
             if (!id) {
-                ctx.ui.notify("Usage: /wiki watcher retry <job-id>", "error");
+                ctx.ui.notify("Usage: /vm watcher retry <job-id>", "error");
                 return;
             }
             const vaultPath = defaultVaultPath();
@@ -1284,29 +1317,27 @@ const handleWatcher = async (args, ctx, pi) => {
                 return;
             }
             const job = result.job;
-            // Re-create the dispatch by re-sending the task as a user message
-            const taskDescription = [
-                `Retry of dispatch ${id} for @agent-${job.role} in ${job.filePath}.`,
-                "",
-                "Please dispatch a subagent to handle it:",
-                "",
-                "```",
-                "subagent({",
-                `  agent: "${job.agentName}",`,
-                `  task: ${JSON.stringify(job.instruction)},`,
-                `  context: "fork",`,
-                "  async: true,",
-                "})",
-                "```",
-            ].join("\n");
-            pi.sendUserMessage(taskDescription, { deliverAs: "followUp" });
-            ctx.ui.notify(`✅ Retried job ${id} → ${job.agentName}`, "info");
+            // Re-dispatch via the internal agent bus
+            const bus = watcherState.bus;
+            if (bus) {
+                void bus.publish("JOB_AVAILABLE", "watcher-retry", {
+                    dispatchId: job.id,
+                    role: job.role,
+                    filePath: job.filePath,
+                    instruction: job.instruction,
+                    vaultPath,
+                });
+                ctx.ui.notify(`✅ Retried job ${id} → ${job.agentName} (via agent bus)`, "info");
+            }
+            else {
+                ctx.ui.notify(`⚠️ Agent bus not available — cannot retry job ${id}`, "warning");
+            }
             return;
         }
         case "cancel": {
             const id = parts[1];
             if (!id) {
-                ctx.ui.notify("Usage: /wiki watcher cancel <job-id>", "error");
+                ctx.ui.notify("Usage: /vm watcher cancel <job-id>", "error");
                 return;
             }
             const vaultPath = defaultVaultPath();
@@ -1330,7 +1361,7 @@ const handleWatcher = async (args, ctx, pi) => {
 };
 // ── Setup ────────────────────────────────────────────────────────────────────
 const handleSetup = async (args, ctx) => {
-    // Parse optional CLI-style args: --vault <path> --provider <name> --model <name> --workspace <name>
+    // Parse optional CLI-style args: --vault <path> --remoteUrl <url> --localUrl <url> --model <name> --workspace <name>
     const cliArgs = {};
     const parts = args.trim().split(/\s+--/);
     for (const part of parts) {
@@ -1340,21 +1371,24 @@ const handleSetup = async (args, ctx) => {
         else if (trimmed === "vault") {
             /* flag without value, handled by interactive */
         }
-        else if (trimmed.startsWith("provider "))
-            cliArgs.provider = trimmed.slice(9).trim();
+        else if (trimmed.startsWith("remoteUrl "))
+            cliArgs.remoteUrl = trimmed.slice(10).trim();
+        else if (trimmed.startsWith("localUrl "))
+            cliArgs.localUrl = trimmed.slice(9).trim();
         else if (trimmed.startsWith("model "))
             cliArgs.model = trimmed.slice(6).trim();
         else if (trimmed.startsWith("workspace "))
             cliArgs.workspace = trimmed.slice(10).trim();
     }
-    const hasCliArgs = cliArgs.vault || cliArgs.provider || cliArgs.model || cliArgs.workspace;
+    const hasCliArgs = cliArgs.vault || cliArgs.remoteUrl || cliArgs.localUrl || cliArgs.model || cliArgs.workspace;
     await setupWizard(ctx, hasCliArgs ? cliArgs : undefined);
+    ctx.ui.notify("Vault is configured. Run /vm personalize to tune the agent personality for this vault.", "info");
 };
-// ── /wiki intake ─────────────────────────────────────────────────────────────
+// ── /vm intake ─────────────────────────────────────────────────────────────
 const handleIntake = async (args, ctx) => {
     const filePath = args.trim();
     if (!filePath) {
-        ctx.ui.notify("Usage: /wiki intake <path-to-json-spec>", "error");
+        ctx.ui.notify("Usage: /vm intake <path-to-json-spec>", "error");
         return;
     }
     if (!fs.existsSync(filePath)) {
@@ -1381,7 +1415,7 @@ const handleIntake = async (args, ctx) => {
         ctx.ui.notify("Intake complete. Answers stored.", "info");
     }
 };
-// ── /wiki modal token ────────────────────────────────────────────────────────
+// ── /vm remote token ────────────────────────────────────────────────────────
 /** Dotenv path where the Modal token is persisted. */
 const MODAL_TOKEN_ENV_PATH = path.join(process.env.HOME || process.env.USERPROFILE || "", ".pi", "agent", "vault-mind.env");
 const writeTokenEnv = (token) => {
@@ -1421,7 +1455,7 @@ const handleModalToken = async (ctx, cliToken) => {
         return;
     }
     if (!ctx.hasUI) {
-        ctx.ui.notify("No 1Password token found and no TUI available. Use:\n  /wiki modal token <token>", "error");
+        ctx.ui.notify("No 1Password token found and no TUI available. Use:\n  /vm remote token <token>", "error");
         return;
     }
     const token = await ctx.ui.input("Modal API token:", "paste bearer token here (will be written to ~/.pi/agent/vault-mind.env)");
@@ -1432,9 +1466,90 @@ const handleModalToken = async (ctx, cliToken) => {
     writeTokenEnv(token);
     ctx.ui.notify(`✅ Wrote token to ${MODAL_TOKEN_ENV_PATH}`, "info");
 };
-// ── Main /wiki command ───────────────────────────────────────────────────────
+// ── /vm token ──────────────────────────────────────────────────────────────
+const maskToken = (token) => {
+    if (token.length <= 8)
+        return "****";
+    return `${token.slice(0, 4)}…${token.slice(-4)}`;
+};
+const handleToken = (args, ctx) => {
+    const parts = args.trim().split(/\s+/g).filter(Boolean);
+    const sub = parts[0]?.toLowerCase() || "show";
+    switch (sub) {
+        case "show": {
+            let source;
+            let token = null;
+            if (process.env.PVM_API_TOKEN) {
+                source = "env (PVM_API_TOKEN)";
+                token = process.env.PVM_API_TOKEN;
+            }
+            else {
+                source = "none";
+                try {
+                    const text = fs.readFileSync(MODAL_TOKEN_ENV_PATH, "utf-8");
+                    for (const line of text.split(/\r?\n/)) {
+                        const m = line.match(/^\s*([A-Z_][A-Z0-9_]*)\s*=\s*("([^"]*)"|'([^']*)'|[^\s#]+)/);
+                        if (!m || m[1] !== "PVM_API_TOKEN")
+                            continue;
+                        const val = m[3] ?? m[4] ?? m[2];
+                        if (val) {
+                            token = val;
+                            source = "~/.pi/agent/vault-mind.env";
+                            break;
+                        }
+                    }
+                }
+                catch {
+                    // file missing or unreadable
+                }
+                if (!token) {
+                    const cfg = loadConfig(ctx.cwd);
+                    const cfgToken = cfg?.vaultMind?.embedding?.modal?.apiToken;
+                    if (cfgToken) {
+                        token = cfgToken;
+                        source = "config (vaultMind.embedding.modal.apiToken)";
+                    }
+                }
+            }
+            const masked = token ? maskToken(token) : "(not set)";
+            ctx.ui.notify(["**API Token**", `Source: ${source}`, `Value:  ${masked}`].join("\n"), token ? "info" : "warning");
+            return;
+        }
+        case "rotate": {
+            const newToken = rotateToken();
+            const masked = maskToken(newToken);
+            const envNote = process.env.PVM_API_TOKEN
+                ? "\n\u26a0\ufe0f  PVM_API_TOKEN env var is still set and overrides the file until you unset it and restart."
+                : "";
+            ctx.ui.notify([
+                `\u2705 New token: ${masked}`,
+                "Written to ~/.pi/agent/vault-mind.env.",
+                `\u26a0\ufe0f  All clients (Obsidian plugin, scripts) must update to the new token — the old token is now invalid.${envNote}`,
+            ].join("\n"), "warning");
+            return;
+        }
+        case "revoke": {
+            const identity = parts[1];
+            if (!identity) {
+                ctx.ui.notify("Usage: /vm token revoke <identity>", "error");
+                return;
+            }
+            const ok = revokeToken(identity);
+            if (ok) {
+                ctx.ui.notify(`Revoked token for identity: ${identity}`, "info");
+            }
+            else {
+                ctx.ui.notify(`No token found for identity: ${identity}`, "warning");
+            }
+            return;
+        }
+        default:
+            ctx.ui.notify(`Unknown: ${sub}. Try: show, rotate, revoke`, "error");
+    }
+};
+// ── Main /vm command ───────────────────────────────────────────────────────
 export const registerCommands = (pi) => {
-    pi.registerCommand("wiki", {
+    pi.registerCommand("vm", {
         description: "pi-vault-mind: manage collections, embedding, reindexing, and config.",
         getArgumentCompletions: (_prefix) => {
             const words = _prefix.trim().split(/\s+/);
@@ -1442,31 +1557,32 @@ export const registerCommands = (pi) => {
                 "init",
                 "validate",
                 "approve",
+                "query",
                 "tombstone",
                 "settings",
-                "audit",
                 "help",
-                "reindex",
                 "collection",
                 "discover-schema",
                 "injector",
                 "context",
                 "embedding",
-                "modal",
+                "remote",
                 "watcher",
+                "personalize",
                 "setup",
+                "token",
             ];
             if (words.length === 1 || (words.length === 2 && words[1] === "")) {
                 return top
                     .filter((c) => c.startsWith(words[0] || ""))
-                    .map((c) => ({ label: c, value: c, description: `wiki ${c}` }));
+                    .map((c) => ({ label: c, value: c, description: `vm ${c}` }));
             }
             // Subcommand completions
             const subcommand = words[0];
             if (words.length >= 2) {
                 const prefix = words[1] || "";
                 if (subcommand === "embedding") {
-                    return ["status", "use", "model", "models", "pull"]
+                    return ["status", "use", "model", "models", "pull", "cloud"]
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `embedding ${c}` }));
                 }
@@ -1480,8 +1596,14 @@ export const registerCommands = (pi) => {
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `discover-schema ${c}` }));
                 }
+                if (subcommand === "query") {
+                    const names = collectionNames(loadConfig(process.cwd()));
+                    return names
+                        .filter((c) => c.startsWith(prefix))
+                        .map((c) => ({ label: c, value: c, description: `query ${c}` }));
+                }
                 if (subcommand === "collection") {
-                    return ["select", "create"]
+                    return ["select", "list", "create", "reindex"]
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `collection ${c}` }));
                 }
@@ -1490,26 +1612,26 @@ export const registerCommands = (pi) => {
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `injector ${c}` }));
                 }
-                if (subcommand === "reindex") {
-                    return ["--all", "--reembed", "--remote"]
-                        .filter((c) => c.startsWith(prefix))
-                        .map((c) => ({ label: c, value: c, description: `reindex ${c}` }));
-                }
-                if (subcommand === "modal") {
-                    return ["status", "config", "auto", "token", "sync", "jobs", "migrate"]
-                        .filter((c) => c.startsWith(prefix))
-                        .map((c) => ({ label: c, value: c, description: `modal ${c}` }));
-                }
                 if (subcommand === "watcher") {
                     return ["start", "stop", "status", "queue", "retry", "cancel"]
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `watcher ${c}` }));
                 }
                 if (subcommand === "setup") {
-                    return ["--vault", "--provider", "--model", "--workspace"]
+                    return ["--vault", "--remoteUrl", "--localUrl", "--model", "--workspace"]
                         .filter((c) => c.startsWith(prefix))
                         .map((c) => ({ label: c, value: c, description: `setup ${c}` }));
                 }
+                if (subcommand === "token") {
+                    return ["show", "rotate", "revoke"]
+                        .filter((c) => c.startsWith(prefix))
+                        .map((c) => ({ label: c, value: c, description: `token ${c}` }));
+                }
+                if (subcommand === "remote") {
+                    return ["status", "config", "auto", "sync", "jobs", "token"]
+                        .filter((c) => c.startsWith(prefix))
+                        .map((c) => ({ label: c, value: c, description: `remote ${c}` }));
+                }
             }
             return [];
         },
@@ -1524,38 +1646,40 @@ export const registerCommands = (pi) => {
                     return handleValidate(rest, ctx, pi);
                 case "approve":
                     return handleApprove(rest, ctx);
+                case "query":
+                    return handleQuery(rest, ctx);
                 case "tombstone":
                     return handleTombstone(rest, ctx);
                 case "settings":
                     return openSettingsDashboard(ctx);
-                case "audit":
-                    return auditConfig(ctx);
-                case "reindex":
-                    return handleReindex(rest, ctx, pi);
                 case "discover-schema":
                     return handleDiscoverSchema(rest, ctx);
                 case "collection":
-                    return handleCollection(rest, ctx);
+                    return handleCollection(rest, ctx, pi);
                 case "injector":
                     return handleInjector(rest, ctx);
                 case "context":
                     return handleContext(rest, ctx, pi);
                 case "embedding":
                     return handleEmbedding(rest, ctx, pi);
-                case "modal":
-                    return handleModal(rest, ctx, pi);
                 case "server":
                     return handleServer(ctx);
                 case "watcher":
                     return handleWatcher(rest, ctx, pi);
+                case "remote":
+                    return handleModal(rest, ctx, pi);
+                case "personalize":
+                    return runPersonalize(ctx, pi);
                 case "setup":
                     return handleSetup(rest, ctx);
+                case "token":
+                    return handleToken(rest, ctx);
                 default:
-                    ctx.ui.notify(WIKI_USAGE, "info");
+                    ctx.ui.notify(VM_USAGE, "info");
             }
         },
     });
-    // Legacy aliases — /wiki-* commands delegate to /wiki subcommand handlers
+    // Legacy aliases — /vm-* commands delegate to /vm subcommand handlers
     /* ── /intake ───────────────────────────────────────────────────────────── */
     pi.registerCommand("intake", {
         description: "Run an intake questionnaire from a JSON spec file. Optionally write the result to --output.",