offsite 0.0.63 → 0.0.64

package/apps/server/dist/main.mjs

@@ -301,6 +301,7 @@ function findCodex() {
 var AppServer = class {
 	home;
 	threads = /* @__PURE__ */ new Map();
+	agents = /* @__PURE__ */ new Map();
 	child;
 	waiting = /* @__PURE__ */ new Map();
 	ready;
@@ -417,9 +418,16 @@ var AppServer = class {
 		}
 		const params = message.params ?? {};
 		const listener = typeof params.threadId === "string" ? this.threads.get(params.threadId) : void 0;
+		const root = this.rootOf(params.threadId);
+		const owner = root === void 0 ? void 0 : this.threads.get(root);
+		if (root !== void 0) this.linkAgents(root, params.item);
 		if (message.id !== void 0) {
-			if (listener === void 0) this.replyError(message.id, `offsite does not handle ${message.method}`);
-			else listener.request(message.id, message.method, params);
+			if (owner === void 0) this.replyError(message.id, `offsite does not handle ${message.method}`);
+			else owner.request(message.id, message.method, params);
+			return;
+		}
+		if (message.method === "serverRequest/resolved") {
+			owner?.notify(message.method, params);
 			return;
 		}
 		if (message.method === "account/rateLimits/updated") {
@@ -428,6 +436,14 @@ var AppServer = class {
 		}
 		listener?.notify(message.method, params);
 	}
+	rootOf(threadId) {
+		if (typeof threadId !== "string") return;
+		return this.threads.has(threadId) ? threadId : this.agents.get(threadId);
+	}
+	linkAgents(root, item) {
+		if (item?.type === "subAgentActivity") this.agents.set(item.agentThreadId, root);
+		if (item?.type === "collabAgentToolCall") for (const agent of item.receiverThreadIds) this.agents.set(agent, root);
+	}
 	armIdleTimer() {
 		clearTimeout(this.idleTimer);
 		this.idleTimer = setTimeout(() => {
@@ -1748,7 +1764,13 @@ function fold(text) {
 		return folded.length === 1 ? folded : character;
 	}).toLowerCase();
 }
+function exactPhrase(query) {
+	const phrase = /^"([^"]+)"$/.exec(query.trim())?.[1].trim();
+	return phrase === void 0 || phrase === "" ? null : phrase;
+}
 function searchWords(query) {
+	const phrase = exactPhrase(query);
+	if (phrase !== null) return [fold(phrase)];
 	return fold(query).replace(/^["'`]+|["'`]+$/g, "").split(/\s+/).filter(Boolean);
 }
 function hasSearchableWord(query) {
@@ -1763,6 +1785,28 @@ function isWordStart(text, index) {
 function isWordEnd(text, end) {
 	return end >= text.length || !alphanumeric.test(text[end]) || isWordStart(text, end);
 }
+function mergeRanges(ranges) {
+	const merged = [];
+	for (const range of [...ranges].sort((a, b) => a.start - b.start)) {
+		const last = merged.at(-1);
+		if (last !== void 0 && range.start <= last.end) last.end = Math.max(last.end, range.end);
+		else merged.push({ ...range });
+	}
+	return merged;
+}
+function exactRanges(folded, phrase) {
+	const ranges = [];
+	for (let index = folded.indexOf(phrase); index !== -1; index = folded.indexOf(phrase, index + 1)) {
+		const end = index + phrase.length;
+		const joinedBefore = alphanumeric.test(phrase[0]) && alphanumeric.test(folded[index - 1] ?? "");
+		const joinedAfter = alphanumeric.test(phrase[phrase.length - 1]) && alphanumeric.test(folded[end] ?? "");
+		if (!joinedBefore && !joinedAfter) ranges.push({
+			start: index,
+			end
+		});
+	}
+	return mergeRanges(ranges);
+}
 function findWord(text, folded, word) {
 	let quality = 0;
 	let at = -1;
@@ -1782,6 +1826,13 @@ function matchMessage(query, text) {
 	const words = searchWords(query);
 	if (words.length === 0) return null;
 	const folded = fold(text);
+	if (exactPhrase(query) !== null) {
+		const range = exactRanges(folded, words[0]).at(0);
+		return range === void 0 ? null : {
+			quality: 1,
+			offset: range.start
+		};
+	}
 	let quality = 1;
 	let offset = text.length;
 	for (const word of words) {
@@ -2223,7 +2274,10 @@ async function openCodeSessions(paths) {
 				directory,
 				parentID: null,
 				limit: PAGE
-			} : { cursor });
+			} : {
+				limit: PAGE,
+				cursor
+			});
 			found.push(...page.data);
 			cursor = page.data.length === PAGE ? page.cursor.next ?? null : null;
 		} while (cursor !== null);
@@ -2360,6 +2414,7 @@ async function allMessages(client, sessionId) {
 			order: "asc"
 		} : {
 			sessionID: sessionId,
+			limit: PAGE,
 			cursor
 		});
 		messages.push(...page.data);
@@ -2903,10 +2958,12 @@ function readProjectFile(cwd, file) {
 		content: data.toString("utf8")
 	};
 }
-function writeProjectFile(cwd, file, content) {
+function writeProjectFile(cwd, file, content, base) {
 	const full = resolveProjectFile(cwd, file);
 	if (!statSync(full).isFile()) throw new Error(`${file} is not a file`);
+	if (base !== null && readFileSync(full, "utf8") !== base) return false;
 	writeFileSync(full, content);
+	return true;
 }
 function createProjectEntry(cwd, file, folder) {
 	const full = resolveNewProjectPath(cwd, file);
@@ -3172,7 +3229,12 @@ async function gitRepos(cwd) {
 }
 async function commit(cwd, message, andPush) {
 	const text = message.trim() === "" ? await commitMessage(cwd, false) : message;
-	await git(cwd, ["add", "--all"]);
+	await git(cwd, [
+		"add",
+		"--all",
+		"--",
+		"."
+	]);
 	await git(cwd, [
 		"commit",
 		"--message",
@@ -3371,7 +3433,9 @@ async function gitStatus(cwd) {
 		"--no-optional-locks",
 		"status",
 		"--porcelain=v2",
-		"--branch"
+		"--branch",
+		"--",
+		"."
 	]);
 	const status = {
 		branch: null,
@@ -3427,14 +3491,16 @@ async function repoDiff(repo, prefix) {
 		await diffBase(repo),
 		"--no-color",
 		"--no-ext-diff",
+		"--relative",
 		`--src-prefix=a/${prefix}`,
 		`--dst-prefix=b/${prefix}`
 	]);
 	const added = (await git(repo, [
 		"ls-files",
 		"--others",
-		"--exclude-standard"
-	])).stdout.split("\n").filter(Boolean).slice(0, UNTRACKED_LIMIT).map((file) => newFilePatch(repo, file, prefix));
+		"--exclude-standard",
+		"-z"
+	])).stdout.split("\0").filter(Boolean).slice(0, UNTRACKED_LIMIT).map((file) => newFilePatch(repo, file, prefix));
 	return [tracked.stdout, ...added].join("");
 }
 async function diffBase(repo) {
@@ -5852,7 +5918,8 @@ async function claudeMessages(sessionId, dir) {
 	});
 }
 async function claudeCandidates(query) {
-	const words = searchWords(query).filter((word) => word.length >= 3 && !/["\\]/.test(word));
+	const phrase = exactPhrase(query);
+	const words = phrase !== null ? [JSON.stringify(phrase).slice(1, -1)] : searchWords(query).filter((word) => word.length >= 3 && !/["\\]/.test(word));
 	if (words.length === 0) return null;
 	try {
 		const lists = await Promise.all(words.map((word) => sessionsWith(word)));
@@ -5885,7 +5952,7 @@ async function sessionsWith(word) {
 	})).stdout.split("\n").filter(Boolean).map((file) => path.basename(file, ".jsonl"));
 }
 async function searchCodex(query, sessions) {
-	const longest = [...searchWords(query)].sort((a, b) => b.length - a.length)[0];
+	const longest = exactPhrase(query) ?? [...searchWords(query)].sort((a, b) => b.length - a.length)[0];
 	const known = new Map(sessions.map((session) => [session.id, session]));
 	const found = (await codexSearch(longest)).filter((result) => known.has(result.thread.id)).sort((a, b) => b.thread.updatedAt - a.thread.updatedAt);
 	const verified = await readAndMatch(query, found.slice(0, CODEX_READ_LIMIT).map((result) => ({ id: result.thread.id })), codexMessages);
@@ -6155,7 +6222,7 @@ async function showFile(cwd, ref, file) {
 	const output = await git(cwd, [
 		"cat-file",
 		"blob",
-		`${ref}:${file}`
+		`${ref}:./${file}`
 	]);
 	if (output.stdout.length > SHOW_LIMIT || output.stdout.includes("\0")) return null;
 	return output.stdout;
@@ -6188,6 +6255,7 @@ async function commitFiles(cwd, hash, parent) {
 		"--name-status",
 		"-M",
 		"-z",
+		"--relative",
 		parent ?? (await git(cwd, [
 			"hash-object",
 			"-t",
@@ -6271,7 +6339,7 @@ async function runAction(cwd, action) {
 		await git(cwd, [
 			"update-index",
 			"--cacheinfo",
-			`${entry.stdout.split(" ")[0]},${hash},${action.path}`
+			`${entry.stdout.split(" ")[0]},${hash},${await repoPrefix(cwd)}${action.path}`
 		]);
 		return;
 	}
@@ -6311,7 +6379,12 @@ async function runAction(cwd, action) {
 		return;
 	}
 	if (action.kind === "commit") {
-		if (action.all) await git(cwd, ["add", "--all"]);
+		if (action.all) await git(cwd, [
+			"add",
+			"--all",
+			"--",
+			"."
+		]);
 		await git(cwd, [
 			"commit",
 			...action.amend ? ["--amend"] : [],
@@ -6365,6 +6438,9 @@ async function network(cwd, args) {
 		throw gitError(error);
 	}
 }
+async function repoPrefix(cwd) {
+	return (await git(cwd, ["rev-parse", "--show-prefix"])).stdout.trim();
+}
 async function repoChanges(cwd) {
 	const output = await git(cwd, [
 		"--no-optional-locks",
@@ -6372,8 +6448,11 @@ async function repoChanges(cwd) {
 		"--porcelain=v2",
 		"--branch",
 		"--untracked-files=all",
-		"-z"
+		"-z",
+		"--",
+		"."
 	]);
+	const prefix = await repoPrefix(cwd);
 	const repo = {
 		head: null,
 		branch: null,
@@ -6396,19 +6475,19 @@ async function repoChanges(cwd) {
 			repo.behind = -Number(fields[3]);
 		}
 		if (fields[0] === "?") repo.changes.push({
-			path: tokens[index].slice(2),
+			path: tokens[index].slice(2 + prefix.length),
 			from: null,
 			status: "U"
 		});
 		if (fields[0] === "u") repo.merge.push({
-			path: fields.slice(10).join(" "),
+			path: fields.slice(10).join(" ").slice(prefix.length),
 			from: null,
 			status: "!"
 		});
 		if (fields[0] === "1" || fields[0] === "2") {
 			const renamed = fields[0] === "2";
-			const file = fields.slice(renamed ? 9 : 8).join(" ");
-			const from = renamed ? tokens[index + 1] : null;
+			const file = fields.slice(renamed ? 9 : 8).join(" ").slice(prefix.length);
+			const from = renamed ? tokens[index + 1].slice(prefix.length) : null;
 			if (fields[1][0] !== ".") repo.staged.push({
 				path: file,
 				from,
@@ -7518,10 +7597,7 @@ const handlers = {
 	"files.list": (params) => listFiles(projectPath(params.projectId)),
 	"files.entries": (params) => listEntries(projectPath(params.projectId)),
 	"files.read": (params) => readProjectFile(projectPath(params.projectId), params.path),
-	"files.write": (params) => {
-		writeProjectFile(projectPath(params.projectId), params.path, params.content);
-		return null;
-	},
+	"files.write": (params) => writeProjectFile(projectPath(params.projectId), params.path, params.content, params.base),
 	"files.create": (params) => {
 		createProjectEntry(projectPath(params.projectId), params.path, params.folder);
 		return null;
@@ -8626,6 +8702,11 @@ async function forward(site, target, request, response) {
 	const kind = rewriteKind(incoming, request);
 	response.statusCode = status;
 	copyHeaders(incoming, response, kind !== null);
+	if (kind === "html") {
+		response.removeHeader("last-modified");
+		response.removeHeader("expires");
+		response.setHeader("cache-control", "no-store, no-transform");
+	}
 	const location = incoming.headers.location;
 	if (location !== void 0) {
 		const next = URL.parse(location, target);