offsite 0.0.18 → 0.0.20

package/apps/server/dist/main.mjs

@@ -8,18 +8,19 @@ import os from "node:os";
 import { deleteSession, forkSession, getSessionMessages, getSubagentMessages, listSessions, query, renameSession } from "@anthropic-ai/claude-agent-sdk";
 import { execFile, spawn } from "node:child_process";
 import readline from "node:readline";
+import { lstat, mkdir, open, readFile, readdir, readlink, stat, writeFile } from "node:fs/promises";
 import { z } from "zod";
 import { Command } from "@commander-js/extra-typings";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { OpenCode } from "@opencode/client";
 import { ensure, headers } from "@opencode/client/service";
 import { and, eq, gt, inArray, lte, sql } from "drizzle-orm";
+import { pathToFileURL } from "node:url";
 import { sumBy } from "es-toolkit";
 import { DatabaseSync } from "node:sqlite";
 import { drizzle } from "drizzle-orm/node-sqlite";
 import { migrate } from "drizzle-orm/node-sqlite/migrator";
 import { integer, snakeCase, text } from "drizzle-orm/sqlite-core";
-import { lstat, open, readFile, readdir, readlink, stat } from "node:fs/promises";
 import webPush from "web-push";
 import { promisify } from "node:util";
 import { spawn as spawn$1 } from "@lydell/node-pty";
@@ -376,17 +377,17 @@ function toUserInput(prompt, uuid, priority) {
 		type: "user",
 		message: {
 			role: "user",
-			content: [...prompt.images.map((image) => ({
+			content: [...prompt.text === "" ? [] : [{
+				type: "text",
+				text: prompt.text
+			}], ...prompt.images.map((image) => ({
 				type: "image",
 				source: {
 					type: "base64",
 					media_type: image.mediaType,
 					data: image.data
 				}
-			})), ...prompt.text === "" ? [] : [{
-				type: "text",
-				text: prompt.text
-			}]]
+			}))]
 		},
 		parent_tool_use_id: null,
 		uuid,
@@ -398,13 +399,13 @@ function promptMessage(prompt, uuid) {
 		type: "user",
 		uuid,
 		time: Date.now(),
-		content: [...prompt.images.map((image) => ({
-			type: "image",
-			...image
-		})), ...prompt.text === "" ? [] : [{
+		content: [...prompt.text === "" ? [] : [{
 			type: "text",
 			text: prompt.text
-		}]],
+		}], ...prompt.images.map((image) => ({
+			type: "image",
+			...image
+		}))],
 		parent: null
 	};
 }
@@ -482,6 +483,23 @@ function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
+//#region src/lib/images.ts
+const extensions = {
+	"image/png": "png",
+	"image/jpeg": "jpg",
+	"image/gif": "gif",
+	"image/webp": "webp"
+};
+async function saveImage(sessionId, image) {
+	const extension = extensions[image.mediaType];
+	if (extension === void 0) throw new Error(`${image.mediaType} images are not supported`);
+	const directory = path.join(os.tmpdir(), "offsite", sessionId, "images");
+	await mkdir(directory, { recursive: true });
+	const file = path.join(directory, `${randomUUID()}.${extension}`);
+	await writeFile(file, Buffer.from(image.data, "base64"));
+	return file;
+}
+//#endregion
 //#region src/lib/codex/items.ts
 const statuses$1 = {
 	inProgress: "running",
@@ -631,13 +649,24 @@ function toItems$1(turnId, item, parent, time) {
 }
 function userText$1(input) {
 	switch (input.type) {
-		case "text": return [input.text];
+		case "text": return [input.text.replaceAll(/\[Image: source: [^\]]+\]/g, "")];
 		case "skill":
 		case "mention": return [`$${input.name}`];
 		case "image":
 		case "localImage": return [];
 	}
 }
+async function imageInputs(sessionId, images) {
+	const files = await Promise.all(images.map((image) => saveImage(sessionId, image)));
+	return [...images.map((image) => ({
+		type: "image",
+		url: `data:${image.mediaType};base64,${image.data}`
+	})), ...files.map((file) => ({
+		type: "text",
+		text: `[Image: source: ${file}]`,
+		text_elements: []
+	}))];
+}
 function userImages(input) {
 	if (input.type !== "image") return [];
 	const match = /^data:([^;,]+);base64,(.*)$/.exec(input.url);
@@ -1336,10 +1365,7 @@ var CodexRun = class CodexRun {
 				text,
 				text_elements: []
 			}],
-			...prompt.images.map((image) => ({
-				type: "image",
-				url: `data:${image.mediaType};base64,${image.data}`
-			}))
+			...await imageInputs(this.sessionId, prompt.images)
 		];
 	}
 	finishTurn() {
@@ -2075,7 +2101,7 @@ var OpenCodeRun = class OpenCodeRun {
 				await (await openCode()).session.prompt({
 					sessionID: this.sessionId,
 					text: prompt.text,
-					files: files(prompt),
+					files: await files(this.sessionId, prompt),
 					delivery: "steer"
 				});
 				return;
@@ -2245,7 +2271,7 @@ var OpenCodeRun = class OpenCodeRun {
 					sessionID,
 					name: match[1],
 					text: match[2],
-					files: files(prompt)
+					files: await files(sessionID, prompt)
 				});
 				return;
 			}
@@ -2254,7 +2280,7 @@ var OpenCodeRun = class OpenCodeRun {
 				await client.session.prompt({
 					sessionID,
 					text: match[2],
-					files: files(prompt),
+					files: await files(sessionID, prompt),
 					skills: [{ id: skill.id }]
 				});
 				return;
@@ -2263,7 +2289,7 @@ var OpenCodeRun = class OpenCodeRun {
 		await client.session.prompt({
 			sessionID,
 			text: prompt.text,
-			files: files(prompt)
+			files: await files(sessionID, prompt)
 		});
 	}
 	async apply() {
@@ -2374,8 +2400,8 @@ var OpenCodeRun = class OpenCodeRun {
 		});
 	}
 };
-function files(prompt) {
-	return prompt.images.map((image) => ({ uri: `data:${image.mediaType};base64,${image.data}` }));
+function files(sessionId, prompt) {
+	return Promise.all(prompt.images.map(async (image) => ({ uri: pathToFileURL(await saveImage(sessionId, image)).href })));
 }
 //#endregion
 //#region src/storage/db.ts
@@ -2684,7 +2710,7 @@ async function find(provider, paths) {
 				return [{
 					id: thread.id,
 					provider: "codex",
-					title: thread.name ?? thread.preview,
+					title: thread.name ?? thread.preview.replaceAll(/\[Image: source: [^\]]+\]/g, ""),
 					projectId,
 					branch: thread.gitInfo?.branch ?? null,
 					updatedAt: thread.updatedAt * 1e3
@@ -4550,6 +4576,7 @@ const DIFF_LIMIT = 8e4;
 const UNTRACKED_LIMIT = 100;
 const NEW_FILE_LIMIT = 262144;
 const REPO_DEPTH = 3;
+const FETCH_TIMEOUT = 6e4;
 const run$1 = promisify(execFile);
 const PULL_REQUEST_INSTRUCTIONS = `You write GitHub pull requests as Markdown.
 
@@ -4612,9 +4639,44 @@ async function push$1(cwd) {
 		]);
 		else await git(cwd, ["push"]);
 	} catch (error) {
-		throw new Error((error instanceof Error ? error.message : String(error)).split("\n").filter((line) => line.trim() !== "" && !line.startsWith("hint:") && !line.startsWith("Command failed:")).join("\n"), { cause: error });
+		throw gitError(error);
 	}
 }
+async function sync(cwd) {
+	if ((await gitStatus(cwd)).upstream === null) {
+		await push$1(cwd);
+		return;
+	}
+	try {
+		await git(cwd, ["fetch"]);
+		const status = await gitStatus(cwd);
+		if (status.behind > 0 && status.ahead === 0) await git(cwd, [
+			"merge",
+			"--ff-only",
+			"@{upstream}"
+		]);
+		if (status.behind > 0 && status.ahead > 0) await rebaseOnUpstream(cwd);
+	} catch (error) {
+		throw gitError(error);
+	}
+	if ((await gitStatus(cwd)).ahead > 0) await push$1(cwd);
+}
+async function fetchProject(cwd) {
+	await Promise.all((await projectRepos(cwd)).map(async (repo) => {
+		try {
+			await run$1("git", ["fetch"], {
+				cwd: path.join(cwd, repo),
+				env: {
+					...process.env,
+					GIT_TERMINAL_PROMPT: "0"
+				},
+				timeout: FETCH_TIMEOUT
+			});
+		} catch (error) {
+			throw gitError(error);
+		}
+	}));
+}
 async function localBranches(cwd) {
 	return (await git(cwd, [
 		"branch",
@@ -4770,6 +4832,7 @@ async function projectRepos(cwd) {
 }
 async function gitStatus(cwd) {
 	const output = await git(cwd, [
+		"--no-optional-locks",
 		"status",
 		"--porcelain=v2",
 		"--branch"
@@ -4777,6 +4840,7 @@ async function gitStatus(cwd) {
 	const status = {
 		branch: null,
 		upstream: null,
+		remote: (await git(cwd, ["remote"])).stdout.trim() !== "",
 		ahead: 0,
 		behind: 0,
 		changed: 0
@@ -4793,6 +4857,25 @@ async function gitStatus(cwd) {
 	}
 	return status;
 }
+async function rebaseOnUpstream(cwd) {
+	try {
+		await git(cwd, ["rebase", "@{upstream}"]);
+	} catch (error) {
+		const rebasing = await git(cwd, [
+			"rev-parse",
+			"--git-path",
+			"rebase-merge"
+		]);
+		if (existsSync(path.resolve(cwd, rebasing.stdout.trim()))) {
+			await git(cwd, ["rebase", "--abort"]);
+			throw new Error("Your commits conflict with the remote branch, so nothing was pulled or pushed. Resolve it in a terminal.", { cause: error });
+		}
+		throw error;
+	}
+}
+function gitError(error) {
+	return new Error((error instanceof Error ? error.message : String(error)).split("\n").filter((line) => line.trim() !== "" && !line.startsWith("hint:") && !line.startsWith("Command failed:")).join("\n"), { cause: error });
+}
 async function isRepo(cwd) {
 	try {
 		await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
@@ -4854,8 +4937,10 @@ function newFilePatch(cwd, file, prefix) {
 	const name = `${prefix}${file}`;
 	const header = `diff --git a/${name} b/${name}\nnew file\n--- /dev/null\n+++ b/${name}\n`;
 	const full = path.join(cwd, file);
-	if (lstatSync(full).isSymbolicLink()) return `${header}@@ -0,0 +1 @@\n+${readlinkSync(full)}\n`;
-	if (statSync(full).size > NEW_FILE_LIMIT) return `${header}Binary or large file\n`;
+	const stats = lstatSync(full);
+	if (stats.isSymbolicLink()) return `${header}@@ -0,0 +1 @@\n+${readlinkSync(full)}\n`;
+	if (stats.isDirectory()) return `${header}Nested repository\n`;
+	if (stats.size > NEW_FILE_LIMIT) return `${header}Binary or large file\n`;
 	const content = readFileSync(full, "utf8");
 	if (content.includes("\0")) return `${header}Binary or large file\n`;
 	const lines = content.split("\n");
@@ -6086,6 +6171,14 @@ const handlers = {
 		await push$1(path.join(projectPath(params.projectId), params.repo));
 		return null;
 	},
+	"git.sync": async (params) => {
+		await sync(path.join(projectPath(params.projectId), params.repo));
+		return null;
+	},
+	"git.fetch": async (params) => {
+		await fetchProject(projectPath(params.projectId));
+		return null;
+	},
 	"git.branches": (params) => pullRequestBranches(path.join(projectPath(params.projectId), params.repo)),
 	"git.localBranches": (params) => localBranches(path.join(projectPath(params.projectId), params.repo)),
 	"git.switch": async (params) => {