agentgui 1.0.758 → 1.0.760

package/lib/routes-oauth.js

@@ -0,0 +1,105 @@
+import { startGeminiOAuth, exchangeGeminiOAuthCode, getGeminiOAuthState } from './oauth-gemini.js';
+import { startCodexOAuth, exchangeCodexOAuthCode, getCodexOAuthState } from './oauth-codex.js';
+
+export function register(deps) {
+  const { sendJSON, parseBody, PORT, BASE_URL, rootDir } = deps;
+  const routes = {};
+
+  routes['POST /api/gemini-oauth/start'] = async (req, res) => {
+    try {
+      const result = await startGeminiOAuth(req, { PORT, BASE_URL, rootDir });
+      sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
+    } catch (e) {
+      console.error('[gemini-oauth] /api/gemini-oauth/start failed:', e);
+      sendJSON(req, res, 500, { error: e.message });
+    }
+  };
+
+  routes['GET /api/gemini-oauth/status'] = async (req, res) => {
+    sendJSON(req, res, 200, getGeminiOAuthState());
+  };
+
+  routes['POST /api/gemini-oauth/relay'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const { code, state: stateParam } = body;
+      if (!code || !stateParam) { sendJSON(req, res, 400, { error: 'Missing code or state' }); return; }
+      const email = await exchangeGeminiOAuthCode(code, stateParam);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/gemini-oauth/complete'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const pastedUrl = (body.url || '').trim();
+      if (!pastedUrl) { sendJSON(req, res, 400, { error: 'No URL provided' }); return; }
+      let parsed;
+      try { parsed = new URL(pastedUrl); } catch (_) {
+        sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' }); return;
+      }
+      const error = parsed.searchParams.get('error');
+      if (error) { sendJSON(req, res, 200, { error: parsed.searchParams.get('error_description') || error }); return; }
+      const code = parsed.searchParams.get('code');
+      const state = parsed.searchParams.get('state');
+      const email = await exchangeGeminiOAuthCode(code, state);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/codex-oauth/start'] = async (req, res) => {
+    try {
+      const result = await startCodexOAuth(req, { PORT, BASE_URL });
+      sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
+    } catch (e) {
+      console.error('[codex-oauth] /api/codex-oauth/start failed:', e);
+      sendJSON(req, res, 500, { error: e.message });
+    }
+  };
+
+  routes['GET /api/codex-oauth/status'] = async (req, res) => {
+    sendJSON(req, res, 200, getCodexOAuthState());
+  };
+
+  routes['POST /api/codex-oauth/relay'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const { code, state: stateParam } = body;
+      if (!code || !stateParam) { sendJSON(req, res, 400, { error: 'Missing code or state' }); return; }
+      const email = await exchangeCodexOAuthCode(code, stateParam);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/codex-oauth/complete'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const pastedUrl = (body.url || '').trim();
+      if (!pastedUrl) { sendJSON(req, res, 400, { error: 'No URL provided' }); return; }
+      let parsed;
+      try { parsed = new URL(pastedUrl); } catch (_) {
+        sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' }); return;
+      }
+      const error = parsed.searchParams.get('error');
+      if (error) { sendJSON(req, res, 200, { error: parsed.searchParams.get('error_description') || error }); return; }
+      const code = parsed.searchParams.get('code');
+      const state = parsed.searchParams.get('state');
+      const email = await exchangeCodexOAuthCode(code, state);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['_match'] = (method, pathOnly) => {
+    return routes[`${method} ${pathOnly}`] || null;
+  };
+
+  return routes;
+}

package/lib/routes-util.js

@@ -0,0 +1,106 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+
+export function register(deps) {
+  const { sendJSON, parseBody, queries, STARTUP_CWD, PKG_VERSION } = deps;
+  const routes = {};
+
+  routes['GET /api/import/claude-code'] = async (req, res) => {
+    const result = queries.importClaudeCodeConversations();
+    sendJSON(req, res, 200, { imported: result });
+  };
+
+  routes['GET /api/discover/claude-code'] = async (req, res) => {
+    const discovered = queries.discoverClaudeCodeConversations();
+    sendJSON(req, res, 200, { discovered });
+  };
+
+  routes['GET /api/home'] = async (req, res) => {
+    sendJSON(req, res, 200, { home: os.homedir(), cwd: STARTUP_CWD });
+  };
+
+  routes['GET /api/version'] = async (req, res) => {
+    sendJSON(req, res, 200, { version: PKG_VERSION });
+  };
+
+  routes['POST /api/clone'] = async (req, res) => {
+    const body = await parseBody(req);
+    const repo = (body.repo || '').trim();
+    if (!repo || !/^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/.test(repo)) {
+      sendJSON(req, res, 400, { error: 'Invalid repo format. Use org/repo or user/repo' });
+      return;
+    }
+    const cloneDir = STARTUP_CWD || os.homedir();
+    const repoName = repo.split('/')[1];
+    const targetPath = path.join(cloneDir, repoName);
+    if (fs.existsSync(targetPath)) {
+      sendJSON(req, res, 409, { error: `Directory already exists: ${repoName}`, path: targetPath });
+      return;
+    }
+    try {
+      const isWindows = os.platform() === 'win32';
+      execSync('git clone https://github.com/' + repo + '.git', {
+        cwd: cloneDir, encoding: 'utf-8', timeout: 120000,
+        stdio: ['pipe', 'pipe', 'pipe'],
+        env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        shell: isWindows
+      });
+      sendJSON(req, res, 200, { ok: true, repo, path: targetPath, name: repoName });
+    } catch (err) {
+      sendJSON(req, res, 500, { error: (err.stderr || err.message || 'Clone failed').trim() });
+    }
+  };
+
+  routes['POST /api/folders'] = async (req, res) => {
+    const body = await parseBody(req);
+    const folderPath = body.path || STARTUP_CWD;
+    try {
+      const expandedPath = folderPath.startsWith('~') ? folderPath.replace('~', os.homedir()) : folderPath;
+      const entries = fs.readdirSync(expandedPath, { withFileTypes: true });
+      const folders = entries
+        .filter(e => e.isDirectory() && !e.name.startsWith('.'))
+        .map(e => ({ name: e.name }))
+        .sort((a, b) => a.name.localeCompare(b.name));
+      sendJSON(req, res, 200, { folders });
+    } catch (err) {
+      sendJSON(req, res, 400, { error: err.message });
+    }
+  };
+
+  routes['GET /api/git/check-remote-ownership'] = async (req, res) => {
+    try {
+      const isWindows = os.platform() === 'win32';
+      const result = execSync('git remote get-url origin' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
+      const remoteUrl = result.trim();
+      const statusResult = execSync('git status --porcelain' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
+      const hasChanges = statusResult.trim().length > 0;
+      const unpushedResult = execSync('git rev-list --count --not --remotes' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
+      const hasUnpushed = parseInt(unpushedResult.trim() || '0', 10) > 0;
+      const ownsRemote = !remoteUrl.includes('github.com/') || remoteUrl.includes(process.env.GITHUB_USER || '');
+      sendJSON(req, res, 200, { ownsRemote, hasChanges, hasUnpushed, remoteUrl });
+    } catch {
+      sendJSON(req, res, 200, { ownsRemote: false, hasChanges: false, hasUnpushed: false, remoteUrl: '' });
+    }
+  };
+
+  routes['POST /api/git/push'] = async (req, res) => {
+    try {
+      const isWindows = os.platform() === 'win32';
+      const gitCommand = isWindows
+        ? 'git add -A & git commit -m "Auto-commit" & git push'
+        : 'git add -A && git commit -m "Auto-commit" && git push';
+      execSync(gitCommand, { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
+      sendJSON(req, res, 200, { success: true });
+    } catch (err) {
+      sendJSON(req, res, 500, { error: err.message });
+    }
+  };
+
+  routes['_match'] = (method, pathOnly) => {
+    return routes[`${method} ${pathOnly}`] || null;
+  };
+
+  return routes;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.758",
+  "version": "1.0.760",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/server.js

@@ -20,6 +20,8 @@ import { findCommand, queryACPServerAgents, discoverAgents, discoverExternalACPS
 import { getGeminiOAuthCreds, startGeminiOAuth, exchangeGeminiOAuthCode, handleGeminiOAuthCallback, getGeminiOAuthStatus, getGeminiOAuthState } from './lib/oauth-gemini.js';
 import { initSpeechManager, getSpeech, ensurePocketTtsSetup, voiceCacheManager, modelDownloadState, broadcastModelProgress, ensureModelsDownloaded, eagerTTS } from './lib/speech-manager.js';
 import { register as registerSpeechRoutes } from './lib/routes-speech.js';
+import { register as registerOAuthRoutes } from './lib/routes-oauth.js';
+import { register as registerUtilRoutes } from './lib/routes-util.js';
 import { startCodexOAuth, exchangeCodexOAuthCode, handleCodexOAuthCallback, getCodexOAuthStatus, getCodexOAuthState, CODEX_HOME, CODEX_AUTH_FILE } from './lib/oauth-codex.js';
 import { WSOptimizer } from './lib/ws-optimizer.js';
 import { WsRouter } from './lib/ws-protocol.js';
@@ -1999,130 +2001,8 @@ const server = http.createServer(async (req, res) => {
       return;
     }
 
-    if (pathOnly === '/api/gemini-oauth/start' && req.method === 'POST') {
-      try {
-        const result = await startGeminiOAuth(req, { PORT, BASE_URL, rootDir });
-        sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
-      } catch (e) {
-        console.error('[gemini-oauth] /api/gemini-oauth/start failed:', e);
-        sendJSON(req, res, 500, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/status' && req.method === 'GET') {
-      sendJSON(req, res, 200, getGeminiOAuthState());
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/relay' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const { code, state: stateParam } = body;
-        if (!code || !stateParam) {
-          sendJSON(req, res, 400, { error: 'Missing code or state' });
-          return;
-        }
-        const email = await exchangeGeminiOAuthCode(code, stateParam);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/complete' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const pastedUrl = (body.url || '').trim();
-        if (!pastedUrl) {
-          sendJSON(req, res, 400, { error: 'No URL provided' });
-          return;
-        }
-
-        let parsed;
-        try { parsed = new URL(pastedUrl); } catch (_) {
-          sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' });
-          return;
-        }
-
-        const error = parsed.searchParams.get('error');
-        if (error) {
-          const desc = parsed.searchParams.get('error_description') || error;
-          sendJSON(req, res, 200, { error: desc });
-          return;
-        }
-
-        const code = parsed.searchParams.get('code');
-        const state = parsed.searchParams.get('state');
-        const email = await exchangeGeminiOAuthCode(code, state);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/start' && req.method === 'POST') {
-      try {
-        const result = await startCodexOAuth(req, { PORT, BASE_URL });
-        sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
-      } catch (e) {
-        console.error('[codex-oauth] /api/codex-oauth/start failed:', e);
-        sendJSON(req, res, 500, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/status' && req.method === 'GET') {
-      sendJSON(req, res, 200, getCodexOAuthState());
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/relay' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const { code, state: stateParam } = body;
-        if (!code || !stateParam) {
-          sendJSON(req, res, 400, { error: 'Missing code or state' });
-          return;
-        }
-        const email = await exchangeCodexOAuthCode(code, stateParam);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/complete' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const pastedUrl = (body.url || '').trim();
-        if (!pastedUrl) {
-          sendJSON(req, res, 400, { error: 'No URL provided' });
-          return;
-        }
-        let parsed;
-        try { parsed = new URL(pastedUrl); } catch (_) {
-          sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' });
-          return;
-        }
-        const error = parsed.searchParams.get('error');
-        if (error) {
-          const desc = parsed.searchParams.get('error_description') || error;
-          sendJSON(req, res, 200, { error: desc });
-          return;
-        }
-        const code = parsed.searchParams.get('code');
-        const state = parsed.searchParams.get('state');
-        const email = await exchangeCodexOAuthCode(code, state);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
+    const oauthHandler = _oauthRoutes._match(req.method, pathOnly);
+    if (oauthHandler) { await oauthHandler(req, res); return; }
 
     const agentAuthMatch = pathOnly.match(/^\/api\/agents\/([^/]+)\/auth$/);
     if (agentAuthMatch && req.method === 'POST') {
@@ -2296,113 +2176,12 @@ const server = http.createServer(async (req, res) => {
       return;
     }
 
-    if (pathOnly === '/api/import/claude-code' && req.method === 'GET') {
-      const result = queries.importClaudeCodeConversations();
-            sendJSON(req, res, 200, { imported: result });
-      return;
-    }
-
-    if (pathOnly === '/api/discover/claude-code' && req.method === 'GET') {
-      const discovered = queries.discoverClaudeCodeConversations();
-            sendJSON(req, res, 200, { discovered });
-      return;
-    }
-
-    if (pathOnly === '/api/home' && req.method === 'GET') {
-            sendJSON(req, res, 200, { home: os.homedir(), cwd: STARTUP_CWD });
-      return;
-    }
-
-    if (pathOnly === '/api/version' && req.method === 'GET') {
-      sendJSON(req, res, 200, { version: PKG_VERSION });
-      return;
-    }
-
     const speechHandler = _speechRoutes._match(req.method, pathOnly);
     if (speechHandler) { await speechHandler(req, res, pathOnly); return; }
 
-    if (pathOnly === '/api/clone' && req.method === 'POST') {
-      const body = await parseBody(req);
-      const repo = (body.repo || '').trim();
-      if (!repo || !/^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/.test(repo)) {
-        sendJSON(req, res, 400, { error: 'Invalid repo format. Use org/repo or user/repo' });
-        return;
-      }
-      const cloneDir = STARTUP_CWD || os.homedir();
-      const repoName = repo.split('/')[1];
-      const targetPath = path.join(cloneDir, repoName);
-      if (fs.existsSync(targetPath)) {
-        sendJSON(req, res, 409, { error: `Directory already exists: ${repoName}`, path: targetPath });
-        return;
-      }
-      try {
-        const isWindows = os.platform() === 'win32';
-        execSync('git clone https://github.com/' + repo + '.git', {
-          cwd: cloneDir,
-          encoding: 'utf-8',
-          timeout: 120000,
-          stdio: ['pipe', 'pipe', 'pipe'],
-          env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
-          shell: isWindows
-        });
-        sendJSON(req, res, 200, { ok: true, repo, path: targetPath, name: repoName });
-      } catch (err) {
-        const stderr = err.stderr || err.message || 'Clone failed';
-        sendJSON(req, res, 500, { error: stderr.trim() });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/folders' && req.method === 'POST') {
-      const body = await parseBody(req);
-      const folderPath = body.path || STARTUP_CWD;
-      try {
-        const expandedPath = folderPath.startsWith('~') ?
-          folderPath.replace('~', os.homedir()) : folderPath;
-        const entries = fs.readdirSync(expandedPath, { withFileTypes: true });
-        const folders = entries
-          .filter(e => e.isDirectory() && !e.name.startsWith('.'))
-          .map(e => ({ name: e.name }))
-          .sort((a, b) => a.name.localeCompare(b.name));
-                sendJSON(req, res, 200, { folders });
-      } catch (err) {
-                sendJSON(req, res, 400, { error: err.message });
-      }
-      return;
-    }
+    const utilHandler = _utilRoutes._match(req.method, pathOnly);
+    if (utilHandler) { await utilHandler(req, res); return; }
 
-    if (pathOnly === '/api/git/check-remote-ownership' && req.method === 'GET') {
-      try {
-        const isWindows = os.platform() === 'win32';
-        const result = execSync('git remote get-url origin' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
-        const remoteUrl = result.trim();
-        const statusResult = execSync('git status --porcelain' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
-        const hasChanges = statusResult.trim().length > 0;
-        const unpushedResult = execSync('git rev-list --count --not --remotes' + (isWindows ? '' : ' 2>/dev/null'), { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
-        const hasUnpushed = parseInt(unpushedResult.trim() || '0', 10) > 0;
-        const ownsRemote = !remoteUrl.includes('github.com/') || remoteUrl.includes(process.env.GITHUB_USER || '');
-        sendJSON(req, res, 200, { ownsRemote, hasChanges, hasUnpushed, remoteUrl });
-      } catch {
-        sendJSON(req, res, 200, { ownsRemote: false, hasChanges: false, hasUnpushed: false, remoteUrl: '' });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/git/push' && req.method === 'POST') {
-      try {
-        const isWindows = os.platform() === 'win32';
-        const gitCommand = isWindows
-          ? 'git add -A & git commit -m "Auto-commit" & git push'
-          : 'git add -A && git commit -m "Auto-commit" && git push';
-        execSync(gitCommand, { encoding: 'utf-8', cwd: STARTUP_CWD, shell: isWindows });
-        sendJSON(req, res, 200, { success: true });
-      } catch (err) {
-        sendJSON(req, res, 500, { error: err.message });
-      }
-      return;
-    }
-
-    // ============================================================
     // THREAD API ENDPOINTS (ACP v0.2.3)
     // ============================================================
 
@@ -3545,6 +3324,8 @@ const wsRouter = new WsRouter();
 
 initSpeechManager({ broadcastSync, syncClients, queries });
 const _speechRoutes = registerSpeechRoutes({ sendJSON, parseBody, broadcastSync, debugLog });
+const _oauthRoutes = registerOAuthRoutes({ sendJSON, parseBody, PORT, BASE_URL, rootDir });
+const _utilRoutes = registerUtilRoutes({ sendJSON, parseBody, queries, STARTUP_CWD, PKG_VERSION });
 
 registerConvHandlers(wsRouter, {
   queries, activeExecutions, rateLimitState,