@kud/ai-conventional-commit-cli 1.1.0 → 2.0.0

package/README.md

@@ -227,12 +227,7 @@ Resolves via cosmiconfig (JSON/YAML/etc). Example:
   "plugins": ["./src/sample-plugin/example-plugin.ts"],
   "maxTokens": 512,
   "maxFileLines": 1000,
-  "skipFilePatterns": [
-    "**/package-lock.json",
-    "**/yarn.lock",
-    "**/*.d.ts",
-    "**/dist/**"
-  ]
+  "skipFilePatterns": ["**/package-lock.json", "**/yarn.lock", "**/*.d.ts", "**/dist/**"]
 }
 ```
 
@@ -256,11 +251,12 @@ Environment overrides (prefix `AICC_`):
 
 Lowest to highest (later wins):
 
-1. Built-in defaults
-2. Global config file: `~/.config/ai-conventional-commit-cli/aicc.json` (or `$XDG_CONFIG_HOME`)
-3. Project config (.aiccrc via cosmiconfig)
-4. Environment variables (`AICC_*`)
-5. CLI flags (e.g. `--model`, `--style`)
+1. Built-in defaults (`github-copilot/gpt-4.1`)
+2. `OPENCODE_FREE_MODEL` env var (ambient opencode default)
+3. Global config file: `~/.config/ai-conventional-commit-cli/aicc.json` (or `$XDG_CONFIG_HOME`)
+4. Project config (.aiccrc via cosmiconfig)
+5. Environment variables (`AICC_*`)
+6. CLI flags (e.g. `--model`, `--style`)
 
 View the resolved configuration:
 
@@ -278,7 +274,7 @@ ai-conventional-commit models --interactive --save # pick + persist globally
 ai-conventional-commit models --current     # show active model + source
 ```
 
-`MODEL`, `PRIVACY`, `STYLE`, `STYLE_SAMPLES`, `MAX_TOKENS`, `MAX_FILE_LINES`, `VERBOSE`, `YES`, `MODEL_TIMEOUT_MS`, `DEBUG`, `PRINT_LOGS`, `DEBUG_PROVIDER=mock`.
+`MODEL`, `PRIVACY`, `STYLE`, `STYLE_SAMPLES`, `MAX_TOKENS`, `MAX_FILE_LINES`, `VERBOSE`, `YES`, `MODEL_TIMEOUT_MS`, `DEBUG`, `PRINT_LOGS`, `DEBUG_PROVIDER=mock`. The external `OPENCODE_FREE_MODEL` env var is also honoured as a lower-priority model default (before `AICC_MODEL`).
 
 **Note:** `skipFilePatterns` cannot be set via environment variable - use config file or accept defaults.
 

package/dist/{chunk-YIXP5EWA.js → chunk-ECRGQKAX.js}

@@ -1,27 +1,64 @@
 // src/prompt.ts
-var summarizeDiffForPrompt = (files, privacy) => {
+var matchesPattern = (filePath, pattern) => {
+  const regexPattern = pattern.replace(/\*\*/g, "\xA7DOUBLESTAR\xA7").replace(/\*/g, "[^/]*").replace(/§DOUBLESTAR§/g, ".*").replace(/\./g, "\\.").replace(/\?/g, ".");
+  const regex = new RegExp(`^${regexPattern}$`);
+  return regex.test(filePath);
+};
+var summarizeDiffForPrompt = (files, privacy, maxFileLines, skipFilePatterns) => {
+  const getTotalLines = (f) => {
+    return f.hunks.reduce((sum, h) => sum + h.lines.length, 0);
+  };
+  const shouldSkipFile = (filePath) => {
+    return skipFilePatterns.some((pattern) => matchesPattern(filePath, pattern));
+  };
   if (privacy === "high") {
-    return files.map((f) => `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length}`).join("\n");
+    return files.map((f) => {
+      const totalLines = getTotalLines(f);
+      const patternSkipped = shouldSkipFile(f.file);
+      const sizeSkipped = totalLines > maxFileLines;
+      const skipped = patternSkipped || sizeSkipped;
+      const reason = patternSkipped ? "generated/lock file" : "large file";
+      return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length}${skipped ? ` [${reason}, content skipped]` : ""}`;
+    }).join("\n");
   }
   if (privacy === "medium") {
-    return files.map(
-      (f) => `file: ${f.file}
+    return files.map((f) => {
+      const totalLines = getTotalLines(f);
+      const patternSkipped = shouldSkipFile(f.file);
+      const sizeSkipped = totalLines > maxFileLines;
+      if (patternSkipped || sizeSkipped) {
+        const reason = patternSkipped ? "generated/lock file" : "large file";
+        return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length} [${reason}, content skipped]`;
+      }
+      return `file: ${f.file}
 ` + f.hunks.map(
         (h) => `  hunk ${h.hash} context:${h.functionContext || ""} +${h.added} -${h.removed}`
-      ).join("\n")
-    ).join("\n");
+      ).join("\n");
+    }).join("\n");
   }
-  return files.map(
-    (f) => `file: ${f.file}
+  return files.map((f) => {
+    const totalLines = getTotalLines(f);
+    const patternSkipped = shouldSkipFile(f.file);
+    const sizeSkipped = totalLines > maxFileLines;
+    if (patternSkipped || sizeSkipped) {
+      const reason = patternSkipped ? "generated/lock file" : "large file";
+      return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length} [${reason}, content skipped]`;
+    }
+    return `file: ${f.file}
 ` + f.hunks.map(
       (h) => `${h.header}
 ${h.lines.slice(0, 40).join("\n")}${h.lines.length > 40 ? "\n[truncated]" : ""}`
-    ).join("\n")
-  ).join("\n");
+    ).join("\n");
+  }).join("\n");
 };
 var buildGenerationMessages = (opts) => {
   const { files, style, config, mode, desiredCommits } = opts;
-  const diff = summarizeDiffForPrompt(files, config.privacy);
+  const diff = summarizeDiffForPrompt(
+    files,
+    config.privacy,
+    config.maxFileLines,
+    config.skipFilePatterns
+  );
   const TYPE_MAP = {
     feat: "A new feature or capability added for the user",
     fix: "A bug fix resolving incorrect behavior",
@@ -47,13 +84,15 @@ var buildGenerationMessages = (opts) => {
     'Output JSON Schema: { "commits": [ { "title": string, "body": string, "score": 0-100, "reasons": string[], "files"?: string[] } ], "meta": { "splitRecommended": boolean } }'
   );
   specLines.push("Primary Output Field: commits[ ].title");
-  specLines.push("Title Format: <type>(<optional-scope>): <subject>");
+  specLines.push("Title Format (REQUIRED): <type>(<scope>): <subject>");
   specLines.push(
     "Title Length Guidance: Aim for <=50 chars ideal; absolute max 72 (do not exceed)."
   );
   specLines.push("Types (JSON mapping follows on next line)");
   specLines.push("TypeMap: " + JSON.stringify(TYPE_MAP));
-  specLines.push("Scope Rules: optional; if present, lowercase kebab-case; omit when unclear.");
+  specLines.push(
+    "Scope Rules: ALWAYS include a concise lowercase kebab-case scope (derive from dominant directory, package, or feature); never omit."
+  );
   specLines.push(
     "Subject Rules: imperative mood, present tense, no leading capital unless proper noun, no trailing period."
   );
@@ -107,12 +146,14 @@ var buildRefineMessages = (opts) => {
   spec.push(
     'Output JSON Schema: { "commits": [ { "title": string, "body": string, "score": 0-100, "reasons": string[] } ] }'
   );
-  spec.push("Title Format: <type>(<optional-scope>): <subject> (<=72 chars)");
+  spec.push("Title Format (REQUIRED): <type>(<scope>): <subject> (<=72 chars)");
   spec.push("Subject: imperative, present tense, no trailing period.");
   spec.push(
     "Emoji Rule: " + (config.style === "gitmoji" || config.style === "gitmoji-pure" ? "OPTIONAL single leading gitmoji BEFORE type if it adds clarity; omit if unsure." : "Disallow all emojis; start directly with the type.")
   );
-  spec.push("Preserve semantic meaning; only improve clarity, scope, brevity, conformity.");
+  spec.push(
+    "Preserve semantic meaning; ensure a scope is present (infer one if missing); only improve clarity, brevity, conformity."
+  );
   spec.push("If instructions request scope or emoji, incorporate only if justified by content.");
   spec.push("Return ONLY JSON (commits array length=1).");
   return [
@@ -130,7 +171,7 @@ Refine now.`
 
 // src/model/provider.ts
 import { z } from "zod";
-import { execa } from "execa";
+import { createOpencode, createOpencodeClient } from "@opencode-ai/sdk";
 var OpenCodeProvider = class {
   constructor(model = "github-copilot/gpt-4.1") {
     this.model = model;
@@ -142,13 +183,6 @@ var OpenCodeProvider = class {
     const debug = process.env.AICC_DEBUG === "true";
     const mockMode = process.env.AICC_DEBUG_PROVIDER === "mock";
     const timeoutMs = parseInt(process.env.AICC_MODEL_TIMEOUT_MS || "120000", 10);
-    const eager = process.env.AICC_EAGER_PARSE !== "false";
-    const userAggregate = messages.map((m) => `${m.role.toUpperCase()}: ${m.content}`).join("\n\n");
-    const command = `Generate high-quality commit message candidates based on the staged git diff.`;
-    const fullPrompt = `${command}
-
-Context:
-${userAggregate}`;
     if (mockMode) {
       if (debug) console.error("[ai-cc][mock] Returning deterministic mock response");
       return JSON.stringify({
@@ -163,66 +197,57 @@ ${userAggregate}`;
         meta: { splitRecommended: false }
       });
     }
+    const userAggregate = messages.map((m) => `${m.role.toUpperCase()}: ${m.content}`).join("\n\n");
+    const fullPrompt = `Generate high-quality commit message candidates based on the staged git diff.
+
+Context:
+${userAggregate}`;
+    const slashIdx = this.model.indexOf("/");
+    const providerID = slashIdx !== -1 ? this.model.slice(0, slashIdx) : this.model;
+    const modelID = slashIdx !== -1 ? this.model.slice(slashIdx + 1) : this.model;
+    const ac = new AbortController();
+    const timer = setTimeout(() => ac.abort(), timeoutMs);
     const start = Date.now();
-    return await new Promise((resolve, reject) => {
-      let resolved = false;
-      let acc = "";
-      const includeLogs = process.env.AICC_PRINT_LOGS === "true";
-      const args = ["run", fullPrompt, "--model", this.model];
-      if (includeLogs) args.push("--print-logs");
-      const subprocess = execa("opencode", args, {
-        timeout: timeoutMs,
-        input: ""
-        // immediately close stdin in case CLI waits for it
-      });
-      const finish = (value) => {
-        if (resolved) return;
-        resolved = true;
-        const elapsed = Date.now() - start;
-        if (debug) {
-          console.error(
-            `[ai-cc][provider] model=${this.model} elapsedMs=${elapsed} promptChars=${fullPrompt.length} bytesOut=${value.length}`
-          );
-        }
-        resolve(value);
-      };
-      const tryEager = () => {
-        if (!eager) return;
-        const first = acc.indexOf("{");
-        const last = acc.lastIndexOf("}");
-        if (first !== -1 && last !== -1 && last > first) {
-          const candidate = acc.slice(first, last + 1).trim();
-          try {
-            JSON.parse(candidate);
-            if (debug) console.error("[ai-cc][provider] eager JSON detected, terminating process");
-            subprocess.kill("SIGTERM");
-            finish(candidate);
-          } catch {
-          }
+    let server;
+    try {
+      let client;
+      try {
+        client = createOpencodeClient({ baseUrl: "http://localhost:4096" });
+        await client.session.list();
+        if (debug) console.error("[ai-cc][provider] reusing existing opencode server");
+      } catch {
+        if (debug) console.error("[ai-cc][provider] starting opencode server");
+        const opencode = await createOpencode({ signal: ac.signal });
+        server = opencode.server;
+        client = opencode.client;
+      }
+      const session = await client.session.create({ body: { title: "aicc" } });
+      if (!session.data) throw new Error("Failed to create opencode session");
+      const result = await client.session.prompt({
+        path: { id: session.data.id },
+        body: {
+          model: { providerID, modelID },
+          parts: [{ type: "text", text: fullPrompt }]
         }
-      };
-      subprocess.stdout?.on("data", (chunk) => {
-        const text = chunk.toString();
-        acc += text;
-        tryEager();
-      });
-      subprocess.stderr?.on("data", (chunk) => {
-        if (debug) console.error("[ai-cc][provider][stderr]", chunk.toString().trim());
       });
-      subprocess.then(({ stdout }) => {
-        if (!resolved) finish(stdout);
-      }).catch((e) => {
-        if (resolved) return;
+      if (debug) {
         const elapsed = Date.now() - start;
-        if (e.timedOut) {
-          return reject(
-            new Error(`Model call timed out after ${timeoutMs}ms (elapsed=${elapsed}ms)`)
-          );
-        }
-        if (debug) console.error("[ai-cc][provider] failure", e.stderr || e.message);
-        reject(new Error(e.stderr || e.message || "opencode invocation failed"));
-      });
-    });
+        console.error(
+          `[ai-cc][provider] model=${this.model} elapsedMs=${elapsed} promptChars=${fullPrompt.length}`
+        );
+      }
+      const text = result.data.parts?.filter((p) => p.type === "text").map((p) => p.data ?? p.text ?? "").join("") ?? "";
+      return text;
+    } catch (e) {
+      if (ac.signal.aborted) {
+        throw new Error(`Model call timed out after ${timeoutMs}ms`);
+      }
+      if (debug) console.error("[ai-cc][provider] failure", e.message);
+      throw new Error(e.message || "opencode SDK call failed");
+    } finally {
+      clearTimeout(timer);
+      server?.close();
+    }
   }
 };
 var CommitSchema = z.object({
@@ -251,7 +276,7 @@ var extractJSON = (raw) => {
   let parsed;
   try {
     parsed = JSON.parse(jsonText);
-  } catch (e) {
+  } catch {
     throw new Error("Invalid JSON parse");
   }
   return PlanSchema.parse(parsed);

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

@@ -1,27 +1,64 @@
 // src/prompt.ts
-var summarizeDiffForPrompt = (files, privacy) => {
+var matchesPattern = (filePath, pattern) => {
+  const regexPattern = pattern.replace(/\*\*/g, "\xA7DOUBLESTAR\xA7").replace(/\*/g, "[^/]*").replace(/§DOUBLESTAR§/g, ".*").replace(/\./g, "\\.").replace(/\?/g, ".");
+  const regex = new RegExp(`^${regexPattern}$`);
+  return regex.test(filePath);
+};
+var summarizeDiffForPrompt = (files, privacy, maxFileLines, skipFilePatterns) => {
+  const getTotalLines = (f) => {
+    return f.hunks.reduce((sum, h) => sum + h.lines.length, 0);
+  };
+  const shouldSkipFile = (filePath) => {
+    return skipFilePatterns.some((pattern) => matchesPattern(filePath, pattern));
+  };
   if (privacy === "high") {
-    return files.map((f) => `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length}`).join("\n");
+    return files.map((f) => {
+      const totalLines = getTotalLines(f);
+      const patternSkipped = shouldSkipFile(f.file);
+      const sizeSkipped = totalLines > maxFileLines;
+      const skipped = patternSkipped || sizeSkipped;
+      const reason = patternSkipped ? "generated/lock file" : "large file";
+      return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length}${skipped ? ` [${reason}, content skipped]` : ""}`;
+    }).join("\n");
   }
   if (privacy === "medium") {
-    return files.map(
-      (f) => `file: ${f.file}
+    return files.map((f) => {
+      const totalLines = getTotalLines(f);
+      const patternSkipped = shouldSkipFile(f.file);
+      const sizeSkipped = totalLines > maxFileLines;
+      if (patternSkipped || sizeSkipped) {
+        const reason = patternSkipped ? "generated/lock file" : "large file";
+        return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length} [${reason}, content skipped]`;
+      }
+      return `file: ${f.file}
 ` + f.hunks.map(
         (h) => `  hunk ${h.hash} context:${h.functionContext || ""} +${h.added} -${h.removed}`
-      ).join("\n")
-    ).join("\n");
+      ).join("\n");
+    }).join("\n");
   }
-  return files.map(
-    (f) => `file: ${f.file}
+  return files.map((f) => {
+    const totalLines = getTotalLines(f);
+    const patternSkipped = shouldSkipFile(f.file);
+    const sizeSkipped = totalLines > maxFileLines;
+    if (patternSkipped || sizeSkipped) {
+      const reason = patternSkipped ? "generated/lock file" : "large file";
+      return `file: ${f.file} (+${f.additions} -${f.deletions}) hunks:${f.hunks.length} [${reason}, content skipped]`;
+    }
+    return `file: ${f.file}
 ` + f.hunks.map(
       (h) => `${h.header}
 ${h.lines.slice(0, 40).join("\n")}${h.lines.length > 40 ? "\n[truncated]" : ""}`
-    ).join("\n")
-  ).join("\n");
+    ).join("\n");
+  }).join("\n");
 };
 var buildGenerationMessages = (opts) => {
   const { files, style, config, mode, desiredCommits } = opts;
-  const diff = summarizeDiffForPrompt(files, config.privacy);
+  const diff = summarizeDiffForPrompt(
+    files,
+    config.privacy,
+    config.maxFileLines,
+    config.skipFilePatterns
+  );
   const TYPE_MAP = {
     feat: "A new feature or capability added for the user",
     fix: "A bug fix resolving incorrect behavior",
@@ -134,7 +171,7 @@ Refine now.`
 
 // src/model/provider.ts
 import { z } from "zod";
-import { execa } from "execa";
+import { createOpencode } from "@opencode-ai/sdk";
 var OpenCodeProvider = class {
   constructor(model = "github-copilot/gpt-4.1") {
     this.model = model;
@@ -146,13 +183,6 @@ var OpenCodeProvider = class {
     const debug = process.env.AICC_DEBUG === "true";
     const mockMode = process.env.AICC_DEBUG_PROVIDER === "mock";
     const timeoutMs = parseInt(process.env.AICC_MODEL_TIMEOUT_MS || "120000", 10);
-    const eager = process.env.AICC_EAGER_PARSE !== "false";
-    const userAggregate = messages.map((m) => `${m.role.toUpperCase()}: ${m.content}`).join("\n\n");
-    const command = `Generate high-quality commit message candidates based on the staged git diff.`;
-    const fullPrompt = `${command}
-
-Context:
-${userAggregate}`;
     if (mockMode) {
       if (debug) console.error("[ai-cc][mock] Returning deterministic mock response");
       return JSON.stringify({
@@ -167,66 +197,49 @@ ${userAggregate}`;
         meta: { splitRecommended: false }
       });
     }
+    const userAggregate = messages.map((m) => `${m.role.toUpperCase()}: ${m.content}`).join("\n\n");
+    const fullPrompt = `Generate high-quality commit message candidates based on the staged git diff.
+
+Context:
+${userAggregate}`;
+    const slashIdx = this.model.indexOf("/");
+    const providerID = slashIdx !== -1 ? this.model.slice(0, slashIdx) : this.model;
+    const modelID = slashIdx !== -1 ? this.model.slice(slashIdx + 1) : this.model;
+    const ac = new AbortController();
+    const timer = setTimeout(() => ac.abort(), timeoutMs);
     const start = Date.now();
-    return await new Promise((resolve, reject) => {
-      let resolved = false;
-      let acc = "";
-      const includeLogs = process.env.AICC_PRINT_LOGS === "true";
-      const args = ["run", fullPrompt, "--model", this.model];
-      if (includeLogs) args.push("--print-logs");
-      const subprocess = execa("opencode", args, {
-        timeout: timeoutMs,
-        input: ""
-        // immediately close stdin in case CLI waits for it
-      });
-      const finish = (value) => {
-        if (resolved) return;
-        resolved = true;
-        const elapsed = Date.now() - start;
-        if (debug) {
-          console.error(
-            `[ai-cc][provider] model=${this.model} elapsedMs=${elapsed} promptChars=${fullPrompt.length} bytesOut=${value.length}`
-          );
+    let server;
+    try {
+      const opencode = await createOpencode({ signal: ac.signal });
+      server = opencode.server;
+      const { client } = opencode;
+      const session = await client.session.create({ body: { title: "aicc" } });
+      if (!session.data) throw new Error("Failed to create opencode session");
+      const result = await client.session.prompt({
+        path: { id: session.data.id },
+        body: {
+          model: { providerID, modelID },
+          parts: [{ type: "text", text: fullPrompt }]
         }
-        resolve(value);
-      };
-      const tryEager = () => {
-        if (!eager) return;
-        const first = acc.indexOf("{");
-        const last = acc.lastIndexOf("}");
-        if (first !== -1 && last !== -1 && last > first) {
-          const candidate = acc.slice(first, last + 1).trim();
-          try {
-            JSON.parse(candidate);
-            if (debug) console.error("[ai-cc][provider] eager JSON detected, terminating process");
-            subprocess.kill("SIGTERM");
-            finish(candidate);
-          } catch {
-          }
-        }
-      };
-      subprocess.stdout?.on("data", (chunk) => {
-        const text = chunk.toString();
-        acc += text;
-        tryEager();
-      });
-      subprocess.stderr?.on("data", (chunk) => {
-        if (debug) console.error("[ai-cc][provider][stderr]", chunk.toString().trim());
       });
-      subprocess.then(({ stdout }) => {
-        if (!resolved) finish(stdout);
-      }).catch((e) => {
-        if (resolved) return;
+      if (debug) {
         const elapsed = Date.now() - start;
-        if (e.timedOut) {
-          return reject(
-            new Error(`Model call timed out after ${timeoutMs}ms (elapsed=${elapsed}ms)`)
-          );
-        }
-        if (debug) console.error("[ai-cc][provider] failure", e.stderr || e.message);
-        reject(new Error(e.stderr || e.message || "opencode invocation failed"));
-      });
-    });
+        console.error(
+          `[ai-cc][provider] model=${this.model} elapsedMs=${elapsed} promptChars=${fullPrompt.length}`
+        );
+      }
+      const text = result.data.parts?.filter((p) => p.type === "text").map((p) => p.data ?? p.text ?? "").join("") ?? "";
+      return text;
+    } catch (e) {
+      if (ac.signal.aborted) {
+        throw new Error(`Model call timed out after ${timeoutMs}ms`);
+      }
+      if (debug) console.error("[ai-cc][provider] failure", e.message);
+      throw new Error(e.message || "opencode SDK call failed");
+    } finally {
+      clearTimeout(timer);
+      server?.close();
+    }
   }
 };
 var CommitSchema = z.object({
@@ -255,7 +268,7 @@ var extractJSON = (raw) => {
   let parsed;
   try {
     parsed = JSON.parse(jsonText);
-  } catch (e) {
+  } catch {
     throw new Error("Invalid JSON parse");
   }
   return PlanSchema.parse(parsed);

package/dist/{chunk-F3BOAVBY.js → chunk-U7UVALKR.js}

@@ -4,7 +4,7 @@ import { resolve, dirname, join } from "path";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { homedir } from "os";
 var DEFAULTS = {
-  model: process.env.AICC_MODEL || "github-copilot/gpt-4.1",
+  model: process.env.AICC_MODEL || process.env.OPENCODE_FREE_MODEL || "github-copilot/gpt-4.1",
   privacy: process.env.AICC_PRIVACY || "low",
   style: process.env.AICC_STYLE || "standard",
   styleSamples: parseInt(process.env.AICC_STYLE_SAMPLES || "120", 10),

package/dist/{config-C3S4LWLD.js → config-AZDENPAB.js}

@@ -3,7 +3,7 @@ import {
   loadConfig,
   loadConfigDetailed,
   saveGlobalConfig
-} from "./chunk-HJR5M6U7.js";
+} from "./chunk-U7UVALKR.js";
 export {
   getGlobalConfigPath,
   loadConfig,