offsite 0.0.42 → 0.0.43

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";
@@ -955,6 +955,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 +3318,7 @@ const CAN = 24;
 const SUB = 26;
 var Scanner = class {
 	title = "";
+	directory = null;
 	state = "ground";
 	payload = [];
 	scan(bytes) {
@@ -3390,6 +3395,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 +3719,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 +3734,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 +3848,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 +3901,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 = {
@@ -3999,7 +3997,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 +4010,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 +4109,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 +6398,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({