@kud/ai-conventional-commit-cli 3.2.3 → 3.2.6

package/dist/{chunk-IWJLYYKM.js → chunk-EHJXGWTJ.js}

@@ -171,18 +171,7 @@ Refine now.`
 
 // src/model/provider.ts
 import { z } from "zod";
-import { createServer } from "net";
 import { createOpencode } from "@opencode-ai/sdk";
-function findFreePort() {
-  return new Promise((resolve, reject) => {
-    const server = createServer();
-    server.on("error", reject);
-    server.listen(0, "127.0.0.1", () => {
-      const port = server.address().port;
-      server.close(() => resolve(port));
-    });
-  });
-}
 var OpenCodeProvider = class {
   constructor(model = "github-copilot/gpt-4.1") {
     this.model = model;
@@ -221,16 +210,11 @@ ${userAggregate}`;
     const start = Date.now();
     let server;
     try {
-      if (debug) console.error("[ai-cc][provider] starting opencode server");
-      const port = await findFreePort();
-      const opencode = await createOpencode({ signal: ac.signal, port });
+      const opencode = await createOpencode({ signal: ac.signal });
       server = opencode.server;
-      const client = opencode.client;
+      const { client } = opencode;
       const session = await client.session.create({ body: { title: "aicc" } });
-      if (!session.data) {
-        const errMsg = session.error?.message ?? JSON.stringify(session.error) ?? "unknown";
-        throw new Error(`Failed to create opencode session: ${errMsg}`);
-      }
+      if (!session.data) throw new Error("Failed to create opencode session");
       const result = await client.session.prompt({
         path: { id: session.data.id },
         body: {

package/dist/{chunk-OLEHSPCO.js → chunk-GZ5XLAI5.js}

@@ -201,13 +201,39 @@ import { createServer } from "net";
 import { mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 import { tmpdir } from "os";
-import { createOpencode } from "@opencode-ai/sdk/v2";
+import { spawn } from "child_process";
+import { createOpencodeClient } from "@opencode-ai/sdk/v2";
 import chalk2 from "chalk";
 var pTag = chalk2.dim("[ai-cc]") + chalk2.cyan("[provider]");
 var pdbg = (msg, pairs = {}) => {
   const kvStr = Object.entries(pairs).map(([k, v]) => chalk2.dim(k + "=") + chalk2.yellow(String(v))).join(" ");
   console.error(pTag, chalk2.white(msg), kvStr || "");
 };
+var killWithFallback = async (pid) => {
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return;
+  }
+  const deadline = Date.now() + 1e3;
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, 100));
+    try {
+      process.kill(pid, 0);
+    } catch {
+      return;
+    }
+  }
+  try {
+    process.kill(pid, "SIGKILL");
+    console.warn(
+      chalk2.yellow("\n\u26A0 [ai-cc]") + " opencode server did not shut down cleanly and had to be force-killed." + chalk2.dim(
+        " Please report this at https://github.com/kud/ai-conventional-commit-cli/issues/new"
+      )
+    );
+  } catch {
+  }
+};
 function findFreePort() {
   return new Promise((resolve, reject) => {
     const server = createServer();
@@ -243,7 +269,7 @@ var OpenCodeProvider = class {
     if (!this.warmPromise) return;
     try {
       const ctx = await this.warmPromise;
-      ctx.server?.close();
+      await ctx.server?.closeAsync();
     } catch {
     } finally {
       process.off("exit", this.exitHandler);
@@ -267,18 +293,60 @@ var OpenCodeProvider = class {
     const isolatedDir = join(tmpdir(), `aicc-${process.pid}`, "opencode");
     mkdirSync(isolatedDir, { recursive: true });
     writeFileSync(join(isolatedDir, "config.json"), '{"mcp":{}}');
+    const port = await findFreePort();
     const originalXDG = process.env.XDG_CONFIG_HOME;
     process.env.XDG_CONFIG_HOME = join(tmpdir(), `aicc-${process.pid}`);
-    let opencode;
-    try {
-      const port = await findFreePort();
-      opencode = await createOpencode({ signal: this.ac.signal, port });
-    } finally {
-      if (originalXDG === void 0) delete process.env.XDG_CONFIG_HOME;
-      else process.env.XDG_CONFIG_HOME = originalXDG;
-    }
-    const { server, client } = opencode;
-    this.syncClose = () => server?.close();
+    const proc = spawn("opencode", ["serve", `--hostname=127.0.0.1`, `--port=${port}`], {
+      env: { ...process.env, OPENCODE_CONFIG_CONTENT: JSON.stringify({ mcp: {} }) }
+    });
+    const killProc = () => {
+      try {
+        process.kill(proc.pid, "SIGTERM");
+      } catch {
+      }
+    };
+    this.syncClose = killProc;
+    if (originalXDG === void 0) delete process.env.XDG_CONFIG_HOME;
+    else process.env.XDG_CONFIG_HOME = originalXDG;
+    const url = await new Promise((resolve, reject) => {
+      const id = setTimeout(
+        () => reject(new Error(`Timeout waiting for opencode server after 10s`)),
+        1e4
+      );
+      let output = "";
+      proc.stdout?.on("data", (chunk) => {
+        output += chunk.toString();
+        for (const line of output.split("\n")) {
+          if (!line.startsWith("opencode server listening")) continue;
+          const match = line.match(/on\s+(https?:\/\/[^\s]+)/);
+          if (!match) {
+            reject(new Error(`Failed to parse server url: ${line}`));
+            return;
+          }
+          clearTimeout(id);
+          resolve(match[1]);
+          return;
+        }
+      });
+      proc.stderr?.on("data", (chunk) => {
+        output += chunk.toString();
+      });
+      proc.on("exit", (code) => {
+        clearTimeout(id);
+        reject(new Error(`Server exited with code ${code}
+${output}`));
+      });
+      proc.on("error", (err) => {
+        clearTimeout(id);
+        reject(err);
+      });
+      this.ac.signal.addEventListener("abort", () => {
+        clearTimeout(id);
+        killProc();
+        reject(new Error("Aborted"));
+      });
+    });
+    const client = createOpencodeClient({ baseUrl: url });
     if (this.debug) {
       const mcpStatusResult = await client.mcp.status();
       pdbg("mcp status", { status: JSON.stringify(mcpStatusResult.data) });
@@ -289,7 +357,11 @@ var OpenCodeProvider = class {
       throw new Error(`Failed to create opencode session: ${errMsg}`);
     }
     if (this.debug) pdbg("session created", { id: sessionResult.data.id });
-    return { client, server, sessionID: sessionResult.data.id };
+    return {
+      client,
+      server: { url, close: killProc, closeAsync: () => killWithFallback(proc.pid) },
+      sessionID: sessionResult.data.id
+    };
   }
   async chat(messages, _opts) {
     const mockMode = process.env.AICC_DEBUG_PROVIDER === "mock";
@@ -316,10 +388,8 @@ ${userAggregate}`;
     const providerID = slashIdx !== -1 ? this.model.slice(0, slashIdx) : this.model;
     const modelID = slashIdx !== -1 ? this.model.slice(slashIdx + 1) : this.model;
     const start = Date.now();
-    let server;
     try {
       const ctx = await (this.warmPromise ?? this._startServer());
-      server = ctx.server;
       if (this.debug) {
         pdbg("sending prompt", { model: this.model, promptChars: fullPrompt.length });
       }
@@ -355,8 +425,6 @@ ${userAggregate}`;
       }
       if (this.debug) pdbg(chalk2.red("call failed"), { error: e.message });
       throw new Error(e.message || "opencode SDK call failed");
-    } finally {
-      server?.close();
     }
   }
 };