@treeport/treeport 0.7.0 → 0.8.3

package/dist/node/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { Ct as projectsResponseSchema, Dt as terminalCaptureResponseSchema, G as treeportRpcClientLayer, Gt as webPanelDefinitionsResponseSchema, K as TreeportRpcs, Lt as treeContextResponseSchema, Nt as terminalResponseSchema, Ot as terminalObservationResponseSchema, Pt as terminatedTerminalsResponseSchema, St as projectResponseSchema, Tt as removePreviewResponseSchema, U as decodeUnknownOrNull, V as webPanelInputSchema, _t as packageOperationResponseSchema, bt as packageReloadResponseSchema, dt as openBrowserPanelResponseSchema, et as browserAgentResponseSchema, ft as openWebPanelResponseSchema, gt as packageListingResponseSchema, mt as operationResponseSchema, nt as browserInstallStatusSchema, o as apiErrorBodySchema, t as TERMINAL_CAPTURE_MAX_LINES, tt as browserInstallResponseSchema, ut as okResponseSchema, vt as packageOperationsResponseSchema, yt as packageProjectResponseSchema } from "../../dist-BsLn2Gbc.js";
-import { A as tailscaleRemoteStatus, C as daemonUp, D as resolveLocalApiUrl, E as readDaemonLogs, N as parseDurationMs, O as resolvePackagePath, S as daemonStatus, T as enableTailscaleRemote, _ as serviceStart, b as daemonDown, c as runLocalUpdate, d as serviceApply, f as serviceDisable, g as serviceRun, h as serviceInstalled, j as treeportVersion, k as runDoctor, m as serviceEnable, p as serviceDoctorCheck, r as formatLocalUpdateError, t as LocalUpdateError, u as readServiceLogs, v as serviceStatus, w as disableTailscaleRemote, x as daemonHealth, y as serviceStop } from "../../update-UYS2lMdD.js";
+import { A as runDoctor, C as daemonStatus, D as readDaemonLogs, E as enableTailscaleRemote, F as formatServiceStatus, I as humanOutput, L as stateName, M as treeportVersion, N as formatLocalUpdateError, O as resolveLocalApiUrl, P as formatLocalUpdateResult, S as daemonHealth, T as disableTailscaleRemote, _ as serviceRun, b as serviceStop, d as readServiceLogs, f as serviceApply, g as serviceInstalled, h as serviceEnable, j as tailscaleRemoteStatus, k as resolvePackagePath, l as runLocalUpdate, m as serviceDoctorCheck, p as serviceDisable, r as confirmLocalUpdate, t as LocalUpdateError, v as serviceStart, w as daemonUp, x as daemonDown, y as serviceStatus, z as parseDurationMs } from "../../update-BYHlwpAq.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { Command, CommanderError } from "commander";
@@ -99,6 +99,9 @@ let writeStderr = (value) => {
 };
 let requestedExitCode = 0;
 let cliEnvironment = process.env;
+let output = humanOutput();
+let errorOutput = humanOutput();
+let updateProgressShown = false;
 var CliError = class extends Error {
 	exitCode;
 	code;
@@ -119,22 +122,6 @@ async function resolveDaemonLifecycle() {
 	}
 	return await serviceInstalled() ? "service" : "treeport";
 }
-function formatServiceStatus(status) {
-	const mode = status.mode === "headless" ? "advanced headless (starts before login)" : status.mode === "user" && status.manager === "launchd" ? "user/login (starts after login)" : status.mode === "user" ? "user service" : "not installed";
-	const lines = [
-		`Treeport service: ${status.state}`,
-		`Mode: ${mode}`,
-		`Manager: ${status.manager ?? "unsupported"}`,
-		`Starts before login: ${status.enabledAtBoot ? "yes" : "no"}`,
-		`Active: ${status.active ? "yes" : "no"}`,
-		`Definition: ${status.definitionPath ?? "not installed"}`
-	];
-	if (status.daemon?.state) lines.push(`PID: ${status.daemon.state.pid}`);
-	if (status.issues.length) lines.push(...status.issues.map((issue) => `Issue: ${issue}`));
-	if (status.administratorCommand) lines.push("Administrator action required:", status.administratorCommand, "Then run: treeport service status");
-	else if (status.recoveryCommands.length) lines.push(`Next: ${status.recoveryCommands[0]}`);
-	return lines.join("\n");
-}
 async function ensureServiceDaemon() {
 	const result = await serviceStart();
 	const state = result.status.daemon?.state;
@@ -474,12 +461,17 @@ function print(value, human) {
 async function main(args) {
 	const argv = args[0] === "spawn" || args[0] === "terminal" && args[1] === "create" ? commandArgv(args) : void 0;
 	let parserError = "";
-	const program = new Command().name("treeport").usage("[options] [folder] [command]").description("Manage Treeport projects, trees, and terminals.").argument("[folder]", "folder or folder inside a Git repository to open").option("--json", "emit machine-readable JSON").configureOutput({
+	const program = new Command().name("treeport").usage("[options] [folder] [command]").description("Manage Treeport projects, trees, and terminals.").version(output.heading(await treeportVersion()), "-v, --version", "show installed CLI version").argument("[folder]", "folder or folder inside a Git repository to open").option("--json", "emit machine-readable JSON").configureOutput({
+		getOutHasColors: () => output.enabled,
+		getErrHasColors: () => errorOutput.enabled,
 		writeOut: writeStdout,
 		writeErr: (value) => {
 			parserError += value;
 		}
-	}).showHelpAfterError().exitOverride();
+	}).showHelpAfterError(jsonOutput).configureHelp({
+		styleTitle: output.heading,
+		styleCommandText: output.heading
+	}).exitOverride();
 	program.action(async (folder) => {
 		if (folder === void 0) {
 			writeStdout(program.helpInformation());
@@ -535,7 +527,7 @@ async function main(args) {
 		if (lifecycle === "service") {
 			if (options.foreground || options.host || options.port) throw new CliError("An installed service owns the listener and process mode. Run `treeport service enable` to refresh its configuration, or `treeport service disable` to return to local background mode.", 5, "DAEMON_LIFECYCLE_SERVICE");
 			const result = await serviceStart();
-			print(result, () => formatServiceStatus(result.status));
+			print(result, () => formatServiceStatus(result.status, output));
 			if (result.administratorCommand || !result.status.healthy) requestedExitCode = 1;
 			return;
 		}
@@ -543,10 +535,13 @@ async function main(args) {
 		const daemonOptions = {};
 		if (options.host !== void 0) daemonOptions.host = options.host;
 		if (port !== void 0) daemonOptions.port = port;
-		if (options.foreground !== void 0) daemonOptions.foreground = options.foreground;
+		if (options.foreground !== void 0) {
+			daemonOptions.foreground = options.foreground;
+			daemonOptions.output = output;
+		}
 		const result = await daemonUp(daemonOptions);
 		if (options.foreground) return;
-		print(result, () => `Treeport is running\n${result.apiUrl}`);
+		print(result, () => output.blocks(output.summary("Treeport is running", "success"), output.rows([["URL", result.apiUrl]])));
 	});
 	const stopCommand = program.command("stop").description("Stop the local daemon and preserve terminal sessions").option("--terminate-terminals", "terminate every Treeport-owned terminal process").option("--force", "confirm termination of all terminals").option("--json", "emit machine-readable JSON");
 	stopCommand.action(async () => {
@@ -557,12 +552,12 @@ async function main(args) {
 		if (options.terminateTerminals) await request("/api/admin/terminate-terminals", terminatedTerminalsResponseSchema, { method: "POST" });
 		if (lifecycle === "service") {
 			const result = await serviceStop();
-			print(result, () => formatServiceStatus(result.status));
+			print(result, () => formatServiceStatus(result.status, output));
 			if (result.administratorCommand) requestedExitCode = 1;
 			return;
 		}
 		const result = await daemonDown();
-		print(result, () => result.wasRunning ? "Treeport is stopped" : "Treeport is already stopped");
+		print(result, () => output.summary(result.wasRunning ? "Treeport is stopped" : "Treeport is already stopped", "success"));
 	});
 	const serviceCommand = program.command("service").description("Manage opt-in OS service supervision");
 	serviceCommand.action(() => {
@@ -571,12 +566,12 @@ async function main(args) {
 	const serviceEnableCommand = serviceCommand.command("enable").description("Enable automatic startup and unexpected-exit restarts").option("--headless", "use advanced macOS startup before login (requires an administrator)").option("--json", "emit machine-readable JSON");
 	serviceEnableCommand.action(async () => {
 		const result = await serviceEnable(serviceEnableCommand.opts().headless ? "headless" : "user");
-		print(result, () => formatServiceStatus(result.status));
+		print(result, () => formatServiceStatus(result.status, output));
 		if (result.status.state === "action_required") requestedExitCode = 1;
 	});
 	serviceCommand.command("status").description("Show OS service supervision status").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await serviceStatus();
-		print(result, () => formatServiceStatus(result));
+		print(result, () => formatServiceStatus(result, output));
 		if (![
 			"disabled",
 			"healthy",
@@ -585,7 +580,7 @@ async function main(args) {
 	});
 	serviceCommand.command("disable").description("Stop and unregister OS service supervision").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await serviceDisable();
-		print(result, () => formatServiceStatus(result.status));
+		print(result, () => formatServiceStatus(result.status, output));
 		if (result.administratorCommand || result.status.state !== "disabled") requestedExitCode = 1;
 	});
 	serviceCommand.command("run", { hidden: true }).action(async () => serviceRun());
@@ -593,7 +588,7 @@ async function main(args) {
 	serviceApplyCommand.action(async () => {
 		const { request: requestPath } = serviceApplyCommand.opts();
 		const result = await serviceApply(requestPath);
-		print(result, () => `Applied Treeport service ${result.operation} request.`);
+		print(result, () => output.summary(`Applied Treeport service ${result.operation} request.`, "success"));
 	});
 	const remoteCommand = program.command("remote").description("Expose Treeport privately through Tailscale Serve");
 	remoteCommand.action(() => {
@@ -611,37 +606,48 @@ async function main(args) {
 		if (port !== void 0) remoteOptions.port = port;
 		if (serviceDaemon !== void 0) remoteOptions.daemon = serviceDaemon;
 		const result = await enableTailscaleRemote(remoteOptions);
-		print(result, () => `Treeport remote access is ${result.alreadyEnabled ? "already enabled" : "enabled"}\n${result.url}\nTailscale authenticates each remote user. Access is limited by your Tailscale policy.`);
+		print(result, () => output.blocks(output.summary(`Treeport remote access is ${result.alreadyEnabled ? "already enabled" : "enabled"}`, "success"), output.rows([["URL", result.url]]), "Tailscale authenticates each remote user. Access is limited by your Tailscale policy."));
 	});
 	remoteCommand.command("status").description("Show Tailscale remote access status").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await tailscaleRemoteStatus();
 		print(result, () => {
-			if (!result.configured) return "Treeport remote access is disabled";
-			return result.active ? `Treeport remote access is enabled\n${result.url}` : `Treeport remote access is unavailable\nExpected: ${result.url}\nThe Tailscale Serve route no longer points to Treeport.`;
+			if (!result.configured) return output.summary("Treeport remote access is disabled");
+			return output.blocks(output.summary(result.active ? "Treeport remote access is enabled" : "Treeport remote access is unavailable", result.active ? "success" : "warning"), output.rows([[result.active ? "URL" : "Expected URL", result.url ?? "Unavailable"]]), !result.active && "The Tailscale Serve route no longer points to Treeport.");
 		});
 	});
 	remoteCommand.command("disable").description("Disable Treeport Tailscale remote access").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await disableTailscaleRemote();
 		print(result, () => {
-			if (result.changedTailscale) return "Treeport remote access is disabled";
-			return result.wasEnabled ? "Treeport remote access is disabled" : "Treeport remote access was already disabled; the current Tailscale route was left unchanged.";
+			if (result.changedTailscale) return output.summary("Treeport remote access is disabled", "success");
+			return output.summary(result.wasEnabled ? "Treeport remote access is disabled" : "Treeport remote access was already disabled; the current Tailscale route was left unchanged.", "success");
 		});
 	});
 	program.command("status").description("Show local daemon status").option("--json", "emit machine-readable JSON").action(async () => {
-		const status = await daemonStatus();
+		const [cliVersion, status] = await Promise.all([treeportVersion(), daemonStatus()]);
 		const supervision = await serviceInstalled() ? await serviceStatus() : null;
+		const observed = supervision?.daemon ?? status;
+		const daemonVersion = observed.running && observed.verified ? observed.health?.version ?? null : null;
 		const projectList = status.verified ? await projects() : [];
 		const result = {
 			...status,
+			cliVersion,
+			daemonVersion,
 			service: supervision,
 			projects: projectList.length,
 			worktrees: projectList.reduce((count, project) => count + project.worktrees.length, 0),
 			terminals: projectList.reduce((count, project) => count + project.worktrees.reduce((worktreeCount, worktree) => worktreeCount + worktree.terminals.length, 0), 0)
 		};
 		print(result, () => {
-			if (!status.state) return supervision ? formatServiceStatus(supervision) : "Treeport is stopped";
-			if (!status.running || !status.verified) return `Treeport is unhealthy (PID ${status.state.pid})\nLogs: ${path.join(status.state.dataDir, "logs", "daemon.log")}`;
-			return `Treeport is running\n${status.state.apiUrl}\nLifecycle: ${status.health?.daemonLifecycle}\nVersion: ${status.health?.version}\nPID: ${status.state.pid}\nProjects: ${result.projects}\nTrees: ${result.worktrees}\nTerminals: ${result.terminals}`;
+			const healthy = observed.running && observed.verified;
+			return output.blocks(output.heading("Treeport status"), output.summary(!observed.state ? "Treeport is stopped" : healthy ? "Treeport is running" : "Treeport is unhealthy", !observed.state ? "neutral" : healthy ? "success" : "failure"), output.rows([
+				["CLI version", cliVersion],
+				["Daemon version", daemonVersion ?? "Unavailable"],
+				observed.state ? ["URL", observed.state.apiUrl] : null
+			]), daemonVersion !== null && daemonVersion !== cliVersion && output.summary("Version mismatch: CLI and daemon versions differ", "warning"), healthy && output.detail(output.rows([
+				supervision ? null : ["Lifecycle", observed.health?.daemonLifecycle === "external" ? "Externally managed" : observed.health?.daemonLifecycle === "service" ? "OS service" : "Treeport"],
+				supervision ? null : ["PID", observed.state.pid],
+				status.verified ? ["Workspace", `${result.projects} projects · ${result.worktrees} trees · ${result.terminals} terminals`] : null
+			])), !healthy && observed.state !== null && output.rows([["PID", observed.state.pid], ["Logs", path.join(observed.state.dataDir, "logs", "daemon.log")]]), supervision !== null && formatServiceStatus(supervision, output));
 		});
 	});
 	const logsCommand = program.command("logs").description("Show recent daemon logs").option("--lines <count>", "number of lines", "100");
@@ -652,7 +658,7 @@ async function main(args) {
 	});
 	program.command("doctor").description("Diagnose local requirements and paths").option("--json", "emit machine-readable JSON").action(async () => {
 		const checks = [...await runDoctor(), await serviceDoctorCheck()];
-		print(checks, () => checks.map((check) => `${check.ok ? "ok" : "error"}\t${check.name}\t${check.detail}`).join("\n"));
+		print(checks, () => output.blocks(output.heading("Treeport doctor"), output.summary(checks.every((check) => check.ok) ? "All checks passed" : "Some checks failed", checks.every((check) => check.ok) ? "success" : "failure"), ...checks.map((check) => `${output.summary(check.name, check.ok ? "success" : "failure")}\n${output.indent(check.detail.startsWith("state: ") ? stateName(check.detail.slice(7)) : check.ok ? output.detail(check.detail) : check.detail)}`)));
 		if (checks.some((check) => !check.ok)) requestedExitCode = 1;
 	});
 	program.command("version").description("Show CLI and daemon versions").option("--json", "emit machine-readable JSON").action(async () => {
@@ -661,7 +667,7 @@ async function main(args) {
 			cli,
 			daemon: status.verified ? status.health?.version ?? null : null
 		};
-		print(result, () => `CLI: ${result.cli}\nDaemon: ${result.daemon ?? "not running"}`);
+		print(result, () => output.blocks(output.heading("Treeport version"), output.rows([["CLI", result.cli], ["Daemon", result.daemon ?? "Unavailable"]]), result.daemon !== null && result.daemon !== result.cli && output.summary("Version mismatch: CLI and daemon versions differ", "warning")));
 	});
 	program.command("skills").description("Print the Treeport usage guide for AI agents").action(async () => {
 		const skill = await fs.readFile(await resolvePackagePath("skills", "treeport", "SKILL.md"), "utf8");
@@ -679,7 +685,7 @@ async function main(args) {
 			print({
 				managed: false,
 				reason: "outside_treeport"
-			}, () => "Not running in a Treeport-managed terminal.");
+			}, () => output.blocks(output.heading("Treeport context"), "Not running in a Treeport-managed terminal."));
 			return;
 		}
 		const missing = [
@@ -743,7 +749,12 @@ async function main(args) {
 				}).join("").split("\n");
 				return `  ${key}: ${first}${rest.length > 0 ? `\n${rest.map((line) => `    ${line}`).join("\n")}` : ""}`;
 			}).join("\n");
-			return `Treeport context\n\nProject:  ${context.project.name} (${context.project.id})\nTree:     ${context.worktree.name} (${context.worktree.id})\nPath:     ${context.worktree.path}\nContext:\n${treeContextText}\nTerminal: ${context.terminal.name} (${context.terminal.id}) — ${context.terminal.status}\nAPI:      ${context.apiUrl}\nLifecycle: ${context.daemonLifecycle === "external" ? "externally managed" : context.daemonLifecycle === "service" ? "managed by the OS service" : "managed by Treeport"}`;
+			return output.blocks(output.heading("Treeport context"), output.rows([
+				["Project", `${context.project.name} (${context.project.id})`],
+				["Tree", `${context.worktree.name} (${context.worktree.id})`],
+				["Path", context.worktree.path],
+				["Terminal", `${context.terminal.name} (${context.terminal.id}) — ${stateName(context.terminal.status)}`]
+			]), entries.length > 0 && `${output.heading("Tree context")}\n${treeContextText}`, output.detail(output.rows([["API", context.apiUrl], ["Lifecycle", context.daemonLifecycle === "external" ? "Externally managed" : context.daemonLifecycle === "service" ? "OS service" : "Treeport"]])));
 		});
 	});
 	const browserCommand = program.command("browser").description("Manage Browser and its hosted Chromium");
@@ -868,29 +879,36 @@ async function main(args) {
 			return lines.join("\n");
 		});
 	});
-	const updatePackagesCommand = program.command("update").description("Update Treeport or explicitly update configured packages").argument("[source]", "one configured npm: source").option("--packages", "update every eligible configured package").option("--json", "emit machine-readable JSON");
+	const updatePackagesCommand = program.command("update").description("Update Treeport or explicitly update configured packages").argument("[source]", "one configured npm: source").option("--packages", "update every eligible configured package").option("-y, --yes", "approve the Treeport self-update without prompting").option("--start", "start Treeport after a self-update if it was stopped").option("--json", "emit machine-readable JSON");
 	updatePackagesCommand.action(async (source) => {
 		const options = updatePackagesCommand.opts();
 		if (source && options.packages) throw new CliError("Specify a package source or --packages, not both.", 2);
+		if ((source || options.packages) && (options.yes || options.start)) throw new CliError("--yes and --start apply only to Treeport self-updates.", 2);
 		if (!source && !options.packages) {
 			if (await resolveDaemonLifecycle() === "external") throw new CliError("Cannot update Treeport because this daemon lifecycle is externally managed.", 5, "UPDATE_EXTERNAL_REFUSED");
-			const selfUpdateOptions = { environment: cliEnvironment };
-			if (!jsonOutput) selfUpdateOptions.progress = (message) => writeStderr(`${message}\n`);
-			const result = await runLocalUpdate(selfUpdateOptions).catch((error) => {
-				if (error instanceof LocalUpdateError) throw new CliError(jsonOutput ? error.message : formatLocalUpdateError(error.message, error.details), error.exitCode, error.code, error.details);
-				throw error;
-			});
-			print(result, () => {
-				if (result.status === "current") return `Treeport ${result.toVersion} is current`;
-				return result.daemon.wasRunning ? `Updated Treeport from ${result.fromVersion} to ${result.toVersion} and restarted the ${result.daemon.lifecycle === "service" ? "service" : "daemon"}` : `Updated Treeport from ${result.fromVersion} to ${result.toVersion}; Treeport remains stopped`;
-			});
+			const selfUpdateOptions = {
+				environment: cliEnvironment,
+				yes: options.yes ?? false,
+				start: options.start ?? false
+			};
+			if (!jsonOutput && process.stdin.isTTY && process.stdout.isTTY && process.stderr.isTTY) selfUpdateOptions.confirm = (preview, signal) => confirmLocalUpdate(preview, signal, process.stdin, process.stderr, errorOutput);
+			if (!jsonOutput) selfUpdateOptions.progress = (message) => {
+				if (!updateProgressShown) {
+					writeStderr(`${errorOutput.heading("Treeport update")}\n\n`);
+					updateProgressShown = true;
+				}
+				writeStderr(`${errorOutput.indent(errorOutput.summary(message, "warning"))}\n`);
+			};
+			const result = await runLocalUpdate(selfUpdateOptions);
+			if (updateProgressShown) writeStderr("\n");
+			print(result, () => formatLocalUpdateResult(result, output));
 			return;
 		}
 		const results = (await request("/api/packages/update", packageOperationsResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(source ? { source: await packageSource(source) } : {})
 		})).results;
-		print(results, () => results.map((result) => `${result.status}\t${result.scope}\t${result.source ?? "packages"}${result.reason ? `\t${result.reason}` : ""}`).join("\n"));
+		print(results, () => output.blocks(output.heading("Treeport package update"), ...results.map((result) => output.blocks(output.summary(`${stateName(result.status)} ${result.source ?? "packages"}`, result.status === "skipped" ? "warning" : "success"), output.detail(output.rows([["Scope", stateName(result.scope)]])), result.reason ? output.indent(result.reason) : null))));
 	});
 	const reloadCommand = program.command("reload").description("Reload package settings and resources without restarting").option("-l, --local", "reload only the registered project containing the current directory").option("--json", "emit machine-readable JSON");
 	reloadCommand.action(async () => {
@@ -1114,10 +1132,13 @@ async function runCliApplication(options) {
 	writeStdout = options.stdout ?? ((value) => process.stdout.write(value));
 	writeStderr = options.stderr ?? ((value) => process.stderr.write(value));
 	requestedExitCode = 0;
+	updateProgressShown = false;
+	output = humanOutput(environment, options.stdoutIsTTY ?? (!options.stdout && Boolean(process.stdout.isTTY)), jsonOutput);
+	errorOutput = humanOutput(environment, options.stderrIsTTY ?? (!options.stderr && Boolean(process.stderr.isTTY)), jsonOutput);
 	try {
 		await main([...options.args]);
 	} catch (error) {
-		const cliError = error instanceof CliError ? error : new CliError(error instanceof Error ? error.message : String(error), 1);
+		const cliError = error instanceof CliError || error instanceof LocalUpdateError ? error : new CliError(error instanceof Error ? error.message : String(error), 1);
 		if (jsonOutput) {
 			const body = { error: cliError.details === void 0 ? {
 				code: cliError.code,
@@ -1128,7 +1149,10 @@ async function runCliApplication(options) {
 				details: cliError.details
 			} };
 			writeStderr(`${JSON.stringify(body)}\n`);
-		} else writeStderr(`${cliError.message}\n`);
+		} else {
+			const text = error instanceof LocalUpdateError ? formatLocalUpdateError(error.message, error.details, errorOutput, error.code === "UPDATE_CANCELLED" || error.code === "UPDATE_INTERRUPTED") : errorOutput.blocks(errorOutput.summary(cliError.code === "USAGE_ERROR" ? "Invalid command" : "Command failed", "failure"), errorOutput.indent(cliError.message.replace(/^error: /, "")), cliError.code === "USAGE_ERROR" && errorOutput.next(["treeport --help"]));
+			writeStderr(`${updateProgressShown ? "\n" : ""}${text}\n`);
+		}
 		requestedExitCode = cliError.exitCode;
 	}
 	return requestedExitCode;

package/dist/node/server/index.js

@@ -1,5 +1,5 @@
 import { $ as applicationUpdateStatusSchema, A as requestWorkspaceOpenSchema, An as parseBrowserOwnerAuth, At as terminalPresetDefinitionsQuerySchema, B as updateWebPanelPermissionGrantSchema, Bt as treeFileSearchResultSchema, C as packageUpdateSchema, Cn as browserTicketRequestSchema, Ct as projectsResponseSchema, D as reorderWorkspaceItemsSchema, Dn as parseBrowserAuth, Dt as terminalCaptureResponseSchema, E as removeWorktreeSchema, En as encodeBrowserFrame, Et as storageValueResponseSchema, F as treeContextValuesSchema, Ft as treeContextFieldListingSchema, Gt as webPanelDefinitionsResponseSchema, H as writeTreeFileSchema, Ht as uploadedFileResponseSchema, I as treeFilePathSchema, It as treeContextFieldsQuerySchema, J as parseSocketHandshake, Jt as worktreesResponseSchema, K as TreeportRpcs, Kt as webPanelResponseSchema, L as updateProjectSchema, Lt as treeContextResponseSchema, M as setWebPanelStorageSchema, Mt as terminalPresetsResponseSchema, N as terminalCaptureQuerySchema, Nt as terminalResponseSchema, O as repositoryTerminalPresetSchema, On as parseBrowserCaptureMessage, Ot as terminalObservationResponseSchema, P as treeContextFieldDefinitionSchema, Pt as terminatedTerminalsResponseSchema, Q as presenceUpdateSchema, Qt as TERMINAL_MAX_CLIENT_MESSAGE_BYTES, R as updateTerminalPresetSchema, Rt as treeFileListingSchema, S as packageRemoveSchema, Sn as browserOwnerTicketResponseSchema, St as projectResponseSchema, T as registerProjectSchema, Tn as browserUrlSchema, Tt as removePreviewResponseSchema, U as decodeUnknownOrNull, Ut as webPanelContextResponseSchema, V as webPanelInputSchema, Vt as treeFileWriteResultSchema, W as isSchemaValue, Wt as webPanelDefinitionResponseSchema, X as PRESENCE_TIMEOUT_MS, Xt as SOCKET_PATH, Y as parseSocketMessage, Yt as BROWSER_VIDEO_CAPTURE_SOURCE, Z as presenceResponseSchema, Zt as TERMINAL_CONTROLLER_GRACE_MS, _ as openBrowserPanelFromTerminalSchema, _n as BROWSER_MAX_MESSAGE_BYTES, _t as packageOperationResponseSchema, at as gitDiffImageSchema, b as packageProjectQuerySchema, bn as browserOwnerIdentitySchema, bt as packageReloadResponseSchema, c as createBrowserPanelSchema, cn as terminalInputSchema, ct as healthResponseSchema, d as createWebPanelSchema, dn as terminalResizeSchema, dt as openBrowserPanelResponseSchema, et as browserAgentResponseSchema, f as createWorktreeSchema, fn as terminalSizeSchema, ft as openWebPanelResponseSchema, g as getWebPanelStorageSchema, gt as packageListingResponseSchema, h as formatCommandLine, hn as webPanelPermissionSchema, ht as operationsResponseSchema, i as TREE_FILE_MAX_BYTES, in as parseTerminalClientEvent, it as directoryBrowseResponseSchema, j as searchTreeFilesSchema, jn as parseBrowserOwnerClientMessage, jt as terminalPresetResponseSchema, k as repositoryTerminalPresetsFileSchema, kn as parseBrowserClientMessage, kt as terminalPresetDefinitionListingSchema, l as createTerminalPresetSchema, ln as terminalOutputAckSchema, lt as listenerDiscoveryResponseSchema, m as deleteWebPanelStorageSchema, mn as gitDiffImageRequestSchema, mt as operationResponseSchema, n as TERMINAL_MAX_UPLOAD_BYTES, nt as browserInstallStatusSchema, o as apiErrorBodySchema, on as terminalBellAcknowledgementSchema, ot as gitDiffResponseSchema, p as deleteTerminalPresetSchema, pn as terminalTakeControlSchema, pt as operationQuerySchema, q as parseProductEvent, qt as worktreeResponseSchema, r as TREE_FILE_LIST_MAX_ENTRIES, rn as parseTerminalAuth, rt as deletePanelQuerySchema, s as browseDirectoryQuerySchema, sn as terminalBinarySchema, st as hasDataResponseSchema, tt as browserInstallResponseSchema, u as createTerminalSchema, un as terminalQueryAuthorityRequestSchema, ut as okResponseSchema, v as openWebPanelSchema, vn as browserAgentCommandSchema, vt as packageOperationsResponseSchema, w as readTreeFileSchema, wn as browserTicketResponseSchema, wt as recentProjectsResponseSchema, x as packageReloadSchema, xn as browserOwnerTicketRequestSchema, xt as prResponseSchema, y as packageInstallSchema, yn as browserOwnerEndpointSchema, yt as packageProjectResponseSchema, z as updateTerminalSchema, zt as treeFileSchema } from "../../dist-BsLn2Gbc.js";
-import { M as assertLoopbackHost, N as parseDurationMs, a as isCanonicalTreeportVersion, i as inspectLocalUpdateInstallation, l as createUpdateStartupReporter, n as compareTreeportVersions, o as readLocalUpdateProgress, r as formatLocalUpdateError, s as resolveLatestTreeportRelease, v as serviceStatus } from "../../update-UYS2lMdD.js";
+import { R as assertLoopbackHost, a as inspectLocalUpdateInstallation, c as resolveLatestTreeportRelease, i as formatLocalUpdateError, n as compareTreeportVersions, o as isCanonicalTreeportVersion, s as readLocalUpdateProgress, u as createUpdateStartupReporter, y as serviceStatus, z as parseDurationMs } from "../../update-BYHlwpAq.js";
 import { a as currentTraceContext, i as terminalHostRecordSchema, n as encodeTerminalHostFrame, s as tracingLayerFromEnvironment, t as TerminalHostFrameDecoder } from "../../terminal-host-protocol-DZkQRAUF.js";
 import { createRequire } from "node:module";
 import fs from "node:fs/promises";
@@ -3562,6 +3562,7 @@ var dependencies = {
 	"drizzle-orm": "^0.45.2",
 	"effect": "^3.22.1",
 	"jsonc-parser": "^3.3.1",
+	"kleur": "^4.1.5",
 	"node-pty": "1.2.0-beta.14",
 	"playwright": "1.61.1",
 	"vite": "8.1.5",
@@ -3891,6 +3892,7 @@ var WebPanelViteRuntime = class {
 		this.developmentServers.clear();
 		await Promise.all(servers.map(async ({ server }) => {
 			await server.waitForRequestsIdle();
+			await Promise.all(Object.values(server.environments).map((environment) => environment.depsOptimizer?.scanProcessing));
 			await server.close();
 		}));
 	}
@@ -8080,9 +8082,17 @@ var WorktreeRemovalService = class {
 				yield* invalidateProjectsSnapshot();
 				return {
 					operationId,
-					preview
+					preview,
+					skipCleanup
 				};
 			})).pipe(Effect.onError(() => locks.release({ worktreeIds: [worktreeId] })));
+			yield* Effect.logInfo("Tree removal accepted").pipe(Effect.annotateLogs({
+				operationId: accepted.operationId,
+				worktreeId,
+				name: accepted.preview.name,
+				path: accepted.preview.path,
+				skipCleanup: accepted.skipCleanup
+			}));
 			const backgroundRemoval = worktreeMutations.enqueue(worktree.projectId, executeRemove(accepted.operationId, worktreeId, accepted.preview.forceRequired)).pipe(Effect.catchAllCause((cause) => Effect.logError(`Background tree removal failed for ${accepted.operationId}: ${Cause.pretty(cause)}`)));
 			yield* applicationFibers.fork(backgroundRemoval);
 			yield* Effect.sync(() => events.publish("remove.started", {
@@ -8119,7 +8129,13 @@ var WorktreeRemovalService = class {
                 UPDATE operations
                 SET request_json=${serializeOperation(request)},updated_at=${now$1()}
                 WHERE id=${operationId}
-              `))), Effect.asVoid);
+              `))), Effect.zipRight(Effect.logInfo("Tree removal phase changed").pipe(Effect.annotateLogs({ phase }))), Effect.asVoid);
+			yield* Effect.logInfo("Tree removal executing").pipe(Effect.annotateLogs({
+				name: preview.name,
+				path: preview.path,
+				phase: request.phase,
+				resumed: operation.status === "running"
+			}));
 			yield* Effect.promise(() => database.db.run(sql`
           UPDATE operations SET status='running',error=NULL,updated_at=${now$1()}
           WHERE id=${operationId}
@@ -8337,6 +8353,10 @@ var WorktreeRemovalService = class {
                 updated_at=${timestamp}
             WHERE id=${operationId}
           `));
+				yield* cleanupWarning ? Effect.logWarning("Tree removal completed with residual files").pipe(Effect.annotateLogs({
+					warning: cleanupWarning,
+					residualPath
+				})) : Effect.logInfo("Tree removal completed");
 				yield* Effect.sync(() => events.publish("remove.completed", {
 					operationId,
 					worktreeId: preview.worktreeId
@@ -8367,6 +8387,11 @@ var WorktreeRemovalService = class {
                     updated_at=${now$1()}
                 WHERE id=${operationId}
               `));
+					yield* Effect.logWarning("Tree removal cleanup failed after Git removal").pipe(Effect.annotateLogs({
+						warning,
+						phase: request.phase,
+						residualPath: preview.path
+					}));
 					yield* Effect.sync(() => events.publish("remove.completed", {
 						operationId,
 						worktreeId: preview.worktreeId
@@ -8378,6 +8403,10 @@ var WorktreeRemovalService = class {
                 SET status='failed',result_json=NULL,error=${message},updated_at=${now$1()}
                 WHERE id=${operationId}
               `));
+					yield* Effect.logError("Tree removal failed; Git kept the tree").pipe(Effect.annotateLogs({
+						error: message,
+						phase: request.phase
+					}));
 					yield* Effect.sync(() => events.publish("remove.failed", {
 						operationId,
 						worktreeId: preview.worktreeId,
@@ -8385,7 +8414,10 @@ var WorktreeRemovalService = class {
 					}));
 				}
 			}));
-		}).pipe(Effect.ensuring(Effect.flatMap(MutationLocks, (locks) => locks.release({ worktreeIds: [lockedWorktreeId] }))));
+		}).pipe(Effect.ensuring(Effect.flatMap(MutationLocks, (locks) => locks.release({ worktreeIds: [lockedWorktreeId] }))), Effect.annotateLogs({
+			operationId,
+			worktreeId: lockedWorktreeId
+		}));
 	}
 	resumeRemove(operationId, worktreeId, force) {
 		return this.executeRemove(operationId, worktreeId, force);
@@ -11860,6 +11892,7 @@ var BrowserSessionManager = class {
 			});
 			const previousController = session.controllerId;
 			let agentControlled = false;
+			let completed = false;
 			try {
 				if (localOwner) {
 					await this.updateScreencast(session, "agent");
@@ -11867,7 +11900,7 @@ var BrowserSessionManager = class {
 				}
 				session.controllerId = "agent";
 				agentControlled = true;
-				this.broadcastState(session, "controlChanged");
+				if (previousController !== "agent") this.broadcastState(session, "controlChanged");
 				if (localOwner) result = await this.executeLocalAgentCommand(session, localOwner, input);
 				else if (this.agentCliRunner) {
 					const name = session.agentSessionName ?? `treeport-${panelId}-${session.generation}-${crypto.randomBytes(6).toString("hex")}`;
@@ -11893,11 +11926,12 @@ var BrowserSessionManager = class {
 					this.queuePanelState(session, browser.state);
 				}
 				await this.waitForPanelState(session);
+				completed = true;
 			} catch (cause) {
 				if (!localOwner) session.agentAttached = false;
 				throw cause;
 			} finally {
-				if (agentControlled) {
+				if (agentControlled && !completed) {
 					if (localOwner && session.localOwner === localOwner) {
 						const nextController = previousController && previousController !== "agent" ? previousController : LOCAL_BROWSER_OWNER_CONTROLLER;
 						if (await this.updateScreencast(session, nextController).then(() => true, () => false)) session.controllerId = nextController;

package/dist/node/server/terminal-host-entry.js

@@ -66,16 +66,21 @@ var TerminalHostSessionManager = class {
 	spawnPty;
 	terminateProcessTree;
 	progressStaleMs;
+	sshAgentDiscovery;
 	shellIntegrationDir;
 	sessions = /* @__PURE__ */ new Map();
 	pendingCleanups = /* @__PURE__ */ new Set();
 	initialization = null;
-	constructor(runtimeDir, launcherPath, spawnPty = pty.spawn, terminateProcessTree = terminatePtyProcessTree, progressStaleMs = TERMINAL_PROGRESS_STALE_MS) {
+	constructor(runtimeDir, launcherPath, spawnPty = pty.spawn, terminateProcessTree = terminatePtyProcessTree, progressStaleMs = TERMINAL_PROGRESS_STALE_MS, sshAgentDiscovery = {
+		platform: process.platform,
+		launchctlPath: "/bin/launchctl"
+	}) {
 		this.runtimeDir = runtimeDir;
 		this.launcherPath = launcherPath;
 		this.spawnPty = spawnPty;
 		this.terminateProcessTree = terminateProcessTree;
 		this.progressStaleMs = progressStaleMs;
+		this.sshAgentDiscovery = sshAgentDiscovery;
 		this.shellIntegrationDir = path.join(runtimeDir, "terminal-shell-integration");
 	}
 	initialize() {
@@ -110,6 +115,18 @@ var TerminalHostSessionManager = class {
 		};
 		const inheritedEnvironment = Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] !== void 0));
 		inheritedEnvironment.TERM = "xterm-256color";
+		if (this.sshAgentDiscovery.platform === "darwin" && inheritedEnvironment.SSH_AUTH_SOCK === void 0 && input.env.SSH_AUTH_SOCK === void 0) await execute(this.sshAgentDiscovery.launchctlPath, ["getenv", "SSH_AUTH_SOCK"], {
+			timeout: 1e3,
+			killSignal: "SIGKILL",
+			maxBuffer: 4096
+		}).then(async ({ stdout }) => {
+			const socket = stdout.trim();
+			if (!socket) return;
+			if (!path.isAbsolute(socket) || /\p{Cc}/u.test(socket) || !(await fs.stat(socket)).isSocket()) throw new Error("Invalid launchd SSH agent socket");
+			inheritedEnvironment.SSH_AUTH_SOCK = socket;
+		}).catch(() => {
+			console.warn("[Treeport terminal host] Could not discover the macOS SSH agent. Continuing without SSH_AUTH_SOCK; check `launchctl getenv SSH_AUTH_SOCK` or set SSH_AUTH_SOCK explicitly for the terminal.");
+		});
 		const directLaunch = integrateShellLaunch(input.argv, {
 			...inheritedEnvironment,
 			...input.env