waxmcp 0.1.4 → 0.1.13

package/README.md

@@ -16,19 +16,48 @@ npm version patch   # or minor/major/1.2.3
 npm publish --access public
 ```
 
-By default, the launcher uses this order:
+This repo also ships a release script that updates `version`, syncs
+`Sources/WaxMCPServer/main.swift`'s `serverVersion`, and rebuilds both Darwin binaries:
+
+```bash
+cd /path/to/Wax
+./scripts/release-waxmcp.sh patch   # or minor / major / 1.2.3
+git add npm/waxmcp/package.json Sources/WaxMCPServer/main.swift npm/waxmcp/dist/darwin-*/wax-cli npm/waxmcp/dist/darwin-*/wax-cli.sha256 npm/waxmcp/dist/darwin-*/wax-mcp npm/waxmcp/dist/darwin-*/wax-mcp.sha256
+git commit -m "release: bump waxmcp version"
+```
+
+`package.json` and `Sources/WaxMCPServer/main.swift` are required to stay in lockstep; the release
+workflow checks this before publishing.
+
+Artifacts are packaged with `wax-cli.sha256` and `wax-mcp.sha256` checksums generated by the release
+scripts for each platform binary.
+
+### MCP mode (default)
+
+When invoked with no arguments or with `mcp serve`, the launcher directly invokes the `wax-mcp`
+binary using this search order:
+
+1. `$WAX_MCP_BIN`
+2. Bundled `dist/darwin-arm64/wax-mcp` or `dist/darwin-x64/wax-mcp`
+3. `wax-mcp` in PATH
+4. `./.build/debug/wax-mcp` (current working directory)
+
+### CLI mode
+
+For all other subcommands (remember, recall, search, etc.), the launcher invokes the `wax-cli`
+binary using this search order:
 
 1. `$WAX_CLI_BIN`
-2. Bundled `dist/darwin-arm64/WaxCLI` or `dist/darwin-x64/WaxCLI`
-3. `wax`
-4. `WaxCLI`
-5. `./.build/debug/WaxCLI` (current working directory)
+2. Bundled `dist/darwin-arm64/wax-cli` or `dist/darwin-x64/wax-cli`
+3. `wax-cli` in PATH
+4. `./.build/debug/wax-cli` (current working directory)
 
 ## Local development
 
 ```bash
 cd /path/to/Wax
-swift build --product WaxCLI --traits MCPServer
-export WAX_CLI_BIN=/path/to/Wax/.build/debug/WaxCLI
+swift build --product wax-cli --traits MCPServer
+swift build --product wax-mcp --traits MCPServer
+export WAX_CLI_BIN=/path/to/Wax/.build/debug/wax-cli
 npx --yes ./npm/waxmcp mcp doctor
 ```

package/bin/waxmcp.js

@@ -8,6 +8,11 @@ const fs = require("node:fs");
 const forwardedArgs = process.argv.slice(2);
 const args = forwardedArgs.length > 0 ? forwardedArgs : ["mcp", "serve"];
 
+// Detect if we're in MCP server mode (default or explicit "mcp serve")
+const isMCPServe =
+  (forwardedArgs.length === 0) ||
+  (forwardedArgs.length >= 2 && forwardedArgs[0] === "mcp" && forwardedArgs[1] === "serve");
+
 function isExecutable(filePath) {
   try {
     fs.accessSync(filePath, fs.constants.X_OK);
@@ -17,7 +22,7 @@ function isExecutable(filePath) {
   }
 }
 
-function resolveBundledBinary() {
+function platformDistDir() {
   if (os.platform() !== "darwin") {
     return null;
   }
@@ -28,20 +33,86 @@ function resolveBundledBinary() {
     return null;
   }
 
-  return path.join(__dirname, "..", "dist", `darwin-${mappedArch}`, "WaxCLI");
+  return path.join(__dirname, "..", "dist", `darwin-${mappedArch}`);
+}
+
+function resolveBundledBinary(name) {
+  const distDir = platformDistDir();
+  if (!distDir) return null;
+  return path.join(distDir, name);
+}
+
+// --- MCP mode: invoke wax-mcp directly ---
+if (isMCPServe) {
+  // Extract flags that come after "mcp serve" (e.g. --store-path, --no-embedder)
+  const mcpFlags = forwardedArgs.length >= 2 ? forwardedArgs.slice(2) : [];
+
+  const mcpCandidates = [];
+  if (process.env.WAX_MCP_BIN) {
+    mcpCandidates.push(process.env.WAX_MCP_BIN);
+  }
+  const bundledMcp = resolveBundledBinary("wax-mcp");
+  if (bundledMcp) {
+    mcpCandidates.push(bundledMcp);
+  }
+  mcpCandidates.push("wax-mcp");
+  mcpCandidates.push(path.join(process.cwd(), ".build", "debug", "wax-mcp"));
+
+  for (const command of mcpCandidates) {
+    if (path.isAbsolute(command) && !isExecutable(command)) {
+      continue;
+    }
+    const result = spawnSync(command, mcpFlags, {
+      stdio: "inherit",
+      env: process.env,
+    });
+
+    if (result.error && result.error.code === "ENOENT") {
+      continue;
+    }
+
+    if (result.error) {
+      console.error(`waxmcp: failed to launch '${command}': ${result.error.message}`);
+      process.exit(1);
+    }
+
+    process.exit(result.status === null ? 1 : result.status);
+  }
+
+  // All wax-mcp candidates exhausted — fail with clear error
+  const mcpCheckedLocations = [
+    process.env.WAX_MCP_BIN
+      ? `  1. $WAX_MCP_BIN = ${process.env.WAX_MCP_BIN}`
+      : "  1. $WAX_MCP_BIN (not set)",
+    `  2. Bundled binary at dist/darwin-${os.arch()}/wax-mcp`,
+    "  3. 'wax-mcp' in PATH",
+    `  4. ${path.join(process.cwd(), ".build", "debug", "wax-mcp")}`,
+  ];
+  console.error(`
+ERROR: No valid wax-mcp binary found.
+
+Checked:
+${mcpCheckedLocations.join("\n")}
+
+Fix options:
+  Install:  npx waxmcp@latest
+  Build:    swift build --product wax-mcp --traits MCPServer
+  Override: export WAX_MCP_BIN=/path/to/wax-mcp
+`);
+  process.exit(1);
 }
 
+// --- CLI mode: invoke wax CLI binary ---
 const candidates = [];
 if (process.env.WAX_CLI_BIN) {
   candidates.push(process.env.WAX_CLI_BIN);
 }
-const bundledBinary = resolveBundledBinary();
-if (bundledBinary) {
-  candidates.push(bundledBinary);
+const bundledCli = resolveBundledBinary("wax-cli");
+if (bundledCli) {
+  candidates.push(bundledCli);
 }
-candidates.push("wax");
-candidates.push("WaxCLI");
-candidates.push(path.join(process.cwd(), ".build", "debug", "WaxCLI"));
+candidates.push("wax-cli");
+candidates.push(path.join(process.cwd(), ".build", "debug", "wax-cli"));
 
 for (const command of candidates) {
   if (path.isAbsolute(command) && !isExecutable(command)) {
@@ -68,20 +139,19 @@ const checkedLocations = [
   process.env.WAX_CLI_BIN
     ? `  1. $WAX_CLI_BIN = ${process.env.WAX_CLI_BIN}`
     : "  1. $WAX_CLI_BIN (not set)",
-  `  2. Bundled binary at dist/darwin-${os.arch()}/WaxCLI`,
-  "  3. 'wax' in PATH",
-  "  4. 'WaxCLI' in PATH",
-  `  5. ${path.join(process.cwd(), ".build", "debug", "WaxCLI")}`,
+  `  2. Bundled binary at dist/darwin-${os.arch()}/wax-cli`,
+  "  3. 'wax-cli' in PATH",
+  `  4. ${path.join(process.cwd(), ".build", "debug", "wax-cli")}`,
 ];
 console.error(`
-ERROR: No valid WaxCLI binary found.
+ERROR: No valid wax-cli binary found.
 
 Checked:
 ${checkedLocations.join("\n")}
 
 Fix options:
   Install:  npx waxmcp@latest
-  Build:    swift build --product WaxCLI --traits MCPServer
-  Override: export WAX_CLI_BIN=/path/to/WaxCLI
+  Build:    swift build --product wax-cli --traits MCPServer
+  Override: export WAX_CLI_BIN=/path/to/wax-cli
 `);
 process.exit(1);

package/dist/darwin-arm64/wax-cli.sha256

@@ -0,0 +1 @@
+829f83da1c29c9dab858353001b7eef5ddaf39eca590a08686990df01ede76ab  wax-cli

package/dist/darwin-arm64/wax-mcp.sha256

@@ -0,0 +1 @@
+6d274752f6475b1b8a6fb6cd998b928074264393b3a309997e5743a54ddfc3f3  wax-mcp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waxmcp",
-  "version": "0.1.4",
+  "version": "0.1.13",
   "description": "npx launcher for the Wax MCP server",
   "repository": {
     "type": "git",