@gajae-code/coding-agent 0.12.6 → 0.12.7

package/src/sdk/host/reverse-leases.ts

@@ -5,12 +5,7 @@ export const REVERSE_HEARTBEAT_MS = 5_000;
 export const REVERSE_LEASE_TTL_MS = 15_000;
 export const REVERSE_RECLAIM_GRACE_MS = 15_000;
 export const MAX_REVERSE_OUTSTANDING = 64;
-export const MAX_REVERSE_CLEANUP_OUTSTANDING = 2;
 export const MAX_REVERSE_PAYLOAD_BYTES = 256 * 1024;
-export const MAX_REVERSE_TERMINAL_OUTPUT_BYTES = 10 * 1024 * 1024;
-export const MAX_REVERSE_TERMINAL_OUTPUT_PAYLOAD_BYTES = 64 * 1024 * 1024;
-const MAX_REVERSE_IDEMPOTENCY_ENTRIES = 256;
-const MAX_REVERSE_IDEMPOTENCY_KEY_BYTES = 512;
 
 export class ReverseLeaseError extends Error {
 	constructor(
@@ -44,7 +39,6 @@ interface Outstanding {
 	connectionId: string;
 	capability: string;
 	leaseId: string;
-	method: string;
 	resolve: (value: unknown) => void;
 	reject: (reason: Error) => void;
 	signal?: AbortSignal;
@@ -55,13 +49,7 @@ export interface ReverseLeaseOptions {
 	now?: () => number;
 	leaseTtlMs?: number;
 	sendFrame: (connectionId: string, frame: SdkFrame) => void | Promise<void>;
-	installDefinitions?: (
-		capability: string,
-		definitions: unknown,
-		leaseId: string,
-		connectionId: string,
-		connectionGeneration: number,
-	) => void;
+	installDefinitions?: (capability: string, definitions: unknown) => void;
 	onCancel?: (requestId: string, reason: "provider_disconnected" | "lease_released") => void;
 	onDefinitionsRemoved?: (capability: string) => void;
 }
@@ -93,10 +81,8 @@ export class ReverseLeaseRuntime {
 	readonly #onCancel?: ReverseLeaseOptions["onCancel"];
 	readonly #leases = new Map<string, ProviderLease>();
 	readonly #idempotency = new Map<string, { fingerprint: string; lease: ProviderLease }>();
-	readonly #idempotencyOrder: string[] = [];
-
 	readonly #outstanding = new Map<string, Outstanding>();
-	readonly #installedCapabilities = new Map<string, string>();
+	readonly #installedCapabilities = new Set<string>();
 	readonly #sweepTimer: ReturnType<typeof setInterval>;
 	#disposing = false;
 
@@ -117,15 +103,11 @@ export class ReverseLeaseRuntime {
 		definitions: unknown,
 		expectedLeaseId?: string,
 		idempotencyKey?: string,
-		connectionGeneration = 0,
 	): ProviderLease {
 		if (this.#disposing) throw new Error("reverse runtime is disposing");
-		if (idempotencyKey !== undefined && Buffer.byteLength(idempotencyKey, "utf8") > MAX_REVERSE_IDEMPOTENCY_KEY_BYTES)
-			throw new ReverseLeaseError("payload_too_large");
 		const key = `${connectionId}\u0000${idempotencyKey ?? ""}`;
 		const fingerprint = registrationFingerprint(capability, definitions, expectedLeaseId);
 		const replay = idempotencyKey ? this.#idempotency.get(key) : undefined;
-
 		if (replay) {
 			if (replay.fingerprint !== fingerprint) throw new ReverseLeaseError("idempotency_conflict");
 			const current = this.#leases.get(capability);
@@ -133,19 +115,12 @@ export class ReverseLeaseRuntime {
 		}
 		const now = this.#now();
 		const existing = this.#leases.get(capability);
-		if (existing && existing.expiresAt <= now) {
-			this.#cancelForLease(existing.capability, existing.leaseId);
-			this.#removeDefinitions(existing.capability, existing.leaseId);
-			this.#evictIdempotencyForLease(existing.leaseId);
-		}
-		const reclaimReserved = existing?.graceUntil !== undefined && existing.graceUntil > now;
-		if (reclaimReserved && existing!.leaseId !== expectedLeaseId) {
-			throw new ReverseLeaseError("provider_lease_conflict");
-		}
+		if (existing && existing.expiresAt <= now) this.#removeDefinitions(existing.capability);
 		const pendingHandoff = existing?.active === false && existing.expiresAt > now;
 		if (pendingHandoff) {
 			if (existing!.connectionId !== connectionId || existing!.leaseId !== expectedLeaseId)
 				throw new ReverseLeaseError("provider_lease_conflict");
+			this.#installDefinitionsFor(capability, definitions);
 			const lease: ProviderLease = {
 				leaseId: existing!.leaseId,
 				connectionId,
@@ -154,22 +129,17 @@ export class ReverseLeaseRuntime {
 				expiresAt: now + this.#leaseTtlMs,
 				active: true,
 			};
-			this.#installDefinitionsFor(capability, definitions, lease.leaseId, lease.connectionId, connectionGeneration);
 			this.#leases.set(capability, lease);
-			if (idempotencyKey) this.#rememberIdempotency(key, fingerprint, lease);
-
+			if (idempotencyKey) this.#idempotency.set(key, { fingerprint, lease });
 			return { ...lease };
 		}
 		const reclaiming =
 			existing?.leaseId === expectedLeaseId && existing?.graceUntil !== undefined && now <= existing.graceUntil;
 		const refreshing =
-			existing?.active !== false &&
-			existing?.connectionId === connectionId &&
-			existing.expiresAt > now &&
-			(expectedLeaseId === undefined || existing.leaseId === expectedLeaseId);
-
+			existing?.active !== false && existing?.connectionId === connectionId && existing.expiresAt > now;
 		if (existing && !reclaiming && !refreshing && existing.connectionId !== connectionId && existing.expiresAt > now)
 			throw new ReverseLeaseError("provider_lease_conflict");
+		this.#installDefinitionsFor(capability, definitions);
 		const lease: ProviderLease = {
 			leaseId: reclaiming || refreshing ? existing!.leaseId : randomUUID(),
 			connectionId,
@@ -178,22 +148,17 @@ export class ReverseLeaseRuntime {
 			expiresAt: now + this.#leaseTtlMs,
 			active: true,
 		};
-		this.#installDefinitionsFor(capability, definitions, lease.leaseId, lease.connectionId, connectionGeneration);
 		this.#leases.set(capability, lease);
-		if (idempotencyKey) this.#rememberIdempotency(key, fingerprint, lease);
-
+		if (idempotencyKey) this.#idempotency.set(key, { fingerprint, lease });
 		return { ...lease };
 	}
 
 	heartbeat(connectionId: string, leaseId: string): ProviderLease {
 		const lease = this.#owner(connectionId, leaseId);
 		if (lease.expiresAt <= this.#now()) {
-			this.#cancelForLease(lease.capability, lease.leaseId);
-			this.#removeDefinitions(lease.capability, lease.leaseId);
-			this.#evictIdempotencyForLease(lease.leaseId);
+			this.#removeDefinitions(lease.capability);
 			throw new ReverseLeaseError("lease_expired");
 		}
-
 		lease.expiresAt = this.#now() + this.#leaseTtlMs;
 		lease.graceUntil = undefined;
 		return { ...lease };
@@ -201,14 +166,8 @@ export class ReverseLeaseRuntime {
 
 	release(connectionId: string, leaseId: string, handoffTo?: string): ProviderLease {
 		const lease = this.#owner(connectionId, leaseId);
-		if (lease.expiresAt <= this.#now()) {
-			this.#cancelForLease(lease.capability, lease.leaseId);
-			this.#removeDefinitions(lease.capability, lease.leaseId);
-			this.#evictIdempotencyForLease(lease.leaseId);
-			throw new ReverseLeaseError("lease_expired");
-		}
-		this.#cancelForLease(lease.capability, lease.leaseId);
-		this.#removeDefinitions(lease.capability, lease.leaseId);
+		this.#cancelForConnection(connectionId, "lease_released");
+		this.#removeDefinitions(lease.capability);
 		if (handoffTo) {
 			lease.connectionId = handoffTo;
 			lease.expiresAt = this.#now() + REVERSE_RECLAIM_GRACE_MS;
@@ -216,32 +175,22 @@ export class ReverseLeaseRuntime {
 			lease.active = false;
 			return { ...lease };
 		}
-		this.#evictIdempotencyForLease(lease.leaseId);
 		this.#leases.delete(lease.capability);
 		return { ...lease };
 	}
 
 	disconnect(connectionId: string): void {
 		const now = this.#now();
-		for (const lease of this.#leases.values()) {
-			if (lease.connectionId !== connectionId) continue;
-			lease.expiresAt = now;
-			lease.graceUntil = now + REVERSE_RECLAIM_GRACE_MS;
-			this.#removeDefinitions(lease.capability, lease.leaseId);
-			this.#evictIdempotencyForLease(lease.leaseId);
-		}
+		for (const lease of this.#leases.values())
+			if (lease.connectionId === connectionId) {
+				lease.expiresAt = now;
+				lease.graceUntil = now + REVERSE_RECLAIM_GRACE_MS;
+				this.#removeDefinitions(lease.capability);
+			}
 		this.#cancelForConnection(connectionId, "provider_disconnected");
 	}
 
-	request(
-		capability: string,
-		method: string,
-		payload: unknown,
-		signal?: AbortSignal,
-		expectedLeaseId?: string,
-		cleanup = false,
-		expectedConnectionId?: string,
-	): Promise<unknown> {
+	request(capability: string, method: string, payload: unknown, signal?: AbortSignal): Promise<unknown> {
 		if (this.#disposing) throw new Error("reverse runtime is disposing");
 		this.#assertPayload(payload);
 		const lease = this.#liveLease(capability);
@@ -251,24 +200,14 @@ export class ReverseLeaseRuntime {
 				throw new ReverseLeaseError("lease_unavailable");
 			throw new ReverseLeaseError("provider_required");
 		}
-		if (expectedLeaseId !== undefined && lease.leaseId !== expectedLeaseId) {
-			throw new ReverseLeaseError("lease_unavailable");
-		}
-		if (expectedConnectionId !== undefined && lease.connectionId !== expectedConnectionId) {
-			throw new ReverseLeaseError("lease_unavailable");
-		}
 		if (signal?.aborted)
 			return Promise.reject(Object.assign(new Error("request_cancelled"), { name: "request_cancelled" }));
-		const outstandingLimit = cleanup
-			? MAX_REVERSE_OUTSTANDING + MAX_REVERSE_CLEANUP_OUTSTANDING
-			: MAX_REVERSE_OUTSTANDING;
-		if (this.#outstanding.size >= outstandingLimit) throw new ReverseLeaseError("too_many_outstanding");
+		if (this.#outstanding.size >= MAX_REVERSE_OUTSTANDING) throw new ReverseLeaseError("too_many_outstanding");
 		const id = randomUUID();
 		return new Promise((resolve, reject) => {
 			const outstanding: Outstanding = {
 				connectionId: lease.connectionId,
 				capability,
-				method,
 				leaseId: lease.leaseId,
 				resolve,
 				reject,
@@ -325,58 +264,13 @@ export class ReverseLeaseRuntime {
 		leaseId: string,
 		result: unknown,
 		error?: { code: string; message: string },
-		wireEnvelope?: unknown,
 	): void {
+		this.#assertPayload(result);
 		const request = this.#outstanding.get(id);
 		if (!request) throw new ReverseLeaseError("unknown_request");
 		if (request.connectionId !== connectionId || request.leaseId !== leaseId)
 			throw new ReverseLeaseError("not_lease_owner");
-		const lease = this.#leases.get(request.capability);
-		if (
-			!lease?.active ||
-			lease.leaseId !== request.leaseId ||
-			lease.connectionId !== request.connectionId ||
-			lease.expiresAt <= this.#now()
-		) {
-			const failure = new ReverseLeaseError("lease_expired");
-			this.#settleOutstandingWithFailure(id, request, failure, true);
-			throw failure;
-		}
-		const envelope =
-			wireEnvelope ??
-			({
-				type: "reverse_response",
-				id,
-				connectionId,
-				leaseId,
-				ok: error === undefined,
-				...(error ? { error } : { result }),
-			} satisfies Record<string, unknown>);
-		try {
-			this.#assertPayload(envelope, MAX_REVERSE_TERMINAL_OUTPUT_PAYLOAD_BYTES);
-			const terminalOutputResponse =
-				error === undefined &&
-				request.capability === "terminal" &&
-				request.method === "terminal.output" &&
-				this.#isTerminalOutputEnvelope(envelope, id, connectionId, leaseId);
-			const maxBytes = terminalOutputResponse
-				? MAX_REVERSE_TERMINAL_OUTPUT_PAYLOAD_BYTES
-				: MAX_REVERSE_PAYLOAD_BYTES;
-			if (
-				terminalOutputResponse &&
-				result &&
-				typeof result === "object" &&
-				typeof (result as { output?: unknown }).output === "string" &&
-				Buffer.byteLength((result as { output: string }).output, "utf-8") > MAX_REVERSE_TERMINAL_OUTPUT_BYTES
-			)
-				throw new ReverseLeaseError("payload_too_large");
-			this.#assertPayload(envelope, maxBytes);
-		} catch (failure) {
-			const responseError = failure instanceof Error ? failure : new Error(String(failure));
-			this.#settleOutstandingWithFailure(id, request, responseError);
-			throw responseError;
-		}
-		if (this.#takeOutstanding(id) !== request) return;
+		this.#takeOutstanding(id);
 		if (error) {
 			const rejection = new Error(error.message);
 			rejection.name = error.code;
@@ -384,44 +278,6 @@ export class ReverseLeaseRuntime {
 		} else request.resolve(result);
 	}
 
-	#isTerminalOutputEnvelope(value: unknown, id: string, connectionId: string, leaseId: string): boolean {
-		if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-		const frame = value as Record<string, unknown>;
-		if (!Object.keys(frame).every(key => ["type", "id", "connectionId", "leaseId", "ok", "result"].includes(key)))
-			return false;
-		if (
-			frame.type !== "reverse_response" ||
-			frame.id !== id ||
-			frame.connectionId !== connectionId ||
-			frame.leaseId !== leaseId ||
-			frame.ok !== true
-		)
-			return false;
-		const response = frame.result;
-		if (!response || typeof response !== "object" || Array.isArray(response)) return false;
-		const resultRecord = response as Record<string, unknown>;
-		if (
-			!Object.keys(resultRecord).every(key => ["output", "truncated", "exitStatus"].includes(key)) ||
-			typeof resultRecord.output !== "string" ||
-			typeof resultRecord.truncated !== "boolean"
-		)
-			return false;
-		const exitStatus = resultRecord.exitStatus;
-		if (exitStatus === undefined || exitStatus === null) return true;
-		if (typeof exitStatus !== "object" || Array.isArray(exitStatus)) return false;
-		const status = exitStatus as Record<string, unknown>;
-		if (!Object.keys(status).every(key => ["exitCode", "signal"].includes(key))) return false;
-		const exitCodeValid =
-			status.exitCode === undefined ||
-			status.exitCode === null ||
-			(typeof status.exitCode === "number" && Number.isSafeInteger(status.exitCode));
-		const signalValid =
-			status.signal === undefined ||
-			status.signal === null ||
-			(typeof status.signal === "string" && Buffer.byteLength(status.signal, "utf-8") <= 128);
-		return exitCodeValid && signalValid;
-	}
-
 	getLease(capability: string): ProviderLease | undefined {
 		const lease = this.#liveLease(capability);
 		return lease && { ...lease };
@@ -437,20 +293,20 @@ export class ReverseLeaseRuntime {
 		this.#disposing = true;
 		clearInterval(this.#sweepTimer);
 		const outstanding = [...this.#outstanding.entries()];
-		const installedCapabilities = [...this.#installedCapabilities.entries()];
-		for (const [id] of outstanding) this.#takeOutstanding(id);
+		const installedCapabilities = [...this.#installedCapabilities];
+		this.#outstanding.clear();
 		this.#installedCapabilities.clear();
 		this.#leases.clear();
 		this.#idempotency.clear();
-		this.#idempotencyOrder.length = 0;
+		for (const request of outstanding.map(([, request]) => request))
+			if (request.signal && request.onAbort) request.signal.removeEventListener("abort", request.onAbort);
 		for (const [id, request] of outstanding) {
-			this.#sendCancellation(id, request);
 			request.reject(new Error("request_cancelled"));
 			try {
 				this.#onCancel?.(id, "lease_released");
 			} catch {}
 		}
-		for (const [capability] of installedCapabilities) {
+		for (const capability of installedCapabilities) {
 			try {
 				this.#onDefinitionsRemoved?.(capability);
 			} catch {}
@@ -466,55 +322,22 @@ export class ReverseLeaseRuntime {
 	#liveLease(capability: string): ProviderLease | undefined {
 		const lease = this.#leases.get(capability);
 		if (!lease?.active || lease.expiresAt <= this.#now()) {
-			if (lease?.expiresAt !== undefined && lease.expiresAt <= this.#now()) {
-				this.#removeDefinitions(capability, lease.leaseId);
-				this.#cancelForLease(lease.capability, lease.leaseId);
-				this.#evictIdempotencyForLease(lease.leaseId);
-			}
+			if (lease?.expiresAt !== undefined && lease.expiresAt <= this.#now()) this.#removeDefinitions(capability);
 			return undefined;
 		}
-
 		return lease;
 	}
 	#expireStaleLeases(): void {
-		for (const lease of this.#leases.values()) {
-			if (lease.expiresAt > this.#now()) continue;
-			this.#removeDefinitions(lease.capability, lease.leaseId);
-			this.#cancelForLease(lease.capability, lease.leaseId);
-			this.#evictIdempotencyForLease(lease.leaseId);
-		}
-	}
-	#sendCancellation(id: string, request: Outstanding): void {
-		queueMicrotask(() => {
-			try {
-				const cancellation = this.#sendFrame(request.connectionId, {
-					type: "reverse_cancel",
-					id,
-					connectionId: request.connectionId,
-					leaseId: request.leaseId,
-				});
-				void Promise.resolve(cancellation).catch(() => {});
-			} catch {
-				// Cancellation is best effort; local retirement remains authoritative.
-			}
-		});
-	}
-	#cancelForLease(capability: string, leaseId: string): void {
-		for (const [id, request] of this.#outstanding) {
-			if (request.capability !== capability || request.leaseId !== leaseId) continue;
-			if (this.#takeOutstanding(id) !== request) continue;
-			this.#sendCancellation(id, request);
-			request.reject(new Error("request_cancelled"));
-		}
+		for (const lease of this.#leases.values())
+			if (lease.expiresAt <= this.#now()) this.#removeDefinitions(lease.capability);
 	}
 	#cancelForConnection(connectionId: string, reason: "provider_disconnected" | "lease_released"): void {
-		for (const [id, request] of this.#outstanding) {
-			if (request.connectionId !== connectionId) continue;
-			if (this.#takeOutstanding(id) !== request) continue;
-			this.#sendCancellation(id, request);
-			request.reject(new Error("request_cancelled"));
-			this.#onCancel?.(id, reason);
-		}
+		for (const [id, request] of this.#outstanding)
+			if (request.connectionId === connectionId) {
+				this.#takeOutstanding(id);
+				request.reject(new Error("request_cancelled"));
+				this.#onCancel?.(id, reason);
+			}
 	}
 	#takeOutstanding(id: string): Outstanding | undefined {
 		const request = this.#outstanding.get(id);
@@ -523,47 +346,17 @@ export class ReverseLeaseRuntime {
 		if (request.signal && request.onAbort) request.signal.removeEventListener("abort", request.onAbort);
 		return request;
 	}
-	#settleOutstandingWithFailure(id: string, request: Outstanding, failure: Error, sendCancellation = false): void {
-		if (this.#takeOutstanding(id) !== request) return;
-		if (sendCancellation) this.#sendCancellation(id, request);
-		request.reject(failure);
+	#installDefinitionsFor(capability: string, definitions: unknown): void {
+		this.#installDefinitions?.(capability, definitions);
+		this.#installedCapabilities.add(capability);
 	}
-	#installDefinitionsFor(
-		capability: string,
-		definitions: unknown,
-		leaseId: string,
-		connectionId: string,
-		connectionGeneration: number,
-	): void {
-		this.#installDefinitions?.(capability, definitions, leaseId, connectionId, connectionGeneration);
-		this.#installedCapabilities.set(capability, leaseId);
-	}
-	#removeDefinitions(capability: string, leaseId?: string): void {
-		const installedLeaseId = this.#installedCapabilities.get(capability);
-		if (installedLeaseId === undefined) return;
-		if (leaseId !== undefined && installedLeaseId !== leaseId) return;
-		this.#installedCapabilities.delete(capability);
+	#removeDefinitions(capability: string): void {
+		if (!this.#installedCapabilities.delete(capability)) return;
 		this.#onDefinitionsRemoved?.(capability);
 	}
-
-	#rememberIdempotency(key: string, fingerprint: string, lease: ProviderLease): void {
-		this.#idempotency.set(key, { fingerprint, lease });
-		this.#idempotencyOrder.push(key);
-		while (this.#idempotencyOrder.length > MAX_REVERSE_IDEMPOTENCY_ENTRIES) {
-			const evicted = this.#idempotencyOrder.shift();
-			if (evicted !== undefined) this.#idempotency.delete(evicted);
-		}
-	}
-	#evictIdempotencyForLease(leaseId: string): void {
-		for (const key of this.#idempotencyOrder) {
-			if (this.#idempotency.get(key)?.lease.leaseId === leaseId) this.#idempotency.delete(key);
-		}
-		while (this.#idempotencyOrder.length > 0 && !this.#idempotency.has(this.#idempotencyOrder[0]!))
-			this.#idempotencyOrder.shift();
-	}
-	#assertPayload(payload: unknown, maxBytes = MAX_REVERSE_PAYLOAD_BYTES): void {
+	#assertPayload(payload: unknown): void {
 		const encoded = JSON.stringify(payload);
-		if (encoded !== undefined && Buffer.byteLength(encoded) > maxBytes)
+		if (encoded !== undefined && Buffer.byteLength(encoded) > MAX_REVERSE_PAYLOAD_BYTES)
 			throw new ReverseLeaseError("payload_too_large");
 	}
 }