Codemod db pass-through calls: messages + runs + approvals + company (C1 part 2/3)

Rewrite ~376 call sites for messages, runs, approvalsMod, and company
domains and delete the corresponding pass-through methods on
AppDatabase / AppDatabaseBase. Structural type references
(ReturnType<HandlerDeps["db"]["getRun"]>) and SweepStaleReviewsDeps-style
mocks are updated to route through the owning sub-module.

src/main/api-server/routes-agent-control.ts

@@ -31,7 +31,7 @@ export function registerAgentControlRoutes(server: AgentApiServer) {
     });
     const parsed = wakeSchema.safeParse(body);
     const reason = parsed.success ? parsed.data.reason : "peer_request";
-    const alreadyActive = db.hasActiveRun({ companyId: token.companyId, agentId: targetAgentId });
+    const alreadyActive = db.runs.hasActiveRun({ companyId: token.companyId, agentId: targetAgentId });
     const runId = onWakeAgent(targetAgentId, token.companyId, reason);
     if (runId) {
       server.json(res, 200, { ok: true, runId, message: `Wake started for agent ${targetAgentId}` });
@@ -65,7 +65,7 @@ export function registerAgentControlRoutes(server: AgentApiServer) {
       server.json(res, 403, { error: "Current agent is not allowed to trigger heartbeat for this agent" });
       return;
     }
-    const alreadyActive = db.hasActiveRun({ companyId: token.companyId, agentId: targetAgentId });
+    const alreadyActive = db.runs.hasActiveRun({ companyId: token.companyId, agentId: targetAgentId });
     const runId = onWakeAgent(targetAgentId, token.companyId, "peer_request");
     if (runId) {
       server.json(res, 200, { ok: true, runId, message: `Heartbeat triggered for agent ${targetAgentId}` });

src/main/api-server/routes-agents-standup.ts

@@ -35,15 +35,15 @@ export function registerAgentStandupRoute(server: AgentApiServer): void {
     const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString();
     const recentComments = db.listRecentTaskComments([...allRelevantTaskIds], twoHoursAgo, 20);
 
-    const myPendingApprovals = db.listAgentPendingApprovals(token.companyId, token.agentId);
-    const myResolvedApprovals = db.listAgentResolvedApprovals(token.companyId, token.agentId, 5);
+    const myPendingApprovals = db.approvalsMod.listAgentPendingApprovals(token.companyId, token.agentId);
+    const myResolvedApprovals = db.approvalsMod.listAgentResolvedApprovals(token.companyId, token.agentId, 5);
 
     // Unread inbox lives in the standup briefing as the agent's
     // canonical view of pending communication. Pre-fix the agent had
     // to make a second API call to /messages?unreadOnly=true that the
     // model frequently skipped, so messages from peers and managers
     // sat dark while the agent posted heartbeat status comments.
-    const unreadInbox = db.listAgentInboxUnread(token.companyId, token.agentId);
+    const unreadInbox = db.messages.listAgentInboxUnread(token.companyId, token.agentId);
     const senderIds = new Set(unreadInbox.map((m) => m.fromAgentId));
     const senderNames = senderIds.size > 0
       ? new Map(db.agents.listAgentNamesByIds(token.companyId, Array.from(senderIds)).map((row) => [row.id, row.name]))

src/main/api-server/routes-agents.ts

@@ -29,7 +29,7 @@ export function registerAgentRoutes(server: AgentApiServer) {
   // and the standup module is registered separately in api-server/index.ts.
 
   server.addRoute("GET", "/api/agents/me/metrics", (_req, res, _params, token) => {
-    const companyMetrics = db.getCompanyMetrics(token.companyId, 30);
+    const companyMetrics = db.company.getCompanyMetrics(token.companyId, 30);
     const agentMetric = companyMetrics.agentMetrics.find(m => m.agentId === token.agentId);
     if (!agentMetric) {
       server.json(res, 404, { error: "Metrics not found" });
@@ -45,7 +45,7 @@ export function registerAgentRoutes(server: AgentApiServer) {
       server.json(res, 404, { error: "Agent not found" });
       return;
     }
-    const companyMetrics = db.getCompanyMetrics(token.companyId, 30);
+    const companyMetrics = db.company.getCompanyMetrics(token.companyId, 30);
     const agentMetric = companyMetrics.agentMetrics.find((metric) => metric.agentId === agentId);
     if (!agentMetric) {
       server.json(res, 404, { error: "Metrics not found" });
@@ -190,7 +190,7 @@ export function registerAgentRoutes(server: AgentApiServer) {
       return;
     }
     // Also check pending hire approvals with the same name to prevent concurrent duplicate requests
-    const pendingHires = db.listPendingHireApprovalPayloads(companyId);
+    const pendingHires = db.approvalsMod.listPendingHireApprovalPayloads(companyId);
     for (const pending of pendingHires) {
       try {
         const payload = pending.payloadJson ? JSON.parse(pending.payloadJson) as Record<string, unknown> : {};

src/main/api-server/routes-approvals.ts

@@ -48,7 +48,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
     // Reject the request at the API boundary so the model cannot
     // circumvent the ordering by resubmitting.
     if (input.type === "approve_ceo_strategy") {
-      const companyHireApprovals = db.listCompanyApprovalsByType(companyId, "hire_agent");
+      const companyHireApprovals = db.approvalsMod.listCompanyApprovalsByType(companyId, "hire_agent");
       if (companyHireApprovals.length === 0) {
         server.json(res, 409, {
           error: "approve_ceo_strategy requires at least one hire_agent approval to exist first. Submit the intended hires, then file the strategy.",
@@ -56,7 +56,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
         });
         return;
       }
-      const existingStrategy = db.listCompanyApprovalsByType(companyId, "approve_ceo_strategy")
+      const existingStrategy = db.approvalsMod.listCompanyApprovalsByType(companyId, "approve_ceo_strategy")
         .find((a) => a.state === "pending" || a.state === "approved");
       if (existingStrategy) {
         server.json(res, 409, {
@@ -70,7 +70,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
 
     let id: string;
     try {
-      id = db.requestApproval({
+      id = db.approvalsMod.requestApproval({
         companyId,
         type: input.type,
         relatedTaskId: input.relatedTaskId ?? null,
@@ -139,7 +139,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
       return;
     }
     const statuses = parsedQuery.data.status?.split(",").filter(Boolean) ?? null;
-    const approvals = db.listApprovalsForApi(companyId, {
+    const approvals = db.approvalsMod.listApprovalsForApi(companyId, {
       requestedByAgentId: parsedQuery.data.requestedByAgentId,
       relatedTaskId: parsedQuery.data.relatedTaskId,
       statuses,
@@ -148,7 +148,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
   });
 
   server.addRoute("GET", "/api/approvals/:approvalId", (_req, res, params, token) => {
-    const approval = db.findApprovalById(requireParam(params, "approvalId"));
+    const approval = db.approvalsMod.findApprovalById(requireParam(params, "approvalId"));
     if (!approval || approval.companyId !== token.companyId) {
       server.json(res, 404, { error: "Approval not found" });
       return;
@@ -162,21 +162,21 @@ export function registerApprovalRoutes(server: AgentApiServer) {
 
   server.addRoute("GET", "/api/approvals/:approvalId/comments", (_req, res, params, token) => {
     const approvalId = requireParam(params, "approvalId");
-    const approval = db.findApprovalById(approvalId);
+    const approval = db.approvalsMod.findApprovalById(approvalId);
     if (!approval) { server.json(res, 404, { error: "Approval not found" }); return; }
     if (approval.companyId !== token.companyId) { server.json(res, 403, { error: "Company mismatch" }); return; }
-    const comments = db.listApprovalComments(approvalId, approval.companyId);
+    const comments = db.approvalsMod.listApprovalComments(approvalId, approval.companyId);
     server.json(res, 200, comments);
   });
 
   server.addRoute("POST", "/api/approvals/:approvalId/comments", (_req, res, params, token, body) => {
-    const approval = db.findApprovalById(requireParam(params, "approvalId"));
+    const approval = db.approvalsMod.findApprovalById(requireParam(params, "approvalId"));
     if (!approval) { server.json(res, 404, { error: "Approval not found" }); return; }
     if (approval.companyId !== token.companyId) { server.json(res, 403, { error: "Company mismatch" }); return; }
     const data = body as Record<string, unknown>;
     const commentBody = typeof data.body === "string" ? data.body.trim() : "";
     if (!commentBody) { server.json(res, 400, { error: "Comment body is required" }); return; }
-    const commentId = db.addApprovalComment({
+    const commentId = db.approvalsMod.addApprovalComment({
       companyId: approval.companyId,
       approvalId: approval.id,
       authorAgentId: token.agentId ?? null,
@@ -194,7 +194,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
   });
 
   server.addRoute("POST", "/api/approvals/:approvalId/resubmit", (_req, res, params, token) => {
-    const approval = db.findApprovalById(requireParam(params, "approvalId"));
+    const approval = db.approvalsMod.findApprovalById(requireParam(params, "approvalId"));
     if (!approval) { server.json(res, 404, { error: "Approval not found" }); return; }
     if (approval.companyId !== token.companyId) { server.json(res, 403, { error: "Company mismatch" }); return; }
     if (approval.state !== "revision_requested") {
@@ -205,23 +205,23 @@ export function registerApprovalRoutes(server: AgentApiServer) {
       server.json(res, 403, { error: "Only the requesting agent can resubmit this approval" });
       return;
     }
-    db.resubmitApproval(approval.id, approval.companyId);
+    db.approvalsMod.resubmitApproval(approval.id, approval.companyId);
     onDomainChanged();
     server.json(res, 200, { resubmitted: true });
   });
 
   server.addRoute("GET", "/api/approvals/:approvalId/tasks", (_req, res, params, token) => {
     const approvalId = requireParam(params, "approvalId");
-    const approval = db.findApprovalById(approvalId);
+    const approval = db.approvalsMod.findApprovalById(approvalId);
     if (!approval) { server.json(res, 404, { error: "Approval not found" }); return; }
     if (approval.companyId !== token.companyId) { server.json(res, 403, { error: "Company mismatch" }); return; }
-    const taskIds = db.listTasksForApproval(approvalId);
+    const taskIds = db.approvalsMod.listTasksForApproval(approvalId);
     server.json(res, 200, taskIds);
   });
 
   server.addRoute("POST", "/api/approvals/:approvalId/tasks", (_req, res, params, token, body) => {
     const approvalId = requireParam(params, "approvalId");
-    const approval = db.findApprovalById(approvalId);
+    const approval = db.approvalsMod.findApprovalById(approvalId);
     if (!approval) { server.json(res, 404, { error: "Approval not found" }); return; }
     if (approval.companyId !== token.companyId) { server.json(res, 403, { error: "Company mismatch" }); return; }
     const data = body as Record<string, unknown>;
@@ -232,7 +232,7 @@ export function registerApprovalRoutes(server: AgentApiServer) {
         server.json(res, 400, { error: `Task ${taskId} does not belong to this company` }); return;
       }
     }
-    db.linkManyTasksToApproval(approvalId, taskIds, token.companyId, token.agentId ?? null);
+    db.approvalsMod.linkManyTasksToApproval(approvalId, taskIds, token.companyId, token.agentId ?? null);
     onDomainChanged();
     server.json(res, 200, { linked: taskIds.length });
   });

src/main/api-server/routes-messages.ts

@@ -142,7 +142,7 @@ export function registerMessageRoutes(server: AgentApiServer) {
       return;
     }
 
-    const messages = db.listAgentMessages(companyId, {
+    const messages = db.messages.listAgentMessages(companyId, {
       agentId: token.agentId,
       channel: channelParam ?? undefined,
       channelTargetId: channelTargetId && channelTargetId.length > 0 ? channelTargetId : undefined,
@@ -158,12 +158,12 @@ export function registerMessageRoutes(server: AgentApiServer) {
       server.json(res, 403, { error: "Company mismatch" });
       return;
     }
-    const message = db.getAgentMessage(requireParam(params, "messageId"), companyId);
+    const message = db.messages.getAgentMessage(requireParam(params, "messageId"), companyId);
     if (!message) {
       server.json(res, 404, { error: "Message not found" });
       return;
     }
-    const visibleToAgent = db.listAgentMessages(companyId, {
+    const visibleToAgent = db.messages.listAgentMessages(companyId, {
       agentId: token.agentId,
       messageId: message.id,
       limit: 1,
@@ -172,7 +172,7 @@ export function registerMessageRoutes(server: AgentApiServer) {
       server.json(res, 403, { error: "This message is not visible to the current agent" });
       return;
     }
-    db.markMessageReadForReader(requireParam(params, "messageId"), companyId, token.agentId);
+    db.messages.markMessageReadForReader(requireParam(params, "messageId"), companyId, token.agentId);
     onDomainChanged();
     server.json(res, 200, { ok: true });
   });

src/main/api-server/routes-misc.ts

@@ -42,7 +42,7 @@ export function registerMiscRoutes(server: AgentApiServer) {
 
     const postActions = ["post", "reply", "dm"];
     if (account.requireApproval && postActions.includes(input.actionType)) {
-      const approvalId = db.requestApproval({
+      const approvalId = db.approvalsMod.requestApproval({
         companyId,
         type: "dangerous_command",
         relatedTaskId: null,
@@ -142,7 +142,7 @@ export function registerMiscRoutes(server: AgentApiServer) {
 
     const contentPreview = parsed.data.content.slice(0, 120) + (parsed.data.content.length > 120 ? "..." : "");
 
-    const approvalId = db.requestApproval({
+    const approvalId = db.approvalsMod.requestApproval({
       companyId,
       requestedByAgentId: token.agentId,
       type: "social_post",

src/main/api-server/routes-runs.ts

@@ -16,7 +16,7 @@ function parsePositiveInt(value: string | null, fallback: number) {
 }
 
 function resolveAuthorizedRun(server: AgentApiServer, token: TokenPayload, runId: string) {
-  const runState = server.db.getRunAuthState(runId);
+  const runState = server.db.runs.getRunAuthState(runId);
   if (!runState || runState.companyId !== token.companyId || runState.agentId !== token.agentId) {
     return null;
   }
@@ -40,7 +40,7 @@ export function registerRunRoutes(server: AgentApiServer) {
     const url = new URL(req.url ?? "/", `http://127.0.0.1:${server.port}`);
     const offset = parsePositiveInt(url.searchParams.get("offset"), 0);
     const limit = Math.min(parsePositiveInt(url.searchParams.get("limit"), DEFAULT_EVENT_LIMIT), MAX_EVENT_LIMIT);
-    const events = server.db.listRunEvents(runId, token.companyId, { offset, limit });
+    const events = server.db.runs.listRunEvents(runId, token.companyId, { offset, limit });
     server.json(res, 200, { events, nextOffset: offset + events.length });
   });
 
@@ -66,7 +66,7 @@ export function registerRunRoutes(server: AgentApiServer) {
 
     const flushPendingEvents = () => {
       while (true) {
-        const events = server.db.listRunEventsAfter(runId, token.companyId, cursor, SSE_BATCH_LIMIT);
+        const events = server.db.runs.listRunEventsAfter(runId, token.companyId, cursor, SSE_BATCH_LIMIT);
         if (events.length === 0) return;
         for (const event of events) {
           writeSse(res, "run-event", event);

src/main/api-server/routes-tasks.ts

@@ -136,7 +136,7 @@ export function registerTaskRoutes(server: AgentApiServer) {
         });
         const reviewerAgent = db.entityCrud.getAgent(token.agentId);
         const docTitles = docs.map((d) => d.title).join(", ");
-        db.requestApproval({
+        db.approvalsMod.requestApproval({
           companyId: task.companyId,
           relatedTaskId: task.id,
           requestedByAgentId: token.agentId,

src/main/api-server/routes-work-graph.ts

@@ -256,7 +256,7 @@ export function registerWorkGraphRoutes(server: AgentApiServer) {
       server.json(res, 403, { error: "Company mismatch" });
       return;
     }
-    const { agents, tasks, recentActivity } = db.getDashboardSnapshot(companyId);
+    const { agents, tasks, recentActivity } = db.company.getDashboardSnapshot(companyId);
 
     const tasksByStatus: Record<string, number> = {};
     for (const t of tasks) {

src/main/api-server/server-core.ts

@@ -217,7 +217,7 @@ export class AgentApiServer {
     if (typeof claimedRunId !== "string" || claimedRunId.trim() !== token.runId) {
       return { ok: false, status: 401, error: "Missing or mismatched X-Agent-Company-Run-Id header" };
     }
-    const runState = this._db.getRunAuthState(token.runId);
+    const runState = this._db.runs.getRunAuthState(token.runId);
     if (!runState || runState.companyId !== token.companyId || runState.agentId !== token.agentId) {
       return { ok: false, status: 403, error: "Token references an unknown or mismatched run" };
     }