context-mode 1.0.146 → 1.0.147

package/build/cli.js

@@ -7,6 +7,8 @@
  *   context-mode doctor                       → Diagnose runtime issues, hooks, FTS5, version
  *   context-mode upgrade                      → Fix hooks, permissions, and settings
  *   context-mode hook <platform> <event>      → Dispatch a hook script (used by platform hook configs)
+ *   CONTEXT_MODE_DIR=/abs/path context-mode   → Override sessions/content storage root
+ *     Empty/whitespace is ignored; non-empty values must be absolute.
  *
  * Platform auto-detection: CLI detects which platform is running
  * (Claude Code, Gemini CLI, OpenCode, etc.) and uses the appropriate adapter.
@@ -22,6 +24,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { detectRuntimes, getRuntimeSummary, hasBunRuntime, getAvailableLanguages, } from "./runtime.js";
 import { getHookScriptPaths } from "./util/hook-config.js";
 import { resolveClaudeConfigDir } from "./util/claude-config.js";
+import { ensureWritableStorageDir, formatStorageDirectoryError, resolveContentStorageDir, resolveSessionStorageDir, resolveStatsStorageDir, StorageDirectoryError, } from "./session/db.js";
 // v1.0.128 — Issue #559 sibling MCP kill helpers (see PR-559-560-FIX-DESIGN.md).
 import { discoverSiblingMcpPids, killSiblingMcpServers } from "./util/sibling-mcp.js";
 // v1.0.119 — Issue #523 Layer 5 heal: post-bump assertion on .claude-plugin/plugin.json
@@ -125,8 +128,26 @@ async function hookDispatch(platform, event) {
 /* -------------------------------------------------------
  * Entry point
  * ------------------------------------------------------- */
+const IN_PROCESS_PLUGIN_PLATFORMS = new Set(["opencode", "kilo"]);
+const isInProcessPluginPlatform = (p) => p ? IN_PROCESS_PLUGIN_PLATFORMS.has(p) : false;
 const args = process.argv.slice(2);
-if (args[0] === "doctor") {
+function printHelp() {
+    console.log([
+        "Usage:",
+        "  context-mode                         Start MCP server (stdio)",
+        "  context-mode doctor                  Diagnose runtime issues, hooks, FTS5, version",
+        "  context-mode upgrade                 Fix hooks, permissions, and settings",
+        "  context-mode hook <platform> <event> Dispatch a configured hook script",
+        "  context-mode statusline              Print Claude Code status line",
+        "",
+        "Environment:",
+        "  CONTEXT_MODE_DIR=/absolute/path      Override sessions/content storage root; empty is ignored, non-empty must be absolute",
+    ].join("\n"));
+}
+if (args[0] === "--help" || args[0] === "-h" || args[0] === "help") {
+    printHelp();
+}
+else if (args[0] === "doctor") {
     doctor().then((code) => process.exit(code));
 }
 else if (args[0] === "upgrade") {
@@ -236,7 +257,7 @@ function cachePluginRoot(platform) {
 }
 function getPluginRoot() {
     const platform = detectPlatform().platform;
-    if (platform === 'opencode' || platform === 'kilo') {
+    if (isInProcessPluginPlatform(platform)) {
         return cachePluginRoot(platform);
     }
     return defaultPluginRoot();
@@ -276,6 +297,25 @@ async function fetchLatestVersion() {
 /* -------------------------------------------------------
  * Doctor — adapter-aware diagnostics
  * ------------------------------------------------------- */
+function describeStorageSource(dir) {
+    return dir.envVar ? dir.envVar : "adapter default";
+}
+function logStorageDir(dir) {
+    try {
+        ensureWritableStorageDir(dir);
+        p.log.success(color.green(`Storage ${dir.kind}: PASS`) +
+            color.dim(` — ${dir.path} (${describeStorageSource(dir)})`));
+        return 0;
+    }
+    catch (err) {
+        if (err instanceof StorageDirectoryError) {
+            p.log.error(color.red(`Storage ${dir.kind}: FAIL`) +
+                color.dim(` — ${formatStorageDirectoryError(err)}`));
+            return 1;
+        }
+        throw err;
+    }
+}
 async function doctor() {
     if (process.stdout.isTTY)
         console.clear();
@@ -286,6 +326,29 @@ async function doctor() {
     p.log.info(`Platform: ${color.cyan(adapter.name)}` +
         color.dim(` (${detection.confidence} confidence — ${detection.reason})`));
     let criticalFails = 0;
+    try {
+        const sessionDir = resolveSessionStorageDir(() => adapter.getSessionDir());
+        const contentDir = resolveContentStorageDir(() => sessionDir.path);
+        const statsDir = resolveStatsStorageDir(() => sessionDir.path);
+        p.note([
+            `sessions: ${sessionDir.path} (${describeStorageSource(sessionDir)})`,
+            `content:  ${contentDir.path} (${describeStorageSource(contentDir)})`,
+            `stats:    ${statsDir.path} (${describeStorageSource(statsDir)})`,
+        ].join("\n"), "Storage paths");
+        criticalFails += logStorageDir(sessionDir);
+        criticalFails += logStorageDir(contentDir);
+        criticalFails += logStorageDir(statsDir);
+    }
+    catch (err) {
+        if (err instanceof StorageDirectoryError) {
+            criticalFails++;
+            p.log.error(color.red(`Storage ${err.kind}: FAIL`) +
+                color.dim(` — ${formatStorageDirectoryError(err)}`));
+        }
+        else {
+            throw err;
+        }
+    }
     const s = p.spinner();
     s.start("Running diagnostics");
     let runtimes;
@@ -738,8 +801,8 @@ async function insight(port) {
         // Detect platform + adapter for correct session/content paths
         const detection = detectPlatform();
         const adapter = await getAdapter(detection.platform);
-        const sessDir = adapter.getSessionDir();
-        const contentDir = join(dirname(sessDir), "content");
+        const sessDir = ensureWritableStorageDir(resolveSessionStorageDir(() => adapter.getSessionDir()));
+        const contentDir = ensureWritableStorageDir(resolveContentStorageDir(() => sessDir));
         const cacheDir = join(dirname(sessDir), "insight-cache");
         if (!existsSync(join(insightSource, "server.mjs"))) {
             console.error("Error: Insight source not found. Try upgrading context-mode.");
@@ -1141,7 +1204,7 @@ async function upgrade(opts) {
                 timeout: 60000,
             });
             s.stop("Dependencies ready");
-            if (detection.platform !== 'opencode' && detection.platform !== 'kilo') {
+            if (!isInProcessPluginPlatform(detection.platform)) {
                 // Verify native addons through the same bootstrap start.mjs imports.
                 // On modern Node, the ABI-specific cache file is the compatibility marker;
                 // the active binding alone may be stale from a previous Node ABI.
@@ -1203,20 +1266,20 @@ async function upgrade(opts) {
                         color.dim(`\n  Try (primary): cd "${pluginRoot}" && npm install better-sqlite3 --no-optional`) +
                         color.dim("\n  Try (fallback): /context-mode:ctx-doctor"));
                 }
-            }
-            // Update global npm
-            s.start("Updating npm global package");
-            try {
-                npmExecFile(["install", "-g", pluginRoot, "--no-audit", "--no-fund"], {
-                    stdio: "pipe",
-                    timeout: 30000,
-                });
-                s.stop(color.green("npm global updated"));
-                changes.push("Updated npm global package");
-            }
-            catch {
-                s.stop(color.yellow("npm global update skipped"));
-                p.log.info(color.dim("  Could not update global npm — may need sudo or standalone install"));
+                // Update global npm
+                s.start("Updating npm global package");
+                try {
+                    npmExecFile(["install", "-g", pluginRoot, "--no-audit", "--no-fund"], {
+                        stdio: "pipe",
+                        timeout: 30000,
+                    });
+                    s.stop(color.green("npm global updated"));
+                    changes.push("Updated npm global package");
+                }
+                catch {
+                    s.stop(color.yellow("npm global update skipped"));
+                    p.log.info(color.dim("  Could not update global npm — may need sudo or standalone install"));
+                }
             }
             // Cleanup
             rmSync(tmpDir, { recursive: true, force: true });

package/build/search/auto-memory.d.ts

@@ -19,7 +19,12 @@ export interface AutoMemoryResult {
 export interface AutoMemoryAdapter {
     getConfigDir(): string;
     getInstructionFiles(): string[];
-    getMemoryDir(): string;
+    /**
+     * `projectDir` is optional for backwards compatibility with legacy
+     * callers — when supplied, adapters MUST return a project-scoped path
+     * (see HookAdapter.getMemoryDir contract, issue #663).
+     */
+    getMemoryDir(projectDir?: string): string;
 }
 /**
  * Search auto-memory files for content matching any of the given queries.

package/build/search/auto-memory.js

@@ -8,6 +8,7 @@
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join, isAbsolute } from "node:path";
 import { resolveClaudeConfigDir } from "../util/claude-config.js";
+import { hashProjectDirCanonical } from "../session/db.js";
 const DEBUG = process.env.DEBUG?.includes("context-mode");
 /**
  * Search auto-memory files for content matching any of the given queries.
@@ -38,10 +39,18 @@ export function searchAutoMemory(queries, limit = 5, projectDir, configDir, adap
     // CC config trees (and empty/whitespace env doesn't poison the path).
     const adapterRelative = adapterConfigDir ? resolveAgainst(projectDir, adapterConfigDir) : null;
     const effectiveConfigDir = adapterRelative ?? configDir ?? resolveClaudeConfigDir();
-    const adapterMemoryDir = adapter?.getMemoryDir();
+    // Issue #663: scope memory dir by projectDir so parallel projects can't
+    // read each other's auto-memory. Adapter-aware path delegates the
+    // scoping to the adapter; legacy adapterless fallback applies the same
+    // hash directly so the contract holds at both call sites.
+    const adapterMemoryDir = adapter?.getMemoryDir(projectDir);
+    const fallbackMemoryBase = join(effectiveConfigDir, "memory");
+    const fallbackMemoryDir = projectDir
+        ? join(fallbackMemoryBase, hashProjectDirCanonical(projectDir))
+        : fallbackMemoryBase;
     const memoryDir = adapterMemoryDir
         ? resolveAgainst(projectDir, adapterMemoryDir)
-        : join(effectiveConfigDir, "memory");
+        : fallbackMemoryDir;
     // Collect candidate files
     const candidates = [];
     // 1. Project-level instruction files