oh-my-opencode 3.7.2 → 3.7.3

package/dist/cli/index.js

@@ -9053,7 +9053,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.7.2",
+  version: "3.7.3",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -9127,13 +9127,13 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.7.2",
-    "oh-my-opencode-darwin-x64": "3.7.2",
-    "oh-my-opencode-linux-arm64": "3.7.2",
-    "oh-my-opencode-linux-arm64-musl": "3.7.2",
-    "oh-my-opencode-linux-x64": "3.7.2",
-    "oh-my-opencode-linux-x64-musl": "3.7.2",
-    "oh-my-opencode-windows-x64": "3.7.2"
+    "oh-my-opencode-darwin-arm64": "3.7.3",
+    "oh-my-opencode-darwin-x64": "3.7.3",
+    "oh-my-opencode-linux-arm64": "3.7.3",
+    "oh-my-opencode-linux-arm64-musl": "3.7.3",
+    "oh-my-opencode-linux-x64": "3.7.3",
+    "oh-my-opencode-linux-x64-musl": "3.7.3",
+    "oh-my-opencode-windows-x64": "3.7.3"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -25213,13 +25213,25 @@ function prependResolvedOpencodeBinToPath(env = process.env, resolve2 = resolveF
 }
 
 // src/cli/run/server-connection.ts
+function isPortStartFailure(error45, port) {
+  if (!(error45 instanceof Error)) {
+    return false;
+  }
+  return error45.message.includes(`Failed to start server on port ${port}`);
+}
+async function startServer(options) {
+  const { signal, port } = options;
+  const { client: client3, server: server2 } = await withWorkingOpencodePath(() => createOpencode({ signal, port, hostname: "127.0.0.1" }));
+  console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server2.url));
+  return { client: client3, cleanup: () => server2.close() };
+}
 async function createServerConnection(options) {
   prependResolvedOpencodeBinToPath();
   const { port, attach, signal } = options;
   if (attach !== undefined) {
     console.log(import_picocolors9.default.dim("Attaching to existing server at"), import_picocolors9.default.cyan(attach));
-    const client4 = createOpencodeClient({ baseUrl: attach });
-    return { client: client4, cleanup: () => {} };
+    const client3 = createOpencodeClient({ baseUrl: attach });
+    return { client: client3, cleanup: () => {} };
   }
   if (port !== undefined) {
     if (port < 1 || port > 65535) {
@@ -25228,13 +25240,24 @@ async function createServerConnection(options) {
     const available = await isPortAvailable(port, "127.0.0.1");
     if (available) {
       console.log(import_picocolors9.default.dim("Starting server on port"), import_picocolors9.default.cyan(port.toString()));
-      const { client: client5, server: server3 } = await withWorkingOpencodePath(() => createOpencode({ signal, port, hostname: "127.0.0.1" }));
-      console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server3.url));
-      return { client: client5, cleanup: () => server3.close() };
+      try {
+        return await startServer({ signal, port });
+      } catch (error45) {
+        if (!isPortStartFailure(error45, port)) {
+          throw error45;
+        }
+        const stillAvailable = await isPortAvailable(port, "127.0.0.1");
+        if (stillAvailable) {
+          throw error45;
+        }
+        console.log(import_picocolors9.default.dim("Port"), import_picocolors9.default.cyan(port.toString()), import_picocolors9.default.dim("became occupied, attaching to existing server"));
+        const client4 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
+        return { client: client4, cleanup: () => {} };
+      }
     }
     console.log(import_picocolors9.default.dim("Port"), import_picocolors9.default.cyan(port.toString()), import_picocolors9.default.dim("is occupied, attaching to existing server"));
-    const client4 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
-    return { client: client4, cleanup: () => {} };
+    const client3 = createOpencodeClient({ baseUrl: `http://127.0.0.1:${port}` });
+    return { client: client3, cleanup: () => {} };
   }
   const { port: selectedPort, wasAutoSelected } = await getAvailableServerPort(DEFAULT_SERVER_PORT, "127.0.0.1");
   if (wasAutoSelected) {
@@ -25242,9 +25265,16 @@ async function createServerConnection(options) {
   } else {
     console.log(import_picocolors9.default.dim("Starting server on port"), import_picocolors9.default.cyan(selectedPort.toString()));
   }
-  const { client: client3, server: server2 } = await withWorkingOpencodePath(() => createOpencode({ signal, port: selectedPort, hostname: "127.0.0.1" }));
-  console.log(import_picocolors9.default.dim("Server listening at"), import_picocolors9.default.cyan(server2.url));
-  return { client: client3, cleanup: () => server2.close() };
+  try {
+    return await startServer({ signal, port: selectedPort });
+  } catch (error45) {
+    if (!isPortStartFailure(error45, selectedPort)) {
+      throw error45;
+    }
+    const { port: retryPort } = await getAvailableServerPort(selectedPort + 1, "127.0.0.1");
+    console.log(import_picocolors9.default.dim("Retrying server start on port"), import_picocolors9.default.cyan(retryPort.toString()));
+    return await startServer({ signal, port: retryPort });
+  }
 }
 
 // src/cli/run/session-resolver.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -74,13 +74,13 @@
     "typescript": "^5.7.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "3.7.2",
-    "oh-my-opencode-darwin-x64": "3.7.2",
-    "oh-my-opencode-linux-arm64": "3.7.2",
-    "oh-my-opencode-linux-arm64-musl": "3.7.2",
-    "oh-my-opencode-linux-x64": "3.7.2",
-    "oh-my-opencode-linux-x64-musl": "3.7.2",
-    "oh-my-opencode-windows-x64": "3.7.2"
+    "oh-my-opencode-darwin-arm64": "3.7.3",
+    "oh-my-opencode-darwin-x64": "3.7.3",
+    "oh-my-opencode-linux-arm64": "3.7.3",
+    "oh-my-opencode-linux-arm64-musl": "3.7.3",
+    "oh-my-opencode-linux-x64": "3.7.3",
+    "oh-my-opencode-linux-x64-musl": "3.7.3",
+    "oh-my-opencode-windows-x64": "3.7.3"
   },
   "trustedDependencies": [
     "@ast-grep/cli",