@kubb/studio 5.11.2 → 5.11.3

package/README.md

@@ -85,9 +85,9 @@ running in a developer's project and a container running a fixed plugin set.
 the agent is a sandbox and carries its slug and Studio's version. From then on the agent pings every
 30 seconds, and Studio schedules one job at a time on the socket.
 
-With `allowRead`, the connect payload also includes a kept copy of the current `output.path` files.
-Studio can browse these files through `readFiles` before running a generation. Sandbox agents have
-no disk output, and output paths outside the project root are excluded.
+With `allowRead`, the connect payload includes the current `output.path` file list. Studio reads
+file contents from disk through `readFiles` when a user opens a file. Sandbox agents have no disk
+output, and output paths outside the project root are excluded.
 
 Studio ends a socket on purpose with one of these close codes:
 

package/dist/index.cjs

@@ -199,7 +199,7 @@ function getElapsedMs(hrStart) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.2";
+var version = "5.11.3";
 //#endregion
 //#region src/resolveConfig.ts
 /**
@@ -1473,6 +1473,33 @@ async function listDisk({ root, outputPath, maxFiles }) {
 		paths: new Set(paths)
 	};
 }
+async function readDiskFiles({ files: disk, paths, cursor = 0, limit }) {
+	const files = {};
+	const pages = {};
+	await inParallel({
+		items: paths.filter((path) => disk.paths.has(path)),
+		limit: READ_CONCURRENCY,
+		run: async (path) => {
+			const content = await disk.storage.readItem((0, node_path.resolve)(disk.root, path));
+			if (content === null) return;
+			if (limit === void 0) {
+				files[path] = content;
+				return;
+			}
+			const lines = content.split(/\r\n|\r|\n/);
+			const end = Math.min(cursor + limit, lines.length);
+			files[path] = lines.slice(cursor, end).join("\n");
+			pages[path] = {
+				nextCursor: end < lines.length ? end : null,
+				totalLines: lines.length
+			};
+		}
+	});
+	return limit === void 0 ? { files } : {
+		files,
+		pages
+	};
+}
 /**
 * Keeps recent generations by job id in `storage`, with an index next to them so a store on disk
 * survives a restart. A generation is only ever looked up by its job id, so on a pooled sandbox one
@@ -2022,23 +2049,7 @@ var Agent = class extends capnweb.RpcTarget {
 			maxFiles: DISK_SNAPSHOT_MAX_FILES
 		});
 		if (!files) return void 0;
-		const jobId = (0, node_crypto.randomUUID)();
-		const output = await this.#generations.keep({
-			jobId,
-			source: require_protocol.FileSource.OUTPUT,
-			files,
-			maxSetMb: this.#limits.maxSnapshotMb,
-			normalize: false
-		});
-		await this.#generations.add({
-			jobId,
-			output
-		});
-		return {
-			jobId,
-			files: output.paths,
-			hashes: output.hashes
-		};
+		return { files: [...files.paths] };
 	}
 	startGeneration(input) {
 		const stream = createGenerationStream(this.#options.hooks, input.jobId);
@@ -2065,7 +2076,7 @@ var Agent = class extends capnweb.RpcTarget {
 			severity: "error",
 			message: "Connection is closed"
 		});
-		if (this.#session.active) return this.#refuse({ message: "A generation is already in progress, please wait for it to finish" });
+		if (this.#session.active) return this.#refuse({ message: require_protocol.AgentMessage.GENERATION_IN_PROGRESS });
 		const settled = Promise.withResolvers();
 		this.#session.active = {
 			jobId: input.jobId,
@@ -2096,7 +2107,7 @@ var Agent = class extends capnweb.RpcTarget {
 	async #generate({ input, root, signal }) {
 		const { jobId, config: patch } = input;
 		const studioInput = this.#sandbox ? patch?.input : void 0;
-		if (this.#sandbox && (typeof studioInput !== "string" || !studioInput.trim() || (0, _kubb_core.getInputKind)(studioInput) !== "inline")) return this.#refuse({ message: "A sandbox agent generates only from the OpenAPI document content Studio sends, not from a file path or URL" });
+		if (this.#sandbox && (typeof studioInput !== "string" || !studioInput.trim() || (0, _kubb_core.getInputKind)(studioInput) !== "inline")) return this.#refuse({ message: require_protocol.AgentMessage.SANDBOX_INPUT_ONLY });
 		const [config, extensions] = await Promise.all([this.#options.loadConfig(), this.#installedExtensions()]);
 		const [plugins, adapter, parsers] = await Promise.all([
 			mergePlugins({
@@ -2229,7 +2240,7 @@ var Agent = class extends capnweb.RpcTarget {
 			message: require_protocol.AgentMessage.READ_AST_NOT_ALLOWED,
 			permission: require_protocol.AgentPermission.READ_AST
 		});
-		if (typeof input.jobId !== "string" || !input.jobId) return this.#refuse({ message: "The request must name a job" });
+		if (typeof input.jobId !== "string" || !input.jobId) return this.#refuse({ message: require_protocol.AgentMessage.JOB_REQUIRED });
 		const generation = await this.#generations.get(input.jobId);
 		if (!generation) return this.#refuse({ message: require_protocol.AgentMessage.GENERATION_GONE });
 		const kept = generation.inputBytes ? await this.#generations.readInput(input.jobId) : void 0;
@@ -2246,14 +2257,32 @@ var Agent = class extends capnweb.RpcTarget {
 			message: require_protocol.AgentMessage.READ_NOT_ALLOWED,
 			permission: require_protocol.AgentPermission.READ
 		});
-		if (!Array.isArray(input.paths) || typeof input.jobId !== "string" || !input.jobId) return this.#refuse({ message: "The request must name a job and carry paths" });
+		if (!Array.isArray(input.paths) || typeof input.jobId !== "string" || !input.jobId || !["generation", "currentDisk"].includes(input.jobType)) return this.#refuse({ message: require_protocol.AgentMessage.FILE_REQUEST_INVALID });
 		const { paths } = input;
-		if (paths.length > 50) return this.#refuse({ message: `At most 50 paths may be requested at once` });
+		if (paths.length > 50) return this.#refuse({ message: require_protocol.AgentMessage.TOO_MANY_FILES });
+		if (!isValidPage(input)) return this.#refuse({ message: require_protocol.AgentMessage.INVALID_PAGE });
+		if (input.jobType === "currentDisk") {
+			if (this.#sandbox) return this.#refuse({ message: require_protocol.AgentMessage.SANDBOX_DISK_UNAVAILABLE });
+			const config = await this.#options.loadConfig();
+			const disk = await listDisk({
+				root: this.#options.root,
+				outputPath: config.output.path,
+				maxFiles: DISK_SNAPSHOT_MAX_FILES
+			});
+			if (!disk) return this.#refuse({ message: require_protocol.AgentMessage.GENERATION_GONE });
+			const result = await readDiskFiles({
+				files: disk,
+				paths,
+				cursor: input.cursor,
+				limit: input.limit
+			});
+			await this.#logCommand("readFiles", `read ${Object.keys(result.files).length}/${paths.length} requested file${paths.length === 1 ? "" : "s"}`);
+			return result;
+		}
 		const generation = await this.#generations.get(input.jobId);
 		if (!generation) return this.#refuse({ message: require_protocol.AgentMessage.GENERATION_GONE });
-		if (!isValidPage(input)) return this.#refuse({ message: `The cursor must be a whole line from 0 and come with a limit of 1 to ${require_protocol.MAX_PAGE_LINES} lines` });
 		const source = input.source === require_protocol.FileSource.DISK ? require_protocol.FileSource.DISK : require_protocol.FileSource.OUTPUT;
-		if (!generation[source]) return this.#refuse({ message: "This agent kept no snapshot of the files on disk for that job" });
+		if (!generation[source]) return this.#refuse({ message: require_protocol.AgentMessage.NO_DISK_SNAPSHOT });
 		const result = await this.#generations.read({
 			generation,
 			source,
@@ -2274,15 +2303,15 @@ var Agent = class extends capnweb.RpcTarget {
 			permission: require_protocol.AgentPermission.READ
 		});
 		const { jobId, path, base, cursor = 0, limit } = input;
-		if (typeof jobId !== "string" || !jobId || typeof path !== "string" || !path || typeof base?.jobId !== "string" || !base.jobId) return this.#refuse({ message: "The request must name a job, a base, and a path" });
+		if (typeof jobId !== "string" || !jobId || typeof path !== "string" || !path || typeof base?.jobId !== "string" || !base.jobId) return this.#refuse({ message: require_protocol.AgentMessage.DIFF_REQUEST_INVALID });
 		if (!isValidPage({
 			cursor,
 			limit
-		})) return this.#refuse({ message: `The cursor must be a whole line from 0 and come with a limit of 1 to ${require_protocol.MAX_PAGE_LINES} lines` });
+		})) return this.#refuse({ message: require_protocol.AgentMessage.INVALID_PAGE });
 		const [generation, baseGeneration] = await Promise.all([this.#generations.get(jobId), this.#generations.get(base.jobId)]);
 		if (!generation || !baseGeneration) return this.#refuse({ message: require_protocol.AgentMessage.GENERATION_GONE });
 		const baseSource = base.source === require_protocol.FileSource.DISK ? require_protocol.FileSource.DISK : require_protocol.FileSource.OUTPUT;
-		if (!baseGeneration[baseSource]) return this.#refuse({ message: "This agent kept no snapshot of the files on disk for that job" });
+		if (!baseGeneration[baseSource]) return this.#refuse({ message: require_protocol.AgentMessage.NO_DISK_SNAPSHOT });
 		const [after, before] = await Promise.all([this.#generations.read({
 			generation,
 			source: require_protocol.FileSource.OUTPUT,
@@ -2293,7 +2322,7 @@ var Agent = class extends capnweb.RpcTarget {
 			paths: [path]
 		})]);
 		const afterContent = after.files[path];
-		if (afterContent === void 0 && path in generation.output.hashes) return this.#refuse({ message: "This agent kept only the hashes of that job" });
+		if (afterContent === void 0 && path in generation.output.hashes) return this.#refuse({ message: require_protocol.AgentMessage.HASHES_ONLY });
 		const beforeContent = before.files[path];
 		if (beforeContent === void 0) return {
 			hunks: [],