Merge pull request #837 from web3dev1337/feat/site-content-rewrite

feat: rewrite showcase site + default ports 9460-9463

Author: web3dev1337

client/dev-server.js

@@ -4,8 +4,8 @@ const path = require('path');
 const { createProxyMiddleware } = require('http-proxy-middleware');
 
 const app = express();
-const BASE_PORT = parseInt(process.env.CLIENT_PORT || '2080', 10);
-const SERVER_PORT = process.env.ORCHESTRATOR_PORT || 3000;
+const BASE_PORT = parseInt(process.env.CLIENT_PORT || '9461', 10);
+const SERVER_PORT = process.env.ORCHESTRATOR_PORT || 9460;
 
 // Proxy socket.io requests to the backend server
 app.use('/socket.io', createProxyMiddleware({
@@ -29,7 +29,7 @@ app.get('*', (req, res) => {
     res.sendFile(path.join(__dirname, 'index.html'));
 });
 
-let port = Number.isFinite(BASE_PORT) ? BASE_PORT : 2080;
+let port = Number.isFinite(BASE_PORT) ? BASE_PORT : 9461;
 const MAX_PORT_ATTEMPTS = 20;
 let attempts = 0;
 

server/diffViewerService.js

@@ -24,7 +24,7 @@ function getDefaultShell() {
 class DiffViewerService {
   constructor() {
     this.diffViewerRoot = path.join(__dirname, '..', 'diff-viewer');
-    this.port = parseInt(process.env.DIFF_VIEWER_PORT || '7655', 10);
+    this.port = parseInt(process.env.DIFF_VIEWER_PORT || '9462', 10);
     this.baseUrl = `http://localhost:${this.port}`;
 
     this.processInfo = null; // { pid, startedAt, logPath }

server/index.js

@@ -299,7 +299,7 @@ const quickLinksService = QuickLinksService.getInstance();
 const recommendationsService = RecommendationsService.getInstance();
 const activityFeed = ActivityFeedService.getInstance();
 activityFeed.setIO(io);
-activityFeed.track('server.started', { port: Number(process.env.ORCHESTRATOR_PORT || 3000) });
+activityFeed.track('server.started', { port: Number(process.env.ORCHESTRATOR_PORT || 9460) });
 const productLauncherService = ProductLauncherService.getInstance();
 const conversationService = ConversationService.getInstance();
 const agentProviderService = AgentProviderService.getInstance({ agentManager, logger });
@@ -7590,7 +7590,7 @@ app.post('/api/commander/execute-text', async (req, res) => {
       return res.status(400).json({ ok: false, error: 'text too long' });
     }
 
-    // Keep the parser context in sync with Commander’s current UI state.
+    // Keep the parser context in sync with Commander's current UI state.
     try {
       const snapshot = commanderContextService.getSnapshot({ workspaceManager, commanderService, commandRegistry });
       voiceCommandService.setContext(snapshot?.context || {});
@@ -8107,7 +8107,8 @@ app.get('/replay-viewer/:worktreeId/*?', (req, res) => {
 });
 
 // Start server
-const PORT = Number(process.env.ORCHESTRATOR_PORT || 3000);
+const DESIRED_PORT = Number(process.env.ORCHESTRATOR_PORT || 9460);
+const MAX_PORT_ATTEMPTS = 10;
 const hostPolicy = evaluateBindSecurity({
   host: process.env.ORCHESTRATOR_HOST || process.env.HOST,
   authToken: AUTH_TOKEN,
@@ -8116,64 +8117,85 @@ const hostPolicy = evaluateBindSecurity({
 const HOST = hostPolicy.host;
 
 if (!hostPolicy.allowStart) {
-  logger.error('Refusing to bind to a non-loopback host without AUTH_TOKEN. Set AUTH_TOKEN or set ORCHESTRATOR_ALLOW_INSECURE_LAN_NO_AUTH=1 to override.', { host: HOST, port: PORT });
+  logger.error('Refusing to bind to a non-loopback host without AUTH_TOKEN. Set AUTH_TOKEN or set ORCHESTRATOR_ALLOW_INSECURE_LAN_NO_AUTH=1 to override.', { host: HOST, port: DESIRED_PORT });
   process.exit(1);
 }
 
-httpServer.listen(PORT, HOST, () => {
-  logger.info(`Server running on http://${HOST}:${PORT}`);
-  if (!hostPolicy.isLoopback) {
-    const bindType = hostPolicy.isBindAll ? 'bind-all' : 'explicit-host';
-    logger.info(`LAN access enabled (${bindType}) on port ${PORT}`);
-    if (!hostPolicy.hasAuthToken) {
-      logger.warn('LAN access is enabled without AUTH_TOKEN. This is insecure; anyone on the network can control this orchestrator.', { host: HOST, port: PORT });
+function tryListen(port, attempt) {
+  httpServer.listen(port, HOST, () => {
+    if (port !== DESIRED_PORT) {
+      logger.info(`Port ${DESIRED_PORT} in use, bound to port ${port} instead`);
     }
-  }
-  if (hostPolicy.hasAuthToken) {
-    logger.info('Authentication enabled');
-  }
+    logger.info(`Server running on http://${HOST}:${port}`);
+    // Expose actual port for other services to discover
+    process.env.ORCHESTRATOR_PORT = String(port);
 
-  // Start the Advanced Diff Viewer in the background.
-  // Default: enabled, since users expect the 🔍 diff viewer to be ready without manual terminal steps.
-  const autoStartRaw = String(process.env.AUTO_START_DIFF_VIEWER ?? 'true').toLowerCase();
-  const shouldAutoStartDiffViewer = !['0', 'false', 'no'].includes(autoStartRaw);
-  if (shouldAutoStartDiffViewer) {
-    diffViewerService.ensureRunning().catch((error) => {
-      logger.warn('Diff viewer auto-start failed', { error: error.message });
-    });
-  }
-  
-  // Initialize sessions
-  const shouldAutoEnsureDiscordServices = (() => {
-    const envRaw = String(process.env.DISCORD_AUTO_ENSURE_SERVICES ?? '').trim().toLowerCase();
-    if (envRaw) return !['0', 'false', 'no'].includes(envRaw);
+    if (!hostPolicy.isLoopback) {
+      const bindType = hostPolicy.isBindAll ? 'bind-all' : 'explicit-host';
+      logger.info(`LAN access enabled (${bindType}) on port ${port}`);
+      if (!hostPolicy.hasAuthToken) {
+        logger.warn('LAN access is enabled without AUTH_TOKEN. This is insecure; anyone on the network can control this orchestrator.', { host: HOST, port });
+      }
+    }
+    if (hostPolicy.hasAuthToken) {
+      logger.info('Authentication enabled');
+    }
 
-    try {
-      const cfg = userSettingsService?.settings?.global?.ui?.discord || {};
-      return cfg.autoEnsureServicesAtStartup === true;
-    } catch {
-      return false;
+    // Start the Advanced Diff Viewer in the background.
+    // Default: enabled, since users expect the diff viewer to be ready without manual terminal steps.
+    const autoStartRaw = String(process.env.AUTO_START_DIFF_VIEWER ?? 'true').toLowerCase();
+    const shouldAutoStartDiffViewer = !['0', 'false', 'no'].includes(autoStartRaw);
+    if (shouldAutoStartDiffViewer) {
+      diffViewerService.ensureRunning().catch((error) => {
+        logger.warn('Diff viewer auto-start failed', { error: error.message });
+      });
     }
-  })();
 
-  workspaceSystemReady
-    .then((workspaceReady) => {
-      if (!workspaceReady) {
-        return;
+    // Initialize sessions
+    const shouldAutoEnsureDiscordServices = (() => {
+      const envRaw = String(process.env.DISCORD_AUTO_ENSURE_SERVICES ?? '').trim().toLowerCase();
+      if (envRaw) return !['0', 'false', 'no'].includes(envRaw);
+
+      try {
+        const cfg = userSettingsService?.settings?.global?.ui?.discord || {};
+        return cfg.autoEnsureServicesAtStartup === true;
+      } catch {
+        return false;
       }
-      return sessionManager.initializeSessions();
-    })
-    .then(() => {
-      if (!shouldAutoEnsureDiscordServices) return;
-      // Don’t block server startup; just best-effort keep Services running after restarts.
-      return discordIntegrationService.ensureDiscordServices({ sessionManager, workspaceManager })
-        .then(() => logger.info('Discord services ensured on startup'))
-        .catch((error) => logger.warn('Failed to ensure Discord services on startup', { error: error.message }));
-    })
-    .catch((error) => {
-      logger.error('Failed to initialize sessions', { error: error.message, stack: error.stack });
-    });
-});
+    })();
+
+    workspaceSystemReady
+      .then((workspaceReady) => {
+        if (!workspaceReady) {
+          return;
+        }
+        return sessionManager.initializeSessions();
+      })
+      .then(() => {
+        if (!shouldAutoEnsureDiscordServices) return;
+        // Don't block server startup; just best-effort keep Services running after restarts.
+        return discordIntegrationService.ensureDiscordServices({ sessionManager, workspaceManager })
+          .then(() => logger.info('Discord services ensured on startup'))
+          .catch((error) => logger.warn('Failed to ensure Discord services on startup', { error: error.message }));
+      })
+      .catch((error) => {
+        logger.error('Failed to initialize sessions', { error: error.message, stack: error.stack });
+      });
+  });
+
+  httpServer.once('error', (err) => {
+    if (err.code === 'EADDRINUSE' && attempt < MAX_PORT_ATTEMPTS) {
+      logger.warn(`Port ${port} in use, trying ${port + 1}...`);
+      httpServer.close();
+      tryListen(port + 1, attempt + 1);
+    } else {
+      logger.error('Failed to start server', { error: err.message, port, attempts: attempt });
+      process.exit(1);
+    }
+  });
+}
+
+tryListen(DESIRED_PORT, 1);
 
 // Graceful shutdown
 process.on('SIGTERM', () => shutdown('SIGTERM'));

server/portRegistry.js

@@ -26,12 +26,13 @@ const logger = winston.createLogger({
 const PORT_RANGE_START = 8080;
 const PORT_RANGE_END = 8199;
 const RESERVED_PORTS = [
-  3000,  // Agent Workspace server
-  4000,  // Agent Workspace dev server
-  2080,  // Client dev server
-  2081,  // Client dev server (dev instance)
-  7655,  // Diff viewer
-  7656,  // Diff viewer (dev instance)
+  9460,  // Agent Workspace server
+  9461,  // Client dev server
+  9462,  // Diff viewer
+  9463,  // Tauri dev
+  3000,  // Legacy / alternate server
+  4000,  // Legacy / alternate dev server
+  2080,  // Legacy client
 ];
 
 class PortRegistry {
@@ -588,12 +589,13 @@ class PortRegistry {
   identifyService(port, processName, projectInfo = null) {
     // Known ports mapping
     const knownPorts = {
-      3000: { name: 'Agent Workspace', type: 'orchestrator', icon: '🎛️' },
+      9460: { name: 'Agent Workspace', type: 'orchestrator', icon: '🎛️' },
+      9461: { name: 'Agent Workspace Client', type: 'client', icon: '🖥️' },
+      9462: { name: 'Diff Viewer', type: 'diff-viewer', icon: '📝' },
+      9463: { name: 'Tauri Dev', type: 'tauri-dev', icon: '🖥️' },
+      3000: { name: 'Agent Workspace (Legacy)', type: 'orchestrator', icon: '🎛️' },
       4000: { name: 'Agent Workspace (Dev)', type: 'orchestrator-dev', icon: '🔧' },
-      2080: { name: 'Orchestrator Client', type: 'client', icon: '🖥️' },
-      2081: { name: 'Orchestrator Client (Dev)', type: 'client-dev', icon: '🖥️' },
-      7655: { name: 'Diff Viewer', type: 'diff-viewer', icon: '📝' },
-      7656: { name: 'Diff Viewer (Dev)', type: 'diff-viewer-dev', icon: '📝' },
+      2080: { name: 'Agent Workspace Client (Legacy)', type: 'client', icon: '🖥️' },
       5173: { name: 'Vite Dev Server', type: 'vite', icon: '⚡' },
       5174: { name: 'Vite Dev Server', type: 'vite', icon: '⚡' },
       3001: { name: 'React Dev Server', type: 'react', icon: '⚛️' },