@jmylchreest/aide-plugin 0.0.23 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmylchreest/aide-plugin",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "aide plugin for OpenCode — multi-agent orchestration, memory, skills, and persistence",
   "type": "module",
   "main": "./src/opencode/index.ts",

package/src/cli/config.ts

@@ -95,7 +95,7 @@ export function addAideToConfig(
     if (!mcp[MCP_SERVER_NAME]) {
       mcp[MCP_SERVER_NAME] = {
         type: "local",
-        command: ["npx", "-y", "-p", PLUGIN_NAME, "aide-wrapper", "mcp"],
+        command: ["npx", "-y", PLUGIN_NAME, "mcp"],
         environment: {
           AIDE_CODE_WATCH: "1",
           AIDE_CODE_WATCH_DELAY: "30s",

package/src/cli/index.ts

@@ -6,11 +6,13 @@
  *   bunx @jmylchreest/aide-plugin install   # Install globally for OpenCode
  *   bunx @jmylchreest/aide-plugin uninstall  # Remove from OpenCode config
  *   bunx @jmylchreest/aide-plugin status     # Show current installation status
+ *   bunx @jmylchreest/aide-plugin mcp        # Start MCP server (used by OpenCode)
  */
 
 import { install } from "./install.js";
 import { uninstall } from "./uninstall.js";
 import { status } from "./status.js";
+import { mcp } from "./mcp.js";
 
 const args = process.argv.slice(2);
 const command = args[0];
@@ -22,6 +24,7 @@ Usage:
   aide-plugin install     Install aide plugin globally for OpenCode
   aide-plugin uninstall   Remove aide plugin from OpenCode config
   aide-plugin status      Show current installation status
+  aide-plugin mcp         Start MCP server (delegates to aide-wrapper)
   aide-plugin --help      Show this help message
 
 Options:
@@ -49,6 +52,9 @@ async function main(): Promise<void> {
     case "status":
       await status();
       break;
+    case "mcp":
+      await mcp(args.slice(1));
+      break;
     case "--help":
     case "-h":
     case "help":

package/src/cli/install.ts

@@ -1,5 +1,8 @@
 /**
  * Install command — registers aide plugin and MCP server in OpenCode config.
+ *
+ * On reinstall, detects and upgrades stale MCP command configurations
+ * (e.g. old `aide-wrapper` commands) to the current format.
  */
 
 import {
@@ -10,6 +13,7 @@ import {
   readConfig,
   writeConfig,
   PLUGIN_NAME,
+  MCP_SERVER_NAME,
 } from "./config.js";
 
 export interface InstallFlags {
@@ -17,6 +21,32 @@ export interface InstallFlags {
   noMcp?: boolean;
 }
 
+/**
+ * Check if an existing MCP config has the current expected command format.
+ * Returns false if the command is missing, empty, or uses an outdated format.
+ */
+function isMcpCommandCurrent(config: ReturnType<typeof readConfig>): boolean {
+  const mcpConfig = config.mcp?.[MCP_SERVER_NAME];
+  if (!mcpConfig?.command || mcpConfig.command.length === 0) {
+    return false;
+  }
+
+  const cmd = mcpConfig.command;
+
+  // Current format: ["npx", "-y", "@jmylchreest/aide-plugin", "mcp"]
+  if (
+    cmd.length === 4 &&
+    cmd[0] === "npx" &&
+    cmd[1] === "-y" &&
+    cmd[2] === PLUGIN_NAME &&
+    cmd[3] === "mcp"
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
 export async function install(flags: InstallFlags): Promise<void> {
   const configPath = flags.project
     ? getProjectConfigPath()
@@ -29,7 +59,11 @@ export async function install(flags: InstallFlags): Promise<void> {
   const existing = readConfig(configPath);
   const before = isAideConfigured(existing);
 
-  if (before.plugin && before.mcp) {
+  // Check if MCP command needs updating (stale format from older versions)
+  const mcpNeedsUpdate =
+    !flags.noMcp && before.mcp && !isMcpCommandCurrent(existing);
+
+  if (before.plugin && before.mcp && !mcpNeedsUpdate) {
     console.log(`aide is already configured in ${configPath}`);
     console.log("  plugin: registered");
     console.log("  mcp:    registered");
@@ -37,6 +71,11 @@ export async function install(flags: InstallFlags): Promise<void> {
     return;
   }
 
+  // If MCP config is stale, remove it so addAideToConfig will write the current version
+  if (mcpNeedsUpdate && existing.mcp) {
+    delete existing.mcp[MCP_SERVER_NAME];
+  }
+
   // Apply changes
   const updated = addAideToConfig(existing, { noMcp: flags.noMcp });
   writeConfig(configPath, updated);
@@ -52,7 +91,9 @@ export async function install(flags: InstallFlags): Promise<void> {
   }
 
   if (!flags.noMcp) {
-    if (!before.mcp && after.mcp) {
+    if (mcpNeedsUpdate) {
+      console.log(`  ~ Updated "aide" MCP server command (was outdated)`);
+    } else if (!before.mcp && after.mcp) {
       console.log(`  + Added "aide" MCP server`);
     } else if (before.mcp) {
       console.log(`  = MCP server already registered`);

package/src/cli/mcp.ts

@@ -0,0 +1,63 @@
+/**
+ * MCP subcommand — delegates to aide-wrapper.sh to start the MCP server.
+ *
+ * This is the entry point used by OpenCode's MCP config:
+ *   "command": ["npx", "-y", "@jmylchreest/aide-plugin", "mcp"]
+ *
+ * The wrapper handles binary discovery/download, then exec's `aide mcp`.
+ */
+
+import { execFileSync } from "child_process";
+import { existsSync } from "fs";
+import { dirname, join, resolve } from "path";
+import { fileURLToPath } from "url";
+
+/**
+ * Find the aide-wrapper.sh script relative to this CLI module.
+ *
+ * Resolution: this file lives at <plugin-root>/src/cli/mcp.ts,
+ * so the wrapper is at <plugin-root>/bin/aide-wrapper.sh.
+ */
+function findWrapper(): string {
+  // __dirname equivalent for ESM
+  const thisDir = dirname(fileURLToPath(import.meta.url));
+  // src/cli -> src -> plugin-root
+  const pluginRoot = resolve(thisDir, "..", "..");
+  const wrapper = join(pluginRoot, "bin", "aide-wrapper.sh");
+
+  if (!existsSync(wrapper)) {
+    throw new Error(
+      `aide-wrapper.sh not found at ${wrapper}\n` +
+        `Expected plugin root: ${pluginRoot}\n` +
+        `Ensure the package is installed correctly.`,
+    );
+  }
+
+  return wrapper;
+}
+
+/**
+ * Start the MCP server by exec'ing aide-wrapper.sh with "mcp" + any extra args.
+ * This replaces the current process so stdio is inherited directly.
+ */
+export async function mcp(extraArgs: string[]): Promise<void> {
+  const wrapper = findWrapper();
+  const args = ["mcp", ...extraArgs];
+
+  // Use execFileSync with stdio inherit so the MCP JSON-RPC protocol
+  // flows directly between OpenCode and the aide binary.
+  // The wrapper will exec() into the aide binary, replacing itself.
+  try {
+    execFileSync(wrapper, args, {
+      stdio: "inherit",
+      env: process.env,
+    });
+  } catch (err: unknown) {
+    // execFileSync throws on non-zero exit. If the process was killed
+    // by a signal (e.g. OpenCode shutting down), exit cleanly.
+    if (err && typeof err === "object" && "status" in err) {
+      process.exit((err as { status: number }).status ?? 1);
+    }
+    throw err;
+  }
+}

package/src/opencode/index.ts

@@ -16,7 +16,7 @@
  *   "mcp": {
  *     "aide": {
  *       "type": "local",
- *       "command": ["npx", "-y", "-p", "@jmylchreest/aide-plugin", "aide-wrapper", "mcp"],
+ *       "command": ["npx", "-y", "@jmylchreest/aide-plugin", "mcp"],
  *       "environment": { "AIDE_CODE_WATCH": "1", "AIDE_CODE_WATCH_DELAY": "30s" },
  *       "enabled": true
  *     }