@klhapp/skillmux 1.3.3 → 1.4.0

package/src/server.ts

@@ -5,6 +5,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { z } from "zod";
 import { createClients } from "./clients";
 import { loadConfig, resolveConfigPath } from "./config";
+import { describeDeployment } from "./deployment";
 import { ConfigWatcher, type ReloadStatus } from "./config-watcher";
 import { RuntimeSnapshotManager } from "./snapshot";
 import {
@@ -64,46 +65,7 @@ function safeTokenEquals(a: string, b: string): boolean {
   return timingSafeEqual(bufA, bufB);
 }
 
-export async function startServer(opts?: {
-  transport?: "stdio" | "http";
-  port?: number;
-  config?: Config;
-  clients?: Partial<Clients>;
-  configPath?: string;
-}): Promise<ServerHandle> {
-  const configPath = resolveConfigPath(opts?.configPath);
-  const config = opts?.config ?? (await loadConfig(configPath));
-  const initialClients = { ...createClients(config), ...opts?.clients };
-  const snapshots = RuntimeSnapshotManager.create(config, initialClients);
-  const inactiveReloadStatus: ReloadStatus = {
-    last_successful_reload_at: null,
-    last_reload_error: null,
-    restart_required_keys: [],
-  };
-  configure({ config, clients: initialClients });
-  // An injected config has no guaranteed file source. Watch it only when the
-  // caller explicitly supplies that source; normal server startup always watches.
-  const watcherPath =
-    opts?.configPath ?? (opts?.config ? undefined : configPath);
-  const configWatcher = watcherPath
-    ? await ConfigWatcher.start(watcherPath, {
-        onReload: (nextConfig) => {
-          const nextClients = {
-            ...createClients(nextConfig),
-            ...opts?.clients,
-          };
-          snapshots.replace(nextConfig, nextClients);
-          configure({ config: nextConfig, clients: nextClients });
-        },
-        onError: (error) =>
-          console.error("skillmux config reload error:", error),
-      })
-    : undefined;
-  const stopWatcher = await startVaultWatcher();
-  const initPromise = initializeRuntime(readinessState)
-    .then(() => metricsRegistry.setReadiness(readinessState.get()))
-    .catch((err) => console.error("skillmux runtime init error:", err));
-
+export function createMcpServer(): McpServer {
   const server = new McpServer({ name: "skillmux", version: "0.1.0" });
 
   // Transport rule from schema.json: the SKILL.md body appears exactly once on
@@ -166,6 +128,52 @@ export async function startServer(opts?: {
     },
   );
 
+  return server;
+}
+
+export async function startServer(opts?: {
+  transport?: "stdio" | "http";
+  port?: number;
+  config?: Config;
+  clients?: Partial<Clients>;
+  configPath?: string;
+}): Promise<ServerHandle> {
+  const configPath = resolveConfigPath(opts?.configPath);
+  const config = opts?.config ?? (await loadConfig(configPath));
+  const initialClients = { ...createClients(config), ...opts?.clients };
+  const snapshots = RuntimeSnapshotManager.create(config, initialClients);
+  const inactiveReloadStatus: ReloadStatus = {
+    last_successful_reload_at: null,
+    last_reload_error: null,
+    restart_required_keys: [],
+  };
+  configure({ config, clients: initialClients });
+  metricsRegistry.setDeployment(describeDeployment(config));
+  // An injected config has no guaranteed file source. Watch it only when the
+  // caller explicitly supplies that source; normal server startup always watches.
+  const watcherPath =
+    opts?.configPath ?? (opts?.config ? undefined : configPath);
+  const configWatcher = watcherPath
+    ? await ConfigWatcher.start(watcherPath, {
+        onReload: (nextConfig) => {
+          const nextClients = {
+            ...createClients(nextConfig),
+            ...opts?.clients,
+          };
+          snapshots.replace(nextConfig, nextClients);
+          configure({ config: nextConfig, clients: nextClients });
+        },
+        onError: (error) =>
+          console.error("skillmux config reload error:", error),
+      })
+    : undefined;
+  const stopWatcher = await startVaultWatcher();
+  const initPromise = initializeRuntime(readinessState)
+    .then(() => metricsRegistry.setReadiness(readinessState.get()))
+    .catch((err) => console.error("skillmux runtime init error:", err));
+
+  const server = createMcpServer();
+
   const transportType = opts?.transport ?? "stdio";
   if (transportType === "http") {
     const { WebStandardStreamableHTTPServerTransport } =
@@ -270,10 +278,16 @@ export async function startServer(opts?: {
           }
           if (url.pathname === "/health/ready") {
             const readiness = readinessState.get();
+            const deployment = describeDeployment(config);
             const headers = new Headers({ "Content-Type": "application/json" });
             if (allowOriginHeader)
               headers.set("Access-Control-Allow-Origin", allowOriginHeader);
-            return new Response(JSON.stringify(readiness), {
+            return new Response(JSON.stringify({
+              ...readiness,
+              version: deployment.version,
+              runtime: deployment.runtime,
+              image_variant: deployment.image_variant,
+            }), {
               status: readiness.status === "ready" ? 200 : 503,
               headers,
             });
@@ -389,6 +403,7 @@ export async function startServer(opts?: {
 
           if (req.method === "GET" && url.pathname === "/admin/v1/config") {
             const { effective, sources } = await getEffectiveConfig(configPath);
+            const deployment = describeDeployment(config);
             const desiredHash = computeHash(effective);
             const snapshot = snapshots.acquire();
             const activeRevision = computeHash(snapshot.snapshot.config);
@@ -411,6 +426,9 @@ export async function startServer(opts?: {
                   ...status,
                   readiness: readinessState.get(),
                   runtime: "running",
+                  version: deployment.version,
+                  deployment_runtime: deployment.runtime,
+                  image_variant: deployment.image_variant,
                 },
               }),
               { status: 200, headers },
@@ -430,7 +448,7 @@ export async function startServer(opts?: {
 
             const ifMatch = req.headers.get("if-match") || "";
             const cleanIfMatch = ifMatch.replace(/^"|"$/g, "");
-            const { effective } = await getEffectiveConfig();
+            const { effective } = await getEffectiveConfig(configPath);
             const currentHash = computeHash(effective);
 
             if (!ifMatch || cleanIfMatch !== currentHash) {