offsite 0.0.14 → 0.0.15

package/apps/server/dist/main.mjs

@@ -20,26 +20,9 @@ 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 { promisify } from "node:util";
 import webPush from "web-push";
+import { promisify } from "node:util";
 import { spawn as spawn$1 } from "@lydell/node-pty";
-//#region ../core/src/protocol.ts
-function encodeFrame(kind, id, data) {
-	const frame = new Uint8Array(5 + data.length);
-	frame[0] = kind;
-	new DataView(frame.buffer).setUint32(1, id);
-	frame.set(data, 5);
-	return frame;
-}
-function decodeFrame(frame) {
-	if (frame.length < 5) throw new Error("terminal frame is too short");
-	return {
-		kind: frame[0],
-		id: new DataView(frame.buffer, frame.byteOffset, frame.byteLength).getUint32(1),
-		data: frame.subarray(5)
-	};
-}
-//#endregion
 //#region src/constants.ts
 const deprecatedModels = {
 	claude: [
@@ -260,7 +243,8 @@ const privateEntries = [
 ];
 const windowNames = /* @__PURE__ */ new Map([[300, "five_hour"], [10080, "seven_day"]]);
 async function codexAccount(account) {
-	const linked = isMirror(account.configDir);
+	const configDir = account.configDir ?? codexBaseDir;
+	const linked = isMirror(configDir);
 	const base = {
 		...account,
 		email: null,
@@ -269,11 +253,11 @@ async function codexAccount(account) {
 		linked
 	};
 	try {
-		const server = appServer(account.configDir);
+		const server = appServer(configDir);
 		const result = await server.request("account/read", {});
 		if (result.account === null) return {
 			...base,
-			error: `Not logged in. Run CODEX_HOME=${account.configDir} codex login in a terminal`,
+			error: `Not logged in. Run CODEX_HOME=${configDir} codex login in a terminal`,
 			valid: false
 		};
 		switch (result.account.type) {
@@ -307,7 +291,7 @@ async function codexAccount(account) {
 	}
 }
 async function codexCapabilities(account, cwd) {
-	const server = appServer(account.configDir);
+	const server = appServer(account.configDir ?? codexBaseDir);
 	const models = [];
 	let cursor = null;
 	do {
@@ -338,7 +322,7 @@ async function skills(server, cwd) {
 	return (await server.request("skills/list", { cwds: [cwd] })).data.flatMap((entry) => entry.skills.filter((skill) => skill.enabled));
 }
 function publishCodexLimits(home, snapshot) {
-	for (const account of storedAccounts()) if (account.provider === "codex" && account.configDir === home) broadcast({
+	for (const account of storedAccounts()) if (account.provider === "codex" && (account.configDir ?? codexBaseDir) === home) broadcast({
 		type: "limits",
 		accountId: account.id,
 		limits: toLimits(snapshot)
@@ -703,7 +687,7 @@ function record$1(value) {
 //#region src/args.ts
 let command = "web";
 let name = null;
-const program = new Command("offsite").description("Starts the server and the web app").option("--host <host>", "Address to listen on", "127.0.0.1").option("--port <port>", "Port to listen on", "47841").option("--dir <dir>", "Folder for settings and accounts", path.join(os.homedir(), ".offsite")).option("--no-auth", "Accept connections without pairing").option("--no-pair", "Don't create a pairing code or print pairing links").option("--pwa", "Serve the web app as an installable app that works offline");
+const program = new Command("offsite").description("Starts the server and the web app").option("--host <host>", "Address to listen on", "127.0.0.1").option("--port <port>", "Port to listen on", "47841").option("--dir <dir>", "Folder for settings and accounts", path.join(os.homedir(), ".offsite")).option("--no-auth", "Accept connections without pairing").option("--no-pair", "Don't create a pairing code or print pairing links").option("--pwa", "Serve the web app as an installable app that works offline").configureHelp({ showGlobalOptions: true });
 program.command("web", { isDefault: true }).description("Starts the server and the web app, same as offsite");
 program.command("serve").description("Starts only the server, without the web app").action(() => {
 	command = "serve";
@@ -717,6 +701,7 @@ program.command("unpair").description("Picks paired browsers to unpair").action(
 });
 program.parse();
 const options = program.opts();
+if (!options.auth && !options.pair) program.error("error: --no-pair can't be used with --no-auth");
 const args = {
 	...options,
 	dir: path.resolve(options.dir),
@@ -1063,7 +1048,7 @@ const presets = /* @__PURE__ */ new Map([
 	}]
 ]);
 function codexServer(settings) {
-	return appServer(storedAccount("codex", settings.accountId).configDir);
+	return appServer(storedAccount("codex", settings.accountId).configDir ?? codexBaseDir);
 }
 var CodexRun = class CodexRun {
 	provider = "codex";
@@ -1491,15 +1476,15 @@ async function revertThread(sessionId, messageId) {
 		beforeTurnId: turnOf(messageId)
 	});
 }
-async function codexCommitMessage(accountId, cwd, model, prompt) {
-	const server = appServer(storedAccount("codex", accountId).configDir);
+async function codexText(accountId, cwd, model, instructions, prompt) {
+	const server = appServer(storedAccount("codex", accountId).configDir ?? codexBaseDir);
 	const threadId = (await server.request("thread/start", {
 		cwd,
 		model,
 		ephemeral: true,
 		approvalPolicy: "never",
 		sandbox: "read-only",
-		developerInstructions: "You write concise git commit messages."
+		developerInstructions: instructions
 	})).thread.id;
 	const reply = Promise.withResolvers();
 	let text = "";
@@ -1527,7 +1512,7 @@ async function codexCommitMessage(accountId, cwd, model, prompt) {
 			}],
 			model
 		});
-		return { message: await reply.promise };
+		return await reply.promise;
 	} finally {
 		server.threads.delete(threadId);
 		await server.request("thread/unsubscribe", { threadId });
@@ -1812,6 +1797,26 @@ function record(value) {
 	return isRecord(value) ? value : {};
 }
 //#endregion
+//#region src/lib/opencode/requests.ts
+function permissionRequest(permission, item) {
+	return {
+		id: permission.id,
+		kind: "approval",
+		title: permission.message ?? `Allow ${permission.action} ${permission.resources.join(", ")}?`,
+		canAlwaysAllow: (permission.save ?? []).length > 0,
+		item: item ?? {
+			id: permission.id,
+			parent: null,
+			time: Date.now(),
+			kind: "tool",
+			name: permission.action,
+			input: { resources: permission.resources },
+			output: "",
+			status: "running"
+		}
+	};
+}
+//#endregion
 //#region src/lib/opencode/sessions.ts
 const PAGE = 100;
 const COMMIT_LIMIT = 12e4;
@@ -1927,7 +1932,7 @@ async function rewindOpenCode(request) {
 	else await client.session.revert.commit({ sessionID });
 	return result;
 }
-async function openCodeCommitMessage(cwd, model, prompt) {
+async function openCodeText(cwd, model, prompt) {
 	const client = await openCode();
 	const session = await client.session.create({
 		location: { directory: cwd },
@@ -1946,7 +1951,7 @@ async function openCodeCommitMessage(cwd, model, prompt) {
 			if (message.type === "idle" && message.outcome === "failed") throw new Error(message.error?.message ?? "OpenCode failed");
 			if (message.type !== "assistant") continue;
 			const text = message.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("").trim();
-			if (text !== "") return { message: text };
+			if (text !== "") return text;
 		}
 		throw new Error("OpenCode did not reply");
 	} finally {
@@ -1994,6 +1999,15 @@ function openCodeRun(sessionId) {
 	const run = runs.get(sessionId);
 	return run?.provider === "opencode" ? run : void 0;
 }
+function sessionSettings(session, settings) {
+	const variant = session.model?.variant;
+	return {
+		...settings,
+		model: session.model === void 0 ? null : `${session.model.providerID}/${session.model.id}`,
+		effort: variant === void 0 || variant === "default" ? null : variant,
+		mode: session.agent ?? null
+	};
+}
 //#endregion
 //#region src/lib/opencode/run.ts
 const IDLE_LIMIT$1 = 18e5;
@@ -2270,22 +2284,7 @@ var OpenCodeRun = class OpenCodeRun {
 		const item = source === void 0 ? void 0 : this.items.get(`${source.messageID}:${source.id}`);
 		this.addPending({
 			kind: "permission",
-			request: {
-				id: permission.id,
-				kind: "approval",
-				title: permission.message ?? `Allow ${permission.action} ${permission.resources.join(", ")}?`,
-				canAlwaysAllow: (permission.save ?? []).length > 0,
-				item: item ?? {
-					id: permission.id,
-					parent: null,
-					time: Date.now(),
-					kind: "tool",
-					name: permission.action,
-					input: { resources: permission.resources },
-					output: "",
-					status: "running"
-				}
-			}
+			request: permissionRequest(permission, item)
 		});
 	}
 	askForm(form) {
@@ -2367,15 +2366,6 @@ var OpenCodeRun = class OpenCodeRun {
 		});
 	}
 };
-function sessionSettings(session, settings) {
-	const variant = session.model?.variant;
-	return {
-		...settings,
-		model: session.model === void 0 ? null : `${session.model.providerID}/${session.model.id}`,
-		effort: variant === void 0 || variant === "default" ? null : variant,
-		mode: session.agent ?? null
-	};
-}
 function files(prompt) {
 	return prompt.images.map((image) => ({ uri: `data:${image.mediaType};base64,${image.data}` }));
 }
@@ -2790,7 +2780,7 @@ const listChanges = /* @__PURE__ */ new Set([
 	"session.execution.failed",
 	"session.execution.interrupted"
 ]);
-const SILENCE_LIMIT$1 = 45e3;
+const SILENCE_LIMIT$2 = 45e3;
 const RECONNECT_ATTEMPTS = 5;
 const RECONNECT_DELAY = 2e3;
 let connection;
@@ -2833,7 +2823,7 @@ async function connect() {
 async function listen(client) {
 	const controller = new AbortController();
 	listener = controller;
-	const silence = setTimeout(() => controller.abort(), SILENCE_LIMIT$1);
+	const silence = setTimeout(() => controller.abort(), SILENCE_LIMIT$2);
 	try {
 		for await (const event of client.event.subscribe({
 			signal: controller.signal,
@@ -2842,7 +2832,7 @@ async function listen(client) {
 		console.warn("the OpenCode event stream ended");
 	} catch (error) {
 		if (listener !== controller) return;
-		console.warn(controller.signal.aborted ? `the OpenCode event stream was silent for ${SILENCE_LIMIT$1 / 1e3} seconds` : `lost the OpenCode event stream: ${error}`);
+		console.warn(controller.signal.aborted ? `the OpenCode event stream was silent for ${SILENCE_LIMIT$2 / 1e3} seconds` : `lost the OpenCode event stream: ${error}`);
 	} finally {
 		clearTimeout(silence);
 	}
@@ -2907,14 +2897,13 @@ function providerName(provider) {
 }
 function storedAccounts() {
 	const config = readConfig();
-	return [...config.claudeAccounts, ...config.codexAccounts].flatMap((item) => {
-		const configDir = item.configDir[platform()];
-		if (configDir === null) return [];
-		return [{
-			...item,
-			configDir
-		}];
-	});
+	return [...config.claudeAccounts.map((item) => ({
+		...item,
+		configDir: item.configDir[platform()]
+	})), ...config.codexAccounts.map((item) => ({
+		...item,
+		configDir: item.configDir[platform()]
+	}))];
 }
 function assertEnabled(provider, accountId) {
 	if (!readConfig().enabledProviders[provider]) throw new Error(`${providerName(provider)} is disabled in Settings`);
@@ -2935,7 +2924,7 @@ async function stopAccount(account) {
 	const stopping = [...runs.values()].filter((run) => run.settings.accountId === account.id);
 	for (const run of stopping) run.stop();
 	await Promise.all(stopping.map((run) => run.closed));
-	if (account.provider === "codex") stopAppServer(account.configDir);
+	if (account.provider === "codex") stopAppServer(account.configDir ?? codexBaseDir);
 	if (account.provider === "claude") forgetClaude(account.id);
 }
 function storedAccount(provider, accountId) {
@@ -3063,7 +3052,15 @@ function removeAccount(id) {
 }
 function validAccount(name, configDir) {
 	if (name.trim() === "") throw new Error("Give the account a name");
+	if (configDir === null) return {
+		name: name.trim(),
+		configDir: null
+	};
 	const dir = configDir.trim();
+	if (dir === "") return {
+		name: name.trim(),
+		configDir: null
+	};
 	if (dir === "~" || dir.startsWith("~/")) return {
 		name: name.trim(),
 		configDir: path.join(os.homedir(), dir.slice(1))
@@ -3075,6 +3072,117 @@ function validAccount(name, configDir) {
 	throw new Error("Use an absolute config directory or one starting with ~/");
 }
 //#endregion
+//#region src/services/push.ts
+const TITLE_LIMIT = 100;
+const BODY_LIMIT = 500;
+const TIME_TO_LIVE = 900;
+const SEND_TIMEOUT = 1e4;
+const SILENCE_LIMIT$1 = 9e4;
+const SUBJECT = "https://github.com/NazmusSayad/offsite";
+let server$1 = "";
+let notifier = null;
+function startPush(address) {
+	server$1 = address;
+}
+function pushActive() {
+	return targets().length > 0;
+}
+function notifierClient() {
+	return notifier === null ? null : notifier.client;
+}
+function notifierConnected() {
+	if (notifier === null || !clients.has(notifier.client)) return false;
+	return Date.now() - notifier.client.heardAt < SILENCE_LIMIT$1;
+}
+function claimNotifier(client, endpoint) {
+	notifier = {
+		client,
+		endpoint
+	};
+	for (const item of clients) item.send({
+		type: "notifier",
+		active: item === client
+	});
+}
+function subscribe(registration, client) {
+	if (new URL(registration.subscription.endpoint).protocol !== "https:") throw new Error("the endpoint must be an https URL");
+	const values = {
+		endpoint: registration.subscription.endpoint,
+		p256dh: registration.subscription.keys.p256dh,
+		auth: registration.subscription.keys.auth,
+		publicKey: registration.publicKey,
+		privateKey: registration.privateKey,
+		machine: registration.machine,
+		server: server$1
+	};
+	db.insert(pushSubscriptions).values(values).onConflictDoUpdate({
+		target: pushSubscriptions.endpoint,
+		set: values
+	}).run();
+	if (notifier !== null && notifier.client === client) notifier.endpoint = registration.subscription.endpoint;
+	console.log("a browser subscribed to push notifications");
+}
+function unsubscribe(endpoint) {
+	db.delete(pushSubscriptions).where(eq(pushSubscriptions.endpoint, endpoint)).run();
+	if (notifier !== null && notifier.endpoint === endpoint) notifier.endpoint = null;
+	console.log("a browser unsubscribed from push notifications");
+}
+async function sendPush(message) {
+	const subscriptions = targets();
+	if (subscriptions.length === 0) return false;
+	const trimmed = {
+		...message,
+		title: [...message.title].slice(0, TITLE_LIMIT).join(""),
+		body: [...message.body].slice(0, BODY_LIMIT).join("")
+	};
+	const gone = [];
+	let sent = false;
+	await Promise.all(subscriptions.map(async (subscription) => {
+		try {
+			await webPush.sendNotification({
+				endpoint: subscription.endpoint,
+				keys: {
+					p256dh: subscription.p256dh,
+					auth: subscription.auth
+				}
+			}, JSON.stringify({
+				...trimmed,
+				machineId: subscription.machine
+			}), {
+				vapidDetails: {
+					subject: SUBJECT,
+					publicKey: subscription.publicKey,
+					privateKey: subscription.privateKey
+				},
+				TTL: TIME_TO_LIVE,
+				urgency: "high",
+				timeout: SEND_TIMEOUT
+			});
+			sent = true;
+		} catch (error) {
+			const status = error.statusCode;
+			if (status !== void 0 && [
+				401,
+				403,
+				404,
+				410
+			].includes(status)) {
+				console.log(`push subscription ${subscription.endpoint} is gone or was made for another key, removing it`);
+				gone.push(subscription.endpoint);
+				return;
+			}
+			console.warn(`could not send a push to ${subscription.endpoint}: ${error}`);
+		}
+	}));
+	if (gone.length === 0) return sent;
+	db.delete(pushSubscriptions).where(and(eq(pushSubscriptions.server, server$1), inArray(pushSubscriptions.endpoint, gone))).run();
+	return sent;
+}
+function targets() {
+	if (notifier === null || notifier.endpoint === null) return [];
+	return db.select().from(pushSubscriptions).where(and(eq(pushSubscriptions.server, server$1), eq(pushSubscriptions.endpoint, notifier.endpoint))).all();
+}
+//#endregion
 //#region src/lib/claude/claude.ts
 const efforts = [
 	"low",
@@ -3116,13 +3224,13 @@ function claudeMode(value) {
 	return mode;
 }
 function claudeOptions(accountId, cwd) {
-	const account = storedAccount("claude", accountId);
+	const configDir = storedAccount("claude", accountId).configDir ?? claudeBaseDir();
 	const env = {
 		...process.env,
 		CLAUDE_CODE_ENTRYPOINT: "offsite",
-		CLAUDE_CONFIG_DIR: account.configDir
+		CLAUDE_CONFIG_DIR: configDir
 	};
-	if (path.resolve(account.configDir) === path.join(os.homedir(), ".claude")) delete env.CLAUDE_CONFIG_DIR;
+	if (path.resolve(configDir) === path.join(os.homedir(), ".claude")) delete env.CLAUDE_CONFIG_DIR;
 	return {
 		cwd,
 		env,
@@ -3135,23 +3243,56 @@ function claudeOptions(accountId, cwd) {
 			matcher: "PushNotification",
 			hooks: [async (input) => {
 				if (input.hook_event_name !== "PostToolUse" || !isRecord(input.tool_input) || typeof input.tool_input.message !== "string") throw new Error("Unexpected PushNotification hook input");
+				const message = input.tool_input.message;
 				broadcast({
 					type: "notification",
 					sessionId: input.session_id,
-					message: input.tool_input.message
+					message
 				});
-				return { hookSpecificOutput: {
+				if (notifierConnected()) return { hookSpecificOutput: {
 					hookEventName: "PostToolUse",
 					updatedToolOutput: {
-						message: input.tool_input.message,
+						message,
 						localSent: true,
 						disabledReason: "no_transport"
 					}
 				} };
+				const session = sessions().find((item) => item.id === input.session_id);
+				if (session === void 0) throw new Error(`Session ${input.session_id} is not listed`);
+				const pushSent = await sendPush({
+					kind: "session",
+					title: session.title,
+					body: message,
+					projectId: session.projectId,
+					sessionId: session.id
+				});
+				return { hookSpecificOutput: {
+					hookEventName: "PostToolUse",
+					updatedToolOutput: {
+						message,
+						localSent: false,
+						pushSent,
+						...pushSent ? {} : { disabledReason: "no_transport" }
+					}
+				} };
 			}]
 		}] }
 	};
 }
+function runOptions(options) {
+	const settings = options.settings;
+	return {
+		...claudeOptions(settings.accountId, options.cwd),
+		...options.resume ? { resume: options.sessionId } : { sessionId: options.sessionId },
+		...options.resumeAt === null ? {} : { resumeSessionAt: options.resumeAt },
+		enableFileCheckpointing: true,
+		...settings.mode === null ? {} : { permissionMode: claudeMode(settings.mode) },
+		...settings.model === null ? {} : { model: settings.model },
+		...settings.effort === null ? {} : { effort: claudeEffort(settings.effort) },
+		allowDangerouslySkipPermissions: true,
+		includePartialMessages: true
+	};
+}
 async function claudeCapabilities(account, cwd) {
 	const result = await initialization(account.id, cwd);
 	return {
@@ -3173,7 +3314,7 @@ async function claudeCapabilities(account, cwd) {
 	};
 }
 async function claudeAccount(account) {
-	const linked = isLinked(account.configDir);
+	const linked = isLinked(account.configDir ?? claudeBaseDir());
 	try {
 		const info = (await initialization(account.id, os.homedir())).account;
 		return {
@@ -3894,19 +4035,10 @@ var Run = class {
 		this.sessionId = options.sessionId;
 		this.resumeAt = options.resumeAt;
 		this.settings = options.settings;
-		const settings = options.settings;
 		this.query = query({
 			prompt: this.input(),
 			options: {
-				...claudeOptions(settings.accountId, options.cwd),
-				...options.resume ? { resume: options.sessionId } : { sessionId: options.sessionId },
-				...options.resumeAt === null ? {} : { resumeSessionAt: options.resumeAt },
-				enableFileCheckpointing: true,
-				...settings.mode === null ? {} : { permissionMode: claudeMode(settings.mode) },
-				...settings.model === null ? {} : { model: settings.model },
-				...settings.effort === null ? {} : { effort: claudeEffort(settings.effort) },
-				allowDangerouslySkipPermissions: true,
-				includePartialMessages: true,
+				...runOptions(options),
 				canUseTool: (toolName, input, context) => this.ask({
 					toolName,
 					input,
@@ -4252,85 +4384,181 @@ const UNTRACKED_LIMIT = 100;
 const NEW_FILE_LIMIT = 262144;
 const REPO_DEPTH = 3;
 const run$1 = promisify(execFile);
-async function gitStatus(cwd) {
-	let output;
-	try {
-		output = await git(cwd, [
-			"status",
-			"--porcelain=v2",
-			"--branch"
-		]);
-	} catch {
-		return null;
-	}
-	const status = {
-		branch: null,
-		upstream: null,
-		ahead: 0,
-		behind: 0,
-		changed: 0
-	};
-	for (const line of output.stdout.split("\n").filter(Boolean)) {
-		const [marker, key, ...rest] = line.split(" ");
-		if (marker !== "#") status.changed++;
-		else if (key === "branch.head") status.branch = rest[0] === "(detached)" ? null : rest[0];
-		else if (key === "branch.upstream") status.upstream = rest[0];
-		else if (key === "branch.ab") {
-			status.ahead = Number(rest[0]);
-			status.behind = -Number(rest[1]);
-		}
-	}
-	return status;
-}
-async function commit(cwd, message) {
-	if (message.trim() === "") throw new Error("Write a commit message first");
+const PULL_REQUEST_INSTRUCTIONS = `You write GitHub pull requests as Markdown.
+
+## TITLE RULES
+
+- Use the conventional commits format: type(scope): subject
+- Types: feat, fix, docs, style, refactor, perf, test, chore, ci
+- Scope is optional; include it when the change targets a clear area
+- Subject: imperative mood, lowercase, no trailing period
+- Maximum 72 characters in total
+- Describe the overall change, not a single commit
+
+## BODY RULES
+
+- Use short Markdown sections with level-2 headings. Choose only sections that fit the change: \`New features\`, \`Improvements\`, \`Fixes\`, \`Before\` / \`After\`, or \`Breaking changes\`. Do not use all of them as a template.
+- Use bullet points under every section, never paragraphs. Each bullet describes one feature or change in one short sentence.
+- For a small change, use one section with one bullet. For larger changes, use only the sections needed, with at most three short bullets across the body.
+- Aim for 20-50 words; fewer is better when enough. Never exceed 80 words.
+- Describe the outcome, not the implementation walkthrough. Do not enumerate changed files, functions, commits, or incidental cleanup; reviewers can read the diff.
+- Add a \`Breaking changes\` section only for an actual compatibility break or required migration.
+- No generic \`Summary\` section, bold labels, checklists, boilerplate openings like "This pull request", or closing summaries.
+
+## RULES
+
+Base every statement on the provided commits and diff; do NOT invent details.
+
+## OUTPUT
+
+Return one Markdown document. The title is the level-1 heading (\`# <title>\`), and everything after it is the body.`;
+async function gitRepos(cwd) {
+	return Promise.all((await projectRepos(cwd)).map(async (repo) => ({
+		...await gitStatus(path.join(cwd, repo)),
+		path: repo
+	})));
+}
+async function commit(cwd, message, andPush) {
+	const text = message.trim() === "" ? await commitMessage(cwd) : message;
 	await git(cwd, ["add", "--all"]);
 	await git(cwd, [
 		"commit",
 		"--message",
-		message
+		text
 	]);
-	return gitStatus(cwd);
+	if (andPush) try {
+		await push$1(cwd);
+	} catch (error) {
+		throw new Error(`Committed, but push failed: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+	}
+	return { message: text };
 }
 async function push$1(cwd) {
 	const status = await gitStatus(cwd);
-	if (status === null) throw new Error(`${cwd} is not a git repository`);
-	if (status.upstream === null) await git(cwd, [
-		"push",
-		"--set-upstream",
+	if (status.branch === null) throw new Error("Cannot push a detached HEAD");
+	try {
+		if (status.upstream === null) await git(cwd, [
+			"push",
+			"--set-upstream",
+			"origin",
+			"HEAD"
+		]);
+		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 });
+	}
+}
+async function pullRequestBranches(cwd) {
+	const head = (await gitStatus(cwd)).branch;
+	if (head === null) throw new Error("Not on a branch");
+	const base = (await run$1("gh", [
+		"repo",
+		"view",
+		"--json",
+		"defaultBranchRef",
+		"--jq",
+		".defaultBranchRef.name"
+	], { cwd })).stdout.trim();
+	if (base === head) throw new Error(`${head} is the default branch. Create a branch first.`);
+	return {
+		head,
+		base,
+		branches: (await git(cwd, [
+			"ls-remote",
+			"--heads",
+			"origin"
+		])).stdout.split("\n").filter(Boolean).map((line) => line.split("refs/heads/")[1]).filter((branch) => branch !== head)
+	};
+}
+async function preparePullRequest(cwd, base, commitChanges) {
+	const head = (await gitStatus(cwd)).branch;
+	if (head === null) throw new Error("Not on a branch");
+	if (commitChanges) await commit(cwd, "", true);
+	const status = await gitStatus(cwd);
+	if (status.upstream === null || status.ahead > 0) await push$1(cwd);
+	const open = (await run$1("gh", [
+		"pr",
+		"list",
+		"--head",
+		head,
+		"--base",
+		base,
+		"--state",
+		"open",
+		"--json",
+		"url",
+		"--jq",
+		".[0].url // \"\""
+	], { cwd })).stdout.trim();
+	if (open !== "") return {
+		kind: "open",
+		url: open
+	};
+	await git(cwd, [
+		"fetch",
 		"origin",
-		"HEAD"
+		base
 	]);
-	else await git(cwd, ["push"]);
-	return gitStatus(cwd);
+	const commits = (await git(cwd, [
+		"log",
+		"--format=- %B",
+		`origin/${base}..HEAD`
+	])).stdout.trim();
+	if (commits === "") throw new Error(`No commits between ${base} and ${head}`);
+	const diff = (await git(cwd, [
+		"diff",
+		"--no-color",
+		"--no-ext-diff",
+		`origin/${base}...HEAD`
+	])).stdout.slice(0, DIFF_LIMIT);
+	const lines = (await generateText(cwd, PULL_REQUEST_INSTRUCTIONS, `Commits between base and head:\n${commits}\n\n${diff}\n\nGenerate the pull request Markdown document from the above.`)).split("\n");
+	const title = lines[0].trim().replace(/^#{1,6}\s*/, "").replace(/^(\*\*|__|\*|_|`)+/, "").replace(/(\*\*|__|\*|_|`)+$/, "").trim();
+	if (title === "") throw new Error("The model returned an empty title");
+	return {
+		kind: "draft",
+		base,
+		head,
+		title,
+		body: lines.slice(1).join("\n").trim()
+	};
 }
-async function createPullRequest(cwd) {
+async function createPullRequest(cwd, request) {
 	const url = (await run$1("gh", [
 		"pr",
 		"create",
-		"--fill"
+		"--title",
+		request.title,
+		"--body",
+		request.body,
+		"--base",
+		request.base,
+		"--head",
+		request.head,
+		"--assignee",
+		"@me"
 	], { cwd })).stdout.trim().split("\n").at(-1);
 	if (url === void 0) throw new Error("gh did not return a pull request URL");
 	return { url };
 }
-async function suggestCommitMessage(cwd) {
+async function commitMessage(cwd) {
+	const diff = (await repoDiff(cwd, "")).slice(0, DIFF_LIMIT);
+	if (diff === "") throw new Error("There is nothing to commit");
+	return generateText(cwd, "You write concise git commit messages.", `Write a git commit message for this diff. Reply with only the message: a short summary line, optionally followed by a blank line and a brief body.\n\n${diff}`);
+}
+async function generateText(cwd, instructions, prompt) {
 	const settings = readConfig().commitMessage;
 	const provider = settings.provider;
 	const accountId = settings.accountId;
 	const model = settings.model;
-	if (provider === null || model === null) throw new Error("Choose a commit message model in Settings → Git");
+	if (provider === null || model === null) throw new Error("Choose a model in Settings → Git");
 	assertEnabled(provider, accountId);
-	if (!await isRepo(cwd)) throw new Error(`${cwd} is not a git repository`);
-	const diff = (await repoDiff(cwd, "")).slice(0, DIFF_LIMIT);
-	if (diff === "") throw new Error("There is nothing to commit");
-	const prompt = `Write a git commit message for this diff. Reply with only the message: a short summary line, optionally followed by a blank line and a brief body.\n\n${diff}`;
-	if (provider === "codex") return codexCommitMessage(accountId, cwd, model, prompt);
-	if (provider === "opencode") return openCodeCommitMessage(cwd, model, prompt);
+	if (provider === "codex") return codexText(accountId, cwd, model, instructions, prompt);
+	if (provider === "opencode") return openCodeText(cwd, model, `${instructions}\n\n${prompt}`);
 	const conversation = query({
 		prompt,
 		options: {
 			...claudeOptions(accountId, cwd),
-			systemPrompt: "You write concise git commit messages.",
+			systemPrompt: instructions,
 			tools: [],
 			model,
 			maxTurns: 1,
@@ -4341,15 +4569,14 @@ async function suggestCommitMessage(cwd) {
 		if (message.type !== "result") continue;
 		if (message.subtype !== "success") throw new Error(message.errors.join("\n"));
 		if (message.is_error) throw new Error(message.result);
-		return { message: message.result.trim() };
+		return message.result.trim();
 	}
 	throw new Error("Claude did not reply");
 }
 async function projectDiff(cwd) {
-	if (await isRepo(cwd)) return repoDiff(cwd, "");
-	const repos = childRepos(cwd, "", REPO_DEPTH);
+	const repos = await projectRepos(cwd);
 	if (repos.length === 0) throw new Error(`${cwd} is not a git repository and has none inside it`);
-	return (await Promise.all(repos.map((repo) => repoDiff(path.join(cwd, repo), `${repo}/`)))).join("");
+	return (await Promise.all(repos.map((repo) => repoDiff(path.join(cwd, repo), repo === "" ? "" : `${repo}/`)))).join("");
 }
 function git(cwd, args) {
 	return run$1("git", args, {
@@ -4357,6 +4584,34 @@ function git(cwd, args) {
 		maxBuffer: 67108864
 	});
 }
+async function projectRepos(cwd) {
+	return await isRepo(cwd) ? [""] : childRepos(cwd, "", REPO_DEPTH);
+}
+async function gitStatus(cwd) {
+	const output = await git(cwd, [
+		"status",
+		"--porcelain=v2",
+		"--branch"
+	]);
+	const status = {
+		branch: null,
+		upstream: null,
+		ahead: 0,
+		behind: 0,
+		changed: 0
+	};
+	for (const line of output.stdout.split("\n").filter(Boolean)) {
+		const [marker, key, ...rest] = line.split(" ");
+		if (marker !== "#") status.changed++;
+		else if (key === "branch.head") status.branch = rest[0] === "(detached)" ? null : rest[0];
+		else if (key === "branch.upstream") status.upstream = rest[0];
+		else if (key === "branch.ab") {
+			status.ahead = Number(rest[0]);
+			status.behind = -Number(rest[1]);
+		}
+	}
+	return status;
+}
 async function isRepo(cwd) {
 	try {
 		await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
@@ -4538,109 +4793,6 @@ function walk(root) {
 	return files;
 }
 //#endregion
-//#region src/services/push.ts
-const TITLE_LIMIT = 100;
-const BODY_LIMIT = 500;
-const TIME_TO_LIVE = 900;
-const SEND_TIMEOUT = 1e4;
-const SUBJECT = "https://github.com/NazmusSayad/offsite";
-let server$1 = "";
-let notifier = null;
-function startPush(address) {
-	server$1 = address;
-}
-function pushActive() {
-	return targets().length > 0;
-}
-function notifierClient() {
-	return notifier === null ? null : notifier.client;
-}
-function claimNotifier(client, endpoint) {
-	notifier = {
-		client,
-		endpoint
-	};
-	for (const item of clients) item.send({
-		type: "notifier",
-		active: item === client
-	});
-}
-function subscribe(registration, client) {
-	if (new URL(registration.subscription.endpoint).protocol !== "https:") throw new Error("the endpoint must be an https URL");
-	const values = {
-		endpoint: registration.subscription.endpoint,
-		p256dh: registration.subscription.keys.p256dh,
-		auth: registration.subscription.keys.auth,
-		publicKey: registration.publicKey,
-		privateKey: registration.privateKey,
-		machine: registration.machine,
-		server: server$1
-	};
-	db.insert(pushSubscriptions).values(values).onConflictDoUpdate({
-		target: pushSubscriptions.endpoint,
-		set: values
-	}).run();
-	if (notifier !== null && notifier.client === client) notifier.endpoint = registration.subscription.endpoint;
-	console.log("a browser subscribed to push notifications");
-}
-function unsubscribe(endpoint) {
-	db.delete(pushSubscriptions).where(eq(pushSubscriptions.endpoint, endpoint)).run();
-	if (notifier !== null && notifier.endpoint === endpoint) notifier.endpoint = null;
-	console.log("a browser unsubscribed from push notifications");
-}
-async function sendPush(message) {
-	const subscriptions = targets();
-	if (subscriptions.length === 0) return;
-	const trimmed = {
-		...message,
-		title: [...message.title].slice(0, TITLE_LIMIT).join(""),
-		body: [...message.body].slice(0, BODY_LIMIT).join("")
-	};
-	const gone = [];
-	await Promise.all(subscriptions.map(async (subscription) => {
-		try {
-			await webPush.sendNotification({
-				endpoint: subscription.endpoint,
-				keys: {
-					p256dh: subscription.p256dh,
-					auth: subscription.auth
-				}
-			}, JSON.stringify({
-				...trimmed,
-				machineId: subscription.machine
-			}), {
-				vapidDetails: {
-					subject: SUBJECT,
-					publicKey: subscription.publicKey,
-					privateKey: subscription.privateKey
-				},
-				TTL: TIME_TO_LIVE,
-				urgency: "high",
-				timeout: SEND_TIMEOUT
-			});
-		} catch (error) {
-			const status = error.statusCode;
-			if (status !== void 0 && [
-				401,
-				403,
-				404,
-				410
-			].includes(status)) {
-				console.log(`push subscription ${subscription.endpoint} is gone or was made for another key, removing it`);
-				gone.push(subscription.endpoint);
-				return;
-			}
-			console.warn(`could not send a push to ${subscription.endpoint}: ${error}`);
-		}
-	}));
-	if (gone.length === 0) return;
-	db.delete(pushSubscriptions).where(and(eq(pushSubscriptions.server, server$1), inArray(pushSubscriptions.endpoint, gone))).run();
-}
-function targets() {
-	if (notifier === null || notifier.endpoint === null) return [];
-	return db.select().from(pushSubscriptions).where(and(eq(pushSubscriptions.server, server$1), eq(pushSubscriptions.endpoint, notifier.endpoint))).all();
-}
-//#endregion
 //#region src/services/runs.ts
 const locks = /* @__PURE__ */ new Map();
 function stopAll() {
@@ -5156,6 +5308,23 @@ function executable(name) {
 	return process.platform === "win32" ? `${name}.exe` : name;
 }
 //#endregion
+//#region ../core/src/terminal.ts
+function encodeFrame(kind, id, data) {
+	const frame = new Uint8Array(5 + data.length);
+	frame[0] = kind;
+	new DataView(frame.buffer).setUint32(1, id);
+	frame.set(data, 5);
+	return frame;
+}
+function decodeFrame(frame) {
+	if (frame.length < 5) throw new Error("terminal frame is too short");
+	return {
+		kind: frame[0],
+		id: new DataView(frame.buffer, frame.byteOffset, frame.byteLength).getUint32(1),
+		data: frame.subarray(5)
+	};
+}
+//#endregion
 //#region src/services/terminal/alerts.ts
 const BELL_GAP = 5e3;
 const NOTIFICATION_GAP = 1e3;
@@ -5594,6 +5763,7 @@ function push(id, alert, windowTitle) {
 	const tab = findTab(id);
 	if (title === "") title = tab?.customName ?? (windowTitle || "Terminal");
 	sendPush({
+		kind: "terminal",
 		title,
 		body,
 		projectId: entry[0],
@@ -5838,12 +6008,16 @@ const handlers = {
 	"files.read": (params) => readProjectFile(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) => gitStatus(projectPath(params.projectId)),
+	"git.status": (params) => gitRepos(projectPath(params.projectId)),
 	"git.diff": (params) => projectDiff(projectPath(params.projectId)),
-	"git.commit": (params) => commit(projectPath(params.projectId), params.message),
-	"git.push": (params) => push$1(projectPath(params.projectId)),
-	"git.pullRequest": (params) => createPullRequest(projectPath(params.projectId)),
-	"git.message": (params) => suggestCommitMessage(projectPath(params.projectId)),
+	"git.commit": (params) => commit(path.join(projectPath(params.projectId), params.repo), params.message, params.push),
+	"git.push": async (params) => {
+		await push$1(path.join(projectPath(params.projectId), params.repo));
+		return null;
+	},
+	"git.branches": (params) => pullRequestBranches(path.join(projectPath(params.projectId), params.repo)),
+	"git.pullRequest": (params) => preparePullRequest(path.join(projectPath(params.projectId), params.repo), params.base, params.commit),
+	"git.createPullRequest": (params) => createPullRequest(path.join(projectPath(params.projectId), params.repo), params),
 	"push.subscribe": (params, client) => {
 		subscribe(params, client);
 		return null;