context-vault 2.4.1 → 2.5.1

package/scripts/prepack.js

@@ -7,20 +7,24 @@
  * Replaces the Unix shell script in package.json "prepack".
  */
 
-import { cpSync, rmSync, mkdirSync } from "node:fs";
+import { cpSync, rmSync, mkdirSync, readFileSync, writeFileSync, existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const LOCAL_ROOT = join(__dirname, "..");
+const NODE_MODULES = join(LOCAL_ROOT, "node_modules");
 const CORE_SRC = join(LOCAL_ROOT, "..", "core");
-const CORE_DEST = join(LOCAL_ROOT, "node_modules", "@context-vault", "core");
+const CORE_DEST = join(NODE_MODULES, "@context-vault", "core");
+const APP_SRC = join(LOCAL_ROOT, "..", "app", "dist");
+const APP_DEST = join(LOCAL_ROOT, "app-dist");
 
-// Ensure target directory exists
-mkdirSync(join(LOCAL_ROOT, "node_modules", "@context-vault"), { recursive: true });
+// Clean node_modules to prevent workspace deps from leaking into the tarball.
+// Only @context-vault/core should be bundled.
+rmSync(NODE_MODULES, { recursive: true, force: true });
 
-// Remove old copy if present
-rmSync(CORE_DEST, { recursive: true, force: true });
+// Ensure target directory exists
+mkdirSync(join(NODE_MODULES, "@context-vault"), { recursive: true });
 
 // Copy core package (dereference symlinks)
 cpSync(CORE_SRC, CORE_DEST, { recursive: true, dereference: true });
@@ -28,4 +32,25 @@ cpSync(CORE_SRC, CORE_DEST, { recursive: true, dereference: true });
 // Remove nested node_modules from the copy
 rmSync(join(CORE_DEST, "node_modules"), { recursive: true, force: true });
 
+// Strip all dependencies from the bundled core's package.json.
+// Core's deps (better-sqlite3, sqlite-vec, MCP SDK) are hoisted to
+// context-vault's own dependencies.  @huggingface/transformers is
+// dynamically imported and installed via postinstall.  Leaving them
+// in the bundled core causes duplicate resolution that breaks native
+// module install scripts in global npm contexts.
+const corePkgPath = join(CORE_DEST, "package.json");
+const corePkg = JSON.parse(readFileSync(corePkgPath, "utf8"));
+delete corePkg.dependencies;
+writeFileSync(corePkgPath, JSON.stringify(corePkg, null, 2) + "\n");
+
 console.log("[prepack] Bundled @context-vault/core into node_modules");
+
+// Copy pre-built web dashboard into app-dist/
+if (!existsSync(join(APP_SRC, "index.html"))) {
+  console.error("[prepack] ERROR: Web dashboard not built. Run: npm run build --workspace=packages/app");
+  process.exit(1);
+}
+
+rmSync(APP_DEST, { recursive: true, force: true });
+cpSync(APP_SRC, APP_DEST, { recursive: true });
+console.log("[prepack] Bundled web dashboard into app-dist/");

package/src/server/index.js

@@ -2,7 +2,7 @@
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, unlinkSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -19,33 +19,46 @@ import { registerTools } from "@context-vault/core/server/tools";
 async function main() {
   let phase = "CONFIG";
   let db;
+  let config;
 
   try {
     // ── Phase: CONFIG ────────────────────────────────────────────────────────
-    const config = resolveConfig();
+    config = resolveConfig();
 
     // ── Phase: DIRS ──────────────────────────────────────────────────────────
     phase = "DIRS";
     mkdirSync(config.dataDir, { recursive: true });
     mkdirSync(config.vaultDir, { recursive: true });
 
+    // Verify vault directory is writable (catch permission issues early)
+    try {
+      const probe = join(config.vaultDir, ".write-probe");
+      writeFileSync(probe, "");
+      unlinkSync(probe);
+    } catch (writeErr) {
+      console.error(`[context-vault] FATAL: Vault directory is not writable: ${config.vaultDir}`);
+      console.error(`[context-vault] ${writeErr.message}`);
+      console.error(`[context-vault] Fix permissions: chmod u+w "${config.vaultDir}"`);
+      process.exit(1);
+    }
+
     // Write .context-mcp marker (non-fatal)
     try {
       const markerPath = join(config.vaultDir, ".context-mcp");
       const markerData = existsSync(markerPath) ? JSON.parse(readFileSync(markerPath, "utf-8")) : {};
       writeFileSync(markerPath, JSON.stringify({ created: markerData.created || new Date().toISOString(), version: pkg.version }, null, 2) + "\n");
     } catch (markerErr) {
-      console.error(`[context-mcp] Warning: could not write marker file: ${markerErr.message}`);
+      console.error(`[context-vault] Warning: could not write marker file: ${markerErr.message}`);
     }
 
     config.vaultDirExists = existsSync(config.vaultDir);
 
     // Startup diagnostics
-    console.error(`[context-mcp] Vault: ${config.vaultDir}`);
-    console.error(`[context-mcp] Database: ${config.dbPath}`);
-    console.error(`[context-mcp] Dev dir: ${config.devDir}`);
+    console.error(`[context-vault] Vault: ${config.vaultDir}`);
+    console.error(`[context-vault] Database: ${config.dbPath}`);
+    console.error(`[context-vault] Dev dir: ${config.devDir}`);
     if (!config.vaultDirExists) {
-      console.error(`[context-mcp] WARNING: Vault directory not found!`);
+      console.error(`[context-vault] WARNING: Vault directory not found!`);
     }
 
     // ── Phase: DB ────────────────────────────────────────────────────────────
@@ -60,33 +73,55 @@ async function main() {
       embed,
       insertVec: (rowid, embedding) => insertVec(stmts, rowid, embedding),
       deleteVec: (rowid) => deleteVec(stmts, rowid),
+      activeOps: { count: 0 },
     };
 
     // ── Phase: SERVER ────────────────────────────────────────────────────────
     phase = "SERVER";
     const server = new McpServer(
-      { name: "context-mcp", version: pkg.version },
+      { name: "context-vault", version: pkg.version },
       { capabilities: { tools: {} } }
     );
 
     registerTools(server, ctx);
 
     // ── Graceful Shutdown ────────────────────────────────────────────────────
-    function shutdown(signal) {
-      console.error(`[context-mcp] Received ${signal}, shutting down...`);
+    function closeDb() {
       try {
         if (db.inTransaction) {
-          console.error("[context-mcp] Rolling back active transaction...");
+          console.error("[context-vault] Rolling back active transaction...");
           db.exec("ROLLBACK");
         }
         db.pragma("wal_checkpoint(TRUNCATE)");
         db.close();
-        console.error("[context-mcp] Database closed cleanly.");
+        console.error("[context-vault] Database closed cleanly.");
       } catch (shutdownErr) {
-        console.error(`[context-mcp] Shutdown error: ${shutdownErr.message}`);
+        console.error(`[context-vault] Shutdown error: ${shutdownErr.message}`);
       }
       process.exit(0);
     }
+
+    function shutdown(signal) {
+      console.error(`[context-vault] Received ${signal}, shutting down...`);
+
+      if (ctx.activeOps.count > 0) {
+        console.error(`[context-vault] Waiting for ${ctx.activeOps.count} in-flight operation(s)...`);
+        const check = setInterval(() => {
+          if (ctx.activeOps.count === 0) {
+            clearInterval(check);
+            closeDb();
+          }
+        }, 100);
+        // Force shutdown after 5 seconds even if ops are still running
+        setTimeout(() => {
+          clearInterval(check);
+          console.error(`[context-vault] Force shutdown — ${ctx.activeOps.count} operation(s) still running`);
+          closeDb();
+        }, 5000);
+      } else {
+        closeDb();
+      }
+    }
     process.on("SIGINT", () => shutdown("SIGINT"));
     process.on("SIGTERM", () => shutdown("SIGTERM"));
 
@@ -105,7 +140,7 @@ async function main() {
             stdio: ["pipe", "pipe", "pipe"],
           }).trim();
           if (latest && latest !== pkg.version) {
-            console.error(`[context-mcp] Update available: v${pkg.version} → v${latest}. Run: context-mcp update`);
+            console.error(`[context-vault] Update available: v${pkg.version} → v${latest}. Run: context-vault update`);
           }
         } catch {}
       }).catch(() => {});
@@ -116,7 +151,7 @@ async function main() {
       // Boxed diagnostic for native module mismatch
       console.error("");
       console.error("╔══════════════════════════════════════════════════════════════╗");
-      console.error("║  context-mcp: Native Module Error                           ║");
+      console.error("║  context-vault: Native Module Error                         ║");
       console.error("╚══════════════════════════════════════════════════════════════╝");
       console.error("");
       console.error(err.message);
@@ -127,15 +162,15 @@ async function main() {
       process.exit(78); // EX_CONFIG
     }
 
-    console.error(`[context-mcp] Fatal error during ${phase} phase: ${err.message}`);
+    console.error(`[context-vault] Fatal error during ${phase} phase: ${err.message}`);
     if (phase === "DB") {
-      console.error(`[context-mcp] Try deleting the DB file and restarting: rm "${err.dbPath || "vault.db"}"`);
+      console.error(`[context-vault] Try deleting the DB file and restarting: rm "${config?.dbPath || "vault.db"}"`);
     }
     process.exit(1);
   }
 }
 
 main().catch((err) => {
-  console.error(`[context-mcp] Unexpected fatal error: ${err.message}`);
+  console.error(`[context-vault] Unexpected fatal error: ${err.message}`);
   process.exit(1);
 });