@gajae-code/coding-agent 0.12.6 → 0.12.8

package/src/sdk/host/host.ts

@@ -4,21 +4,11 @@ import type { BrokerIndexWriter, HostEndpointAdapters, SdkFrame } from "./types"
 
 export type SdkRequestObserver = (kind: "control" | "query", connectionId: string, frame: SdkFrame) => void;
 
-export interface ProviderLeaseIdentity {
-	leaseId: string;
-	connectionId: string;
-	connectionGeneration: number;
-	fence: string;
-}
-
-export type ProviderLeaseFence = (identity: ProviderLeaseIdentity, reason?: string) => boolean;
-
 export interface SessionSdkHostOptions extends HostEndpointAdapters {
 	control?: (connectionId: string, frame: SdkFrame) => unknown | Promise<unknown>;
 	query?: (connectionId: string, frame: SdkFrame) => unknown | Promise<unknown>;
 	/** Best-effort diagnostic observation of accepted control/query frames. */
 	onRequest?: SdkRequestObserver;
-	onFrameOverflow?: (connectionId: string) => void;
 	/** Runs before a control response is sent; identity transitions use sendTerminal. */
 	beforeControlResponse?: (
 		connectionId: string,
@@ -28,25 +18,13 @@ export interface SessionSdkHostOptions extends HostEndpointAdapters {
 	) => void | Promise<void>;
 	/** Runs only after a successful control response has been sent to the client. */
 	afterControlResponse?: (connectionId: string, request: SdkFrame, response: SdkFrame) => void | Promise<void>;
-	onProviderLeaseRegistered?: (lease: ProviderLease, connectionGeneration: number) => void;
-	installProviderDefinitions?: (
-		capability: string,
-		definitions: unknown,
-		leaseId: string,
-		connectionId: string,
-		connectionGeneration: number,
-	) => void;
+	installProviderDefinitions?: (capability: string, definitions: unknown) => void;
 	onProviderDefinitionsRemoved?: (capability: string) => void;
 	onReverseCancel?: (requestId: string, reason: "provider_disconnected" | "lease_released") => void;
 	/** Best-effort capabilities mirrored from the native transport for out-of-band consumers. */
 	connectionCapabilities?: (connectionId: string) => ReadonlySet<string> | undefined;
 }
 
-/** Bound asynchronous frame admission per transport connection. */
-const MAX_PENDING_FRAMES_PER_CONNECTION = 32;
-const MAX_QUARANTINED_PROVIDER_LEASES = 256;
-const MAX_RETAINED_CLOSED_CONNECTIONS = 256;
-
 const TOOL_ACTIVITY_CAPABILITY = "tool_activity_v2";
 const CAP_GATED_FRAME_KINDS = new Set(["tool_activity", "reasoning_summary"]);
 const EMPTY_CAPABILITIES: ReadonlySet<string> = new Set();
@@ -142,12 +120,6 @@ export class SessionSdkHost {
 	#stopPromise?: Promise<"stopped">;
 	#unsubscribe?: () => void;
 	#registration?: { writer: BrokerIndexWriter; generation: number };
-	#connectionGenerations = new Map<string, number>();
-	#openConnections = new Set<string>();
-	#pendingFrames = new Map<string, { generation: number; count: number }>();
-	#leaseRecords = new Map<string, { capability: string; connectionId: string; connectionGeneration: number }>();
-	#quarantinedLeases = new Map<string, ProviderLeaseIdentity>();
-	#closedConnectionOrder: string[] = [];
 
 	constructor(options: SessionSdkHostOptions) {
 		this.#options = options;
@@ -169,120 +141,9 @@ export class SessionSdkHost {
 	getProviderDefinitions(capability: string): unknown | undefined {
 		return this.reverse.getInstalledDefinitions(capability);
 	}
-	/** Mark a transport connection live and return its stable generation. */
-	handleConnect(connectionId: string): number {
-		if (!this.#openConnections.has(connectionId)) {
-			const generation = this.#connectionGenerations.get(connectionId) ?? 1;
-			this.#connectionGenerations.set(connectionId, generation);
-			this.#openConnections.add(connectionId);
-			this.#pendingFrames.set(connectionId, { generation, count: 0 });
-		}
-		return this.#connectionGenerations.get(connectionId) ?? 0;
-	}
-
-	/** Current generation for a transport connection, if it has been observed. */
-	connectionGeneration(connectionId: string): number {
-		return this.#connectionGenerations.get(connectionId) ?? 0;
-	}
-
-	isConnectionOpen(connectionId: string, generation?: number): boolean {
-		return (
-			this.#openConnections.has(connectionId) &&
-			(generation === undefined || this.#connectionGenerations.get(connectionId) === generation)
-		);
-	}
-
 	/** Release reverse leases after the transport reports a WebSocket disconnect. */
 	handleDisconnect(connectionId: string): void {
-		if (!this.#openConnections.delete(connectionId)) return;
-		this.#connectionGenerations.set(connectionId, (this.#connectionGenerations.get(connectionId) ?? 0) + 1);
-		this.#pendingFrames.delete(connectionId);
-		for (const [leaseId, record] of this.#leaseRecords) {
-			if (record.connectionId === connectionId) this.#leaseRecords.delete(leaseId);
-		}
 		this.reverse.disconnect(connectionId);
-		this.#closedConnectionOrder.push(connectionId);
-		while (this.#closedConnectionOrder.length > MAX_RETAINED_CLOSED_CONNECTIONS) {
-			const retired = this.#closedConnectionOrder.shift();
-			if (retired && !this.#openConnections.has(retired)) this.#connectionGenerations.delete(retired);
-		}
-	}
-
-	/**
-	 * Fences one exact provider lease after uncertain terminal cleanup. The fence
-	 * is idempotent for the same identity and never affects a newer generation.
-	 */
-	quarantineProviderLease(identity: ProviderLeaseIdentity, _reason?: string): boolean {
-		if (
-			!identity ||
-			typeof identity.leaseId !== "string" ||
-			identity.leaseId.length === 0 ||
-			typeof identity.connectionId !== "string" ||
-			identity.connectionId.length === 0 ||
-			!Number.isSafeInteger(identity.connectionGeneration) ||
-			identity.connectionGeneration < 0 ||
-			typeof identity.fence !== "string" ||
-			identity.fence.length === 0
-		)
-			return false;
-		const previous = this.#quarantinedLeases.get(identity.leaseId);
-		if (
-			previous &&
-			previous.connectionId === identity.connectionId &&
-			previous.connectionGeneration === identity.connectionGeneration &&
-			previous.fence === identity.fence
-		)
-			return true;
-		if (this.#quarantinedLeases.size >= MAX_QUARANTINED_PROVIDER_LEASES) return false;
-		if (this.#connectionGenerations.get(identity.connectionId) !== identity.connectionGeneration) return false;
-		const record = this.#leaseRecords.get(identity.leaseId);
-		if (
-			!record ||
-			record.connectionId !== identity.connectionId ||
-			record.connectionGeneration !== identity.connectionGeneration
-		)
-			return false;
-		const lease = this.reverse.getLease(record.capability);
-		if (!lease || lease.leaseId !== identity.leaseId || lease.connectionId !== identity.connectionId || !lease.active)
-			return false;
-		try {
-			this.reverse.release(identity.connectionId, identity.leaseId);
-		} catch {
-			return false;
-		}
-		this.#quarantinedLeases.set(identity.leaseId, { ...identity });
-		return true;
-	}
-
-	/** Dispatch a frame through bounded per-connection asynchronous admission. */
-	dispatchFrame(connectionId: string, frame: SdkFrame): Promise<void> {
-		const generation = this.#connectionGenerations.has(connectionId)
-			? (this.#connectionGenerations.get(connectionId) ?? 0)
-			: this.handleConnect(connectionId);
-		const pending = this.#pendingFrames.get(connectionId);
-		const pendingCount = pending?.generation === generation ? pending.count : 0;
-		if (pendingCount >= MAX_PENDING_FRAMES_PER_CONNECTION) {
-			this.#options.onFrameOverflow?.(connectionId);
-			return Promise.resolve();
-		}
-		this.#pendingFrames.set(connectionId, { generation, count: pendingCount + 1 });
-		const task = Promise.resolve().then(() => {
-			if (this.#connectionGenerations.get(connectionId) !== generation) return;
-			if (!this.#openConnections.has(connectionId)) return;
-			return this.#onFrame(connectionId, frame, generation);
-		});
-		void task.finally(() => {
-			const current = this.#pendingFrames.get(connectionId);
-			if (!current || current.generation !== generation) return;
-			this.#pendingFrames.set(connectionId, {
-				generation,
-				count: Math.max(0, current.count - 1),
-			});
-		});
-		return task.then(
-			() => {},
-			() => {},
-		);
 	}
 
 	/** Adds an event to the resumable event ring. Transport delivery is owned by bus wiring. */
@@ -295,7 +156,7 @@ export class SessionSdkHost {
 		this.events.restart();
 		this.emitEvent({ name: "session_ready", sessionId: this.#options.sessionId, generation: this.events.generation });
 		const disposer = this.#options.onFrame((connectionId, frame) => {
-			void this.dispatchFrame(connectionId, frame);
+			void this.#onFrame(connectionId, frame);
 		});
 		this.#unsubscribe = typeof disposer === "function" ? disposer : undefined;
 		this.#started = true;
@@ -360,30 +221,18 @@ export class SessionSdkHost {
 		}
 	}
 
-	async #onFrame(connectionId: string, frame: SdkFrame, generation: number): Promise<void> {
-		if (this.#connectionGenerations.has(connectionId) && this.#connectionGenerations.get(connectionId) !== generation)
-			return;
+	async #onFrame(connectionId: string, frame: SdkFrame): Promise<void> {
 		try {
 			switch (frame.type) {
 				case "control_request": {
 					this.#observeRequest("control", connectionId, frame);
 					const result = await this.#options.control?.(connectionId, frame);
-					if (
-						this.#connectionGenerations.has(connectionId) &&
-						this.#connectionGenerations.get(connectionId) !== generation
-					)
-						return;
 					if (result !== undefined) {
 						const response = { type: "control_response", ...(result as SdkFrame) };
 						let terminalSent = false;
 						const sendTerminal = async (): Promise<void> => {
 							if (terminalSent) return;
 							terminalSent = true;
-							if (
-								this.#connectionGenerations.has(connectionId) &&
-								this.#connectionGenerations.get(connectionId) !== generation
-							)
-								return;
 							await this.#send(connectionId, response);
 						};
 						await this.#options.beforeControlResponse?.(connectionId, frame, response, sendTerminal);
@@ -422,11 +271,6 @@ export class SessionSdkHost {
 				case "query_request": {
 					this.#observeRequest("query", connectionId, frame);
 					const result = await this.#options.query?.(connectionId, frame);
-					if (
-						this.#connectionGenerations.has(connectionId) &&
-						this.#connectionGenerations.get(connectionId) !== generation
-					)
-						return;
 					if (result !== undefined)
 						await this.#send(connectionId, { type: "query_response", ...(result as SdkFrame) });
 					break;
@@ -436,30 +280,13 @@ export class SessionSdkHost {
 					requireConnection(connectionId, frame);
 					const capability = requiredString(frame, "capability");
 					if (!has(frame, "definitions")) throw invalidFrame("definitions is required.");
-					const expectedLeaseId = optionalString(frame, "expectedLeaseId");
-					if (expectedLeaseId && this.#quarantinedLeases.has(expectedLeaseId))
-						throw new ReverseLeaseError("lease_unavailable");
-					const connectionGeneration = this.#connectionGenerations.get(connectionId) ?? 0;
 					const lease = this.reverse.registerProvider(
 						connectionId,
 						capability,
 						frame.definitions,
-						expectedLeaseId,
+						optionalString(frame, "expectedLeaseId"),
 						optionalString(frame, "idempotencyKey"),
-						connectionGeneration,
 					);
-					for (const [priorLeaseId, record] of this.#leaseRecords) {
-						if (record.capability === lease.capability && priorLeaseId !== lease.leaseId)
-							this.#leaseRecords.delete(priorLeaseId);
-					}
-					this.#leaseRecords.set(lease.leaseId, {
-						capability: lease.capability,
-						connectionId: lease.connectionId,
-						connectionGeneration,
-					});
-					try {
-						this.#options.onProviderLeaseRegistered?.(lease, connectionGeneration);
-					} catch {}
 					await this.#send(connectionId, {
 						id: frame.id,
 						type: "register_provider_result",
@@ -479,7 +306,6 @@ export class SessionSdkHost {
 					requireConnection(connectionId, frame);
 					const handoffTo = optionalString(frame, "handoffTo");
 					const lease = this.reverse.release(connectionId, requiredString(frame, "leaseId"), handoffTo);
-					this.#leaseRecords.delete(lease.leaseId);
 					await this.#send(connectionId, leaseState(undefined, lease));
 					break;
 				}
@@ -492,7 +318,7 @@ export class SessionSdkHost {
 					if (frame.ok) {
 						if (!has(frame, "result") || has(frame, "error"))
 							throw invalidFrame("Successful reverse responses require result and no error.");
-						this.reverse.respond(connectionId, id, leaseId, frame.result, undefined, frame);
+						this.reverse.respond(connectionId, id, leaseId, frame.result);
 					} else {
 						if (
 							has(frame, "result") ||
@@ -501,14 +327,10 @@ export class SessionSdkHost {
 							typeof responseError.message !== "string"
 						)
 							throw invalidFrame("Failed reverse responses require a structured error and no result.");
-						this.reverse.respond(
-							connectionId,
-							id,
-							leaseId,
-							undefined,
-							{ code: responseError.code, message: responseError.message },
-							frame,
-						);
+						this.reverse.respond(connectionId, id, leaseId, undefined, {
+							code: responseError.code,
+							message: responseError.message,
+						});
 					}
 					break;
 				}

package/src/sdk/host/query/handlers.ts

@@ -1,4 +1,6 @@
 import { PROMPT_CLIENT_REF_MAX_LENGTH } from "../../prompt-status.js";
+import type { ActiveProviderDescriptor } from "../../providers.js";
+import { ActiveProviderResolutionError } from "../../providers.js";
 import {
 	assertCursorSelector,
 	type CursorEnvelope,
@@ -22,6 +24,7 @@ export interface SessionSurface {
 	getUsage(): unknown | Promise<unknown>;
 	getModels(): unknown | Promise<unknown>;
 	getSkillState(): unknown | Promise<unknown>;
+	getActiveProviders?(): ActiveProviderDescriptor[] | Promise<ActiveProviderDescriptor[]>;
 	/** Q12 rows preserve workflow gate fields and include stable durable gate metadata. */
 	getGates(): unknown | Promise<unknown>;
 	getConfigItems(): unknown | Promise<unknown>;
@@ -102,6 +105,7 @@ const sources: Record<string, { resource: string; method: keyof SessionSurface;
 	Q21: { resource: "queue", method: "getQueueMessages", mvcc: true },
 	Q22: { resource: "extensions", method: "getExtensions", mvcc: true },
 	Q25: { resource: "jobs", method: "getJobs", mvcc: false },
+	Q29: { resource: "activeProviders", method: "getActiveProviders", mvcc: false },
 	Q27: { resource: "modelProfiles", method: "getModelProfiles", mvcc: true },
 };
 const names = [
@@ -133,6 +137,7 @@ const names = [
 	"turn.prompt_status",
 	"models.profiles.list",
 	"skill.invoke_status",
+	"providers.list/active",
 ];
 
 export class QueryHandlers {
@@ -168,6 +173,15 @@ export class QueryHandlers {
 				return this.#error(request, "invalid_request", false, "models.profiles.list does not accept input fields.");
 			if (query === "Q27" && typeof this.surface.getModelProfiles !== "function")
 				return this.#error(request, "unavailable", false, "models.profiles.list is unavailable for this session.");
+			if (query === "Q29" && request.input && Object.keys(request.input).length > 0)
+				return this.#error(
+					request,
+					"invalid_request",
+					false,
+					"providers.list/active does not accept input fields.",
+				);
+			if (query === "Q29" && typeof this.surface.getActiveProviders !== "function")
+				return this.#error(request, "unavailable", false, "providers.list/active is unavailable for this session.");
 			const source = sources[query];
 			if (!source) return this.#error(request, "invalid_request");
 			return await this.#pageSource(request, query, source);
@@ -257,7 +271,12 @@ export class QueryHandlers {
 				source.resource === "transcript" ? { highWatermark: cursor.highWatermark } : {},
 			);
 		} else {
-			snapshot = await (this.surface[source.method] as () => unknown)();
+			try {
+				snapshot = await (this.surface[source.method] as () => unknown)();
+			} catch (error) {
+				if (queryId === "Q29") throw new ActiveProviderResolutionError();
+				throw error;
+			}
 			revision = await this.revisions.createRevision(source.resource, resourceId, snapshot);
 		}
 		if (snapshot === undefined) return this.#error(request, "resource_gone");