Fix blocking (Fixes #51)

cli/index.js

@@ -2,6 +2,7 @@
 
 import { Claude } from '../index.js';
 import inquirer from 'inquirer';
+import readline from 'readline'
 import chalk from 'chalk';
 import ora from 'ora';
 import * as marked from 'marked';
@@ -16,6 +17,7 @@ import "isomorphic-fetch";
 import { File } from "@web-std/file";
 import { exec } from 'child_process';
 import open from 'open';
+import fetch from './tls.js';
 
 marked.setOptions({ headerIds: false, mangle: false })
 marked.setOptions({
@@ -116,7 +118,7 @@ const WELCOME_MESSAGE = chalk.bold.green('Welcome to the Claude CLI!');
 let MODEL = 'claude-2'
 const claude = new Claude({
     sessionKey: getKey(),
-    fetch: globalThis.fetch
+    fetch: fetch,
 });
 
 async function main() {
@@ -782,7 +784,6 @@ async function getPrompt(template, variables = {}) {
             } catch (e) {
                 return { value: '', body: '' };
             }
-            console.log("GOT SHELL RESULT", { result });
             if (['shd', 'shelld', 'shelldisplay'].includes(command)) {
                 return {
                     value: result,
@@ -795,12 +796,28 @@ async function getPrompt(template, variables = {}) {
             }
         }
         if (command === 'js' || ['jsdisplay', 'jsd'].includes(command)) {
+            if (SPINNER) { SPINNER.stop() }
             let pr;
             const BLACKLIST = ['void', 'var', 'let', 'const', 'private', 'public', 'window', 'body', 'document', 'globalThis', 'globals', 'import', 'class', 'async', 'function', 'this', 'return', 'yield', 'throw', 'catch', 'break', 'case', 'continue', 'default', 'do', 'else', 'finally', 'if', 'in', 'return', 'switch', 'throw', 'try', 'while', 'with', 'yield'];
             let p = new Promise(resolve => (pr = resolve));
-            const EVAL_STR = (`((async ({${Object.keys(variables).filter(i => !BLACKLIST.includes(i)).join(', ')}}) => {
-            ${arg.split('\n').length === 1 ? `return ${arg}` : arg}
-        })(${JSON.stringify(variables)})).then(result => {
+            const ask = (q) => {
+                return new Promise(resolve => {
+                    const rl = readline.createInterface({
+                        input: process.stdin,
+                        output: process.stdout,
+                    })
+                    rl.question(q, (a) => {
+                        resolve(a);
+                    })
+                })
+            }
+            const EVAL_STR = (`
+            const tempFunc = async ({${Object.keys(variables).filter(i => !BLACKLIST.includes(i)).join(', ')}}) => {
+                ${arg.split('\n').length === 1 ? `return ${arg}` : arg}
+            }
+            debugger;
+            tempFunc(${JSON.stringify({ variables })}).then(result => {
+            debugger;
             pr(result);
         })`);
             eval(EVAL_STR);

cli/package.json

@@ -17,6 +17,7 @@
         "@web-std/file": "^3.0.2",
         "chalk": "^5.3.0",
         "claude-ai": "^1.2.0",
+        "cycletls": "^1.0.21",
         "dotenv": "^16.3.1",
         "inquirer": "^9.2.7",
         "isomorphic-fetch": "^3.0.0",

cli/templates/code.txt

@@ -1,10 +1,10 @@
 You are an expert software engineer at Google. Be concise! Your job is to implement the code designed and detailed in the uploaded file requirements.txt. This project is {prompt}
 
-Make sure to use the latest syntax (e.g. ESM/ES6 imports and syntax in JavaScript, HTML5, CSS3), don't include debug or comments or empty lines. Include error handling to make sure it works properly. Make sure your code is readable and does not include any placeholders or psuedocode.
+Make sure to use the latest syntax (e.g., ESM/ES6 imports and syntax in JavaScript, HTML5, CSS3), don't include debug or comments or empty lines. Include error handling to make sure it works properly. Make sure your code is readable and does not include any placeholders or pseudocode.
 
-DONT INCLUDE ANY TODO COMMENTS. DONT INCLUDE PSUEDOCODE. DONT INCLUDE PLACEHOLDERS. Adhere to the user's request as closely as possible. Your code's output, variables and function should match the example output given in the design document exactly.
+DON'T INCLUDE ANY TODO COMMENTS. DON'T INCLUDE PSUEDOCODE. DON'T INCLUDE PLACEHOLDERS. Adhere to the user's request as closely as possible. Your code's output, variables, and function should match the example output given in the design document exactly.
 
-First write you initial implementation of the requirements, then write out 4 criticisms of it. Finally write your final code. Begin the final code with "FINAL:"
+First write your initial implementation of the requirements, then write out 4 criticisms of it. Finally, write your final code. Begin the final code with "FINAL:"
 
 The requirements and design details of this project are located in the uploaded file requirements.txt