Merge pull request #95 from AutoMaker-Org/refactor-api-approach

refactoring the api endpoints to be separate files to reduce context …

Author: webdevcody

README.md

@@ -4,7 +4,7 @@
 >
 > Automaker itself was built by a group of engineers using AI and agentic coding techniques to build features faster than ever. By leveraging tools like Cursor IDE and Claude Code CLI, the team orchestrated AI agents to implement complex functionality in days instead of weeks.
 >
-> **Learn how:** Master these same techniques and workflows in the [Agentic Jumpstart course](https://agenticjumpstart.com/).
+> **Learn how:** Master these same techniques and workflows in the [Agentic Jumpstart course](https://agenticjumpstart.com/?utm=automaker).
 
 # Automaker
 

apps/server/src/index.ts

@@ -16,26 +16,26 @@ import dotenv from "dotenv";
 import { createEventEmitter, type EventEmitter } from "./lib/events.js";
 import { initAllowedPaths } from "./lib/security.js";
 import { authMiddleware, getAuthStatus } from "./lib/auth.js";
-import { createFsRoutes } from "./routes/fs.js";
-import { createHealthRoutes } from "./routes/health.js";
-import { createAgentRoutes } from "./routes/agent.js";
-import { createSessionsRoutes } from "./routes/sessions.js";
-import { createFeaturesRoutes } from "./routes/features.js";
-import { createAutoModeRoutes } from "./routes/auto-mode.js";
-import { createWorktreeRoutes } from "./routes/worktree.js";
-import { createGitRoutes } from "./routes/git.js";
-import { createSetupRoutes } from "./routes/setup.js";
-import { createSuggestionsRoutes } from "./routes/suggestions.js";
-import { createModelsRoutes } from "./routes/models.js";
-import { createRunningAgentsRoutes } from "./routes/running-agents.js";
-import { createWorkspaceRoutes } from "./routes/workspace.js";
-import { createTemplatesRoutes } from "./routes/templates.js";
+import { createFsRoutes } from "./routes/fs/index.js";
+import { createHealthRoutes } from "./routes/health/index.js";
+import { createAgentRoutes } from "./routes/agent/index.js";
+import { createSessionsRoutes } from "./routes/sessions/index.js";
+import { createFeaturesRoutes } from "./routes/features/index.js";
+import { createAutoModeRoutes } from "./routes/auto-mode/index.js";
+import { createWorktreeRoutes } from "./routes/worktree/index.js";
+import { createGitRoutes } from "./routes/git/index.js";
+import { createSetupRoutes } from "./routes/setup/index.js";
+import { createSuggestionsRoutes } from "./routes/suggestions/index.js";
+import { createModelsRoutes } from "./routes/models/index.js";
+import { createRunningAgentsRoutes } from "./routes/running-agents/index.js";
+import { createWorkspaceRoutes } from "./routes/workspace/index.js";
+import { createTemplatesRoutes } from "./routes/templates/index.js";
 import {
   createTerminalRoutes,
   validateTerminalToken,
   isTerminalEnabled,
   isTerminalPasswordRequired,
-} from "./routes/terminal.js";
+} from "./routes/terminal/index.js";
 import { AgentService } from "./services/agent-service.js";
 import { FeatureLoader } from "./services/feature-loader.js";
 import { AutoModeService } from "./services/auto-mode-service.js";

apps/server/src/routes/agent.ts

@@ -0,0 +1,15 @@
+/**
+ * Common utilities for agent routes
+ */
+
+import { createLogger } from "../../lib/logger.js";
+import {
+  getErrorMessage as getErrorMessageShared,
+  createLogError,
+} from "../common.js";
+
+const logger = createLogger("Agent");
+
+// Re-export shared utilities
+export { getErrorMessageShared as getErrorMessage };
+export const logError = createLogError(logger);

apps/server/src/routes/agent/common.ts

@@ -0,0 +1,29 @@
+/**
+ * Agent routes - HTTP API for Claude agent interactions
+ */
+
+import { Router } from "express";
+import { AgentService } from "../../services/agent-service.js";
+import type { EventEmitter } from "../../lib/events.js";
+import { createStartHandler } from "./routes/start.js";
+import { createSendHandler } from "./routes/send.js";
+import { createHistoryHandler } from "./routes/history.js";
+import { createStopHandler } from "./routes/stop.js";
+import { createClearHandler } from "./routes/clear.js";
+import { createModelHandler } from "./routes/model.js";
+
+export function createAgentRoutes(
+  agentService: AgentService,
+  _events: EventEmitter
+): Router {
+  const router = Router();
+
+  router.post("/start", createStartHandler(agentService));
+  router.post("/send", createSendHandler(agentService));
+  router.post("/history", createHistoryHandler(agentService));
+  router.post("/stop", createStopHandler(agentService));
+  router.post("/clear", createClearHandler(agentService));
+  router.post("/model", createModelHandler(agentService));
+
+  return router;
+}

apps/server/src/routes/agent/index.ts

@@ -0,0 +1,28 @@
+/**
+ * POST /clear endpoint - Clear conversation
+ */
+
+import type { Request, Response } from "express";
+import { AgentService } from "../../../services/agent-service.js";
+import { getErrorMessage, logError } from "../common.js";
+
+export function createClearHandler(agentService: AgentService) {
+  return async (req: Request, res: Response): Promise<void> => {
+    try {
+      const { sessionId } = req.body as { sessionId: string };
+
+      if (!sessionId) {
+        res
+          .status(400)
+          .json({ success: false, error: "sessionId is required" });
+        return;
+      }
+
+      const result = await agentService.clearSession(sessionId);
+      res.json(result);
+    } catch (error) {
+      logError(error, "Clear session failed");
+      res.status(500).json({ success: false, error: getErrorMessage(error) });
+    }
+  };
+}

apps/server/src/routes/agent/routes/clear.ts

@@ -0,0 +1,28 @@
+/**
+ * POST /history endpoint - Get conversation history
+ */
+
+import type { Request, Response } from "express";
+import { AgentService } from "../../../services/agent-service.js";
+import { getErrorMessage, logError } from "../common.js";
+
+export function createHistoryHandler(agentService: AgentService) {
+  return async (req: Request, res: Response): Promise<void> => {
+    try {
+      const { sessionId } = req.body as { sessionId: string };
+
+      if (!sessionId) {
+        res
+          .status(400)
+          .json({ success: false, error: "sessionId is required" });
+        return;
+      }
+
+      const result = agentService.getHistory(sessionId);
+      res.json(result);
+    } catch (error) {
+      logError(error, "Get history failed");
+      res.status(500).json({ success: false, error: getErrorMessage(error) });
+    }
+  };
+}

apps/server/src/routes/agent/routes/history.ts

@@ -0,0 +1,31 @@
+/**
+ * POST /model endpoint - Set session model
+ */
+
+import type { Request, Response } from "express";
+import { AgentService } from "../../../services/agent-service.js";
+import { getErrorMessage, logError } from "../common.js";
+
+export function createModelHandler(agentService: AgentService) {
+  return async (req: Request, res: Response): Promise<void> => {
+    try {
+      const { sessionId, model } = req.body as {
+        sessionId: string;
+        model: string;
+      };
+
+      if (!sessionId || !model) {
+        res
+          .status(400)
+          .json({ success: false, error: "sessionId and model are required" });
+        return;
+      }
+
+      const result = await agentService.setSessionModel(sessionId, model);
+      res.json({ success: result });
+    } catch (error) {
+      logError(error, "Set session model failed");
+      res.status(500).json({ success: false, error: getErrorMessage(error) });
+    }
+  };
+}

apps/server/src/routes/agent/routes/model.ts

@@ -0,0 +1,52 @@
+/**
+ * POST /send endpoint - Send a message
+ */
+
+import type { Request, Response } from "express";
+import { AgentService } from "../../../services/agent-service.js";
+import { createLogger } from "../../../lib/logger.js";
+import { getErrorMessage, logError } from "../common.js";
+
+const logger = createLogger("Agent");
+
+export function createSendHandler(agentService: AgentService) {
+  return async (req: Request, res: Response): Promise<void> => {
+    try {
+      const { sessionId, message, workingDirectory, imagePaths, model } =
+        req.body as {
+          sessionId: string;
+          message: string;
+          workingDirectory?: string;
+          imagePaths?: string[];
+          model?: string;
+        };
+
+      if (!sessionId || !message) {
+        res.status(400).json({
+          success: false,
+          error: "sessionId and message are required",
+        });
+        return;
+      }
+
+      // Start the message processing (don't await - it streams via WebSocket)
+      agentService
+        .sendMessage({
+          sessionId,
+          message,
+          workingDirectory,
+          imagePaths,
+          model,
+        })
+        .catch((error) => {
+          logError(error, "Send message failed (background)");
+        });
+
+      // Return immediately - responses come via WebSocket
+      res.json({ success: true, message: "Message sent" });
+    } catch (error) {
+      logError(error, "Send message failed");
+      res.status(500).json({ success: false, error: getErrorMessage(error) });
+    }
+  };
+}