context-mode 1.0.122 → 1.0.123

package/.claude-plugin/marketplace.json

@@ -6,14 +6,14 @@
   },
   "metadata": {
     "description": "Claude Code plugins by Mert Koseoğlu",
-    "version": "1.0.122"
+    "version": "1.0.123"
   },
   "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.122",
+      "version": "1.0.123",
       "author": {
         "name": "Mert Koseoğlu"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.122",
+  "version": "1.0.123",
   "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.122",
+  "version": "1.0.123",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/.openclaw-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.122",
+  "version": "1.0.123",
   "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/adapters/client-map.js

@@ -21,6 +21,12 @@ export const CLIENT_NAME_TO_PLATFORM = {
     "Kiro CLI": "kiro",
     "Pi CLI": "pi",
     "Pi Coding Agent": "pi",
+    // Issue #542 — Pi rebranded to OMP. Upstream
+    // refs/platforms/oh-my-pi/packages/coding-agent/src/mcp/client.ts:46-49
+    // ships clientInfo.name = "omp-coding-agent". Resolved to the OMP
+    // adapter (~/.omp/, PI_CODING_AGENT_DIR). Legacy "Pi CLI" /
+    // "Pi Coding Agent" entries above still resolve to the pi adapter.
+    "omp-coding-agent": "omp",
     "Zed": "zed",
     "zed": "zed",
     "qwen-code": "qwen-code",

package/build/adapters/detect.d.ts

@@ -33,7 +33,7 @@ export declare function __seedClaudeCodePluginCacheMissForTests(): void;
  * Single source of truth — consumed by detectPlatform() below and by
  * tests that need to clear platform-related env vars deterministically.
  */
-export declare const PLATFORM_ENV_VARS: readonly [readonly ["claude-code", readonly ["CLAUDE_CODE_ENTRYPOINT", "CLAUDE_PLUGIN_ROOT", "CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"]], readonly ["antigravity", readonly ["ANTIGRAVITY_CLI_ALIAS"]], readonly ["cursor", readonly ["CURSOR_TRACE_ID", "CURSOR_CLI"]], readonly ["kilo", readonly ["KILO", "KILO_PID"]], readonly ["opencode", readonly ["OPENCODE", "OPENCODE_PID"]], readonly ["zed", readonly ["ZED_SESSION_ID", "ZED_TERM"]], readonly ["codex", readonly ["CODEX_THREAD_ID", "CODEX_CI"]], readonly ["gemini-cli", readonly ["GEMINI_PROJECT_DIR", "GEMINI_CLI"]], readonly ["vscode-copilot", readonly ["VSCODE_PID", "VSCODE_CWD"]], readonly ["jetbrains-copilot", readonly ["IDEA_INITIAL_DIRECTORY"]], readonly ["qwen-code", readonly ["QWEN_PROJECT_DIR"]], readonly ["omp", readonly ["PI_CODING_AGENT_DIR"]], readonly ["pi", readonly ["PI_PROJECT_DIR"]]];
+export declare const PLATFORM_ENV_VARS: readonly [readonly ["claude-code", readonly ["CLAUDE_CODE_ENTRYPOINT", "CLAUDE_PLUGIN_ROOT", "CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"]], readonly ["antigravity", readonly ["ANTIGRAVITY_CLI_ALIAS"]], readonly ["cursor", readonly ["CURSOR_TRACE_ID", "CURSOR_CLI"]], readonly ["kilo", readonly ["KILO", "KILO_PID"]], readonly ["opencode", readonly ["OPENCODE", "OPENCODE_PID"]], readonly ["zed", readonly ["ZED_SESSION_ID", "ZED_TERM"]], readonly ["codex", readonly ["CODEX_THREAD_ID", "CODEX_CI"]], readonly ["gemini-cli", readonly ["GEMINI_PROJECT_DIR", "GEMINI_CLI"]], readonly ["vscode-copilot", readonly ["VSCODE_PID", "VSCODE_CWD"]], readonly ["jetbrains-copilot", readonly ["IDEA_INITIAL_DIRECTORY"]], readonly ["qwen-code", readonly ["QWEN_PROJECT_DIR"]], readonly ["omp", readonly ["PI_CODING_AGENT_DIR"]], readonly ["pi", readonly ["PI_CONFIG_DIR", "PI_SESSION_FILE", "PI_COMPILED"]]];
 /**
  * Sync map from platform identifier → home-relative path segments where that
  * platform stores its config. Mirrors the `super([...])` argument passed by

package/build/adapters/detect.js

@@ -118,9 +118,15 @@ export const PLATFORM_ENV_VARS = [
     // agent-dir override per `packages/utils/src/dirs.ts:193`. Listed
     // BEFORE pi so OMP is not misclassified as Pi when both are installed.
     ["omp", ["PI_CODING_AGENT_DIR"]],
-    // pi — PI_PROJECT_DIR consumed by src/adapters/pi/extension.ts:154 + src/server.ts:153
-    // — implies the Pi runtime sets it before invoking the extension.
-    ["pi", ["PI_PROJECT_DIR"]],
+    // pi — Issue #542 marker correction. PI_PROJECT_DIR is a consumer-set
+    // var (read by src/adapters/pi/extension.ts) but is NOT auto-set by
+    // the Pi runtime — verified against
+    //   refs/platforms/oh-my-pi/packages/coding-agent/src/mcp/transports/stdio.ts:55-63
+    // (env passthrough only, no synthesis). The Pi runtime DOES set
+    // PI_CONFIG_DIR (config dir override), PI_SESSION_FILE (active session
+    // path), and PI_COMPILED (binary build marker). PI_CODING_AGENT_DIR is
+    // owned by OMP above; keep it there.
+    ["pi", ["PI_CONFIG_DIR", "PI_SESSION_FILE", "PI_COMPILED"]],
     // openclaw — removed (runtime never sets OPENCLAW_HOME or OPENCLAW_CLI;
     // detection falls through to ~/.openclaw/ config-dir tier below).
     // kiro — not listed (no auto-set process env vars; ~/.kiro/ config-dir tier).
@@ -245,13 +251,15 @@ export function detectPlatform(clientInfo) {
             reason: "~/.codex/ directory exists",
         };
     }
-    if (existsSync(resolve(home, ".cursor"))) {
-        return {
-            platform: "cursor",
-            confidence: "medium",
-            reason: "~/.cursor/ directory exists",
-        };
-    }
+    // Issue #542 — CLI agents BEFORE host IDEs.
+    //
+    // Cursor (a VSCode fork) is the most installed editor across our user
+    // base. Checking ~/.cursor/ first means every CLI agent co-installed
+    // with Cursor (Pi, OMP, Kiro, Qwen) silently routes through
+    // CursorAdapter even though the agent owns the session — Cursor merely
+    // hosts the terminal. Reorder: agents (.kiro/.omp/.pi/.qwen/.openclaw)
+    // win the medium-confidence tier, editors (~/.cursor/, ~/.vscode/,
+    // JetBrains) lose. Verified by the detect-config-dir.test.ts matrix.
     if (existsSync(resolve(home, ".kiro"))) {
         return {
             platform: "kiro",
@@ -288,6 +296,14 @@ export function detectPlatform(clientInfo) {
             reason: "~/.openclaw/ directory exists",
         };
     }
+    // Cursor / host IDEs — checked AFTER all CLI agents (issue #542).
+    if (existsSync(resolve(home, ".cursor"))) {
+        return {
+            platform: "cursor",
+            confidence: "medium",
+            reason: "~/.cursor/ directory exists",
+        };
+    }
     if (existsSync(resolve(home, ".config", "kilo"))) {
         return {
             platform: "kilo",

package/build/adapters/pi/extension.js

@@ -233,7 +233,11 @@ export function isPiShortCircuitArgv(argv) {
 export default function piExtension(pi) {
     const buildDir = dirname(fileURLToPath(import.meta.url));
     const pluginRoot = resolve(buildDir, "..", "..", "..");
-    const projectDir = process.env.PI_PROJECT_DIR || process.cwd();
+    // Issue #542 — Pi's runtime sets PI_CONFIG_DIR (not PI_PROJECT_DIR).
+    // PI_PROJECT_DIR remains supported as a legacy override for callers
+    // that historically synthesized it. Cwd is the universal final
+    // fallback.
+    const projectDir = process.env.PI_CONFIG_DIR || process.env.PI_PROJECT_DIR || process.cwd();
     const db = getOrCreateDB();
     // ── 1. session_start — Initialize session ──────────────
     pi.on("session_start", (_event, ctx) => {

package/build/cli.js

@@ -125,7 +125,16 @@ if (args[0] === "doctor") {
     doctor().then((code) => process.exit(code));
 }
 else if (args[0] === "upgrade") {
-    upgrade().catch((err) => {
+    // Issue #542 — accept --platform <id> from the ctx_upgrade MCP handler,
+    // which forwards the live MCP clientInfo's resolved PlatformId. The flag
+    // wins over upgrade()'s own detectPlatform() heuristic chain so an
+    // ambiguous config-dir collision (e.g. ~/.cursor + ~/.pi both present)
+    // can never misroute the upgrade.
+    const platformFlagIdx = args.indexOf("--platform");
+    const platformArg = platformFlagIdx >= 0 && args[platformFlagIdx + 1]
+        ? args[platformFlagIdx + 1]
+        : undefined;
+    upgrade(platformArg ? { platform: platformArg } : undefined).catch((err) => {
         const message = err instanceof Error ? err.message : String(err);
         p.log.error(color.red(message));
         process.exit(1);
@@ -601,11 +610,18 @@ async function insight(port) {
 /* -------------------------------------------------------
  * Upgrade — adapter-aware hook configuration
  * ------------------------------------------------------- */
-async function upgrade() {
+async function upgrade(opts) {
     if (process.stdout.isTTY)
         console.clear();
-    // Detect platform
-    const detection = detectPlatform();
+    // Issue #542 — when the MCP ctx_upgrade handler threads through an
+    // explicit --platform <id> (resolved from live clientInfo), trust it
+    // over the local heuristic chain. detectPlatform() with no args cannot
+    // see the MCP handshake and falls through to the config-dir tier,
+    // which misdetects Pi/OMP installs as Cursor on systems where both
+    // ~/.cursor/ and ~/.pi/ exist.
+    const detection = opts?.platform
+        ? { platform: opts.platform, confidence: "high", reason: `--platform ${opts.platform} from ctx_upgrade handler` }
+        : detectPlatform();
     const adapter = await getAdapter(detection.platform);
     p.intro(color.bgCyan(color.black(" context-mode upgrade ")));
     p.log.info(`Platform: ${color.cyan(adapter.name)}` +

package/build/server.js

@@ -2745,12 +2745,27 @@ server.registerTool("ctx_upgrade", {
         }
     }
     catch { /* best effort — don't block upgrade */ }
+    // Issue #542 — thread MCP clientInfo into the spawned upgrade
+    // process. detectPlatform() runs IN-PROCESS here (no spawn boundary)
+    // so clientInfo from the MCP handshake is the highest-confidence
+    // signal available. We forward the resolved PlatformId as a
+    // --platform flag (cross-shell safe on POSIX, Git Bash, PowerShell,
+    // and cmd.exe — unlike env-var prefixes). If detection fails we
+    // skip the flag and let upgrade()'s own detectPlatform() fall back.
+    let platformFlag = "";
+    try {
+        const { detectPlatform } = await import("./adapters/detect.js");
+        const clientInfo = server.server.getClientVersion();
+        const signal = detectPlatform(clientInfo ?? undefined);
+        platformFlag = ` --platform ${signal.platform}`;
+    }
+    catch { /* best effort — fall back to upgrade()'s own detect */ }
     let cmd;
     if (existsSync(bundlePath)) {
-        cmd = `${buildNodeCommand(bundlePath)} upgrade`;
+        cmd = `${buildNodeCommand(bundlePath)} upgrade${platformFlag}`;
     }
     else if (existsSync(fallbackPath)) {
-        cmd = `${buildNodeCommand(fallbackPath)} upgrade`;
+        cmd = `${buildNodeCommand(fallbackPath)} upgrade${platformFlag}`;
     }
     else {
         // Inline fallback: neither CLI file exists (e.g. marketplace installs).