agentgui 1.0.842 → 1.0.843

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [Unreleased]
 
 ### Refactor
+- Extract express upload + fsbrowse setup from server.js to lib/routes-upload.js (79L) exporting createExpressApp; server.js imports createExpressApp and no longer contains Busboy/fsbrowse/express inline code
 - Extract maskKey, getProviderConfigs, saveProviderConfig, buildSystemPrompt, PROVIDER_CONFIGS from server.js to lib/provider-config.js (151L); extract logError, makeCleanupExecution, makeGetModelsForAgent, errLogPath from server.js to lib/server-utils.js (61L); server.js imports all via named imports; cleanupExecution wired after broadcastSync; _debugRoutes receives errLogPath
 - Extract parseBody, acceptsEncoding, compressAndSend, sendJSON from server.js to lib/http-utils.js (43L); server.js imports from new module; zlib import removed from server.js
 - Extract message/stream/queue routes (messagesMatch, streamMatch, queueMatch handlers) to lib/routes-messages.js (140L) and session/chunk/full/execution routes to lib/routes-sessions.js (145L); server.js reduced from 2406L to 2127L; both files ≤200L; wired via _messagesRoutes._match and _sessionsRoutes._match in request handler

package/lib/routes-upload.js

@@ -0,0 +1,79 @@
+import express from 'express';
+import Busboy from 'busboy';
+import fsbrowse from 'fsbrowse';
+import fs from 'fs';
+import path from 'path';
+
+export function createExpressApp({ queries, BASE_URL }) {
+  const app = express();
+  const fsbrowseRouters = new Map();
+
+  app.post(BASE_URL + '/api/upload/:conversationId', (req, res) => {
+    try {
+      const conv = queries.getConversation(req.params.conversationId);
+      if (!conv) return res.status(404).json({ error: 'Conversation not found' });
+      if (!conv.workingDirectory) return res.status(400).json({ error: 'No working directory set for this conversation' });
+
+      const uploadDir = conv.workingDirectory;
+      if (!fs.existsSync(uploadDir)) {
+        fs.mkdirSync(uploadDir, { recursive: true });
+      }
+
+      const bb = Busboy({ headers: req.headers });
+      const fileNames = [];
+      const writePromises = [];
+
+      bb.on('file', (fieldname, file, info) => {
+        const safeName = path.basename(info.filename);
+        const filePath = path.join(uploadDir, safeName);
+        fileNames.push(safeName);
+        const p = new Promise((resolve) => {
+          const writeStream = fs.createWriteStream(filePath);
+          file.pipe(writeStream);
+          writeStream.on('finish', resolve);
+          writeStream.on('error', () => { file.resume(); resolve(); });
+        });
+        writePromises.push(p);
+      });
+
+      bb.on('finish', () => {
+        Promise.all(writePromises).then(() => {
+          res.json({ ok: true, files: fileNames, count: fileNames.length });
+        }).catch(() => {
+          res.json({ ok: true, files: fileNames, count: fileNames.length });
+        });
+      });
+
+      bb.on('error', (err) => {
+        res.status(500).json({ error: 'Upload failed: ' + err.message });
+      });
+
+      req.pipe(bb);
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  app.use(BASE_URL + '/files/:conversationId', (req, res, next) => {
+    const convId = req.params.conversationId;
+    const conv = queries.getConversation(convId);
+    if (!conv || !conv.workingDirectory) {
+      return res.status(404).json({ error: 'Conversation not found or no working directory' });
+    }
+
+    const normalizedWorkingDir = path.resolve(conv.workingDirectory);
+
+    let router = fsbrowseRouters.get(convId);
+    if (!router) {
+      router = fsbrowse({ baseDir: normalizedWorkingDir, name: 'Files' });
+      fsbrowseRouters.set(convId, router);
+    }
+
+    req.baseUrl = BASE_URL + '/files/' + convId;
+    req.url = req.url.replace(new RegExp(`^${BASE_URL}/files/${convId}`), '');
+
+    router(req, res, next);
+  });
+
+  return app;
+}

package/package.json

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

package/server.js

@@ -9,9 +9,7 @@ import { LRUCache } from 'lru-cache';
 import { createRequire } from 'module';
 import crypto from 'crypto';
 const PKG_VERSION = JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version;
-import express from 'express';
-import Busboy from 'busboy';
-import fsbrowse from 'fsbrowse';
+import { createExpressApp } from './lib/routes-upload.js';
 import { queries } from './database.js';
 import { runClaudeWithStreaming } from './lib/claude-runner-run.js';
 import { initializeDescriptors, getAgentDescriptor } from './lib/agent-descriptors.js';
@@ -111,85 +109,7 @@ const STARTUP_CWD = (() => {
 const staticDir = path.join(rootDir, 'static');
 if (!fs.existsSync(staticDir)) fs.mkdirSync(staticDir, { recursive: true });
 
-// Express sub-app for fsbrowse file browser and file upload
-const expressApp = express();
-
-
-// File upload endpoint - copies dropped files to conversation workingDirectory
-expressApp.post(BASE_URL + '/api/upload/:conversationId', (req, res) => {
-  try {
-    const conv = queries.getConversation(req.params.conversationId);
-    if (!conv) return res.status(404).json({ error: 'Conversation not found' });
-    if (!conv.workingDirectory) return res.status(400).json({ error: 'No working directory set for this conversation' });
-
-    const uploadDir = conv.workingDirectory;
-    if (!fs.existsSync(uploadDir)) {
-      fs.mkdirSync(uploadDir, { recursive: true });
-    }
-
-    const bb = Busboy({ headers: req.headers });
-    const fileNames = [];
-    const writePromises = [];
-
-    bb.on('file', (fieldname, file, info) => {
-      const safeName = path.basename(info.filename);
-      const filePath = path.join(uploadDir, safeName);
-      fileNames.push(safeName);
-      const p = new Promise((resolve) => {
-        const writeStream = fs.createWriteStream(filePath);
-        file.pipe(writeStream);
-        writeStream.on('finish', resolve);
-        writeStream.on('error', () => { file.resume(); resolve(); });
-      });
-      writePromises.push(p);
-    });
-
-    bb.on('finish', () => {
-      Promise.all(writePromises).then(() => {
-        res.json({ ok: true, files: fileNames, count: fileNames.length });
-      }).catch(() => {
-        res.json({ ok: true, files: fileNames, count: fileNames.length });
-      });
-    });
-
-    bb.on('error', (err) => {
-      res.status(500).json({ error: 'Upload failed: ' + err.message });
-    });
-
-    req.pipe(bb);
-  } catch (err) {
-    res.status(500).json({ error: err.message });
-  }
-});
-
-// Cache fsbrowse routers per conversation to ensure API calls work
-const fsbrowseRouters = new Map();
-
-// fsbrowse file browser - mounted per conversation workingDirectory
-// Route: /gm/files/:conversationId/*
-expressApp.use(BASE_URL + '/files/:conversationId', (req, res, next) => {
-  const convId = req.params.conversationId;
-  const conv = queries.getConversation(convId);
-  if (!conv || !conv.workingDirectory) {
-    return res.status(404).json({ error: 'Conversation not found or no working directory' });
-  }
-
-  // Normalize the working directory path to avoid Windows path duplication issues
-  const normalizedWorkingDir = path.resolve(conv.workingDirectory);
-
-  // Get or create cached fsbrowse router for this conversation
-  let router = fsbrowseRouters.get(convId);
-  if (!router) {
-    router = fsbrowse({ baseDir: normalizedWorkingDir, name: 'Files' });
-    fsbrowseRouters.set(convId, router);
-  }
-
-  // Set baseUrl before calling the router
-  req.baseUrl = BASE_URL + '/files/' + convId;
-  req.url = req.url.replace(new RegExp(`^${BASE_URL}/files/${convId}`), '');
-
-  router(req, res, next);
-});
+const expressApp = createExpressApp({ queries, BASE_URL });
 
 let discoveredAgents = [];
 initializeDescriptors(discoveredAgents);