context-mode 1.0.112 → 1.0.113

package/.claude-plugin/marketplace.json

@@ -6,14 +6,14 @@
   },
   "metadata": {
     "description": "Claude Code plugins by Mert Koseoğlu",
-    "version": "1.0.112"
+    "version": "1.0.113"
   },
   "plugins": [
     {
       "name": "context-mode",
       "source": "./",
       "description": "Claude Code MCP plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-      "version": "1.0.112",
+      "version": "1.0.113",
       "author": {
         "name": "Mert Koseoğlu"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.112",
+  "version": "1.0.113",
   "description": "MCP server that saves 98% of your context window with session continuity. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and automatic state restore across compactions.",
   "author": {
     "name": "Mert Koseoğlu",

package/.openclaw-plugin/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "name": "Context Mode",
   "kind": "tool",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-  "version": "1.0.112",
+  "version": "1.0.113",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/.openclaw-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.112",
+  "version": "1.0.113",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
   "author": {
     "name": "Mert Koseoğlu",

package/build/server.js

@@ -27,6 +27,7 @@ import { detectPlatform, getSessionDirSegments } from "./adapters/detect.js";
 import { resolveCodexConfigDir } from "./adapters/codex/paths.js";
 import { getHookScriptPaths } from "./util/hook-config.js";
 import { resolveClaudeConfigDir } from "./util/claude-config.js";
+import { resolveProjectDir } from "./util/project-dir.js";
 import { loadDatabase } from "./db-base.js";
 import { AnalyticsEngine, formatReport, getConversationStats, getLifetimeStats, getMultiAdapterLifetimeStats, getRealBytesStats, OPUS_INPUT_PRICE_PER_TOKEN } from "./session/analytics.js";
 const __pkg_dir = dirname(fileURLToPath(import.meta.url));
@@ -181,14 +182,15 @@ function getSessionDir() {
  * that don't set their own env var (Cursor, OpenClaw, Codex, Kiro, Zed).
  */
 function getProjectDir() {
-    return process.env.CLAUDE_PROJECT_DIR
-        || process.env.GEMINI_PROJECT_DIR
-        || process.env.VSCODE_CWD
-        || process.env.OPENCODE_PROJECT_DIR
-        || process.env.PI_PROJECT_DIR
-        || process.env.IDEA_INITIAL_DIRECTORY
-        || process.env.CONTEXT_MODE_PROJECT_DIR
-        || process.cwd();
+    // Delegated to the shared resolver so the env-var chain rejects plugin
+    // install paths (set by a prior MCP boot's start.mjs after `/ctx-upgrade`)
+    // and prefers the shell-set PWD before the chdir'd cwd. See
+    // src/util/project-dir.ts for the rationale + safety rules.
+    return resolveProjectDir({
+        env: process.env,
+        cwd: process.cwd(),
+        pwd: process.env.PWD,
+    });
 }
 /**
  * Resolve a possibly-relative path against the project directory (full env cascade),

package/build/util/project-dir.d.ts

@@ -0,0 +1,49 @@
+/**
+ * Project-dir resolution helpers — shared between `start.mjs` (the MCP entry
+ * point) and `src/server.ts getProjectDir()` (the consumer).
+ *
+ * Background: when Claude Code runs `/ctx-upgrade`, it kills + respawns the
+ * MCP server. The respawn happens with `cwd` set to the plugin install
+ * directory (`~/.claude/plugins/cache/context-mode/context-mode/<version>/`).
+ * The legacy `start.mjs` then set `CLAUDE_PROJECT_DIR = originalCwd`, which
+ * poisoned every downstream `ctx_stats` / SessionDB / hash computation —
+ * sessions silently re-rooted under the plugin install path.
+ *
+ * Defense-in-depth fix (v1.0.113):
+ *   - `start.mjs` calls `isPluginInstallPath(originalCwd)` and skips the env
+ *     auto-set when true (no poisoning at the source).
+ *   - `getProjectDir()` calls `resolveProjectDir(...)` which rejects plugin-
+ *     pathed env vars and the plugin cwd, preferring `process.env.PWD`
+ *     (shell-set, survives `process.chdir`) before falling back.
+ */
+/**
+ * Detect whether a path lives inside the Claude Code plugin install tree —
+ * specifically `<home>/.claude/plugins/cache/<plugin>/<plugin>/<version>/`
+ * or the marketplace mirror `<home>/.claude/plugins/marketplaces/...`.
+ *
+ * Cross-OS: matches both POSIX (`/`) and Windows (`\`) path separators.
+ * Independent of `home` location — we only care about the `.claude/plugins/`
+ * suffix pattern.
+ */
+export declare function isPluginInstallPath(p: string): boolean;
+/**
+ * Pure project-dir resolver. Mirror of the env-var chain inside
+ * `src/server.ts getProjectDir()`, but takes its inputs explicitly so the
+ * resolver can be exercised under test without process-level mutation.
+ *
+ * Resolution order:
+ *   1. Adapter-priority env vars (CLAUDE / GEMINI / VSCODE / OPENCODE / PI /
+ *      IDEA / CONTEXT_MODE) — first non-empty AND non-plugin-path wins.
+ *   2. `process.env.PWD` — shell-set, NOT updated by `process.chdir()`, so
+ *      it survives the `start.mjs` chdir into the plugin dir. Skipped if
+ *      it too points at a plugin install path.
+ *   3. `cwd` — last resort. Returned even if it is a plugin path; the
+ *      caller is responsible for rendering a graceful "no project context"
+ *      message rather than panicking. Keeping the function total preserves
+ *      operation of project-independent tools (sandbox execute, fetch).
+ */
+export declare function resolveProjectDir(opts: {
+    env: Record<string, string | undefined>;
+    cwd: string;
+    pwd: string | undefined;
+}): string;

package/build/util/project-dir.js

@@ -0,0 +1,67 @@
+/**
+ * Project-dir resolution helpers — shared between `start.mjs` (the MCP entry
+ * point) and `src/server.ts getProjectDir()` (the consumer).
+ *
+ * Background: when Claude Code runs `/ctx-upgrade`, it kills + respawns the
+ * MCP server. The respawn happens with `cwd` set to the plugin install
+ * directory (`~/.claude/plugins/cache/context-mode/context-mode/<version>/`).
+ * The legacy `start.mjs` then set `CLAUDE_PROJECT_DIR = originalCwd`, which
+ * poisoned every downstream `ctx_stats` / SessionDB / hash computation —
+ * sessions silently re-rooted under the plugin install path.
+ *
+ * Defense-in-depth fix (v1.0.113):
+ *   - `start.mjs` calls `isPluginInstallPath(originalCwd)` and skips the env
+ *     auto-set when true (no poisoning at the source).
+ *   - `getProjectDir()` calls `resolveProjectDir(...)` which rejects plugin-
+ *     pathed env vars and the plugin cwd, preferring `process.env.PWD`
+ *     (shell-set, survives `process.chdir`) before falling back.
+ */
+/**
+ * Detect whether a path lives inside the Claude Code plugin install tree —
+ * specifically `<home>/.claude/plugins/cache/<plugin>/<plugin>/<version>/`
+ * or the marketplace mirror `<home>/.claude/plugins/marketplaces/...`.
+ *
+ * Cross-OS: matches both POSIX (`/`) and Windows (`\`) path separators.
+ * Independent of `home` location — we only care about the `.claude/plugins/`
+ * suffix pattern.
+ */
+export function isPluginInstallPath(p) {
+    if (!p)
+        return false;
+    return /[/\\]\.claude[/\\]plugins[/\\](cache|marketplaces)[/\\]/.test(p);
+}
+/**
+ * Pure project-dir resolver. Mirror of the env-var chain inside
+ * `src/server.ts getProjectDir()`, but takes its inputs explicitly so the
+ * resolver can be exercised under test without process-level mutation.
+ *
+ * Resolution order:
+ *   1. Adapter-priority env vars (CLAUDE / GEMINI / VSCODE / OPENCODE / PI /
+ *      IDEA / CONTEXT_MODE) — first non-empty AND non-plugin-path wins.
+ *   2. `process.env.PWD` — shell-set, NOT updated by `process.chdir()`, so
+ *      it survives the `start.mjs` chdir into the plugin dir. Skipped if
+ *      it too points at a plugin install path.
+ *   3. `cwd` — last resort. Returned even if it is a plugin path; the
+ *      caller is responsible for rendering a graceful "no project context"
+ *      message rather than panicking. Keeping the function total preserves
+ *      operation of project-independent tools (sandbox execute, fetch).
+ */
+export function resolveProjectDir(opts) {
+    const { env, cwd, pwd } = opts;
+    const candidates = [
+        env.CLAUDE_PROJECT_DIR,
+        env.GEMINI_PROJECT_DIR,
+        env.VSCODE_CWD,
+        env.OPENCODE_PROJECT_DIR,
+        env.PI_PROJECT_DIR,
+        env.IDEA_INITIAL_DIRECTORY,
+        env.CONTEXT_MODE_PROJECT_DIR,
+    ];
+    for (const c of candidates) {
+        if (c && !isPluginInstallPath(c))
+            return c;
+    }
+    if (pwd && !isPluginInstallPath(pwd))
+        return pwd;
+    return cwd;
+}