offsite 0.0.17 → 0.0.18

package/apps/server/dist/main.mjs

@@ -823,11 +823,9 @@ const configSchema = z.strictObject({
 		opencode: z.record(z.string(), modelSetting).default({})
 	}).prefault({}),
 	delivery: z.enum(["queue", "steer"]).default("steer"),
-	autoResolve: z.strictObject({
-		questions: z.number().positive().nullable().default(3),
-		permissions: z.number().positive().nullable().default(1),
-		permissionDecision: z.enum(["allow", "deny"]).default("allow")
-	}).prefault({}),
+	autoSkipQuestionTimeout: z.number().positive().nullable().default(180),
+	autoPermissionMode: z.enum(["allow", "deny"]).default("allow"),
+	autoPermissionTimeout: z.number().positive().nullable().default(15),
 	terminal: z.strictObject({
 		shell: z.strictObject({
 			macos: z.string().nullable().default(null),
@@ -914,20 +912,27 @@ function broadcastActivity() {
 	});
 }
 function scheduleAutoResolve(sessionId, request) {
-	if (request.kind === "plan") return;
-	const settings = readConfig().autoResolve;
-	const minutes = request.kind === "question" ? settings.questions : settings.permissions;
-	if (minutes === null) return;
+	if (request.kind === "plan") return request;
+	const config = readConfig();
+	const seconds = request.kind === "question" ? config.autoSkipQuestionTimeout : config.autoPermissionTimeout;
+	if (seconds === null) return request;
+	const decision = request.kind === "question" ? "allow" : config.autoPermissionMode;
 	setTimeout(async () => {
 		const run = runs.get(sessionId);
 		if (run === void 0) return;
 		try {
-			if (request.kind === "question") await run.respond(request.id, "allow", {});
-			else await run.respond(request.id, readConfig().autoResolve.permissionDecision, null);
+			await run.respond(request.id, decision, request.kind === "question" ? {} : null);
 		} catch (error) {
 			console.warn(`could not auto-resolve ${request.id}: ${error}`);
 		}
-	}, minutes * 6e4);
+	}, seconds * 1e3);
+	return {
+		...request,
+		autoResolve: {
+			at: Date.now() + seconds * 1e3,
+			decision
+		}
+	};
 }
 //#endregion
 //#region src/lib/codex/requests.ts
@@ -1257,11 +1262,12 @@ var CodexRun = class CodexRun {
 			});
 			return;
 		}
-		const request = toRequest$1(String(id), method, params, this.items);
-		if (request === null) {
+		const created = toRequest$1(String(id), method, params, this.items);
+		if (created === null) {
 			this.server.replyError(id, `offsite does not handle ${method}`);
 			return;
 		}
+		const request = scheduleAutoResolve(this.sessionId, created);
 		this.pending.set(request.id, {
 			request,
 			id,
@@ -1274,7 +1280,6 @@ var CodexRun = class CodexRun {
 			request
 		});
 		broadcastActivity();
-		scheduleAutoResolve(this.sessionId, request);
 	}
 	async startTurn(prompt) {
 		clearTimeout(this.idleTimer);
@@ -1746,7 +1751,7 @@ function toolItems(base, tool) {
 		case "skill": return [{
 			...base,
 			kind: "skill",
-			skill: text$2(input.name),
+			skill: text$2(input.id),
 			output,
 			status
 		}];
@@ -2299,14 +2304,17 @@ var OpenCodeRun = class OpenCodeRun {
 		});
 	}
 	addPending(pending) {
-		this.pending.set(pending.request.id, pending);
+		const request = scheduleAutoResolve(this.sessionId, pending.request);
+		this.pending.set(request.id, {
+			...pending,
+			request
+		});
 		publish$2(this.sessionId, {
 			type: "request",
 			sessionId: this.sessionId,
-			request: pending.request
+			request
 		});
 		broadcastActivity();
-		scheduleAutoResolve(this.sessionId, pending.request);
 	}
 	finishTurn() {
 		this.partial = "";
@@ -4319,13 +4327,13 @@ var Run = class {
 		}, IDLE_LIMIT);
 	}
 	ask(options) {
-		const request = toRequest({
+		const request = scheduleAutoResolve(this.sessionId, toRequest({
 			id: randomUUID(),
 			toolName: options.toolName,
 			input: options.input,
 			title: options.title,
 			canAlwaysAllow: options.suggestions.length > 0
-		});
+		}));
 		return new Promise((resolve) => {
 			this.pending.set(request.id, {
 				request,
@@ -4339,7 +4347,6 @@ var Run = class {
 				request
 			});
 			broadcastActivity();
-			scheduleAutoResolve(this.sessionId, request);
 			options.signal.addEventListener("abort", () => this.settle(request.id, {
 				behavior: "deny",
 				message: "Cancelled"
@@ -4391,6 +4398,153 @@ var Run = class {
 	}
 };
 //#endregion
+//#region ../core/src/media.ts
+const mediaTypes = /* @__PURE__ */ new Map([
+	[".png", "image/png"],
+	[".jpg", "image/jpeg"],
+	[".jpeg", "image/jpeg"],
+	[".gif", "image/gif"],
+	[".webp", "image/webp"],
+	[".svg", "image/svg+xml"],
+	[".mp4", "video/mp4"],
+	[".m4v", "video/mp4"],
+	[".webm", "video/webm"],
+	[".mov", "video/quicktime"],
+	[".mp3", "audio/mpeg"],
+	[".wav", "audio/wav"],
+	[".ogg", "audio/ogg"],
+	[".opus", "audio/ogg"],
+	[".m4a", "audio/mp4"],
+	[".aac", "audio/aac"],
+	[".flac", "audio/flac"]
+]);
+//#endregion
+//#region src/services/files.ts
+const FILE_LIMIT = 2e4;
+const OUTPUT_LIMIT$1 = 262144;
+const READ_LIMIT = 1048576;
+const MEDIA_LINK_LIFETIME = 36e5;
+const mediaLinks = /* @__PURE__ */ new Map();
+const skipped = /* @__PURE__ */ new Set([
+	"node_modules",
+	".git",
+	".DS_Store",
+	"dist",
+	"target",
+	".next",
+	"__pycache__",
+	".venv"
+]);
+async function listFiles(cwd) {
+	const files = [];
+	const pending = [""];
+	while (pending.length > 0 && files.length < FILE_LIMIT) {
+		const dir = pending.pop() ?? "";
+		let entries;
+		try {
+			entries = await readdir(path.join(cwd, dir), { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const entry of entries) {
+			if (skipped.has(entry.name)) continue;
+			const relative = dir === "" ? entry.name : `${dir}/${entry.name}`;
+			if (entry.isDirectory()) pending.push(relative);
+			if (entry.isFile()) files.push(relative);
+			if (entry.isSymbolicLink()) {
+				if ((await stat(path.join(cwd, relative)).catch(() => null))?.isFile() === true) files.push(relative);
+			}
+		}
+	}
+	return files.slice(0, FILE_LIMIT).sort();
+}
+function readProjectFile(cwd, file) {
+	const full = resolveProjectFile(cwd, file);
+	const stats = statSync(full);
+	if (!stats.isFile()) throw new Error(`${file} is not a file`);
+	if (stats.size > READ_LIMIT) return {
+		kind: "large",
+		size: stats.size,
+		limit: READ_LIMIT
+	};
+	const data = readFileSync(full);
+	const mediaType = mediaTypes.get(path.extname(full).toLowerCase());
+	if (mediaType?.startsWith("image/") === true) return {
+		kind: "image",
+		size: stats.size,
+		mediaType,
+		data: data.toString("base64")
+	};
+	if (data.includes(0)) return {
+		kind: "binary",
+		size: stats.size
+	};
+	return {
+		kind: "text",
+		size: stats.size,
+		content: data.toString("utf8")
+	};
+}
+function linkProjectMedia(cwd, file) {
+	const full = resolveProjectFile(cwd, file);
+	const mediaType = mediaTypes.get(path.extname(full).toLowerCase());
+	if (mediaType === void 0) throw new Error(`${file} is not an image, video or audio file`);
+	for (const [token, link] of mediaLinks) if (link.expiresAt <= Date.now()) mediaLinks.delete(token);
+	const token = randomBytes(32).toString("base64url");
+	mediaLinks.set(token, {
+		file: full,
+		mediaType,
+		expiresAt: Date.now() + MEDIA_LINK_LIFETIME
+	});
+	return token;
+}
+function findMediaLink(token) {
+	if (token === null) return null;
+	const link = mediaLinks.get(token);
+	if (link === void 0 || link.expiresAt <= Date.now()) return null;
+	return link;
+}
+function saveUpload(name, data) {
+	const dir = path.join(home, "uploads", randomUUID());
+	mkdirSync(dir, { recursive: true });
+	const file = path.join(dir, path.basename(name));
+	writeFileSync(file, data);
+	return file;
+}
+async function taskOutput(sessionId, file) {
+	const tasks = path.dirname(file);
+	if (!/^[\w-]+$/.test(sessionId) || !path.isAbsolute(file) || path.normalize(file) !== file || !/^\w+\.output$/.test(path.basename(file)) || path.basename(tasks) !== "tasks" || path.basename(path.dirname(tasks)) !== sessionId) throw new Error("Not a background task output file of this thread");
+	let stats;
+	try {
+		stats = await lstat(file);
+	} catch (error) {
+		if (hasCode(error, "ENOENT")) return null;
+		throw error;
+	}
+	if (!stats.isFile()) throw new Error("Background task output is not a regular file");
+	const start = Math.max(0, stats.size - OUTPUT_LIMIT$1);
+	const handle = await open(file, "r");
+	try {
+		const buffer = Buffer.alloc(stats.size - start);
+		const read = await handle.read(buffer, 0, buffer.length, start);
+		return {
+			text: buffer.subarray(0, read.bytesRead).toString("utf8"),
+			truncated: start > 0
+		};
+	} finally {
+		await handle.close();
+	}
+}
+function resolveProjectFile(cwd, file) {
+	const root = realpathSync(cwd);
+	const resolved = path.resolve(root, file);
+	if (!existsSync(resolved)) throw new Error(`${file} does not exist`);
+	const full = realpathSync(resolved);
+	const relative = path.relative(root, full);
+	if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) throw new Error(`${file} is outside the project`);
+	return full;
+}
+//#endregion
 //#region src/services/git.ts
 const DIFF_LIMIT = 8e4;
 const UNTRACKED_LIMIT = 100;
@@ -4649,6 +4803,7 @@ async function isRepo(cwd) {
 }
 async function repoDiff(repo, prefix) {
 	const tracked = await git(repo, [
+		"--no-optional-locks",
 		"diff",
 		await diffBase(repo),
 		"--no-color",
@@ -4708,119 +4863,6 @@ function newFilePatch(cwd, file, prefix) {
 	return `${header}@@ -0,0 +1,${lines.length} @@\n${lines.map((line) => `+${line}\n`).join("")}`;
 }
 //#endregion
-//#region src/services/files.ts
-const FILE_LIMIT = 2e4;
-const OUTPUT_LIMIT$1 = 262144;
-const READ_LIMIT = 1048576;
-const images = /* @__PURE__ */ new Map([
-	[".png", "image/png"],
-	[".jpg", "image/jpeg"],
-	[".jpeg", "image/jpeg"],
-	[".gif", "image/gif"],
-	[".webp", "image/webp"],
-	[".svg", "image/svg+xml"]
-]);
-const skipped = /* @__PURE__ */ new Set([
-	"node_modules",
-	".git",
-	"dist",
-	"target",
-	".next"
-]);
-async function listFiles(cwd) {
-	try {
-		const { stdout } = await git(cwd, [
-			"ls-files",
-			"--cached",
-			"--others",
-			"--exclude-standard"
-		]);
-		return stdout.split("\n").filter(Boolean).slice(0, FILE_LIMIT);
-	} catch {
-		return walk(cwd);
-	}
-}
-function readProjectFile(cwd, file) {
-	const root = realpathSync(cwd);
-	const full = realpathSync(path.resolve(root, file));
-	const relative = path.relative(root, full);
-	if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) throw new Error(`${file} is outside the project`);
-	const stats = statSync(full);
-	if (!stats.isFile()) throw new Error(`${file} is not a file`);
-	if (stats.size > READ_LIMIT) return {
-		kind: "large",
-		size: stats.size,
-		limit: READ_LIMIT
-	};
-	const data = readFileSync(full);
-	const mediaType = images.get(path.extname(full).toLowerCase());
-	if (mediaType !== void 0) return {
-		kind: "image",
-		size: stats.size,
-		mediaType,
-		data: data.toString("base64")
-	};
-	if (data.includes(0)) return {
-		kind: "binary",
-		size: stats.size
-	};
-	return {
-		kind: "text",
-		size: stats.size,
-		content: data.toString("utf8")
-	};
-}
-function saveUpload(name, data) {
-	const dir = path.join(home, "uploads", randomUUID());
-	mkdirSync(dir, { recursive: true });
-	const file = path.join(dir, path.basename(name));
-	writeFileSync(file, data);
-	return file;
-}
-async function taskOutput(sessionId, file) {
-	const tasks = path.dirname(file);
-	if (!/^[\w-]+$/.test(sessionId) || !path.isAbsolute(file) || path.normalize(file) !== file || !/^\w+\.output$/.test(path.basename(file)) || path.basename(tasks) !== "tasks" || path.basename(path.dirname(tasks)) !== sessionId) throw new Error("Not a background task output file of this thread");
-	let stats;
-	try {
-		stats = await lstat(file);
-	} catch (error) {
-		if (hasCode(error, "ENOENT")) return null;
-		throw error;
-	}
-	if (!stats.isFile()) throw new Error("Background task output is not a regular file");
-	const start = Math.max(0, stats.size - OUTPUT_LIMIT$1);
-	const handle = await open(file, "r");
-	try {
-		const buffer = Buffer.alloc(stats.size - start);
-		const read = await handle.read(buffer, 0, buffer.length, start);
-		return {
-			text: buffer.subarray(0, read.bytesRead).toString("utf8"),
-			truncated: start > 0
-		};
-	} finally {
-		await handle.close();
-	}
-}
-function walk(root) {
-	const files = [];
-	const pending = [""];
-	while (pending.length > 0 && files.length < FILE_LIMIT) {
-		const dir = pending.pop() ?? "";
-		let entries;
-		try {
-			entries = readdirSync(path.join(root, dir), { withFileTypes: true });
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			const relative = dir === "" ? entry.name : `${dir}/${entry.name}`;
-			if (entry.isDirectory() && !skipped.has(entry.name)) pending.push(relative);
-			if (entry.isFile()) files.push(relative);
-		}
-	}
-	return files;
-}
-//#endregion
 //#region src/services/runs.ts
 const locks = /* @__PURE__ */ new Map();
 function stopAll() {
@@ -6034,6 +6076,7 @@ const handlers = {
 	capabilities: (params) => capabilities(params.provider, params.accountId, params.projectId === null ? os.homedir() : projectPath(params.projectId)),
 	"files.list": (params) => listFiles(projectPath(params.projectId)),
 	"files.read": (params) => readProjectFile(projectPath(params.projectId), params.path),
+	"files.media": (params) => linkProjectMedia(projectPath(params.projectId), params.path),
 	"files.upload": (params) => saveUpload(params.name, Buffer.from(params.data, "base64")),
 	"tasks.output": (params) => taskOutput(params.sessionId, params.path),
 	"git.status": (params) => gitRepos(projectPath(params.projectId)),
@@ -6212,6 +6255,10 @@ const code = args.auth && args.pair && !hasDevices() ? addCode(null) : null;
 const tickets = /* @__PURE__ */ new Map();
 const server = createServer((request, response) => {
 	const url = new URL(request.url ?? "/", "http://localhost");
+	if (url.pathname === "/api/media") {
+		serveMedia(url.searchParams.get("token"), request, response);
+		return;
+	}
 	if (url.pathname.startsWith("/api/")) {
 		answerApi(url.pathname, request, response);
 		return;
@@ -6308,6 +6355,64 @@ function answerApi(pathname, request, response) {
 	response.statusCode = 404;
 	response.end("not found");
 }
+function serveMedia(token, request, response) {
+	if (request.method !== "GET") {
+		response.statusCode = 405;
+		response.end("use GET");
+		return;
+	}
+	const link = findMediaLink(token);
+	if (link === null) {
+		response.statusCode = 404;
+		response.end("This media link expired");
+		return;
+	}
+	const stats = statSync(link.file, { throwIfNoEntry: false });
+	if (stats === void 0 || !stats.isFile()) {
+		response.statusCode = 404;
+		response.end("not found");
+		return;
+	}
+	response.setHeader("content-type", link.mediaType);
+	response.setHeader("accept-ranges", "bytes");
+	response.setHeader("cache-control", "private, max-age=3600");
+	response.setHeader("content-security-policy", "sandbox");
+	response.setHeader("x-content-type-options", "nosniff");
+	if (request.headers.range === void 0) {
+		response.setHeader("content-length", stats.size);
+		createReadStream(link.file).on("error", () => response.destroy()).pipe(response);
+		return;
+	}
+	const range = byteRange(request.headers.range, stats.size);
+	if (range === null) {
+		response.statusCode = 416;
+		response.setHeader("content-range", `bytes */${stats.size}`);
+		response.end();
+		return;
+	}
+	response.statusCode = 206;
+	response.setHeader("content-range", `bytes ${range.start}-${range.end}/${stats.size}`);
+	response.setHeader("content-length", range.end - range.start + 1);
+	createReadStream(link.file, range).on("error", () => response.destroy()).pipe(response);
+}
+function byteRange(header, size) {
+	const match = /^bytes=(?:(\d+)-(\d*)|-(\d+))$/.exec(header);
+	if (match === null) return null;
+	if (match[3] !== void 0) {
+		if (size === 0 || Number(match[3]) === 0) return null;
+		return {
+			start: Math.max(size - Number(match[3]), 0),
+			end: size - 1
+		};
+	}
+	const start = Number(match[1]);
+	const end = match[2] === "" ? size - 1 : Math.min(Number(match[2]), size - 1);
+	if (start > end) return null;
+	return {
+		start,
+		end
+	};
+}
 function answerJson(response, body) {
 	response.setHeader("content-type", "application/json");
 	response.end(JSON.stringify(body));