@ours.network/fleet 1.2.0-nightly.6 → 1.2.0-nightly.61

package/dist/web/runtime.js

@@ -1,5 +1,16 @@
-import { spawn } from 'node:child_process';
-import { existsSync, realpathSync } from 'node:fs';
+import { replaceFileAtomically } from '../atomic-file.js';
+import { validateAccountOrigin } from '../account-origin.js';
+import { startWorkspaceTunnel } from './workspace-tunnel.js';
+import { createPrefixGateway } from './prefix-gateway.js';
+import { readClientProfile } from '../client-profile.js';
+import { readPrivateFile } from '@ours.network/sdk/connector';
+import { LayoutBindingGrants } from '../rooms-tasks/layout-binding-grants.js';
+import { RoomLayoutService } from '../rooms-tasks/layout-service.js';
+import { FleetNotificationProducer } from '../notifications/fleet-producer.js';
+import { producerConfig } from '../notifications/outbox.js';
+import { SubscriptionService } from '../subscriptions/service.js';
+import { createCodexModelDiscovery } from '../application/codex-models.js';
+import { existsSync, mkdirSync, realpathSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { loadConfig } from '../config.js';
 import { RoleRepository } from '../application/role-repository.js';
@@ -13,7 +24,8 @@ import { FleetError } from '../application/errors.js';
 import { controlRequest, controlSocketPath } from '../session/control.js';
 import { pickBackend } from '../supervisor/index.js';
 import { realExec } from '../exec.js';
-import { home, stateRoot } from '../paths.js';
+import { home, stateRoot, agentsRoot, tmpRoot, logsRoot } from '../paths.js';
+import { executeInitAnswers, publishSetup } from '../init-wizard.js';
 import { AuditSink } from './audit.js';
 import { FleetEventBus } from './events.js';
 import { buildWebServer } from './server.js';
@@ -21,8 +33,11 @@ import { FleetConfigService } from './fleet-config-service.js';
 import { mergeTopology } from './topology-model.js';
 import { TopologyDraftStore } from './topology-draft-store.js';
 import { TopologyPromoteService } from './topology-promote.js';
+import { RoomLayoutDefinitions } from '../application/room-layout-definitions.js';
+import { PresetProvenance } from '../application/preset-provenance.js';
 import { doctor } from '../doctor.js';
 import { acquireWebServerLock } from './lock.js';
+import { WorkspaceDeviceStore } from './workspace-devices.js';
 import { TrustedDeviceStore } from './device-store.js';
 import { WebAuth } from './auth.js';
 import { startWebControlServer } from './control.js';
@@ -47,19 +62,31 @@ function cachedConfigProvider(configPath) {
     };
 }
 export async function startWebConsole(options) {
-    const requestedPort = options.port ?? 49_271;
+    const notificationConfig = producerConfig(process.env, undefined, options.log);
+    let requestedPort = options.port ?? 49_271;
     if (!Number.isInteger(requestedPort) || requestedPort < 0 || requestedPort > 65_535)
         throw new FleetError('invalid_request', 'port must be between 0 and 65535');
-    const lock = acquireWebServerLock();
-    const webDir = resolve(stateRoot(), 'web');
+    const webDir = options.webStateDir ?? resolve(stateRoot(), 'web');
+    const lock = acquireWebServerLock(webDir);
     const bind = options.bind ?? '127.0.0.1';
     const publicOrigin = options.publicOrigin ? validatePublicOrigin(options.publicOrigin) : undefined;
+    const workspaceGateway = Boolean(publicOrigin && existsSync(resolve(stateRoot(), 'workspace', 'binding.json')));
     if (!isLoopback(bind) && !publicOrigin) {
         lock.release();
         throw new FleetError('forbidden', 'a non-loopback bind requires an explicit --public-origin');
     }
     const access = options.access ?? new WebAccessStore(webDir).read();
-    const auth = new WebAuth(publicOrigin?.origin ?? `http://127.0.0.1:${requestedPort}`, publicOrigin?.host ?? `127.0.0.1:${requestedPort}`, Date.now, new TrustedDeviceStore(webDir), access);
+    const bindingFile = resolve(stateRoot(), 'workspace', 'binding.json');
+    let appOrigin = 'https://app.ours.network';
+    try {
+        if (existsSync(bindingFile))
+            appOrigin = validateAccountOrigin(JSON.parse(readFileSync(bindingFile, 'utf8')).appOrigin ?? appOrigin);
+    }
+    catch (error) {
+        lock.release();
+        throw error;
+    }
+    const auth = new WebAuth(publicOrigin?.origin ?? `http://127.0.0.1:${requestedPort}`, publicOrigin?.host ?? `127.0.0.1:${requestedPort}`, Date.now, new TrustedDeviceStore(webDir), access, new WorkspaceDeviceStore(webDir), appOrigin);
     const backend = pickBackend();
     const repository = new RoleRepository({
         configPath: options.configPath,
@@ -159,8 +186,29 @@ export async function startWebConsole(options) {
     try {
         server = await buildWebServer({
             query, repository, logs, commands, creation, removal, audit, events, watchdogs, configuration,
-            taskRooms: new TaskRoomApplicationService(options.configPath),
+            taskRooms: new TaskRoomApplicationService(options.configPath, { binPath: () => options.binPath }),
+            roomLayouts: new RoomLayoutDefinitions(options.configPath),
+            layoutBindings: new LayoutBindingGrants(new RoomLayoutService(options.configPath).supervisor()),
+            presetProvenance: new PresetProvenance(options.configPath),
             topology: readTopology, topologyDrafts, topologyPromote,
+            // Same boundary as `ours-fleet init --settings`: existing files are preserved, missing defaults are added.
+            onboardingSetup: async (answers) => {
+                await executeInitAnswers(answers, configuration.path, {
+                    async hostSetup() {
+                        for (const directory of [agentsRoot(), tmpRoot(), logsRoot()])
+                            mkdirSync(directory, { recursive: true });
+                        await pickBackend().init(options.binPath);
+                    },
+                    publish: publishSetup,
+                });
+            },
+            codexModels: createCodexModelDiscovery(),
+            subscriptions: new SubscriptionService({
+                agents: async () => (await query.list(true)).map(({ role, status }) => ({
+                    roleId: role.id, stateDir: repository.stateDir(role), running: status.supervisor.liveness === 'running',
+                })),
+                onChange: () => events.publish('subscription.changed', {}),
+            }),
             async session(roleId) {
                 const role = await repository.get(roleId);
                 if (!role)
@@ -182,7 +230,7 @@ export async function startWebConsole(options) {
     }
     let address;
     try {
-        address = await server.app.listen({ host: bind, port: requestedPort });
+        address = await server.app.listen({ host: workspaceGateway ? '127.0.0.1' : bind, port: workspaceGateway ? 0 : requestedPort });
     }
     catch (error) {
         await server.close();
@@ -193,39 +241,84 @@ export async function startWebConsole(options) {
     const localHost = `127.0.0.1:${actual.port}`;
     const browserOrigin = publicOrigin?.origin ?? `http://${localHost}`;
     const browserHost = publicOrigin?.host ?? localHost;
+    let gateway;
+    if (workspaceGateway)
+        try {
+            const profile = readClientProfile(), provider = new URL(profile.serverUrl), credential = readPrivateFile(profile.credentialPath, 4096).toString('utf8').trim();
+            const basePath = provider.pathname.replace(/\/$/, '');
+            const services = ['daemon', 'cowork', 'messenger', 'notifications'].map(name => ({ prefix: '/' + name, origin: provider.origin, upstreamPrefix: basePath + '/' + name, stripBrowserContext: true, headers: { 'X-Ours-Api-Token': credential, ...(name === 'messenger' ? { Origin: provider.origin, 'X-Ours-Messenger-CSRF': '1' } : name === 'cowork' ? { Origin: provider.origin } : {}) },
+                // The App reports a visible page to the notification service, so an open app is not sent a push.
+                ...(name === 'notifications' ? { deviceSocketPaths: ['/api/v1/presence'] } : {}) }));
+            gateway = createPrefixGateway({ auth: server.auth, fleetOrigin: address, services, audit });
+            const listen = (port) => new Promise((resolve, reject) => { gateway.server.once('error', reject); gateway.server.listen(port, bind, () => { gateway.server.off('error', reject); resolve(); }); });
+            try {
+                await listen(requestedPort);
+            }
+            catch (error) {
+                const selection = resolve(webDir, 'port-selection.json');
+                if (error.code !== 'EADDRINUSE' || !existsSync(selection) || JSON.parse(readPrivateFile(selection, 4096).toString()).expiresAt <= Date.now())
+                    throw error;
+                await listen(0);
+            }
+            const bound = gateway.server.address();
+            if (!bound || typeof bound === 'string')
+                throw Error('Workspace listener did not bind');
+            requestedPort = bound.port;
+            replaceFileAtomically(resolve(webDir, 'workspace-port.json'), JSON.stringify({ port: requestedPort }) + '\n', 0o600);
+        }
+        catch (error) {
+            await gateway?.close().catch(() => { });
+            await server.close();
+            lock.release();
+            throw error;
+        }
     server.auth.setBoundary(browserOrigin, browserHost, publicOrigin ? {
         // nginx's safe default uses the loopback upstream as Host. The declared
         // browser Origin remains mandatory for auth/mutations and WebSocket hello,
         // so operators do not need a fragile Host-rewrite incantation.
-        hosts: [localHost, `localhost:${actual.port}`],
+        hosts: [localHost, `localhost:${actual.port}`, ...(workspaceGateway ? [`127.0.0.1:${requestedPort}`, `localhost:${requestedPort}`] : [])],
     } : {
         hosts: [`localhost:${actual.port}`], origins: [`http://localhost:${actual.port}`],
     });
     let control;
     try {
-        control = await startWebControlServer({
-            dir: webDir,
-            onOpen() {
-                const url = access.mode === 'pairing'
-                    ? `${browserOrigin}/#bootstrap=${server.auth.mintBootstrap()}` : `${browserOrigin}/`;
-                openBrowser(url);
-            },
-            onRevokeAll() { server.auth.revokeAllTrustedDevices(); },
-        });
+        if (options.control !== false)
+            control = await startWebControlServer({
+                dir: webDir,
+                onLinkDevice() { return { version: 1, origin: browserOrigin, ...server.auth.workspaceEnrollment() }; },
+                onRevokeAll() { server.auth.revokeAllTrustedDevices(); },
+            });
     }
     catch (error) {
+        await gateway?.close();
         await server.close();
         lock.release();
         throw error;
     }
-    if (options.open !== false)
-        openBrowser(access.mode === 'pairing'
-            ? `${browserOrigin}/#bootstrap=${server.auth.bootstrapSecret}` : `${browserOrigin}/`);
+    let stopTunnel;
+    try {
+        stopTunnel = startWorkspaceTunnel(browserOrigin);
+    }
+    catch (error) {
+        try {
+            await control?.close();
+            await gateway?.close();
+            await server.close();
+        }
+        finally {
+            lock.release();
+        }
+        throw error;
+    }
+    const notifications = notificationConfig ? new FleetNotificationProducer([agentsRoot(), tmpRoot()], resolve(webDir, 'notification-outboxes'), notificationConfig, options.log) : undefined;
     return {
         ...server, address: browserOrigin,
         async close() {
             try {
-                await control.close();
+                await stopTunnel();
+                await notifications?.close();
+                await control?.close();
+                await gateway?.close();
                 await server.close();
             }
             finally {
@@ -237,11 +330,3 @@ export async function startWebConsole(options) {
 function isLoopback(host) {
     return ['127.0.0.1', 'localhost', '::1'].includes(host);
 }
-function openBrowser(url) {
-    const command = process.platform === 'darwin' ? 'open'
-        : process.platform === 'win32' ? 'cmd' : 'xdg-open';
-    const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
-    const child = spawn(command, args, { stdio: 'ignore', detached: true, shell: false });
-    child.on('error', () => undefined);
-    child.unref();
-}

package/dist/web/server.d.ts

@@ -1,3 +1,5 @@
+import { type InitAnswers } from '../init-wizard.js';
+import { SupervisorOursTools } from '../application/supervisor-ours-tools.js';
 import { type FastifyInstance } from 'fastify';
 import type { FleetQueryService } from '../application/fleet-query-service.js';
 import type { RoleRepository } from '../application/role-repository.js';
@@ -15,7 +17,13 @@ import type { TopologyDraftStore } from './topology-draft-store.js';
 import type { TopologyPromoteService } from './topology-promote.js';
 import type { RoleRemovalService } from '../application/role-removal-service.js';
 import type { TaskRoomApplicationService } from '../application/task-room-service.js';
+import type { RoomLayoutDefinitions } from '../application/room-layout-definitions.js';
+import type { PresetProvenance } from '../application/preset-provenance.js';
+import type { OfferedModels } from '../subscriptions/cli.js';
+import type { SubscriptionService } from '../subscriptions/service.js';
+import type { LayoutBindingGrants } from '../rooms-tasks/layout-binding-grants.js';
 export interface WebServices {
+    layoutBindings?: Pick<LayoutBindingGrants, 'control'>;
     query: FleetQueryService;
     repository: RoleRepository;
     session(roleId: string): Promise<RoleSessionControl>;
@@ -31,6 +39,14 @@ export interface WebServices {
     topologyPromote?: TopologyPromoteService;
     removal?: RoleRemovalService;
     taskRooms?: TaskRoomApplicationService;
+    roomLayouts?: RoomLayoutDefinitions;
+    presetProvenance?: PresetProvenance;
+    oursTools?: Pick<SupervisorOursTools, 'list' | 'call'>;
+    subscriptions?: SubscriptionService;
+    /** First-time setup from the packaged presets; the account App supplies only the model choices. */
+    onboardingSetup?(answers: InitAnswers): Promise<void>;
+    /** The Codex models the runtime that sessions will use offers the active account. Absent: this server cannot tell, and filters nothing. */
+    codexModels?(): Promise<OfferedModels>;
 }
 export interface WebServer {
     app: FastifyInstance;