context-mode 1.0.39 → 1.0.41

package/skills/ctx-doctor/SKILL.md

@@ -13,20 +13,10 @@ Run diagnostics and display results directly in the conversation.
 
 ## Instructions
 
-1. Derive the **plugin root** from this skill's base directory (go up 2 levels — remove `/skills/ctx-doctor`).
-2. Run with Bash:
+1. Call the `ctx_doctor` MCP tool directly. It runs all checks server-side and returns a markdown checklist.
+2. Display the results verbatim — they are already formatted as a checklist with `[x]` PASS, `[ ]` FAIL, `[-]` WARN.
+3. **Fallback** (only if MCP tool call fails): Derive the **plugin root** from this skill's base directory (go up 2 levels — remove `/skills/ctx-doctor`), then run with Bash:
    ```
    CLI="<PLUGIN_ROOT>/cli.bundle.mjs"; [ ! -f "$CLI" ] && CLI="<PLUGIN_ROOT>/build/cli.js"; node "$CLI" doctor
    ```
-3. **IMPORTANT**: After the Bash tool completes, re-display the key results as markdown text directly in the conversation so the user sees them without expanding the tool output. Format as a checklist:
-   ```
-   ## context-mode doctor
-   - [x] Runtimes: 6/10 (javascript, typescript, python, shell, ruby, perl)
-   - [x] Performance: FAST (Bun)
-   - [x] Server test: PASS
-   - [x] Hooks: PASS
-   - [x] FTS5: PASS
-   - [x] npm: v0.7.1
-   - [x] Marketplace: v0.7.1
-   ```
-   Use `[x]` for PASS, `[ ]` for FAIL, `[-]` for WARN.
+   Re-display results as a markdown checklist.

package/skills/ctx-upgrade/SKILL.md

@@ -13,20 +13,19 @@ Pull latest from GitHub and reinstall the plugin.
 
 ## Instructions
 
-1. Derive the **plugin root** from this skill's base directory (go up 2 levels — remove `/skills/ctx-upgrade`).
-2. Run with Bash:
-   ```
-   CLI="<PLUGIN_ROOT>/cli.bundle.mjs"; [ ! -f "$CLI" ] && CLI="<PLUGIN_ROOT>/build/cli.js"; node "$CLI" upgrade
-   ```
-3. **IMPORTANT**: After the Bash tool completes, re-display the key results as markdown text directly in the conversation so the user sees them without expanding the tool output. Format as:
+1. Call the `ctx_upgrade` MCP tool directly. It returns a shell command to execute.
+2. Run the returned command using your shell execution tool (Bash, shell_execute, etc.).
+3. Display results as a markdown checklist:
    ```
    ## context-mode upgrade
    - [x] Pulled latest from GitHub
-   - [x] Built and installed v0.9.13
-   - [x] npm global updated
+   - [x] Built and installed v1.0.39
    - [x] Hooks configured
-   - [x] Permissions set
    - [x] Doctor: all checks PASS
    ```
-   Use `[x]` for success, `[ ]` for failure. Show the actual version numbers and any warnings.
-   Tell the user to **restart their Claude Code session** to pick up the new version.
+   Use `[x]` for success, `[ ]` for failure. Show actual version numbers.
+4. Tell the user to **restart their session** to pick up the new version.
+5. **Fallback** (only if MCP tool call fails): Derive the **plugin root** from this skill's base directory (go up 2 levels — remove `/skills/ctx-upgrade`), then run with Bash:
+   ```
+   CLI="<PLUGIN_ROOT>/cli.bundle.mjs"; [ ! -f "$CLI" ] && CLI="<PLUGIN_ROOT>/build/cli.js"; node "$CLI" upgrade
+   ```

package/start.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { execSync } from "node:child_process";
-import { existsSync, copyFileSync, readFileSync, writeFileSync, readdirSync } from "node:fs";
+import { existsSync, copyFileSync, chmodSync, readFileSync, writeFileSync, readdirSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
@@ -56,47 +56,65 @@ if (!process.env.CLAUDE_PROJECT_DIR) {
   process.env.CLAUDE_PROJECT_DIR = originalCwd;
 }
 
-// Auto-write routing instructions file for the detected platform
+// Auto-write routing instructions file for NON-hook-capable platforms only.
+// Hook-capable platforms (Claude Code, Gemini CLI, VS Code Copilot, OpenCode, OpenClaw)
+// inject routing via SessionStart hook — writing to disk dirties the git tree (#158).
+// server.ts also guards this with adapter.capabilities.sessionStart.
 try {
-  const projectDir =
-    process.env.CLAUDE_PROJECT_DIR ||
-    process.env.GEMINI_PROJECT_DIR ||
-    process.env.VSCODE_CWD ||
-    process.cwd();
-
-  const configsDir = resolve(__dirname, "configs");
-
-  // Detect platform and determine instruction file
-  const platformConfigs = [
-    { env: ["CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"], dir: "claude-code", file: "CLAUDE.md", target: "CLAUDE.md" },
-    { env: ["GEMINI_PROJECT_DIR", "GEMINI_SESSION_ID"], dir: "gemini-cli", file: "GEMINI.md", target: "GEMINI.md" },
-    { env: ["VSCODE_PID", "VSCODE_CWD"], dir: "vscode-copilot", file: "copilot-instructions.md", target: ".github/copilot-instructions.md" },
-    { env: ["OPENCODE_PROJECT_DIR", "OPENCODE_SESSION_ID"], dir: "opencode", file: "AGENTS.md", target: "AGENTS.md" },
-    { env: ["OPENCLAW_HOME", "OPENCLAW_PROJECT_DIR"], dir: "openclaw", file: "AGENTS.md", target: "AGENTS.md" },
-    { env: ["CODEX_HOME"], dir: "codex", file: "AGENTS.md", target: "AGENTS.md" },
+  // Hook-capable platforms set these env vars — skip file write for them.
+  // Uses verified env vars from src/adapters/detect.ts (not invented session IDs).
+  const hookCapableSessionVars = [
+    "CLAUDE_SESSION_ID",        // Claude Code
+    "GEMINI_PROJECT_DIR",       // Gemini CLI (GEMINI_CLI also valid)
+    "OPENCODE",                 // OpenCode (OPENCODE_PID also valid)
+    "OPENCLAW_HOME",            // OpenClaw (user-set home dir)
+    "OPENCLAW_CLI",             // OpenClaw (set at runtime by openclaw CLI)
+    // VS Code Copilot: VSCODE_PID is too broad (set for ALL VS Code extensions).
+    // Accept occasional harmless write rather than false-positive suppression.
   ];
+  const hasHookSupport = hookCapableSessionVars.some((e) => process.env[e]);
+
+  if (!hasHookSupport) {
+    const projectDir =
+      process.env.CLAUDE_PROJECT_DIR ||
+      process.env.GEMINI_PROJECT_DIR ||
+      process.env.VSCODE_CWD ||
+      process.cwd();
+
+    const configsDir = resolve(__dirname, "configs");
+
+    // Detect platform and determine instruction file
+    const platformConfigs = [
+      { env: ["CLAUDE_PROJECT_DIR"], dir: "claude-code", file: "CLAUDE.md", target: "CLAUDE.md" },
+      { env: ["GEMINI_PROJECT_DIR"], dir: "gemini-cli", file: "GEMINI.md", target: "GEMINI.md" },
+      { env: ["VSCODE_CWD"], dir: "vscode-copilot", file: "copilot-instructions.md", target: ".github/copilot-instructions.md" },
+      { env: ["OPENCODE_PROJECT_DIR"], dir: "opencode", file: "AGENTS.md", target: "AGENTS.md" },
+      { env: ["OPENCLAW_HOME"], dir: "openclaw", file: "AGENTS.md", target: "AGENTS.md" },
+      { env: ["CODEX_HOME"], dir: "codex", file: "AGENTS.md", target: "AGENTS.md" },
+    ];
+
+    const detected = platformConfigs.find((p) => p.env.some((e) => process.env[e]));
+    if (detected) {
+      const targetPath = resolve(projectDir, detected.target);
+      const sourcePath = resolve(configsDir, detected.dir, detected.file);
+
+      // Ensure parent dir exists (for .github/copilot-instructions.md)
+      const targetDir = resolve(targetPath, "..");
+      if (!existsSync(targetDir)) {
+        const { mkdirSync } = await import("node:fs");
+        mkdirSync(targetDir, { recursive: true });
+      }
 
-  const detected = platformConfigs.find((p) => p.env.some((e) => process.env[e]));
-  if (detected) {
-    const targetPath = resolve(projectDir, detected.target);
-    const sourcePath = resolve(configsDir, detected.dir, detected.file);
-
-    // Ensure parent dir exists (for .github/copilot-instructions.md)
-    const targetDir = resolve(targetPath, "..");
-    if (!existsSync(targetDir)) {
-      const { mkdirSync } = await import("node:fs");
-      mkdirSync(targetDir, { recursive: true });
-    }
-
-    if (existsSync(sourcePath)) {
-      const content = readFileSync(sourcePath, "utf-8");
-      if (existsSync(targetPath)) {
-        const existing = readFileSync(targetPath, "utf-8");
-        if (!existing.includes("context-mode")) {
-          writeFileSync(targetPath, existing.trimEnd() + "\n\n" + content, "utf-8");
+      if (existsSync(sourcePath)) {
+        const content = readFileSync(sourcePath, "utf-8");
+        if (existsSync(targetPath)) {
+          const existing = readFileSync(targetPath, "utf-8");
+          if (!existing.includes("context-mode")) {
+            writeFileSync(targetPath, existing.trimEnd() + "\n\n" + content, "utf-8");
+          }
+        } else {
+          writeFileSync(targetPath, content, "utf-8");
         }
-      } else {
-        writeFileSync(targetPath, content, "utf-8");
       }
     }
   }
@@ -172,6 +190,13 @@ for (const pkg of ["better-sqlite3", "turndown", "turndown-plugin-gfm", "@mixmar
 // Each ABI needs its own compiled binary — cache them side-by-side.
 ensureNativeCompat(__dirname);
 
+// Self-heal: create CLI shim if cli.bundle.mjs is missing (marketplace installs)
+if (!existsSync(resolve(__dirname, "cli.bundle.mjs")) && existsSync(resolve(__dirname, "build", "cli.js"))) {
+  const shimPath = resolve(__dirname, "cli.bundle.mjs");
+  writeFileSync(shimPath, '#!/usr/bin/env node\nawait import("./build/cli.js");\n');
+  if (process.platform !== "win32") chmodSync(shimPath, 0o755);
+}
+
 // Bundle exists (CI-built) — start instantly
 if (existsSync(resolve(__dirname, "server.bundle.mjs"))) {
   await import("./server.bundle.mjs");