phistruct-mcp 0.1.1 → 0.1.2

package/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { spawn, execFileSync } from "node:child_process";
+import { execFileSync, spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, writeFileSync } from "node:fs";
 import { createConnection } from "node:net";
 import { homedir } from "node:os";
@@ -71,8 +71,24 @@ function runMdfind() {
   }
 }
 
+/** A visible PhiStruct window, including a different copy than `bin`. Ignores the hidden --mcp helper. */
+export function isGuiCommand(command, bin) {
+  if (!command || isStdioMcpCommand(command)) return false;
+  if (bin && command.includes(bin)) return true;
+  return /\/MacOS\/PhiStruct(?:\s|$)/.test(command);
+}
+
+export function runningGuiBinary(listCommands = psCommands) {
+  for (const command of listCommands()) {
+    if (!isGuiCommand(command)) continue;
+    const match = command.match(/(\/\S+\/MacOS\/PhiStruct)(?:\s|$)/);
+    if (match) return match[1];
+  }
+  return null;
+}
+
 export function guiIsRunning(bin, listCommands = psCommands) {
-  return listCommands().some((command) => command.includes(bin) && !isStdioMcpCommand(command));
+  return listCommands().some((command) => isGuiCommand(command, bin));
 }
 
 function psCommands() {
@@ -193,11 +209,32 @@ export function setupConfigs({
   return written;
 }
 
+export const WINDOW_CLOSED_MESSAGE = "PhiStruct 窗口没开。请先自己打开 PhiStruct。";
+
 function fail(message) {
   process.stderr.write(`${message}\n`);
   process.exit(1);
 }
 
+/** Use the app's own helper so sandboxed UserDefaults stay inside the app container. */
+export function runStdioBridge({
+  bin = runningGuiBinary(),
+  spawnProcess = spawn,
+  onExit = (code) => process.exit(code ?? 1),
+} = {}) {
+  if (!bin) throw new Error(WINDOW_CLOSED_MESSAGE);
+  const child = spawnProcess(bin, ["--mcp"], { stdio: "inherit" });
+  child.once("error", (err) => {
+    process.stderr.write(`Could not connect to PhiStruct MCP: ${err.message}\n`);
+    onExit(1);
+  });
+  child.once("exit", (code, signal) => {
+    if (signal) process.kill(process.pid, signal);
+    else onExit(code);
+  });
+  return child;
+}
+
 async function main() {
   const argv = process.argv.slice(2).filter((a) => a !== "--");
   if (argv[0] === "setup" || argv[0] === "install") {
@@ -206,24 +243,9 @@ async function main() {
     return;
   }
   if (process.platform !== "darwin") {
-    fail("PhiStruct MCP opens PhiStruct.app and only runs on macOS.");
-  }
-  const bin = findApp();
-  if (!bin) {
-    fail("PhiStruct.app not found. Install PhiStruct, then try again.");
+    fail("PhiStruct MCP only runs on macOS.");
   }
-  if (!guiIsRunning(bin)) {
-    spawn(bin, [], { detached: true, stdio: "ignore" }).unref();
-  }
-  const port = await waitForLiveMcp();
-  if (port == null) {
-    fail("PhiStruct opened but MCP did not listen on 127.0.0.1:17321–17340.");
-  }
-  const child = spawn(bin, ["--mcp"], { stdio: "inherit" });
-  child.on("exit", (code, signal) => {
-    if (signal) process.kill(process.pid, signal);
-    process.exit(code ?? 1);
-  });
+  runStdioBridge();
 }
 
 function isDirectRun() {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "phistruct-mcp",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
-  "description": "MCP stdio bridge that opens PhiStruct.app for Cursor, Claude, and other IDEs",
+  "description": "MCP stdio bridge for an already-open PhiStruct window. Does not launch the app.",
   "bin": {
     "phistruct-mcp": "./cli.mjs"
   },