@naisys/hub 3.0.0-beta.16 → 3.0.0-beta.17

package/.env.example

@@ -0,0 +1,5 @@
+# Hub server port
+HUB_PORT=3101
+
+# NAISYS folder for logs and auto-generated TLS certificates
+NAISYS_FOLDER="~/.naisys"

package/dist/handlers/hubConfigService.js

@@ -29,6 +29,13 @@ export async function createHubConfigService(naisysServer, { hubDb }, logService
         }
         logService.log(`[Hub:Config] Seeded ${entries.length} variables from .env file into database`);
     }
+    // Ensure well-known variables exist so they show up in supervisor UI
+    await ensureVariables(hubDb, [
+        { key: "GOOGLE_SEARCH_ENGINE_ID" },
+        { key: "SPEND_LIMIT_DOLLARS" },
+        { key: "SPEND_LIMIT_HOURS" },
+        { key: "TARGET_VERSION" },
+    ]);
     /** Read variables from DB and build a ConfigResponse */
     async function buildConfigPayload() {
         const rows = await hubDb.variables.findMany();
@@ -82,4 +89,22 @@ export async function createHubConfigService(naisysServer, { hubDb }, logService
         getConfig: () => cachedConfig,
     };
 }
+/** Create variable placeholders if they don't already exist */
+export async function ensureVariables(hubDb, keys) {
+    for (const { key, sensitive } of keys) {
+        const existing = await hubDb.variables.findUnique({ where: { key } });
+        if (!existing) {
+            await hubDb.variables.create({
+                data: {
+                    key,
+                    value: "",
+                    sensitive: sensitive ?? false,
+                    export_to_shell: false,
+                    created_by: "hub",
+                    updated_by: "hub",
+                },
+            });
+        }
+    }
+}
 //# sourceMappingURL=hubConfigService.js.map

package/dist/handlers/hubHostService.js

@@ -1,14 +1,22 @@
 import { HubEvents } from "@naisys/hub-protocol";
+import { getHubVersion } from "../version.js";
 /** Pushes the host list to all connections when connected hosts change */
 export function createHubHostService(naisysServer, hostRegistrar, logService) {
     let cachedHostListJson = "";
     function broadcastHostList(newConnection) {
-        const connectedHostIds = new Set(naisysServer.getConnectedClients().map((c) => c.getHostId()));
-        const hosts = hostRegistrar.getAllHosts().map((h) => ({
-            ...h,
-            online: connectedHostIds.has(h.hostId),
-        }));
-        const payload = { hosts };
+        // Index connected clients by hostId for O(1) lookup of online + version
+        const clientByHostId = new Map(naisysServer
+            .getConnectedClients()
+            .map((c) => [c.getHostId(), c]));
+        const hosts = hostRegistrar.getAllHosts().map((h) => {
+            const client = clientByHostId.get(h.hostId);
+            return {
+                ...h,
+                online: !!client,
+                version: client?.getClientVersion() || "",
+            };
+        });
+        const payload = { hubVersion: getHubVersion(), hosts };
         const json = JSON.stringify(payload);
         // Send to the newly connecting client directly
         if (newConnection) {

package/dist/handlers/hubModelsService.js

@@ -1,6 +1,7 @@
 import { builtInImageModels, builtInLlmModels, dbFieldsToImageModel, dbFieldsToLlmModel, imageModelToDbFields, llmModelToDbFields, } from "@naisys/common";
 import { loadCustomModels } from "@naisys/common-node";
 import { HubEvents } from "@naisys/hub-protocol";
+import { ensureVariables } from "./hubConfigService.js";
 /** Hub handler that seeds models on startup, pushes them on connect, and broadcasts on change */
 export async function createHubModelsService(naisysServer, { hubDb }, logService) {
     // Seed models table from built-in + YAML custom models (one-time, skips if non-empty)
@@ -102,5 +103,13 @@ async function seedModels(hubDb, logService) {
     else {
         logService.log(`[Hub:Models] Models already seeded`);
     }
+    // Ensure API key variables referenced by built-in models exist in the variables table
+    // so they show up in the supervisor UI for the user to configure
+    const apiKeyVars = [
+        ...new Set([...builtInLlmModels, ...builtInImageModels]
+            .map((m) => m.apiKeyVar)
+            .filter(Boolean)),
+    ];
+    await ensureVariables(hubDb, apiKeyVars.map((key) => ({ key, sensitive: true })));
 }
 //# sourceMappingURL=hubModelsService.js.map

package/dist/naisysHub.js

@@ -1,4 +1,4 @@
-import { expandNaisysFolder } from "@naisys/common-node";
+import { ensureDotEnv, expandNaisysFolder } from "@naisys/common-node";
 import { createHubDatabaseService } from "@naisys/hub-database";
 import { program } from "commander";
 import dotenv from "dotenv";
@@ -112,6 +112,7 @@ export const startHub = async (startupType, startSupervisor, plugins, startupAge
 // Start server if this file is run directly
 if (process.argv[1] === fileURLToPath(import.meta.url)) {
     dotenv.config({ quiet: true });
+    await ensureDotEnv(new URL("../.env.example", import.meta.url));
     expandNaisysFolder();
     program
         .argument("[agent-path]", "Path to agent configuration file to seed the database (optional)")

package/dist/services/agentRegistrar.js

@@ -1,4 +1,4 @@
-import { toUrlSafeKey } from "@naisys/common";
+import { adminAgentConfig, toUrlSafeKey } from "@naisys/common";
 import { loadAgentConfigs } from "@naisys/common-node";
 import { randomBytes, randomUUID } from "crypto";
 /** Seeds agent configs from YAML files into an empty database. Skips if users already exist. */
@@ -10,9 +10,22 @@ export async function seedAgentConfigs({ hubDb }, logService, startupAgentPath)
         logService.log("[Hub:AgentRegistrar] Agents already seeded");
         return;
     }
-    // Default to CWD when no path specified (matches standalone hub behavior)
-    const users = loadAgentConfigs(startupAgentPath || "");
-    await seedUsersToDatabase(hubDb, logService, users);
+    if (startupAgentPath) {
+        const users = loadAgentConfigs(startupAgentPath);
+        await seedUsersToDatabase(hubDb, logService, users);
+    }
+    else {
+        // No seed path: just create the admin agent
+        const adminUsers = new Map();
+        adminUsers.set(1, {
+            userId: 1,
+            username: adminAgentConfig.username,
+            enabled: true,
+            leadUserId: undefined,
+            config: adminAgentConfig,
+        });
+        await seedUsersToDatabase(hubDb, logService, adminUsers);
+    }
 }
 async function seedUsersToDatabase(hubDb, logService, users) {
     // First pass: create all users, build loader userId → DB id map

package/dist/services/naisysConnection.js

@@ -3,7 +3,7 @@
  * Each connected NAISYS instance gets its own NaisysConnection instance.
  */
 export function createNaisysConnection(socket, connectionInfo, raiseEvent, logService) {
-    const { hostId, hostName, connectedAt, hostType } = connectionInfo;
+    const { hostId, hostName, connectedAt, hostType, clientVersion } = connectionInfo;
     logService.log(`[Hub:Connection] NAISYS instance connected: ${hostName} (${hostId})`);
     // Forward all socket events to hub's emit function
     // Note: Socket.IO passes (eventName, ...args) where last arg may be an ack callback
@@ -40,6 +40,7 @@ export function createNaisysConnection(socket, connectionInfo, raiseEvent, logSe
         getConnectedAt: () => connectedAt,
         getSocketId: () => socket.id,
         getHostType: () => hostType,
+        getClientVersion: () => clientVersion,
     };
 }
 //# sourceMappingURL=naisysConnection.js.map

package/dist/services/naisysServer.js

@@ -59,7 +59,7 @@ export function createNaisysServer(nsp, initialHubAccessKey, logService, hostReg
     }
     // Authentication middleware
     nsp.use(async (socket, next) => {
-        const { hubAccessKey: clientAccessKey, hostName, hostType: rawHostType, } = socket.handshake.auth;
+        const { hubAccessKey: clientAccessKey, hostName, hostType: rawHostType, clientVersion, } = socket.handshake.auth;
         if (!clientAccessKey || clientAccessKey !== hubAccessKey) {
             logService.log(`[Hub] Connection rejected: invalid access key from ${socket.handshake.address}`);
             return next(new Error("Invalid access key"));
@@ -79,6 +79,8 @@ export function createNaisysServer(nsp, initialHubAccessKey, logService, hostReg
             socket.data.hostId = hostId;
             socket.data.hostName = hostName;
             socket.data.hostType = hostType;
+            socket.data.clientVersion =
+                typeof clientVersion === "string" ? clientVersion : "";
             next();
         }
         catch (err) {
@@ -88,13 +90,14 @@ export function createNaisysServer(nsp, initialHubAccessKey, logService, hostReg
     });
     // Handle new connections
     nsp.on("connection", (socket) => {
-        const { hostId, hostName, hostType } = socket.data;
+        const { hostId, hostName, hostType, clientVersion } = socket.data;
         // Create connection handler for this socket, passing our emit function
         const connection = createNaisysConnection(socket, {
             hostId,
             hostName,
             connectedAt: new Date(),
             hostType,
+            clientVersion,
         }, raiseEvent, logService);
         if (hostType === "supervisor") {
             supervisorConnections.push(connection);

package/dist/version.js

@@ -0,0 +1,12 @@
+import { getGitCommitHash } from "@naisys/common-node";
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+// Read the hub's own package.json (one level up from dist/)
+const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
+const commitHash = getGitCommitHash(__dirname);
+export function getHubVersion() {
+    return commitHash ? `${pkg.version}/${commitHash}` : pkg.version;
+}
+//# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naisys/hub",
-  "version": "3.0.0-beta.16",
+  "version": "3.0.0-beta.17",
   "description": "NAISYS Hub - Adds persistence and multi-instance coordination to NAISYS",
   "type": "module",
   "main": "dist/naisysHub.js",
@@ -13,7 +13,7 @@
     "./services/runnerServer": "./dist/services/runnerServer.js"
   },
   "scripts": {
-    "clean": "rimraf dist",
+    "clean": "npx rimraf dist",
     "dev": "tsx watch src/naisysHub.ts",
     "start": "node dist/naisysHub.js",
     "build": "tsc",
@@ -24,12 +24,13 @@
   "files": [
     "dist",
     "bin",
+    ".env.example",
     "!dist/**/*.map",
     "!dist/**/*.d.ts",
     "!dist/**/*.d.ts.map"
   ],
   "peerDependencies": {
-    "@naisys/supervisor": "3.0.0-beta.16"
+    "@naisys/supervisor": "3.0.0-beta.17"
   },
   "peerDependenciesMeta": {
     "@naisys/supervisor": {
@@ -37,10 +38,10 @@
     }
   },
   "dependencies": {
-    "@naisys/common": "3.0.0-beta.16",
-    "@naisys/common-node": "3.0.0-beta.16",
-    "@naisys/hub-database": "3.0.0-beta.16",
-    "@naisys/hub-protocol": "3.0.0-beta.16",
+    "@naisys/common": "3.0.0-beta.17",
+    "@naisys/common-node": "3.0.0-beta.17",
+    "@naisys/hub-database": "3.0.0-beta.17",
+    "@naisys/hub-protocol": "3.0.0-beta.17",
     "commander": "^14.0.3",
     "dotenv": "^17.3.1",
     "pino": "^10.3.1",