@pablopunk/webr 0.3.17 → 0.3.19

package/dist/server/chunks/{App_HQFrnQj9.mjs → App_Ch7GmWXO.mjs}

@@ -1,14 +1,14 @@
 import { S as createAstro, f as renderHead, i as renderComponent, m as createRenderInstruction, p as addAttribute, s as renderSlot, u as renderTemplate } from "./server_dfdLOyV2.mjs";
 import { t as createComponent } from "./compiler_BnrQvXXD.mjs";
 import { ViewTransition, createContext, memo, useCallback, useContext, useDeferredValue, useEffect, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
-import { Archive, ArchiveRestore, ArrowDown, ArrowLeft, ArrowRight, ArrowUp, Bot, Check, ChevronDown, ChevronRight, Circle, CircleAlert, CircleArrowUp, CircleCheck, CircleHelp, Command, Copy, Cpu, FileText, Folder, FolderTree, GitBranch, ImagePlus, ImageUp, LayoutList, LoaderCircle, MessageCircleQuestion, Mic, Monitor, Moon, PanelLeft, PanelLeftClose, PanelLeftOpen, Pencil, Plus, Search, Server, Settings2, Square, SquarePen, SquareTerminal, Sun, TerminalSquare, Trash2, TriangleAlert, X } from "lucide-react";
+import { Archive, ArchiveRestore, ArrowDown, ArrowLeft, ArrowRight, ArrowUp, Bot, Check, ChevronDown, ChevronRight, Circle, CircleAlert, CircleArrowUp, CircleCheck, CircleHelp, Command, Copy, Cpu, ExternalLink, FileText, Folder, FolderTree, GitBranch, ImagePlus, ImageUp, LayoutList, LoaderCircle, MessageCircleQuestion, Mic, Monitor, Moon, PanelLeft, PanelLeftClose, PanelLeftOpen, Pencil, Plus, Search, Server, Settings2, Square, SquarePen, SquareTerminal, Sun, TerminalSquare, Trash2, TriangleAlert, X } from "lucide-react";
 import { createRoot } from "react-dom/client";
 import { AlertDialog } from "@base-ui/react/alert-dialog";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { Tooltip } from "@base-ui/react/tooltip";
 import { BotAvatar, botAvatarTypes } from "bot-avatars";
 import { Combobox } from "@base-ui/react/combobox";
-import { QueryClient, QueryClientProvider, useQuery } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider, useQuery, useQueryClient } from "@tanstack/react-query";
 import { Dialog } from "@base-ui/react/dialog";
 import { encode } from "uqr";
 import { ContextMenu } from "@base-ui/react/context-menu";
@@ -1817,24 +1817,40 @@ var hasOwnTextSelection = (target) => {
 	return !!document.getSelection()?.toString();
 };
 function bindTerminalClipboard(host, terminal, canWriteFromTerminalOutput, onCopied) {
+	const reportCopy = (copied) => onCopied(copied ? "copied" : "blocked");
+	let textWaitingForClick;
+	const copyWaitingTextOnUserGesture = () => {
+		const text = textWaitingForClick;
+		textWaitingForClick = void 0;
+		if (text !== void 0) writeClipboardText(text).then(reportCopy);
+	};
+	const copyFromTerminalOutput = (text) => void writeClipboardText(text).then((copied) => {
+		if (copied) return reportCopy(true);
+		textWaitingForClick = text;
+		onCopied("waiting-for-click");
+	});
 	const copySelectionOnRelease = () => {
-		if (terminal.hasSelection()) writeClipboardText(terminal.getSelection()).then(onCopied);
+		if (terminal.hasSelection()) writeClipboardText(terminal.getSelection()).then(reportCopy);
 	};
 	const copySelectionOnShortcut = (event) => {
 		if (event.defaultPrevented || !terminal.hasSelection() || hasOwnTextSelection(event.target)) return;
 		event.clipboardData?.setData("text/plain", terminal.getSelection());
 		event.preventDefault();
-		onCopied(true);
+		reportCopy(true);
 	};
 	const osc52 = terminal.parser.registerOscHandler(OSC_CLIPBOARD, (data) => {
 		const text = decodeOsc52ClipboardWrite(data);
-		if (text !== void 0 && canWriteFromTerminalOutput()) writeClipboardText(text).then(onCopied);
+		if (text !== void 0 && canWriteFromTerminalOutput()) copyFromTerminalOutput(text);
 		return true;
 	});
 	host.addEventListener("mouseup", copySelectionOnRelease);
 	window.addEventListener("copy", copySelectionOnShortcut);
+	window.addEventListener("pointerdown", copyWaitingTextOnUserGesture, true);
+	window.addEventListener("keydown", copyWaitingTextOnUserGesture, true);
 	return () => {
 		osc52.dispose();
+		window.removeEventListener("pointerdown", copyWaitingTextOnUserGesture, true);
+		window.removeEventListener("keydown", copyWaitingTextOnUserGesture, true);
 		host.removeEventListener("mouseup", copySelectionOnRelease);
 		window.removeEventListener("copy", copySelectionOnShortcut);
 	};
@@ -2082,6 +2098,98 @@ function RemoteAccess() {
 	});
 }
 //#endregion
+//#region src/client/update.ts
+var CHECK_MS = 9e5;
+var POLL_MS = 2e3;
+var GIVE_UP_MS = 18e4;
+var fetchStatus = async (signal) => {
+	const response = await fetch("/api/update", { signal });
+	if (!response.ok) throw new Error("Updates are not available.");
+	return await response.json();
+};
+var postCheck = async () => {
+	const response = await fetch("/api/update/check", { method: "POST" });
+	if (!response.ok) throw new Error("Updates are not available.");
+	return await response.json();
+};
+var confirmationMessage = ({ current, latest }) => `Update Webr from ${current} to ${latest}? Webr restarts and this page reloads. Running agents keep working.`;
+function useUpdate() {
+	const [updatingFrom, setUpdatingFrom] = useState();
+	const data = useQuery({
+		queryKey: ["update"],
+		queryFn: ({ signal }) => fetchStatus(signal),
+		refetchInterval: updatingFrom ? POLL_MS : CHECK_MS,
+		refetchOnWindowFocus: !updatingFrom
+	}).data;
+	const stopWaiting = useCallback((message) => {
+		setUpdatingFrom(void 0);
+		alertDialog(message);
+	}, []);
+	useEffect(() => {
+		if (!updatingFrom || !data) return;
+		if (data.current !== updatingFrom) window.location.reload();
+		else if (data.state === "failed") stopWaiting(data.error ?? "The update failed.");
+	}, [
+		updatingFrom,
+		data,
+		stopWaiting
+	]);
+	useEffect(() => {
+		if (!updatingFrom) return;
+		const timer = setTimeout(() => stopWaiting("Webr did not come back after the update. Reload this page, or restart Herdr."), GIVE_UP_MS);
+		return () => clearTimeout(timer);
+	}, [updatingFrom, stopWaiting]);
+	const queryClient = useQueryClient();
+	const [checking, setChecking] = useState(false);
+	const checkNow = useCallback(async () => {
+		setChecking(true);
+		try {
+			queryClient.setQueryData(["update"], await postCheck());
+		} catch {
+			await alertDialog("Webr could not check for updates.");
+		} finally {
+			setChecking(false);
+		}
+	}, [queryClient]);
+	const requestUpdate = useCallback(async () => {
+		if (!data || !await confirmDialog(confirmationMessage(data), { confirmLabel: "Update" })) return;
+		if ((await fetch("/api/update", { method: "POST" }).catch(() => void 0))?.status === 202) setUpdatingFrom(data.current);
+		else await alertDialog("Webr could not start the update.");
+	}, [data]);
+	return {
+		status: data,
+		updating: !!updatingFrom,
+		checking,
+		checkNow,
+		requestUpdate
+	};
+}
+//#endregion
+//#region src/components/UpdateSetting.tsx
+function UpdateSetting() {
+	const { status, updating, checking, checkNow, requestUpdate } = useUpdate();
+	const upToDate = status && !status.available;
+	return /* @__PURE__ */ jsxs("section", { children: [/* @__PURE__ */ jsx("h2", { children: "Updates" }), /* @__PURE__ */ jsxs("div", {
+		className: "settings-row",
+		children: [/* @__PURE__ */ jsxs("span", { children: [status ? `Webr ${status.current}` : "Webr", /* @__PURE__ */ jsx("small", {
+			className: "device-meta",
+			children: status?.available ? `Version ${status.latest} is available.` : upToDate ? "You are on the latest version." : "Checking for updates…"
+		})] }), status?.available ? /* @__PURE__ */ jsx("button", {
+			type: "button",
+			className: "dialog-button is-primary",
+			disabled: updating,
+			onClick: () => void requestUpdate(),
+			children: updating ? "Updating…" : `Update to ${status.latest}`
+		}) : /* @__PURE__ */ jsx("button", {
+			type: "button",
+			className: "dialog-button",
+			disabled: checking || !status,
+			onClick: () => void checkNow(),
+			children: checking ? "Checking…" : "Check for updates"
+		})]
+	})] });
+}
+//#endregion
 //#region src/components/SettingsView.tsx
 function SettingsView({ onOpenSidebar }) {
 	const [behavior, setBehavior] = useState("worktree");
@@ -2128,6 +2236,7 @@ function SettingsView({ onOpenSidebar }) {
 				children: "Threads"
 			}),
 			/* @__PURE__ */ jsx("h1", { children: "Settings" }),
+			/* @__PURE__ */ jsx(UpdateSetting, {}),
 			/* @__PURE__ */ jsxs("section", { children: [/* @__PURE__ */ jsx("h2", { children: "Appearance" }), /* @__PURE__ */ jsxs("div", {
 				className: "settings-row",
 				children: [/* @__PURE__ */ jsx("span", { children: "Theme" }), /* @__PURE__ */ jsx(ThemeControl, { expanded: true })]
@@ -3036,54 +3145,6 @@ function Sidebar({ projects, threads, archived = [], machines, currentId, mode,
 	})] });
 }
 //#endregion
-//#region src/client/update.ts
-var CHECK_MS = 9e5;
-var POLL_MS = 2e3;
-var GIVE_UP_MS = 18e4;
-var fetchStatus = async (signal) => {
-	const response = await fetch("/api/update", { signal });
-	if (!response.ok) throw new Error("Updates are not available.");
-	return await response.json();
-};
-var confirmationMessage = ({ current, latest }) => `Update Webr from ${current} to ${latest}? Webr restarts and this page reloads. Running agents keep working.`;
-function useUpdate() {
-	const [updatingFrom, setUpdatingFrom] = useState();
-	const data = useQuery({
-		queryKey: ["update"],
-		queryFn: ({ signal }) => fetchStatus(signal),
-		refetchInterval: updatingFrom ? POLL_MS : CHECK_MS,
-		refetchOnWindowFocus: !updatingFrom
-	}).data;
-	const stopWaiting = useCallback((message) => {
-		setUpdatingFrom(void 0);
-		alertDialog(message);
-	}, []);
-	useEffect(() => {
-		if (!updatingFrom || !data) return;
-		if (data.current !== updatingFrom) window.location.reload();
-		else if (data.state === "failed") stopWaiting(data.error ?? "The update failed.");
-	}, [
-		updatingFrom,
-		data,
-		stopWaiting
-	]);
-	useEffect(() => {
-		if (!updatingFrom) return;
-		const timer = setTimeout(() => stopWaiting("Webr did not come back after the update. Reload this page, or restart Herdr."), GIVE_UP_MS);
-		return () => clearTimeout(timer);
-	}, [updatingFrom, stopWaiting]);
-	const requestUpdate = useCallback(async () => {
-		if (!data || !await confirmDialog(confirmationMessage(data), { confirmLabel: "Update" })) return;
-		if ((await fetch("/api/update", { method: "POST" }).catch(() => void 0))?.status === 202) setUpdatingFrom(data.current);
-		else await alertDialog("Webr could not start the update.");
-	}, [data]);
-	return {
-		status: data,
-		updating: !!updatingFrom,
-		requestUpdate
-	};
-}
-//#endregion
 //#region src/components/UpdateButton.tsx
 function UpdateButton() {
 	const { status, updating, requestUpdate } = useUpdate();
@@ -4020,9 +4081,88 @@ function useImageAttachments({ machineId, active, writable, send, show }) {
 }
 //#endregion
 //#region src/client/terminal-links.ts
-function openLinkOnModifierClick(event, uri) {
-	if (!event.metaKey && !event.ctrlKey) return;
-	window.open(uri, "_blank", "noopener,noreferrer");
+var URL_PATTERN = /https?:\/\/[^\s"'<>`]+/g;
+var TRAILING_PUNCTUATION = /[.,;:!?)\]}]+$/;
+var hasOpenModifier = (event) => event.metaKey || event.ctrlKey;
+function logicalLineAt(terminal, row) {
+	const buffer = terminal.buffer.active;
+	let first = row;
+	while (first > 0 && buffer.getLine(first)?.isWrapped) first--;
+	let text = "";
+	let last = first;
+	for (let index = first; buffer.getLine(index) && (index === first || buffer.getLine(index).isWrapped); index++) {
+		text += buffer.getLine(index).translateToString(false, 0, terminal.cols);
+		last = index;
+	}
+	return {
+		text,
+		offset: (row - first) * terminal.cols,
+		last
+	};
+}
+function urlAtCell(terminal, column, row) {
+	const { text, offset } = logicalLineAt(terminal, row);
+	const position = offset + column;
+	for (const match of text.matchAll(URL_PATTERN)) {
+		const url = match[0].replace(TRAILING_PUNCTUATION, "");
+		if (position >= match.index && position < match.index + url.length) return url;
+	}
+}
+var trimmedLines = (text) => text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+var WHOLE_URL = /^https?:\/\/[^\s"'<>`]+$/;
+function urlFromSelection(selection) {
+	const joined = trimmedLines(selection).join("").replace(TRAILING_PUNCTUATION, "");
+	return WHOLE_URL.test(joined) ? joined : void 0;
+}
+var openUrlInNewTab = (url) => {
+	window.open(url, "_blank", "noopener,noreferrer");
+};
+function openLinkUnderModifierClick(terminal, event) {
+	const rect = (terminal.element?.querySelector(".xterm-screen"))?.getBoundingClientRect();
+	if (!hasOpenModifier(event) || !rect?.width || !rect.height) return;
+	const url = urlAtCell(terminal, Math.floor((event.clientX - rect.left) / rect.width * terminal.cols), Math.floor((event.clientY - rect.top) / rect.height * terminal.rows) + terminal.buffer.active.viewportY);
+	if (url) openUrlInNewTab(url);
+}
+//#endregion
+//#region src/components/TerminalUrlActions.tsx
+var keepSelection = (event) => {
+	event.preventDefault();
+	event.stopPropagation();
+};
+function TerminalUrlActions({ selected, onDone, onCopied }) {
+	return /* @__PURE__ */ jsxs("div", {
+		className: "terminal-url-actions",
+		role: "toolbar",
+		"aria-label": "Selected link",
+		style: {
+			left: selected.x,
+			top: selected.y
+		},
+		onMouseDown: keepSelection,
+		onPointerDown: (event) => event.stopPropagation(),
+		onClick: (event) => event.stopPropagation(),
+		children: [/* @__PURE__ */ jsxs("button", {
+			type: "button",
+			onClick: () => {
+				openUrlInNewTab(selected.url);
+				onDone();
+			},
+			children: [/* @__PURE__ */ jsx(ExternalLink, {
+				size: 14,
+				strokeWidth: 1.8
+			}), "Open link"]
+		}), /* @__PURE__ */ jsxs("button", {
+			type: "button",
+			onClick: () => {
+				writeClipboardText(selected.url).then(onCopied);
+				onDone();
+			},
+			children: [/* @__PURE__ */ jsx(Copy, {
+				size: 14,
+				strokeWidth: 1.8
+			}), "Copy link"]
+		})]
+	});
 }
 //#endregion
 //#region src/components/useTerminalNotice.ts
@@ -4281,6 +4421,7 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 	const [inputFocused, setInputFocused] = useState(false);
 	const [ctrl, setCtrl] = useState(false);
 	const [touch, setTouch] = useState(false);
+	const [selectedUrl, setSelectedUrl] = useState(null);
 	useEffect(() => setTouch(matchesCoarsePointer()), []);
 	const { notice, show } = useTerminalNotice();
 	const images = useImageAttachments({
@@ -4298,8 +4439,8 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 			control.current?.input(text, true);
 		}
 	});
-	const showCopyResult = useRef((copied) => {});
-	showCopyResult.current = (copied) => copied ? show("Copied to clipboard", "info", 1200) : show("The browser blocked clipboard access.", "error", 4e3);
+	const showCopyResult = useRef((outcome) => {});
+	showCopyResult.current = (outcome) => outcome === "copied" ? show("Copied to clipboard", "info", 1200) : outcome === "waiting-for-click" ? show("Click or press a key to finish copying.", "info", 6e3) : show("The browser blocked clipboard access.", "error", 4e3);
 	useEffect(() => {
 		if (!host.current) return;
 		let disposed = false;
@@ -4333,7 +4474,7 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 				if (writableRef.current) host.current?.parentElement?.querySelector(".terminal-input-capture")?.focus();
 			};
 			terminal.textarea?.addEventListener("focus", redirectFocus);
-			const clipboard = bindTerminalClipboard(host.current, terminal, () => writableRef.current, (copied) => showCopyResult.current(copied));
+			const clipboard = bindTerminalClipboard(host.current, terminal, () => writableRef.current, (outcome) => showCopyResult.current(outcome));
 			const links = terminal.parser.registerOscHandler(8, () => true);
 			if (!pane.terminalId) {
 				clipboard();
@@ -4342,7 +4483,24 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 			}
 			const fit = new FitAddon();
 			terminal.loadAddon(fit);
-			terminal.loadAddon(new WebLinksAddon(openLinkOnModifierClick));
+			terminal.loadAddon(new WebLinksAddon(() => {}));
+			const openLink = (event) => openLinkUnderModifierClick(terminal, event);
+			const hostElement = host.current;
+			hostElement.addEventListener("mouseup", openLink);
+			const offerSelectedUrl = (event) => {
+				const url = terminal.hasSelection() ? urlFromSelection(terminal.getSelection()) : void 0;
+				const origin = section.current?.getBoundingClientRect();
+				setSelectedUrl(url && origin ? {
+					url,
+					x: event.clientX - origin.left,
+					y: event.clientY - origin.top
+				} : null);
+			};
+			const withdrawUrlOffer = () => {
+				if (!terminal.hasSelection()) setSelectedUrl(null);
+			};
+			hostElement.addEventListener("mouseup", offerSelectedUrl);
+			const selection = terminal.onSelectionChange(withdrawUrlOffer);
 			const estimatedViewport = () => ({
 				cols: Math.floor((host.current?.clientWidth ?? 640) / 8),
 				rows: Math.floor((host.current?.clientHeight ?? 400) / 20)
@@ -4414,6 +4572,10 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 				document.removeEventListener("visibilitychange", claimSize);
 				terminal.textarea?.removeEventListener("focus", redirectFocus);
 				clipboard();
+				hostElement.removeEventListener("mouseup", openLink);
+				hostElement.removeEventListener("mouseup", offerSelectedUrl);
+				selection.dispose();
+				setSelectedUrl(null);
 				links.dispose();
 				resize.disconnect();
 				colorObserver.disconnect();
@@ -4545,6 +4707,14 @@ function TerminalPane({ pane, machineId, threadId, active, canControl, onFocus }
 					strokeWidth: 1.6
 				}), /* @__PURE__ */ jsx("span", { children: "Drop image to attach" })]
 			}),
+			selectedUrl && /* @__PURE__ */ jsx(TerminalUrlActions, {
+				selected: selectedUrl,
+				onDone: () => {
+					setSelectedUrl(null);
+					term.current?.clearSelection();
+				},
+				onCopied: (copied) => showCopyResult.current(copied ? "copied" : "blocked")
+			}),
 			notice && /* @__PURE__ */ jsx("div", {
 				className: `terminal-attach-notice is-${notice.tone}`,
 				role: notice.tone === "error" ? "alert" : "status",

package/dist/server/chunks/{_id__Bhub9N4a.mjs → _id__Ba8WQNWp.mjs}

@@ -1,6 +1,6 @@
 import { S as createAstro, V as __exportAll, i as renderComponent, u as renderTemplate } from "./server_dfdLOyV2.mjs";
 import { t as createComponent } from "./compiler_BnrQvXXD.mjs";
-import { n as $$Base, t as App } from "./App_HQFrnQj9.mjs";
+import { n as $$Base, t as App } from "./App_Ch7GmWXO.mjs";
 //#region src/pages/threads/[id].astro
 var _id__exports = /* @__PURE__ */ __exportAll({
 	default: () => $$Id,

package/dist/server/chunks/{_tab__DJZZZJmr.mjs → _tab__BEI4cb-5.mjs}

@@ -1,6 +1,6 @@
 import { S as createAstro, V as __exportAll, i as renderComponent, u as renderTemplate } from "./server_dfdLOyV2.mjs";
 import { t as createComponent } from "./compiler_BnrQvXXD.mjs";
-import { n as $$Base, t as App } from "./App_HQFrnQj9.mjs";
+import { n as $$Base, t as App } from "./App_Ch7GmWXO.mjs";
 //#region src/pages/sessions/[session]/tabs/[tab].astro
 var _tab__exports = /* @__PURE__ */ __exportAll({
 	default: () => $$Tab,

package/dist/server/chunks/{new_BWEe2CpA.mjs → new_CM9fzfm6.mjs}

@@ -1,6 +1,6 @@
 import { S as createAstro, V as __exportAll, i as renderComponent, u as renderTemplate } from "./server_dfdLOyV2.mjs";
 import { t as createComponent } from "./compiler_BnrQvXXD.mjs";
-import { n as $$Base, t as App } from "./App_HQFrnQj9.mjs";
+import { n as $$Base, t as App } from "./App_Ch7GmWXO.mjs";
 //#region src/pages/new.astro
 var new_exports = /* @__PURE__ */ __exportAll({
 	default: () => $$New,

package/dist/server/chunks/{settings_D6oHTDVP.mjs → settings_D4hVr2qz.mjs}

@@ -1,6 +1,6 @@
 import { S as createAstro, V as __exportAll, i as renderComponent, u as renderTemplate } from "./server_dfdLOyV2.mjs";
 import { t as createComponent } from "./compiler_BnrQvXXD.mjs";
-import { n as $$Base, t as App } from "./App_HQFrnQj9.mjs";
+import { n as $$Base, t as App } from "./App_Ch7GmWXO.mjs";
 //#region src/pages/settings.astro
 var settings_exports = /* @__PURE__ */ __exportAll({
 	default: () => $$Settings,

package/dist/server/entry.mjs

@@ -2426,10 +2426,10 @@ var renderers = [Object.assign({
 //#endregion
 //#region \0virtual:astro:pages
 var _page0 = () => import("./chunks/node_C8FqXy_n.mjs").then((n) => n.t);
-var _page1 = () => import("./chunks/new_BWEe2CpA.mjs");
-var _page2 = () => import("./chunks/_tab__DJZZZJmr.mjs");
-var _page3 = () => import("./chunks/settings_D6oHTDVP.mjs");
-var _page4 = () => import("./chunks/_id__Bhub9N4a.mjs");
+var _page1 = () => import("./chunks/new_CM9fzfm6.mjs");
+var _page2 = () => import("./chunks/_tab__BEI4cb-5.mjs");
+var _page3 = () => import("./chunks/settings_D4hVr2qz.mjs");
+var _page4 = () => import("./chunks/_id__Ba8WQNWp.mjs");
 var _page5 = () => import("./chunks/index_Bvv1gpI0.mjs");
 var pageMap = /* @__PURE__ */ new Map([
 	["node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node.js", _page0],
@@ -2441,7 +2441,7 @@ var pageMap = /* @__PURE__ */ new Map([
 ]);
 //#endregion
 //#region \0virtual:astro:manifest
-var _manifest = deserializeManifest({"rootDir":"file:///home/runner/work/webr/webr/","cacheDir":"file:///home/runner/work/webr/webr/node_modules/.astro/","outDir":"file:///home/runner/work/webr/webr/dist/","srcDir":"file:///home/runner/work/webr/webr/src/","publicDir":"file:///home/runner/work/webr/webr/public/","buildClientDir":"file:///home/runner/work/webr/webr/dist/client/","buildServerDir":"file:///home/runner/work/webr/webr/dist/server/","adapterName":"@astrojs/node","assetsDir":"_astro","routes":[{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"type":"page","component":"_server-islands.astro","params":["name"],"segments":[[{"content":"_server-islands","dynamic":false,"spread":false}],[{"content":"name","dynamic":true,"spread":false}]],"pattern":"^\\/_server-islands\\/([^/]+?)\\/?$","prerender":false,"isIndex":false,"fallbackRoutes":[],"route":"/_server-islands/[name]","origin":"internal","distURL":[],"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/_image","component":"node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node.js","params":[],"pathname":"/_image","pattern":"^\\/_image\\/?$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"type":"endpoint","prerender":false,"fallbackRoutes":[],"distURL":[],"isIndex":false,"origin":"internal","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.L92siqEU.css"}],"routeData":{"route":"/new","isIndex":false,"type":"page","pattern":"^\\/new\\/?$","segments":[[{"content":"new","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/new.astro","pathname":"/new","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.L92siqEU.css"}],"routeData":{"route":"/sessions/[session]/tabs/[tab]","isIndex":false,"type":"page","pattern":"^\\/sessions\\/([^/]+?)\\/tabs\\/([^/]+?)\\/?$","segments":[[{"content":"sessions","dynamic":false,"spread":false}],[{"content":"session","dynamic":true,"spread":false}],[{"content":"tabs","dynamic":false,"spread":false}],[{"content":"tab","dynamic":true,"spread":false}]],"params":["session","tab"],"component":"src/pages/sessions/[session]/tabs/[tab].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.L92siqEU.css"}],"routeData":{"route":"/settings","isIndex":false,"type":"page","pattern":"^\\/settings\\/?$","segments":[[{"content":"settings","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/settings.astro","pathname":"/settings","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.L92siqEU.css"}],"routeData":{"route":"/threads/[id]","isIndex":false,"type":"page","pattern":"^\\/threads\\/([^/]+?)\\/?$","segments":[[{"content":"threads","dynamic":false,"spread":false}],[{"content":"id","dynamic":true,"spread":false}]],"params":["id"],"component":"src/pages/threads/[id].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/","isIndex":true,"type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}}],"serverLike":true,"middlewareMode":"classic","base":"/","trailingSlash":"ignore","compressHTML":"jsx","componentMetadata":[["/home/runner/work/webr/webr/src/pages/new.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/sessions/[session]/tabs/[tab].astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/settings.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/threads/[id].astro",{"propagation":"none","containsHead":true}]],"renderers":[],"clientDirectives":[["idle","(()=>{var l=(n,t)=>{let i=async()=>{await(await n())()},e=typeof t.value==\"object\"?t.value:void 0,s={timeout:e==null?void 0:e.timeout};\"requestIdleCallback\"in window?window.requestIdleCallback(i,s):setTimeout(i,s.timeout||200)};(self.Astro||(self.Astro={})).idle=l;window.dispatchEvent(new Event(\"astro:idle\"));})();"],["load","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event(\"astro:load\"));})();"],["media","(()=>{var n=(a,t)=>{let i=async()=>{await(await a())()};if(t.value){let e=matchMedia(t.value);e.matches?i():e.addEventListener(\"change\",i,{once:!0})}};(self.Astro||(self.Astro={})).media=n;window.dispatchEvent(new Event(\"astro:media\"));})();"],["only","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event(\"astro:only\"));})();"],["visible","(()=>{var a=(s,i,o)=>{let r=async()=>{await(await s())()},t=typeof i.value==\"object\"?i.value:void 0,c={rootMargin:t==null?void 0:t.rootMargin},n=new IntersectionObserver(e=>{for(let l of e)if(l.isIntersecting){n.disconnect(),r();break}},c);for(let e of o.children)n.observe(e)};(self.Astro||(self.Astro={})).visible=a;window.dispatchEvent(new Event(\"astro:visible\"));})();"]],"entryModules":{"\u0000noop-middleware":"virtual_astro_middleware.mjs","\u0000virtual:astro:server-island-manifest":"chunks/_virtual_astro_server-island-manifest_C1Q2srgE.mjs","\u0000virtual:astro:session-driver":"chunks/_virtual_astro_session-driver_Dp7RXjOf.mjs","\u0000virtual:astro:actions/noop-entrypoint":"chunks/noop-entrypoint_Z3zFhrGC.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/@astrojs+react@7.0.0_@types+node@22.20.4_@types+react-dom@19.3.0_@types+react@19.3.0__@_02aa85dceaccf3d763325676dd8540a8/node_modules/@astrojs/react/dist/vnode-children.js":"chunks/vnode-children_BSi0H4PL.mjs","@astrojs/node/server.js":"entry.mjs","\u0000virtual:astro:page:src/pages/threads/[id]@_@astro":"chunks/_id__Bhub9N4a.mjs","\u0000virtual:astro:page:src/pages/sessions/[session]/tabs/[tab]@_@astro":"chunks/_tab__DJZZZJmr.mjs","\u0000virtual:astro:page:src/pages/index@_@astro":"chunks/index_Bvv1gpI0.mjs","\u0000virtual:astro:page:src/pages/new@_@astro":"chunks/new_BWEe2CpA.mjs","\u0000virtual:astro:page:node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node@_@js":"chunks/node_C8FqXy_n.mjs","\u0000virtual:astro:page:src/pages/settings@_@astro":"chunks/settings_D6oHTDVP.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/services/sharp.js":"chunks/sharp_8J8zk4Wd.mjs","/home/runner/work/webr/webr/src/components/App.tsx":"_astro/App.D4o88FA4.js","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/components/ClientRouter.astro?astro&type=script&index=0&lang.ts":"_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","@astrojs/react/client.js":"_astro/client.BDkzSRUN.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-fit@0.10.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-fit/lib/addon-fit.js":"_astro/addon-fit.jgKqzwky.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-web-links@0.11.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-web-links/lib/addon-web-links.js":"_astro/addon-web-links.C9lyQRxI.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-webgl@0.18.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-webgl/lib/addon-webgl.js":"_astro/addon-webgl.Bd5ox92E.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+xterm@5.5.0/node_modules/@xterm/xterm/lib/xterm.js":"_astro/xterm.B-l5AIf6.js","astro:scripts/before-hydration.js":""},"inlinedScripts":[],"assets":["/apple-touch-icon.png","/brand-mark.png","/favicon-16.png","/favicon-32.png","/favicon.ico","/icon-192.png","/icon-512.png","/icon-maskable-512.png","/manifest.webmanifest","/_astro/App.D4o88FA4.js","/_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","/_astro/addon-fit.jgKqzwky.js","/_astro/addon-web-links.C9lyQRxI.js","/_astro/addon-webgl.Bd5ox92E.js","/_astro/client.BDkzSRUN.js","/_astro/client.Bbg9OBwT.js","/_astro/client.CLSsMr2g.js","/_astro/xterm.B-l5AIf6.js","/_astro/App.L92siqEU.css","/_astro/jetbrains-mono.CFJaiWaY.woff2","/_astro/symbols-nerd.CEdkKAK8.woff2"],"buildFormat":"directory","checkOrigin":true,"actionBodySizeLimit":1048576,"serverIslandBodySizeLimit":1048576,"allowedDomains":[],"key":"BqKCg7f1I+KEbVUuq6rLEnIDbECo8zUbBRCH+qBFMbo=","sessionConfig":{"driver":"unstorage/drivers/fs-lite","options":{"base":"/home/runner/work/webr/webr/node_modules/.astro/sessions"}},"image":{},"devToolbar":{"enabled":false,"debugInfoOutput":""},"logLevel":"info","shouldInjectCspMetaTags":false});
+var _manifest = deserializeManifest({"rootDir":"file:///home/runner/work/webr/webr/","cacheDir":"file:///home/runner/work/webr/webr/node_modules/.astro/","outDir":"file:///home/runner/work/webr/webr/dist/","srcDir":"file:///home/runner/work/webr/webr/src/","publicDir":"file:///home/runner/work/webr/webr/public/","buildClientDir":"file:///home/runner/work/webr/webr/dist/client/","buildServerDir":"file:///home/runner/work/webr/webr/dist/server/","adapterName":"@astrojs/node","assetsDir":"_astro","routes":[{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"type":"page","component":"_server-islands.astro","params":["name"],"segments":[[{"content":"_server-islands","dynamic":false,"spread":false}],[{"content":"name","dynamic":true,"spread":false}]],"pattern":"^\\/_server-islands\\/([^/]+?)\\/?$","prerender":false,"isIndex":false,"fallbackRoutes":[],"route":"/_server-islands/[name]","origin":"internal","distURL":[],"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/_image","component":"node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node.js","params":[],"pathname":"/_image","pattern":"^\\/_image\\/?$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"type":"endpoint","prerender":false,"fallbackRoutes":[],"distURL":[],"isIndex":false,"origin":"internal","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.DroHhgBz.css"}],"routeData":{"route":"/new","isIndex":false,"type":"page","pattern":"^\\/new\\/?$","segments":[[{"content":"new","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/new.astro","pathname":"/new","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.DroHhgBz.css"}],"routeData":{"route":"/sessions/[session]/tabs/[tab]","isIndex":false,"type":"page","pattern":"^\\/sessions\\/([^/]+?)\\/tabs\\/([^/]+?)\\/?$","segments":[[{"content":"sessions","dynamic":false,"spread":false}],[{"content":"session","dynamic":true,"spread":false}],[{"content":"tabs","dynamic":false,"spread":false}],[{"content":"tab","dynamic":true,"spread":false}]],"params":["session","tab"],"component":"src/pages/sessions/[session]/tabs/[tab].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.DroHhgBz.css"}],"routeData":{"route":"/settings","isIndex":false,"type":"page","pattern":"^\\/settings\\/?$","segments":[[{"content":"settings","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/settings.astro","pathname":"/settings","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[{"type":"external","src":"_astro/App.DroHhgBz.css"}],"routeData":{"route":"/threads/[id]","isIndex":false,"type":"page","pattern":"^\\/threads\\/([^/]+?)\\/?$","segments":[[{"content":"threads","dynamic":false,"spread":false}],[{"content":"id","dynamic":true,"spread":false}]],"params":["id"],"component":"src/pages/threads/[id].astro","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"styles":[],"routeData":{"route":"/","isIndex":true,"type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"fallbackRoutes":[],"distURL":[],"origin":"project","_meta":{"trailingSlash":"ignore"}}}],"serverLike":true,"middlewareMode":"classic","base":"/","trailingSlash":"ignore","compressHTML":"jsx","componentMetadata":[["/home/runner/work/webr/webr/src/pages/new.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/sessions/[session]/tabs/[tab].astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/settings.astro",{"propagation":"none","containsHead":true}],["/home/runner/work/webr/webr/src/pages/threads/[id].astro",{"propagation":"none","containsHead":true}]],"renderers":[],"clientDirectives":[["idle","(()=>{var l=(n,t)=>{let i=async()=>{await(await n())()},e=typeof t.value==\"object\"?t.value:void 0,s={timeout:e==null?void 0:e.timeout};\"requestIdleCallback\"in window?window.requestIdleCallback(i,s):setTimeout(i,s.timeout||200)};(self.Astro||(self.Astro={})).idle=l;window.dispatchEvent(new Event(\"astro:idle\"));})();"],["load","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).load=e;window.dispatchEvent(new Event(\"astro:load\"));})();"],["media","(()=>{var n=(a,t)=>{let i=async()=>{await(await a())()};if(t.value){let e=matchMedia(t.value);e.matches?i():e.addEventListener(\"change\",i,{once:!0})}};(self.Astro||(self.Astro={})).media=n;window.dispatchEvent(new Event(\"astro:media\"));})();"],["only","(()=>{var e=async t=>{await(await t())()};(self.Astro||(self.Astro={})).only=e;window.dispatchEvent(new Event(\"astro:only\"));})();"],["visible","(()=>{var a=(s,i,o)=>{let r=async()=>{await(await s())()},t=typeof i.value==\"object\"?i.value:void 0,c={rootMargin:t==null?void 0:t.rootMargin},n=new IntersectionObserver(e=>{for(let l of e)if(l.isIntersecting){n.disconnect(),r();break}},c);for(let e of o.children)n.observe(e)};(self.Astro||(self.Astro={})).visible=a;window.dispatchEvent(new Event(\"astro:visible\"));})();"]],"entryModules":{"\u0000noop-middleware":"virtual_astro_middleware.mjs","\u0000virtual:astro:server-island-manifest":"chunks/_virtual_astro_server-island-manifest_C1Q2srgE.mjs","\u0000virtual:astro:session-driver":"chunks/_virtual_astro_session-driver_Dp7RXjOf.mjs","\u0000virtual:astro:actions/noop-entrypoint":"chunks/noop-entrypoint_Z3zFhrGC.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/@astrojs+react@7.0.0_@types+node@22.20.4_@types+react-dom@19.3.0_@types+react@19.3.0__@_02aa85dceaccf3d763325676dd8540a8/node_modules/@astrojs/react/dist/vnode-children.js":"chunks/vnode-children_BSi0H4PL.mjs","@astrojs/node/server.js":"entry.mjs","\u0000virtual:astro:page:src/pages/threads/[id]@_@astro":"chunks/_id__Ba8WQNWp.mjs","\u0000virtual:astro:page:src/pages/sessions/[session]/tabs/[tab]@_@astro":"chunks/_tab__BEI4cb-5.mjs","\u0000virtual:astro:page:src/pages/index@_@astro":"chunks/index_Bvv1gpI0.mjs","\u0000virtual:astro:page:src/pages/new@_@astro":"chunks/new_CM9fzfm6.mjs","\u0000virtual:astro:page:node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/endpoint/node@_@js":"chunks/node_C8FqXy_n.mjs","\u0000virtual:astro:page:src/pages/settings@_@astro":"chunks/settings_D4hVr2qz.mjs","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/dist/assets/services/sharp.js":"chunks/sharp_8J8zk4Wd.mjs","/home/runner/work/webr/webr/src/components/App.tsx":"_astro/App.Ho8QFCCQ.js","/home/runner/work/webr/webr/node_modules/.pnpm/astro@7.3.5_@types+node@22.20.4_tsx@4.23.15_yaml@2.9.1/node_modules/astro/components/ClientRouter.astro?astro&type=script&index=0&lang.ts":"_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","@astrojs/react/client.js":"_astro/client.BDkzSRUN.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-fit@0.10.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-fit/lib/addon-fit.js":"_astro/addon-fit.jgKqzwky.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-web-links@0.11.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-web-links/lib/addon-web-links.js":"_astro/addon-web-links.C9lyQRxI.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+addon-webgl@0.18.0_@xterm+xterm@5.5.0/node_modules/@xterm/addon-webgl/lib/addon-webgl.js":"_astro/addon-webgl.Bd5ox92E.js","/home/runner/work/webr/webr/node_modules/.pnpm/@xterm+xterm@5.5.0/node_modules/@xterm/xterm/lib/xterm.js":"_astro/xterm.B-l5AIf6.js","astro:scripts/before-hydration.js":""},"inlinedScripts":[],"assets":["/apple-touch-icon.png","/brand-mark.png","/favicon-16.png","/favicon-32.png","/favicon.ico","/icon-192.png","/icon-512.png","/icon-maskable-512.png","/manifest.webmanifest","/_astro/App.Ho8QFCCQ.js","/_astro/ClientRouter.astro_astro_type_script_index_0_lang.CTgtIFyY.js","/_astro/addon-fit.jgKqzwky.js","/_astro/addon-web-links.C9lyQRxI.js","/_astro/addon-webgl.Bd5ox92E.js","/_astro/client.BDkzSRUN.js","/_astro/client.Bbg9OBwT.js","/_astro/client.CLSsMr2g.js","/_astro/xterm.B-l5AIf6.js","/_astro/App.DroHhgBz.css","/_astro/jetbrains-mono.CFJaiWaY.woff2","/_astro/symbols-nerd.CEdkKAK8.woff2"],"buildFormat":"directory","checkOrigin":true,"actionBodySizeLimit":1048576,"serverIslandBodySizeLimit":1048576,"allowedDomains":[],"key":"MindeMlzE0aK1tV4qZ1g2UuMX9PGXHBF6/QvgWI+3fE=","sessionConfig":{"driver":"unstorage/drivers/fs-lite","options":{"base":"/home/runner/work/webr/webr/node_modules/.astro/sessions"}},"image":{},"devToolbar":{"enabled":false,"debugInfoOutput":""},"logLevel":"info","shouldInjectCspMetaTags":false});
 var manifestRoutes = _manifest.routes;
 var manifest = Object.assign(_manifest, {
 	renderers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pablopunk/webr",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "Control your Herdr agents from anywhere.",
   "keywords": [
     "herdr",

package/server/update/service.ts

@@ -72,6 +72,11 @@ export class UpdateService implements Updates {
     if (latest) writeCachedLatest(latest, this.env);
   }
 
+  async check(): Promise<UpdateStatus> {
+    await this.refresh();
+    return this.status();
+  }
+
   status(): UpdateStatus {
     const { version: current } = packageInfo();
     const latest = readCachedLatest(this.env)?.latest ?? current;

package/src/server/host.ts

@@ -56,6 +56,7 @@ export async function createHost(manager: RuntimeManager, origin: string, ssr?:
   if (transcriber) registerVoiceRoutes(app, transcriber);
   if (updates) {
     app.get('/api/update', async () => updates.status());
+    app.post('/api/update/check', async () => updates.check());
     app.post('/api/update', async (_request, reply) => { const status = updates.start(); return reply.code(status.state === 'updating' ? 202 : 409).send(status); });
   }
   app.get('/api/catalog/machines', async () => manager.bootstrap().machines);

package/src/shared/update.ts

@@ -2,4 +2,4 @@ export type UpdateState = 'idle' | 'updating' | 'failed';
 
 export type UpdateStatus = { current: string; latest: string; available: boolean; state: UpdateState; error?: string };
 
-export type Updates = { status: () => UpdateStatus; start: () => UpdateStatus };
+export type Updates = { status: () => UpdateStatus; check: () => Promise<UpdateStatus>; start: () => UpdateStatus };