npm - @frigopedro/committer - Versions diffs - 0.1.0 → 0.1.1 - Mend

@frigopedro/committer 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.md +50 -56
package/index.js +14 -16
package/package.json +30 -26
package/src/ai.js +38 -20
package/src/claude.js +39 -0
package/src/constants.js +13 -13
package/src/onboarding.js +11 -0
package/src/prompt.js +122 -90
package/src/providers/claude.js +59 -29
package/src/providers/ollama.js +103 -44
package/src/providers/openai.js +99 -31

package/README.md CHANGED Viewed

@@ -1,78 +1,56 @@
-# AI Git Committer
+# AI Git Committer 🤖
-I was tired of typing out commit messages, so I wrote this tool.
-I know bunch of other tools exist, but I had hard times with them.
+I was tired of typing out commit messages, so I wrote this tool. I know bunch of other tools exist, but I had hard times with them.
 Its a personal tool, dont expect to be good because its not :/
-## Install
+## Install 📦
 ```bash
-npm install -g .
+npm install -g @frigopedro/committer
 ```
-Or for local development:
+Local development:
 ```bash
 npm link
 ```
-## Usage
+## Quick start ⚡
 ```bash
 committer
 ```
-The tool reads your git diff, proposes a conventional commit message, then
-asks you to (y) commit, (n) abort, or (r) regenerate.
+You will get a suggested commit message and can:
-Commit messages include a required body with a broader summary of the changes.
+- `y` to commit
+- `n` to abort
+- `r` to regenerate
-On first run, committer creates a `.committer` config file in your home
-directory and walks the user through provider and model selection.
-Use `committer --init` to re-run onboarding and rewrite the config.
+The commit message streams live as it is generated.
-### Options
+On first run, committer creates `~/.committer` and walks you through provider + model selection.
+Re-run onboarding anytime with:
+```bash
+committer --init
+```
+## Usage ✅
 ```bash
 committer --provider ollama --model llama3.1
 committer --provider openai --model gpt-4o-mini
 committer --staged
 committer --all
-committer --init
 ```
-If you run `committer` with `--provider ollama` and no model specified, the
-CLI will list your local Ollama models and prompt you to pick one.
-### Environment variables
-- `AI_COMMIT_PROVIDER`: `claude`, `ollama`, or `openai`
-- `AI_COMMIT_MODEL`: override model name
-- `AI_COMMIT_MAX_DIFF_CHARS`: trim diff length
-- `ANTHROPIC_API_KEY` or `CLAUDE_API_KEY`: Claude API key
-- `OPENAI_API_KEY`: OpenAI API key
-- `AI_COMMIT_OLLAMA_HOST`: Ollama host (default `http://localhost:11434`)
-### .committer config
-The `.committer` file is a JSON config stored at `~/.committer`.
-Example:
-```json
-{
-  "version": 1,
-  "provider": "ollama",
-  "model": "llama3.1",
-  "diffMode": "auto",
-  "maxDiffChars": 12000
-}
-```
+If you run with `--provider ollama` and no model, it will list local models and let you pick one.
-### Commit format
+## Commit format ✍️
-Commit messages are generated in the format:
+Commit messages are generated as:
 ```
 <type>[optional scope]: <description>
@@ -80,35 +58,51 @@ Commit messages are generated in the format:
 <body>
 ```
-The body is always present and provides a multi-sentence summary of most
-changed files.
+The body is always present and provides a multi‑sentence summary covering most changed files.
-## Claude setup
+## Providers 🔌
-Set your Claude API key before running:
+### Claude
 ```bash
 export ANTHROPIC_API_KEY=your_key_here
 ```
-## ChatGPT setup
-Set your OpenAI API key before running:
+### ChatGPT (OpenAI)
 ```bash
 export OPENAI_API_KEY=your_key_here
 ```
-## Local Llama setup
-Install and run Ollama, then pull a model:
+### Local Llama (Ollama)
 ```bash
 ollama pull llama3.1
 ```
-Run the CLI with:
 ```bash
 committer --provider ollama
 ```
+## Config file 🧰
+`~/.committer` is a JSON config shared across all repos.
+```json
+{
+  "version": 1,
+  "provider": "ollama",
+  "model": "llama3.1",
+  "diffMode": "auto",
+  "maxDiffChars": 12000
+}
+```
+## Environment variables 🌱
+- `AI_COMMIT_PROVIDER`: `claude`, `ollama`, or `openai`
+- `AI_COMMIT_MODEL`: override model name
+- `AI_COMMIT_MAX_DIFF_CHARS`: trim diff length
+- `ANTHROPIC_API_KEY` or `CLAUDE_API_KEY`: Claude API key
+- `OPENAI_API_KEY`: OpenAI API key
+- `AI_COMMIT_OLLAMA_HOST`: Ollama host (default `http://localhost:11434`)

package/index.js CHANGED Viewed

@@ -18,9 +18,8 @@ import { truncateDiff } from "./src/diff.js";
 import { generateCommitMessage } from "./src/ai.js";
 import { runOnboarding } from "./src/onboarding.js";
 import { selectOllamaModel } from "./src/ollama.js";
-import { writeLine } from "./src/ui.js";
+import { write, writeLine } from "./src/ui.js";
 import { commitWithMessage } from "./src/commit.js";
-import { hasEmoji, validateCommitMessage } from "./src/validate.js";
 const PROVIDERS = ["claude", "ollama", "openai"];
@@ -169,34 +168,33 @@ async function main() {
     try {
         while (true) {
-            writeLine("⏳ Loading... generating commit message.");
+            writeLine("⏳ Loading commit message...");
+            writeLine("\n✨ Suggested commit message:");
+            let streamed = false;
             message = await generateCommitMessage({
                 provider,
                 model,
                 diff: trimmedDiff,
                 truncated,
                 host: ollamaHost,
+                stream: true,
+                onToken: (chunk) => {
+                    streamed = true;
+                    write(chunk);
+                },
             });
-            if (!message) {
-                writeLine("⚠️ AI response was invalid. Regenerating...");
-                continue;
+            if (!streamed && message) {
+                writeLine(message);
             }
-            if (hasEmoji(message)) {
-                writeLine("⚠️ Commit message contains emoji. Regenerating...");
-                continue;
-            }
-            console.log(message);
+            writeLine("");
-            const validation = validateCommitMessage(message);
-            if (!validation.valid) {
-                writeLine(`⚠️ ${validation.reason} Regenerating...`);
+            if (!message) {
+                writeLine("⚠️ AI response was empty. Regenerating...");
                 continue;
             }
-            writeLine(`\n✨ Suggested commit message:\n${message}\n`);
             const answer = await rl.question(
                 "Use (y) to commit, (n) to abort, (r) to regenerate: "
             );

package/package.json CHANGED Viewed

@@ -1,28 +1,32 @@
 {
-  "name": "@frigopedro/committer",
-  "version": "0.1.0",
-  "description": "Generate conventional commit messages using AI",
-  "type": "module",
-  "bin": {
-    "committer": "index.js"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "license": "MIT",
-  "keywords": [
-    "git",
-    "commit",
-    "conventional-commits",
-    "ai",
-    "cli"
-  ],
-  "files": [
-    "index.js",
-    "src",
-    "README.md"
-  ],
-  "publishConfig": {
-    "access": "public"
-  }
+    "name": "@frigopedro/committer",
+    "version": "0.1.1",
+    "description": "Generate conventional commit messages using AI",
+    "type": "module",
+    "bin": {
+        "committer": "index.js"
+    },
+    "engines": {
+        "node": ">=18"
+    },
+    "license": "MIT",
+    "keywords": [
+        "git",
+        "commit",
+        "conventional-commits",
+        "ai",
+        "commit-message",
+        "commit-generator",
+        "commit-bot",
+        "ai-commit",
+        "cli"
+    ],
+    "files": [
+        "index.js",
+        "src",
+        "README.md"
+    ],
+    "publishConfig": {
+        "access": "public"
+    }
 }

package/src/ai.js CHANGED Viewed

@@ -1,27 +1,45 @@
-import { buildPrompt, parseCommitMessage } from "./prompt.js";
+import { buildPrompt, buildSystemPrompt } from "./prompt.js";
 import { callClaude } from "./providers/claude.js";
-import { callOllama } from "./providers/ollama.js";
-import { callOpenAI } from "./providers/openai.js";
+import { callOllama, streamOllama } from "./providers/ollama.js";
+import { callOpenAI, streamOpenAI } from "./providers/openai.js";
 export async function generateCommitMessage({
-  provider,
-  model,
-  diff,
-  truncated,
-  host,
+    provider,
+    model,
+    diff,
+    truncated,
+    host,
+    stream = false,
+    onToken,
 }) {
-  const system =
-    "You are a senior developer assistant that writes clear, conventional commit messages.";
-  const user = buildPrompt(diff, { truncated });
+    const system = buildSystemPrompt(provider);
+    const user = buildPrompt(provider, diff, { truncated });
-  let raw = "";
-  if (provider === "ollama") {
-    raw = await callOllama({ system, user, model, host });
-  } else if (provider === "openai") {
-    raw = await callOpenAI({ system, user, model });
-  } else {
-    raw = await callClaude({ system, user, model });
-  }
+    let raw = "";
-  return parseCommitMessage(raw);
+    if (stream && typeof onToken === "function") {
+        if (provider === "ollama") {
+            raw = await streamOllama({ system, user, model, host, onToken });
+            return raw;
+        }
+        if (provider === "openai") {
+            raw = await streamOpenAI({ system, user, model, onToken });
+            return raw;
+        }
+        if (provider === "claude") {
+            // Claude streaming is not enabled; fall back to non-stream.
+        }
+    }
+    if (provider === "ollama") {
+        raw = await callOllama({ system, user, model, host });
+    } else if (provider === "openai") {
+        raw = await callOpenAI({ system, user, model });
+    } else {
+        raw = await callClaude({ system, user, model });
+    }
+    return raw;
 }

package/src/claude.js ADDED Viewed

@@ -0,0 +1,39 @@
+import { fetchClaudeModels } from "./providers/claude.js";
+import { writeLine } from "./ui.js";
+import { DEFAULT_CLAUDE_MODEL } from "./constants.js";
+export async function selectClaudeModel({ rl }) {
+  const models = await fetchClaudeModels();
+  if (!models.length) {
+    throw new Error("No Claude models returned by API.");
+  }
+  const defaultIndex = Math.max(
+    0,
+    models.findIndex((model) => model === DEFAULT_CLAUDE_MODEL)
+  );
+  writeLine("\n🧠 Available Claude models:");
+  models.forEach((model, index) => {
+    const marker = index === defaultIndex ? " (default)" : "";
+    writeLine(`${index + 1}) ${model}${marker}`);
+  });
+  const answer = await rl.question(`Select model [${defaultIndex + 1}]: `);
+  const trimmed = answer.trim();
+  if (!trimmed) {
+    return models[defaultIndex];
+  }
+  const asNumber = Number.parseInt(trimmed, 10);
+  if (!Number.isNaN(asNumber) && asNumber >= 1 && asNumber <= models.length) {
+    return models[asNumber - 1];
+  }
+  if (models.includes(trimmed)) {
+    return trimmed;
+  }
+  writeLine("Invalid selection. Using default model.");
+  return models[defaultIndex];
+}

package/src/constants.js CHANGED Viewed

@@ -1,19 +1,19 @@
 export const COMMIT_TYPES = [
-  "feat",
-  "fix",
-  "docs",
-  "style",
-  "refactor",
-  "perf",
-  "test",
-  "build",
-  "ci",
-  "chore",
-  "revert",
+    "feat",
+    "fix",
+    "docs",
+    "style",
+    "refactor",
+    "perf",
+    "test",
+    "build",
+    "ci",
+    "chore",
+    "revert",
 ];
-export const DEFAULT_MAX_DIFF_CHARS = 12000;
-export const DEFAULT_CLAUDE_MODEL = "claude-3-5-sonnet-latest";
+export const DEFAULT_MAX_DIFF_CHARS = 50000;
+export const DEFAULT_CLAUDE_MODEL = "claude-3-5-haiku-20241022";
 export const DEFAULT_OLLAMA_MODEL = "llama3.1";
 export const DEFAULT_OPENAI_MODEL = "gpt-4o-mini";
 export const DEFAULT_PROVIDER = "claude";

package/src/onboarding.js CHANGED Viewed

@@ -7,6 +7,7 @@ import {
 } from "./constants.js";
 import { promptNumber, promptSelect, writeLine } from "./ui.js";
 import { selectOllamaModel } from "./ollama.js";
+import { selectClaudeModel } from "./claude.js";
 import { writeConfig } from "./config.js";
 export async function runOnboarding({ rl, configPath, ollamaHost }) {
@@ -38,6 +39,16 @@ export async function runOnboarding({ rl, configPath, ollamaHost }) {
     model = DEFAULT_OPENAI_MODEL;
   }
+  if (provider === "claude") {
+    try {
+      model = await selectClaudeModel({ rl });
+    } catch (error) {
+      writeLine(`⚠️ Claude model selection failed: ${error.message}`);
+      writeLine(`↩️ Falling back to ${DEFAULT_CLAUDE_MODEL}.`);
+      model = DEFAULT_CLAUDE_MODEL;
+    }
+  }
   const diffMode = await promptSelect({
     rl,
     question: "Which diff should committer use?",

package/src/prompt.js CHANGED Viewed

@@ -1,66 +1,29 @@
 import { COMMIT_TYPES } from "./constants.js";
-export function buildPrompt(diff, { truncated }) {
-    const types = COMMIT_TYPES.join(", ");
+function buildCommonTypes() {
+    return COMMIT_TYPES.join(", ");
+}
+function buildOpenAIPrompt(diff, { truncated, types }) {
     return [
-        "You are an expert software engineer writing a professional git commit message.",
-        "Analyze the diff and produce a precise, high-signal commit message.",
-        "",
-        "Return valid JSON only.",
-        "Do not wrap the response in markdown.",
-        "Do not include explanations, commentary, or extra keys.",
-        'Use exactly this schema: {"subject":"...","body":"..."}',
-        "",
-        "Rules for the subject:",
-        "1. Follow Conventional Commits.",
-        "2. Format: <type>(optional-scope)!: <description>",
-        `3. Allowed types: ${types}.`,
-        "4. Use ! only if the diff clearly introduces a breaking change.",
-        "5. Use imperative mood.",
-        "6. Use lower-case for the description.",
-        "7. Do not end the subject with a period.",
-        "8. Keep the subject concise, specific, and under 72 characters.",
-        "9. Prefer describing the main user-visible or architectural change.",
-        "10. Avoid vague subjects like 'update code', 'fix stuff', or 'changes'.",
-        "",
-        "Rules for the body:",
-        "1. Body is required.",
-        "2. Write 2 to 5 short sentences.",
-        "3. Summarize the intent and the most important changes.",
-        "4. Mention notable implementation details only when they help explain the change.",
-        "5. Cover the main files or areas affected, but do not list every file mechanically.",
-        "6. Focus on why and what changed more than line-level details.",
-        "7. Do not repeat the subject verbatim.",
-        "8. Do not include a footer, ticket number, or breaking-change footer.",
-        "9. Do not invent details not supported by the diff.",
-        "",
-        "Decision guidance:",
-        "- Use feat for new behavior or capability.",
-        "- Use fix for bug fixes or correctness issues.",
-        "- Use refactor for internal restructuring without behavior change.",
-        "- Use perf for performance improvements.",
-        "- Use docs for documentation-only changes.",
-        "- Use test for test-only changes.",
-        "- Use build for build system, dependencies, or packaging changes.",
-        "- Use ci for CI/CD changes.",
-        "- Use chore for maintenance tasks that do not fit other types.",
-        "- Use style for formatting-only changes with no logic change.",
-        "",
-        "Scoping guidance:",
-        "- Add a scope only when the affected area is clear and meaningful.",
-        "- Use a short scope such as api, auth, ui, cli, db, config, or parser.",
-        "- Omit the scope if there is no obvious single area.",
-        "",
-        "Diff interpretation guidance:",
-        "- Infer the primary purpose of the change from the overall diff, not isolated lines.",
-        "- Ignore unimportant noise such as formatting churn unless formatting is the main change.",
-        "- If multiple changes exist, prioritize the dominant one.",
-        truncated
-            ? "- The diff was truncated, so base the message on the visible changes only and avoid overclaiming."
-            : "",
-        "",
-        "Now analyze this diff and return only the JSON object.",
+        "Write a professional git commit message from this diff.",
+        "Return only the commit message.",
+        "No preface, no commentary, no markdown.",
+        "",
+        "Format:",
+        "<type>(optional-scope)!: <description>",
+        "",
+        "<body paragraph>",
+        "",
+        `Allowed types: ${types}.`,
+        "Use conventional commits.",
+        "Use imperative mood.",
+        "Use lower-case description.",
+        "No trailing period in the subject.",
+        "Subject under 72 characters.",
+        "Body required, 2 to 4 sentences.",
+        "No footer.",
+        truncated ? "The diff is truncated. Only describe visible changes." : "",
         "",
         "Diff:",
         diff,
@@ -69,38 +32,107 @@ export function buildPrompt(diff, { truncated }) {
         .join("\n");
 }
-export function cleanCommitMessage(message) {
-    let cleaned = message.trim();
-    cleaned = cleaned.replace(/^```[a-z]*\n?/i, "").replace(/```$/, "");
-    cleaned = cleaned.replace(/^commit message:\s*/i, "");
-    cleaned = cleaned.replace(/^"|"$/g, "");
-    cleaned = cleaned.replace(/^'|'$/g, "");
-    cleaned = cleaned.replace(/\r\n/g, "\n");
-    return cleaned.trim();
+function buildClaudePrompt(diff, { truncated, types }) {
+    return [
+        "You are writing a professional git commit message for a maintainer.",
+        "Return only the commit message.",
+        "",
+        "Format:",
+        "<type>(optional-scope)!: <description>",
+        "",
+        "<body paragraph>",
+        "",
+        `Allowed types: ${types}.`,
+        "Use conventional commits.",
+        "Use imperative mood.",
+        "Use lower-case description.",
+        "No trailing period in the subject.",
+        "Subject under 72 characters.",
+        "Body required, 2 to 4 sentences.",
+        "No footer.",
+        "Focus on the main intent of the change.",
+        truncated ? "The diff is truncated. Only describe visible changes." : "",
+        "",
+        "Diff:",
+        diff,
+    ]
+        .filter(Boolean)
+        .join("\n");
 }
-export function parseCommitMessage(raw) {
-    const cleaned = cleanCommitMessage(raw);
-    try {
-        const parsed = JSON.parse(cleaned);
-        const subject = parsed?.subject?.trim();
-        const body = parsed?.body?.trim();
-        if (!subject || !body) return "";
-        return `${subject}\n\n${body}`.trim();
-    } catch {
-        const start = cleaned.indexOf("{");
-        const end = cleaned.lastIndexOf("}");
-        if (start >= 0 && end > start) {
-            try {
-                const parsed = JSON.parse(cleaned.slice(start, end + 1));
-                const subject = parsed?.subject?.trim();
-                const body = parsed?.body?.trim();
-                if (!subject || !body) return "";
-                return `${subject}\n\n${body}`.trim();
-            } catch {
-                return "";
-            }
-        }
-        return "";
+function buildLlamaPrompt(diff, { truncated, types }) {
+    return [
+        "Write a git commit message.",
+        "",
+        "ONLY output the commit message.",
+        "NO explanations.",
+        "NO summaries.",
+        "NO bullet points.",
+        "NO numbered lists.",
+        "NO markdown.",
+        "NO extra text.",
+        "",
+        "Format EXACTLY:",
+        "<type>(optional-scope)!: <description>",
+        "",
+        "<body paragraph>",
+        "",
+        `Allowed types: ${types}.`,
+        "Use conventional commits.",
+        "Subject: imperative, lower-case, no period, max 72 chars.",
+        "Body: 2-3 sentences.",
+        "No footer.",
+        "",
+        truncated ? "Diff is truncated. Do not guess missing parts." : "",
+        "",
+        "BAD OUTPUT:",
+        "The provided code appears to be...",
+        "Here are some observations:",
+        "1. Updated function...",
+        "",
+        "GOOD OUTPUT:",
+        "feat(api): add structured json response handling",
+        "",
+        "Update API providers to support structured JSON responses and improve",
+        "response parsing. Adjust request configuration to ensure consistent",
+        "output formatting across providers.",
+        "",
+        "Now output ONLY the commit message.",
+        "",
+        "Diff:",
+        diff,
+    ]
+        .filter(Boolean)
+        .join("\n");
+}
+export function buildPrompt(provider, diff, { truncated }) {
+    const types = buildCommonTypes();
+    const p = (provider ?? "").toLowerCase();
+    if (p === "claude") return buildClaudePrompt(diff, { truncated, types });
+    if (p === "openai") return buildOpenAIPrompt(diff, { truncated, types });
+    if (p === "ollama" || p.includes("llama")) {
+        return buildLlamaPrompt(diff, { truncated, types });
     }
+    return buildOpenAIPrompt(diff, { truncated, types });
+}
+export function buildSystemPrompt(provider) {
+    const base =
+        "You are a senior developer assistant that writes clear, conventional commit messages.";
+    const p = (provider ?? "").toLowerCase();
+    if (p === "ollama" || p.includes("llama")) {
+        return [
+            base,
+            "Follow instructions strictly.",
+            "Return only the commit message.",
+            "No markdown, no bullet lists, no numbering.",
+            "Use exactly one blank line between subject and body.",
+        ].join("\n");
+    }
+    return base;
 }

package/src/providers/claude.js CHANGED Viewed

@@ -1,34 +1,64 @@
 export async function callClaude({ system, user, model }) {
-  const apiKey =
-    process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || "";
-  if (!apiKey) {
-    throw new Error(
-      "Missing ANTHROPIC_API_KEY or CLAUDE_API_KEY for Claude provider."
-    );
-  }
+    const apiKey =
+        process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || "";
+    if (!apiKey) {
+        throw new Error(
+            "Missing ANTHROPIC_API_KEY or CLAUDE_API_KEY for Claude provider."
+        );
+    }
-  const response = await fetch("https://api.anthropic.com/v1/messages", {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-      "x-api-key": apiKey,
-      "anthropic-version": "2023-06-01",
-    },
-    body: JSON.stringify({
-      model,
-      max_tokens: 128,
-      temperature: 0.2,
-      system,
-      messages: [{ role: "user", content: user }],
-    }),
-  });
+    const response = await fetch("https://api.anthropic.com/v1/messages", {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+            "x-api-key": apiKey,
+            "anthropic-version": "2023-06-01",
+        },
+        body: JSON.stringify({
+            model: "claude-sonnet-4-6",
+            max_tokens: 256,
+            temperature: 0.2,
+            system,
+            messages: [{ role: "user", content: user }],
+        }),
+    });
-  if (!response.ok) {
-    const text = await response.text();
-    throw new Error(`Claude API error: ${response.status} ${text}`);
-  }
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Claude API error: ${response.status} ${text}`);
+    }
-  const data = await response.json();
-  const content = data?.content?.[0]?.text ?? "";
-  return content;
+    const data = await response.json();
+    const content = data?.content?.[0]?.text ?? "";
+    return content;
+}
+export async function fetchClaudeModels() {
+    const apiKey =
+        process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY || "";
+    if (!apiKey) {
+        throw new Error(
+            "Missing ANTHROPIC_API_KEY or CLAUDE_API_KEY for Claude provider."
+        );
+    }
+    const response = await fetch("https://api.anthropic.com/v1/models", {
+        method: "GET",
+        headers: {
+            "content-type": "application/json",
+            "x-api-key": apiKey,
+            "anthropic-version": "2023-06-01",
+        },
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Claude API error: ${response.status} ${text}`);
+    }
+    const data = await response.json();
+    const models = (data?.data || [])
+        .map((model) => model?.id)
+        .filter(Boolean);
+    return Array.from(new Set(models)).sort();
 }

package/src/providers/ollama.js CHANGED Viewed

@@ -1,49 +1,108 @@
 export async function callOllama({ system, user, model, host }) {
-  const response = await fetch(`${host}/api/chat`, {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      model,
-      format: "json",
-      stream: false,
-      options: {
-        temperature: 0.2,
-        num_predict: 128,
-      },
-      messages: [
-        { role: "system", content: system },
-        { role: "user", content: user },
-      ],
-    }),
-  });
-  if (!response.ok) {
-    const text = await response.text();
-    throw new Error(`Ollama API error: ${response.status} ${text}`);
-  }
-  const data = await response.json();
-  return data?.message?.content ?? data?.response ?? "";
+    const response = await fetch(`${host}/api/chat`, {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+        },
+        body: JSON.stringify({
+            model,
+            stream: false,
+            options: {
+                temperature: 0.1,
+                num_predict: 128,
+            },
+            messages: [
+                { role: "system", content: system },
+                { role: "user", content: user },
+            ],
+        }),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Ollama API error: ${response.status} ${text}`);
+    }
+    const data = await response.json();
+    return data?.message?.content ?? data?.response ?? "";
+}
+export async function streamOllama({ system, user, model, host, onToken }) {
+    const response = await fetch(`${host}/api/chat`, {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+        },
+        body: JSON.stringify({
+            model,
+            stream: true,
+            options: {
+                temperature: 0.1,
+                num_predict: 128,
+            },
+            messages: [
+                { role: "system", content: system },
+                { role: "user", content: user },
+            ],
+        }),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Ollama API error: ${response.status} ${text}`);
+    }
+    if (!response.body) {
+        throw new Error("Ollama API error: missing response body.");
+    }
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+    let full = "";
+    while (true) {
+        const { value, done } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() ?? "";
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed) continue;
+            try {
+                const payload = JSON.parse(trimmed);
+                const content = payload?.message?.content ?? payload?.response ?? "";
+                if (content) {
+                    full += content;
+                    onToken(content);
+                }
+            } catch {
+                continue;
+            }
+        }
+    }
+    return full;
 }
 export async function fetchOllamaModels(host) {
-  const response = await fetch(`${host}/api/tags`, {
-    method: "GET",
-    headers: {
-      "content-type": "application/json",
-    },
-  });
-  if (!response.ok) {
-    const text = await response.text();
-    throw new Error(`Ollama API error: ${response.status} ${text}`);
-  }
-  const data = await response.json();
-  const models = (data?.models || [])
-    .map((model) => model?.name)
-    .filter(Boolean);
-  return Array.from(new Set(models)).sort();
+    const response = await fetch(`${host}/api/tags`, {
+        method: "GET",
+        headers: {
+            "content-type": "application/json",
+        },
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Ollama API error: ${response.status} ${text}`);
+    }
+    const data = await response.json();
+    const models = (data?.models || [])
+        .map((model) => model?.name)
+        .filter(Boolean);
+    return Array.from(new Set(models)).sort();
 }

package/src/providers/openai.js CHANGED Viewed

@@ -1,33 +1,101 @@
 export async function callOpenAI({ system, user, model }) {
-  const apiKey = process.env.OPENAI_API_KEY || "";
-  if (!apiKey) {
-    throw new Error("Missing OPENAI_API_KEY for OpenAI provider.");
-  }
-  const response = await fetch("https://api.openai.com/v1/chat/completions", {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-      authorization: `Bearer ${apiKey}`,
-    },
-    body: JSON.stringify({
-      model,
-      temperature: 0.2,
-      max_tokens: 128,
-      response_format: { type: "json_object" },
-      messages: [
-        { role: "system", content: system },
-        { role: "user", content: user },
-      ],
-    }),
-  });
-  if (!response.ok) {
-    const text = await response.text();
-    throw new Error(`OpenAI API error: ${response.status} ${text}`);
-  }
-  const data = await response.json();
-  const content = data?.choices?.[0]?.message?.content ?? "";
-  return content;
+    const apiKey = process.env.OPENAI_API_KEY || "";
+    if (!apiKey) {
+        throw new Error("Missing OPENAI_API_KEY for OpenAI provider.");
+    }
+    const response = await fetch("https://api.openai.com/v1/chat/completions", {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+            authorization: `Bearer ${apiKey}`,
+        },
+        body: JSON.stringify({
+            model,
+            temperature: 0.2,
+            max_tokens: 256,
+            messages: [
+                { role: "system", content: system },
+                { role: "user", content: user },
+            ],
+        }),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`OpenAI API error: ${response.status} ${text}`);
+    }
+    const data = await response.json();
+    const content = data?.choices?.[0]?.message?.content ?? "";
+    return content;
+}
+export async function streamOpenAI({ system, user, model, onToken }) {
+    const apiKey = process.env.OPENAI_API_KEY || "";
+    if (!apiKey) {
+        throw new Error("Missing OPENAI_API_KEY for OpenAI provider.");
+    }
+    const response = await fetch("https://api.openai.com/v1/chat/completions", {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+            authorization: `Bearer ${apiKey}`,
+        },
+        body: JSON.stringify({
+            model,
+            temperature: 0.2,
+            max_tokens: 256,
+            stream: true,
+            messages: [
+                { role: "system", content: system },
+                { role: "user", content: user },
+            ],
+        }),
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`OpenAI API error: ${response.status} ${text}`);
+    }
+    if (!response.body) {
+        throw new Error("OpenAI API error: missing response body.");
+    }
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = "";
+    let full = "";
+    while (true) {
+        const { value, done } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() ?? "";
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed) continue;
+            if (trimmed === "data: [DONE]") {
+                break;
+            }
+            if (!trimmed.startsWith("data: ")) continue;
+            try {
+                const payload = JSON.parse(trimmed.slice(6));
+                const content = payload?.choices?.[0]?.delta?.content ?? "";
+                if (content) {
+                    full += content;
+                    onToken(content);
+                }
+            } catch {
+                continue;
+            }
+        }
+    }
+    return full;
 }