agents 0.28.1 → 0.29.0

package/dist/skills/index.js

@@ -324,6 +324,185 @@ function r2(bucket, options = {}) {
 	};
 }
 //#endregion
+//#region src/skills/workspace.ts
+/** Directory skill scripts and relative paths resolve against. */
+const WORKSPACE_ROOT = "/workspace";
+const TEXT_ENCODER = new TextEncoder();
+const TEXT_DECODER = new TextDecoder();
+/** @internal Adapt a Workspace for projecting skills into it. */
+function createSkillWorkspaceFiles(workspace, rootOverride) {
+	const root = parseRoot(rootOverride ?? `${WORKSPACE_ROOT}/.agents/skills`);
+	const access = createSkillWorkspaceAccess(workspace);
+	const readBytes = async (path) => {
+		try {
+			return await drain(await workspace.fs.readFile(path));
+		} catch (error) {
+			if (isNotFound(error)) return null;
+			throw error;
+		}
+	};
+	return {
+		root,
+		path(name, relativePath) {
+			return `${root}/${parseSkillDirectoryName(name)}/${parseRelativePath(relativePath)}`;
+		},
+		async exists(path) {
+			return await access.stat(path) !== null;
+		},
+		readText: (path) => access.readFile(path),
+		async readResource(path, descriptor) {
+			if ((descriptor.encoding ?? "text") === "text") {
+				const content = await access.readFile(path);
+				return content === null ? null : {
+					...descriptor,
+					content
+				};
+			}
+			const bytes = await readBytes(path);
+			return bytes === null ? null : {
+				...descriptor,
+				content: encodeBase64(bytes)
+			};
+		},
+		writeText: (path, content) => access.writeFile(path, content),
+		async writeResource(path, resource) {
+			await access.writeFile(path, (resource.encoding ?? "text") === "text" ? resource.content : decodeBase64(resource.content));
+		}
+	};
+}
+/**
+* @internal Adapt a Workspace for skill scripts. Relative paths resolve
+* against `/workspace`.
+*/
+function createSkillWorkspaceAccess(workspace) {
+	const { fs } = workspace;
+	const access = {
+		async readFile(path) {
+			try {
+				return TEXT_DECODER.decode(await drain(await fs.readFile(resolvePath(path))));
+			} catch (error) {
+				if (isNotFound(error)) return null;
+				throw error;
+			}
+		},
+		async listFiles(path) {
+			const directory = resolvePath(path);
+			return (await fs.readdir(directory)).map((entry) => ({
+				path: `${directory.replace(/\/$/, "")}/${entry.name}`,
+				name: entry.name,
+				type: entry.isDirectory ? "directory" : "file",
+				size: entry.size
+			}));
+		},
+		async glob(pattern) {
+			const segments = resolvePath(pattern).split("/").filter(Boolean);
+			const firstGlob = segments.findIndex((part) => /[*?[\]{}]/.test(part));
+			if (firstGlob === -1) {
+				const path = `/${segments.join("/")}`;
+				const found = await access.stat(path);
+				return found === null ? [] : [{
+					path,
+					...found
+				}];
+			}
+			let matches;
+			try {
+				matches = await fs.find(`/${segments.slice(0, firstGlob).join("/")}`, segments.slice(firstGlob).join("/"));
+			} catch (error) {
+				if (isNotFound(error)) return [];
+				throw error;
+			}
+			return Promise.all(matches.map(async (match) => match.type === "dir" ? {
+				path: match.path,
+				type: "directory",
+				size: 0
+			} : {
+				path: match.path,
+				type: "file",
+				size: (await fs.stat(match.path)).size
+			}));
+		},
+		async stat(path) {
+			try {
+				const info = await fs.stat(resolvePath(path));
+				return {
+					type: info.isDirectory ? "directory" : "file",
+					size: info.size
+				};
+			} catch (error) {
+				if (isNotFound(error)) return null;
+				throw error;
+			}
+		},
+		async writeFile(path, content) {
+			const absolute = resolvePath(path);
+			const parent = absolute.slice(0, absolute.lastIndexOf("/"));
+			if (parent) await fs.mkdir(parent, { recursive: true });
+			await fs.writeFile(absolute, typeof content === "string" ? TEXT_ENCODER.encode(content) : content);
+		}
+	};
+	return access;
+}
+function resolvePath(path) {
+	if (path.startsWith("/")) return path;
+	const relative = path.replace(/^\.(\/|$)/, "");
+	return relative === "" ? WORKSPACE_ROOT : `${WORKSPACE_ROOT}/${relative}`;
+}
+function parseRoot(root) {
+	if (!root.startsWith("/") || root.includes("\0") || root.split("/").some((part) => part === "." || part === "..")) throw new Error(`Skill Workspace root must be a normalized absolute path: ${root}`);
+	const normalized = root.replace(/\/{2,}/g, "/").replace(/\/$/, "");
+	if (!normalized) throw new Error("Skill Workspace root cannot be /");
+	return normalized;
+}
+function parseSkillDirectoryName(name) {
+	if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name)) throw new Error(`Skill name must be a safe Workspace directory name: ${name}`);
+	return name;
+}
+function parseRelativePath(path) {
+	if (path.startsWith("/") || path.includes("\0") || path.split("/").some((part) => part === "" || part === "." || part === "..")) throw new Error(`Skill file path must be normalized and relative: ${path}`);
+	return path;
+}
+function isNotFound(error) {
+	if (!error || typeof error !== "object") return false;
+	const record = error;
+	return record.code === "ENOENT" || typeof record.message === "string" && /ENOENT|no such file|not found/i.test(record.message);
+}
+async function drain(stream) {
+	const parts = [];
+	let total = 0;
+	const reader = stream.getReader();
+	try {
+		while (true) {
+			const { value, done } = await reader.read();
+			if (done) break;
+			if (!value || value.byteLength === 0) continue;
+			parts.push(value);
+			total += value.byteLength;
+		}
+	} finally {
+		reader.releaseLock();
+	}
+	if (parts.length === 1) return parts[0];
+	const bytes = new Uint8Array(total);
+	let offset = 0;
+	for (const part of parts) {
+		bytes.set(part, offset);
+		offset += part.byteLength;
+	}
+	return bytes;
+}
+function decodeBase64(value) {
+	const binary = atob(value);
+	const bytes = new Uint8Array(binary.length);
+	for (let index = 0; index < binary.length; index++) bytes[index] = binary.charCodeAt(index);
+	return bytes;
+}
+function encodeBase64(bytes) {
+	const parts = [];
+	for (let offset = 0; offset < bytes.byteLength; offset += 32768) parts.push(String.fromCharCode(...bytes.subarray(offset, offset + 32768)));
+	return btoa(parts.join(""));
+}
+//#endregion
 //#region src/skills/runner.ts
 const DEFAULT_SCRIPT_TIMEOUT_MS = 3e4;
 const MAX_OUTPUT_ARTIFACT_BYTES = 64e3;
@@ -579,7 +758,7 @@ var SkillScriptHostBridge = class extends RpcTarget {
 		_classPrivateFieldInitSpec(this, _workspaceAccess, void 0);
 		_classPrivateFieldInitSpec(this, _outputs, /* @__PURE__ */ new Map());
 		_classPrivateFieldSet2(_tools, this, tools);
-		_classPrivateFieldSet2(_workspace, this, workspace);
+		_classPrivateFieldSet2(_workspace, this, workspace === void 0 ? void 0 : createSkillWorkspaceAccess(workspace));
 		_classPrivateFieldSet2(_workspaceAccess, this, workspaceAccess);
 	}
 	get workspaceAccess() {
@@ -595,18 +774,13 @@ var SkillScriptHostBridge = class extends RpcTarget {
 		return _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").readFile(path);
 	}
 	async listFiles(path = ".") {
-		return _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").readDir(path);
+		return _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").listFiles(path);
 	}
 	async glob(pattern) {
 		return _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").glob(pattern);
 	}
 	async stat(path) {
-		const info = await _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").stat(path);
-		if (!info) return null;
-		return {
-			type: info.type,
-			size: info.size ?? 0
-		};
+		return _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read").stat(path);
 	}
 	async writeFile(path, content) {
 		await _assertClassBrand(_SkillScriptHostBridge_brand, this, _requireWorkspace).call(this, "read-write").writeFile(path, content);
@@ -1097,140 +1271,6 @@ function runner(options) {
 	} };
 }
 //#endregion
-//#region src/skills/workspace.ts
-/** @internal Parse and adapt a Computer or legacy Shell Workspace. */
-function createSkillWorkspaceFiles(workspace, rootOverride) {
-	const computer = isComputerWorkspace(workspace);
-	const root = parseRoot(rootOverride ?? (computer ? "/workspace/.agents/skills" : "/.agents/skills"));
-	const exists = async (path) => {
-		try {
-			const stat = computer ? await workspace.fs.stat(path) : await workspace.stat(path);
-			return stat !== null && stat !== void 0;
-		} catch (error) {
-			if (isNotFound(error)) return false;
-			throw error;
-		}
-	};
-	const readText = async (path) => {
-		try {
-			return computer ? await workspace.fs.readFile(path, "utf8") : await workspace.readFile(path);
-		} catch (error) {
-			if (isNotFound(error)) return null;
-			throw error;
-		}
-	};
-	const readBytes = async (path) => {
-		if (!computer) return workspace.readFileBytes(path);
-		try {
-			return await drain(await workspace.fs.readFile(path));
-		} catch (error) {
-			if (isNotFound(error)) return null;
-			throw error;
-		}
-	};
-	const mkdirParent = async (path) => {
-		const parent = path.slice(0, path.lastIndexOf("/"));
-		if (!parent) return;
-		if (computer) await workspace.fs.mkdir(parent, { recursive: true });
-		else await workspace.mkdir(parent, { recursive: true });
-	};
-	return {
-		root,
-		path(name, relativePath) {
-			return `${root}/${parseSkillDirectoryName(name)}/${parseRelativePath(relativePath)}`;
-		},
-		exists,
-		readText,
-		async readResource(path, descriptor) {
-			if ((descriptor.encoding ?? "text") === "text") {
-				const content = await readText(path);
-				return content === null ? null : {
-					...descriptor,
-					content
-				};
-			}
-			const bytes = await readBytes(path);
-			return bytes === null ? null : {
-				...descriptor,
-				content: encodeBase64(bytes)
-			};
-		},
-		async writeText(path, content) {
-			await mkdirParent(path);
-			if (computer) await workspace.fs.writeFile(path, content);
-			else await workspace.writeFile(path, content);
-		},
-		async writeResource(path, resource) {
-			await mkdirParent(path);
-			if ((resource.encoding ?? "text") === "text") {
-				if (computer) await workspace.fs.writeFile(path, resource.content);
-				else await workspace.writeFile(path, resource.content);
-				return;
-			}
-			const bytes = decodeBase64(resource.content);
-			if (computer) await workspace.fs.writeFile(path, bytes);
-			else await workspace.writeFileBytes(path, bytes, resource.mimeType);
-		}
-	};
-}
-function isComputerWorkspace(workspace) {
-	return "fs" in workspace;
-}
-function parseRoot(root) {
-	if (!root.startsWith("/") || root.includes("\0") || root.split("/").some((part) => part === "." || part === "..")) throw new Error(`Skill Workspace root must be a normalized absolute path: ${root}`);
-	const normalized = root.replace(/\/{2,}/g, "/").replace(/\/$/, "");
-	if (!normalized) throw new Error("Skill Workspace root cannot be /");
-	return normalized;
-}
-function parseSkillDirectoryName(name) {
-	if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name)) throw new Error(`Skill name must be a safe Workspace directory name: ${name}`);
-	return name;
-}
-function parseRelativePath(path) {
-	if (path.startsWith("/") || path.includes("\0") || path.split("/").some((part) => part === "" || part === "." || part === "..")) throw new Error(`Skill file path must be normalized and relative: ${path}`);
-	return path;
-}
-function isNotFound(error) {
-	if (!error || typeof error !== "object") return false;
-	const record = error;
-	return record.code === "ENOENT" || typeof record.message === "string" && /ENOENT|no such file|not found/i.test(record.message);
-}
-async function drain(stream) {
-	const parts = [];
-	let total = 0;
-	const reader = stream.getReader();
-	try {
-		while (true) {
-			const { value, done } = await reader.read();
-			if (done) break;
-			if (!value || value.byteLength === 0) continue;
-			parts.push(value);
-			total += value.byteLength;
-		}
-	} finally {
-		reader.releaseLock();
-	}
-	if (parts.length === 1) return parts[0];
-	const bytes = new Uint8Array(total);
-	let offset = 0;
-	for (const part of parts) {
-		bytes.set(part, offset);
-		offset += part.byteLength;
-	}
-	return bytes;
-}
-function decodeBase64(value) {
-	const binary = atob(value);
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index++) bytes[index] = binary.charCodeAt(index);
-	return bytes;
-}
-function encodeBase64(bytes) {
-	const parts = [];
-	for (let offset = 0; offset < bytes.byteLength; offset += 32768) parts.push(String.fromCharCode(...bytes.subarray(offset, offset + 32768)));
-	return btoa(parts.join(""));
-}
-//#endregion
 //#region src/skills/registry.ts
 const SKILL_CONTEXT_LABEL = "think_skills";
 function stableSourceFingerprint(sources) {
@@ -1335,7 +1375,7 @@ var SkillRegistry = class {
 		this.warnings.push(...refreshErrors);
 	}
 	/**
-	* Seed resolved Agent Skills into Computer or legacy Shell storage.
+	* Seed resolved Agent Skills into a Workspace.
 	* Existing files are preserved by default, and become authoritative for
 	* activation, resource reads, and script execution.
 	*/