@riflo/ryte 1.1.3 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riflo/ryte",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "AI Git Workflow Assistant - Generate semantic commits and PRs",
   "main": "src/index.js",
   "bin": {

package/src/ai.js

@@ -1,28 +1,19 @@
-import dotenv from "dotenv";
-dotenv.config();
+import { getConfig } from "./config.js";
+import { getProviderConfig } from "./provider.js";
 
-export async function generateAIResponse(messages) {
-    const groqKey = process.env.GROQ_API_KEY;
-    const openAiKey = process.env.OPENAI_API_KEY;
+export async function generateAIResponse(messages, overrideConfig = null) {
+    const config = overrideConfig || getConfig();
 
-    if (!groqKey && !openAiKey) {
-        console.error("Error: Please set either GROQ_API_KEY (for free AI) or OPENAI_API_KEY in your environment variables.");
-        process.exit(1);
+    if (!config || !config.apiKey) {
+        throw new Error("API Key not found. Please run 'ryte config' or follow the setup flow.");
     }
 
-    const isGroq = !!groqKey;
-    const apiKey = isGroq ? groqKey : openAiKey;
+    const providerName = config.provider || "openai";
+    const pConfig = getProviderConfig(providerName, config.baseUrl);
 
-    // Groq API is 100% compatible with OpenAI's format! Just changing URL & Model.
-    const apiUrl = isGroq
-        ? "https://api.groq.com/openai/v1/chat/completions"
-        : "https://api.openai.com/v1/chat/completions";
-
-    // llama-3.1-8b-instant: 14,400 TPM (6x higher than llama-3.3-70b-versatile)
-    // Still very capable for commit messages and PR summaries
-    const model = isGroq
-        ? "llama-3.1-8b-instant"
-        : "gpt-4o-mini";
+    const apiUrl = pConfig.url;
+    const apiKey = config.apiKey;
+    const model = config.model || pConfig.model;
 
     const MAX_RETRIES = 3;
 
@@ -42,7 +33,6 @@ export async function generateAIResponse(messages) {
             });
 
             if (response.status === 429) {
-                // Rate limited — parse retry-after header or use exponential backoff
                 const retryAfter = parseInt(response.headers.get("retry-after") || "15", 10);
                 const waitSeconds = retryAfter + 1;
 
@@ -50,22 +40,67 @@ export async function generateAIResponse(messages) {
                     process.stdout.write(`\r\x1b[33m⚠ Rate limit hit. Waiting ${i}s before retry (${attempt}/${MAX_RETRIES})...\x1b[0m`);
                     await new Promise(r => setTimeout(r, 1000));
                 }
-                process.stdout.write("\r" + " ".repeat(80) + "\r"); // Clear the line
+                process.stdout.write("\r" + " ".repeat(80) + "\r");
                 continue;
             }
 
             if (!response.ok) {
-                const error = await response.json();
-                throw new Error(error.error?.message || "API request failed");
+                let errorData;
+                try {
+                    errorData = await response.json();
+                } catch (e) {
+                    throw new Error(`HTTP Error ${response.status}: ${response.statusText}`);
+                }
+                throw new Error(errorData.error?.message || `API request failed with status ${response.status}`);
             }
 
             const data = await response.json();
-            return data.choices[0].message.content.trim();
+            if (!data.choices || !data.choices[0] || !data.choices[0].message) {
+                throw new Error("Invalid response format from AI provider.");
+            }
+
+            const content = data.choices[0].message.content;
+            if (!content) {
+                throw new Error("AI provider returned an empty response.");
+            }
+
+            const trimmed = content.trim();
+
+            // Deterministic Internal Contract Prep
+            // Currently returns { text: string, structured: Object }
+            return parseAICommitMessage(trimmed);
         } catch (e) {
+            // Check for network errors (Offline)
+            if (e.code === 'ENOTFOUND' || e.code === 'EAI_AGAIN') {
+                throw new Error("Network unreachable. Please check your internet connection.");
+            }
+
             if (attempt === MAX_RETRIES) {
-                console.error("AI Generation failed:", e.message);
-                process.exit(1);
+                throw e;
             }
         }
     }
 }
+
+/**
+ * Parses a conventional commit message into a structured object.
+ * This is the 'Deterministic Contract' for the engine.
+ */
+function parseAICommitMessage(text) {
+    const lines = text.split("\n");
+    const header = lines[0].trim();
+
+    // Simple regex for conventional commit: type(scope): subject
+    const match = header.match(/^(\w+)(?:\(([^)]+)\))?:\s*(.+)$/);
+
+    return {
+        text: text, // The full raw text for legacy compatibility
+        structured: {
+            header: header,
+            type: match ? match[1] : "other",
+            scope: match ? match[2] : null,
+            subject: match ? match[3] : header,
+            body: lines.slice(1).filter(l => l.trim().length > 0).join("\n").trim() || null
+        }
+    };
+}

package/src/config.js

@@ -0,0 +1,45 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+
+const CONFIG_DIR = path.join(os.homedir(), ".ryte");
+const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+
+const DEFAULT_CONFIG = {
+    provider: "openai",
+    apiKey: "",
+    model: "gpt-4o-mini",
+    baseUrl: "" // Optional for local providers like OpenClaw/Ollama
+};
+
+export function getConfig() {
+    if (!fs.existsSync(CONFIG_FILE)) {
+        return null;
+    }
+    try {
+        const data = fs.readFileSync(CONFIG_FILE, "utf-8");
+        const parsed = JSON.parse(data);
+        // Ensure some basic structure integrity
+        if (typeof parsed !== "object" || parsed === null) throw new Error("Invalid config format");
+        return { ...DEFAULT_CONFIG, ...parsed };
+    } catch (e) {
+        console.warn(`\n\x1b[33m⚠ Warning: Configuration file is corrupted. Re-initializing...\x1b[0m`);
+        // If corrupted, return null so setupFlow triggers or we can fallback
+        return null;
+    }
+}
+
+export function setConfig(updates) {
+    if (!fs.existsSync(CONFIG_DIR)) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+    const current = getConfig() || DEFAULT_CONFIG;
+    const updated = { ...current, ...updates };
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify(updated, null, 2), { mode: 0o600 });
+    return updated;
+}
+
+export function hasValidConfig() {
+    const config = getConfig();
+    return !!(config && config.apiKey);
+}

package/src/index.js

@@ -6,12 +6,16 @@ import path from "path";
 import { getStagedDiff, getCurrentBranch, getBranchCommits, applyCommit } from "./git.js";
 import { generateAIResponse } from "./ai.js";
 import { COMMIT_SYSTEM_PROMPT, PR_SYSTEM_PROMPT } from "./prompt.js";
+import { getConfig, setConfig, hasValidConfig } from "./config.js";
+import { PROVIDERS } from "./provider.js";
 
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
 });
 
+const VERSION = "1.2.2";
+
 async function question(query) {
     return new Promise(resolve => rl.question(query, resolve));
 }
@@ -40,6 +44,43 @@ function editInteractively(initialText) {
     });
 }
 
+async function setupFlow() {
+    console.log("\n\x1b[36mWelcome to RYTE. Let's set up your Git Intelligence Layer.\x1b[0m");
+    console.log("------------------------------------------------------------");
+
+    console.log("\nSelect your LLM Provider:");
+    const providerList = Object.keys(PROVIDERS);
+    providerList.forEach((p, i) => console.log(`${i + 1}) ${p.charAt(0).toUpperCase() + p.slice(1)}`));
+
+    const choice = await question(`\nChoose [1-${providerList.length}]: `);
+    const providerKey = providerList[parseInt(choice) - 1] || "openai";
+
+    const apiKey = await question(`Paste your ${providerKey.toUpperCase()} API Key: `);
+    if (!apiKey) {
+        console.error("Error: API Key is required.");
+        process.exit(1);
+    }
+
+    setConfig({
+        provider: providerKey,
+        apiKey: apiKey,
+        model: PROVIDERS[providerKey].defaultModel
+    });
+
+    console.log("\n\x1b[32m✔ Configuration saved to ~/.ryte/config.json\x1b[0m");
+}
+
+async function handleConfig() {
+    const config = getConfig() || {};
+    console.log("\n\x1b[36mCurrent Configuration:\x1b[0m");
+    console.log(JSON.stringify(config, null, 2));
+
+    const choice = await question("\nWould you like to reset configuration? [y/N]: ");
+    if (choice.toLowerCase() === "y") {
+        await setupFlow();
+    }
+}
+
 async function interactiveLoop(initialResult, type) {
     let currentResult = initialResult;
 
@@ -72,25 +113,34 @@ async function interactiveLoop(initialResult, type) {
 async function handleCommit() {
     const diff = getStagedDiff();
     if (!diff) {
-        console.log("No staged changes found. Use `git add` to stage files.");
+        console.log("\n\x1b[33m⚠ No staged changes found.\x1b[0m");
+        console.log("Use \x1b[32m`git add` \x1b[0m to stage files before committing.");
         process.exit(0);
     }
 
     const branch = getCurrentBranch();
 
     while (true) {
-        console.log("\nAnalyzing staged diff...");
-        const result = await generateAIResponse([
-            { role: "system", content: COMMIT_SYSTEM_PROMPT },
-            { role: "user", content: `Branch: ${branch}\n\nDiff:\n${diff}` }
-        ]);
-
-        const finalAction = await interactiveLoop(result, "Commit Message");
-
-        if (finalAction !== "REGENERATE") {
-            applyCommit(finalAction);
-            console.log("\n\x1b[32m✔ Commit applied successfully!\x1b[0m");
-            break;
+        try {
+            console.log("\nAnalyzing staged diff...");
+            const result = await generateAIResponse([
+                { role: "system", content: COMMIT_SYSTEM_PROMPT },
+                { role: "user", content: `Branch: ${branch}\n\nDiff:\n${diff}` }
+            ]);
+
+            const finalAction = await interactiveLoop(result.text, "Commit Message");
+
+            if (finalAction !== "REGENERATE") {
+                applyCommit(finalAction);
+                console.log("\n\x1b[32m✔ Commit applied successfully!\x1b[0m");
+                break;
+            }
+        } catch (e) {
+            console.error(`\n\x1b[31m✖ AI Generation failed:\x1b[0m ${e.message}`);
+            const retry = await question("\nWould you like to try again? [y/N]: ");
+            if (retry.toLowerCase() !== "y") {
+                process.exit(1);
+            }
         }
     }
 }
@@ -98,25 +148,34 @@ async function handleCommit() {
 async function handlePR() {
     const commits = getBranchCommits();
     if (!commits) {
-        console.log("No recent commits found distinct from main branch.");
+        console.log("\n\x1b[33m⚠ No recent commits found.\x1b[0m");
+        console.log("Ensure you have committed changes that are distinct from your main branch.");
         process.exit(0);
     }
     const branch = getCurrentBranch();
 
     while (true) {
-        console.log("\nAnalyzing recent commits...");
-        const result = await generateAIResponse([
-            { role: "system", content: PR_SYSTEM_PROMPT },
-            { role: "user", content: `Branch: ${branch}\n\nCommits:\n${commits}` }
-        ]);
-
-        const finalAction = await interactiveLoop(result, "PR Markdown Description");
-
-        if (finalAction !== "REGENERATE") {
-            console.log("\n\x1b[32mFinal PR Content:\x1b[0m\n");
-            console.log(finalAction);
-            console.log("\n(You can copy-paste the above into your pull request or we can pipe it to the clipboard later)");
-            break;
+        try {
+            console.log("\nAnalyzing recent commits...");
+            const result = await generateAIResponse([
+                { role: "system", content: PR_SYSTEM_PROMPT },
+                { role: "user", content: `Branch: ${branch}\n\nCommits:\n${commits}` }
+            ]);
+
+            const finalAction = await interactiveLoop(result.text, "PR Markdown Description");
+
+            if (finalAction !== "REGENERATE") {
+                console.log("\n\x1b[32mFinal PR Content:\x1b[0m\n");
+                console.log(finalAction);
+                console.log("\n(You can copy-paste the above into your pull request)");
+                break;
+            }
+        } catch (e) {
+            console.error(`\n\x1b[31m✖ AI Generation failed:\x1b[0m ${e.message}`);
+            const retry = await question("\nWould you like to try again? [y/N]: ");
+            if (retry.toLowerCase() !== "y") {
+                process.exit(1);
+            }
         }
     }
 }
@@ -125,12 +184,19 @@ async function main() {
     const args = process.argv.slice(2);
     const cmd = args[0]?.toLowerCase();
 
-    if (cmd === "c" || cmd === "commit") {
-        await handleCommit();
-    } else if (cmd === "pr") {
-        await handlePR();
-    } else {
-        console.log(`
+    try {
+        if (!hasValidConfig()) {
+            await setupFlow();
+        }
+
+        if (cmd === "c" || cmd === "commit") {
+            await handleCommit();
+        } else if (cmd === "pr") {
+            await handlePR();
+        } else if (cmd === "config") {
+            await handleConfig();
+        } else {
+            console.log(`
   \x1b[1;38;5;39m██████╗ \x1b[1;38;5;63m██╗   ██╗\x1b[1;38;5;129m████████╗\x1b[1;38;5;161m███████╗\x1b[0m
   \x1b[1;38;5;39m██╔══██╗\x1b[1;38;5;63m╚██╗ ██╔╝\x1b[1;38;5;129m╚══██╔══╝\x1b[1;38;5;161m██╔════╝\x1b[0m
   \x1b[1;38;5;39m██████╔╝\x1b[1;38;5;63m ╚████╔╝ \x1b[1;38;5;129m   ██║   \x1b[1;38;5;161m█████╗  \x1b[0m
@@ -139,17 +205,21 @@ async function main() {
   \x1b[1;38;5;39m╚═╝  ╚═╝\x1b[1;38;5;63m   ╚═╝   \x1b[1;38;5;129m   ╚═╝   \x1b[1;38;5;161m╚══════╝\x1b[0m
   
   \x1b[1;38;5;46m[ THE AI-POWERED GIT INFRASTRUCTURE ]\x1b[0m
-  \x1b[90mv1.1.3 | by Riflo\x1b[0m
+  \x1b[90mv${VERSION} | by Riflo\x1b[0m
 
   \x1b[33mCOMMANDS:\x1b[0m
-  \x1b[32mryte c\x1b[0m     Generate semantic commit from diff
-  \x1b[32mryte pr\x1b[0m    Generate PR markdown from branch commits
-
-  \x1b[33mGETTING STARTED:\x1b[0m
-  Set either environment variable to unleash the AI:
-  • \x1b[36mGROQ_API_KEY\x1b[0m   (Recommended / Free tier)
-  • \x1b[36mOPENAI_API_KEY\x1b[0m (OpenAI API key)
-        `);
+  \x1b[32mryte c\x1b[0m      Generate semantic commit from diff
+  \x1b[32mryte pr\x1b[0m     Generate PR markdown from branch commits
+  \x1b[32mryte config\x1b[0m Generate or edit your local configuration
+
+  \x1b[33mONBOARDING:\x1b[0m
+  No .env required. Run \x1b[32mryte config\x1b[0m or just run \x1b[32mryte c\x1b[0m to 
+  start the interactive setup.
+            `);
+        }
+    } catch (e) {
+        console.error(`\n\x1b[31m✖ Unexpected Error:\x1b[0m ${e.message}`);
+        process.exit(1);
     }
 
     rl.close();

package/src/prompt.js

@@ -2,25 +2,33 @@ export const COMMIT_SYSTEM_PROMPT = `
 You are an expert developer assistant specialized in Git workflows and the Conventional Commits specification.
 Your goal is to generate a concise, meaningful, and technically accurate commit message based on provided git diffs.
 
+PRIORITY:
+1. LOGIC OVER METADATA: If the diff contains both code changes (src/, lib/) and metadata changes (package.json version, README typos), the commit message MUST focus on the code logic. 
+2. SUBSTANCE: Avoid subjects like "bump version" or "update files" if there is meaningful logic change. Focus on the "What" and "Why" of the code evolution.
+
 RULES:
-1. OUTPUT ONLY THE COMMIT MESSAGE. No markdown, no "Here is your commit", no backticks.
+1. OUTPUT ONLY THE COMMIT MESSAGE. No markdown, no filler.
 2. Follow Conventional Commits: <type>(<scope>): <subject>
-3. Use types: feat (new feature), fix (bug fix), docs (documentation), style (formatting), refactor (code cleanup), perf (performance), test (adding tests), chore (maintenance).
+3. Use types: 
+   - feat: new capability or significant hardening/stabilization.
+   - fix: bug fixes.
+   - refactor: code restructuring without changing behavior.
+   - docs: documentation only.
+   - chore: maintenance, version bumps (only if NO logic changed).
 4. Subject line:
-   - Use imperative mood ("add", not "adds" or "added").
-   - Max 50 characters.
-   - Do not end with a period.
-   - Focus on the "why" or the core "what", not every trivial change.
-5. Breaking Changes: If the diff shows breaking changes, use "!" after the type (e.g., "feat!: delete deprecated api").
-6. Scope: If the diff is localized, infer a scope (e.g., "auth", "ui", "config").
-7. Body (Optional): If the change is complex, add a brief body after 1 blank line to explain technical nuances.
-8. Context: If a branch name or ticket is provided, incorporate it into the scope or footer if applicable.
-9. Anti-Hallucination: Documentation files (like README.md) often contain example commit messages (e.g., "feat(auth): ..."). DO NOT assume these examples are the topic of the current change.
-10. Logical Validation: Your suggested <scope> must be derived from actual modified logic in the diff, not from text inside code blocks, comments, or examples within a documentation file.
-11. If only README.md or docs are changed, the type MUST be "docs" and the scope should relate to the documentation structure (e.g., "readme", "config", "intro"), NOT the example code inside it.
+   - Use imperative mood ("add", "implement", "harden").
+   - Max 50 characters. No period.
+   - Focus on the technical achievement.
+5. Breaking Changes: Use "!" if behavior changes significantly (e.g., "feat!: ...").
+6. Scope: Infer from affected module (e.g., "config", "ai", "core").
+7. Body: Use bullet points for complex multi-file changes to explain "Why" and nuances.
 
 Example:
-feat(ui): add loading state to checkout button
+feat(core): harden config recovery and ai response validation
+
+- Implement auto-healing for corrupted config.json
+- Add defensive network error handling in ai.js
+- Standardize internal engine response contract
 `;
 
 export const PR_SYSTEM_PROMPT = `

package/src/provider.js

@@ -0,0 +1,31 @@
+export const PROVIDERS = {
+    openai: {
+        baseUrl: "https://api.openai.com/v1/chat/completions",
+        defaultModel: "gpt-4o-mini",
+        authHeader: (key) => `Bearer ${key}`
+    },
+    groq: {
+        baseUrl: "https://api.groq.com/openai/v1/chat/completions",
+        defaultModel: "llama-3.1-8b-instant",
+        authHeader: (key) => `Bearer ${key}`
+    },
+    openrouter: {
+        baseUrl: "https://openrouter.ai/api/v1/chat/completions",
+        defaultModel: "google/gemini-pro-1.5-exp",
+        authHeader: (key) => `Bearer ${key}`
+    },
+    local: {
+        baseUrl: "http://localhost:11434/v1/chat/completions", // Default Ollama/OpenClaw local port
+        defaultModel: "llama3",
+        authHeader: (key) => `Bearer ${key}`
+    }
+};
+
+export function getProviderConfig(name, customBaseUrl = "") {
+    const p = PROVIDERS[name] || PROVIDERS.openai;
+    return {
+        url: customBaseUrl || p.baseUrl,
+        model: p.defaultModel,
+        auth: p.authHeader
+    };
+}