sam-coder-cli 1.0.6 → 1.0.8

package/bin/agi-cli.js

@@ -683,22 +683,16 @@ async function processQuery(query, conversation = []) {
 }
 
 // Main chat loop
-async function chat(useToolCalling) {
+async function chat(rl, useToolCalling) {
   const conversation = [];
-  ui.showHeader();
   console.log('Type your message, or "exit" to quit.');
   
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    prompt: '> '
-  });
-  
+  rl.setPrompt('> ');
   rl.prompt();
   
   rl.on('line', async (input) => {
     if (input.toLowerCase() === '/setup') {
-      await runSetup(true);
+      await runSetup(rl, true);
       console.log('\nSetup complete. Please restart the application to apply changes.');
       rl.close();
       return;
@@ -727,15 +721,9 @@ async function chat(useToolCalling) {
 }
 
 // Ask user for mode selection
-function askForMode() {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-
+function askForMode(rl) {
   return new Promise((resolve) => {
     rl.question('Select mode (1 for tool calling, 2 for function calling): ', (answer) => {
-      rl.close();
       resolve(answer.trim() === '1');
     });
   });
@@ -758,12 +746,7 @@ async function writeConfig(config) {
   await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2), 'utf-8');
 }
 
-async function runSetup(isReconfig = false) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-
+async function runSetup(rl, isReconfig = false) {
   const askQuestion = (query) => new Promise(resolve => rl.question(query, resolve));
 
   if (!isReconfig) {
@@ -784,23 +767,33 @@ async function runSetup(isReconfig = false) {
     const customEndpoint = await askQuestion('Enter custom OpenAI-compatible API endpoint: ');
     config.isPro = true;
     config.customApiBase = customEndpoint;
+    await writeConfig(config);
+    console.log('✅ Configuration saved successfully!');
   } else if (proCode) {
-    console.log('⚠️ Invalid activation code. Continuing with standard setup.');
+    await writeConfig(config);
+    console.log('⚠️ Invalid activation code. Standard plan configured.');
+    console.log('\nPlease restart the application to continue.');
+    rl.close();
+    process.exit(0);
+  } else {
+    await writeConfig(config);
+    console.log('✅ Configuration saved successfully!');
   }
 
-  await writeConfig(config);
-
-  console.log('✅ Configuration saved successfully!');
-  rl.close();
   return config;
 }
 
 // Start the application
 async function start() {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
   try {
     let config = await readConfig();
     if (!config || !config.OPENROUTER_API_KEY) {
-      config = await runSetup();
+      config = await runSetup(rl);
     }
 
     OPENROUTER_API_KEY = config.OPENROUTER_API_KEY;
@@ -814,13 +807,14 @@ async function start() {
     console.log('1. Tool Calling (for models that support it)');
     console.log('2. Function Calling (legacy)');
     
-    const useToolCalling = await askForMode();
+    const useToolCalling = await askForMode(rl);
     ui.showResponse(`\nStarting in ${useToolCalling ? 'Tool Calling' : 'Function Calling'} mode...\n`);
     
     // Start the chat with the selected mode
-    await chat(useToolCalling);
+    await chat(rl, useToolCalling);
   } catch (error) {
     ui.showError(error);
+    rl.close();
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {