updates

Author: VictorTaelin

chatsh.mjs

@@ -3,12 +3,12 @@
 import readline from 'readline';
 import { exec } from 'child_process';
 import { promisify } from 'util';
-import { makeStatefulAsker, MODELS } from './Ask.mjs';
+import { asker, MODELS } from './Ask.mjs';
 
 const execAsync = promisify(exec);
 
 // Default model if not specified
-const DEFAULT_MODEL = "cf";  
+const DEFAULT_MODEL = "g";  
 // Get model from environment variable or use default
 const MODEL = process.argv[2] || DEFAULT_MODEL;
 
@@ -22,13 +22,16 @@ When the user asks you to perform a task:
 - Do NOT include any explanatory text along with the code.
 
 If the user asks an open question that is not demanding a task:  
-- Treat it as a chat, and ask as an assistant instead.
-- As an assistant, you're helpful, friendly, intelligent and truthful.
+- Treat it as a chat, and answer as you would normally.
+- Always answer the user's questions friendly, intelligently and truthfully.
 
 Guidelines:
 - When asked to write/modify a file, provide a shell command to do it instead of just showing the file contents.
 - When asked to query an API, write a shell command to make the request.
 - Always assume common commands/tools are available. Don't write install commands.
+
+User shell:
+${await get_shell()}
 `;
 
 // Create readline interface for user input/output
@@ -39,7 +42,7 @@ const rl = readline.createInterface({
 });
 
 // Create a stateful asker
-const ask = makeStatefulAsker();
+const ask = asker();
 
 // Utility function to prompt the user for input
 async function prompt(query) {
@@ -92,4 +95,10 @@ function extractCode(text) {
   return match ? match[1].trim() : null;
 }
 
+
+async function get_shell() {
+  const shellInfo = (await execAsync('uname -a && $SHELL --version')).stdout.trim();
+  return shellInfo;
+}
+
 main();

holefill.mjs

@@ -1,10 +1,7 @@
 #!/usr/bin/env node
-
-import * as GPT from './GPT.mjs';
-import * as Claude from './Claude.mjs';
+import { asker, MODELS } from './Ask.mjs';
 import process from "process";
 import fs from 'fs/promises';
-import os from 'os';
 import path from 'path';
 
 const system = `
@@ -29,23 +26,33 @@ if (i % 2 === 0) {
       sum += i;
     }
 
-## NOTICE THE INDENTATION:
+## NOTICE THE CONTEXT-AWARE INDENTATION:
 
 1. The first line is NOT indented, because there are already spaces before {{LOOP}}.
 
 2. The other lines ARE indented, to match the indentation of the context.
+
+# NOTICE NO EXTRA EXPLANATORY WORDS:
+
+1. Do NOT add explanatory words like 'here is the code:' in the answer.
+
+2. Unless demanded by context, do NOT add backticks around the answer.
+
+3. Answer just with the correct substitution. 
 `;
 
 var file = process.argv[2];
 var curr = process.argv[3];
-var model = process.argv[4] || "gpt-4-turbo-2024-04-09";
+var model = process.argv[4] || "C";
 
 if (!file) {
-  console.log("Usage: holefill <file> [<shortened_file>] [<model_name>]");
-  console.log("");
-  console.log("This will replace all {{HOLES}} in <file>, using GPT-4 / Claude-3.");
-  console.log("A shortened file can be used to omit irrelevant parts.");
-  process.exit();
+  console.log("Usage: holefill <file> [<shortened_file>] [<model>]");
+  console.log("Replaces {{HOLES}} in <file> using the specified model. Shortcuts:");
+  for (var key in MODELS) {
+    console.log("- " + key + " = " + MODELS[key]);
+  }
+  console.log("A shortened file can be used to provide relevant context.");
+  process.exit(1);
 }
 
 var file_code = await fs.readFile(file, 'utf-8');
@@ -68,18 +75,19 @@ while ((match = regex.exec(curr_code)) !== null) {
 
 await fs.writeFile(curr, curr_code, 'utf-8');
 
-var tokens = GPT.token_count(curr_code);
+var tokens = curr_code.length; // Use the length of the code as a rough estimate of tokens
 var holes = curr_code.match(/{{\w+}}/g) || [];
-var ask = model.startsWith("claude") ? Claude.ask : GPT.ask;
+
+var ask = asker();
 
 console.log("holes_found:", holes);
 console.log("token_count:", tokens);
-console.log("model_label:", model);
+console.log("model_label:", MODELS[model] || model);
 
 for (let hole of holes) {
   console.log("next_filled: " + hole + "...");
-  var prompt = curr_code + "\nTASK: Fill the {{"+hole+"}} hole. Answer only with the EXACT completion to replace {{"+hole+"}} with. INDENT IT BASED ON THE CONTEXT.";
-  var answer = await ask({system, prompt, model});
+  var prompt = curr_code + "\nTASK: Fill the {{" + hole + "}} hole. Answer only with the EXACT completion to replace {{" + hole + "}} with. INDENT IT BASED ON THE CONTEXT.";
+  var answer = await ask(prompt, { system, model, temperature: 0, max_tokens: 256 });
   file_code = file_code.replace(hole, answer);
 }