@lioneltay/worker-manager 0.0.3 → 0.0.4

package/dist/orchestrator.js

@@ -6,6 +6,25 @@ import { randomUUID } from "node:crypto";
 import { create } from "@lioneltay/worktree-manager";
 import { getGitRoot, getStateDir, readRegistry, writeRegistry, readAndFlushMail, writeOrchestratorMapping, removeOrchestratorMapping, } from "./state.js";
 import { spawnWorker } from "./spawn.js";
+/**
+ * Get Claude Code's PID. The MCP server is spawned via:
+ *   Claude Code → npx (npm exec) → node
+ * So process.ppid = npx's PID. We need Claude Code's PID (npx's parent)
+ * to match the hook's $PPID which is also Claude Code's PID.
+ */
+function getClaudeCodePid() {
+    try {
+        const ppidStr = execFileSync("ps", ["-p", String(process.ppid), "-o", "ppid="], { encoding: "utf-8" }).trim();
+        const grandparentPid = parseInt(ppidStr, 10);
+        if (!isNaN(grandparentPid) && grandparentPid > 1) {
+            return grandparentPid;
+        }
+    }
+    catch {
+        // Fall through to process.ppid
+    }
+    return process.ppid;
+}
 function generateShortId() {
     return randomUUID().slice(0, 8);
 }
@@ -37,7 +56,7 @@ function killTmuxSession(session) {
         // Session may already be dead
     }
 }
-function cleanupWorkers(stateDir) {
+function cleanupWorkers(stateDir, pid) {
     const registry = readRegistry(stateDir);
     let changed = false;
     for (const worker of Object.values(registry.workers)) {
@@ -50,7 +69,7 @@ function cleanupWorkers(stateDir) {
     if (changed) {
         writeRegistry(stateDir, registry);
     }
-    removeOrchestratorMapping(stateDir, process.ppid);
+    removeOrchestratorMapping(stateDir, pid);
 }
 function getCurrentBranch() {
     return execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
@@ -62,8 +81,9 @@ export async function startOrchestratorServer() {
     const orchestratorId = generateShortId();
     const gitRoot = getGitRoot();
     const stateDir = getStateDir(gitRoot);
+    const claudePid = getClaudeCodePid();
     // Write mapping so hooks (which share the same parent PID) can find our mailbox.
-    writeOrchestratorMapping(stateDir, process.ppid, orchestratorId);
+    writeOrchestratorMapping(stateDir, claudePid, orchestratorId);
     const server = new McpServer({
         name: "worker-manager",
         version: "0.0.1",
@@ -355,14 +375,14 @@ export async function startOrchestratorServer() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
     transport.onclose = () => {
-        cleanupWorkers(stateDir);
+        cleanupWorkers(stateDir, claudePid);
     };
     process.on("SIGTERM", () => {
-        cleanupWorkers(stateDir);
+        cleanupWorkers(stateDir, claudePid);
         process.exit(0);
     });
     process.on("SIGINT", () => {
-        cleanupWorkers(stateDir);
+        cleanupWorkers(stateDir, claudePid);
         process.exit(0);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lioneltay/worker-manager",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Claude Code plugin for spawning and managing worker agents in isolated worktrees",
   "repository": {
     "type": "git",
@@ -19,11 +19,6 @@
     "hooks",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "test": "vitest run --exclude dist"
-  },
   "dependencies": {
     "@lioneltay/worktree-manager": "^0.0.1",
     "@modelcontextprotocol/sdk": "^1.12.1",
@@ -33,5 +28,10 @@
     "@types/node": "^22.13.1",
     "typescript": "^5.7.3",
     "vitest": "^4.0.18"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "test": "vitest run --exclude dist"
   }
-}
+}