voicecc 1.1.18 → 1.1.20

package/dashboard/routes/auth.ts

@@ -120,53 +120,47 @@ function spawnLoginProcess(): Promise<string> {
     let resolved = false;
     let step = 0;
 
+    let loginSent = false;
+    let enterDebounce: ReturnType<typeof setTimeout> | null = null;
+
     child.onData((data: string) => {
       output += data;
       const clean = data.replace(/\x1b\[[^m]*m/g, "").replace(/\r/g, "").trim();
-      if (clean) console.debug(`[auth/login] step=${step} data: ${clean.slice(0, 200)}`);
-
-      // Step 0 → 1: Accept trust prompt
-      if (step === 0 && /enter to confirm/i.test(output)) {
-        step = 1;
-        console.debug("[auth/login] step 1: accepting trust prompt");
-        setTimeout(() => child.write("\r"), 500);
-      }
+      if (clean) console.debug(`[auth/login] step=${step} loginSent=${loginSent} data: ${clean.slice(0, 200)}`);
 
-      // Step 0 alternative: no trust prompt, already trusted — look for version string
-      if (step === 0 && /v\d+\.\d+\.\d+/.test(output)) {
-        step = 2;
-        console.debug("[auth/login] step 2: no trust prompt, sending /login");
-        setTimeout(() => child.write("/login\r"), 1000);
-      }
+      if (resolved) return;
 
-      // Step 1 → 2: Wait for main prompt after trust, send /login
-      if (step === 1 && /v\d+\.\d+\.\d+/.test(output.slice(-2000))) {
-        step = 2;
-        console.debug("[auth/login] step 2: sending /login");
-        setTimeout(() => child.write("/login\r"), 1000);
+      // ---- Always check for OAuth URL (can appear during setup or after /login) ----
+      const urlMatch = output.match(/(https:\/\/claude\.ai\/oauth\/authorize\S+)/);
+      if (urlMatch) {
+        resolved = true;
+        step = 4;
+        console.debug("[auth/login] URL captured");
+        pendingLogin = {
+          pty: child,
+          url: urlMatch[1],
+          createdAt: Date.now(),
+        };
+        resolve(urlMatch[1]);
+        return;
       }
 
-      // Step 2 → 3: Select Claude Pro (first option)
-      if (step === 2 && /claude.*pro|login.*method/i.test(output.slice(-500))) {
-        step = 3;
-        console.debug("[auth/login] step 3: selecting Claude Pro");
-        setTimeout(() => child.write("\r"), 1000);
+      // ---- Dismiss any selection prompt (❯) by pressing Enter ----
+      // Handles: trust, theme picker, login method, or any other setup prompt.
+      if (/❯/.test(data)) {
+        if (enterDebounce) clearTimeout(enterDebounce);
+        enterDebounce = setTimeout(() => {
+          console.debug("[auth/login] pressing Enter on selection prompt");
+          child.write("\r");
+        }, 800);
       }
 
-      // Capture OAuth URL (can happen at step 2 or 3)
-      if (step >= 2) {
-        const urlMatch = output.match(/(https:\/\/claude\.ai\/oauth\/authorize\S+)/);
-        if (urlMatch && !resolved) {
-          resolved = true;
-          step = 4;
-          console.debug("[auth/login] step 4: URL captured");
-          pendingLogin = {
-            pty: child,
-            url: urlMatch[1],
-            createdAt: Date.now(),
-          };
-          resolve(urlMatch[1]);
-        }
+      // ---- Detect the main REPL prompt and send /login ----
+      // Sparkle animation means we're in the main REPL, not setup.
+      if (!loginSent && /[✻✽✶✢]/.test(data)) {
+        loginSent = true;
+        console.debug("[auth/login] main prompt ready, sending /login");
+        setTimeout(() => child.write("/login\r"), 1000);
       }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "voicecc",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Voice mode plugin for Claude Code -- hands-free interaction via ElevenLabs STT/TTS and VAD",
   "type": "module",
   "bin": {