agentgui 1.0.700 → 1.0.702

package/lib/ws-handlers-util.js

@@ -9,6 +9,7 @@ export function register(router, deps) {
   const { queries, wsOptimizer, modelDownloadState, ensureModelsDownloaded,
     broadcastSync, getSpeech, getProviderConfigs, saveProviderConfig,
     startGeminiOAuth, exchangeGeminiOAuthCode, geminiOAuthState,
+    startCodexDeviceAuth, codexDeviceAuthState,
     STARTUP_CWD, activeScripts, voiceCacheManager, toolManager, discoveredAgents } = deps;
 
   router.handle('home', () => ({ home: os.homedir(), cwd: STARTUP_CWD }));
@@ -157,6 +158,30 @@ export function register(router, deps) {
     } catch (e) { err(400, e.message); }
   });
 
+  router.handle('codex.start', async () => {
+    try {
+      const result = startCodexDeviceAuth();
+      const st = typeof codexDeviceAuthState === 'function' ? codexDeviceAuthState() : codexDeviceAuthState;
+      if (result.alreadyAuthenticated) return { status: 'success', authenticated: true };
+      const waitForCode = () => new Promise((resolve) => {
+        let tries = 12;
+        const poll = () => {
+          const state = typeof codexDeviceAuthState === 'function' ? codexDeviceAuthState() : codexDeviceAuthState;
+          if (state.authUrl || tries-- <= 0) resolve(state);
+          else setTimeout(poll, 400);
+        };
+        poll();
+      });
+      const state = await waitForCode();
+      return { status: state.status, authUrl: state.authUrl, userCode: state.userCode };
+    } catch (e) { err(500, e.message); }
+  });
+
+  router.handle('codex.status', () => {
+    const st = typeof codexDeviceAuthState === 'function' ? codexDeviceAuthState() : codexDeviceAuthState;
+    return st;
+  });
+
   router.handle('gemini.complete', async (p) => {
     const pastedUrl = (p.url || '').trim();
     if (!pastedUrl) err(400, 'No URL provided');
@@ -268,47 +293,47 @@ export function register(router, deps) {
     }
   });
 
-  router.handle('agent.subagents', async (p) => {
-    const { id } = p;
-    if (!id) err(400, 'Missing agent id');
-
-    // Claude Code: run 'claude agents list' and parse output
-    if (id === 'claude-code' || id === 'cli-claude') {
-      const spawnEnv = { ...process.env };
-      delete spawnEnv.CLAUDECODE;
-      const result = spawnSync('claude', ['agents', 'list'], {
-        encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'pipe'],
-        env: spawnEnv
-      });
-      if (result.status !== 0 || !result.stdout) return { subAgents: [] };
-      const output = result.stdout.trim();
-      // Output format: '  agentId · model' lines under section headers
-      const agents = [];
-      for (const line of output.split('\n').filter(l => l.trim())) {
-        const match = line.match(/^  (\S+)\s+·/);
-        if (match) {
-          const id = match[1];
-          agents.push({ id, name: id });
-        }
-      }
-      console.log('[agent.subagents] claude agents list found:', agents.map(a => a.id).join(', '));
-      return { subAgents: agents };
-    }
-
-    // ACP agents: hardcoded map filtered by installed tools
-    const subAgentMap = {
-      'opencode':     [{ id: 'gm-oc',   name: 'GM OpenCode' }],
-      'cli-opencode': [{ id: 'gm-oc',   name: 'GM OpenCode' }],
-      'gemini':       [{ id: 'gm-gc',   name: 'GM Gemini'   }],
-      'cli-gemini':   [{ id: 'gm-gc',   name: 'GM Gemini'   }],
-      'kilo':         [{ id: 'gm-kilo', name: 'GM Kilo'     }],
-      'cli-kilo':     [{ id: 'gm-kilo', name: 'GM Kilo'     }],
-      'codex':        [],
-      'cli-codex':    []
-    };
-    const subAgents = subAgentMap[id] || [];
-    const tools = await toolManager.getAllToolsAsync();
-    const installed = new Set(tools.filter(t => t.category === 'plugin' && t.installed).map(t => t.id));
-    return { subAgents: subAgents.filter(sa => installed.has(sa.id)) };
+  router.handle('agent.subagents', async (p) => {
+    const { id } = p;
+    if (!id) err(400, 'Missing agent id');
+
+    // Claude Code: run 'claude agents list' and parse output
+    if (id === 'claude-code' || id === 'cli-claude') {
+      const spawnEnv = { ...process.env };
+      delete spawnEnv.CLAUDECODE;
+      const result = spawnSync('claude', ['agents', 'list'], {
+        encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'pipe'],
+        env: spawnEnv
+      });
+      if (result.status !== 0 || !result.stdout) return { subAgents: [] };
+      const output = result.stdout.trim();
+      // Output format: '  agentId · model' lines under section headers
+      const agents = [];
+      for (const line of output.split('\n').filter(l => l.trim())) {
+        const match = line.match(/^  (\S+)\s+·/);
+        if (match) {
+          const id = match[1];
+          agents.push({ id, name: id });
+        }
+      }
+      console.log('[agent.subagents] claude agents list found:', agents.map(a => a.id).join(', '));
+      return { subAgents: agents };
+    }
+
+    // ACP agents: hardcoded map filtered by installed tools
+    const subAgentMap = {
+      'opencode':     [{ id: 'gm-oc',   name: 'GM OpenCode' }],
+      'cli-opencode': [{ id: 'gm-oc',   name: 'GM OpenCode' }],
+      'gemini':       [{ id: 'gm-gc',   name: 'GM Gemini'   }],
+      'cli-gemini':   [{ id: 'gm-gc',   name: 'GM Gemini'   }],
+      'kilo':         [{ id: 'gm-kilo', name: 'GM Kilo'     }],
+      'cli-kilo':     [{ id: 'gm-kilo', name: 'GM Kilo'     }],
+      'codex':        [],
+      'cli-codex':    []
+    };
+    const subAgents = subAgentMap[id] || [];
+    const tools = await toolManager.getAllToolsAsync();
+    const installed = new Set(tools.filter(t => t.category === 'plugin' && t.installed).map(t => t.id));
+    return { subAgents: subAgents.filter(sa => installed.has(sa.id)) };
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.700",
+  "version": "1.0.702",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -696,6 +696,96 @@ const GEMINI_ACCOUNTS_FILE = path.join(GEMINI_DIR, 'google_accounts.json');
 let geminiOAuthState = { status: 'idle', error: null, email: null };
 let geminiOAuthPending = null;
 
+const CODEX_AUTH_FILE = path.join(os.homedir(), '.codex', 'auth.json');
+let codexDeviceAuthState = { status: 'idle', error: null, userCode: null, authUrl: null };
+let codexDeviceAuthProcess = null;
+
+function getCodexAuthStatus() {
+  try {
+    if (fs.existsSync(CODEX_AUTH_FILE)) {
+      const creds = JSON.parse(fs.readFileSync(CODEX_AUTH_FILE, 'utf-8'));
+      if (creds.auth_mode === 'oauth' || creds.access_token || creds.refresh_token) {
+        return { authenticated: true, detail: creds.email || 'oauth' };
+      }
+      if (creds.auth_mode === 'apikey' && creds.OPENAI_API_KEY) {
+        return { authenticated: true, detail: 'api-key' };
+      }
+    }
+  } catch (_) {}
+  return { authenticated: false, detail: 'no credentials' };
+}
+
+function startCodexDeviceAuth() {
+  if (codexDeviceAuthProcess) {
+    return { alreadyRunning: true };
+  }
+  const codexStatus = getCodexAuthStatus();
+  if (codexStatus.authenticated) {
+    codexDeviceAuthState = { status: 'success', error: null, userCode: null, authUrl: null };
+    return { alreadyAuthenticated: true };
+  }
+  codexDeviceAuthState = { status: 'pending', error: null, userCode: null, authUrl: null };
+  const child = spawn('npx', ['@openai/codex', 'login', '--device-auth'], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: { ...process.env, FORCE_COLOR: '0', NO_COLOR: '1' },
+    shell: os.platform() === 'win32',
+  });
+  codexDeviceAuthProcess = child;
+
+  const onData = (chunk) => {
+    const text = chunk.toString().replace(/\x1b\[[0-9;]*m/g, '');
+    const urlMatch = text.match(/https:\/\/auth\.openai\.com\/codex\/device[^\s]*/);
+    const codeMatch = text.match(/\b([0-9A-Z]{4}-[0-9A-Z]{5})\b/);
+    if (urlMatch && !codexDeviceAuthState.authUrl) codexDeviceAuthState.authUrl = urlMatch[0];
+    if (codeMatch && !codexDeviceAuthState.userCode) codexDeviceAuthState.userCode = codeMatch[1];
+  };
+  child.stdout.on('data', onData);
+  child.stderr.on('data', onData);
+
+  const authFileWatcher = fs.watchFile ? null : null;
+  const pollInterval = setInterval(() => {
+    const st = getCodexAuthStatus();
+    if (st.authenticated) {
+      clearInterval(pollInterval);
+      clearTimeout(timeoutId);
+      codexDeviceAuthState = { status: 'success', error: null, userCode: codexDeviceAuthState.userCode, authUrl: codexDeviceAuthState.authUrl };
+      if (codexDeviceAuthProcess) { try { codexDeviceAuthProcess.kill('SIGTERM'); } catch (_) {} codexDeviceAuthProcess = null; }
+    }
+  }, 1500);
+
+  const timeoutId = setTimeout(() => {
+    clearInterval(pollInterval);
+    if (codexDeviceAuthState.status === 'pending') {
+      codexDeviceAuthState = { status: 'error', error: 'Authentication timed out', userCode: null, authUrl: null };
+    }
+    if (codexDeviceAuthProcess) { try { codexDeviceAuthProcess.kill('SIGTERM'); } catch (_) {} codexDeviceAuthProcess = null; }
+  }, 5 * 60 * 1000);
+
+  child.on('error', (e) => {
+    clearInterval(pollInterval);
+    clearTimeout(timeoutId);
+    codexDeviceAuthState = { status: 'error', error: e.message, userCode: null, authUrl: null };
+    codexDeviceAuthProcess = null;
+  });
+  child.on('close', (code) => {
+    clearInterval(pollInterval);
+    clearTimeout(timeoutId);
+    codexDeviceAuthProcess = null;
+    if (codexDeviceAuthState.status === 'pending') {
+      if (code === 0) {
+        const st = getCodexAuthStatus();
+        codexDeviceAuthState = st.authenticated
+          ? { status: 'success', error: null, userCode: codexDeviceAuthState.userCode, authUrl: codexDeviceAuthState.authUrl }
+          : { status: 'error', error: 'Process exited without saving credentials', userCode: null, authUrl: null };
+      } else {
+        codexDeviceAuthState = { status: 'error', error: 'Authentication cancelled', userCode: null, authUrl: null };
+      }
+    }
+  });
+
+  return { started: true };
+}
+
 function buildBaseUrl(req) {
   const override = process.env.AGENTGUI_BASE_URL;
   if (override) return override.replace(/\/+$/, '');
@@ -2177,6 +2267,10 @@ const server = http.createServer(async (req, res) => {
             } else {
               status.detail = 'no credentials';
             }
+          } else if (agent.id === 'codex') {
+            const codexSt = getCodexAuthStatus();
+            status.authenticated = codexSt.authenticated;
+            status.detail = codexSt.detail;
           } else {
             status.detail = 'unknown';
           }
@@ -2659,6 +2753,55 @@ const server = http.createServer(async (req, res) => {
         }
       }
 
+      if (agentId === 'codex') {
+        const conversationId = '__agent_auth__';
+        const result = startCodexDeviceAuth();
+        if (result.alreadyRunning) {
+          sendJSON(req, res, 200, { ok: true, agentId, authUrl: codexDeviceAuthState.authUrl, userCode: codexDeviceAuthState.userCode, status: 'pending' });
+          return;
+        }
+        if (result.alreadyAuthenticated) {
+          sendJSON(req, res, 200, { ok: true, agentId, status: 'success' });
+          return;
+        }
+        broadcastSync({ type: 'script_started', conversationId, script: 'auth-codex', agentId: 'codex', timestamp: Date.now() });
+        broadcastSync({ type: 'script_output', conversationId, data: '\x1b[36mStarting Codex device authorization...\x1b[0m\r\n', stream: 'stdout', timestamp: Date.now() });
+
+        const waitForCode = (tries) => {
+          if (tries <= 0) return;
+          if (codexDeviceAuthState.authUrl && codexDeviceAuthState.userCode) {
+            const msg = `\r\nVisit: ${codexDeviceAuthState.authUrl}\r\nEnter code: ${codexDeviceAuthState.userCode}\r\n`;
+            broadcastSync({ type: 'script_output', conversationId, data: msg, stream: 'stdout', timestamp: Date.now() });
+            return;
+          }
+          setTimeout(() => waitForCode(tries - 1), 500);
+        };
+        waitForCode(10);
+
+        const pollId = setInterval(() => {
+          if (codexDeviceAuthState.status === 'success') {
+            clearInterval(pollId);
+            broadcastSync({ type: 'script_output', conversationId, data: '\r\n\x1b[32mCodex authentication successful\x1b[0m\r\n', stream: 'stdout', timestamp: Date.now() });
+            broadcastSync({ type: 'script_stopped', conversationId, code: 0, timestamp: Date.now() });
+          } else if (codexDeviceAuthState.status === 'error') {
+            clearInterval(pollId);
+            broadcastSync({ type: 'script_output', conversationId, data: `\r\n\x1b[31mAuthentication failed: ${codexDeviceAuthState.error}\x1b[0m\r\n`, stream: 'stderr', timestamp: Date.now() });
+            broadcastSync({ type: 'script_stopped', conversationId, code: 1, error: codexDeviceAuthState.error, timestamp: Date.now() });
+          }
+        }, 1500);
+        setTimeout(() => clearInterval(pollId), 5 * 60 * 1000 + 5000);
+
+        const waitForInfo = (tries) => {
+          if (codexDeviceAuthState.authUrl || tries <= 0) {
+            sendJSON(req, res, 200, { ok: true, agentId, authUrl: codexDeviceAuthState.authUrl, userCode: codexDeviceAuthState.userCode, status: codexDeviceAuthState.status });
+          } else {
+            setTimeout(() => waitForInfo(tries - 1), 400);
+          }
+        };
+        waitForInfo(12);
+        return;
+      }
+
       const authCommands = {
         'claude-code': { cmd: 'claude', args: ['setup-token'] },
         'opencode': { cmd: 'opencode', args: ['auth', 'login'] },
@@ -4190,6 +4333,7 @@ registerUtilHandlers(wsRouter, {
   broadcastSync, getSpeech, getProviderConfigs, saveProviderConfig,
   startGeminiOAuth, exchangeGeminiOAuthCode,
   geminiOAuthState: () => geminiOAuthState,
+  startCodexDeviceAuth, codexDeviceAuthState: () => codexDeviceAuthState,
   STARTUP_CWD, activeScripts, voiceCacheManager, toolManager, discoveredAgents
 });
 

package/static/js/agent-auth.js

@@ -128,6 +128,7 @@
   function closeDropdown() { dropdown.classList.remove('open'); editingProvider = null; }
 
   var oauthPollInterval = null, oauthPollTimeout = null, oauthFallbackTimer = null;
+  var codexPollInterval = null, codexPollTimeout = null;
 
   function cleanupOAuthPolling() {
     if (oauthPollInterval) { clearInterval(oauthPollInterval); oauthPollInterval = null; }
@@ -135,6 +136,96 @@
     if (oauthFallbackTimer) { clearTimeout(oauthFallbackTimer); oauthFallbackTimer = null; }
   }
 
+  function cleanupCodexPolling() {
+    if (codexPollInterval) { clearInterval(codexPollInterval); codexPollInterval = null; }
+    if (codexPollTimeout) { clearTimeout(codexPollTimeout); codexPollTimeout = null; }
+  }
+
+  function removeCodexModal() {
+    var el = document.getElementById('codexDeviceModal');
+    if (el) el.remove();
+  }
+
+  function showCodexDeviceModal(authUrl, userCode) {
+    removeCodexModal();
+    var overlay = document.createElement('div');
+    overlay.id = 'codexDeviceModal';
+    overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.7);display:flex;align-items:center;justify-content:center;z-index:9999;';
+    var displayUrl = authUrl || 'https://auth.openai.com/codex/device';
+    var displayCode = userCode || '';
+    overlay.innerHTML = '<div style="background:var(--color-bg-secondary,#1f2937);border-radius:1rem;padding:2rem;max-width:30rem;width:calc(100% - 2rem);box-shadow:0 25px 50px rgba(0,0,0,0.5);color:var(--color-text-primary,white);font-family:system-ui,sans-serif;" onclick="event.stopPropagation()">' +
+      '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:1.25rem;">' +
+      '<h2 style="font-size:1.125rem;font-weight:700;margin:0;">Codex Sign-In</h2>' +
+      '<button id="codexModalClose" style="background:none;border:none;color:var(--color-text-secondary,#9ca3af);font-size:1.5rem;cursor:pointer;padding:0;line-height:1;">\u00d7</button></div>' +
+      '<div id="codexModalContent" style="text-align:center;">' +
+      '<div style="font-size:2rem;margin-bottom:1rem;animation:pulse 2s infinite;">&#9203;</div>' +
+      '<p style="font-size:0.85rem;color:var(--color-text-secondary,#d1d5db);margin:0 0 1rem;">Follow these steps to sign in with your OpenAI account:</p>' +
+      '<div style="margin-bottom:1rem;">' +
+      '<p style="font-size:0.8rem;color:var(--color-text-secondary,#9ca3af);margin:0 0 0.5rem;text-align:left;">1. Open this link in your browser:</p>' +
+      '<div style="display:flex;gap:0.5rem;align-items:center;">' +
+      '<a href="' + esc(displayUrl) + '" target="_blank" style="flex:1;padding:0.5rem 0.75rem;background:var(--color-primary,#3b82f6);color:white;text-decoration:none;border-radius:0.375rem;font-size:0.8rem;font-weight:600;text-align:center;">Open Sign-In Page</a>' +
+      '</div></div>' +
+      '<div style="margin-bottom:1.25rem;">' +
+      '<p style="font-size:0.8rem;color:var(--color-text-secondary,#9ca3af);margin:0 0 0.5rem;text-align:left;">2. Enter this one-time code:</p>' +
+      '<div style="display:flex;gap:0.5rem;align-items:center;">' +
+      '<div id="codexUserCode" style="flex:1;padding:0.625rem;background:var(--color-bg-primary,#111827);border:2px solid var(--color-primary,#3b82f6);border-radius:0.5rem;font-family:monospace;font-size:1.25rem;font-weight:700;letter-spacing:0.15em;text-align:center;">' + esc(displayCode) + '</div>' +
+      '<button id="codexCopyBtn" style="padding:0.5rem 0.75rem;background:var(--color-bg-primary,#374151);border:1px solid var(--color-border,#4b5563);border-radius:0.375rem;color:var(--color-text-primary,white);font-size:0.75rem;cursor:pointer;flex-shrink:0;">Copy</button>' +
+      '</div></div>' +
+      '<p style="font-size:0.75rem;color:var(--color-text-secondary,#6b7280);margin:0;">This dialog will close automatically when sign-in completes.</p>' +
+      '</div>' +
+      '<div id="codexModalSuccess" style="display:none;text-align:center;padding:1rem 0;">' +
+      '<div style="font-size:3rem;color:#10b981;margin-bottom:0.75rem;">&#10003;</div>' +
+      '<p style="font-weight:600;margin:0 0 0.25rem;">Authentication Successful</p>' +
+      '<p style="font-size:0.8rem;color:var(--color-text-secondary,#9ca3af);margin:0;">Codex CLI is now authenticated.</p>' +
+      '</div>' +
+      '<div style="margin-top:1.25rem;">' +
+      '<button id="codexModalCancel" style="width:100%;padding:0.625rem;border-radius:0.5rem;border:1px solid var(--color-border,#4b5563);background:transparent;color:var(--color-text-primary,white);font-size:0.8rem;cursor:pointer;font-weight:600;">Cancel</button></div>' +
+      '<style>@keyframes pulse{0%,100%{opacity:1}50%{opacity:0.5}}</style></div>';
+    document.body.appendChild(overlay);
+
+    var dismiss = function() { cleanupCodexPolling(); authRunning = false; removeCodexModal(); };
+    document.getElementById('codexModalClose').addEventListener('click', dismiss);
+    document.getElementById('codexModalCancel').addEventListener('click', dismiss);
+
+    var copyBtn = document.getElementById('codexCopyBtn');
+    if (copyBtn && displayCode) {
+      copyBtn.addEventListener('click', function(e) {
+        e.stopPropagation();
+        navigator.clipboard.writeText(displayCode).then(function() {
+          copyBtn.textContent = 'Copied!';
+          setTimeout(function() { copyBtn.textContent = 'Copy'; }, 2000);
+        }).catch(function() {});
+      });
+    }
+
+    cleanupCodexPolling();
+    codexPollInterval = setInterval(function() {
+      window.wsClient.rpc('codex.status')
+        .then(function(st) {
+          if (st.status === 'success') {
+            cleanupCodexPolling();
+            authRunning = false;
+            var content = document.getElementById('codexModalContent');
+            var success = document.getElementById('codexModalSuccess');
+            var cancel = document.getElementById('codexModalCancel');
+            if (content) content.style.display = 'none';
+            if (success) success.style.display = 'block';
+            if (cancel) cancel.textContent = 'Close';
+            setTimeout(function() { removeCodexModal(); refresh(); }, 2500);
+          } else if (st.status === 'error') {
+            cleanupCodexPolling();
+            authRunning = false;
+            removeCodexModal();
+            refresh();
+          }
+        }).catch(function() {});
+    }, 1500);
+    codexPollTimeout = setTimeout(function() {
+      cleanupCodexPolling();
+      if (authRunning) { authRunning = false; removeCodexModal(); }
+    }, 5 * 60 * 1000);
+  }
+
   function showOAuthWaitingModal() {
     removeOAuthModal();
     var overlay = document.createElement('div');
@@ -217,6 +308,19 @@
 
   function triggerAuth(agentId) {
     if (authRunning) return;
+    if (agentId === 'codex') {
+      authRunning = true;
+      window.wsClient.rpc('codex.start')
+        .then(function(data) {
+          if (data.status === 'success') {
+            authRunning = false;
+            refresh();
+            return;
+          }
+          showCodexDeviceModal(data.authUrl, data.userCode);
+        }).catch(function() { authRunning = false; });
+      return;
+    }
     window.wsClient.rpc('agent.auth', { id: agentId })
       .then(function(data) {
         if (data.ok) {
@@ -271,6 +375,8 @@
       authRunning = false;
       removeOAuthModal();
       cleanupOAuthPolling();
+      cleanupCodexPolling();
+      removeCodexModal();
       var term = getTerminal();
       var msg = data.error ? data.error : ('exited with code ' + (data.code || 0));
       if (term) term.writeln('\r\n\x1b[90m[auth ' + msg + ']\x1b[0m');