offsite 0.0.65 → 0.0.66

package/apps/server/dist/main.mjs

@@ -763,7 +763,7 @@ function toItems$1(turnId, item, parent, time) {
 		case "userMessage": return [{
 			...base,
 			kind: "user",
-			text: item.content.flatMap(userText$1).join("\n").trim(),
+			text: item.content.flatMap(userText$2).join("\n").trim(),
 			images: item.content.flatMap(userImages),
 			format: "text"
 		}];
@@ -861,7 +861,8 @@ function toItems$1(turnId, item, parent, time) {
 		}];
 		case "contextCompaction": return [{
 			...base,
-			kind: "compaction"
+			kind: "compaction",
+			summary: null
 		}];
 		case "hookPrompt":
 		case "functionCallOutput":
@@ -872,7 +873,7 @@ function toItems$1(turnId, item, parent, time) {
 		case "exitedReviewMode": return [];
 	}
 }
-function userText$1(input) {
+function userText$2(input) {
 	switch (input.type) {
 		case "text": return [input.text.replaceAll(/\[Image: source: [^\]]+\]/g, "")];
 		case "skill":
@@ -1948,7 +1949,8 @@ function messageItems(message, parent) {
 				case "running": return [];
 				case "completed": return [{
 					...base,
-					kind: "compaction"
+					kind: "compaction",
+					summary: null
 				}];
 				case "failed": return [{
 					...errorItem(message.id, message.error.message),
@@ -4820,7 +4822,8 @@ function toItems(messages) {
 			items.push({
 				...base,
 				id: message.uuid,
-				kind: "compaction"
+				kind: "compaction",
+				summary: message.summary
 			});
 			continue;
 		}
@@ -4927,7 +4930,7 @@ function toItems(messages) {
 				});
 				continue;
 			}
-			texts.push(userText(block.text));
+			texts.push(userText$1(block.text));
 		}
 		if (texts.length === 0 && images.length === 0) continue;
 		items.push({
@@ -5178,7 +5181,7 @@ function applyResult(item, result) {
 		default: return item;
 	}
 }
-function userText(value) {
+function userText$1(value) {
 	const command = /<command-name>(.*?)<\/command-name>/s.exec(value);
 	if (command !== null) {
 		const args = /<command-args>(.*?)<\/command-args>/s.exec(value);
@@ -5286,12 +5289,19 @@ function parseLine(line) {
 function mainMessages(disk, entries) {
 	const times = messageTimes(entries);
 	const outputs = toolOutputs(entries);
+	const summaries = new Set(entries.flatMap((entry) => entry.isCompactSummary === true && typeof entry.uuid === "string" ? [entry.uuid] : []));
 	return disk.flatMap((item) => {
 		if (item.type === "system" || item.parent_tool_use_id !== null) return [];
 		const message = toMessage(item.type, {
 			...item,
 			tool_use_result: outputs.get(item.uuid)
 		}, times.get(item.uuid) ?? null);
+		if (summaries.has(item.uuid)) return [{
+			type: "compaction",
+			uuid: item.uuid,
+			time: message.time,
+			summary: message.content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n").replace(/<system-reminder>[\s\S]*?<\/system-reminder>\s*/g, "")
+		}];
 		return [{
 			...message,
 			content: message.content.map((block) => block.type === "image" ? {
@@ -5349,11 +5359,7 @@ async function earlier(sessionId, before) {
 	const index = session.pages.findIndex((page) => page.before === before);
 	if (index < 0) throw new Error(`no messages before entry ${before}`);
 	return {
-		items: toItems([...mainMessages(session.pages[index].disk, session.entries), {
-			type: "compaction",
-			uuid: `compacted:${before}`,
-			time: null
-		}]),
+		items: toItems(mainMessages(session.pages[index].disk, session.entries)),
 		before: session.pages[index + 1]?.before ?? null
 	};
 }
@@ -5637,7 +5643,8 @@ var Run = class {
 					this.add({
 						type: "compaction",
 						uuid: message.uuid,
-						time: Date.now()
+						time: Date.now(),
+						summary: null
 					});
 					return;
 				}
@@ -5851,141 +5858,6 @@ async function isLocalHost(hostname) {
 	if (isIP(hostname) !== 0) return isPrivate(hostname);
 	return (await dns.promises.lookup(hostname, { all: true })).some((item) => isPrivate(item.address));
 }
-// src/services/message-search.ts
-const READ_LIMIT = 30;
-const CODEX_READ_LIMIT = 10;
-const RG_TIME_LIMIT = 5e3;
-const generatedText = /^(?:This session is being continued from a previous conversation|<command-|<local-command-|<bash-|<task-notification|<cross-session-message|Another Claude session sent a message:|\[Request interrupted by user)/;
-const run$2 = promisify(execFile);
-async function searchMessages(query) {
-	if (!hasSearchableWord(query)) return {
-		matches: [],
-		failed: []
-	};
-	const paths = new Map(projects().map((project) => [project.path, project.id]));
-	const folders = new Map(projects().map((project) => [project.id, project.path]));
-	const results = await Promise.all([
-		"claude",
-		"codex",
-		"opencode"
-	].filter((provider) => readConfig().enabledProviders[provider]).map(async (provider) => {
-		try {
-			return {
-				provider,
-				matches: await timeLimit(search(provider, query, paths, folders), `${providerName(provider)} did not search in time`),
-				failed: false
-			};
-		} catch (error) {
-			console.warn(`could not search ${providerName(provider)} messages: ${error}`);
-			return {
-				provider,
-				matches: [],
-				failed: true
-			};
-		}
-	}));
-	return {
-		matches: results.flatMap((result) => result.matches),
-		failed: results.filter((result) => result.failed).map((result) => result.provider)
-	};
-}
-async function search(provider, query, paths, folders) {
-	const found = await find(provider, paths);
-	if (found === null) return [];
-	const sessions = newestFirst(found);
-	switch (provider) {
-		case "claude": return searchClaude(query, sessions, folders);
-		case "codex": return searchCodex(query, sessions);
-		case "opencode": return readAndMatch(query, sessions.slice(0, READ_LIMIT), openCodeMessages);
-	}
-}
-function newestFirst(sessions) {
-	return [...sessions].sort((a, b) => b.updatedAt - a.updatedAt);
-}
-async function searchClaude(query, sessions, folders) {
-	const candidates = await claudeCandidates(query);
-	const matching = candidates === null ? sessions : sessions.filter((session) => candidates.has(session.id));
-	const projectOf = new Map(sessions.map((session) => [session.id, session.projectId]));
-	return readAndMatch(query, matching.slice(0, READ_LIMIT), (sessionId) => claudeMessages(sessionId, folders.get(projectOf.get(sessionId) ?? "")));
-}
-async function claudeMessages(sessionId, dir) {
-	return (await getSessionMessages(sessionId, { dir })).flatMap((item) => {
-		if (item.type === "system" || item.parent_tool_use_id !== null) return [];
-		const text = toMessage(item.type, item, null).content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n");
-		return generatedText.test(text) ? [] : [{
-			author: item.type,
-			text
-		}];
-	});
-}
-async function claudeCandidates(query) {
-	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)));
-		return new Set(lists[0].filter((id) => lists.every((list) => list.includes(id))));
-	} catch (error) {
-		console.warn(`could not narrow Claude sessions with rg: ${error}`);
-		return null;
-	}
-}
-async function sessionsWith(word) {
-	return (await run$2("rg", [
-		"--files-with-matches",
-		"--fixed-strings",
-		"--ignore-case",
-		"--no-ignore",
-		"--hidden",
-		"--max-depth",
-		"2",
-		"--glob",
-		"*.jsonl",
-		"--",
-		word,
-		path.join(claudeBaseDir(), "projects")
-	], {
-		maxBuffer: 16777216,
-		timeout: RG_TIME_LIMIT
-	}).catch((error) => {
-		if (error.code === 1) return { stdout: "" };
-		throw error;
-	})).stdout.split("\n").filter(Boolean).map((file) => path.basename(file, ".jsonl"));
-}
-async function searchCodex(query, sessions) {
-	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);
-	const unverified = found.slice(CODEX_READ_LIMIT).flatMap((result) => {
-		const match = matchMessage(query, result.snippet);
-		return match === null ? [] : [{
-			sessionId: result.thread.id,
-			author: "assistant",
-			quality: match.quality,
-			snippet: messageSnippet(result.snippet, match.offset)
-		}];
-	});
-	return [...verified, ...unverified];
-}
-async function readAndMatch(query, sessions, read) {
-	return (await Promise.all(sessions.map(async (session) => bestMatch(query, session.id, await read(session.id))))).filter((match) => match !== null);
-}
-function bestMatch(query, sessionId, messages) {
-	let best = null;
-	for (const message of messages) {
-		const match = matchMessage(query, message.text);
-		if (match === null) continue;
-		const candidate = {
-			sessionId,
-			author: message.author,
-			quality: match.quality,
-			snippet: messageSnippet(message.text, match.offset)
-		};
-		if (best === null || compareMessages(candidate, best) < 0) best = candidate;
-	}
-	return best;
-}
 // src/services/runs.ts
 const locks = /* @__PURE__ */ new Map();
 function stopAll() {
@@ -6113,7 +5985,7 @@ async function runFor(sessionId, cwd, settings) {
 			sessionId,
 			cwd,
 			resume: true,
-			resumeAt: null,
+			resumeAt: run?.provider === "claude" && run.messages.length === 0 ? run.resumeAt : null,
 			settings
 		});
 		case "codex": return CodexRun.resume(sessionId, cwd, settings);
@@ -6138,6 +6010,257 @@ async function changedElsewhere(run, cwd) {
 	const last = (await getSessionMessages(run.sessionId, { dir: cwd })).at(-1)?.uuid;
 	return last !== void 0 && !run.messages.some((item) => item.uuid === last);
 }
+// src/services/export.ts
+async function exportSession(sessionId, projectId) {
+	const [session, event] = await Promise.all([findSession(sessionId), sessionHistory(sessionId, projectPath(projectId))]);
+	if (session === null) throw new Error(`session ${sessionId} not found`);
+	if (event.type !== "history") throw new Error(`unexpected ${event.type} event for ${sessionId}`);
+	let items = event.items;
+	let before = event.before;
+	while (before !== null) {
+		const page = await earlier(sessionId, before);
+		items = [...page.items, ...items];
+		before = page.before;
+	}
+	return {
+		messages: markdown(session, items, 0),
+		steps: markdown(session, items, 1),
+		details: markdown(session, items, 2),
+		full: markdown(session, items, 3)
+	};
+}
+function markdown(session, items, level) {
+	const sections = [];
+	let assistant = [];
+	for (const item of items) {
+		if (item.parent !== null) continue;
+		if (item.kind === "user") {
+			if (assistant.length > 0) {
+				sections.push(`## Assistant\n\n${assistant.join("\n\n")}`);
+				assistant = [];
+			}
+			sections.push(`## User\n\n${userText(item)}`);
+			continue;
+		}
+		const text = itemText(item, level);
+		if (text !== null) assistant.push(text);
+	}
+	if (assistant.length > 0) sections.push(`## Assistant\n\n${assistant.join("\n\n")}`);
+	return `${[[
+		`# ${session.title}`,
+		"",
+		`**Session ID:** ${session.id}`,
+		`**Provider:** ${providerName(session.provider)}`,
+		...session.branch === null ? [] : [`**Branch:** ${session.branch}`],
+		`**Updated:** ${new Date(session.updatedAt).toLocaleString()}`
+	].join("\n"), ...sections].join("\n\n---\n\n")}\n`;
+}
+function userText(item) {
+	const images = item.images.length === 0 ? "" : `\n\n_[${item.images.length} image${item.images.length === 1 ? "" : "s"} attached]_`;
+	switch (item.format) {
+		case "text": return `${item.text}${images}`;
+		case "command":
+		case "output": return `${fenced("", item.text)}${images}`;
+	}
+}
+function itemText(item, level) {
+	switch (item.kind) {
+		case "assistant": return item.text;
+		case "plan": return `**Plan:**\n\n${item.plan}`;
+		case "question": return item.questions.map((question) => `**Question:** ${question.question}\n\n**Answer:** ${item.answers?.[question.question] ?? "_No answer_"}`).join("\n\n");
+		case "error": return `**Error:** ${item.text}`;
+		case "reasoning": return level < 2 ? null : `_Thinking:_\n\n${item.text}`;
+		case "command":
+			if (level < 1) return null;
+			if (level < 2) return `**Shell:** ${item.description === "" ? `\`${item.command.split("\n")[0]}\`` : item.description}${statusText(item.status)}`;
+			return `**Shell**${item.description === "" ? "" : `: ${item.description}`}${statusText(item.status)}\n\n${fenced("sh", `$ ${item.command}${level < 3 || item.output === "" ? "" : `\n${item.output}`}`)}`;
+		case "file_change": {
+			if (level < 1) return null;
+			const title = `**Edit:** \`${item.path}\`${statusText(item.status)}`;
+			if (level < 2) return title;
+			return `${title}\n\n${fenced("diff", item.diffs.map((diff) => [...lines(diff.before).map((line) => `-${line}`), ...lines(diff.after).map((line) => `+${line}`)].join("\n")).join("\n"))}${level < 3 || item.output === "" ? "" : `\n\n${fenced("", item.output)}`}`;
+		}
+		case "web_search": {
+			if (level < 1) return null;
+			const title = `**Web search:** ${item.query ?? item.url ?? ""}${statusText(item.status)}`;
+			if (level < 2) return title;
+			return [title, ...item.results.map((result) => `- [${result.title}](${result.url})`)].join("\n");
+		}
+		case "skill": {
+			if (level < 1) return null;
+			const title = `**Skill:** ${item.skill}${statusText(item.status)}`;
+			return level < 3 || item.output === "" ? title : `${title}\n\n${fenced("", item.output)}`;
+		}
+		case "tool": {
+			if (level < 1) return null;
+			const title = `**Tool:** ${item.name}${statusText(item.status)}`;
+			if (level < 2) return title;
+			return `${title}\n\n**Input:**\n\n${fenced("json", JSON.stringify(item.input, null, 2))}${level < 3 || item.output === "" ? "" : `\n\n**Output:**\n\n${fenced("", item.output)}`}`;
+		}
+		case "subagent": return level < 1 ? null : `**Subagent (${item.agent}):** ${item.description}${statusText(item.status)}`;
+		case "agent_message": return level < 1 ? null : `**Message${item.target === null ? "" : ` to ${item.target}`}:** ${item.summary}${statusText(item.status)}`;
+		case "notice": return level < 1 ? null : `_${item.text}_`;
+		case "compaction":
+			if (level < 1) return null;
+			return level < 2 || item.summary === null ? "_Conversation compacted_" : `_Conversation compacted_\n\n${item.summary}`;
+		case "todo_list": return level < 2 ? null : [
+			"**Todos:**",
+			"",
+			...item.steps.map((step) => `- [${step.status === "completed" ? "x" : " "}] ${step.text}`)
+		].join("\n");
+	}
+}
+function statusText(status) {
+	switch (status) {
+		case "completed": return "";
+		case "running": return " _(running)_";
+		case "failed": return " _(failed)_";
+		case "stopped": return " _(stopped)_";
+	}
+}
+function lines(text) {
+	return text === "" ? [] : text.split("\n");
+}
+function fenced(language, text) {
+	const longest = Math.max(0, ...(text.match(/`+/g) ?? []).map((run) => run.length));
+	const fence = "`".repeat(Math.max(3, longest + 1));
+	return `${fence}${language}\n${text}\n${fence}`;
+}
+// src/services/message-search.ts
+const READ_LIMIT = 30;
+const CODEX_READ_LIMIT = 10;
+const RG_TIME_LIMIT = 5e3;
+const generatedText = /^(?:This session is being continued from a previous conversation|<command-|<local-command-|<bash-|<task-notification|<cross-session-message|Another Claude session sent a message:|\[Request interrupted by user)/;
+const run$2 = promisify(execFile);
+async function searchMessages(query) {
+	if (!hasSearchableWord(query)) return {
+		matches: [],
+		failed: []
+	};
+	const paths = new Map(projects().map((project) => [project.path, project.id]));
+	const folders = new Map(projects().map((project) => [project.id, project.path]));
+	const results = await Promise.all([
+		"claude",
+		"codex",
+		"opencode"
+	].filter((provider) => readConfig().enabledProviders[provider]).map(async (provider) => {
+		try {
+			return {
+				provider,
+				matches: await timeLimit(search(provider, query, paths, folders), `${providerName(provider)} did not search in time`),
+				failed: false
+			};
+		} catch (error) {
+			console.warn(`could not search ${providerName(provider)} messages: ${error}`);
+			return {
+				provider,
+				matches: [],
+				failed: true
+			};
+		}
+	}));
+	return {
+		matches: results.flatMap((result) => result.matches),
+		failed: results.filter((result) => result.failed).map((result) => result.provider)
+	};
+}
+async function search(provider, query, paths, folders) {
+	const found = await find(provider, paths);
+	if (found === null) return [];
+	const sessions = newestFirst(found);
+	switch (provider) {
+		case "claude": return searchClaude(query, sessions, folders);
+		case "codex": return searchCodex(query, sessions);
+		case "opencode": return readAndMatch(query, sessions.slice(0, READ_LIMIT), openCodeMessages);
+	}
+}
+function newestFirst(sessions) {
+	return [...sessions].sort((a, b) => b.updatedAt - a.updatedAt);
+}
+async function searchClaude(query, sessions, folders) {
+	const candidates = await claudeCandidates(query);
+	const matching = candidates === null ? sessions : sessions.filter((session) => candidates.has(session.id));
+	const projectOf = new Map(sessions.map((session) => [session.id, session.projectId]));
+	return readAndMatch(query, matching.slice(0, READ_LIMIT), (sessionId) => claudeMessages(sessionId, folders.get(projectOf.get(sessionId) ?? "")));
+}
+async function claudeMessages(sessionId, dir) {
+	return (await getSessionMessages(sessionId, { dir })).flatMap((item) => {
+		if (item.type === "system" || item.parent_tool_use_id !== null) return [];
+		const text = toMessage(item.type, item, null).content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n");
+		return generatedText.test(text) ? [] : [{
+			author: item.type,
+			text
+		}];
+	});
+}
+async function claudeCandidates(query) {
+	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)));
+		return new Set(lists[0].filter((id) => lists.every((list) => list.includes(id))));
+	} catch (error) {
+		console.warn(`could not narrow Claude sessions with rg: ${error}`);
+		return null;
+	}
+}
+async function sessionsWith(word) {
+	return (await run$2("rg", [
+		"--files-with-matches",
+		"--fixed-strings",
+		"--ignore-case",
+		"--no-ignore",
+		"--hidden",
+		"--max-depth",
+		"2",
+		"--glob",
+		"*.jsonl",
+		"--",
+		word,
+		path.join(claudeBaseDir(), "projects")
+	], {
+		maxBuffer: 16777216,
+		timeout: RG_TIME_LIMIT
+	}).catch((error) => {
+		if (error.code === 1) return { stdout: "" };
+		throw error;
+	})).stdout.split("\n").filter(Boolean).map((file) => path.basename(file, ".jsonl"));
+}
+async function searchCodex(query, sessions) {
+	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);
+	const unverified = found.slice(CODEX_READ_LIMIT).flatMap((result) => {
+		const match = matchMessage(query, result.snippet);
+		return match === null ? [] : [{
+			sessionId: result.thread.id,
+			author: "assistant",
+			quality: match.quality,
+			snippet: messageSnippet(result.snippet, match.offset)
+		}];
+	});
+	return [...verified, ...unverified];
+}
+async function readAndMatch(query, sessions, read) {
+	return (await Promise.all(sessions.map(async (session) => bestMatch(query, session.id, await read(session.id))))).filter((match) => match !== null);
+}
+function bestMatch(query, sessionId, messages) {
+	let best = null;
+	for (const message of messages) {
+		const match = matchMessage(query, message.text);
+		if (match === null) continue;
+		const candidate = {
+			sessionId,
+			author: message.author,
+			quality: match.quality,
+			snippet: messageSnippet(message.text, match.offset)
+		};
+		if (best === null || compareMessages(candidate, best) < 0) best = candidate;
+	}
+	return best;
+}
 // src/services/session-title.ts
 const CONTEXT_LIMIT = 8e3;
 const MESSAGE_LIMIT = 2e3;
@@ -7533,6 +7656,7 @@ const handlers = {
 	"sessions.searchable": () => searchableSessions(),
 	"sessions.searchMessages": (params) => searchMessages(params.query),
 	"sessions.earlier": (params) => earlier(params.sessionId, params.before),
+	"sessions.export": (params) => exportSession(params.sessionId, params.projectId),
 	"sessions.image": (params) => image(params.sessionId, params.itemId, params.index),
 	"sessions.agent": (params) => {
 		switch (providerOf(params.sessionId)) {