jawere 1.6.1 → 1.7.0

package/dist/index.js

@@ -14387,6 +14387,25 @@ async function decrypt(encoded) {
   }
 }
 var KEY_FILE = join(homedir(), ".jawere", "key.enc");
+var CONFIG_FILE = join(homedir(), ".jawere", "config.json");
+async function saveConfig(config) {
+  const dir = join(homedir(), ".jawere");
+  await mkdir2(dir, { recursive: true });
+  await writeFile2(CONFIG_FILE, JSON.stringify(config, null, 2), "utf-8");
+  try {
+    await chmod(CONFIG_FILE, 384);
+  } catch {
+  }
+}
+async function loadSavedConfig() {
+  try {
+    await access2(CONFIG_FILE, constants2.R_OK);
+    const raw = await readFile2(CONFIG_FILE, "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
 async function saveKey(apiKey) {
   const dir = join(homedir(), ".jawere");
   await mkdir2(dir, { recursive: true });
@@ -14410,16 +14429,13 @@ async function loadKey() {
     return null;
   }
 }
-async function hasKey() {
-  try {
-    await access2(KEY_FILE, constants2.R_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
 
 // src/config.ts
+var PROVIDER_DEFAULTS = {
+  deepseek: { baseURL: "https://api.deepseek.com/v1", model: "deepseek-v4-pro" },
+  openai: { baseURL: "https://api.openai.com/v1", model: "gpt-4o" },
+  custom: { baseURL: "https://api.openai.com/v1", model: "gpt-4o" }
+};
 function isDevMode() {
   if (process.env.NODE_ENV === "production") return false;
   if (process.env.NODE_ENV === "development") return true;
@@ -14441,12 +14457,26 @@ async function loadConfig() {
     keyFromFile = true;
   } else if (process.env.DEEPSEEK_API_KEY) {
     apiKey = process.env.DEEPSEEK_API_KEY;
+  } else if (process.env.OPENAI_API_KEY) {
+    apiKey = process.env.OPENAI_API_KEY;
+  } else if (process.env.AI_API_KEY) {
+    apiKey = process.env.AI_API_KEY;
+  }
+  let savedConfig = null;
+  try {
+    savedConfig = await loadSavedConfig();
+  } catch {
   }
+  const provider = process.env.AI_PROVIDER || savedConfig?.provider || "deepseek";
+  const defaults2 = PROVIDER_DEFAULTS[provider] || PROVIDER_DEFAULTS.deepseek;
+  const baseURL = process.env.AI_BASE_URL || savedConfig?.baseURL || defaults2.baseURL;
+  const model = process.env.AI_MODEL || savedConfig?.model || defaults2.model;
   const isDev = isDevMode();
   cachedConfig = {
-    baseURL: "https://api.deepseek.com/v1",
+    baseURL,
     apiKey,
-    model: process.env.DEEPSEEK_MODEL || "deepseek-v4-pro",
+    model,
+    provider,
     workDir: process.env.WORK_DIR || process.cwd(),
     keyFromFile,
     isDev
@@ -14865,7 +14895,7 @@ async function runAgent(userMessage, options = {}) {
   const config = await loadConfig();
   if (!config.apiKey) {
     throw new Error(
-      "No API key configured. Run with --setup to save your DeepSeek API key, or set DEEPSEEK_API_KEY env var."
+      'No API key configured. Run "jawere --setup" to configure your AI provider and key, or set AI_API_KEY env var.'
     );
   }
   const client = new openai_default({
@@ -15708,6 +15738,7 @@ function createPrompt() {
 // src/index.ts
 var G_GREEN = "\x1B[38;2;184;187;3m";
 var G_GRAY2 = "\x1B[38;2;146;131;116m";
+var G_AQUA = "\x1B[38;2;142;192;124m";
 var R3 = "\x1B[0m";
 function center(text, width) {
   const visible = text.replace(/\x1b\[[0-9;]*m/g, "");
@@ -15718,7 +15749,7 @@ function printBanner(config) {
   const cols = process.stdout.columns || 60;
   const sep = G_GRAY2 + "\u2500".repeat(Math.min(cols - 2, 50)) + R3;
   console.log("");
-  console.log(center(`${G_GRAY2}${config.model}${R3}  ${G_GRAY2}${config.isDev ? "dev" : "prod"}${R3}`, cols));
+  console.log(center(`${G_GRAY2}${config.provider} / ${config.model}${R3}  ${G_GRAY2}${config.isDev ? "dev" : "prod"}${R3}`, cols));
   console.log(center(sep, cols));
   console.log("");
 }
@@ -15728,29 +15759,69 @@ ${G_GREEN}Commands:${R3}
   ${G_GRAY2}/help${R3}          Show this help
 
   ${G_GRAY2}/key${R3}           Show API key status
-  ${G_GRAY2}/setup${R3}         Re-enter API key
+  ${G_GRAY2}/setup${R3}         Re-configure AI provider & key
   ${G_GRAY2}/clear${R3}         Clear screen & start fresh session
   ${G_GRAY2}/exit${R3}, ${G_GRAY2}/quit${R3}   Quit
+
+${G_GREEN}CLI flags:${R3}
+  ${G_GRAY2}--setup${R3}        Run setup wizard (provider, key, model)
 `);
 }
 async function setupKey() {
   const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
-  console.log("\nEnter your DeepSeek API key (starts with sk-):");
-  const key = await new Promise((resolve4) => {
-    rl.question("API Key: ", (answer) => {
+  const ask = (q2) => new Promise((resolve4) => rl.question(q2, (a2) => resolve4(a2.trim())));
+  console.log("");
+  console.log(`${G_GREEN}\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557${R3}`);
+  console.log(`${G_GREEN}\u2551   jawere \u2014 Setup                         \u2551${R3}`);
+  console.log(`${G_GREEN}\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D${R3}`);
+  console.log("");
+  console.log("Select AI provider:");
+  console.log(`  ${G_AQUA}1.${R3} DeepSeek`);
+  console.log(`  ${G_AQUA}2.${R3} OpenAI`);
+  console.log(`  ${G_AQUA}3.${R3} Custom (enter base URL)`);
+  console.log("");
+  const choice = await ask(`Choice [1]: `) || "1";
+  let provider = "deepseek";
+  let baseURL;
+  let defaultModel;
+  if (choice === "2") {
+    provider = "openai";
+    defaultModel = "gpt-4o";
+  } else if (choice === "3") {
+    provider = "custom";
+    console.log("");
+    baseURL = await ask("Base URL (e.g. https://api.openai.com/v1): ");
+    if (!baseURL) {
+      console.log("No URL entered. Aborting setup.");
       rl.close();
-      resolve4(answer.trim());
-    });
-  });
+      return;
+    }
+    defaultModel = "gpt-4o";
+  } else {
+    provider = "deepseek";
+    defaultModel = "deepseek-v4-pro";
+  }
+  console.log("");
+  const keyHint = provider === "openai" ? "sk-" : provider === "deepseek" ? "sk-" : "";
+  const hintText = keyHint ? ` (starts with ${keyHint})` : "";
+  console.log(`Enter your API key${hintText}:`);
+  const key = await ask("API Key: ");
   if (!key) {
     console.log("No key entered. Aborting setup.");
+    rl.close();
     return;
   }
-  if (!key.startsWith("sk-")) {
-    console.log('Warning: Key does not start with "sk-". Saving anyway...');
-  }
+  console.log("");
+  const model = await ask(`Model [${defaultModel}]: `) || defaultModel;
   await saveKey(key);
-  console.log(`API key encrypted and saved to ~/.jawere/key.enc`);
+  await saveConfig({ provider, baseURL: baseURL || void 0, model });
+  console.log("");
+  console.log(`${G_GREEN}Setup complete!${R3}`);
+  console.log(`  Provider : ${G_AQUA}${provider}${R3}`);
+  console.log(`  Model    : ${G_AQUA}${model}${R3}`);
+  console.log(`  Key saved: ~/.jawere/key.enc`);
+  console.log("");
+  rl.close();
 }
 async function main() {
   const setupMode = process.argv.includes("--setup");
@@ -15761,16 +15832,14 @@ async function main() {
     process.exit(0);
   }
   if (!config.apiKey) {
-    const hasExistingKey = await hasKey();
     console.log("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
-    console.log("\u2551   jawere \u2014 AI Coding Agent                  \u2551");
+    console.log("\u2551        jawere \u2014 AI Coding Agent          \u2551");
     console.log("\u2560\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2563");
     console.log("\u2551 No API key found.                        \u2551");
     console.log("\u2551                                          \u2551");
-    console.log("\u2551 Option 1: Set DEEPSEEK_API_KEY env var   \u2551");
-    console.log("\u2551 Option 2: Run --setup to encrypt & save  \u2551");
+    console.log("\u2551 Option 1: Set AI_API_KEY env var         \u2551");
+    console.log("\u2551 Option 2: Run jawere --setup             \u2551");
     console.log("\u2551                                          \u2551");
-    console.log("\u2551   npx tsx src/index.ts --setup            \u2551");
     console.log("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
     process.exit(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jawere",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "type": "module",
   "bin": {
     "jawere": "bin/jawere.js"