@gajae-code/coding-agent 0.12.10 → 0.12.12

package/src/session/artifacts.ts

@@ -13,6 +13,7 @@ import {
 	ensureManagedDirectory,
 	type ManagedSessionDescendantStore,
 	publishManagedFileNoReplace,
+	publishManagedFileNoReplaceSync,
 } from "./internal/managed-session-storage";
 import { DEFAULT_ARTIFACT_MAX_BYTES, truncateHeadBytes } from "./streaming-output";
 
@@ -78,7 +79,8 @@ export class ArtifactManager {
 	readonly #dir: string;
 	readonly #store: ManagedSessionDescendantStore | undefined;
 	#dirCreated = false;
-	#initialized = false;
+	#initialized: Promise<void> | undefined;
+	#initializedComplete = false;
 
 	/**
 	 * @param dir Directory that will hold artifact files. Created lazily on first save.
@@ -118,10 +120,10 @@ export class ArtifactManager {
 			else ensureManagedDirectory(this.#dir);
 			this.#dirCreated = true;
 		}
-		if (!this.#initialized) {
-			await this.#scanExistingIds();
-			this.#initialized = true;
-		}
+		// Memoized: concurrent first writers must not each rescan and restart the
+		// ID counter at the same value, which would collide on publish.
+		this.#initialized ??= this.#scanExistingIds();
+		await this.#initialized;
 	}
 
 	#filename(id: string, toolType: string): string {
@@ -129,6 +131,44 @@ export class ArtifactManager {
 		return `${id}.${toolType}.log`;
 	}
 
+	#claimFilename(id: number): string {
+		return `.artifact-id-${id}`;
+	}
+
+	#nextCandidateId(): number {
+		const id = this.#nextId++;
+		if (!Number.isSafeInteger(id) || id < 0) throw new Error("artifact_id_out_of_range");
+		return id;
+	}
+
+	async #claimNextId(): Promise<number> {
+		while (true) {
+			const id = this.#nextCandidateId();
+			try {
+				await this.#publish("", this.#claimFilename(id));
+				return id;
+			} catch (error) {
+				if (!(error instanceof Error) || error.message !== "destination_conflict") throw error;
+			}
+		}
+	}
+
+	#claimNextIdSync(): number {
+		if (!this.#initializedComplete)
+			throw new Error("ArtifactManager must be initialized before synchronous allocation");
+		while (true) {
+			const id = this.#nextCandidateId();
+			try {
+				const filename = this.#claimFilename(id);
+				if (this.#store) this.#store.publishNoReplaceSync(filename, new Uint8Array());
+				else publishManagedFileNoReplaceSync(path.join(this.#dir, filename), new Uint8Array());
+				return id;
+			} catch (error) {
+				if (!(error instanceof Error) || error.message !== "destination_conflict") throw error;
+			}
+		}
+	}
+
 	async #publish(content: string, filename: string): Promise<void> {
 		if (this.#store) await this.#store.publishNoReplace(filename, Buffer.from(content, "utf8"));
 		else await publishManagedFileNoReplace(path.join(this.#dir, filename), Buffer.from(content, "utf8"));
@@ -250,22 +290,25 @@ export class ArtifactManager {
 		const files = await this.listFiles();
 		let maxId = -1;
 		for (const file of files) {
-			// Files are named: {id}.{toolType}.log
-			const match = file.match(/^(\d+)\..*\.log$/);
+			// Published artifacts are `{id}.{toolType}.log`; hidden claim files reserve
+			// the numeric namespace across independent managers and processes.
+			const match = file.match(/^(\d+)\..*\.log$/) ?? file.match(/^\.artifact-id-(\d+)$/);
 			if (match) {
-				const id = parseInt(match[1], 10);
+				const id = Number(match[1]);
+				if (!Number.isSafeInteger(id) || id < 0) throw new Error("artifact_id_out_of_range");
 				if (id > maxId) maxId = id;
 			}
 		}
 		this.#nextId = maxId + 1;
+		this.#initializedComplete = true;
 	}
 
 	/**
-	 * Atomically allocate next artifact ID.
-	 * IDs are sequential within the session.
+	 * Atomically claim the next artifact ID after this manager has been initialized.
+	 * Prefer `allocatePath` or `save`; this synchronous seam exists for pruning callbacks.
 	 */
 	allocateId(): number {
-		return this.#nextId++;
+		return this.#claimNextIdSync();
 	}
 
 	/**
@@ -276,7 +319,7 @@ export class ArtifactManager {
 	 */
 	async allocatePath(toolType: string): Promise<{ id: string; path?: string }> {
 		await this.#ensureDir();
-		const id = String(this.allocateId());
+		const id = String(await this.#claimNextId());
 		if (this.#store) return { id };
 		return { id, path: path.join(this.#dir, this.#filename(id, toolType)) };
 	}
@@ -288,7 +331,7 @@ export class ArtifactManager {
 	 */
 	async save(content: string, toolType: string, options: ArtifactSaveOptions = {}): Promise<string> {
 		await this.#ensureDir();
-		const id = String(this.allocateId());
+		const id = String(await this.#claimNextId());
 		const maxBytes = Math.max(0, options.maxBytes ?? DEFAULT_ARTIFACT_MAX_BYTES);
 		const contentBytes = Buffer.byteLength(content, "utf-8");
 		const published =