@alhisan/gac 1.1.0 → 1.1.1

package/.github/workflows/npm-publish.yml

@@ -1,11 +1,9 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
 name: Publish Package to npmjs
 
 on:
   release:
-    types: [created]
+    # This triggers when you click 'Publish Release' in the GitHub UI
+    types: [published] 
 
 jobs:
   build:
@@ -21,13 +19,17 @@ jobs:
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
+    # CRITICAL: These permissions are required for --provenance to work
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          registry-url: https://registry.npmjs.org/
+          registry-url: https://registry.npmjs.org
       - run: npm ci
       - run: npm publish --provenance --access public
         env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/README.md

@@ -29,6 +29,7 @@ Single prompt:
 
 ```bash
 gac -a "Hello gpt4all, how are you doing today?"
+gac "How do I push to GitHub?"
 gac suggest "How do I connect to ssh server on a custom port 5322?"
 gac explain "How do I use rsync?"
 gac suggest -d "Give me step-by-step instructions to set up an SSH server on port 5322"
@@ -86,6 +87,8 @@ gac config set detailedSuggest true
 - `temperature` (number)
 - `maxTokens` (number)
 - `stream` (boolean)
+- `requestTimeoutMs` (number): request timeout in milliseconds (0 to disable). Useful for larger models or slower servers.
+- `defaultAction` (string): default mode for direct prompts (`suggest`, `ask`, or `explain`).
 - `detailedSuggest` (boolean): when `true`, `suggest` mode returns more detailed, step-by-step suggestions.
 - `renderMarkdown` (boolean)
 
@@ -146,7 +149,7 @@ curl http://[SERVER_ADDRESS]:[SERVER_PORT]/v1/models
 For Ollama:
 
 ```bash
-curl http://localhost:11434/api/tags
+curl http://[SERVER_ADDRESS]:[SERVER_PORT]/api/tags
 ```
 
 ## License

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alhisan/gac",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Terminal client for GPT4All running on localhost",
   "license": "GPL-3.0-only",
   "type": "module",
@@ -10,7 +10,14 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "scripts": {
+    "test": "echo \"No tests yet\""
+  },
   "dependencies": {
     "terminal-kit": "^3.1.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kwmx/gac"
   }
 }

package/src/cli.js

@@ -2,6 +2,7 @@ import terminalKit from "terminal-kit";
 import { chatCompletion, listModels } from "./gpt4all.js";
 import { getConfigPath, loadConfig, setConfigValue } from "./config.js";
 import { createMarkdownRenderer } from "./markdown.js";
+import fs from "fs";
 import os from "os";
 import process from "process";
 const { terminal: term } = terminalKit;
@@ -39,6 +40,33 @@ function printHelp() {
   term(`  gac --debug-render -a "Show rendered and raw output"\n`);
   term(`\n`);
 }
+function parseOsRelease(contents) {
+  const result = {};
+  const lines = contents.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#") || !trimmed.includes("=")) continue;
+    const [key, ...rest] = trimmed.split("=");
+    let value = rest.join("=").trim();
+    if (value.startsWith('"') && value.endsWith('"')) {
+      value = value.slice(1, -1);
+    }
+    if (value) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
+function readLinuxOsRelease() {
+  try {
+    const contents = fs.readFileSync("/etc/os-release", "utf8");
+    return parseOsRelease(contents);
+  } catch (err) {
+    return null;
+  }
+}
+
 function getOSVersion() {
   const platform = os.platform();
   if (platform === "win32") {
@@ -65,7 +93,14 @@ function getOSVersion() {
     return "macOS";
   }
   if (platform === "linux") {
-    // Find which distro
+    const osRelease = readLinuxOsRelease();
+    if (osRelease && (osRelease.PRETTY_NAME || osRelease.NAME)) {
+      const pretty = osRelease.PRETTY_NAME || osRelease.NAME;
+      const id = osRelease.ID ? `; id=${osRelease.ID}` : "";
+      const idLike = osRelease.ID_LIKE ? `; id_like=${osRelease.ID_LIKE}` : "";
+      return `Linux (${pretty}${id}${idLike})`;
+    }
+    // Find which distro (fallbacks)
     if (process.env.OS_RELEASE) {
       return `${platform}: ${process.env.OS_RELEASE}`;
     } else if (process.env.OS) {
@@ -88,24 +123,33 @@ function getOSVersion() {
 }
 function buildSystemPrompt(mode, config) {
   const osInfo = getOSVersion();
+  const osGuidance = `The user is using a system with the following OS: ${osInfo}. When providing commands or package install steps, use the native tooling for that OS (e.g., dnf for Fedora, apt for Debian/Ubuntu). Avoid giving instructions for other distros unless explicitly requested.`;
 
   if (mode === "suggest") {
     if (config.detailedSuggest === true) {
-      return `You are an expert technical assistant. The user is using a system with the following OS: ${osInfo}. When providing suggestions, give detailed, step-by-step instructions that the user can follow to achieve their goals. Include relevant commands, code snippets, or configurations as needed. Avoid unnecessary explanations or background information. Tailor your suggestions to be relevant to the user's operating system and environment.
+      return `You are an expert technical assistant. ${osGuidance} When providing suggestions, give detailed, step-by-step instructions that the user can follow to achieve their goals. Include relevant commands, code snippets, or configurations as needed. Avoid unnecessary explanations or background information. Tailor your suggestions to be relevant to the user's operating system and environment.
 Attempt to make it a single line response where possible. Prefer commands and code snippets over lengthy explanations. Always leave commands and codes in their own line for easy copying.`;
     } else {
-      return `You are an expert technical assistant. The user is using a system with the following OS: ${osInfo}. Provide concise and practical suggestions to help the user accomplish their tasks efficiently. Focus on clarity and brevity, ensuring that your suggestions are easy to understand and implement. Tailor your suggestions to be relevant to the user's operating system and environment. Avoid lengthy explanations or unnecessary details prefer single line commands or codes if you must include explainations make sure the commands and codes are in their own line for easy copying.`;
+      return `You are an expert technical assistant. ${osGuidance} Provide concise and practical suggestions to help the user accomplish their tasks efficiently. Focus on clarity and brevity, ensuring that your suggestions are easy to understand and implement. Tailor your suggestions to be relevant to the user's operating system and environment. Avoid lengthy explanations or unnecessary details prefer single line commands or codes if you must include explainations make sure the commands and codes are in their own line for easy copying.`;
     }
   }
   if (mode === "ask") {
-    return "Provide a helpful and accurate response to the user's question.";
+    return `Provide a helpful and accurate response to the user's question. ${osGuidance}`;
   }
   if (mode === "explain") {
-    return "Explain step-by-step with a short example if helpful.";
+    return `Explain step-by-step with a short example if helpful. ${osGuidance}`;
   }
   return null;
 }
 
+function normalizeDefaultAction(action) {
+  const normalized = String(action || "").trim().toLowerCase();
+  if (normalized === "ask" || normalized === "suggest" || normalized === "explain") {
+    return normalized;
+  }
+  return "suggest";
+}
+
 async function runSinglePrompt(mode, prompt, config) {
   const system = buildSystemPrompt(mode, config);
   const messages = [];
@@ -121,6 +165,11 @@ async function runSinglePrompt(mode, prompt, config) {
       term(`${reply}\n`);
     }
   }
+  if (!reply || !reply.trim()) {
+    term(
+      "No response from the model. The request may have timed out or returned empty content. Consider increasing requestTimeoutMs in the config or enabling streaming.\n"
+    );
+  }
   if (config.debugRender) {
     term(`\n--- RAW ---\n${reply}\n`);
   }
@@ -220,6 +269,8 @@ async function runConfigTui(config) {
       `Temperature: ${formatConfigValue(updatedConfig.temperature)}`,
       `Max Tokens: ${formatConfigValue(updatedConfig.maxTokens)}`,
       `Stream: ${formatConfigValue(updatedConfig.stream)}`,
+      `Request Timeout (ms): ${formatConfigValue(updatedConfig.requestTimeoutMs)}`,
+      `Default Action: ${formatConfigValue(updatedConfig.defaultAction)}`,
       `Render Markdown: ${formatConfigValue(updatedConfig.renderMarkdown)}`,
       `Debug Render: ${formatConfigValue(updatedConfig.debugRender)}`,
       `Detailed Suggest: ${formatConfigValue(updatedConfig.detailedSuggest)}`,
@@ -320,6 +371,30 @@ async function runConfigTui(config) {
     }
 
     if (selection === 8) {
+      const value = await promptConfigValue(
+        "Request timeout in ms (0 to disable)",
+        updatedConfig.requestTimeoutMs
+      );
+      if (value !== null) {
+        setConfigValue("requestTimeoutMs", value);
+        updatedConfig.requestTimeoutMs = value;
+      }
+      continue;
+    }
+
+    if (selection === 9) {
+      const value = await promptConfigValue(
+        "Default action (suggest/ask/explain)",
+        updatedConfig.defaultAction
+      );
+      if (value !== null) {
+        setConfigValue("defaultAction", value);
+        updatedConfig.defaultAction = value;
+      }
+      continue;
+    }
+
+    if (selection === 10) {
       const value = await promptConfigValue(
         "Render Markdown (true/false)",
         updatedConfig.renderMarkdown
@@ -331,7 +406,7 @@ async function runConfigTui(config) {
       continue;
     }
 
-    if (selection === 9) {
+    if (selection === 11) {
       const value = await promptConfigValue("Debug Render (true/false)", updatedConfig.debugRender);
       if (value !== null) {
         setConfigValue("debugRender", value);
@@ -340,7 +415,7 @@ async function runConfigTui(config) {
       continue;
     }
 
-    if (selection === 10) {
+    if (selection === 12) {
       const value = await promptConfigValue(
         "Detailed Suggest (true/false)",
         updatedConfig.detailedSuggest
@@ -352,7 +427,7 @@ async function runConfigTui(config) {
       continue;
     }
 
-    if (selection === 11) {
+    if (selection === 13) {
       cleanup();
       term("Configuration saved.\n");
       break;
@@ -400,6 +475,11 @@ async function runChat(config) {
     if (config.debugRender) {
       term(`\n--- RAW ---\n${reply}\n`);
     }
+    if (!reply || !reply.trim()) {
+      term(
+        "\nNo response from the model. The request may have timed out or returned empty content. Consider increasing requestTimeoutMs in the config or enabling streaming."
+      );
+    }
     term("\n\n");
     messages.push({ role: "assistant", content: reply });
   }
@@ -550,6 +630,17 @@ export async function runCli(argv) {
     return;
   }
 
+  if (!args[0].startsWith("-")) {
+    const prompt = args.join(" ").trim();
+    if (!prompt) {
+      term("Error: missing prompt.\n");
+      term.processExit(1);
+    }
+    const defaultAction = normalizeDefaultAction(config.defaultAction);
+    await runSinglePrompt(defaultAction, prompt, config);
+    return;
+  }
+
   term("Unknown command.\n\n");
   printHelp();
 }

package/src/config.js

@@ -11,6 +11,8 @@ const DEFAULT_CONFIG = {
   temperature: 0.7,
   maxTokens: 512,
   stream: true,
+  requestTimeoutMs: 300000,
+  defaultAction: "suggest",
   renderMarkdown: true,
   debugRender: false,
   detailedSuggest: false,

package/src/gpt4all.js

@@ -41,12 +41,27 @@ function buildOpenAiHeaders(apiKey) {
   return headers;
 }
 
+function createTimeoutController(timeoutMs) {
+  if (!timeoutMs || Number.isNaN(timeoutMs) || timeoutMs <= 0) {
+    return null;
+  }
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+  return { controller, timeoutId };
+}
+
 async function parseStream(response, onToken, renderer) {
   const reader = response.body.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
   let fullText = "";
   let lineBuffer = "";
+  const flushLineBuffer = () => {
+    if (renderer && lineBuffer) {
+      onToken(renderer.renderLine(lineBuffer));
+      lineBuffer = "";
+    }
+  };
 
   while (true) {
     const { value, done } = await reader.read();
@@ -61,6 +76,7 @@ async function parseStream(response, onToken, renderer) {
       if (!trimmed || !trimmed.startsWith("data:")) continue;
       const payload = trimmed.replace(/^data:\s*/, "");
       if (payload === "[DONE]") {
+        flushLineBuffer();
         return fullText;
       }
 
@@ -99,6 +115,12 @@ async function parseOllamaStream(response, onToken, renderer) {
   let buffer = "";
   let fullText = "";
   let lineBuffer = "";
+  const flushLineBuffer = () => {
+    if (renderer && lineBuffer) {
+      onToken(renderer.renderLine(lineBuffer));
+      lineBuffer = "";
+    }
+  };
 
   while (true) {
     const { value, done } = await reader.read();
@@ -114,6 +136,7 @@ async function parseOllamaStream(response, onToken, renderer) {
       try {
         const json = JSON.parse(trimmed);
         if (json.done) {
+          flushLineBuffer();
           return fullText;
         }
         const delta = getOllamaContentDelta(json);
@@ -143,9 +166,13 @@ async function parseOllamaStream(response, onToken, renderer) {
   return fullText;
 }
 
-async function fetchJson(url, payload, errorLabel) {
+async function fetchJson(url, payload, errorLabel, timeoutMs) {
+  const timeout = createTimeoutController(timeoutMs);
   try {
-    const response = await fetch(url, payload);
+    const response = await fetch(url, {
+      ...payload,
+      signal: timeout ? timeout.controller.signal : undefined,
+    });
     if (!response.ok) {
       const text = await response.text();
       throw new Error(`${errorLabel} error ${response.status}: ${text}`);
@@ -155,19 +182,39 @@ async function fetchJson(url, payload, errorLabel) {
     if (err.message && err.message.startsWith(`${errorLabel} error`)) {
       throw err;
     }
+    if (err.name === "AbortError") {
+      throw new Error(
+        `${errorLabel} request timed out after ${timeoutMs}ms. Increase requestTimeoutMs in config if needed.`
+      );
+    }
     throw new Error(`Failed to connect to ${url}. (${err.message})`);
+  } finally {
+    if (timeout) {
+      clearTimeout(timeout.timeoutId);
+    }
   }
 }
 
-async function fetchCompletion(url, payload, headers, errorLabel) {
+async function fetchCompletion(url, payload, headers, errorLabel, timeoutMs) {
+  const timeout = createTimeoutController(timeoutMs);
   try {
     return await fetch(url, {
       method: "POST",
       headers,
       body: JSON.stringify(payload),
+      signal: timeout ? timeout.controller.signal : undefined,
     });
   } catch (err) {
+    if (err.name === "AbortError") {
+      throw new Error(
+        `${errorLabel} request timed out after ${timeoutMs}ms. Increase requestTimeoutMs in config if needed.`
+      );
+    }
     throw new Error(`Failed to connect to ${url}. (${err.message})`);
+  } finally {
+    if (timeout) {
+      clearTimeout(timeout.timeoutId);
+    }
   }
 }
 
@@ -178,23 +225,25 @@ async function handleError(response, errorLabel) {
 
 export async function listModels(config) {
   const provider = getProvider(config);
+  const timeoutMs = Number(config.requestTimeoutMs);
   if (provider === "ollama") {
     const baseUrl = normalizeOllamaBaseUrl(config.ollamaBaseUrl);
     const url = `${baseUrl}/api/tags`;
-    const json = await fetchJson(url, { method: "GET" }, "Ollama");
+    const json = await fetchJson(url, { method: "GET" }, "Ollama", timeoutMs);
     if (!json || !Array.isArray(json.models)) return [];
     return json.models.map((model) => model.name).filter(Boolean);
   }
 
   const url = `${normalizeOpenAiBaseUrl(config.baseUrl)}/models`;
   const headers = buildOpenAiHeaders(config.apiKey);
-  const json = await fetchJson(url, { method: "GET", headers }, "OpenAI");
+  const json = await fetchJson(url, { method: "GET", headers }, "OpenAI", timeoutMs);
   if (!json || !Array.isArray(json.data)) return [];
   return json.data.map((model) => model.id).filter(Boolean);
 }
 
 async function openAiChatCompletion(config, messages) {
   const url = `${normalizeOpenAiBaseUrl(config.baseUrl)}/chat/completions`;
+  const timeoutMs = Number(config.requestTimeoutMs);
   const payload = {
     model: config.model,
     messages,
@@ -204,7 +253,7 @@ async function openAiChatCompletion(config, messages) {
   };
 
   const headers = buildOpenAiHeaders(config.apiKey);
-  let response = await fetchCompletion(url, payload, headers, "OpenAI");
+  let response = await fetchCompletion(url, payload, headers, "OpenAI", timeoutMs);
 
   const renderer = config.renderMarkdown
     ? createMarkdownRenderer(config.markdownStyles)
@@ -219,7 +268,7 @@ async function openAiChatCompletion(config, messages) {
       text.includes("not supported")
     ) {
       const retryPayload = { ...payload, stream: false };
-      response = await fetchCompletion(url, retryPayload, headers, "OpenAI");
+      response = await fetchCompletion(url, retryPayload, headers, "OpenAI", timeoutMs);
       if (!response.ok) {
         await handleError(response, "OpenAI");
       }
@@ -258,6 +307,7 @@ async function openAiChatCompletion(config, messages) {
 async function ollamaChatCompletion(config, messages) {
   const baseUrl = normalizeOllamaBaseUrl(config.ollamaBaseUrl);
   const url = `${baseUrl}/api/chat`;
+  const timeoutMs = Number(config.requestTimeoutMs);
   const payload = {
     model: config.model,
     messages,
@@ -275,7 +325,8 @@ async function ollamaChatCompletion(config, messages) {
     url,
     payload,
     { "Content-Type": "application/json" },
-    "Ollama"
+    "Ollama",
+    timeoutMs
   );
 
   if (!response.ok) {