@ours.network/fleet 1.2.0-nightly.39 → 1.2.0-nightly.40

package/dist/build-info.json

@@ -1,9 +1,9 @@
 {
-  "version": "1.2.0-nightly.39",
-  "buildId": "a95feeafc4fa",
-  "commit": "b342979b9278dec56c740f8df38bff153f528472",
+  "version": "1.2.0-nightly.40",
+  "buildId": "de6076ea1748",
+  "commit": "147b0e1859d9dc59f46140b0171329e9a479d3cc",
   "dirty": true,
-  "builtAt": "2026-10-03T00:33:48.695Z",
+  "builtAt": "2026-10-03T11:45:41.330Z",
   "capabilities": [
     "workspace.enroll.preserve-profile-v1",
     "cowork.http-management-v1",

package/dist/web/prefix-gateway.d.ts

@@ -9,6 +9,12 @@ export interface ServiceTarget {
     headers?: Record<string, string>;
     /** Dedicated credential-authenticated services reject direct browser context. */
     stripBrowserContext?: boolean;
+    /**
+     * Service paths (below the prefix) where the account App may open a WebSocket with its device
+     * credential. A browser cannot set Authorization on a WebSocket, so only there it is accepted
+     * as a subprotocol.
+     */
+    deviceSocketPaths?: string[];
 }
 export interface GatewayOptions {
     /** Backend mode is for a separate loopback machine-client listener; browsers are rejected. */

package/dist/web/prefix-gateway.js

@@ -1,5 +1,19 @@
 import { createServer, request as httpRequest } from 'node:http';
 import { request as httpsRequest } from 'node:https';
+/** The App offers exactly these two subprotocols; only the marker is ever answered or forwarded. */
+const DEVICE_SOCKET_PROTOCOL = 'ours.workspace.v1';
+const DEVICE_SOCKET_BEARER = 'ours.workspace.bearer.';
+/** The device credential a WebSocket offered as a subprotocol; undefined when it offered none of ours. */
+function deviceSocketCredential(req) {
+    const offered = String(req.headers['sec-websocket-protocol'] ?? '').split(',').map(value => value.trim()).filter(Boolean);
+    if (!offered.some(value => value === DEVICE_SOCKET_PROTOCOL || value.startsWith(DEVICE_SOCKET_BEARER)))
+        return undefined;
+    const credentials = offered.filter(value => value.startsWith(DEVICE_SOCKET_BEARER));
+    const token = credentials[0]?.slice(DEVICE_SOCKET_BEARER.length) ?? '';
+    if (offered.length !== 2 || credentials.length !== 1 || !offered.includes(DEVICE_SOCKET_PROTOCOL) || !/^[A-Za-z0-9_.-]{16,256}$/.test(token))
+        throw new Error('invalid workspace socket subprotocol');
+    return token;
+}
 const hopHeaders = new Set(['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailer', 'transfer-encoding', 'upgrade']);
 function headersFor(message) {
     const denied = new Set([...hopHeaders, ...(message.headers.connection ?? '').split(',').map(x => x.trim().toLowerCase())]);
@@ -32,7 +46,18 @@ export function createPrefixGateway(options) {
     };
     const prepare = (req, upgrade = false) => {
         const route = select(req);
-        const request = { headers: req.headers, method: req.method, url: route.path };
+        // The device credential of an App WebSocket: accepted only on an upgrade, from the exact
+        // account origin, on a path the service declares, and never beside another credential.
+        const socketCredential = upgrade && auth ? deviceSocketCredential(req) : undefined;
+        if (socketCredential !== undefined) {
+            const path = route.service ? (req.url ?? '/').split('?')[0].slice(route.service.prefix.length) : undefined;
+            if (!route.service?.deviceSocketPaths?.includes(path ?? '') || req.headers.authorization !== undefined || req.headers.cookie !== undefined
+                || !req.headers.origin || auth.accountOrigin(req) !== req.headers.origin)
+                throw new Error('workspace socket credential is not accepted here');
+        }
+        // Authentication sees the credential as the bearer it is; the request's own headers are untouched.
+        const authHeaders = socketCredential !== undefined ? { ...req.headers, authorization: `Bearer ${socketCredential}` } : req.headers;
+        const request = { headers: authHeaders, method: req.method, url: route.path };
         if (!auth && (req.headers.origin || req.headers['sec-fetch-site'] || !route.service))
             throw new Error('machine-client listener rejects browser requests');
         auth?.validateBoundary(request, upgrade);
@@ -59,14 +84,17 @@ export function createPrefixGateway(options) {
             headers.connection = 'Upgrade';
             headers.upgrade = 'websocket';
         }
-        return { ...route, headers, session };
+        // The credential subprotocol ends here: the service is not offered it, on any request.
+        if (socketCredential !== undefined || String(headers['sec-websocket-protocol'] ?? '').includes(DEVICE_SOCKET_BEARER))
+            delete headers['sec-websocket-protocol'];
+        return { ...route, headers, session, authHeaders, deviceSocket: socketCredential !== undefined };
     };
-    const track = (req, session, close) => {
+    const track = (authHeaders, session, close) => {
         if (!session)
             return () => { };
         const unbind = auth.bindTransport(session.id, close);
         const timer = setInterval(() => { try {
-            auth.authenticate({ headers: req.headers });
+            auth.authenticate({ headers: authHeaders });
         }
         catch {
             close();
@@ -126,7 +154,7 @@ export function createPrefixGateway(options) {
                 res.writeHead(502, { ...(route.service ? cors : {}), 'content-type': 'application/json' });
             res.end(JSON.stringify({ error: { code: 'upstream_unavailable', message: 'Service is unavailable' } }));
         });
-        const untrack = track(req, route.session, () => { upstream.destroy(); res.destroy(); });
+        const untrack = track(route.authHeaders, route.session, () => { upstream.destroy(); res.destroy(); });
         res.on('close', untrack);
         req.on('aborted', () => upstream.destroy());
         res.on('close', () => upstream.destroy());
@@ -151,12 +179,15 @@ export function createPrefixGateway(options) {
             headers.connection = 'Upgrade';
             headers.upgrade = 'websocket';
             delete headers['set-cookie'];
+            // A browser that offered subprotocols needs one answered; only the marker, never the credential.
+            if (route.deviceSocket)
+                headers['sec-websocket-protocol'] = DEVICE_SOCKET_PROTOCOL;
             socket.write(`HTTP/1.1 101 Switching Protocols\r\n${Object.entries(headers).flatMap(([k, v]) => (Array.isArray(v) ? v : [v]).map(value => `${k}: ${value}\r\n`)).join('')}\r\n`);
             if (head.length)
                 peer.write(head);
             if (upstreamHead.length)
                 socket.write(upstreamHead);
-            const untrack = track(req, route.session, () => { peer.destroy(); socket.destroy(); });
+            const untrack = track(route.authHeaders, route.session, () => { peer.destroy(); socket.destroy(); });
             socket.on('close', untrack);
             peer.pipe(socket);
             socket.pipe(peer);

package/dist/web/runtime.js

@@ -246,7 +246,9 @@ export async function startWebConsole(options) {
         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 } : {}) } }));
+            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 });
             const listen = (port) => new Promise((resolve, reject) => { gateway.server.once('error', reject); gateway.server.listen(port, bind, () => { gateway.server.off('error', reject); resolve(); }); });
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "1.2.0-nightly.39",
+  "version": "1.2.0-nightly.40",
   "description": "Harness-agnostic fleet of persistent, identity-bound AI agents. Declarative fleet.yaml, managed native/ACP sessions, supervision, and ours.network messaging.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",