@naisys/hub 3.0.0-beta.38 → 3.0.0-beta.39

package/dist/handlers/hubAgentService.js

@@ -256,6 +256,7 @@ export function createHubAgentService(naisysServer, { hubDb }, logService, heart
                     const sent = naisysServer.sendMessage(targetHostId, event, {
                         userId: parsed.userId,
                         runId: parsed.runId,
+                        subagentId: parsed.subagentId,
                         sessionId: parsed.sessionId,
                         sourceHostId: hostId,
                     }, (response) => {
@@ -300,6 +301,7 @@ export function createHubAgentService(naisysServer, { hubDb }, logService, heart
                 const sent = naisysServer.sendMessage(targetHostId, HubEvents.AGENT_RUN_COMMAND, {
                     userId: parsed.userId,
                     runId: parsed.runId,
+                    subagentId: parsed.subagentId,
                     sessionId: parsed.sessionId,
                     command: parsed.command,
                     sourceHostId: hostId,

package/dist/handlers/hubConfigService.js

@@ -40,6 +40,7 @@ export async function createHubConfigService(naisysServer, { hubDb }, logService
         { key: "SPEND_LIMIT_DOLLARS" },
         { key: "SPEND_LIMIT_HOURS" },
         { key: "TARGET_VERSION" },
+        { key: "MAIL_ENABLED" },
     ]);
     /** Read variables from DB and build a ConfigResponse */
     async function buildConfigPayload() {

package/dist/handlers/hubCostService.js

@@ -3,9 +3,10 @@ import { CostWriteRequestSchema, HubEvents, } from "@naisys/hub-protocol";
 const SPEND_LIMIT_CHECK_INTERVAL_MS = 10_000;
 /** Handles cost_write events from NAISYS instances (fire-and-forget) */
 export function createHubCostService(naisysServer, { hubDb }, logService, heartbeatService, configService) {
-    // Track which users have been suspended due to spend limit overrun
-    const suspendedByGlobal = new Set();
-    const suspendedByAgent = new Set();
+    // Suspended users → original suspension reason. Stored so a defensive
+    // re-send (when a suspended user keeps writing costs) can use the same text.
+    const suspendedByGlobal = new Map();
+    const suspendedByAgent = new Map();
     naisysServer.registerEvent(HubEvents.COST_WRITE, async (hostId, data, ack) => {
         try {
             const parsed = CostWriteRequestSchema.parse(data);
@@ -14,10 +15,14 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
             const costPushMap = new Map();
             const userCostTotals = new Map();
             for (const entry of parsed.entries) {
+                const subagentId = entry.subagentId ?? 0;
+                // Wire format: undefined for parent (subagent_id 0 in DB), number otherwise
+                const wireSubagentId = subagentId === 0 ? undefined : subagentId;
                 await hubDb.costs.create({
                     data: {
                         user_id: entry.userId,
                         run_id: entry.runId,
+                        subagent_id: subagentId,
                         session_id: entry.sessionId,
                         host_id: hostId,
                         source: entry.source,
@@ -34,13 +39,14 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
                     where: {
                         user_id: entry.userId,
                         run_id: entry.runId,
+                        subagent_id: subagentId,
                         session_id: entry.sessionId,
                     },
                     data: {
                         total_cost: { increment: entry.cost },
                     },
                 });
-                const key = `${entry.userId}:${entry.runId}:${entry.sessionId}`;
+                const key = `${entry.userId}:${entry.runId}:${subagentId}:${entry.sessionId}`;
                 const existing = costPushMap.get(key);
                 if (existing) {
                     existing.costDelta += entry.cost;
@@ -49,6 +55,7 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
                     costPushMap.set(key, {
                         userId: entry.userId,
                         runId: entry.runId,
+                        subagentId: wireSubagentId,
                         sessionId: entry.sessionId,
                         costDelta: entry.cost,
                     });
@@ -61,10 +68,12 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
                     entries: Array.from(costPushMap.values()),
                 });
             }
-            // Re-send cost_control to any suspended users still writing costs
+            // Re-send cost_control to suspended users still writing costs.
+            // Per-agent reason wins: a per-agent limit overrides the global one.
             for (const userId of userCostTotals.keys()) {
-                if (suspendedByGlobal.has(userId) || suspendedByAgent.has(userId)) {
-                    sendCostControl(userId, false, "Spend limit exceeded");
+                const reason = suspendedByAgent.get(userId) ?? suspendedByGlobal.get(userId);
+                if (reason !== undefined) {
+                    sendCostControl(userId, false, reason);
                 }
             }
             // Decrement budget_left and return updated values
@@ -83,9 +92,9 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
     async function checkSpendLimits(candidateUserIds) {
         const activeUserIds = heartbeatService.getActiveUserIds();
         const usersToCheck = new Set(activeUserIds);
-        for (const userId of suspendedByGlobal)
+        for (const userId of suspendedByGlobal.keys())
             usersToCheck.add(userId);
-        for (const userId of suspendedByAgent)
+        for (const userId of suspendedByAgent.keys())
             usersToCheck.add(userId);
         if (candidateUserIds) {
             for (const userId of candidateUserIds)
@@ -209,7 +218,7 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
                 const reason = `Global spend limit of $${spendLimit} reached (total: $${totalCost.toFixed(2)})`;
                 logService.log(`[Hub:Costs] Suspending user ${userId} (global limit): ${reason}`);
                 sendCostControl(userId, false, reason);
-                suspendedByGlobal.add(userId);
+                suspendedByGlobal.set(userId, reason);
                 await setCostSuspendedReason(hubDb, userId, reason);
             }
             else if (!isOverLimit && wasSuspended) {
@@ -232,7 +241,7 @@ export function createHubCostService(naisysServer, { hubDb }, logService, heartb
             const reason = `Spend limit of $${spendLimit} reached (current: $${periodCost.toFixed(2)})`;
             logService.log(`[Hub:Costs] Suspending user ${userId}: ${reason}`);
             sendCostControl(userId, false, reason);
-            suspendedByAgent.add(userId);
+            suspendedByAgent.set(userId, reason);
             await setCostSuspendedReason(hubDb, userId, reason);
         }
         else if (!isOverLimit && wasSuspended) {

package/dist/handlers/hubCostService.test.js

@@ -0,0 +1,263 @@
+import { buildDefaultAgentConfig } from "@naisys/common";
+import { HubEvents } from "@naisys/hub-protocol";
+import { describe, expect, test, vi } from "vitest";
+import { createHubCostService } from "./hubCostService.js";
+function createServerHarness() {
+    const handlers = new Map();
+    const server = {
+        registerEvent: vi.fn((event, handler) => {
+            handlers.set(event, handler);
+        }),
+        broadcastToSupervisors: vi.fn(),
+        sendMessage: vi.fn(() => true),
+    };
+    async function emitCostWrite(hostId, data) {
+        const handler = handlers.get(HubEvents.COST_WRITE);
+        if (!handler)
+            throw new Error("COST_WRITE handler was not registered");
+        let ackResponse;
+        await handler(hostId, data, (response) => {
+            ackResponse = response;
+        });
+        return ackResponse;
+    }
+    return { server, emitCostWrite };
+}
+function createHubDb() {
+    const budgetLeft = new Map([[1, 5]]);
+    const hubDb = {
+        costs: {
+            create: vi.fn(() => Promise.resolve({})),
+            aggregate: vi.fn(() => Promise.resolve({ _sum: { cost: 0 } })),
+        },
+        run_session: {
+            updateMany: vi.fn(() => Promise.resolve({})),
+        },
+        users: {
+            findMany: vi.fn(() => Promise.resolve([])),
+        },
+        user_notifications: {
+            findUnique: vi.fn(({ where }) => {
+                const value = budgetLeft.get(where.user_id);
+                return Promise.resolve(value === undefined ? null : { budget_left: value });
+            }),
+            update: vi.fn(({ where, data, }) => {
+                budgetLeft.set(where.user_id, data.budget_left);
+                return Promise.resolve({ budget_left: data.budget_left });
+            }),
+            updateMany: vi.fn(() => Promise.resolve({})),
+        },
+    };
+    return { hubDb, budgetLeft };
+}
+function createLogger() {
+    return {
+        log: vi.fn(),
+        error: vi.fn(),
+        disableConsole: vi.fn(),
+    };
+}
+function createHeartbeatService(activeUserIds, hostIdsByUser = new Map([[1, [101]]])) {
+    return {
+        getActiveUserIds: vi.fn(() => activeUserIds),
+        findHostsForAgent: vi.fn((userId) => hostIdsByUser.get(userId) ?? []),
+    };
+}
+function createConfigService(config) {
+    return {
+        getConfig: vi.fn(() => ({ config })),
+    };
+}
+function userRow(id, configOverrides, spendLimitResetAt) {
+    return {
+        id,
+        config: JSON.stringify({
+            ...buildDefaultAgentConfig(`agent-${id}`),
+            ...configOverrides,
+        }),
+        user_notifications: {
+            spend_limit_reset_at: spendLimitResetAt,
+        },
+    };
+}
+describe("hubCostService", () => {
+    test("persists subagent cost entries, pushes scoped deltas, and decrements budget", async () => {
+        const { server, emitCostWrite } = createServerHarness();
+        const { hubDb } = createHubDb();
+        const logger = createLogger();
+        const heartbeatService = createHeartbeatService([]);
+        const configService = createConfigService({});
+        const service = createHubCostService(server, { hubDb }, logger, heartbeatService, configService);
+        const ack = await emitCostWrite(42, {
+            entries: [
+                {
+                    userId: 1,
+                    runId: 7,
+                    subagentId: -1,
+                    sessionId: 1,
+                    source: "genimg",
+                    model: "mock-image",
+                    cost: 0.5,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheWriteTokens: 0,
+                    cacheReadTokens: 0,
+                },
+                {
+                    userId: 1,
+                    runId: 7,
+                    subagentId: -1,
+                    sessionId: 1,
+                    source: "genimg",
+                    model: "mock-image",
+                    cost: 0.25,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheWriteTokens: 0,
+                    cacheReadTokens: 0,
+                },
+            ],
+        });
+        expect(hubDb.costs.create).toHaveBeenCalledWith({
+            data: expect.objectContaining({
+                user_id: 1,
+                run_id: 7,
+                subagent_id: -1,
+                session_id: 1,
+                host_id: 42,
+                cost: 0.5,
+            }),
+        });
+        expect(hubDb.run_session.updateMany).toHaveBeenCalledWith({
+            where: {
+                user_id: 1,
+                run_id: 7,
+                subagent_id: -1,
+                session_id: 1,
+            },
+            data: {
+                total_cost: { increment: 0.5 },
+            },
+        });
+        expect(server.broadcastToSupervisors).toHaveBeenCalledWith(HubEvents.COST_PUSH, {
+            entries: [
+                {
+                    userId: 1,
+                    runId: 7,
+                    subagentId: -1,
+                    sessionId: 1,
+                    costDelta: 0.75,
+                },
+            ],
+        });
+        expect(hubDb.user_notifications.update).toHaveBeenCalledWith({
+            where: { user_id: 1 },
+            data: { budget_left: 4.25 },
+        });
+        expect(ack).toEqual({ budgets: [{ userId: 1, budgetLeft: 4.25 }] });
+        service.cleanup();
+    });
+    test("normalizes parent-agent subagentId to undefined on the wire (DB row stays 0)", async () => {
+        const { server, emitCostWrite } = createServerHarness();
+        const { hubDb } = createHubDb();
+        const logger = createLogger();
+        const heartbeatService = createHeartbeatService([]);
+        const configService = createConfigService({});
+        const service = createHubCostService(server, { hubDb }, logger, heartbeatService, configService);
+        await emitCostWrite(42, {
+            entries: [
+                {
+                    userId: 1,
+                    runId: 7,
+                    // subagentId omitted — represents the parent agent
+                    sessionId: 1,
+                    source: "console",
+                    model: "mock",
+                    cost: 0.1,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheWriteTokens: 0,
+                    cacheReadTokens: 0,
+                },
+            ],
+        });
+        expect(hubDb.costs.create).toHaveBeenCalledWith({
+            data: expect.objectContaining({ subagent_id: 0 }),
+        });
+        expect(server.broadcastToSupervisors).toHaveBeenCalledWith(HubEvents.COST_PUSH, {
+            entries: [
+                {
+                    userId: 1,
+                    runId: 7,
+                    subagentId: undefined,
+                    sessionId: 1,
+                    costDelta: 0.1,
+                },
+            ],
+        });
+        service.cleanup();
+    });
+    test("suspends, re-sends, and resumes per-agent cost control", async () => {
+        const { server, emitCostWrite } = createServerHarness();
+        const { hubDb } = createHubDb();
+        const logger = createLogger();
+        const heartbeatService = createHeartbeatService([1]);
+        const configService = createConfigService({});
+        vi.mocked(hubDb.users.findMany).mockResolvedValue([
+            userRow(1, { spendLimitDollars: 1 }),
+        ]);
+        vi.mocked(hubDb.costs.aggregate)
+            .mockResolvedValueOnce({ _sum: { cost: 1.25 } })
+            .mockResolvedValueOnce({ _sum: { cost: 0.25 } });
+        const service = createHubCostService(server, { hubDb }, logger, heartbeatService, configService);
+        await service.checkSpendLimits();
+        const suspendReason = "Spend limit of $1 reached (current: $1.25)";
+        expect(server.sendMessage).toHaveBeenCalledWith(101, HubEvents.COST_CONTROL, {
+            userId: 1,
+            enabled: false,
+            reason: suspendReason,
+        });
+        expect(service.isUserSpendSuspended(1)).toBe(true);
+        expect(hubDb.user_notifications.updateMany).toHaveBeenCalledWith({
+            where: { user_id: 1 },
+            data: { cost_suspended_reason: suspendReason },
+        });
+        vi.mocked(server.sendMessage).mockClear();
+        await emitCostWrite(42, {
+            entries: [
+                {
+                    userId: 1,
+                    runId: 7,
+                    subagentId: -1,
+                    sessionId: 1,
+                    source: "genimg",
+                    model: "mock-image",
+                    cost: 0.1,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheWriteTokens: 0,
+                    cacheReadTokens: 0,
+                },
+            ],
+        });
+        expect(server.sendMessage).toHaveBeenCalledWith(101, HubEvents.COST_CONTROL, {
+            userId: 1,
+            enabled: false,
+            reason: suspendReason,
+        });
+        vi.mocked(server.sendMessage).mockClear();
+        await service.checkSpendLimits();
+        expect(server.sendMessage).toHaveBeenCalledWith(101, HubEvents.COST_CONTROL, {
+            userId: 1,
+            enabled: true,
+            reason: "Spend limit period reset (current: $0.25, limit: $1)",
+        });
+        expect(service.isUserSpendSuspended(1)).toBe(false);
+        expect(hubDb.user_notifications.updateMany).toHaveBeenCalledWith({
+            where: { user_id: 1 },
+            data: { cost_suspended_reason: null },
+        });
+        service.cleanup();
+    });
+});
+//# sourceMappingURL=hubCostService.test.js.map

package/dist/handlers/hubHeartbeatService.js

@@ -1,11 +1,10 @@
 import { HeartbeatSchema, HUB_HEARTBEAT_INTERVAL_MS, HubEvents, } from "@naisys/hub-protocol";
 /** Tracks NAISYS instance heartbeats and pushes aggregate active user status to all instances */
 export function createHubHeartbeatService(naisysServer, { hubDb }, logService) {
-    // Track active agent user IDs per host from heartbeat data
+    // Active agent user ids per host. Subagents ride under the parent's userId.
     const hostActiveAgents = new Map();
-    // Track each active agent's current run session and its last heartbeat time.
-    // Keyed by hostId so we can drop sessions when a host disconnects.
     const hostActiveSessions = new Map();
+    const sessionKey = (userId, subagentId) => `${userId}:${subagentId ?? 0}`;
     // Track per-agent notification IDs (latestLogId, latestMailId)
     const agentNotifications = new Map();
     /** Update a single notification field for an agent */
@@ -20,7 +19,10 @@ export function createHubHeartbeatService(naisysServer, { hubDb }, logService) {
     // Handle heartbeat from NAISYS instances
     naisysServer.registerEvent(HubEvents.HEARTBEAT, async (hostId, data) => {
         const parsed = HeartbeatSchema.parse(data);
-        const activeUserIds = parsed.activeSessions.map((s) => s.userId);
+        // Dedup: a parent and its subagents share a userId.
+        const activeUserIds = [
+            ...new Set(parsed.activeSessions.map((s) => s.userId)),
+        ];
         // Update in-memory per-host active agent IDs
         hostActiveAgents.set(hostId, activeUserIds);
         try {
@@ -42,15 +44,10 @@ export function createHubHeartbeatService(naisysServer, { hubDb }, logService) {
             // aggregate SESSION_HEARTBEAT broadcast runs on its own interval below.
             const sessionMap = new Map();
             for (const session of parsed.activeSessions) {
-                await hubDb.run_session.updateMany({
-                    where: {
-                        user_id: session.userId,
-                        run_id: session.runId,
-                        session_id: session.sessionId,
-                    },
-                    data: { last_active: now },
-                });
-                sessionMap.set(session.userId, {
+                const subagentId = session.subagentId ?? 0;
+                sessionMap.set(sessionKey(session.userId, subagentId), {
+                    userId: session.userId,
+                    subagentId: subagentId === 0 ? null : subagentId,
                     runId: session.runId,
                     sessionId: session.sessionId,
                     lastActive: now,
@@ -58,6 +55,19 @@ export function createHubHeartbeatService(naisysServer, { hubDb }, logService) {
                     state: session.state,
                 });
             }
+            if (parsed.activeSessions.length > 0) {
+                await hubDb.run_session.updateMany({
+                    where: {
+                        OR: parsed.activeSessions.map((session) => ({
+                            user_id: session.userId,
+                            run_id: session.runId,
+                            subagent_id: session.subagentId ?? 0,
+                            session_id: session.sessionId,
+                        })),
+                    },
+                    data: { last_active: now },
+                });
+            }
             hostActiveSessions.set(hostId, sessionMap);
         }
         catch (error) {
@@ -99,10 +109,11 @@ export function createHubHeartbeatService(naisysServer, { hubDb }, logService) {
     function pushSessionHeartbeat() {
         const updates = [];
         for (const sessions of hostActiveSessions.values()) {
-            for (const [userId, info] of sessions) {
+            for (const info of sessions.values()) {
                 updates.push({
-                    userId,
+                    userId: info.userId,
                     runId: info.runId,
+                    subagentId: info.subagentId ?? undefined,
                     sessionId: info.sessionId,
                     lastActive: info.lastActive,
                     paused: info.paused,

package/dist/handlers/hubHostService.js

@@ -37,6 +37,9 @@ export function createHubHostService(naisysServer, hostRegistrar, logService) {
     naisysServer.registerEvent(HubEvents.CLIENT_CONNECTED, (_hostId, connection) => {
         broadcastHostList(connection);
     });
+    naisysServer.registerEvent(HubEvents.CLIENT_DISCONNECTED, () => {
+        broadcastHostList();
+    });
     naisysServer.registerEvent(HubEvents.HOSTS_CHANGED, async () => {
         logService.log("[Hub:Hosts] Received HOSTS_CHANGED, refreshing cache...");
         await hostRegistrar.refreshHosts();

package/dist/handlers/hubLogService.js

@@ -12,10 +12,14 @@ export function createHubLogService(naisysServer, { hubDb }, logService, heartbe
             for (const entry of parsed.entries) {
                 const now = new Date().toISOString();
                 const lineCount = entry.message.split("\n").length;
+                const subagentId = entry.subagentId ?? 0;
+                // Wire format: undefined for parent (subagent_id 0 in DB), number otherwise
+                const wireSubagentId = subagentId === 0 ? undefined : subagentId;
                 const log = await hubDb.context_log.create({
                     data: {
                         user_id: entry.userId,
                         run_id: entry.runId,
+                        subagent_id: subagentId,
                         session_id: entry.sessionId,
                         host_id: hostId,
                         role: entry.role,
@@ -31,6 +35,7 @@ export function createHubLogService(naisysServer, { hubDb }, logService, heartbe
                     where: {
                         user_id: entry.userId,
                         run_id: entry.runId,
+                        subagent_id: subagentId,
                         session_id: entry.sessionId,
                     },
                     data: {
@@ -69,13 +74,14 @@ export function createHubLogService(naisysServer, { hubDb }, logService, heartbe
                     }
                 }
                 // Collect push entry with DB-assigned ID
-                const sessionKey = `${entry.userId}-${entry.runId}-${entry.sessionId}`;
+                const sessionKey = `${entry.userId}-${entry.runId}-${subagentId}-${entry.sessionId}`;
                 const previousId = lastPushedLogId.get(sessionKey) ?? null;
                 pushEntries.push({
                     id: log.id,
                     previousId,
                     userId: entry.userId,
                     runId: entry.runId,
+                    subagentId: wireSubagentId,
                     sessionId: entry.sessionId,
                     role: entry.role,
                     source: entry.source,
@@ -98,6 +104,7 @@ export function createHubLogService(naisysServer, { hubDb }, logService, heartbe
                     sessionUpdates.set(sessionKey, {
                         userId: entry.userId,
                         runId: entry.runId,
+                        subagentId: wireSubagentId,
                         sessionId: entry.sessionId,
                         lastActive: now,
                         latestLogId: log.id,

package/dist/handlers/hubRunService.js

@@ -14,18 +14,42 @@ export function createHubRunService(naisysServer, { hubDb }, logService) {
     naisysServer.registerEvent(HubEvents.SESSION_CREATE, async (hostId, data, ack) => {
         try {
             const parsed = SessionCreateRequestSchema.parse(data);
-            // Get the last run_id across all sessions
-            const lastRun = await hubDb.run_session.findFirst({
-                select: { run_id: true },
-                orderBy: { run_id: "desc" },
-            });
-            const newRunId = lastRun ? lastRun.run_id + 1 : 1;
+            // Subagent path: inherit the parent's runId rather than allocating a new one.
+            let runId;
+            if (parsed.subagentId !== undefined) {
+                if (parsed.parentRunId === undefined) {
+                    throw new Error("parentRunId is required when subagentId is set");
+                }
+                // Confirm the parent's run row exists before materializing a child
+                // under it — otherwise we'd silently create an orphan subagent row.
+                const parent = await hubDb.run_session.findFirst({
+                    where: {
+                        user_id: parsed.userId,
+                        run_id: parsed.parentRunId,
+                        subagent_id: 0,
+                    },
+                    select: { run_id: true },
+                });
+                if (!parent) {
+                    throw new Error(`parent run ${parsed.parentRunId} not found for user ${parsed.userId}`);
+                }
+                runId = parsed.parentRunId;
+            }
+            else {
+                const lastRun = await hubDb.run_session.findFirst({
+                    select: { run_id: true },
+                    orderBy: { run_id: "desc" },
+                });
+                runId = lastRun ? lastRun.run_id + 1 : 1;
+            }
+            const subagentId = parsed.subagentId ?? 0;
             const newSessionId = 1;
             const now = new Date().toISOString();
             await hubDb.run_session.create({
                 data: {
                     user_id: parsed.userId,
-                    run_id: newRunId,
+                    run_id: runId,
+                    subagent_id: subagentId,
                     session_id: newSessionId,
                     host_id: hostId,
                     model_name: parsed.modelName,
@@ -35,12 +59,13 @@ export function createHubRunService(naisysServer, { hubDb }, logService) {
             });
             ack({
                 success: true,
-                runId: newRunId,
+                runId,
                 sessionId: newSessionId,
             });
             pushSessionToSupervisors({
                 userId: parsed.userId,
-                runId: newRunId,
+                runId,
+                subagentId: parsed.subagentId,
                 sessionId: newSessionId,
                 modelName: parsed.modelName,
                 createdAt: now,
@@ -55,12 +80,14 @@ export function createHubRunService(naisysServer, { hubDb }, logService) {
     naisysServer.registerEvent(HubEvents.SESSION_INCREMENT, async (hostId, data, ack) => {
         try {
             const parsed = SessionIncrementRequestSchema.parse(data);
-            // Get the max session_id for this user + run
+            const subagentId = parsed.subagentId ?? 0;
+            // Get the max session_id for this user + run + subagent
             const lastSession = await hubDb.run_session.findFirst({
                 select: { session_id: true },
                 where: {
                     user_id: parsed.userId,
                     run_id: parsed.runId,
+                    subagent_id: subagentId,
                 },
                 orderBy: { session_id: "desc" },
             });
@@ -70,6 +97,7 @@ export function createHubRunService(naisysServer, { hubDb }, logService) {
                 data: {
                     user_id: parsed.userId,
                     run_id: parsed.runId,
+                    subagent_id: subagentId,
                     session_id: newSessionId,
                     host_id: hostId,
                     model_name: parsed.modelName,
@@ -81,6 +109,7 @@ export function createHubRunService(naisysServer, { hubDb }, logService) {
             pushSessionToSupervisors({
                 userId: parsed.userId,
                 runId: parsed.runId,
+                subagentId: parsed.subagentId,
                 sessionId: newSessionId,
                 modelName: parsed.modelName,
                 createdAt: now,

package/dist/naisysHub.js

@@ -1,4 +1,4 @@
-import { createDualLogger, cwdWithTilde, ensureDotEnv, expandNaisysFolder, promptResetSuperAdminPasskey, runSetupWizard, } from "@naisys/common-node";
+import { createDualLogger, cwdWithTilde, ensureDotEnv, expandNaisysFolder, promptResetSuperAdminAccount, runSetupWizard, } from "@naisys/common-node";
 import { createHubDatabaseService } from "@naisys/hub-database";
 import { program } from "commander";
 import dotenv from "dotenv";
@@ -29,6 +29,7 @@ import { createNaisysServer } from "./services/naisysServer.js";
 export const startHub = async (startupType, startSupervisor, plugins, startupAgentPath, wizardRan) => {
     try {
         const agentPath = startupAgentPath || ".";
+        let cleanupSupervisor;
         // Create log service first
         const logService = createDualLogger("hub-server.log");
         logService.log(`[Hub] Starting Hub server in ${startupType} mode...`);
@@ -79,7 +80,7 @@ export const startHub = async (startupType, startSupervisor, plugins, startupAge
         // Register hub agent service for agent_start requests routed to target hosts
         const agentService = createHubAgentService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, hostRegistrar);
         // Register hub mail service for mail events from NAISYS instances
-        createHubMailService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, agentService, costService, configService);
+        const mailService = createHubMailService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, agentService, costService, configService);
         /**
          * There should be no dependency between supervisor and hub
          * Sharing the same process space is to save 150 mb of node.js runtime memory on small servers
@@ -88,14 +89,16 @@ export const startHub = async (startupType, startSupervisor, plugins, startupAge
             // Don't import the whole fastify web server module tree unless needed
             // Use variable to avoid compile-time type dependency on @naisys/supervisor (allows parallel builds)
             const supervisorModule = "@naisys/supervisor";
-            const { supervisorPlugin, bootstrapSupervisor } = (await import(supervisorModule));
-            const resetSuperAdminPasskey = wizardRan
-                ? await promptResetSuperAdminPasskey("Supervisor Setup", {
+            const hostedSupervisor = (await import(supervisorModule));
+            const { supervisorPlugin, bootstrapSupervisor } = hostedSupervisor;
+            cleanupSupervisor = hostedSupervisor.cleanupSupervisor;
+            const resetSuperAdminAccount = wizardRan
+                ? await promptResetSuperAdminAccount("Supervisor Setup", {
                     defaultReset: !process.argv.includes("--setup"),
                 })
                 : false;
             // Bootstrap before plugin register so the operator prompt isn't bounded by pluginTimeout and doesn't interleave with hub connection logs.
-            await bootstrapSupervisor({ resetSuperAdminPasskey });
+            await bootstrapSupervisor({ resetSuperAdminAccount });
             await fastify.register(supervisorPlugin, {
                 plugins,
                 serverPort,
@@ -109,11 +112,14 @@ export const startHub = async (startupType, startSupervisor, plugins, startupAge
             logService.disableConsole();
         }
         let shutdownPromise = null;
+        // Like NAISYS: process exit reaps sockets and Fastify. Clear known timers
+        // synchronously, but only wait for the DB disconnect.
         async function runShutdown() {
             try {
+                cleanupSupervisor?.();
                 heartbeatService.cleanup();
-                await io.close();
-                await fastify.close();
+                costService.cleanup();
+                mailService.cleanup();
             }
             finally {
                 await hubDatabaseService.disconnect();

package/dist/services/naisysServer.js

@@ -68,7 +68,10 @@ export function createNaisysServer(nsp, initialHubAccessKey, logService, hostReg
         const { hubAccessKey: clientAccessKey, hostName, machineId: rawMachineId, instanceId: rawInstanceId, startedAt: rawStartedAt, hostType: rawHostType, clientVersion, environment: rawEnvironment, } = socket.handshake.auth;
         if (!clientAccessKey || clientAccessKey !== hubAccessKey) {
             logService.log(`[Hub] Connection rejected: invalid access key from ${socket.handshake.address}`);
-            return next(createConnectError("Invalid access key", "invalid_access_key"));
+            // Non-fatal: keys can rotate while a client is in retry; the client's
+            // auth callback re-reads the key on each attempt so the next try picks
+            // up the new value.
+            return next(createConnectError("Invalid access key", "invalid_access_key", false));
         }
         if (!hostName) {
             logService.log(`[Hub] Connection rejected: missing hostName`);
@@ -123,7 +126,9 @@ export function createNaisysServer(nsp, initialHubAccessKey, logService, hostReg
         }
         catch (err) {
             logService.error(`[Hub] Connection rejected: failed to register host ${hostName}: ${err}`);
-            return next(createConnectError("NAISYS instance registration failed", "registration_failed"));
+            // Non-fatal: registration touches the DB and can hit transient failures
+            // (pool timeout, deadlock); let the client keep retrying.
+            return next(createConnectError("NAISYS instance registration failed", "registration_failed", false));
         }
     });
     // Handle new connections

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
   "name": "@naisys/hub",
-  "version": "3.0.0-beta.38",
+  "version": "3.0.0-beta.39",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@naisys/hub",
-      "version": "3.0.0-beta.38",
+      "version": "3.0.0-beta.39",
       "dependencies": {
-        "@naisys/common": "3.0.0-beta.38",
-        "@naisys/common-node": "3.0.0-beta.38",
-        "@naisys/hub-database": "3.0.0-beta.38",
-        "@naisys/hub-protocol": "3.0.0-beta.38",
+        "@naisys/common": "3.0.0-beta.39",
+        "@naisys/common-node": "3.0.0-beta.39",
+        "@naisys/hub-database": "3.0.0-beta.39",
+        "@naisys/hub-protocol": "3.0.0-beta.39",
         "commander": "^14.0.3",
         "dotenv": "^17.3.1",
         "fastify": "^5.8.2",
@@ -24,7 +24,7 @@
         "node": ">=22.0.0"
       },
       "peerDependencies": {
-        "@naisys/supervisor": "3.0.0-beta.38"
+        "@naisys/supervisor": "3.0.0-beta.39"
       },
       "peerDependenciesMeta": {
         "@naisys/supervisor": {
@@ -189,32 +189,32 @@
       "license": "MIT"
     },
     "node_modules/@naisys/common": {
-      "version": "3.0.0-beta.38",
-      "resolved": "https://registry.npmjs.org/@naisys/common/-/common-3.0.0-beta.38.tgz",
-      "integrity": "sha512-YJIawcV12XNgzQz/QcM2oAYhu4O4V55tHm0JZrEdmBt2GS33VsGIVJqhDtg3sVWvtsDfh8QkK7EjwPEvgj7fzA==",
+      "version": "3.0.0-beta.39",
+      "resolved": "https://registry.npmjs.org/@naisys/common/-/common-3.0.0-beta.39.tgz",
+      "integrity": "sha512-H65s+TNhjKC+6piF9sP9LpydRL+K7IEyD6gUgXDekiQ1+6OV9xgxzZmeOgTAGs/Mk3fSs73OJ6JC4WPjBwVSdA==",
       "dependencies": {
         "semver": "^7.7.4",
         "zod": "^4.3.6"
       }
     },
     "node_modules/@naisys/common-node": {
-      "version": "3.0.0-beta.38",
-      "resolved": "https://registry.npmjs.org/@naisys/common-node/-/common-node-3.0.0-beta.38.tgz",
-      "integrity": "sha512-dNVvY+gWzBx4I+3chvNl74MgrcxVBFpPB+0acYSl7bcINvhqmbqLMYryR4AwOvU+dc09GDbpgugE6EWIQnn/zA==",
+      "version": "3.0.0-beta.39",
+      "resolved": "https://registry.npmjs.org/@naisys/common-node/-/common-node-3.0.0-beta.39.tgz",
+      "integrity": "sha512-UGQwcHx8hbeTHjYKYB0Y9BQouwip614bOxUXeo2U+552gUTjmdjc2T7ng14opVqtZmYYzTidLWQrblS8mNa+sw==",
       "dependencies": {
-        "@naisys/common": "3.0.0-beta.38",
+        "@naisys/common": "3.0.0-beta.39",
         "better-sqlite3": "^12.6.2",
         "js-yaml": "^4.1.1",
         "pino": "^10.3.1"
       }
     },
     "node_modules/@naisys/hub-database": {
-      "version": "3.0.0-beta.38",
-      "resolved": "https://registry.npmjs.org/@naisys/hub-database/-/hub-database-3.0.0-beta.38.tgz",
-      "integrity": "sha512-h+e50Qjg389ewSKU2jAisexlmajEAK34lMz6FKWd8Hog/PI6v3BYKB/8wgL2HmI78apmHIjh1FRW3NQNF+D8rw==",
+      "version": "3.0.0-beta.39",
+      "resolved": "https://registry.npmjs.org/@naisys/hub-database/-/hub-database-3.0.0-beta.39.tgz",
+      "integrity": "sha512-rTKKwhRWGp/5LcBiFLurY3VYdk6a5YNiEj7nfGMWYGbTozTw1X6PlCoBT3UV6g/brFPKDIlsS9tMDAhI/ibuuw==",
       "dependencies": {
-        "@naisys/common": "3.0.0-beta.38",
-        "@naisys/common-node": "3.0.0-beta.38",
+        "@naisys/common": "3.0.0-beta.39",
+        "@naisys/common-node": "3.0.0-beta.39",
         "@prisma/adapter-better-sqlite3": "^7.5.0",
         "@prisma/client": "^7.5.0",
         "better-sqlite3": "^12.6.2",
@@ -222,11 +222,11 @@
       }
     },
     "node_modules/@naisys/hub-protocol": {
-      "version": "3.0.0-beta.38",
-      "resolved": "https://registry.npmjs.org/@naisys/hub-protocol/-/hub-protocol-3.0.0-beta.38.tgz",
-      "integrity": "sha512-HLNcDmbdQVDeOxQlohoSrQdz/EXvNKx16BZVEovlwixuGCfINgweOkjtr4qypHO0peHPD0p1ayBa2QAjRrSY5Q==",
+      "version": "3.0.0-beta.39",
+      "resolved": "https://registry.npmjs.org/@naisys/hub-protocol/-/hub-protocol-3.0.0-beta.39.tgz",
+      "integrity": "sha512-zYBhBSVuN/RlEiMpY4ke2J9SwL5Nyd4VNZmP2ZH7hXiL3bDlp8K3odZQqfd1kIUKidnhNzqEH4H+CLOwB4kJPA==",
       "dependencies": {
-        "@naisys/common": "3.0.0-beta.38",
+        "@naisys/common": "3.0.0-beta.39",
         "zod": "^4.3.6"
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naisys/hub",
-  "version": "3.0.0-beta.38",
+  "version": "3.0.0-beta.39",
   "description": "NAISYS Hub - Adds persistence and multi-instance coordination to NAISYS",
   "type": "module",
   "main": "dist/naisysHub.js",
@@ -17,6 +17,7 @@
     "dev": "tsx watch src/naisysHub.ts",
     "start": "node dist/naisysHub.js",
     "build": "tsc",
+    "test": "vitest run",
     "type-check": "tsc --noEmit",
     "npm:publish:dryrun": "npm publish --dry-run",
     "npm:publish": "npm publish --access public"
@@ -31,7 +32,7 @@
     "!dist/**/*.d.ts.map"
   ],
   "peerDependencies": {
-    "@naisys/supervisor": "3.0.0-beta.38"
+    "@naisys/supervisor": "3.0.0-beta.39"
   },
   "peerDependenciesMeta": {
     "@naisys/supervisor": {
@@ -39,10 +40,10 @@
     }
   },
   "dependencies": {
-    "@naisys/common": "3.0.0-beta.38",
-    "@naisys/common-node": "3.0.0-beta.38",
-    "@naisys/hub-database": "3.0.0-beta.38",
-    "@naisys/hub-protocol": "3.0.0-beta.38",
+    "@naisys/common": "3.0.0-beta.39",
+    "@naisys/common-node": "3.0.0-beta.39",
+    "@naisys/hub-database": "3.0.0-beta.39",
+    "@naisys/hub-protocol": "3.0.0-beta.39",
     "commander": "^14.0.3",
     "dotenv": "^17.3.1",
     "fastify": "^5.8.2",
@@ -51,7 +52,8 @@
   "devDependencies": {
     "@types/node": "^25.5.0",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.0"
   },
   "engines": {
     "node": ">=22.0.0"