feat: expose daemon-owned active agent profile

src/server/sessiond.ts

@@ -20,11 +20,16 @@ import { TerminalService } from "./terminals/terminalService.js";
 import { registerTerminalRoutes } from "./terminals/terminalRoutes.js";
 import { getPiWebRuntimeComponent } from "./piWebStatus.js";
 import { SESSIOND_RUNTIME_CAPABILITIES } from "../shared/capabilities.js";
-import { effectiveAgentConfig, effectivePiWebConfig, maxUploadBytes, spawnSessionsEnabled, subsessionsEnabled } from "../config.js";
+import { agentSessionDirEnvKeys, effectivePiWebConfig, maxUploadBytes, spawnSessionsEnabled, subsessionsEnabled } from "../config.js";
+import { createActiveAgentProfileDescriptor } from "../sessiond/activeAgentProfile.js";
 import { runSessionDaemonStartup } from "./sessiond/sessionDaemonStartup.js";
 
 const { config } = effectivePiWebConfig();
-const agent = effectiveAgentConfig(process.env, config);
+const activeAgentProfile = createActiveAgentProfileDescriptor({
+  command: config.agent.command,
+  dir: config.agent.dir,
+  sessionDirEnvKeys: agentSessionDirEnvKeys(config.agent.command),
+});
 const app = Fastify({ logger: true, bodyLimit: maxUploadBytes(process.env, config) });
 await app.register(fastifyWebsocket);
 
@@ -33,46 +38,50 @@ await runSessionDaemonStartup({
   createRuntime() {
     const eventHub = new SessionEventHub();
     const workspaceActivity = new WorkspaceActivityService(eventHub);
-    const auth = new AuthService({ agentDir: agent.dir });
+    const auth = new AuthService({ agentDir: activeAgentProfile.dir });
     const spawnTargets = spawnSessionsEnabled(process.env, config)
       ? new ProjectScopedSpawnTargetResolver({ projects: new ProjectService(new ProjectStore()), workspaces: new WorkspaceService() })
       : undefined;
     const sessions = new PiSessionService(eventHub, {
       modelRegistry: auth.modelRegistry,
-      agentDir: agent.dir,
+      agentDir: activeAgentProfile.dir,
       workspaceActivity,
       logger: app.log,
       ...(spawnTargets === undefined ? {} : { spawnTargets }),
       subsessionsEnabled: spawnTargets !== undefined && subsessionsEnabled(process.env, config),
-      sessionManager: createPiSessionManagerGateway({ agentDir: agent.dir, sessionDirEnvKeys: agent.sessionDirEnvKeys }),
+      sessionManager: createPiSessionManagerGateway({
+        agentDir: activeAgentProfile.dir,
+        sessionDirEnvKeys: activeAgentProfile.sessionDirEnvKeys,
+      }),
     });
     auth.subscribe((change) => { sessions.applyAuthChange(change); });
     const terminals = new TerminalService(eventHub, workspaceActivity);
-    return { eventHub, workspaceActivity, auth, sessions, terminals };
+    const runtimeComponent = Object.freeze({
+      ...getPiWebRuntimeComponent("sessiond", SESSIOND_RUNTIME_CAPABILITIES),
+      activeAgentProfile,
+    });
+    return { eventHub, workspaceActivity, auth, sessions, terminals, activeAgentProfile, runtimeComponent };
   },
-  registerRoutes({ eventHub, workspaceActivity, auth, sessions, terminals }) {
+  registerRoutes({ eventHub, workspaceActivity, auth, sessions, terminals, runtimeComponent }) {
     registerWorkspaceActivityRoutes(app, workspaceActivity);
     registerAuthRoutes(app, auth);
     registerSessionRoutes(app, sessions, eventHub);
     registerTerminalRoutes(app, terminals);
 
-    app.get("/health", () => {
-      const runtime = getPiWebRuntimeComponent("sessiond", SESSIOND_RUNTIME_CAPABILITIES);
-      return {
-        ok: true,
-        activeSessions: sessions.activeCount(),
-        checkedAt: new Date().toISOString(),
-        version: {
-          component: runtime.component,
-          label: runtime.label,
-          ...(runtime.runtimeVersion === undefined ? {} : { runtimeVersion: runtime.runtimeVersion }),
-          stale: false,
-          available: runtime.available,
-        },
-      };
-    });
+    app.get("/health", () => ({
+      ok: true,
+      activeSessions: sessions.activeCount(),
+      checkedAt: new Date().toISOString(),
+      version: {
+        component: runtimeComponent.component,
+        label: runtimeComponent.label,
+        ...(runtimeComponent.runtimeVersion === undefined ? {} : { runtimeVersion: runtimeComponent.runtimeVersion }),
+        stale: false,
+        available: runtimeComponent.available,
+      },
+    }));
 
-    app.get("/runtime", () => getPiWebRuntimeComponent("sessiond", SESSIOND_RUNTIME_CAPABILITIES));
+    app.get("/runtime", () => runtimeComponent);
   },
   async listen({ auth, sessions, terminals }) {
     let shuttingDown = false;