@nimbus-sh/worker 0.9.0 → 0.11.0

package/dist/runtime-catalog.generated.js

@@ -24,4 +24,4 @@
  * The empty string means "not pinned yet" — the catalog stays out of L2 and
  * the supervisor warns once per isolate.
  */
-export const RUNTIME_CATALOG_SHA256 = "9cdc9cc0d96667234c6fed2adc81e7890fef96b3afe5bd80dd80612e822d3d3a";
+export const RUNTIME_CATALOG_SHA256 = "2827a7f7245403cb7644c27f0075423dd1ba00313b8c40f70f4dfa5bcd097ed0";

package/dist/session/agent.d.ts

@@ -13,13 +13,25 @@ interface Host extends ProgrammaticHost, SessionAiHost {
     ctx: ProgrammaticHost['ctx'];
     env: ProgrammaticHost['env'] & Record<string, unknown>;
 }
-interface OAuthStatePayload {
+export interface OAuthStatePayload {
     v: 1;
     nonce: string;
     sessionId: string;
     tenantSegment: string;
+    /** Expiry (ms since the epoch), signed with the rest. */
+    exp: number;
 }
 export declare function handleAgentRequest(self: Host, request: Request, url: URL): Promise<Response>;
-export declare function parseAgentOAuthStateParam(state: string | null): OAuthStatePayload | null;
+/**
+ * The OAuth `state` a callback carries, if this deployment signed it. The
+ * router routes a callback by the session and tenant segment in `state`, so an
+ * unsigned one would let any client wake or create a Durable Object under any
+ * tenant segment; the signature (HMAC-SHA256 under the agent cookie secret)
+ * makes the router refuse it before routing. An expired one (its signed `exp`
+ * at or before `now`) is refused the same way. Null for anything else.
+ */
+export declare function parseAgentOAuthStateParam(state: string | null, env: Record<string, unknown>, now?: number): Promise<OAuthStatePayload | null>;
+/** The `state` an OAuth flow carries: `<payload>.<signature>`, both base64url. */
+export declare function signAgentOAuthState(payload: OAuthStatePayload, env: Record<string, unknown>): Promise<string>;
 export {};
 //# sourceMappingURL=agent.d.ts.map

package/dist/session/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/session/agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAgCH,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAYL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAkB3B,UAAU,IAAK,SAAQ,gBAAgB,EAAE,aAAa;IACpD,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7B,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxD;AAED,UAAU,iBAAiB;IACzB,CAAC,EAAE,CAAC,CAAC;IACL,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AA2BD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CA2ClG;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAQxF"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/session/agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkCH,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAYL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAkB3B,UAAU,IAAK,SAAQ,gBAAgB,EAAE,aAAa;IACpD,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7B,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAChC,CAAC,EAAE,CAAC,CAAC;IACL,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,GAAG,EAAE,MAAM,CAAC;CACb;AA0BD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CA2ClG;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,GAAG,SAAa,GACf,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAWnC;AAs/BD,kFAAkF;AAClF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAKnH"}

package/dist/session/agent.js

@@ -9,7 +9,7 @@
  */
 import { generateText, isLoopFinished, jsonSchema, streamText, tool as aiTool, } from 'ai';
 import { BASE_PATH_HEADER, TENANT_HEADER } from '../_shared/session-router.js';
-import { decodeJsonBase64Url, encodeJsonBase64Url, pkceChallenge, randomBase64Url, sealJson, unsealJson, } from '@nimbus-sh/core/_shared/crypto.js';
+import { base64Url, base64UrlDecode, decodeJsonBase64Url, encodeJsonBase64Url, pkceChallenge, randomBase64Url, sealJson, unsealJson, } from '@nimbus-sh/core/_shared/crypto.js';
 import { clearNimbusAgentOAuthCookie, fetchNimbusCloudflareAccounts, isNimbusCloudflareAccountId, isNimbusTenantSegment, NIMBUS_CF_OAUTH_AUTH_URL, readNimbusCookie, readNimbusAgentCookieSecret, readNimbusAgentOAuthConfig, requestNimbusCloudflareOAuthToken, serializeNimbusCookie, } from './agent-oauth.js';
 import { clearSessionAiCredential, createSessionAiModel, describeSessionAiConnection, readSessionAiConfig, resolveSessionAiCredential, sessionAiAccountIsAvailable, setSessionAiAccount, storeSessionAiCredential, } from './ai.js';
 import { ensureProgrammaticReady, rpcExec, rpcEnsureRuntimes, rpcInstallRuntime, rpcExposeApp, rpcKillProcess, rpcListApps, rpcListPorts, rpcListProcesses, rpcProcessLogs, rpcStartProcess, } from './programmatic.js';
@@ -68,12 +68,29 @@ export async function handleAgentRequest(self, request, url) {
     }
     return json({ error: 'unknown agent endpoint' }, 404);
 }
-export function parseAgentOAuthStateParam(state) {
+/**
+ * The OAuth `state` a callback carries, if this deployment signed it. The
+ * router routes a callback by the session and tenant segment in `state`, so an
+ * unsigned one would let any client wake or create a Durable Object under any
+ * tenant segment; the signature (HMAC-SHA256 under the agent cookie secret)
+ * makes the router refuse it before routing. An expired one (its signed `exp`
+ * at or before `now`) is refused the same way. Null for anything else.
+ */
+export async function parseAgentOAuthStateParam(state, env, now = Date.now()) {
     if (!state)
         return null;
-    const payload = decodeState(state);
+    let secret;
+    try {
+        secret = readNimbusAgentCookieSecret(env);
+    }
+    catch {
+        return null;
+    }
+    const payload = await decodeState(state, secret);
     if (!payload || payload.v !== 1)
         return null;
+    if (!Number.isSafeInteger(payload.exp) || payload.exp <= now)
+        return null;
     if (!isSessionId(payload.sessionId))
         return null;
     if (!isNimbusTenantSegment(payload.tenantSegment))
@@ -139,16 +156,19 @@ async function oauthStart(self, request, url) {
     const codeVerifier = randomBase64Url(48);
     const codeChallenge = await pkceChallenge(codeVerifier);
     const redirectUri = config.redirectUri;
-    const payload = { v: 1, nonce, sessionId, tenantSegment };
-    const state = encodeState(payload);
     const now = Date.now();
-    const stored = {
-        ...payload,
-        codeVerifier,
-        redirectUri,
-        createdAt: now,
-        expiresAt: now + OAUTH_STATE_TTL_MS,
-    };
+    const payload = { v: 1, nonce, sessionId, tenantSegment, exp: now + OAUTH_STATE_TTL_MS };
+    let state;
+    try {
+        state = await signAgentOAuthState(payload, self.env);
+    }
+    catch (e) {
+        return json({
+            error: e?.message || String(e),
+            code: 'E_AGENT_COOKIE_SECRET',
+        }, 409);
+    }
+    const stored = { ...payload, codeVerifier, redirectUri, createdAt: now };
     const authUrl = new URL(NIMBUS_CF_OAUTH_AUTH_URL);
     authUrl.searchParams.set('client_id', config.oauthClientId);
     authUrl.searchParams.set('response_type', 'code');
@@ -169,18 +189,18 @@ async function oauthStart(self, request, url) {
             code: 'E_AGENT_COOKIE_SECRET',
         }, 409);
     }
-    return json({ ok: true, authUrl: authUrl.toString(), expiresAt: stored.expiresAt }, 200, headers);
+    return json({ ok: true, authUrl: authUrl.toString(), expiresAt: stored.exp }, 200, headers);
 }
 async function oauthCallback(self, request, url) {
     const code = url.searchParams.get('code');
     const error = url.searchParams.get('error');
-    const payload = parseAgentOAuthStateParam(url.searchParams.get('state'));
+    const payload = await parseAgentOAuthStateParam(url.searchParams.get('state'), self.env);
     if (error)
         return oauthResultHtml(false, 'Cloudflare authorization failed.', payload?.sessionId);
     if (!code || !payload)
         return oauthResultHtml(false, 'OAuth callback is missing code or state.', payload?.sessionId);
     const stored = await loadStateCookie(self, request);
-    if (!stored || stored.expiresAt < Date.now()) {
+    if (!stored || !Number.isSafeInteger(stored.exp) || stored.exp <= Date.now()) {
         return oauthResultHtml(false, 'OAuth session expired. Connect again.', payload.sessionId);
     }
     if (stored.sessionId !== payload.sessionId ||
@@ -1071,12 +1091,30 @@ setTimeout(function(){ try { window.close(); } catch {} }, 700);
         headers: responseHeaders,
     });
 }
-function encodeState(payload) {
-    return encodeJsonBase64Url(payload);
+const STATE_SIGNATURE_PURPOSE = 'nimbus-agent-oauth-state:v1';
+function stateSigningKey(secret, usage) {
+    return crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, [usage]);
+}
+function stateSigned(body) {
+    return new TextEncoder().encode(`${STATE_SIGNATURE_PURPOSE}\0${body}`);
 }
-function decodeState(state) {
+/** The `state` an OAuth flow carries: `<payload>.<signature>`, both base64url. */
+export async function signAgentOAuthState(payload, env) {
+    const secret = readNimbusAgentCookieSecret(env);
+    const body = encodeJsonBase64Url(payload);
+    const signature = await crypto.subtle.sign('HMAC', await stateSigningKey(secret, 'sign'), stateSigned(body));
+    return `${body}.${base64Url(new Uint8Array(signature))}`;
+}
+async function decodeState(state, secret) {
+    const dot = state.indexOf('.');
+    if (dot <= 0 || dot !== state.lastIndexOf('.'))
+        return null;
+    const body = state.slice(0, dot);
     try {
-        return decodeJsonBase64Url(state);
+        const signature = base64UrlDecode(state.slice(dot + 1));
+        if (!await crypto.subtle.verify('HMAC', await stateSigningKey(secret, 'verify'), signature, stateSigned(body)))
+            return null;
+        return decodeJsonBase64Url(body);
     }
     catch {
         return null;

package/dist/session/ai.d.ts

@@ -39,7 +39,6 @@
  * session; `captureSessionAiCredential` is the one place it is read.
  */
 import type { LanguageModel } from 'ai';
-import { z } from 'zod/v4';
 import type { PortRegistry } from '@nimbus-sh/core/runtime/port-registry.js';
 import { type NimbusCloudflareAccount } from './agent-oauth.js';
 export interface SessionAiHost {
@@ -82,13 +81,6 @@ export type SessionAiResolution = {
     ok: false;
     reason: SessionAiUnavailable;
 };
-declare const StoredCredentialSchema: z.ZodObject<{
-    accessToken: z.ZodString;
-    refreshToken: z.ZodOptional<z.ZodString>;
-    accountId: z.ZodNullable<z.ZodString>;
-    expiresAt: z.ZodNullable<z.ZodNumber>;
-}, z.core.$strip>;
-type StoredCredential = z.infer<typeof StoredCredentialSchema>;
 /** Base URL of the in-session endpoint. The one true address of this gateway. */
 export declare function sessionAiBaseUrl(): string;
 /**
@@ -183,13 +175,10 @@ export declare function createSessionAiModel(self: SessionAiHost): LanguageModel
 export declare function setSessionAiAccount(self: SessionAiHost, accountId: string): Promise<boolean>;
 /** Forget this session's credential (agent logout). */
 export declare function clearSessionAiCredential(self: SessionAiHost): Promise<void>;
-/** The stored credential, for surfaces that report connection state. */
-export declare function readSessionAiCredential(self: SessionAiHost): Promise<StoredCredential | null>;
 /**
  * Serve one OpenAI-compatible request. This is the whole gateway: the loopback
  * router calls it for the session's tools, and agent.ts calls it directly for
  * the Nimbus agent.
  */
 export declare function handleSessionAiRequest(self: SessionAiHost, request: Request): Promise<Response>;
-export {};
 //# sourceMappingURL=ai.d.ts.map

package/dist/session/ai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai.d.ts","sourceRoot":"","sources":["../../src/session/ai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ai.d.ts","sourceRoot":"","sources":["../../src/session/ai.ts"],"names":[],"mappings":"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"}

package/dist/session/ai.js

@@ -320,10 +320,6 @@ export async function clearSessionAiCredential(self) {
     lastSeenCookie.delete(self);
     await self.ctx.storage.delete(SESSION_AI_CREDENTIAL_KEY);
 }
-/** The stored credential, for surfaces that report connection state. */
-export async function readSessionAiCredential(self) {
-    return readStoredCredential(self);
-}
 // ── The OpenAI-compatible endpoint ────────────────────────────────────────
 /**
  * Serve one OpenAI-compatible request. This is the whole gateway: the loopback

package/dist/session/fs-watch.d.ts

@@ -118,15 +118,4 @@ export declare function handleFsWatchUnsubscribe(host: FsWatchHost, ws: WebSocke
  * wsError. Idempotent + no-op when nothing pending.
  */
 export declare function cleanupFsWatchOnClose(host: FsWatchHost, ws: WebSocket): void;
-/**
- * Diagnostic: total subscriber + pending-event counts across the host.
- * Useful for /api/_diag/* surfaces and leak-detection probes (the
- * cleanup-on-disconnect probe asserts counts return to 0 after WS close).
- */
-export declare function getFsWatchStats(host: FsWatchHost): {
-    wsCount: number;
-    subCount: number;
-    pendingTotal: number;
-    droppedTotal: number;
-};
 //# sourceMappingURL=fs-watch.d.ts.map

package/dist/session/fs-watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs-watch.d.ts","sourceRoot":"","sources":["../../src/session/fs-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,+DAA+D;IAC/D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,2DAA2D;IAC3D,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,UAAU,EAAE,GAAG,CAAC;CACjB;AAiBD,gDAAgD;AAChD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;CAC7C;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA6F5D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAgB/B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CAS5E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAcA"}
+{"version":3,"file":"fs-watch.d.ts","sourceRoot":"","sources":["../../src/session/fs-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,+DAA+D;IAC/D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,2DAA2D;IAC3D,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,UAAU,EAAE,GAAG,CAAC;CACjB;AAiBD,gDAAgD;AAChD,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;CAC7C;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA6F5D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAgB/B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CAS5E"}

package/dist/session/fs-watch.js

@@ -232,24 +232,3 @@ export function cleanupFsWatchOnClose(host, ws) {
     }
     map.delete(ws);
 }
-/**
- * Diagnostic: total subscriber + pending-event counts across the host.
- * Useful for /api/_diag/* surfaces and leak-detection probes (the
- * cleanup-on-disconnect probe asserts counts return to 0 after WS close).
- */
-export function getFsWatchStats(host) {
-    const map = host._fsWatchSubs;
-    if (!map)
-        return { wsCount: 0, subCount: 0, pendingTotal: 0, droppedTotal: 0 };
-    let subCount = 0;
-    let pendingTotal = 0;
-    let droppedTotal = 0;
-    for (const list of map.values()) {
-        subCount += list.length;
-        for (const sub of list) {
-            pendingTotal += sub.pending.length;
-            droppedTotal += sub.dropped;
-        }
-    }
-    return { wsCount: map.size, subCount, pendingTotal, droppedTotal };
-}

package/dist/session/hibernation.d.ts

@@ -18,6 +18,8 @@
  *     w9_proc_logs + w9_proc_exits.
  *   - scheduleHibFlush(host, ctx) — debounced setTimeout + best-effort
  *     setAlarm for post-hibernation drain.
+ *   - ensureResidentKeepalive(host, ctx) — arm the keep-alive alarm that
+ *     holds this object in memory while a resident process runs.
  *   - dispatchAlarm(host) — alarm() handler body: the fabric's generic
  *     reason dispatcher with this session's handlers registered.
  *   - flushOnClose(host) — synchronous flush on ws close.
@@ -25,7 +27,7 @@
  * The timer multiplexer itself (reason map, schedule, the per-instance
  * chain) is fabric machinery — `@nimbus-sh/fabric/timers.js`; this module
  * registers the session's reasons ('w9-flush' | 'log-janitor' |
- * 'resident-launch') on top of it.
+ * 'resident-launch' | 'resident-keepalive') on top of it.
  *
  * **`ctx` taken as a separate arg from `host`** because the parent
  * `CloudflareDurableObject` class declares `ctx` as `protected`, which
@@ -56,6 +58,14 @@ export interface HibHost extends TimerHost {
     _w9FlushTimer: any;
     /** W1: log-janitor alarm believed armed for this instance (cheap guard). */
     _w1JanitorArmed: boolean;
+    /** W1: resident keep-alive alarm believed armed for this instance. */
+    _w1KeepaliveArmed: boolean;
+    /**
+     * W1: when a client last reached this session over HTTP (an exec, a file
+     * read, a port preview, a socket upgrade). Facet RPCs are not clients: a
+     * process's own traffic must not keep its abandoned session alive.
+     */
+    _w1LastClientActivityAt: number;
     /** W1: destroyed-session tombstone — never re-arm alarms while set. */
     _w1SessionDestroyed: boolean;
 }
@@ -103,15 +113,69 @@ export declare function installLogPersistence(host: Pick<HibHost, '_w9PersistWir
  */
 export declare function clearDestroyedTombstone(host: HibHost, ctx: any): void;
 export declare function ensureLogJanitor(host: HibHost, ctx: any): void;
+/** The fields the keep-alive rule reads and keeps; both hosts carry them. */
+export type ResidentKeepaliveHost = Pick<HibHost, 'processes' | '_w1KeepaliveArmed' | '_w1LastClientActivityAt' | '_w1SessionDestroyed'>;
+/** Arm the host's `resident-keepalive` alarm at `at`; resolves false when it could not. */
+export type ResidentKeepaliveSchedule = (at: number) => Promise<boolean>;
+/** Where a host's attached clients are counted: its hibernatable sockets. */
+export type KeepaliveClients = Partial<Pick<DurableObjectState, 'getWebSockets'>>;
+/**
+ * W1: arm the keep-alive alarm cycle for this instance, from the spawn hook
+ * of a LONG-RUNNING process only.
+ *
+ * A resident process lives in a facet, and a facet dies with its parent; the
+ * platform evicts an idle object after roughly ten seconds, and a pending
+ * `ctx.waitUntil` is not the in-flight event that counts (see
+ * RESIDENT_KEEPALIVE_MS). A quiet process sends no RPC, so without this the
+ * host idles out and the launch journal re-drives the process under a new
+ * pid namespace, dropping its attached terminal and its port. The alarm is
+ * the event; its dispatch is the whole payload.
+ *
+ * The one rule for both hosts: the session DO schedules through the fabric
+ * timer mux, a hosted runtime through its embedder's lifecycle. Idempotent
+ * per instance via `_w1KeepaliveArmed`; `residentKeepaliveFired` clears the
+ * flag when the cycle ends, so the next resident spawn re-arms it.
+ */
+export declare function armResidentKeepalive(host: ResidentKeepaliveHost, schedule: ResidentKeepaliveSchedule): void;
+/**
+ * W1: the keep-alive alarm fired. Deliberately no work: the alarm exists so
+ * the object HAS an event, and being dispatched is the entire payload.
+ * Returns when to fire next, or null after clearing the armed flag.
+ *
+ * Re-arms only while a resident process runs AND a client is present — the
+ * rule the janitor learned the hard way (see dispatchAlarm): an
+ * unconditional self-renewal makes every session boot its DO forever, and
+ * the fleet doing that resets live ones. Bounded by the resident alone, an
+ * abandoned dev server did exactly that. The next resident spawn, or the
+ * client's return, re-arms the cycle.
+ */
+export declare function residentKeepaliveFired(host: ResidentKeepaliveHost, ctx: KeepaliveClients, now: number): number | null;
+/**
+ * W1: a client reached the host. Records the moment, and re-arms the
+ * keep-alive if a resident is running and the cycle had lapsed: a host
+ * whose client came back before the platform evicted it still holds its
+ * process, and the next quiet stretch must not idle it out mid-session.
+ */
+export declare function noteResidentClient(host: ResidentKeepaliveHost, schedule: ResidentKeepaliveSchedule): void;
+export declare function ensureResidentKeepalive(host: HibHost, ctx: any): void;
 /** W9: idempotent SQL schema bootstrap. */
 export declare function ensureHibSchema(host: Pick<HibHost, '_w9SchemaInit'>, ctx: any): void;
+/**
+ * Whether a client is here: a hibernatable socket attached (terminal,
+ * process log, file watch) or a request within the detached grace. The
+ * keep-alive re-arms on this and on a running resident, never on the
+ * resident alone.
+ */
+export declare function residentClientPresent(host: ResidentKeepaliveHost, ctx: KeepaliveClients, now: number): boolean;
+/** W1: a client reached the session DO (see noteResidentClient). */
+export declare function noteClientActivity(host: HibHost, ctx: any): void;
 /**
  * W1: this session's canonical alarm-reason strings, registered on the
  * fabric's reason map. Forward-compat: the dispatcher silently drops unknown
  * reasons so a rollback from a future deploy that added new reasons doesn't
  * leave the alarm stuck.
  */
-export type AlarmReason = 'w9-flush' | 'log-janitor' | 'resident-launch';
+export type AlarmReason = 'w9-flush' | 'log-janitor' | 'resident-launch' | 'resident-keepalive';
 /**
  * W9: ensure the alarm is set for the next flush window. Cheap to
  * call repeatedly — we only schedule the in-isolate flush timer if
@@ -126,6 +190,8 @@ export declare function scheduleHibFlush(host: HibHost, ctx: any): void;
  *   - `'resident-launch'` → pumpResidentLaunches()
  *   - `'log-janitor'` → processes.dropLogsOlderThan(orphanCheck); re-arm
  *     for next 60s cycle while the session still has anything to sweep.
+ *   - `'resident-keepalive'` → no work; the fire IS the work. Re-arms
+ *     while a resident process is running, so the object stays in memory.
  *
  * `janitorOrphanCheck` is the orphan-pid predicate provided by the
  * caller (typically `(pid) => !host.processes.get(pid)`). Decoupled

package/dist/session/hibernation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hibernation.d.ts","sourceRoot":"","sources":["../../src/session/hibernation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAGH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAA0B,KAAK,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACpH,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGrE,YAAY,EAAE,yBAAyB,EAAE,CAAC;AAE1C;;;;;;GAMG;AACH,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,SAAS,EAAE,wBAAwB,CAAC;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,OAAO,CAAC;IACzB,uEAAuE;IACvE,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,GAAG,GAAG,yBAAyB,CAY9E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAKnE;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,WAAW,CAAC,EACtE,GAAG,EAAE,kBAAkB,EACvB,UAAU,EAAE,MAAM,IAAI,GACrB,IAAI,CA0GN;AAED;;;;;;;;;;GAUG;AACH;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAMrE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAc9D;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAqBpF;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAEzE;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAqB9D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,GAAG,EACR,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,EAC7C,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC1C,SAAS,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAMhD"}
+{"version":3,"file":"hibernation.d.ts","sourceRoot":"","sources":["../../src/session/hibernation.ts"],"names":[],"mappings":"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"}

package/dist/session/hibernation.js

@@ -18,6 +18,8 @@
  *     w9_proc_logs + w9_proc_exits.
  *   - scheduleHibFlush(host, ctx) — debounced setTimeout + best-effort
  *     setAlarm for post-hibernation drain.
+ *   - ensureResidentKeepalive(host, ctx) — arm the keep-alive alarm that
+ *     holds this object in memory while a resident process runs.
  *   - dispatchAlarm(host) — alarm() handler body: the fabric's generic
  *     reason dispatcher with this session's handlers registered.
  *   - flushOnClose(host) — synchronous flush on ws close.
@@ -25,7 +27,7 @@
  * The timer multiplexer itself (reason map, schedule, the per-instance
  * chain) is fabric machinery — `@nimbus-sh/fabric/timers.js`; this module
  * registers the session's reasons ('w9-flush' | 'log-janitor' |
- * 'resident-launch') on top of it.
+ * 'resident-launch' | 'resident-keepalive') on top of it.
  *
  * **`ctx` taken as a separate arg from `host`** because the parent
  * `CloudflareDurableObject` class declares `ctx` as `protected`, which
@@ -40,6 +42,7 @@
  */
 import { configureWsHibernation } from '@nimbus-sh/fabric/ws-hibernation-config.js';
 import { timers } from '@nimbus-sh/fabric/timers.js';
+import { RESIDENT_KEEPALIVE_DETACHED_MS, RESIDENT_KEEPALIVE_MS } from '@nimbus-sh/platform/limits.js';
 import { SESSION_DESTROYED_KEY, W9_FLUSH_DEBOUNCE_MS } from './keys.js';
 /**
  * Run at DO ctor time. Returns the result for the class to assign to
@@ -228,6 +231,74 @@ export function ensureLogJanitor(host, ctx) {
             host._w1JanitorArmed = false;
     });
 }
+/**
+ * W1: arm the keep-alive alarm cycle for this instance, from the spawn hook
+ * of a LONG-RUNNING process only.
+ *
+ * A resident process lives in a facet, and a facet dies with its parent; the
+ * platform evicts an idle object after roughly ten seconds, and a pending
+ * `ctx.waitUntil` is not the in-flight event that counts (see
+ * RESIDENT_KEEPALIVE_MS). A quiet process sends no RPC, so without this the
+ * host idles out and the launch journal re-drives the process under a new
+ * pid namespace, dropping its attached terminal and its port. The alarm is
+ * the event; its dispatch is the whole payload.
+ *
+ * The one rule for both hosts: the session DO schedules through the fabric
+ * timer mux, a hosted runtime through its embedder's lifecycle. Idempotent
+ * per instance via `_w1KeepaliveArmed`; `residentKeepaliveFired` clears the
+ * flag when the cycle ends, so the next resident spawn re-arms it.
+ */
+export function armResidentKeepalive(host, schedule) {
+    if (host._w1KeepaliveArmed)
+        return;
+    if (host.processes.residentRunning === 0)
+        return;
+    // Same zombie-alarm rule as the janitor: a destroyed session stays inert,
+    // so a straggler facet RPC that wakes the dead DO and spawns cannot leave
+    // an eternal keep-alive loop on a session that no longer exists.
+    if (host._w1SessionDestroyed)
+        return;
+    // Optimistic flag (dedupes same-turn spawns), CONFIRMED by the schedule
+    // outcome: a failure with the flag left set would mean no alarm AND
+    // nothing ever re-arming until the instance recycles.
+    host._w1KeepaliveArmed = true;
+    void schedule(Date.now() + RESIDENT_KEEPALIVE_MS).then((ok) => {
+        if (!ok)
+            host._w1KeepaliveArmed = false;
+    });
+}
+/**
+ * W1: the keep-alive alarm fired. Deliberately no work: the alarm exists so
+ * the object HAS an event, and being dispatched is the entire payload.
+ * Returns when to fire next, or null after clearing the armed flag.
+ *
+ * Re-arms only while a resident process runs AND a client is present — the
+ * rule the janitor learned the hard way (see dispatchAlarm): an
+ * unconditional self-renewal makes every session boot its DO forever, and
+ * the fleet doing that resets live ones. Bounded by the resident alone, an
+ * abandoned dev server did exactly that. The next resident spawn, or the
+ * client's return, re-arms the cycle.
+ */
+export function residentKeepaliveFired(host, ctx, now) {
+    if (host.processes.residentRunning > 0 && residentClientPresent(host, ctx, now)) {
+        return now + RESIDENT_KEEPALIVE_MS;
+    }
+    host._w1KeepaliveArmed = false;
+    return null;
+}
+/**
+ * W1: a client reached the host. Records the moment, and re-arms the
+ * keep-alive if a resident is running and the cycle had lapsed: a host
+ * whose client came back before the platform evicted it still holds its
+ * process, and the next quiet stretch must not idle it out mid-session.
+ */
+export function noteResidentClient(host, schedule) {
+    host._w1LastClientActivityAt = Date.now();
+    armResidentKeepalive(host, schedule);
+}
+export function ensureResidentKeepalive(host, ctx) {
+    armResidentKeepalive(host, (at) => timers(host, ctx).schedule('resident-keepalive', at));
+}
 /** W9: idempotent SQL schema bootstrap. */
 export function ensureHibSchema(host, ctx) {
     if (host._w9SchemaInit)
@@ -249,6 +320,22 @@ export function ensureHibSchema(host, ctx) {
         host._w9SchemaInit = false; // retry next time
     }
 }
+/**
+ * Whether a client is here: a hibernatable socket attached (terminal,
+ * process log, file watch) or a request within the detached grace. The
+ * keep-alive re-arms on this and on a running resident, never on the
+ * resident alone.
+ */
+export function residentClientPresent(host, ctx, now) {
+    const sockets = typeof ctx?.getWebSockets === 'function' ? ctx.getWebSockets() : [];
+    if (sockets.length > 0)
+        return true;
+    return now - host._w1LastClientActivityAt < RESIDENT_KEEPALIVE_DETACHED_MS;
+}
+/** W1: a client reached the session DO (see noteResidentClient). */
+export function noteClientActivity(host, ctx) {
+    noteResidentClient(host, (at) => timers(host, ctx).schedule('resident-keepalive', at));
+}
 /**
  * W9: ensure the alarm is set for the next flush window. Cheap to
  * call repeatedly — we only schedule the in-isolate flush timer if
@@ -286,6 +373,8 @@ export function scheduleHibFlush(host, ctx) {
  *   - `'resident-launch'` → pumpResidentLaunches()
  *   - `'log-janitor'` → processes.dropLogsOlderThan(orphanCheck); re-arm
  *     for next 60s cycle while the session still has anything to sweep.
+ *   - `'resident-keepalive'` → no work; the fire IS the work. Re-arms
+ *     while a resident process is running, so the object stays in memory.
  *
  * `janitorOrphanCheck` is the orphan-pid predicate provided by the
  * caller (typically `(pid) => !host.processes.get(pid)`). Decoupled
@@ -321,6 +410,11 @@ export function dispatchAlarm(host, ctx, janitorOrphanCheck, pumpResidentLaunche
             }
             host._w1JanitorArmed = false;
         },
+        'resident-keepalive': (now) => {
+            const rearmAt = residentKeepaliveFired(host, ctx, now);
+            if (rearmAt !== null)
+                return { rearmAt };
+        },
     }, () => {
         // Legacy path: pre-W1 deploys had no map. dispatchAlarm was called
         // with no map and unconditionally ran the log flush. Preserve

package/dist/session/init-phases.d.ts

@@ -15,8 +15,7 @@
  *                (cwd, env, mounts, scrollback). Pure SQL reads;
  *                sets up locals consumed by later phases.
  *   - build:     Phase B — constructing Kernel + Shell + registry +
- *                installing 60+ commands + wiring SqliteVFSProvider
- *                mounts. Most CPU-intensive phase.
+ *                installing 60+ commands. Most CPU-intensive phase.
  *   - wire:      Phase W — attaching the WebSocketTerminal to the
  *                Shell, replaying persisted scrollback into the WS.
  *                This is the phase B'.5 will be able to re-run on

package/dist/session/init-phases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-phases.d.ts","sourceRoot":"","sources":["../../src/session/init-phases.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAElG,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE7E;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE;IAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CAAE,EACtD,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GACd,IAAI,CAcN;AAED,KAAK,iBAAiB,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,EAAE,OAAO,EAAE,SAAS,SAAS,EAAE,EAAE,GAAG,GAAE,MAAmB,GAAG,iBAAiB,CAG7E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE;IACJ,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE;QAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACpG,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,EACD,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EAC5B,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GACnC,IAAI,CAiCN"}
+{"version":3,"file":"init-phases.d.ts","sourceRoot":"","sources":["../../src/session/init-phases.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAElG,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE7E;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE;IAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CAAE,EACtD,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GACd,IAAI,CAcN;AAED,KAAK,iBAAiB,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,EAAE,OAAO,EAAE,SAAS,SAAS,EAAE,EAAE,GAAG,GAAE,MAAmB,GAAG,iBAAiB,CAG7E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE;IACJ,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE;QAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACpG,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,EACD,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EAC5B,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GACnC,IAAI,CAiCN"}

package/dist/session/init-phases.js

@@ -15,8 +15,7 @@
  *                (cwd, env, mounts, scrollback). Pure SQL reads;
  *                sets up locals consumed by later phases.
  *   - build:     Phase B — constructing Kernel + Shell + registry +
- *                installing 60+ commands + wiring SqliteVFSProvider
- *                mounts. Most CPU-intensive phase.
+ *                installing 60+ commands. Most CPU-intensive phase.
  *   - wire:      Phase W — attaching the WebSocketTerminal to the
  *                Shell, replaying persisted scrollback into the WS.
  *                This is the phase B'.5 will be able to re-run on

package/dist/session/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/session/init.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD;;;;;;;;GAQG;AACH,KAAK,QAAQ,GAAG,eAAe,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AAQ3E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;CAC/B;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,QAAQ,EACd,EAAE,EAAE,SAAS,GAAG,IAAI,EACpB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAkcf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/session/init.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD;;;;;;;;GAQG;AACH,KAAK,QAAQ,GAAG,eAAe,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AAQ3E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;CAC/B;AAED,wBAAsB,WAAW,CAC/B,IAAI,EAAE,QAAQ,EACd,EAAE,EAAE,SAAS,GAAG,IAAI,EACpB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAqbf"}