@toothfairyai/tfcode 1.0.0-beta.4 → 1.0.0-beta.5

package/bin/tfcode.js

@@ -42,47 +42,35 @@ function info(msg) {
 
 function question(rl, prompt, hidden = false) {
   return new Promise((resolve) => {
-    if (hidden) {
+    if (hidden && process.stdin.isTTY) {
+      // Use simpler approach for hidden input
       process.stdout.write(prompt);
       
       let input = '';
       const stdin = process.stdin;
       
-      if (stdin.isTTY) {
-        stdin.setRawMode(true);
-      }
+      stdin.setRawMode(true);
+      stdin.setEncoding('utf8');
       stdin.resume();
       
-      const onData = (char) => {
-        const c = char.toString('utf8');
-        
-        switch (c) {
-          case '\n':
-          case '\r':
-          case '\u0004':
-            if (stdin.isTTY) {
-              stdin.setRawMode(false);
-            }
-            stdin.pause();
-            stdin.removeListener('data', onData);
-            process.stdout.write('\n');
-            resolve(input);
-            break;
-          case '\u0003':
-            process.stdout.write('\n');
-            process.exit();
-            break;
-          case '\u007F':
-          case '\b':
-            input = input.slice(0, -1);
-            break;
-          default:
-            input += c;
-            break;
+      const onKeypress = (str) => {
+        if (str === '\n' || str === '\r' || str === '\u0004') {
+          stdin.setRawMode(false);
+          stdin.pause();
+          stdin.removeListener('data', onKeypress);
+          process.stdout.write('\n');
+          resolve(input);
+        } else if (str === '\u0003') {
+          process.stdout.write('\n');
+          process.exit();
+        } else if (str === '\u007F' || str === '\b') {
+          input = input.slice(0, -1);
+        } else if (str.length === 1 && str.charCodeAt(0) >= 32) {
+          input += str;
         }
       };
       
-      stdin.on('data', onData);
+      stdin.on('data', onKeypress);
     } else {
       rl.question(prompt, (answer) => {
         resolve(answer.trim());
@@ -101,42 +89,17 @@ function select(prompt, options) {
     });
     log('');
     
-    process.stdout.write('Select (1-' + options.length + '): ');
-    
-    let input = '';
-    const stdin = process.stdin;
-    
-    if (stdin.isTTY) {
-      stdin.setRawMode(true);
-    }
-    stdin.resume();
-    
-    const onData = (char) => {
-      const c = char.toString('utf8');
-      
-      if (c === '\n' || c === '\r' || c === '\u0004') {
-        if (stdin.isTTY) {
-          stdin.setRawMode(false);
-        }
-        stdin.pause();
-        stdin.removeListener('data', onData);
-        process.stdout.write('\n');
-        
-        const idx = parseInt(input) - 1;
-        resolve(idx >= 0 && idx < options.length ? idx : 0);
-      } else if (c === '\u0003') {
-        process.stdout.write('\n');
-        process.exit();
-      } else if (c >= '1' && c <= '9') {
-        input += c;
-        process.stdout.write(c);
-      } else if (c === '\u007F' || c === '\b') {
-        input = input.slice(0, -1);
-        process.stdout.write('\b \b');
-      }
-    };
+    // Create a fresh readline for select
+    const rlSelect = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
     
-    stdin.on('data', onData);
+    rlSelect.question('Select (1-' + options.length + '): ', (answer) => {
+      rlSelect.close();
+      const idx = parseInt(answer.trim()) - 1;
+      resolve(idx >= 0 && idx < options.length ? idx : 0);
+    });
   });
 }
 
@@ -287,11 +250,6 @@ function saveToolsCache(tools) {
 }
 
 async function interactiveSetup() {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  
   log('');
   log(`${COLORS.bold}${COLORS.magenta}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLORS.reset}`);
   log(`${COLORS.bold}${COLORS.magenta}  tfcode Setup${COLORS.reset}`);
@@ -303,35 +261,83 @@ async function interactiveSetup() {
   log(`${COLORS.dim}  https://app.toothfairyai.com → Settings → API Keys${COLORS.reset}`);
   log('');
   
-  // Workspace ID
+  // Step 1: Workspace ID
   log(`${COLORS.bold}Step 1: Workspace ID${COLORS.reset}`);
   log(`${COLORS.dim}This is your workspace UUID (e.g., 12345678-1234-1234-1234-123456789012)${COLORS.reset}`);
   log('');
-  const workspaceId = await question(rl, 'Enter your Workspace ID: ');
+  
+  const workspaceId = await new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    rl.question('Enter your Workspace ID: ', (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
   
   if (!workspaceId) {
     error('Workspace ID is required');
-    rl.close();
     process.exit(1);
   }
   
   log('');
   
-  // API Key
+  // Step 2: API Key (hidden)
   log(`${COLORS.bold}Step 2: API Key${COLORS.reset}`);
   log(`${COLORS.dim}Your API key will be hidden as you type${COLORS.reset}`);
   log('');
-  const apiKey = await question(rl, 'Enter your API Key: ', true);
+  
+  const apiKey = await new Promise((resolve) => {
+    if (!process.stdin.isTTY) {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      rl.question('Enter your API Key: ', (answer) => {
+        rl.close();
+        resolve(answer.trim());
+      });
+      return;
+    }
+    
+    process.stdout.write('Enter your API Key: ');
+    let input = '';
+    const stdin = process.stdin;
+    
+    stdin.setRawMode(true);
+    stdin.setEncoding('utf8');
+    stdin.resume();
+    
+    const onKeypress = (str) => {
+      if (str === '\n' || str === '\r' || str === '\u0004') {
+        stdin.setRawMode(false);
+        stdin.pause();
+        stdin.removeListener('data', onKeypress);
+        process.stdout.write('\n');
+        resolve(input);
+      } else if (str === '\u0003') {
+        process.stdout.write('\n');
+        process.exit();
+      } else if (str === '\u007F' || str === '\b') {
+        input = input.slice(0, -1);
+      } else if (str.length === 1 && str.charCodeAt(0) >= 32) {
+        input += str;
+      }
+    };
+    
+    stdin.on('data', onKeypress);
+  });
   
   if (!apiKey) {
     error('API Key is required');
-    rl.close();
     process.exit(1);
   }
   
   log('');
   
-  // Region
+  // Step 3: Region
   log(`${COLORS.bold}Step 3: Region${COLORS.reset}`);
   const regions = ['dev (Development)', 'au (Australia)', 'eu (Europe)', 'us (United States)'];
   const regionIdx = await select('Select your region:', regions);
@@ -349,8 +355,16 @@ async function interactiveSetup() {
   log(`  Region: ${region}`);
   log('');
   
-  rl.resume();
-  const confirm = await question(rl, 'Save these credentials? (Y/n): ');
+  const confirm = await new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    rl.question('Save these credentials? (Y/n): ', (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
   
   if (confirm.toLowerCase() !== 'n' && confirm.toLowerCase() !== 'no') {
     const config = { workspace_id: workspaceId, api_key: apiKey, region };
@@ -359,8 +373,16 @@ async function interactiveSetup() {
     log('');
     
     // Validate
-    rl.resume();
-    const testNow = await question(rl, 'Validate credentials now? (Y/n): ');
+    const testNow = await new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      rl.question('Validate credentials now? (Y/n): ', (answer) => {
+        rl.close();
+        resolve(answer.trim());
+      });
+    });
     
     if (testNow.toLowerCase() !== 'n' && testNow.toLowerCase() !== 'no') {
       log('');
@@ -376,8 +398,16 @@ async function interactiveSetup() {
           log(`  Workspace ID: ${result.workspace_id}`);
           log('');
           
-          rl.resume();
-          const syncNow = await question(rl, 'Sync tools now? (Y/n): ');
+          const syncNow = await new Promise((resolve) => {
+            const rl = readline.createInterface({
+              input: process.stdin,
+              output: process.stdout
+            });
+            rl.question('Sync tools now? (Y/n): ', (answer) => {
+              rl.close();
+              resolve(answer.trim());
+            });
+          });
           
           if (syncNow.toLowerCase() !== 'n' && syncNow.toLowerCase() !== 'no') {
             log('');
@@ -433,8 +463,6 @@ async function interactiveSetup() {
   } else {
     log('Setup cancelled.');
   }
-  
-  rl.close();
 }
 
 const cli = yargs(hideBin(process.argv))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toothfairyai/tfcode",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "ToothFairyAI's official AI coding agent",
   "keywords": ["toothfairyai", "ai", "coding", "cli"],
   "author": "ToothFairyAI",