@different-ai/opencode-browser 4.2.3 → 4.2.5

package/bin/cli.js

@@ -25,6 +25,7 @@ import { homedir, platform } from "os";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { createInterface } from "readline";
+import { createConnection } from "net";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -35,6 +36,7 @@ const EXTENSION_DIR = join(BASE_DIR, "extension");
 const BROKER_DST = join(BASE_DIR, "broker.cjs");
 const NATIVE_HOST_DST = join(BASE_DIR, "native-host.cjs");
 const CONFIG_DST = join(BASE_DIR, "config.json");
+const BROKER_SOCKET = join(BASE_DIR, "broker.sock");
 
 const NATIVE_HOST_NAME = "com.opencode.browser_automation";
 
@@ -92,6 +94,68 @@ function ensureDir(p) {
   mkdirSync(p, { recursive: true });
 }
 
+function createJsonLineParser(onMessage) {
+  let buffer = "";
+  return (chunk) => {
+    buffer += chunk.toString("utf8");
+    while (true) {
+      const idx = buffer.indexOf("\n");
+      if (idx === -1) return;
+      const line = buffer.slice(0, idx);
+      buffer = buffer.slice(idx + 1);
+      if (!line.trim()) continue;
+      try {
+        onMessage(JSON.parse(line));
+      } catch {
+        // ignore
+      }
+    }
+  };
+}
+
+async function getBrokerStatus(timeoutMs = 2000) {
+  return await new Promise((resolve) => {
+    let done = false;
+    const socket = createConnection(BROKER_SOCKET);
+
+    const finish = (result) => {
+      if (done) return;
+      done = true;
+      try {
+        socket.end();
+      } catch {}
+      resolve(result);
+    };
+
+    const timeout = setTimeout(() => {
+      finish({ ok: false, error: "Timed out waiting for broker" });
+    }, timeoutMs);
+
+    socket.once("error", (err) => {
+      clearTimeout(timeout);
+      finish({ ok: false, error: err.message || "Broker connection failed" });
+    });
+
+    socket.once("connect", () => {
+      socket.write(JSON.stringify({ type: "request", id: 1, op: "status" }) + "\n");
+    });
+
+    socket.on(
+      "data",
+      createJsonLineParser((msg) => {
+        if (msg && msg.type === "response" && msg.id === 1) {
+          clearTimeout(timeout);
+          if (msg.ok) {
+            finish({ ok: true, data: msg.data });
+          } else {
+            finish({ ok: false, error: msg.error || "Broker status error" });
+          }
+        }
+      })
+    );
+  });
+}
+
 function copyDirRecursive(srcDir, destDir) {
   ensureDir(destDir);
   const entries = readdirSync(srcDir, { recursive: true });
@@ -289,6 +353,10 @@ Find it at ${color("cyan", "chrome://extensions")}:
       .replace(/^\s*\/\/.*$/gm, "");
   }
 
+  function sanitizeJson(contents) {
+    return stripJsoncComments(contents).replace(/,\s*(\]|\})/g, "$1");
+  }
+
   function findOpenCodeConfigPath(configDir) {
     const jsoncPath = join(configDir, "opencode.jsonc");
     if (existsSync(jsoncPath)) return jsoncPath;
@@ -338,17 +406,38 @@ Find it at ${color("cyan", "chrome://extensions")}:
 
     if (shouldUpdate) {
       try {
-        const config = hasExistingConfig
-          ? JSON.parse(stripJsoncComments(readFileSync(configPath, "utf-8")))
-          : { $schema: "https://opencode.ai/config.json", plugin: [] };
-
-        config.plugin = normalizePlugins(config.plugin);
-        if (!config.plugin.includes(desiredPlugin)) config.plugin.push(desiredPlugin);
-        if (typeof config.$schema !== "string") config.$schema = "https://opencode.ai/config.json";
-
-        ensureDir(configDir);
-        writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-        success(`Updated ${configPath} with plugin`);
+        let config = { $schema: "https://opencode.ai/config.json", plugin: [] };
+        let canWriteConfig = true;
+
+        if (hasExistingConfig) {
+          const rawConfig = readFileSync(configPath, "utf-8");
+          try {
+            config = JSON.parse(sanitizeJson(rawConfig));
+          } catch (e) {
+            error(`Failed to parse ${configPath}: ${e.message}`);
+            const shouldOverwrite = await confirm("Config is invalid JSON. Back up and recreate it?");
+            if (shouldOverwrite) {
+              const backupPath = `${configPath}.bak-${Date.now()}`;
+              writeFileSync(backupPath, rawConfig);
+              warn(`Backed up invalid config to ${backupPath}`);
+              config = { $schema: "https://opencode.ai/config.json", plugin: [] };
+            } else {
+              canWriteConfig = false;
+            }
+          }
+        }
+
+        if (canWriteConfig) {
+          config.plugin = normalizePlugins(config.plugin);
+          if (!config.plugin.includes(desiredPlugin)) config.plugin.push(desiredPlugin);
+          if (typeof config.$schema !== "string") config.$schema = "https://opencode.ai/config.json";
+
+          ensureDir(configDir);
+          writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+          success(`Updated ${configPath} with plugin`);
+        } else {
+          warn(`Skipped updating ${configPath}. Fix JSON manually and rerun install.`);
+        }
       } catch (e) {
         error(`Failed to update ${configPath}: ${e.message}`);
       }
@@ -382,19 +471,48 @@ Format rules (summary):
     warn("Skill template missing from package; skipping.");
   }
 
+  header("Step 9: Verify Extension Connection (optional)");
+
+  const shouldCheck = await confirm("Check broker + extension connection now?");
+  if (shouldCheck) {
+    while (true) {
+      const status = await getBrokerStatus();
+      if (status.ok && status.data?.hostConnected) {
+        success("Broker is running and extension is connected.");
+        break;
+      }
+
+      if (status.ok && !status.data?.hostConnected) {
+        warn("Broker is running but extension is not connected.");
+      } else {
+        warn(`Could not connect to local broker (${status.error || "unknown error"}).`);
+      }
+
+      log(`
+Open Chrome and:
+- Verify the extension is loaded in chrome://extensions
+- Click the OpenCode Browser extension icon to connect
+`);
+
+      const retry = await confirm("Retry broker check?");
+      if (!retry) break;
+    }
+  }
+
   header("Installation Complete!");
 
   log(`
-${color("bright", "What happens now:")}
+ ${color("bright", "What happens now:")}
   - The extension connects to the native host automatically.
   - OpenCode loads the plugin, which talks to the broker.
   - The broker enforces ${color("bright", "per-tab ownership")}. First touch auto-claims.
 
-${color("bright", "Try it:")}
+ ${color("bright", "Try it:")}
   Restart OpenCode and run: ${color("cyan", "browser_get_tabs")}
-`);
+ `);
 }
 
+
 async function status() {
   header("Status");
 

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "OpenCode Browser Automation",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "description": "Browser automation for OpenCode",
   "permissions": [
     "tabs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@different-ai/opencode-browser",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "description": "Browser automation plugin for OpenCode (native messaging + per-tab ownership).",
   "type": "module",
   "bin": {