supipowers 0.7.0 → 0.7.2

package/bin/install.mjs

@@ -83,6 +83,11 @@ function isInstalled(binary) {
   return result.status === 0;
 }
 
+// ── CLI Flags ────────────────────────────────────────────────
+
+const args = process.argv.slice(2);
+const skipLsp = args.includes("--skip-lsp");
+
 // ── Main ─────────────────────────────────────────────────────
 
 async function main() {
@@ -191,41 +196,94 @@ async function main() {
     }
   }
 
-  // ── Step 3: LSP setup (optional) ──────────────────────────
+  // ── Step 2b: Register context-mode MCP server (if installed) ──
+
+  const ctxSpinner = spinner();
+  ctxSpinner.start("Checking for context-mode...");
+
+  // Find context-mode installation (Claude Code plugin cache)
+  const ctxCacheBase = join(homedir(), ".claude", "plugins", "cache", "context-mode", "context-mode");
+  let ctxInstallPath = null;
+  if (existsSync(ctxCacheBase)) {
+    // Find the latest version directory
+    const versions = readdirSync(ctxCacheBase, { withFileTypes: true })
+      .filter((d) => d.isDirectory())
+      .map((d) => d.name)
+      .sort()
+      .reverse();
+    if (versions.length > 0) {
+      const candidate = join(ctxCacheBase, versions[0], "start.mjs");
+      if (existsSync(candidate)) {
+        ctxInstallPath = join(ctxCacheBase, versions[0]);
+      }
+    }
+  }
 
-  const lspSpinner = spinner();
-  lspSpinner.start("Checking installed LSP servers...");
-  const lspOptions = LSP_SERVERS.map((srv) => {
-    const installed = isInstalled(srv.server);
-    return {
-      value: srv,
-      label: srv.language,
-      hint: installed ? `${srv.server} (installed)` : srv.server,
+  if (ctxInstallPath) {
+    // Register as MCP server in ~/.omp/agent/mcp.json
+    const mcpConfigPath = join(homedir(), ".omp", "agent", "mcp.json");
+    let mcpConfig = { mcpServers: {} };
+    if (existsSync(mcpConfigPath)) {
+      try {
+        mcpConfig = JSON.parse(readFileSync(mcpConfigPath, "utf8"));
+        if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
+      } catch {
+        mcpConfig = { mcpServers: {} };
+      }
+    }
+
+    const startMjs = join(ctxInstallPath, "start.mjs");
+    mcpConfig.mcpServers["context-mode"] = {
+      command: "node",
+      args: [startMjs],
     };
-  });
-  const installedCount = lspOptions.filter((o) => o.hint.includes("(installed)")).length;
-  lspSpinner.stop(`Found ${installedCount}/${LSP_SERVERS.length} LSP servers installed`);
 
-  const selected = await multiselect({
-    message: "Install LSP servers for better code intelligence?",
-    options: lspOptions,
-    required: false,
-  });
+    const { writeFileSync: writeFs } = await import("node:fs");
+    writeFs(mcpConfigPath, JSON.stringify(mcpConfig, null, 2));
+    ctxSpinner.stop(`context-mode registered as MCP server (${ctxInstallPath})`);
+  } else {
+    ctxSpinner.stop("context-mode not found (install it as a Claude Code plugin for context window protection)");
+  }
 
-  if (!isCancel(selected) && selected.length > 0) {
-    for (const srv of selected) {
-      if (isInstalled(srv.server)) {
-        note(`${srv.server} is already installed, skipping.`, srv.language);
-        continue;
-      }
-      const ls = spinner();
-      ls.start(`Installing ${srv.server}...`);
-      const [cmd, ...args] = srv.installCmd.split(" ");
-      const r = run(cmd, args);
-      if (r.status !== 0) {
-        ls.stop(`Failed to install ${srv.server} — you can install manually: ${srv.installCmd}`);
-      } else {
-        ls.stop(`${srv.server} installed`);
+  // ── Step 3: LSP setup (optional, skipped with --skip-lsp) ──
+
+  if (skipLsp) {
+    note("LSP setup skipped (--skip-lsp)", "LSP");
+  } else {
+    const lspSpinner = spinner();
+    lspSpinner.start("Checking installed LSP servers...");
+    const lspOptions = LSP_SERVERS.map((srv) => {
+      const installed = isInstalled(srv.server);
+      return {
+        value: srv,
+        label: srv.language,
+        hint: installed ? `${srv.server} (installed)` : srv.server,
+      };
+    });
+    const installedCount = lspOptions.filter((o) => o.hint.includes("(installed)")).length;
+    lspSpinner.stop(`Found ${installedCount}/${LSP_SERVERS.length} LSP servers installed`);
+
+    const selected = await multiselect({
+      message: "Install LSP servers for better code intelligence?",
+      options: lspOptions,
+      required: false,
+    });
+
+    if (!isCancel(selected) && selected.length > 0) {
+      for (const srv of selected) {
+        if (isInstalled(srv.server)) {
+          note(`${srv.server} is already installed, skipping.`, srv.language);
+          continue;
+        }
+        const ls = spinner();
+        ls.start(`Installing ${srv.server}...`);
+        const [cmd, ...installArgs] = srv.installCmd.split(" ");
+        const r = run(cmd, installArgs);
+        if (r.status !== 0) {
+          ls.stop(`Failed to install ${srv.server} — you can install manually: ${srv.installCmd}`);
+        } else {
+          ls.stop(`${srv.server} installed`);
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supipowers",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "OMP-native workflow extension inspired by supipowers.",
   "type": "module",
   "scripts": {

package/src/context-mode/detector.ts

@@ -24,13 +24,26 @@ const TOOL_SUFFIXES: Array<[string, keyof ContextModeStatus["tools"]]> = [
 ];
 
 /**
- * Extract the short tool name from a potentially MCP-namespaced tool name.
- * MCP tools use the format: mcp__<server>__<tool_name>
- * Native tools use bare names like: lsp, bash, etc.
+ * Check if a tool name matches a context-mode tool suffix.
+ * Handles multiple naming conventions:
+ *   - Bare names: "ctx_execute"
+ *   - Claude Code MCP: "mcp__plugin_context-mode_context-mode__ctx_execute"
+ *   - OMP MCP: "mcp_context_mode_ctx_execute"
+ *
+ * We match by checking if the tool contains a known context-mode server
+ * prefix followed by the suffix, or is the bare suffix itself.
  */
-function getShortName(tool: string): string {
-  const lastSep = tool.lastIndexOf("__");
-  return lastSep >= 0 ? tool.slice(lastSep + 2) : tool;
+const CONTEXT_MODE_PREFIXES = [
+  "mcp__plugin_context-mode_context-mode__",  // Claude Code
+  "mcp_context_mode_",                        // OMP
+];
+
+function matchesSuffix(tool: string, suffix: string): boolean {
+  if (tool === suffix) return true;
+  for (const prefix of CONTEXT_MODE_PREFIXES) {
+    if (tool === prefix + suffix) return true;
+  }
+  return false;
 }
 
 /** Detect context-mode MCP tool availability from the active tools list */
@@ -45,9 +58,8 @@ export function detectContextMode(activeTools: string[]): ContextModeStatus {
   };
 
   for (const tool of activeTools) {
-    const shortName = getShortName(tool);
     for (const [suffix, key] of TOOL_SUFFIXES) {
-      if (shortName === suffix) {
+      if (matchesSuffix(tool, suffix)) {
         tools[key] = true;
         break;
       }

package/src/context-mode/hooks.ts

@@ -67,9 +67,11 @@ export function registerContextModeHooks(pi: ExtensionAPI, config: SupipowersCon
 
   // Phase 1: Tool routing — block native tools and redirect to ctx_* equivalents
   pi.on("tool_call", (event) => {
-    if (!cachedStatus) cachedStatus = detectContextMode(pi.getActiveTools());
+    // Always re-detect: MCP tools may load after extension init
+    const status = detectContextMode(pi.getActiveTools());
+    cachedStatus = status;
 
-    return routeToolCall(event.toolName, event.input as any, cachedStatus, {
+    return routeToolCall(event.toolName, event.input as any, status, {
       enforceRouting: config.contextMode.enforceRouting,
       blockHttpCommands: config.contextMode.blockHttpCommands,
     });

package/src/context-mode/routing.ts

@@ -73,6 +73,28 @@ export function routeToolCall(
     };
   }
 
+  // Find/Glob → block, redirect to ctx_execute or ctx_batch_execute
+  if (options.enforceRouting && toolName === "find") {
+    if (!status.tools.ctxExecute) return undefined;
+    return {
+      block: true,
+      reason:
+        'Use ctx_execute(language: "shell", code: "find ...") or ctx_batch_execute instead of Find/Glob. ' +
+        "Results are indexed and compressed to save context window.",
+    };
+  }
+
+  // Fetch/WebFetch → block, redirect to ctx_fetch_and_index
+  if (toolName === "fetch" || toolName === "web_fetch") {
+    if (!status.tools.ctxFetchAndIndex) return undefined;
+    return {
+      block: true,
+      reason:
+        "Use ctx_fetch_and_index instead of Fetch/WebFetch. " +
+        "It fetches the URL, indexes the content, and returns a compressed summary.",
+    };
+  }
+
   // Read (full-file, no limit/offset) → block, redirect to ctx_execute_file
   if (options.enforceRouting && toolName === "read") {
     if (!status.tools.ctxExecuteFile) return undefined;