@gajae-code/coding-agent 0.11.1 → 0.11.2

package/src/sdk/host/query/revision-store.ts

@@ -284,6 +284,10 @@ export class RevisionStore {
 	#peakBufferedBytes = 0;
 	#peakReadBufferedBytes = 0;
 	readonly #onReadRange?: (start: number, end: number) => void;
+	#closing = false;
+	#closePromise: Promise<void> | undefined;
+	#writesInFlight = 0;
+	#writesDrained: PromiseWithResolvers<void> | undefined;
 
 	constructor(
 		readonly sessionId: string,
@@ -295,40 +299,47 @@ export class RevisionStore {
 	}
 
 	async createRevision(resourceKind: string, resourceId: string, payload: unknown): Promise<string> {
-		if (payload === undefined) throw new RevisionStoreError("resource_gone", "snapshot payload is unavailable");
-		const serialised = await this.#serialise(payload);
-		const key = `${resourceKind}:${resourceId}`;
-		const revisions = this.#resources.get(key) ?? [];
-		const previous = revisions.length === 0 ? undefined : revisions[revisions.length - 1];
-		if (previous?.hash === serialised.hash) {
-			await this.#discardUnreferenced(serialised.chunks, serialised.manifest);
-			return previous.id;
-		}
-		const revision: Revision = {
-			id: String(previous ? Number(previous.id) + 1 : 1),
-			hash: serialised.hash,
-			bytes: serialised.bytes,
-			payload: serialised.payload,
-			manifest: serialised.manifest,
-			chunks: serialised.chunks,
-			chunkLengths: serialised.chunkLengths,
-			index: serialised.index,
-			pins: new Set(),
-			lastAccessed: this.now(),
-			createdAt: this.now(),
-		};
-		revisions.push(revision);
-		this.#resources.set(key, revisions);
-		this.#retainSpill(revision);
-		if (revision.payload) this.#memoryBytes += revision.bytes;
-		await this.#enforceMemory();
-		while (revisions.length > MAX_REVISIONS_PER_RESOURCE) {
-			const candidate = revisions.find(item => item.pins.size === 0);
-			if (!candidate) break;
-			revisions.splice(revisions.indexOf(candidate), 1);
-			this.#drop(candidate);
+		if (this.#closing) throw new RevisionStoreError("resource_gone", "snapshot store is closing");
+		this.#writesInFlight++;
+		try {
+			if (payload === undefined) throw new RevisionStoreError("resource_gone", "snapshot payload is unavailable");
+			const serialised = await this.#serialise(payload);
+			const key = `${resourceKind}:${resourceId}`;
+			const revisions = this.#resources.get(key) ?? [];
+			const previous = revisions.length === 0 ? undefined : revisions[revisions.length - 1];
+			if (previous?.hash === serialised.hash) {
+				await this.#discardUnreferenced(serialised.chunks, serialised.manifest);
+				return previous.id;
+			}
+			const revision: Revision = {
+				id: String(previous ? Number(previous.id) + 1 : 1),
+				hash: serialised.hash,
+				bytes: serialised.bytes,
+				payload: serialised.payload,
+				manifest: serialised.manifest,
+				chunks: serialised.chunks,
+				chunkLengths: serialised.chunkLengths,
+				index: serialised.index,
+				pins: new Set(),
+				lastAccessed: this.now(),
+				createdAt: this.now(),
+			};
+			revisions.push(revision);
+			this.#resources.set(key, revisions);
+			this.#retainSpill(revision);
+			if (revision.payload) this.#memoryBytes += revision.bytes;
+			await this.#enforceMemory();
+			while (revisions.length > MAX_REVISIONS_PER_RESOURCE) {
+				const candidate = revisions.find(item => item.pins.size === 0);
+				if (!candidate) break;
+				revisions.splice(revisions.indexOf(candidate), 1);
+				this.#drop(candidate);
+			}
+			return revision.id;
+		} finally {
+			this.#writesInFlight--;
+			if (this.#writesInFlight === 0) this.#writesDrained?.resolve();
 		}
-		return revision.id;
 	}
 
 	async readRevision(resourceKind: string, resourceId: string, id: string): Promise<unknown> {
@@ -359,14 +370,18 @@ export class RevisionStore {
 		revision.lastAccessed = this.now();
 		if (!revision.index?.items) return undefined;
 		const items: unknown[] = [];
+		let itemsBytes = 2; // []
 		for (const range of revision.index.items.slice(offset)) {
 			// The manifest records the canonical item length, so reject an oversized
 			// item before reading or parsing its complete range.
 			if (range.end - range.start > targetBytes) break;
 			const value = JSON.parse(await this.#readRange(revision, range));
-			if (Buffer.byteLength(JSON.stringify([...items, value])) > targetBytes && items.length) break;
-			if (Buffer.byteLength(JSON.stringify([...items, value])) > 1024 * 1024) break;
+			const itemBytes = Buffer.byteLength(JSON.stringify(value));
+			const candidateBytes = itemsBytes + itemBytes + (items.length ? 1 : 0);
+			if (candidateBytes > targetBytes && items.length) break;
+			if (candidateBytes > 1024 * 1024) break;
 			items.push(value);
+			itemsBytes = candidateBytes;
 		}
 		return { items, complete: offset + items.length >= revision.index.items.length };
 	}
@@ -485,12 +500,21 @@ export class RevisionStore {
 	}
 
 	async close(): Promise<void> {
-		this.#resources.clear();
-		this.#pinIndex.clear();
-		this.#memoryBytes = 0;
-		this.#chunkRefs.clear();
-		this.#manifestRefs.clear();
-		if (this.#directory) await rm(this.#directory, { recursive: true, force: true });
+		if (this.#closePromise) return this.#closePromise;
+		this.#closing = true;
+		this.#closePromise = (async () => {
+			if (this.#writesInFlight > 0) {
+				this.#writesDrained ??= Promise.withResolvers<void>();
+				await this.#writesDrained.promise;
+			}
+			this.#resources.clear();
+			this.#pinIndex.clear();
+			this.#memoryBytes = 0;
+			this.#chunkRefs.clear();
+			this.#manifestRefs.clear();
+			if (this.#directory) await rm(this.#directory, { recursive: true, force: true });
+		})();
+		return this.#closePromise;
 	}
 
 	get pinnedCount(): number {
@@ -527,12 +551,13 @@ export class RevisionStore {
 		const chunkLengths: number[] = [];
 		const hash = createHash("sha256");
 		let bytes = 0;
-		let buffer = "";
+		// Reuse one staging chunk across flushes. Nested large strings therefore retain
+		// one chunk-sized buffer rather than allocating one buffer per emitted chunk.
+		const buffer = Buffer.allocUnsafe(CHUNK_BYTES);
 		let bufferBytes = 0;
 		const flush = async () => {
-			if (buffer.length === 0) return;
-			const data = Buffer.from(buffer);
-			buffer = "";
+			if (bufferBytes === 0) return;
+			const data = buffer.subarray(0, bufferBytes);
 			bufferBytes = 0;
 			const chunkHash = createHash("sha256").update(data).digest("hex");
 			const file = join(directory, "objects", chunkHash);
@@ -548,17 +573,15 @@ export class RevisionStore {
 					remaining = CHUNK_BYTES;
 				}
 				const end = utf8ChunkEnd(text, offset, remaining);
-
 				if (end === offset) {
 					await flush();
 					continue;
 				}
-				const part = text.slice(offset, end);
-				buffer += part;
-				hash.update(part);
-				const partBytes = Buffer.byteLength(part);
-				bytes += partBytes;
-				bufferBytes += partBytes;
+				const data = Buffer.from(text.slice(offset, end));
+				data.copy(buffer, bufferBytes);
+				hash.update(data);
+				bytes += data.length;
+				bufferBytes += data.length;
 				this.#peakBufferedBytes = Math.max(this.#peakBufferedBytes, bufferBytes);
 				offset = end;
 				if (bufferBytes === CHUNK_BYTES) await flush();
@@ -612,16 +635,16 @@ export class RevisionStore {
 	}
 
 	async #encode(value: unknown, append: (text: string) => Promise<void>, inArray: boolean): Promise<void> {
-		if (value === null) return append("null");
+		if (value === null || typeof value === "number" || typeof value === "boolean") {
+			const serialised = JSON.stringify(value);
+			return append(serialised ?? "null");
+		}
 		if (typeof value === "string") {
 			await this.#encodeString(value, append);
 			return;
 		}
-		if (typeof value === "number") return append(Number.isFinite(value) ? String(value) : "null");
-		if (typeof value === "boolean") return append(value ? "true" : "false");
 		if (typeof value === "bigint") throw new TypeError("Do not know how to serialize a BigInt");
-		if (value === undefined || typeof value === "function" || typeof value === "symbol")
-			return append(inArray ? "null" : "null");
+		if (value === undefined || typeof value === "function" || typeof value === "symbol") return append("null");
 		if (typeof value === "object" && typeof (value as { toJSON?: unknown }).toJSON === "function")
 			return this.#encode((value as { toJSON: (key: string) => unknown }).toJSON(""), append, inArray);
 		if (Array.isArray(value)) {

package/src/sdk/index.ts

@@ -11,3 +11,4 @@ export type {
 	Q10ThinkingMode,
 } from "./models";
 export * from "./session";
+export * from "./session-directory";