@lioneltay/worker-manager 0.0.2 → 0.0.4

package/dist/index.js

@@ -2,20 +2,22 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
-import { getStateDir, getGitRoot, readAndFlushMail, readRegistry, readOrchestratorId, } from "./state.js";
+import { getStateDir, getGitRoot, readOrchestratorId, readAndFlushMail, readRegistry, } from "./state.js";
 import { startOrchestratorServer } from "./orchestrator.js";
 import { startWorkerServer } from "./worker.js";
 function runHook() {
     try {
+        const claudePid = parseInt(process.env.CLAUDE_PID, 10);
+        if (!claudePid)
+            return;
         const gitRoot = getGitRoot();
         const stateDir = getStateDir(gitRoot);
-        const orchestratorId = readOrchestratorId(stateDir, process.ppid);
+        const orchestratorId = readOrchestratorId(stateDir, claudePid);
         if (!orchestratorId)
             return;
         const messages = readAndFlushMail(stateDir, orchestratorId);
-        if (messages.length === 0) {
+        if (messages.length === 0)
             return;
-        }
         for (const msg of messages) {
             const prefix = msg.type === "completion" ? "COMPLETED" : "QUESTION";
             process.stdout.write(`[Worker ${msg.workerName} (${msg.workerId})] ${prefix}: ${msg.content}\n`);
@@ -31,15 +33,17 @@ function runStopHook() {
     // Orchestrator mode: check for pending mail
     if (!workerId || !stateDir) {
         try {
+            const claudePid = parseInt(process.env.CLAUDE_PID, 10);
+            if (!claudePid)
+                return;
             const gitRoot = getGitRoot();
             const orchestratorStateDir = getStateDir(gitRoot);
-            const orchestratorId = readOrchestratorId(orchestratorStateDir, process.ppid);
+            const orchestratorId = readOrchestratorId(orchestratorStateDir, claudePid);
             if (!orchestratorId)
                 return;
             const messages = readAndFlushMail(orchestratorStateDir, orchestratorId);
-            if (messages.length === 0) {
+            if (messages.length === 0)
                 return;
-            }
             const formatted = messages
                 .map((m) => {
                 const prefix = m.type === "completion" ? "COMPLETED" : "QUESTION";

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/hooks/hooks.json

@@ -5,7 +5,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "npx -y @lioneltay/worker-manager --hook",
+            "command": "CLAUDE_PID=$PPID npx -y @lioneltay/worker-manager --hook",
             "timeout": 5
           }
         ]
@@ -16,7 +16,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "npx -y @lioneltay/worker-manager --stop-hook",
+            "command": "CLAUDE_PID=$PPID npx -y @lioneltay/worker-manager --stop-hook",
             "timeout": 5
           }
         ]

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@lioneltay/worker-manager",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Claude Code plugin for spawning and managing worker agents in isolated worktrees",
   "repository": {
     "type": "git",
-    "url": "https://github.com/lioneltay/agent-forge",
+    "url": "git+https://github.com/lioneltay/agent-forge.git",
     "directory": "packages/claude-plugins/worker-manager"
   },
   "type": "module",
@@ -19,17 +19,19 @@
     "hooks",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch"
-  },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.1",
     "@lioneltay/worktree-manager": "^0.0.1",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "zod": "^3.24.2"
   },
   "devDependencies": {
     "@types/node": "^22.13.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.7.3",
+    "vitest": "^4.0.18"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "test": "vitest run --exclude dist"
   }
-}
+}