@deslop/workbench 0.0.327 → 0.0.330

package/dist/server.js

@@ -20748,7 +20748,7 @@ var Declaration = class Declaration extends Base {
 * @category models
 * @since 4.0.0
 */
-var Null = class extends Base {
+var Null$1 = class extends Base {
 	_tag = "Null";
 	/** @internal */
 	getParser() {
@@ -20759,7 +20759,7 @@ var Null = class extends Base {
 		return "null";
 	}
 };
-const null_ = /*#__PURE__*/ new Null();
+const null_ = /*#__PURE__*/ new Null$1();
 /**
 * AST node matching the `undefined` value.
 *
@@ -33331,6 +33331,14 @@ const Any = /*#__PURE__*/ make$35(any);
 */
 const Unknown = /*#__PURE__*/ make$35(unknown);
 /**
+* Schema for the `null` literal. Validates that the input is strictly `null`.
+*
+* @see {@link NullOr} for a union with another schema.
+* @category schemas
+* @since 3.10.0
+*/
+const Null = /*#__PURE__*/ make$35(null_);
+/**
 * Schema for the `undefined` literal. Validates that the input is strictly `undefined`.
 *
 * @see {@link UndefinedOr} for a union with another schema.
@@ -33536,6 +33544,13 @@ function Literals(literals) {
 	});
 }
 /**
+* Creates a union schema of `S | null`.
+*
+* @category constructors
+* @since 3.10.0
+*/
+const NullOr = /*#__PURE__*/ lambda((self) => Union([self, Null]));
+/**
 * Creates a union schema of `S | undefined`.
 *
 * @category constructors
@@ -52257,6 +52272,22 @@ var GitHubReviewThread = class extends Class("GitHubReviewThread")({
 	side: optional(Literals(["additions", "deletions"])),
 	url: optional(String$1)
 }) {};
+const GitHubRepositoryResponse = Struct({
+	name: String$1,
+	owner: Struct({ login: String$1 })
+});
+const GitHubReviewThreadsResponse = Struct({ data: optional(Struct({ repository: optional(Struct({ pullRequest: optional(Struct({ reviewThreads: optional(Struct({ nodes: ArraySchema(Struct({
+	comments: Struct({ nodes: ArraySchema(Struct({
+		body: String$1,
+		line: optional(NullOr(Number$1)),
+		originalLine: optional(NullOr(Number$1)),
+		path: String$1,
+		url: optional(String$1)
+	})) }),
+	diffSide: optional(String$1),
+	id: String$1,
+	isResolved: Boolean$1
+})) })) })) })) })) });
 var GitRepository = class extends Class("GitRepository")({
 	gitDirectory: String$1,
 	root: String$1
@@ -52570,6 +52601,26 @@ const makeGitExecutor = gen(function* () {
 		})
 	};
 });
+function toArgs(to) {
+	return to.type === "ref" ? [to.ref] : empty$13();
+}
+function segmentsByFile(segments) {
+	return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some$1(append$1(getOrElse$1(current, () => empty$13()), segment))));
+}
+function diffFromPatchChunk(chunk, segments) {
+	const deleted = /^deleted file mode /mu.test(chunk);
+	const filePath = (deleted ? chunk.match(/^--- a\/(.+)$/mu)?.[1] : void 0) ?? chunk.match(/^\+\+\+ b\/(.+)$/mu)?.[1] ?? chunk.match(/^--- a\/(.+)$/mu)?.[1] ?? chunk.match(/^diff --git a\/.+ b\/(.+)$/mu)?.[1] ?? "";
+	const status = value(chunk).pipe(when((value) => /^new file mode /mu.test(value), () => "added"), when(() => deleted, () => "deleted"), when((value) => /^rename (from|to) /mu.test(value), () => "renamed"), orElse(() => "modified"));
+	return new GitDiff({
+		filePath,
+		patch: chunk,
+		segments: getOrElse$1(get$1(segments, filePath), () => empty$13()),
+		status
+	});
+}
+function isWipSubject(subject) {
+	return subject === "wip" || startsWith("wip: ")(subject);
+}
 var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", { make: gen(function* () {
 	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
 	const git = yield* makeGitExecutor;
@@ -52615,25 +52666,28 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 	const collectRepositoriesFromRoots = fnUntraced(function* (roots, repositories) {
 		return yield* match$3(roots, {
 			onEmpty: () => succeed$3(repositories),
-			onNonEmpty: (roots) => pipe(fs.readDirectory(roots[0]), orElseSucceed(() => empty$13()), flatMap$2((entries) => {
-				if (contains(entries, ".git")) return pipe(git.string(roots[0], [
-					"rev-parse",
-					"--path-format=absolute",
-					"--git-common-dir"
-				]), map$4(trim), map$4((gitDirectory) => succeed$7(new GitRepository({
-					gitDirectory,
-					root: roots[0]
-				}))), orElseSucceed(() => failVoid), flatMap$2((repository) => collectRepositoriesFromRoots(drop$1(roots, 1), append$1(repositories, repository))));
-				return pipe(entries, filter$2((entry) => !(new Set([
-					".git",
-					".next",
-					".turbo",
-					"build",
-					"coverage",
-					"dist",
-					"node_modules"
-				]).has(entry) || startsWith(".")(entry) && entry !== ".git")), forEach$1((entry) => pipe(fs.stat(path.join(roots[0], entry)), map$4((info) => info.type === "Directory" ? path.join(roots[0], entry) : ""), orElseSucceed(() => ""))), flatMap$2((nextRoots) => collectRepositoriesFromRoots(pipe(nextRoots, filter$2(isNonEmpty$1), appendAll(drop$1(roots, 1))), repositories)));
-			}))
+			onNonEmpty: (remainingRoots) => {
+				const root = remainingRoots[0];
+				return pipe(fs.readDirectory(root), orElseSucceed(() => empty$13()), flatMap$2((entries) => {
+					if (contains(entries, ".git")) return pipe(git.string(root, [
+						"rev-parse",
+						"--path-format=absolute",
+						"--git-common-dir"
+					]), map$4(trim), map$4((gitDirectory) => succeed$7(new GitRepository({
+						gitDirectory,
+						root
+					}))), orElseSucceed(() => failVoid), flatMap$2((repository) => collectRepositoriesFromRoots(drop$1(remainingRoots, 1), append$1(repositories, repository))));
+					return pipe(entries, filter$2((entry) => !(new Set([
+						".git",
+						".next",
+						".turbo",
+						"build",
+						"coverage",
+						"dist",
+						"node_modules"
+					]).has(entry) || startsWith(".")(entry) && entry !== ".git")), forEach$1((entry) => pipe(fs.stat(path.join(root, entry)), map$4((info) => info.type === "Directory" ? path.join(root, entry) : ""), orElseSucceed(() => ""))), flatMap$2((nextRoots) => collectRepositoriesFromRoots(pipe(nextRoots, filter$2(isNonEmpty$1), appendAll(drop$1(roots, 1))), repositories)));
+				}));
+			}
 		});
 	});
 	const listWorktrees = fnUntraced(function* (cwd) {
@@ -52694,7 +52748,11 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 		yield* set(projects, yield* listProjectsFrom(home));
 	});
 	yield* refreshProjects();
-	yield* acquireRelease(sync(() => NFS.watch(home, () => run(refreshProjects()))), (watcher) => sync(() => watcher.close()));
+	yield* acquireRelease(sync(() => NFS.watch(home, () => {
+		run(refreshProjects());
+	})), (watcher) => sync(() => {
+		watcher.close();
+	}));
 	return {
 		branches: fnUntraced(function* (cwd) {
 			return new GitBranchesSnapshot({
@@ -52816,7 +52874,7 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 				...input.force ? ["--force"] : [],
 				input.cwd
 			]), asVoid);
-			if (worktree.branch !== void 0) yield* pipe(git.string(worktree.mainRoot, [
+			if (isNotUndefined(worktree.branch)) yield* pipe(git.string(worktree.mainRoot, [
 				"branch",
 				"-D",
 				worktree.branch
@@ -52845,23 +52903,6 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"HEAD"
 		]), map$4(trim));
 	});
-	function toArgs(to) {
-		return to.type === "ref" ? [to.ref] : empty$13();
-	}
-	function segmentsByFile(segments) {
-		return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some$1(append$1(getOrElse$1(current, () => empty$13()), segment))));
-	}
-	function diffFromPatchChunk(chunk, segments) {
-		const deleted = /^deleted file mode /mu.test(chunk);
-		const filePath = (deleted ? chunk.match(/^--- a\/(.+)$/mu)?.[1] : void 0) ?? chunk.match(/^\+\+\+ b\/(.+)$/mu)?.[1] ?? chunk.match(/^--- a\/(.+)$/mu)?.[1] ?? chunk.match(/^diff --git a\/.+ b\/(.+)$/mu)?.[1] ?? "";
-		const status = /^new file mode /mu.test(chunk) ? "added" : deleted ? "deleted" : /^rename (from|to) /mu.test(chunk) ? "renamed" : "modified";
-		return new GitDiff({
-			filePath,
-			patch: chunk,
-			segments: getOrElse$1(get$1(segments, filePath), () => empty$13()),
-			status
-		});
-	}
 	function diffsFromPatch(patch, segments) {
 		const groupedSegments = segmentsByFile(segments);
 		return pipe(patch.split(/(?=^diff --git )/mu), filter$2(isNonEmpty$1), map$7((chunk) => diffFromPatchChunk(chunk, groupedSegments)));
@@ -52913,9 +52954,9 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			`${input.from}..${input.to}`
 		])).split("\0DESLOP-COMMIT\0"), filter$2(isNonEmpty$1), flatMap$5((entry) => {
 			const lines = split$1("\n")(entry);
-			const header = lines[0] ?? "";
+			const header = lines[0];
 			const parts = split$1("\0")(header);
-			const commit = parts[0] ?? "";
+			const commit = parts[0];
 			const id = `${pipe(parts[1] ?? "", split$1(" "), filter$2(isNonEmpty$1))[0] ?? `${commit}^`}->${commit}`;
 			return pipe(drop$1(lines, 1), filter$2(isNonEmpty$1), map$7((filePath) => new GitDiffSegment({
 				filePath,
@@ -52993,14 +53034,11 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		"--jq",
 		".url"
 	]), map$4(trim), map$4((url) => isNonEmpty$1(url) ? some$1(url) : none()), catchTag("GitError", () => succeed$3(none())));
-	function isWipSubject(subject) {
-		return subject === "wip" || startsWith("wip: ")(subject);
-	}
 	function commitFromLogLine(line) {
 		const parts = split$1("\0")(line);
 		const subject = parts[2] ?? "";
 		return new GitCommit({
-			hash: parts[0] ?? "",
+			hash: parts[0],
 			parents: pipe(parts[3] ?? "", split$1(" "), filter$2(isNonEmpty$1)),
 			shortHash: parts[1] ?? "",
 			subject,
@@ -53085,7 +53123,10 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"view",
 			"--json",
 			"owner,name"
-		]), map$4((output) => JSON.parse(output)));
+		]), flatMap$2(decodeUnknownEffect(fromJsonString(GitHubRepositoryResponse))), mapError$2((cause) => new GitError({
+			cause,
+			message: "Failed to parse GitHub repository."
+		})));
 		const response = yield* ghString([
 			"api",
 			"graphql",
@@ -53120,12 +53161,15 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"-F",
 			`number=${pr}`
 		]);
-		return pipe(JSON.parse(response).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [], filter$2((thread) => thread.id !== void 0), flatMap$5((thread) => pipe(thread.comments?.nodes ?? [], filter$2((comment) => comment.body !== void 0 && comment.path !== void 0), map$7((comment) => new GitHubReviewThread({
-			body: comment.body ?? "",
-			filePath: comment.path ?? "",
-			id: thread.id ?? "",
+		return pipe((yield* pipe(decodeUnknownEffect(fromJsonString(GitHubReviewThreadsResponse))(response), mapError$2((cause) => new GitError({
+			cause,
+			message: "Failed to parse GitHub review threads."
+		})))).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [], flatMap$5((thread) => pipe(thread.comments.nodes, map$7((comment) => new GitHubReviewThread({
+			body: comment.body,
+			filePath: comment.path,
+			id: thread.id,
 			lineNumber: comment.line ?? comment.originalLine ?? 1,
-			resolved: thread.isResolved === true,
+			resolved: thread.isResolved,
 			side: thread.diffSide === "LEFT" ? "deletions" : "additions",
 			url: comment.url
 		})))));
@@ -53155,7 +53199,7 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		createWipCommit: fnUntraced(function* (message) {
 			if (!(yield* hasWorktreeChanges)) return yield* new GitError({ message: "No changes to commit." });
 			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
-			const subject = pipe(message, trim, (message) => isEmpty$1(message) ? "wip" : `wip: ${message}`);
+			const subject = pipe(message, trim, (value) => isEmpty$1(value) ? "wip" : `wip: ${value}`);
 			yield* pipe(git.string(config.cwd, [
 				"commit",
 				"-m",
@@ -53231,7 +53275,7 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 				filePath
 			]), asVoid);
 		}),
-		watchReviewRangeDiffs: (input) => pipe(worktreeChanges, mapEffect(() => pipe(reviewRangeDiffs(input), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
+		watchReviewRangeDiffs: (input) => pipe(worktreeChanges, mapEffect(() => pipe(reviewRangeDiffs(input), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => isNotUndefined(right[index]) && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
 	};
 }) }) {
 	static layer = flow(this.make, effect(this));
@@ -53264,7 +53308,7 @@ const discover = fnUntraced(function* (cwd, input) {
 		"package.json",
 		"**/package.json"
 	], { cwd }));
-	return yield* pipe(pipe(split$1("\n")(output), filter$2((path) => path === "package.json" || endsWith("/package.json")(path))), map$7((packagePath) => pipe(fs.readFileString(path.join(cwd, packagePath)), flatMap$2((source) => try_({
+	return yield* pipe(pipe(split$1("\n")(output), filter$2((packagePath) => packagePath === "package.json" || endsWith("/package.json")(packagePath))), map$7((packagePath) => pipe(fs.readFileString(path.join(cwd, packagePath)), flatMap$2((source) => try_({
 		catch: (error) => error,
 		try: () => pipe(JSON.parse(source), decodeUnknownOption(PackageJson))
 	})), catch_$2(() => succeed$3(none())), flatMap$2((packageJson) => {
@@ -53327,10 +53371,10 @@ const INJECTED_HEAD = `<script>
     if (typeof value === 'string') return value
     try { return JSON.stringify(value) } catch { return String(value) }
   }
-  const send = (level, message) => window.parent?.postMessage({__deslopBrowserLog: true, level, message}, '*')
+  const send = (level, message) => window.parent?.postMessage({deslopBrowserLog: true, level, message}, '*')
   const sendFavicon = () => {
     const icon = Array.from(document.head.querySelectorAll('link')).find(link => link.rel === 'shortcut icon' || link.rel.split(/\\s+/).includes('icon'))
-    window.parent?.postMessage({__deslopBrowserFavicon: true, href: icon?.href}, '*')
+    window.parent?.postMessage({deslopBrowserFavicon: true, href: icon?.href}, '*')
   }
 
   for (const level of ['debug', 'info', 'log', 'warn', 'error']) {
@@ -53344,7 +53388,7 @@ const INJECTED_HEAD = `<script>
   window.addEventListener('error', event => send('error', event.message || 'Resource failed to load'), true)
   window.addEventListener('unhandledrejection', event => send('error', serialize(event.reason)))
   window.addEventListener('message', event => {
-    if (event.data?.__deslopBrowserClear !== true) return
+    if (event.data?.deslopBrowserClear !== true) return
     localStorage.clear()
     sessionStorage.clear()
     document.cookie.split(';').forEach(cookie => {
@@ -53355,7 +53399,7 @@ const INJECTED_HEAD = `<script>
     location.reload()
   })
 
-  const sendLocation = () => window.parent?.postMessage({__deslopBrowserLocation: true, path: location.pathname + location.search + location.hash}, '*')
+  const sendLocation = () => window.parent?.postMessage({deslopBrowserLocation: true, path: location.pathname + location.search + location.hash}, '*')
   const wrapHistory = name => {
     const original = history[name]
     history[name] = function(...args) {
@@ -53411,7 +53455,7 @@ const proxy = fnUntraced(function* (request, origin) {
 });
 const proxyWebSocket = fnUntraced(function* (request, origin) {
 	const [pathname = "/", search = ""] = request.url.split("?");
-	const protocols = pipe(fromUndefinedOr(request.headers["sec-websocket-protocol"]), map$9((protocols) => pipe(protocols, split$1(","), map$7(trim), filter$2(isNonEmpty$1))));
+	const protocols = pipe(fromUndefinedOr(request.headers["sec-websocket-protocol"]), map$9((header) => pipe(header, split$1(","), map$7(trim), filter$2(isNonEmpty$1))));
 	const inbound = yield* request.upgrade;
 	const upstreamUrl = new URL(origin);
 	upstreamUrl.protocol = upstreamUrl.protocol === "https:" ? "wss:" : "ws:";
@@ -53425,7 +53469,7 @@ const proxyWebSocket = fnUntraced(function* (request, origin) {
 	return empty();
 });
 function requestHostname(host) {
-	return pipe(fromUndefinedOr(host), flatMap$6((host) => pipe(host, split$1(":"), head)));
+	return pipe(fromUndefinedOr(host), flatMap$6((value) => pipe(value, split$1(":"), head)));
 }
 function isLocalHostname(hostname) {
 	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname === "[::1]";
@@ -53455,11 +53499,11 @@ var Portless = class Portless extends Service()("@deslop/portless/Portless", { m
 		const existing = ports.get(key);
 		if (existing !== void 0) return existing;
 		const reserved = new Set(ports.values());
-		for (let port = 4e3; port <= 4999; port += 1) {
-			const occupied = yield* pipe(tryPromise(() => fetch(`http://127.0.0.1:${port}`, { signal: AbortSignal.timeout(100) })), as(true), catch_$2(() => succeed$3(false)));
-			if (!reserved.has(port) && !occupied) {
-				ports.set(key, port);
-				return port;
+		for (let candidatePort = 4e3; candidatePort <= 4999; candidatePort += 1) {
+			const occupied = yield* pipe(tryPromise(() => fetch(`http://127.0.0.1:${candidatePort}`, { signal: AbortSignal.timeout(100) })), as(true), catch_$2(() => succeed$3(false)));
+			if (!reserved.has(candidatePort) && !occupied) {
+				ports.set(key, candidatePort);
+				return candidatePort;
 			}
 		}
 		throw new Error("no portless app ports available");
@@ -53472,7 +53516,7 @@ var Portless = class Portless extends Service()("@deslop/portless/Portless", { m
 				port: (sessionId) => port(`${cwd}:${sessionId}`)
 			}), tap((discovered) => sync(() => {
 				for (const route of discovered) routes.set(route.host, `http://127.0.0.1:${route.port}`);
-			})), map$4((routes) => routes.map((route) => ({
+			})), map$4((discovered) => discovered.map((route) => ({
 				host: route.host,
 				port: route.port,
 				script: {
@@ -53617,7 +53661,7 @@ function adjacentGroups(items, sameGroup, merge) {
 	return pipe(items, reduce(empty$13(), (groups, item) => {
 		const next = groups;
 		const previous = groups.at(-1);
-		if (!(previous && sameGroup(previous, item))) {
+		if (previous === void 0 || !sameGroup(previous, item)) {
 			next.push(item);
 			return next;
 		}
@@ -53676,11 +53720,11 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		scrollback: 1e4
 	});
 	const serialize = new SerializeModule.SerializeAddon();
-	const progress = new import_addon_progress.ProgressAddon();
+	const progressAddon = new import_addon_progress.ProgressAddon();
 	screen.loadAddon(serialize);
-	screen.loadAddon(progress);
+	screen.loadAddon(progressAddon);
 	const publish$1 = fnUntraced(function* (data) {
-		const sequence = yield* updateAndGet(eventSequenceRef, (sequence) => sequence + 1);
+		const sequence = yield* updateAndGet(eventSequenceRef, (current) => current + 1);
 		yield* publish(events, {
 			data,
 			sequence,
@@ -53700,10 +53744,10 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 			state
 		}));
 	}
-	function setProgressState(progress) {
+	function setProgressState(progressState) {
 		return update(stateRef, (current) => {
 			if (current.state === "stopped" || current.state === "exited" || current.state === "failed") return current;
-			const state = pipe(progress.state, value, when(0, () => "idle"), when(2, () => "failed"), when(4, () => "waiting"), orElse(() => "running"));
+			const state = pipe(progressState.state, value, when(0, () => "idle"), when(2, () => "failed"), when(4, () => "waiting"), orElse(() => "running"));
 			return {
 				...current,
 				state
@@ -53733,7 +53777,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		runFork(setTitle(title));
 		return false;
 	});
-	progress.onChange((nextProgress) => {
+	progressAddon.onChange((nextProgress) => {
 		runFork(setProgressState(nextProgress));
 	});
 	const interruptProcess = fnUntraced(function* (subprocess, signal) {
@@ -53752,7 +53796,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		if ((yield* get$3(screenGenerationRef)) !== input.generation) return;
 		yield* withPermit(screenLock, pipe(callback$1((resume) => {
 			screen.write(input.data, () => {
-				resume(void_$1);
+				resume(succeed$3(void 0));
 			});
 		}), andThen(gen(function* () {
 			if ((yield* get$3(screenGenerationRef)) === input.generation) yield* set$4(parsedSequenceRef, yield* publish$1(input.data));
@@ -53776,7 +53820,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		if (state) yield* setState(state);
 	});
 	const spawnProcess = fnUntraced(function* () {
-		const generation = yield* updateAndGet(screenGenerationRef, (generation) => generation + 1);
+		const generation = yield* updateAndGet(screenGenerationRef, (current) => current + 1);
 		yield* withPermit(screenLock, pipe(sync(() => {
 			screen.reset();
 		}), andThen(publish$1(terminalReset)), tap((sequence) => set$4(parsedSequenceRef, sequence))));
@@ -53800,9 +53844,9 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 			})
 		});
 		const handle = {
-			data: subprocess.onData((data) => {
+			data: subprocess.onData((chunk) => {
 				offerUnsafe(dataQueue, {
-					data,
+					data: chunk,
 					generation
 				});
 			}),
@@ -53839,7 +53883,9 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		shutdown(screenQueue),
 		shutdown(writeQueue),
 		shutdown(resizeQueue),
-		sync(() => screen.dispose())
+		sync(() => {
+			screen.dispose();
+		})
 	], {
 		concurrency: "unbounded",
 		discard: true
@@ -53945,6 +53991,29 @@ const AgentSessionKey = Struct({
 	cwd: String$1,
 	uuid: String$1
 });
+function terminalSessionInput(session) {
+	if ("args" in session || "env" in session) return {
+		command: session.command === void 0 ? void 0 : make$40(session.command, session.args ?? [], { env: session.env }),
+		cwd: session.cwd,
+		sessionId: session.sessionId
+	};
+	if (typeof session.command === "string") return {
+		command: make$40(session.command),
+		cwd: session.cwd,
+		sessionId: session.sessionId
+	};
+	return {
+		command: session.command,
+		cwd: session.cwd,
+		sessionId: session.sessionId
+	};
+}
+function commentKey(input) {
+	return `${input.filePath}:${input.side ?? "additions"}:${input.lineNumber}`;
+}
+function markKey(input) {
+	return `${input.filePath}:${input.segmentId}:${input.fingerprint}`;
+}
 const TerminalSessions = make$46({
 	idleTimeToLive: infinity,
 	lookup: fnUntraced(function* (config) {
@@ -54000,24 +54069,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 			sessionId: script.sessionId
 		};
 	});
-	function terminalSessionInput(session) {
-		if ("args" in session || "env" in session) return {
-			command: session.command === void 0 ? void 0 : make$40(session.command, session.args ?? [], { env: session.env }),
-			cwd: session.cwd,
-			sessionId: session.sessionId
-		};
-		if (typeof session.command === "string") return {
-			command: make$40(session.command),
-			cwd: session.cwd,
-			sessionId: session.sessionId
-		};
-		return {
-			command: session.command,
-			cwd: session.cwd,
-			sessionId: session.sessionId
-		};
-	}
-	const terminal = fnUntraced(function* (input) {
+	const getTerminal = fnUntraced(function* (input) {
 		return yield* pipe(terminalSession(input), map$4(terminalSessionInput), flatMap$2((session) => get$6(terminals, session)));
 	});
 	const reviewStateKey = fnUntraced(function* (input) {
@@ -54043,17 +54095,11 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 			yield* reviewStore.set(`review-state/${key}`, state);
 		})), mapError$2((cause) => new GitError({ cause })));
 	});
-	function commentKey(input) {
-		return `${input.filePath}:${input.side ?? "additions"}:${input.lineNumber}`;
-	}
-	function markKey(input) {
-		return `${input.filePath}:${input.segmentId}:${input.fingerprint}`;
-	}
 	const agents = yield* make$3(empty$6());
 	return RpcContracts.of({
 		"agents.create": (payload) => gen(function* () {
-			const labelCount = pipe(fromIterable$2(values(yield* get(agents))), filter$2((session) => session.cwd === payload.cwd && session.command === payload.command), length);
-			const session = {
+			const labelCount = pipe(fromIterable$2(values(yield* get(agents))), filter$2((agentSession) => agentSession.cwd === payload.cwd && agentSession.command === payload.command), length);
+			const agentSession = {
 				args: [...payload.args],
 				command: payload.command,
 				cwd: payload.cwd,
@@ -54062,21 +54108,21 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 				uuid: randomUUID()
 			};
 			yield* update(agents, (sessions) => set$2(sessions, AgentSessionKey.make({
-				cwd: session.cwd,
-				uuid: session.uuid
-			}), session));
-			const terminal = yield* terminalSession(TerminalSessionKey.make({
-				args: session.args,
-				command: session.command,
-				cwd: session.cwd,
-				sessionId: session.uuid
-			})).pipe(map$4(terminalSessionInput), flatMap$2((session) => get$6(terminals, session)));
-			yield* terminal.restart();
-			yield* pipe(terminal.stateUpdates, map$2((state) => state.state), filter((state) => state === "exited" || state === "failed" || state === "stopped"), take(1), runDrain, andThen(update(agents, (current) => remove$2(current, AgentSessionKey.make({
-				cwd: session.cwd,
-				uuid: session.uuid
+				cwd: agentSession.cwd,
+				uuid: agentSession.uuid
+			}), agentSession));
+			const sessionTerminal = yield* terminalSession(TerminalSessionKey.make({
+				args: agentSession.args,
+				command: agentSession.command,
+				cwd: agentSession.cwd,
+				sessionId: agentSession.uuid
+			})).pipe(map$4(terminalSessionInput), flatMap$2((input) => get$6(terminals, input)));
+			yield* sessionTerminal.restart();
+			yield* pipe(sessionTerminal.stateUpdates, map$2((state) => state.state), filter((state) => state === "exited" || state === "failed" || state === "stopped"), take(1), runDrain, andThen(update(agents, (sessions) => remove$2(sessions, AgentSessionKey.make({
+				cwd: agentSession.cwd,
+				uuid: agentSession.uuid
 			})))), forkDetach);
-			return session;
+			return agentSession;
 		}),
 		"agents.remove": (payload) => update(agents, (current) => remove$2(current, AgentSessionKey.make({
 			cwd: payload.cwd,
@@ -54135,15 +54181,15 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 			to: payload.to
 		})))),
 		"runs.portless": (payload) => get$6(portlessWorktrees, payload.cwd),
-		"terminal.resize": (payload) => pipe(terminal(TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.resize({
+		"terminal.resize": (payload) => pipe(getTerminal(TerminalSessionKey.make(payload)), flatMap$2((sessionTerminal) => sessionTerminal.resize({
 			cols: payload.cols,
 			rows: payload.rows
 		}))),
-		"terminal.restart": (payload) => flatMap$2(terminal(TerminalSessionKey.make(payload)), (terminal) => terminal.restart()),
-		"terminal.state.watch": (payload) => unwrap$1(map$4(terminal(TerminalSessionKey.make(payload)), (terminal) => terminal.stateUpdates)),
-		"terminal.stop": (payload) => flatMap$2(terminal(TerminalSessionKey.make(payload)), (terminal) => terminal.stop()),
-		"terminal.watch": (payload) => unwrap$1(map$4(terminal(TerminalSessionKey.make(payload)), (terminal) => terminal.updates)),
-		"terminal.write": (payload) => pipe(terminal(TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.write(payload.data)))
+		"terminal.restart": (payload) => flatMap$2(getTerminal(TerminalSessionKey.make(payload)), (sessionTerminal) => sessionTerminal.restart()),
+		"terminal.state.watch": (payload) => unwrap$1(map$4(getTerminal(TerminalSessionKey.make(payload)), (sessionTerminal) => sessionTerminal.stateUpdates)),
+		"terminal.stop": (payload) => flatMap$2(getTerminal(TerminalSessionKey.make(payload)), (sessionTerminal) => sessionTerminal.stop()),
+		"terminal.watch": (payload) => unwrap$1(map$4(getTerminal(TerminalSessionKey.make(payload)), (sessionTerminal) => sessionTerminal.updates)),
+		"terminal.write": (payload) => pipe(getTerminal(TerminalSessionKey.make(payload)), flatMap$2((sessionTerminal) => sessionTerminal.write(payload.data)))
 	});
 }));
 //#endregion

package/package.json

@@ -2,7 +2,7 @@
 	"type": "module",
 	"sideEffects": false,
 	"name": "@deslop/workbench",
-	"version": "0.0.327",
+	"version": "0.0.330",
 	"files": [
 		"dist"
 	],

package/dist/client/assets/agent-CRsoHYEG.js

@@ -1 +0,0 @@
-import{n as e,t}from"./compiler-runtime-rGeCHUuX.js";import{Jo as n,Vs as r,ba as i,eo as a}from"./button-fe_R2wzr.js";import{g as o,h as s,l as c,n as l,s as u,t as d}from"./state-C-LyNCwu.js";import{t as f}from"./agent-DYjX-Pzl.js";import{t as p}from"./terminal-DgodR87i.js";var m=t(),h=e();function g(){let e=(0,m.c)(16),t=f.useParams(),s=f.useSearch(),c;e[0]===t.worktree?c=e[1]:(c=d(t.worktree),e[0]=t.worktree,e[1]=c);let u=o(c),p=u.value.activeWorktree?.root??``,g;e[2]===p?g=e[3]:(g=l(p),e[2]=p,e[3]=g);let v=o(g);if(!u.value.activeWorktree){let t;return e[4]===Symbol.for(`react.memo_cache_sentinel`)?(t=(0,h.jsx)(r,{to:`/`,replace:!0}),e[4]=t):t=e[4],t}let y;if(e[5]!==s||e[6]!==v.value){let t;e[8]===s?t=e[9]:(t=e=>e.uuid===s.agentId,e[8]=s,e[9]=t),y=n(v.value,i(t),a),e[5]=s,e[6]=v.value,e[7]=y}else y=e[7];let b=y;if(!b){let t;return e[10]===Symbol.for(`react.memo_cache_sentinel`)?(t=(0,h.jsx)(r,{to:`/`,replace:!0}),e[10]=t):t=e[10],t}let x;return e[11]!==u.value.activeWorktree.root||e[12]!==s.agentId||e[13]!==b.args||e[14]!==b.command?(x=(0,h.jsx)(_,{args:b.args,command:b.command,cwd:u.value.activeWorktree.root,sessionId:s.agentId}),e[11]=u.value.activeWorktree.root,e[12]=s.agentId,e[13]=b.args,e[14]=b.command,e[15]=x):x=e[15],x}function _(e){let t=(0,m.c)(23),n;t[0]===Symbol.for(`react.memo_cache_sentinel`)?(n=c.mutation(`terminal.resize`),t[0]=n):n=t[0];let r=s(n),i;t[1]===Symbol.for(`react.memo_cache_sentinel`)?(i=c.mutation(`terminal.write`),t[1]=i):i=t[1];let a=s(i),l;t[2]===e?l=t[3]:(l=u(e),t[2]=e,t[3]=l);let d=o(l),f;t[4]!==e.args||t[5]!==e.command||t[6]!==e.cwd||t[7]!==e.sessionId||t[8]!==a?(f=t=>a({payload:{args:e.args,command:e.command,cwd:e.cwd,data:t,sessionId:e.sessionId}}),t[4]=e.args,t[5]=e.command,t[6]=e.cwd,t[7]=e.sessionId,t[8]=a,t[9]=f):f=t[9];let g;t[10]!==e.args||t[11]!==e.command||t[12]!==e.cwd||t[13]!==e.sessionId||t[14]!==r?(g=t=>r({payload:{args:e.args,cols:t.cols,command:e.command,cwd:e.cwd,rows:t.rows,sessionId:e.sessionId}}),t[10]=e.args,t[11]=e.command,t[12]=e.cwd,t[13]=e.sessionId,t[14]=r,t[15]=g):g=t[15];let _;return t[16]!==e.sessionId||t[17]!==f||t[18]!==g||t[19]!==d.value.data||t[20]!==d.value.frame||t[21]!==d.value.state.state?(_=(0,h.jsx)(`div`,{className:`bg-background h-full min-h-0 min-w-0`,children:(0,h.jsx)(p,{className:`h-full min-h-0 w-full min-w-0 overflow-hidden`,data:d.value.data,frame:d.value.frame,onData:f,onResize:g,state:d.value.state.state},e.sessionId)}),t[16]=e.sessionId,t[17]=f,t[18]=g,t[19]=d.value.data,t[20]=d.value.frame,t[21]=d.value.state.state,t[22]=_):_=t[22],_}export{g as component};

package/dist/client/assets/agent-DYjX-Pzl.js

@@ -1,2 +0,0 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/agent-CRsoHYEG.js","assets/state-C-LyNCwu.js","assets/chunk-QTnfLwEv.js","assets/button-fe_R2wzr.js","assets/compiler-runtime-rGeCHUuX.js","assets/terminal-DgodR87i.js","assets/fallbacks-DZ7ciusO.js"])))=>i.map(i=>d[i]);
-import{$o as e,J as t,Qo as n,Y as r,gt as i}from"./button-fe_R2wzr.js";import{t as a}from"./preload-helper-CjdClQve.js";var o=e(`/(home)/$worktree/agent`)({component:n(()=>a(()=>import(`./agent-CRsoHYEG.js`),__vite__mapDeps([0,1,2,3,4,5,6])),`component`),validateSearch:i(r({agentId:t}))});export{o as t};