offsite 0.0.42 → 0.0.44

package/README.md

@@ -10,32 +10,6 @@ Claude Code, Codex and OpenCode in your browser. It uses the same sessions as th
 npx offsite
 ```
 
-Then open the pairing link it prints. It pairs this browser with the server, so only browsers that opened the link can use it.
-
-| Command          | What it does                                                                      |
-| ---------------- | --------------------------------------------------------------------------------- |
-| `offsite`        | Starts the server and the web app                                                 |
-| `offsite web`    | Same as `offsite`                                                                 |
-| `offsite serve`  | Starts only the server                                                            |
-| `offsite pair`   | Makes a pairing token for another browser and prints its link. `--name` labels it |
-| `offsite unpair` | Lists paired browsers so you can pick which to unpair                             |
-
-| Flag        | Default      | What it sets                                                 |
-| ----------- | ------------ | ------------------------------------------------------------ |
-| `--host`    | `127.0.0.1`  | Address to listen on                                         |
-| `--port`    | `47841`      | Port to listen on                                            |
-| `--dir`     | `~/.offsite` | Folder for settings and accounts                             |
-| `--no-auth` | auth on      | Accept connections without the pairing token                 |
-| `--no-pair` | pair on      | Don't create a pairing token or print pairing links on start |
-| `--pwa`     | off          | Serve the web app as an installable app that works offline   |
-
-Pairing tokens stay in `tokens.json` inside `--dir`. A running OffSite disconnects an unpaired browser within seconds.
-
-> [!WARNING]
-> With `--no-auth`, anyone who can reach its port, including any website open in your browser, can run your coding agents and open a terminal on your machine.
-
-Don't use the same session in OffSite and the CLI at the same time. Switching between them is fine.
-
 ## Separate instances
 
 Give each instance its own port and `--dir`.

package/apps/server/dist/main.mjs

@@ -5,7 +5,7 @@ import path from "node:path";
 import { consola } from "consola";
 import { WebSocketServer } from "ws";
 import { z } from "zod";
-import os, { homedir } from "node:os";
+import os from "node:os";
 import { deleteSession, forkSession, getSessionInfo, getSessionMessages, getSubagentMessages, listSessions, query, renameSession } from "@anthropic-ai/claude-agent-sdk";
 import { execFile, spawn } from "node:child_process";
 import readline from "node:readline";
@@ -85,7 +85,7 @@ function broadcast(event) {
 //#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").configureHelp({ showGlobalOptions: true });
+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").option("--connect <addresses>", "Add this machine to the web app with these comma separated addresses; needs --no-auth").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";
@@ -100,11 +100,19 @@ 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");
+if (options.connect !== void 0 && options.auth) program.error("error: --connect needs --no-auth");
+if (options.connect !== void 0 && command === "serve") program.error("error: --connect can't be used with offsite serve");
+const connect$1 = options.connect === void 0 ? null : options.connect.split(",").map((address) => {
+	const url = URL.parse(address);
+	if (url === null || url.protocol !== "http:" && url.protocol !== "https:") return program.error(`error: --connect address ${address} needs http:// or https://, like https://example.com`);
+	return url.origin;
+});
 const args = {
 	...options,
 	dir: path.resolve(options.dir),
 	command,
-	name
+	name,
+	connect: connect$1
 };
 const serverDir = path.join(import.meta.dirname, "..");
 //#endregion
@@ -955,6 +963,10 @@ function platform() {
 function claudeBaseDir() {
 	return readConfig().claudeBaseDir[platform()] ?? path.join(os.homedir(), ".claude");
 }
+function workingDirectory() {
+	const dir = readConfig().workingDir[platform()] ?? "~";
+	return dir.startsWith("~") ? path.join(os.homedir(), dir.slice(1)) : dir;
+}
 function defaultShell() {
 	if (process.platform === "win32") return process.env.COMSPEC ?? "cmd.exe";
 	return os.userInfo().shell ?? "/bin/sh";
@@ -3314,6 +3326,7 @@ const CAN = 24;
 const SUB = 26;
 var Scanner = class {
 	title = "";
+	directory = null;
 	state = "ground";
 	payload = [];
 	scan(bytes) {
@@ -3390,6 +3403,10 @@ var Scanner = class {
 			this.title = text.slice(2);
 			return null;
 		}
+		if (text.startsWith("9;9;")) {
+			this.directory = text.slice(4).replace(/^"(.*)"$/, "$1");
+			return null;
+		}
 		if (text.startsWith("9;")) {
 			const body = text.slice(2);
 			const digits = /^\d*/.exec(body)?.[0].length ?? 0;
@@ -3710,7 +3727,7 @@ function startShell(cwd) {
 		encoding: null
 	});
 }
-async function currentDirectory(pid) {
+async function currentDirectory(pid, reported) {
 	if (process.platform === "linux") return readlink(`/proc/${pid}/cwd`);
 	if (process.platform === "darwin") {
 		const { stdout } = await run("lsof", [
@@ -3725,6 +3742,10 @@ async function currentDirectory(pid) {
 		if (line === void 0) throw new Error(`lsof found no folder for ${pid}`);
 		return line.slice(1);
 	}
+	if (process.platform === "win32") {
+		if (reported === null || !statSync(reported, { throwIfNoEntry: false })?.isDirectory()) throw new Error(`the shell reported no existing folder, it reported ${reported}`);
+		return reported;
+	}
 	throw new Error("reading the directory of another process is not supported on this platform");
 }
 async function busyProgram(pid) {
@@ -3835,12 +3856,6 @@ const OUTPUT_LIMIT$1 = 1048576;
 const STALL_LIMIT = 1e4;
 const SILENCE_LIMIT$1 = 9e4;
 const KILL_DELAY = 3e3;
-const pasteTypes = {
-	"image/png": "png",
-	"image/jpeg": "jpg",
-	"image/gif": "gif",
-	"image/webp": "webp"
-};
 const instance = `${Date.now()}-${randomUUID()}`;
 const projects = /* @__PURE__ */ new Map();
 const terminals = /* @__PURE__ */ new Map();
@@ -3894,15 +3909,6 @@ function closeProjectTabs(projectId) {
 	for (const tab of [...project.tabs]) closeTab(tab.id);
 	publish();
 }
-function savePastedImage(type, data) {
-	const extension = pasteTypes[type];
-	if (extension === void 0) throw new Error("pasted image must be a PNG, JPEG, GIF or WebP image");
-	const directory = path.join(home, "paste");
-	mkdirSync(directory, { recursive: true });
-	const file = path.join(directory, `${Date.now()}-${randomUUID()}.${extension}`);
-	writeFileSync(file, data);
-	return file;
-}
 function attach(client) {
 	detachTerminal(client);
 	const connection = {
@@ -3965,7 +3971,7 @@ async function request(connection, message) {
 				tab.minimized = false;
 				project.activeTab = tab.id;
 			}
-			if (project.tabs.length === 0) await createTab(message.projectId);
+			if (project.tabs.length === 0 && message.projectId !== "global") await createTab(message.projectId);
 			break;
 		}
 	}
@@ -3999,7 +4005,7 @@ function input(connection, bytes) {
 	terminal.pty.write(Buffer.from(frame.data));
 }
 async function createTab(projectId) {
-	const cwd = projectId === "global" ? homedir() : projectPath(projectId);
+	const cwd = projectId === "global" ? workingDirectory() : projectPath(projectId);
 	if (!statSync(cwd, { throwIfNoEntry: false })?.isDirectory()) {
 		console.error(`${cwd} is not a folder, terminal not created`);
 		return;
@@ -4012,7 +4018,7 @@ async function createTab(projectId) {
 	const active = project.activeTab === null ? void 0 : terminals.get(project.activeTab);
 	let directory = cwd;
 	if (active !== void 0) try {
-		directory = await currentDirectory(active.pty.pid);
+		directory = await currentDirectory(active.pty.pid, active.scanner.directory);
 	} catch (error) {
 		console.warn(`starting in the project folder, could not read the folder of the active terminal: ${error}`);
 	}
@@ -4111,12 +4117,8 @@ function drain() {
 	}, 10);
 }
 function scan(id, terminal, data) {
-	if (!pushActive()) {
-		terminal.scanner = new Scanner();
-		return;
-	}
 	const alert = terminal.scanner.scan(data);
-	if (alert === null || notifierWatching()) return;
+	if (!pushActive() || alert === null || notifierWatching()) return;
 	if (!(alert.type === "bell" ? terminal.alerts.startBell() : terminal.alerts.startNotification())) return;
 	const windowTitle = terminal.scanner.title;
 	setTimeout(() => push(id, alert, windowTitle), 500);
@@ -6404,6 +6406,23 @@ async function changedElsewhere(run, cwd) {
 	return last !== void 0 && !run.messages.some((item) => item.uuid === last);
 }
 //#endregion
+//#region src/services/terminal/paste.ts
+const pasteTypes = {
+	"image/png": "png",
+	"image/jpeg": "jpg",
+	"image/gif": "gif",
+	"image/webp": "webp"
+};
+function savePastedImage(type, data) {
+	const extension = pasteTypes[type];
+	if (extension === void 0) throw new Error("pasted image must be a PNG, JPEG, GIF or WebP image");
+	const directory = path.join(home, "paste");
+	mkdirSync(directory, { recursive: true });
+	const file = path.join(directory, `${Date.now()}-${randomUUID()}.${extension}`);
+	writeFileSync(file, data);
+	return file;
+}
+//#endregion
 //#region src/storage/state.ts
 const stateFile = path.join(home, "state.json");
 const stateSchema = z.strictObject({ composer: z.strictObject({
@@ -6866,12 +6885,12 @@ if (args.auth) setInterval(() => {
 }, UNPAIR_CHECK);
 server.listen(port, args.host, () => {
 	startPush(`${args.host}:${port}`);
-	if (args.pair && (code !== null || !args.auth)) {
+	if (args.connect === null && args.pair && (code !== null || !args.auth)) {
 		const links = pairingLinks(code);
 		if (args.command === "web") console.log(`offsite is running at ${links.local}`);
 	} else {
 		console.log(`offsite is running at ${address}`);
-		if (args.pair) console.log("Run offsite pair to pair another browser");
+		if (args.auth && args.pair) console.log("Run offsite pair to pair another browser");
 	}
 	if (!args.auth) console.warn("auth is off; anyone who can reach this port can control this machine");
 });
@@ -7121,8 +7140,11 @@ function serveFile(pathname, response) {
 		return;
 	}
 	response.setHeader("content-type", contentTypes[path.extname(file)] ?? "application/octet-stream");
-	if (!args.pwa && path.basename(file) === "index.html") {
-		response.end(readFileSync(file, "utf8").replace(/<link rel="manifest"[^>]*>/, ""));
+	if (path.basename(file) === "index.html") {
+		let page = readFileSync(file, "utf8");
+		if (!args.pwa) page = page.replace(/<link rel="manifest"[^>]*>/, "");
+		if (args.connect !== null) page = page.replace("</head>", `<meta name="offsite-connect" content="${args.connect.join(" ")}"></head>`);
+		response.end(page);
 		return;
 	}
 	createReadStream(file).pipe(response);