sam-coder-cli 1.0.7 → 1.0.9

package/bin/agi-cli.js

@@ -12,7 +12,7 @@ const execAsync = util.promisify(exec);
 // Configuration
 const CONFIG_PATH = path.join(os.homedir(), '.sam-coder-config.json');
 let OPENROUTER_API_KEY;
-const MODEL = 'deepseek/deepseek-chat-v3-0324:free';
+let MODEL = 'deepseek/deepseek-chat-v3-0324:free';
 let API_BASE_URL = 'https://openrouter.ai/api/v1';
 
 // Tool/Function definitions for the AI
@@ -380,19 +380,18 @@ function extractJsonFromMarkdown(text) {
 }
 
 // Call OpenRouter API with tool calling
-async function callOpenRouterWithTools(messages) {
+async function callOpenRouter(messages, currentModel, useJson = false) {
   const apiKey = OPENROUTER_API_KEY;
 
   try {
-    const response = await fetch(API_BASE_URL + '/chat/completions', {
+    const response = await fetch(`${API_BASE_URL}/chat/completions`, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
-        'HTTP-Referer': 'https://github.com/yourusername/agi-cli'
+        'Authorization': `Bearer ${OPENROUTER_API_KEY}`,
+        'Content-Type': 'application/json'
       },
       body: JSON.stringify({
-        model: MODEL,
+        model: currentModel,
         messages: messages,
         tools: tools,
         tool_choice: 'auto'
@@ -415,100 +414,8 @@ async function callOpenRouterWithTools(messages) {
   }
 }
 
-// Call OpenRouter API with function calling (legacy)
-async function callOpenRouterWithFunctions(messages) {
-  const apiKey = OPENROUTER_API_KEY;
-
-  try {
-    const response = await fetch(API_BASE_URL + '/chat/completions', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
-        'HTTP-Referer': 'https://github.com/yourusername/agi-cli'
-      },
-      body: JSON.stringify({
-        model: MODEL,
-        messages: messages
-      })
-    });
-
-    if (!response.ok) {
-      if (response.status === 401) {
-        throw new Error('AuthenticationError: Invalid API key. Please run /setup to reconfigure.');
-      }
-      const error = await response.json();
-      throw new Error(`API error: ${error.error?.message || response.statusText}`);
-    }
-
-    return await response.json();
-  } catch (error) {
-    console.error('API call failed:', error);
-    ui.stopThinking();
-    throw new Error(`Failed to call OpenRouter API: ${error.message}`);
-  }
-}
-
-// Process tool calls from the AI response
-async function handleToolCalls(toolCalls, messages) {
-  const results = [];
-  
-  for (const toolCall of toolCalls) {
-    const functionName = toolCall.function.name;
-    let args;
-    
-    try {
-      args = JSON.parse(toolCall.function.arguments);
-    } catch (error) {
-      console.error('❌ Failed to parse tool arguments:', error);
-      results.push({
-        tool_call_id: toolCall.id,
-        role: 'tool',
-        name: functionName,
-        content: JSON.stringify({ error: `Invalid arguments format: ${error.message}` })
-      });
-      continue;
-    }
-    
-    console.log(`🔧 Executing ${functionName} with args:`, args);
-    
-    try {
-      if (!agentUtils[functionName]) {
-        throw new Error(`Tool '${functionName}' not found`);
-      }
-      
-      const result = await agentUtils[functionName](...Object.values(args));
-      console.log('✅ Tool executed successfully');
-      
-      // Stringify the result if it's not already a string
-      const resultContent = typeof result === 'string' ? result : JSON.stringify(result);
-      
-      results.push({
-        tool_call_id: toolCall.id,
-        role: 'tool',
-        name: functionName,
-        content: resultContent
-      });
-    } catch (error) {
-      console.error('❌ Tool execution failed:', error);
-      
-      results.push({
-        tool_call_id: toolCall.id,
-        role: 'tool',
-        name: functionName,
-        content: JSON.stringify({ 
-          error: error.message,
-          stack: process.env.DEBUG ? error.stack : undefined
-        })
-      });
-    }
-  }
-  
-  return results;
-}
-
 // Process a query with tool calling
-async function processQueryWithTools(query, conversation = []) {
+async function processQueryWithTools(query, conversation = [], currentModel) {
   // Add user message to conversation
   const userMessage = { role: 'user', content: query };
   const messages = [...conversation, userMessage];
@@ -527,7 +434,7 @@ If a tool fails, you can try again with different parameters or a different appr
   ui.startThinking();
 
   try {
-    const response = await callOpenRouterWithTools(messages);
+    const response = await callOpenRouterWithTools(messages, currentModel);
     const assistantMessage = response.choices[0].message;
     messages.push(assistantMessage);
 
@@ -550,7 +457,7 @@ If a tool fails, you can try again with different parameters or a different appr
 
     // Now, get the AI's response to the tool results
     ui.startThinking();
-    const finalResponseObj = await callOpenRouterWithTools(messages);
+    const finalResponseObj = await callOpenRouterWithTools(messages, currentModel);
     const finalAssistantMessage = finalResponseObj.choices[0].message;
     messages.push(finalAssistantMessage);
     ui.stopThinking();
@@ -570,53 +477,8 @@ If a tool fails, you can try again with different parameters or a different appr
   }
 }
 
-// Execute a single action from the action system
-async function executeAction(action) {
-  const { type, data } = action;
-  
-  switch (type) {
-    case 'read':
-      return await agentUtils.readFile(data.path);
-      
-    case 'write':
-      return await agentUtils.writeFile(data.path, data.content);
-      
-    case 'edit':
-      return await agentUtils.editFile(data.path, data.edits);
-      
-    case 'command':
-      return await agentUtils.runCommand(data.command);
-      
-    case 'search':
-      if (data.type === 'files') {
-        return await agentUtils.searchFiles(data.pattern);
-      }
-      throw new Error('Text search is not implemented yet');
-      
-    case 'execute':
-      // For execute action, we'll run it as a command
-      const cmd = data.language === 'bash' 
-        ? data.code 
-        : `node -e "${data.code.replace(/"/g, '\\"')}"`;
-      return await agentUtils.runCommand(cmd);
-      
-    case 'browse':
-      throw new Error('Web browsing is not implemented yet');
-      
-    case 'analyze':
-      // For analyze action, we'll just return the question for now
-      return `Analysis requested for code: ${data.code}\nQuestion: ${data.question}`;
-      
-    case 'stop':
-      return 'Stopping action execution';
-      
-    default:
-      throw new Error(`Unknown action type: ${type}`);
-  }
-}
-
 // Process a query with action handling (legacy function calling)
-async function processQuery(query, conversation = []) {
+async function processQuery(query, conversation = [], currentModel) {
   try {
     // Add user message to conversation
     const userMessage = { role: 'user', content: query };
@@ -632,10 +494,10 @@ async function processQuery(query, conversation = []) {
 
     ui.startThinking();
     
-    const response = await callOpenRouterWithFunctions(messages);
+    const response = await callOpenRouterWithFunctions(messages, currentModel);
     const assistantMessage = response.choices[0].message;
     messages.push(assistantMessage);
-    
+
     // Try to extract JSON from the response
     const actionData = extractJsonFromMarkdown(assistantMessage.content);
     
@@ -674,31 +536,51 @@ async function processQuery(query, conversation = []) {
     };
   } catch (error) {
     ui.stopThinking();
-    ui.showError(`Error processing query: ${error.message}`);
+    console.error('❌ Error during processing:', error);
     return {
-      response: `Error: ${error.message}`,
-      conversation: conversation || []
+      response: `An error occurred: ${error.message}`,
+      conversation: messages
     };
   }
 }
 
 // Main chat loop
-async function chat(useToolCalling) {
+async function chat(rl, useToolCalling, initialModel) {
+  let currentModel = initialModel;
   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().startsWith('/model')) {
+      const newModel = input.split(' ')[1];
+      if (newModel) {
+        currentModel = newModel;
+        let config = await readConfig();
+        config.MODEL = currentModel;
+        await writeConfig(config);
+        console.log(`Model changed to: ${currentModel}`);
+      } else {
+        console.log('Please specify a model. Usage: /model <model_name>');
+      }
+      rl.prompt();
+      return;
+    }
+
+    if (input.toLowerCase() === '/default-model') {
+      currentModel = 'deepseek/deepseek-chat-v3-0324:free';
+      let config = await readConfig();
+      config.MODEL = currentModel;
+      await writeConfig(config);
+      console.log(`Model reset to default: ${currentModel}`);
+      rl.prompt();
+      return;
+    }
+
     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;
@@ -710,8 +592,8 @@ async function chat(useToolCalling) {
     }
     
     const result = useToolCalling 
-      ? await processQueryWithTools(input, conversation)
-      : await processQuery(input, conversation);
+      ? await processQueryWithTools(input, conversation, currentModel)
+      : await processQuery(input, conversation, currentModel);
     ui.stopThinking();
     ui.showResponse(result.response);
     
@@ -727,15 +609,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 +634,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) {
@@ -797,18 +668,24 @@ async function runSetup(isReconfig = false) {
     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);
     }
 
+    MODEL = config.MODEL || 'deepseek/deepseek-chat-v3-0324:free'; // Load model from config or use default
+
     OPENROUTER_API_KEY = config.OPENROUTER_API_KEY;
     if (config.isPro && config.customApiBase) {
       API_BASE_URL = config.customApiBase;
@@ -820,13 +697,49 @@ 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, MODEL);
   } catch (error) {
     ui.showError(error);
+    rl.close();
+    process.exit(1);
+  }
+}
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  try {
+    let config = await readConfig();
+    if (!config || !config.OPENROUTER_API_KEY) {
+      config = await runSetup(rl);
+    }
+
+    MODEL = config.MODEL || 'deepseek/deepseek-chat-v3-0324:free'; // Load model from config or use default
+
+    OPENROUTER_API_KEY = config.OPENROUTER_API_KEY;
+    if (config.isPro && config.customApiBase) {
+      API_BASE_URL = config.customApiBase;
+      console.log(`🚀 Using Pro Plan custom endpoint: ${API_BASE_URL}`);
+    }
+
+    ui.showHeader();
+    console.log('Select Mode:');
+    console.log('1. Tool Calling (for models that support it)');
+    console.log('2. Function Calling (legacy)');
+    
+    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(rl, useToolCalling, MODEL);
+  } catch (error) {
+    ui.showError(error);
+    rl.close();
     process.exit(1);
   }
 }

package/package.json

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