opencode-pixel-office 1.0.8 → 1.0.10

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;

package/bin/opencode-pixel-office.js

@@ -22,23 +22,37 @@ const shouldInstallClaude = args[0] === "claude-code" && args[1] === "install";
 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:");
   console.log("  opencode-pixel-office install [--yes] [--port <number>]");
   console.log("  opencode-pixel-office claude-code install");
   console.log("  opencode-pixel-office switch <opencode|claude-code>");
+  console.log("  opencode-pixel-office start");
   console.log("  opencode-pixel-office uninstall");
   console.log("  opencode-pixel-office stop");
   console.log("\nOptions:");
   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 = () => {
@@ -129,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'.");
@@ -148,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
@@ -166,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 {
@@ -188,32 +286,73 @@ const run = async () => {
     process.exit(0);
   }
 
-  if (args.includes("stop")) {
+  if (shouldStart) {
     const config = loadConfig();
-    const port = config.port || 5100;
+    const port = portArg ? parseInt(portArg, 10) : (config.port || 5100);
+    const serverScript = "server/index.ts";
+
+    const rootSource = path.resolve(__dirname, "..");
+    const localServerPath = path.join(rootSource, "server", "index.ts");
+    const globalServerPath = path.join(DEFAULT_APP_DIR, "server", "index.ts");
+
+    let serverCwd;
+    let useGlobal = false;
+    if (fs.existsSync(localServerPath)) {
+      serverCwd = rootSource;
+    } else if (fs.existsSync(globalServerPath)) {
+      serverCwd = DEFAULT_APP_DIR;
+      useGlobal = true;
+    } else {
+      console.error("Server not found. Run 'opencode-pixel-office install' first.");
+      process.exit(1);
+    }
 
-    console.log(`Stopping Pixel Office server on port ${port}...`);
     try {
-      const pidOutput = execSync(`lsof -t -i :${port}`).toString().trim();
+      const pidOutput = execSync(`lsof -t -i :${port} 2>/dev/null`).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}`);
+        console.log(`Pixel Office is already running on port ${port} (PID: ${pidOutput})`);
+        const url = `http://localhost:${port}`;
+        const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+        try { execSync(`${openCmd} ${url}`); } catch { }
+        console.log(`Opened ${url}`);
+        process.exit(0);
       }
-    } 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}`);
+    } catch { }
+
+    let tsxBin = "tsx";
+    if (useGlobal) {
+      const globalTsx = path.join(serverCwd, "node_modules", ".bin", "tsx");
+      if (fs.existsSync(globalTsx)) {
+        tsxBin = globalTsx;
       }
     }
+
+    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.unref();
+
+    console.log(`Pixel Office server started on port ${port} (PID: ${child.pid})`);
+
+    await new Promise((r) => setTimeout(r, 1500));
+    const url = `http://localhost:${port}`;
+    const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+    try { execSync(`${openCmd} ${url}`); } catch { }
+    console.log(`Opened ${url}`);
+    process.exit(0);
+  }
+
+  if (args.includes("stop")) {
+    const config = loadConfig();
+    const port = config.port || 5100;
+    console.log(`Stopping Pixel Office server on port ${port}...`);
+    if (!stopServer(port)) {
+      console.log(`- No server found on port ${port}`);
+    }
     process.exit(0);
   }
 
@@ -298,7 +437,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-pixel-office",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "module",
   "files": [
     "bin",

package/plugin/pixel-office.js

@@ -3,31 +3,25 @@ import fs from "node:fs";
 
 const DEFAULT_PORT = 5100;
 
-// Helper to get configured port
-const getConfiguredPort = (globalDistDir) => {
+const homeDir = process.env.HOME || process.env.USERPROFILE || "/";
+const globalDistDir = path.join(homeDir, ".opencode", "pixel-office");
+
+const getConfiguredPort = () => {
   try {
     const configPath = path.join(globalDistDir, "config.json");
     if (fs.existsSync(configPath)) {
-      const start = Date.now();
-      // Read synchronously to ensure we have port for endpoint
-      // This is okay as it's a tiny local JSON
       const raw = fs.readFileSync(configPath, "utf8");
       const data = JSON.parse(raw);
       if (data && typeof data.port === "number") {
         return data.port;
       }
     }
-  } catch (e) {
+  } catch {
     // ignore
   }
   return DEFAULT_PORT;
 };
 
-// We need to resolve home dir early to get config
-const homeDir = process.env.HOME || process.env.USERPROFILE || "/";
-const globalDistDir = path.join(homeDir, ".opencode", "pixel-office");
-const configuredPort = getConfiguredPort(globalDistDir);
-
 const readMode = () => {
   try {
     const configPath = path.join(globalDistDir, "config.json");
@@ -38,140 +32,28 @@ const readMode = () => {
         return data.mode;
       }
     }
-  } catch (e) {
+  } catch {
     return "opencode";
   }
   return "opencode";
 };
 
 const resolveEndpoint = () => {
-  const port = process.env.PIXEL_OFFICE_PORT || configuredPort;
-  const raw =
-    process.env.PIXEL_OFFICE_URL ||
-    `http://localhost:${port}/events`;
+  const port = process.env.PIXEL_OFFICE_PORT || getConfiguredPort();
+  const raw = process.env.PIXEL_OFFICE_URL || `http://localhost:${port}/events`;
   return raw.endsWith("/events") ? raw : `${raw.replace(/\/$/, "")}/events`;
 };
 
-const resolveServerUrl = (endpoint) => endpoint.replace(/\/events$/, "");
-
-const resolveEndpointInfo = (endpoint, portOverride) => {
-  try {
-    const url = new URL(endpoint);
-    const port = url.port ? Number(url.port) : portOverride;
-    return {
-      url,
-      port,
-      isLocal: url.hostname === "localhost" || url.hostname === "127.0.0.1",
-    };
-  } catch (error) {
-    return { url: null, port: portOverride, isLocal: false };
-  }
-};
-
-const resolveOpenCommand = (url) => {
-  if (process.platform === "darwin") {
-    return ["open", url];
-  }
-  if (process.platform === "win32") {
-    return ["cmd", "/c", "start", "", url];
-  }
-  return ["xdg-open", url];
-};
-
 export const PixelOfficePlugin = async ({ directory, worktree, client }) => {
-  const endpoint = resolveEndpoint();
-  const serverUrl = resolveServerUrl(endpoint);
-  const rootDir = worktree || directory;
-  const endpointInfo = resolveEndpointInfo(endpoint, configuredPort);
-  const openCommand = resolveOpenCommand(serverUrl);
-
-  // Path Resolution
-  const localServerPath = path.join(rootDir, "server", "index.ts");
-  const globalServerPath = path.join(globalDistDir, "server", "index.ts");
-
-  let serverCwd = rootDir;
-  let serverScript = "server/index.ts";
-  let useGlobal = false;
-
-  if (fs.existsSync(localServerPath)) {
-    // Local dev mode: run from workspace
-    serverCwd = rootDir;
-  } else if (fs.existsSync(globalServerPath)) {
-    // Global standalone mode: run from ~/.opencode/pixel-office
-    serverCwd = globalDistDir;
-    useGlobal = true;
-  } else {
-    // Neither found
-    if (endpointInfo.isLocal) {
-      console.warn("[Pixel Office] Server not found locally or globally.");
-    }
+  if (readMode() !== "opencode") {
+    // In claude-code mode, plugin does nothing - hooks handle events
+    return {};
   }
 
-  let serverProcess = null;
-  let browserOpened = false;
-  let warnedOnce = false;
-
-  const startServerIfNeeded = async () => {
-    if (!endpointInfo.isLocal || serverProcess) {
-      return;
-    }
-    const env = {
-      ...process.env,
-      PORT: String(process.env.PIXEL_OFFICE_PORT || endpointInfo.port),
-    };
-
-    let cmd = ["tsx", serverScript];
-    if (useGlobal) {
-      const globalTsx = path.join(serverCwd, "node_modules", ".bin", "tsx");
-      if (fs.existsSync(globalTsx)) {
-        cmd = [globalTsx, serverScript];
-      }
-    }
-
-    try {
-      serverProcess = Bun.spawn({
-        cmd,
-        cwd: serverCwd,
-        env,
-        stdout: "ignore",
-        stderr: "ignore",
-      });
-      // console.log(`[Pixel Office] Started server in ${serverCwd} on port ${env.PORT}`);
-    } catch (error) {
-      await client.app.log({
-        service: "pixel-office",
-        level: "error",
-        message: "Failed to start Pixel Office server",
-        extra: { error: String(error), cwd: serverCwd },
-      });
-    }
-  };
-
-  const openBrowserIfNeeded = async () => {
-    if (!endpointInfo.isLocal || browserOpened) {
-      return;
-    }
-    browserOpened = true;
-    try {
-      Bun.spawn({ cmd: openCommand, stdout: "ignore", stderr: "ignore" });
-    } catch (error) {
-      await client.app.log({
-        service: "pixel-office",
-        level: "warn",
-        message: "Failed to open Pixel Office browser",
-        extra: { error: String(error), url: serverUrl },
-      });
-    }
-  };
-
-  await startServerIfNeeded();
-  await openBrowserIfNeeded();
+  const endpoint = resolveEndpoint();
 
   return {
     event: async ({ event }) => {
-      if (readMode() !== "opencode") {
-        return;
-      }
       if (!event) {
         return;
       }
@@ -183,18 +65,10 @@ export const PixelOfficePlugin = async ({ directory, worktree, client }) => {
           },
           body: JSON.stringify(event),
         });
-      } catch (error) {
-        if (!warnedOnce) {
-          warnedOnce = true;
-        }
-      }
-    },
-    dispose: async () => {
-      if (serverProcess) {
-        // console.log("[Pixel Office] Killing server process...");
-        serverProcess.kill();
-        serverProcess = null;
+      } catch {
+        // Server not running, silently ignore
       }
     },
+    dispose: async () => {},
   };
 };