voicecc 1.1.20 → 1.1.22

package/dashboard/routes/auth.ts

@@ -118,23 +118,19 @@ function spawnLoginProcess(): Promise<string> {
 
     let output = "";
     let resolved = false;
-    let step = 0;
-
-    let loginSent = false;
-    let enterDebounce: ReturnType<typeof setTimeout> | null = null;
+    let enterCount = 0;
 
     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} loginSent=${loginSent} data: ${clean.slice(0, 200)}`);
+      if (clean) console.debug(`[auth/login] data: ${clean.slice(0, 200)}`);
 
       if (resolved) return;
 
-      // ---- Always check for OAuth URL (can appear during setup or after /login) ----
+      // Check for OAuth URL on every data event
       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,
@@ -145,26 +141,41 @@ function spawnLoginProcess(): Promise<string> {
         return;
       }
 
-      // ---- 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);
-      }
-
-      // ---- 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);
+      // Detect REPL prompt — means user is already authenticated.
+      // The REPL shows "◐ medium · /effort" or similar model/effort indicator.
+      const stripped = output.replace(/\x1b\[[^m]*m/g, "");
+      if (enterCount >= 1 && !resolved) {
+        const replIndicators = [
+          /\/effort/,             // effort command shown in REPL status
+          /◐.*medium/,           // model indicator in REPL
+          /\$\d+\.\d+/,           // cost like $0.00
+          /what can i help/i,
+        ];
+        for (const pattern of replIndicators) {
+          if (pattern.test(stripped)) {
+            resolved = true;
+            console.debug("[auth/login] REPL detected — already authenticated");
+            child.kill();
+            reject(new Error("ALREADY_AUTHENTICATED"));
+            return;
+          }
+        }
       }
     });
 
+    // Press Enter every 2s to advance through setup prompts
+    // (trust, theme, login method, etc.) until the OAuth URL appears.
+    // Some prompts render ❯ via ANSI cursor positioning which is
+    // impossible to detect reliably, so periodic Enter is simplest.
+    const enterInterval = setInterval(() => {
+      if (resolved) { clearInterval(enterInterval); return; }
+      enterCount++;
+      console.debug(`[auth/login] pressing Enter (periodic #${enterCount})`);
+      child.write("\r");
+    }, 2000);
+
     child.onExit(({ exitCode }: { exitCode: number }) => {
+      clearInterval(enterInterval);
       console.debug("[auth/login] PTY exited with code", exitCode);
       if (!resolved) {
         resolved = true;
@@ -178,10 +189,11 @@ function spawnLoginProcess(): Promise<string> {
     // Timeout
     setTimeout(() => {
       if (!resolved) {
+        clearInterval(enterInterval);
         resolved = true;
         child.kill();
         const clean = output.replace(/\x1b\[[^m]*m/g, "").slice(-500);
-        reject(new Error(`Login timed out at step ${step}. Last output: ${clean}`));
+        reject(new Error(`Login timed out. Last output: ${clean}`));
       }
     }, LOGIN_TIMEOUT_MS);
   });
@@ -289,11 +301,21 @@ export function authRoutes(): Hono {
    * Spawns interactive claude via PTY, navigates to /login, returns URL.
    */
   app.post("/oauth/start", async (c) => {
+    // Pre-check: if already authenticated, don't spawn PTY
+    const status = await getAuthStatus();
+    if (status.authenticated) {
+      return c.json({ error: "Already authenticated", alreadyAuthenticated: true }, 400);
+    }
+
     try {
       const url = await spawnLoginProcess();
       return c.json({ url });
     } catch (err) {
-      return c.json({ error: (err as Error).message }, 500);
+      const msg = (err as Error).message;
+      if (msg === "ALREADY_AUTHENTICATED") {
+        return c.json({ error: "Already authenticated", alreadyAuthenticated: true }, 400);
+      }
+      return c.json({ error: msg }, 500);
     }
   });
 

package/package.json

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