@workerdeck/server 2.8.0 → 2.9.0

package/build/index.d.mts

@@ -29,21 +29,22 @@ declare class SessionNotifier {
   #private;
   constructor(options: SessionNotificationOptions);
   get idle(): boolean;
-  watch(runner: Runner, afterSeq?: number): void;
+  watch(runner: Runner, afterSeq?: number): () => void;
 }
 //#endregion
 //#region src/services/registry.d.ts
 type SessionRegistryOptions = {
-  onRegister?: (runner: Runner) => void;
+  onRegister?: (runner: Runner) => unknown;
 };
 declare class SessionRegistry {
   #private;
   constructor(options?: SessionRegistryOptions);
-  observe(listener: (runner: Runner) => void): () => void;
+  observe(listener: (runner: Runner) => unknown): () => void;
   create(config: SessionRunnerConfig): Runner;
   prepare(config: SessionRunnerConfig): Runner;
   adopt(runner: Runner): Runner;
   register(runner: Runner): Runner;
+  retain(id: string, detach: () => void): void;
   get(id: string): Runner | undefined;
   list(): SessionInfo[];
   remove(id: string): boolean;
@@ -72,6 +73,7 @@ type DormantSessionRecord = {
   savedAt: number;
 };
 type StoredSessionRecord = ParkedSessionRecord | DormantSessionRecord;
+declare function isDormant(record: StoredSessionRecord): record is DormantSessionRecord;
 interface SessionStore {
   save(record: StoredSessionRecord): Promise<void>;
   get(id: string): Promise<StoredSessionRecord | null>;
@@ -119,6 +121,9 @@ declare class SessionParkManager {
   touch(runner: Runner): void;
   hydrate(): Promise<void>;
   watch(runner: Runner, afterSeq?: number): () => void;
+  release(sessionId: string): SessionRunnerConfig | undefined;
+  adopt(runner: Runner, config?: SessionRunnerConfig): void;
+  flush(sessionId?: string): Promise<void>;
   onDetach(sessionId: string): void;
   sessionFor(executionId: string): string | undefined;
   get(id: string): Promise<StoredSessionRecord | null>;
@@ -223,6 +228,10 @@ type QueueServerOptions = {
   webhookRetryDelayMs?: number;
   onEvent?: (event: JobEvent) => void;
 };
+type CarriedSession = {
+  runner: Runner;
+  config?: SessionRunnerConfig;
+};
 type DrainReport = {
   working: string[];
   awaitingHuman: string[];
@@ -243,6 +252,8 @@ type WorkerServer = {
     port: number;
   }>;
   drain: (options?: DrainOptions) => Promise<DrainReport>;
+  releaseSession: (id: string) => CarriedSession | undefined;
+  adoptSession: (carried: CarriedSession) => boolean;
   close: () => Promise<void>;
 };
 //#endregion
@@ -281,6 +292,10 @@ type ProviderRunnerOptions = {
 };
 declare function createProviderRunner(ctx: EngineRunnerContext, options: ProviderRunnerOptions): Promise<Runner>;
 //#endregion
+//#region src/lib/reload-plan.d.ts
+type ReloadPlan = 'carry' | 'persist' | 'drop';
+declare function reloadPlan(runner: Runner): ReloadPlan;
+//#endregion
 //#region src/services/attachments.d.ts
 type AttachmentStoreOptions = {
   maxFileBytes?: number;
@@ -332,7 +347,7 @@ type ProducedFile = {
 };
 declare class ProducedFileStore {
   #private;
-  watch(runner: Runner): void;
+  watch(runner: Runner): () => void;
   get(sessionId: string, fileId: string): ProducedFile | undefined;
   list(sessionId: string): ProducedFile[];
   drop(sessionId: string): void;
@@ -341,9 +356,9 @@ declare class ProducedFileStore {
 //#region src/services/profile-usage.d.ts
 declare class ProfileUsageTracker {
   #private;
-  watch(runner: Runner): void;
+  watch(runner: Runner): () => void;
   usage(profile: string, now?: number): ProfileUsage | undefined;
 }
 //#endregion
-export { AttachmentStore, type AttachmentStoreOptions, type Authenticator, BridgeHub, type BridgeHubOptions, type EngineRunnerContext, type FileSessionStoreOptions, MemorySessionStore, type ParkedSessionRecord, type ProducedFile, ProducedFileStore, type ProfileStore, ProfileUsageTracker, type ProviderRunnerOptions, type QueueServerOptions, type SdkSessionLister, type SessionNotificationOptions, SessionNotifier, SessionParkManager, type SessionParkOptions, SessionRegistry, type SessionRegistryOptions, type SessionStore, type WorkerServer, type WorkerServerOptions, createFileProfileStore, createFileSessionStore, createMemoryProfileStore, createProviderRunner, createWorkerServer, sandboxedProviderProfile, toDurableRecord };
+export { AttachmentStore, type AttachmentStoreOptions, type Authenticator, BridgeHub, type BridgeHubOptions, type CarriedSession, type EngineRunnerContext, type FileSessionStoreOptions, MemorySessionStore, type ParkedSessionRecord, type ProducedFile, ProducedFileStore, type ProfileStore, ProfileUsageTracker, type ProviderRunnerOptions, type QueueServerOptions, type ReloadPlan, type SdkSessionLister, type SessionNotificationOptions, SessionNotifier, SessionParkManager, type SessionParkOptions, SessionRegistry, type SessionRegistryOptions, type SessionStore, type StoredSessionRecord, type WorkerServer, type WorkerServerOptions, createFileProfileStore, createFileSessionStore, createMemoryProfileStore, createProviderRunner, createWorkerServer, isDormant, reloadPlan, sandboxedProviderProfile, toDurableRecord };
 //# sourceMappingURL=index.d.mts.map

package/build/index.mjs

@@ -2,7 +2,7 @@ import { createServer } from "node:http";
 import { WebSocketServer } from "ws";
 import { BrowserBridgeExecutor, SessionRunner, attachmentKind, checkClaudeAuth, createEngineSession, getEngineAdapter, normalizeMediaType } from "@workerdeck/core";
 import { JobQueue } from "@workerdeck/queue";
-import { ENGINE_CAPABILITIES, PROTOCOL_VERSION, SHELL_COMMAND_MAX, imagePartRef, sessionState, supportsPermissionMode } from "@workerdeck/protocol";
+import { ENGINE_CAPABILITIES, PROTOCOL_VERSION, SHELL_COMMAND_MAX, imagePartRef, isJobRun, sessionState, supportsPermissionMode } from "@workerdeck/protocol";
 import { createHash, randomUUID } from "node:crypto";
 import { closeSync, constants, createReadStream, existsSync, fstatSync, ftruncateSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { constants as constants$1, homedir } from "node:os";
@@ -211,6 +211,15 @@ function parseSessionRoute(basePath, url) {
 	return null;
 }
 //#endregion
+//#region src/lib/reload-plan.ts
+function reloadPlan(runner) {
+	const info = runner.info();
+	if (info.status === "closed" || info.status === "failed") return "drop";
+	if (isJobRun(info)) return "drop";
+	if (runner.snapshot !== void 0) return "persist";
+	return "carry";
+}
+//#endregion
 //#region src/routes/executions.ts
 async function handleExecutionResult(ctx, req, res, pathname, auth) {
 	const { auth: authSvc, basePath, parking, registry } = ctx;
@@ -1808,6 +1817,7 @@ function attachClient(ctx, ws, runner, req, access) {
 		imageRefs
 	});
 	const detachBridge = bridge.attach(runner.id, send);
+	runner.refreshUsage?.().catch(() => {});
 	ws.on("message", (data) => {
 		let frame;
 		try {
@@ -2209,8 +2219,8 @@ var SessionNotifier = class {
 		return !this.#options.webhook && !this.#options.onNotification;
 	}
 	watch(runner, afterSeq = runner.info().lastSeq) {
-		if (this.idle) return;
-		runner.subscribe((event) => {
+		if (this.idle) return () => {};
+		return runner.subscribe((event) => {
 			switch (event.type) {
 				case "permission_requested":
 					this.#emit(runner, event.seq, event.ts, {
@@ -2301,6 +2311,7 @@ var SessionParkManager = class {
 	#configs = /* @__PURE__ */ new Map();
 	#remembered = /* @__PURE__ */ new Set();
 	#storeOps = /* @__PURE__ */ new Map();
+	#watches = /* @__PURE__ */ new Map();
 	#closed = false;
 	constructor(options) {
 		this.#options = options;
@@ -2320,7 +2331,8 @@ var SessionParkManager = class {
 		}
 	}
 	watch(runner, afterSeq = 0) {
-		return runner.subscribe((event) => {
+		this.#watches.get(runner.id)?.();
+		const unsubscribe = runner.subscribe((event) => {
 			switch (event.type) {
 				case "execution_dispatched":
 					if (!event.deferred) return;
@@ -2360,6 +2372,35 @@ var SessionParkManager = class {
 				default: return;
 			}
 		}, afterSeq);
+		const detach = () => {
+			if (this.#watches.get(runner.id) === detach) this.#watches.delete(runner.id);
+			unsubscribe();
+		};
+		this.#watches.set(runner.id, detach);
+		return detach;
+	}
+	release(sessionId) {
+		this.#watches.get(sessionId)?.();
+		this.#watches.delete(sessionId);
+		clearTimeout(this.#detachTimers.get(sessionId));
+		this.#detachTimers.delete(sessionId);
+		const config = this.#configs.get(sessionId);
+		this.#configs.delete(sessionId);
+		this.#remembered.delete(sessionId);
+		return config;
+	}
+	adopt(runner, config) {
+		this.#options.registry.register(runner);
+		if (config) this.remember(runner.id, config);
+		this.watch(runner, runner.info().lastSeq);
+		this.touch(runner);
+	}
+	async flush(sessionId) {
+		if (sessionId === void 0) {
+			await Promise.all(this.#storeOps.values());
+			return;
+		}
+		await this.#storeOps.get(sessionId);
 	}
 	onDetach(sessionId) {
 		if (this.#closed) return;
@@ -2411,6 +2452,7 @@ var SessionParkManager = class {
 		};
 	}
 	async discard(sessionId) {
+		this.#watches.delete(sessionId);
 		clearTimeout(this.#detachTimers.get(sessionId));
 		this.#detachTimers.delete(sessionId);
 		this.#configs.delete(sessionId);
@@ -2639,7 +2681,7 @@ var SessionParkManager = class {
 var ProducedFileStore = class {
 	#bySession = /* @__PURE__ */ new Map();
 	watch(runner) {
-		runner.subscribe((event) => {
+		return runner.subscribe((event) => {
 			if (event.type !== "file_produced") return;
 			const held = this.#bySession.get(runner.id) ?? /* @__PURE__ */ new Map();
 			held.set(event.fileId, {
@@ -2790,8 +2832,8 @@ var ProfileUsageTracker = class {
 	#profiles = /* @__PURE__ */ new Map();
 	watch(runner) {
 		const profile = runner.info().profile;
-		if (!profile) return;
-		runner.subscribe((event) => {
+		if (!profile) return () => {};
+		return runner.subscribe((event) => {
 			if (event.type !== "rate_limit") return;
 			const type = event.info.rateLimitType;
 			if (!type) return;
@@ -2835,12 +2877,13 @@ var SessionRegistry = class {
 	#sessions = /* @__PURE__ */ new Map();
 	#options;
 	#observers = /* @__PURE__ */ new Set();
+	#detachers = /* @__PURE__ */ new Map();
 	constructor(options = {}) {
 		this.#options = options;
 	}
 	observe(listener) {
 		this.#observers.add(listener);
-		for (const runner of this.#sessions.values()) listener(runner);
+		for (const runner of this.#sessions.values()) this.#retain(runner.id, listener(runner));
 		return () => void this.#observers.delete(listener);
 	}
 	create(config) {
@@ -2858,11 +2901,14 @@ var SessionRegistry = class {
 		const existing = this.#sessions.get(runner.id);
 		this.#sessions.set(runner.id, runner);
 		if (existing !== runner) {
-			this.#options.onRegister?.(runner);
-			for (const listener of this.#observers) listener(runner);
+			this.#retain(runner.id, this.#options.onRegister?.(runner));
+			for (const listener of this.#observers) this.#retain(runner.id, listener(runner));
 		}
 		return runner;
 	}
+	retain(id, detach) {
+		this.#retain(id, detach);
+	}
 	get(id) {
 		return this.#sessions.get(id);
 	}
@@ -2873,14 +2919,30 @@ var SessionRegistry = class {
 		const runner = this.#sessions.get(id);
 		if (!runner) return false;
 		runner.close("server");
+		this.#detach(id);
 		return this.#sessions.delete(id);
 	}
 	evict(id) {
+		this.#detach(id);
 		return this.#sessions.delete(id);
 	}
 	closeAll() {
 		for (const runner of this.#sessions.values()) runner.close("server");
 	}
+	#retain(id, detach) {
+		if (typeof detach !== "function") return;
+		const run = detach;
+		const existing = this.#detachers.get(id);
+		if (existing) {
+			existing.push(run);
+			return;
+		}
+		this.#detachers.set(id, [run]);
+	}
+	#detach(id) {
+		for (const detach of this.#detachers.get(id) ?? []) detach();
+		this.#detachers.delete(id);
+	}
 };
 //#endregion
 //#region src/services/session-factory.ts
@@ -3052,7 +3114,7 @@ function createSessionFactory(deps) {
 	};
 	const watchAuthSource = (runner) => {
 		let seen = false;
-		runner.subscribe((event) => {
+		return runner.subscribe((event) => {
 			if (seen || event.type !== "system_init") return;
 			seen = true;
 			if (event.apiKeySource !== "oauth") return;
@@ -3084,6 +3146,8 @@ function createSessionFactory(deps) {
 //#endregion
 //#region src/server.ts
 const SOCKET_CLOSE_GRACE_MS = 250;
+const CLOSE_DEADLINE_MS = 1e3;
+const USAGE_STALE_MS = 3e5;
 function surveyDrain(registry) {
 	const working = [];
 	const awaitingHuman = [];
@@ -3110,6 +3174,19 @@ function createWorkerServer(options = {}) {
 	const adapterFor = (engine) => options.engines?.[engine ?? "claude"] ?? getEngineAdapter(engine);
 	const profileDefaultModels = /* @__PURE__ */ new Map();
 	const profileUsage = new ProfileUsageTracker();
+	const refreshStaleUsage = (name) => {
+		const held = profileUsage.usage(name);
+		const newest = Math.max(0, ...Object.values(held ?? {}).map((window) => window.updatedAt ?? 0));
+		if (Date.now() - newest < USAGE_STALE_MS) return;
+		for (const info of refs.registry?.list() ?? []) {
+			if (info.profile !== name) continue;
+			const runner = refs.registry?.get(info.id);
+			if (runner?.refreshUsage) {
+				runner.refreshUsage().catch(() => {});
+				return;
+			}
+		}
+	};
 	const detected = options.profiles ? [] : detectDefaultProfiles();
 	const profiles = new ProfileService({
 		declared: options.profiles ?? (options.profileStore ? [] : detected),
@@ -3122,7 +3199,10 @@ function createWorkerServer(options = {}) {
 		decorate: {
 			defaultModel: (name) => profileDefaultModels.get(name),
 			availability: (name) => availability.get(name),
-			usage: (name) => profileUsage.usage(name)
+			usage: (name) => {
+				refreshStaleUsage(name);
+				return profileUsage.usage(name);
+			}
 		}
 	});
 	for (const p of options.profiles ?? []) {
@@ -3155,16 +3235,20 @@ function createWorkerServer(options = {}) {
 	const producedFiles = new ProducedFileStore();
 	const shell = options.shell?.enabled === true ? createShellService(options.shell) : null;
 	const registry = new SessionRegistry({ onRegister: (runner) => {
-		notifier.watch(runner);
-		producedFiles.watch(runner);
-		profileUsage.watch(runner);
-		shell?.watch(runner);
+		const detachers = [
+			notifier.watch(runner),
+			producedFiles.watch(runner),
+			profileUsage.watch(runner),
+			shell?.watch(runner)
+		];
 		const profile = runner.info().profile;
-		if (!profile) return;
-		runner.subscribe((event) => {
+		if (profile) detachers.push(runner.subscribe((event) => {
 			if (event.type !== "capabilities" || !event.defaultModel) return;
 			profileDefaultModels.set(profile, event.defaultModel);
-		});
+		}));
+		return () => {
+			for (const detach of detachers) detach?.();
+		};
 	} });
 	const attachmentStore = new AttachmentStore(options.attachments);
 	const bridge = new BridgeHub({
@@ -3445,6 +3529,24 @@ function createWorkerServer(options = {}) {
 				});
 			});
 		},
+		releaseSession: (id) => {
+			const runner = registry.get(id);
+			if (!runner) return;
+			const plan = reloadPlan(runner);
+			if (plan !== "carry") throw new Error(`session ${id} cannot be carried by identity (${plan})`);
+			const config = parking.release(id);
+			registry.evict(id);
+			return {
+				runner,
+				config
+			};
+		},
+		adoptSession: ({ runner, config }) => {
+			if (reloadPlan(runner) !== "carry") return false;
+			parking.adopt(runner, config);
+			registry.retain(runner.id, factory.watchAuthSource(runner));
+			return true;
+		},
 		drain: async (drainOptions = {}) => {
 			const { timeoutMs = 3e4, pollMs = 250, onProgress } = drainOptions;
 			draining = true;
@@ -3477,12 +3579,15 @@ function createWorkerServer(options = {}) {
 					for (const ws of wss.clients) ws.terminate();
 				}, SOCKET_CLOSE_GRACE_MS);
 				force.unref();
-				wss.close();
-				server.close(() => {
+				const deadline = setTimeout(() => resolve(), CLOSE_DEADLINE_MS);
+				deadline.unref();
+				const drained = Promise.all([new Promise((done) => wss.close(() => done())), new Promise((done) => server.close(() => done()))]);
+				server.closeAllConnections();
+				drained.then(() => {
 					clearTimeout(force);
+					clearTimeout(deadline);
 					resolve();
 				});
-				server.closeAllConnections();
 			});
 			return closing;
 		}
@@ -3579,6 +3684,6 @@ function createFileProfileStore(path = join(process.cwd(), ".workerdeck", "profi
 	};
 }
 //#endregion
-export { AttachmentStore, BridgeHub, MemorySessionStore, ProducedFileStore, ProfileUsageTracker, SessionNotifier, SessionParkManager, SessionRegistry, createFileProfileStore, createFileSessionStore, createMemoryProfileStore, createProviderRunner, createWorkerServer, sandboxedProviderProfile, toDurableRecord };
+export { AttachmentStore, BridgeHub, MemorySessionStore, ProducedFileStore, ProfileUsageTracker, SessionNotifier, SessionParkManager, SessionRegistry, createFileProfileStore, createFileSessionStore, createMemoryProfileStore, createProviderRunner, createWorkerServer, isDormant, reloadPlan, sandboxedProviderProfile, toDurableRecord };
 
 //# sourceMappingURL=index.mjs.map