opencode-pixel-office 1.0.9 → 1.0.11

package/README.md

@@ -15,7 +15,7 @@ The system consists of three main parts:
 
 ```mermaid
 graph TD
-    A[OpenCode IDE] -->|Plugin Events via HTTP| B(Pixel Office Server :3000)
+    A[OpenCode IDE] -->|Plugin Events via HTTP| B(Pixel Office Server :5100)
     B -->|Broadcast State via WebSocket| C[React Client]
     C -->|Render| D[PixiJS Scene]
     C -->|Render| E[HUD / Sidebar]
@@ -92,7 +92,7 @@ Monitor your agents from your phone or tablet!
     This sets up the standalone app in `~/.opencode/pixel-office` and installs the `pixel-office.js` plugin script to `~/.opencode/plugins/`.
 
 3.  **Start OpenCode**:
-    Simply open your IDE. Pixel Office will auto-launch in your browser at `http://localhost:3000`.
+    Simply open your IDE. Pixel Office will auto-launch in your browser at `http://localhost:5100`.
 
 ### CLI Commands
 
@@ -114,7 +114,7 @@ npm install
 #### 2. Start the Server (Dev Mode)
 ```bash
 npm start
-# Server runs on http://localhost:3000, watching for changes
+# Server runs on http://localhost:5100, watching for changes
 ```
 
 #### 3. Start the Client (Dev Mode)

package/bin/claude-code-hook.js

@@ -48,15 +48,17 @@ const mapHookToEvent = (input) => {
 
   const info = {
     id: sessionId || `claude-${Date.now()}`,
-    sessionID: sessionId || "",
-    role: "user",
+    sessionID: sessionId,
+    agent: "Claude",
+    title: cwd || "Claude Code",
+    model: { modelID: "claude", providerID: "anthropic" },
   };
 
   switch (hook) {
     case "SessionStart":
       return {
         type: "session.created",
-        properties: { info: { id: sessionId, title: cwd } },
+        properties: { info },
       };
     case "SessionEnd":
       return {
@@ -67,35 +69,35 @@ const mapHookToEvent = (input) => {
       return {
         type: "message.updated",
         properties: {
-          info,
-          message: { content: prompt },
+          info: { ...info, role: "user" },
+          message: { content: prompt, role: "user" },
         },
       };
     case "PreToolUse":
       return {
         type: "tool.execute.before",
-        properties: { tool: { name: toolName, input: toolInput } },
+        properties: { info, tool: { name: toolName, input: toolInput } },
       };
     case "PostToolUse":
     case "PostToolUseFailure":
       return {
         type: "tool.execute.after",
-        properties: { tool: { name: toolName, input: toolInput } },
+        properties: { info, tool: { name: toolName, input: toolInput } },
       };
     case "PermissionRequest":
       return {
         type: "permission.asked",
-        properties: { permission },
+        properties: { info, permission },
       };
     case "Notification":
       return {
         type: "tui.toast.show",
-        properties: { message: input.message || "" },
+        properties: { info, message: input.message || "" },
       };
     case "PreCompact":
       return {
         type: "session.compacted",
-        properties: { info: { id: sessionId } },
+        properties: { info },
       };
     case "Stop":
       return {
@@ -106,7 +108,7 @@ const mapHookToEvent = (input) => {
     case "SubagentStop":
       return {
         type: "session.updated",
-        properties: { info: { id: sessionId } },
+        properties: { info },
       };
     default:
       return null;
@@ -119,7 +121,7 @@ const main = async () => {
     process.exit(0);
   }
   const input = JSON.parse(raw);
-  const endpoint = process.env.PIXEL_OFFICE_URL || "http://localhost:3000/events";
+  const endpoint = process.env.PIXEL_OFFICE_URL || "http://localhost:5100/events";
   if (readMode() !== "claude-code") {
     process.exit(0);
   }

package/bin/opencode-pixel-office.js

@@ -23,11 +23,22 @@ const shouldSwitch = args[0] === "switch";
 const switchTarget = shouldSwitch ? args[1] : null;
 const shouldUninstall = args.includes("uninstall");
 const shouldStart = args[0] === "start";
+const shouldVersion = args.includes("--version") || args.includes("-v");
 const yesFlag = args.includes("--yes") || args.includes("-y");
 const skipJson = args.includes("--no-json");
 const portIndex = args.findIndex((arg) => arg === "--port");
 const portArg = portIndex !== -1 ? args[portIndex + 1] : null;
 
+const getVersion = () => {
+  try {
+    const pkgPath = path.resolve(__dirname, "..", "package.json");
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    return pkg.version || "unknown";
+  } catch {
+    return "unknown";
+  }
+};
+
 const printHelp = () => {
   console.log("opencode-pixel-office installer\n");
   console.log("Usage:");
@@ -38,9 +49,10 @@ const printHelp = () => {
   console.log("  opencode-pixel-office uninstall");
   console.log("  opencode-pixel-office stop");
   console.log("\nOptions:");
-  console.log("  --port <number> Configure the server port (default: 3000)");
+  console.log("  --port <number> Configure the server port (default: 5100)");
   console.log("  --no-json       Skip updating opencode.json");
   console.log("  --yes, -y       Overwrite without prompting");
+  console.log("  --version, -v   Show version number");
 };
 
 const installClaudeCodeHooks = () => {
@@ -131,7 +143,33 @@ const copyRecursiveSync = (src, dest) => {
   }
 };
 
+const stopServer = (port) => {
+  try {
+    const pidOutput = execSync(`lsof -t -i :${port} 2>/dev/null`).toString().trim();
+    if (pidOutput) {
+      const pids = pidOutput.split('\n').map(p => parseInt(p, 10)).filter(p => !isNaN(p) && p > 0);
+      for (const pid of pids) {
+        try {
+          process.kill(pid);
+          console.log(`✓ Stopped server (PID: ${pid})`);
+        } catch {
+          // Process may have already exited
+        }
+      }
+      return pids.length > 0;
+    }
+  } catch {
+    // lsof failed, no process found
+  }
+  return false;
+};
+
 const run = async () => {
+  if (shouldVersion) {
+    console.log(`opencode-pixel-office v${getVersion()}`);
+    process.exit(0);
+  }
+
   if (shouldSwitch) {
     if (switchTarget !== "opencode" && switchTarget !== "claude-code") {
       console.error("Switch target must be 'opencode' or 'claude-code'.");
@@ -150,6 +188,14 @@ const run = async () => {
   }
 
   if (shouldUninstall) {
+    // Stop server first
+    const config = loadConfig();
+    const port = config.port || 5100;
+    console.log("Stopping Pixel Office server...");
+    if (!stopServer(port)) {
+      console.log("- Server not running");
+    }
+
     const targetPluginPath = path.join(DEFAULT_PLUGIN_DIR, PLUGIN_NAME);
 
     // Remove Plugin
@@ -168,6 +214,56 @@ const run = async () => {
       console.log(`- App directory not found at ${DEFAULT_APP_DIR}`);
     }
 
+    // Remove Claude Code hooks
+    const claudeDir = path.join(os.homedir(), ".claude");
+    const hookDir = path.join(claudeDir, "hooks");
+    const hookFile = path.join(hookDir, "opencode-pixel-office-hook.js");
+    const settingsPath = path.join(claudeDir, "settings.json");
+
+    if (fs.existsSync(hookFile)) {
+      fs.unlinkSync(hookFile);
+      console.log(`✓ Removed Claude Code hook: ${hookFile}`);
+    }
+
+    if (fs.existsSync(settingsPath)) {
+      try {
+        const settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+        if (settings.hooks) {
+          let modified = false;
+          for (const eventName of Object.keys(settings.hooks)) {
+            const hooks = settings.hooks[eventName];
+            if (Array.isArray(hooks)) {
+              const filtered = hooks.filter(h => {
+                if (Array.isArray(h.hooks)) {
+                  h.hooks = h.hooks.filter(inner =>
+                    !inner.command?.includes("opencode-pixel-office-hook")
+                  );
+                  return h.hooks.length > 0;
+                }
+                return !h.command?.includes("opencode-pixel-office-hook");
+              });
+              if (filtered.length !== hooks.length) {
+                settings.hooks[eventName] = filtered;
+                modified = true;
+              }
+              if (filtered.length === 0) {
+                delete settings.hooks[eventName];
+              }
+            }
+          }
+          if (Object.keys(settings.hooks).length === 0) {
+            delete settings.hooks;
+          }
+          if (modified) {
+            fs.writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
+            console.log(`✓ Removed hooks from Claude Code settings`);
+          }
+        }
+      } catch {
+        // ignore settings parse errors
+      }
+    }
+
     // Clean up Config (Legacy)
     if (fs.existsSync(DEFAULT_CONFIG_PATH) && !skipJson) {
       try {
@@ -192,7 +288,7 @@ const run = async () => {
 
   if (shouldStart) {
     const config = loadConfig();
-    const port = portArg ? parseInt(portArg, 10) : (config.port || 3000);
+    const port = portArg ? parseInt(portArg, 10) : (config.port || 5100);
     const serverScript = "server/index.ts";
 
     const rootSource = path.resolve(__dirname, "..");
@@ -223,21 +319,38 @@ const run = async () => {
       }
     } catch { }
 
-    let tsxBin = "tsx";
-    if (useGlobal) {
-      const globalTsx = path.join(serverCwd, "node_modules", ".bin", "tsx");
-      if (fs.existsSync(globalTsx)) {
-        tsxBin = globalTsx;
+    // Resolve tsx binary - check multiple locations
+    let tsxBin = null;
+    const tsxLocations = [
+      path.join(serverCwd, "node_modules", ".bin", "tsx"),
+      path.join(__dirname, "..", "node_modules", ".bin", "tsx"),
+      path.join(DEFAULT_APP_DIR, "node_modules", ".bin", "tsx"),
+    ];
+    for (const loc of tsxLocations) {
+      if (fs.existsSync(loc)) {
+        tsxBin = loc;
+        break;
       }
     }
+    if (!tsxBin) {
+      // Fallback to PATH
+      tsxBin = "tsx";
+    }
 
     const { spawn } = await import("node:child_process");
+
     const child = spawn(tsxBin, [serverScript], {
       cwd: serverCwd,
       env: { ...process.env, PORT: String(port) },
       detached: true,
       stdio: "ignore",
     });
+
+    child.on("error", (err) => {
+      console.error(`Failed to start server: ${err.message}`);
+      process.exit(1);
+    });
+
     child.unref();
 
     console.log(`Pixel Office server started on port ${port} (PID: ${child.pid})`);
@@ -252,29 +365,10 @@ const run = async () => {
 
   if (args.includes("stop")) {
     const config = loadConfig();
-    const port = config.port || 3000;
-
+    const port = config.port || 5100;
     console.log(`Stopping Pixel Office server on port ${port}...`);
-    try {
-      const pidOutput = execSync(`lsof -t -i :${port}`).toString().trim();
-      if (pidOutput) {
-        const pid = parseInt(pidOutput, 10);
-        if (!isNaN(pid) && pid > 0) {
-          process.kill(pid);
-          console.log(`✓ Server stopped (PID: ${pid})`);
-        } else {
-          console.log(`- No server found on port ${port} (PID: ${pidOutput})`);
-        }
-      } else {
-        console.log(`- No server found on port ${port}`);
-      }
-    } catch (e) {
-      if (e.message.includes("Command failed")) {
-        // likely lsof failed meaning no process found
-        console.log(`- No server found on port ${port}`);
-      } else {
-        console.error(`! Failed to stop server: ${e.message}`);
-      }
+    if (!stopServer(port)) {
+      console.log(`- No server found on port ${port}`);
     }
     process.exit(0);
   }
@@ -360,7 +454,8 @@ const run = async () => {
 
   console.log(`✓ Standalone app installed to ${DEFAULT_APP_DIR}`);
 
-  console.log("\nSuccess! Restart OpenCode to launch Pixel Office.");
+  console.log("\nInstallation complete!");
+  console.log("Run 'opencode-pixel-office start' to launch the server.");
 };
 
 run().catch((error) => {