@wular/coder 0.4.7 → 0.4.8

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{tasks/list/tasks-list.2a0e1eb5c396be42.js → [org]/tasks/list/tasks-list.0976f1812d6d15f5.js}

@@ -1,34 +1,34 @@
 "use client";
-import "./tasks-list.291e81e56d54513c.css.pnext-asset.js";
-import { dynamic } from "../../../../../../../../../node_modules/@wular/pnext/src/api/dynamic.tsx";
-import { useEffect, useRef, useState } from "../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
-import { client } from "../../../../utils/client.a8205c524e63d4a9.js";
-import { formatCount, formatDate, formatDay, formatDuration } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
-import { iAgent, iClock, iDots, iFolder, iMonitor, iPlug, iPlus, iTerminal } from "../../../../comps/ui/icons.1777c0350d5d215e.js";
-import { Menu, MenuItem } from "../../../../comps/ui/menu.a4dd9fb9f566689a.js";
-import { Link } from "../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
-import { useRouter } from "../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
-import { usePaged } from "../../../../utils/paged.7e5713a82abf0211.js";
-import { BrandIcon } from "../../agents/agent/agent-pills.6a0eea1ec99dffd7.js";
-import { Card, Empty } from "../../../../comps/ui/card.b0873d38765c9d20.js";
-import { Id } from "../../../../comps/ui/badge.5abdef72e9189fdc.js";
-import { ConfirmDialog } from "../../../../comps/ui/confirm.1328a7ede6c27bb9.js";
-import { ErrorText } from "../../../../comps/ui/field.7b2a2075ee8c6e29.js";
-import { approvalParts } from "../[id]/task-actions.ee523c68a38a7975.js";
-import { reasonText } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
-import { Status } from "./status.b90b76ffa62e957a.js";
-import { Icon } from "../../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { Filter } from "../../../../comps/ui/filter.f19b6d5ebd6a3c2b.js";
-import { addRows, listOrder, taskActive, withAdded } from "./task.465c2af602cce783.js";
-import { taskTitle } from "./task.465c2af602cce783.js";
-import { LIST_PAGE } from "../../../../utils/paged.7e5713a82abf0211.js";
-import { Search, Toolbar, queryOf, useFilters } from "../../../../comps/ui/toolbar.b2c59c5fc015d08d.js";
-import { Tail } from "../../../../comps/ui/tail.9377d261fe9e91df.js";
-import { SOURCES, STATUSES, folderName, listFilters, sourceLabel } from "./task.465c2af602cce783.js";
-import { NeedsCredential } from "../composer.f232cc1bf2d7b08a.js";
-import { useTaskEvents } from "../../../../comps/frame/task-toasts.10b46a8b8db1791f.js";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
-const NewTaskButton = dynamic(() => import("../composer.f232cc1bf2d7b08a.js").then((m) => m.NewTaskButton), { 
+import "./tasks-list.2282a7cef8b15bd8.css.pnext-asset.js";
+import { dynamic } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/dynamic.tsx";
+import { useEffect, useRef, useState } from "../../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
+import { client } from "../../../../../utils/client.d25e6dcc6704eb60.js";
+import { useAction } from "../../../../../utils/action.568346602027ac74.js";
+import { formatCount, formatDate, formatDay, formatDuration } from "../../../../../utils/format.6a7d1beaf4d09d9c.js";
+import { iAgent, iClock, iDots, iFolder, iMonitor, iPlug, iPlus, iTerminal } from "../../../../../comps/ui/icons.868385119bf2de28.js";
+import { Menu, MenuItem } from "../../../../../comps/ui/menu.0f064f75822888be.js";
+import { Link } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
+import { useRouter } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
+import { usePaged } from "../../../../../utils/paged.18f5872fc5aebe96.js";
+import { BrandIcon } from "../../agents/agent/agent-pills.19e913c8cb22db21.js";
+import { Card, Empty } from "../../../../../comps/ui/card.6227f43fc0ae4bd1.js";
+import { Id } from "../../../../../comps/ui/badge.3d9163a51e6f6d6e.js";
+import { ConfirmDialog } from "../../../../../comps/ui/confirm.fe133a074c2743af.js";
+import { approvalParts } from "../[id]/task-actions.ece7ec732352ce70.js";
+import { Status } from "./status.16190fdd5fd7daad.js";
+import { Icon } from "../../../../../comps/ui/icon.0874ca2f58f7db14.js";
+import { Filter } from "../../../../../comps/ui/filter.4f703a4ce7d2a519.js";
+import { addRows, readDelta, taskActive, withAdded } from "./task.af5001e51d2f612b.js";
+import { taskTitle } from "./task.af5001e51d2f612b.js";
+import { LIST_PAGE } from "../../../../../utils/paged.18f5872fc5aebe96.js";
+import { Search, Toolbar, queryOf, useFilters } from "../../../../../comps/ui/toolbar.801bbd3163d3fbb0.js";
+import { Tail } from "../../../../../comps/ui/tail.30913c92f5ca6102.js";
+import { SOURCES, STATUSES, folderName, listFilters, sourceLabel } from "./task.af5001e51d2f612b.js";
+import { NeedsCredential } from "../composer.c7ec618e215d63ce.js";
+import { useTaskEvents } from "../../../../../comps/frame/task-toasts.4282affa47415a36.js";
+import { useOrg } from "../../../../../comps/nav/org.813dc34bd23a336f.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+const NewTaskButton = dynamic(() => import("../composer.c7ec618e215d63ce.js").then((m) => m.NewTaskButton), { 
 // TODO: stays disabled after client navigation until pnext SSRs nested dynamic() like Next.js.
 loading: () => /* @__PURE__ */ _jsxs("button", {
 	type: "button",
@@ -36,9 +36,9 @@ loading: () => /* @__PURE__ */ _jsxs("button", {
 	disabled: true,
 	children: [/* @__PURE__ */ _jsx(Icon, { d: iPlus }), "New task"]
 }) }, {
-	"file": decodeURIComponent(new URL("../../../../../../../../../../../../src/server/dash/app/dash/tasks/composer.tsx", import.meta.url).pathname),
+	"file": decodeURIComponent(new URL("../../../../../../../../../../../../../src/server/dash/app/dash/[org]/tasks/composer.tsx", import.meta.url).pathname),
 	"exportName": "NewTaskButton",
-	"id": "c-7441e4d326"
+	"id": "c-fdfde05882"
 });
 const SOURCE_ICONS = {
 	dashboard: iMonitor,
@@ -46,6 +46,7 @@ const SOURCE_ICONS = {
 	schedule: iClock
 };
 const sourceIcon = (source) => SOURCE_ICONS[source] ?? iPlug;
+const DELTA_ROWS = 200;
 /** How long ago, under a day; the date after that. */
 function ago(value, now, tz) {
 	const minutes = Math.round((now - value) / 6e4);
@@ -54,15 +55,19 @@ function ago(value, now, tz) {
 	if (minutes < 1440) return `${Math.round(minutes / 60)} h ago`;
 	return formatDay(value, tz);
 }
-function TaskRowView({ task, brand, back, scoped, tz, now, onDone, onError }) {
+function TaskRowView({ task, brand, back, scoped, tz, now, onDone }) {
+	const org = useOrg();
 	const elapsed = task.startedAt === undefined ? undefined : (task.finishedAt ?? now) - task.startedAt;
 	const source = task.task.event?.integration ?? task.task.source ?? "dashboard";
 	const kind = task.task.event?.type ?? (task.task.flow === "default" ? undefined : task.task.flow);
 	return /* @__PURE__ */ _jsxs("tr", { children: [
 		/* @__PURE__ */ _jsxs("td", { children: [/* @__PURE__ */ _jsx(Link, {
 			class: "cover",
-			href: "/dash/tasks/[id]",
-			params: { id: task.task.id },
+			href: "/dash/[org]/tasks/[id]",
+			params: {
+				org,
+				id: task.task.id
+			},
 			search: back ? { back } : undefined,
 			children: taskTitle(task)
 		}), /* @__PURE__ */ _jsxs("span", {
@@ -95,19 +100,18 @@ function TaskRowView({ task, brand, back, scoped, tz, now, onDone, onError }) {
 			class: "row-acts",
 			children: /* @__PURE__ */ _jsx(RowActions, {
 				task,
-				onDone,
-				onError
+				onDone
 			})
 		})] })
 	] });
 }
-function RowActions({ task, onDone, onError }) {
-	const [deleting, setDeleting] = useState();
-	const act = (what, decision) => {
-		onError("");
-		const call = what === "approve" ? client.tasks.approve(task.task.id, approvalParts(task.approval).id ?? "", decision ?? "decline") : what === "delete" ? client.tasks.delete(task.task.id) : client.tasks[what](task.task.id);
-		void call.then(() => onDone(what), (reason) => onError(reasonText(reason))).finally(() => setDeleting(undefined));
-	};
+function RowActions({ task, onDone }) {
+	const action = useAction();
+	const [confirming, setConfirming] = useState(false);
+	const act = (what, decision) => void action.run(what, () => what === "approve" ? client.tasks.approve(task.task.id, approvalParts(task.approval).id ?? "", decision ?? "decline") : what === "delete" ? client.tasks.delete(task.task.id) : client.tasks[what](task.task.id)).then((ok) => {
+		if (ok) onDone(what);
+		setConfirming(false);
+	});
 	return /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsxs(Menu, {
 		summary: /* @__PURE__ */ _jsx(Icon, { d: iDots }),
 		summaryClass: "icon-btn",
@@ -133,28 +137,26 @@ function RowActions({ task, onDone, onError }) {
 			/* @__PURE__ */ _jsx(MenuItem, {
 				title: "Delete",
 				danger: true,
-				onClick: () => setDeleting("ask")
+				onClick: () => setConfirming(true)
 			})
 		]
 	}), /* @__PURE__ */ _jsx(ConfirmDialog, {
-		open: Boolean(deleting),
+		open: confirming,
 		title: "Delete this task?",
 		body: "Its conversation, activity and diff go with it.",
 		confirmLabel: "Delete",
-		busy: deleting === "busy",
-		onConfirm: () => {
-			setDeleting("busy");
-			act("delete");
-		},
-		onClose: () => setDeleting(undefined)
+		busy: action.pending === "delete",
+		onConfirm: () => act("delete"),
+		onClose: () => setConfirming(false)
 	})] });
 }
 /** Tasks newest first, in pages as the list scrolls; search and filters run on the server, running ones stay live. */
 export function TasksList({ first, platforms, brands = {}, agents = [], filters, agent, head, missing, tz, now }) {
+	const org = useOrg();
 	const { values, set, query } = useFilters(filters);
 	const initial = queryOf(filters);
 	const scope = agent ? `&agent=${encodeURIComponent(agent)}` : "";
-	const path = agent ? `/dash/agents/${encodeURIComponent(agent)}/tasks` : "/dash/tasks";
+	const path = agent ? `/dash/${org}/agents/${encodeURIComponent(agent)}/tasks` : `/dash/${org}/tasks`;
 	const back = query || agent ? `${path}${query ? `?${query}` : ""}` : undefined;
 	const options = {
 		limit: LIST_PAGE,
@@ -199,10 +201,16 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 		rows: {},
 		added: []
 	});
-	const [gone, setGone] = useState([]);
 	// Rows hidden after an archive or delete come back into view when the filters change.
-	useEffect(() => setGone([]), [query]);
-	const [actionError, setActionError] = useState("");
+	const [goneIn, setGoneIn] = useState({
+		query,
+		ids: []
+	});
+	const gone = goneIn.query === query ? goneIn.ids : [];
+	const setGone = (next) => setGoneIn((now) => ({
+		query,
+		ids: next(now.query === query ? now.ids : [])
+	}));
 	const rows = withAdded(list.rows, fresh.query === query ? fresh.added : [], fresh.rows).filter((task) => !gone.includes(task.task.id));
 	const counts = (fresh.query === query ? fresh.counts : undefined) ?? list.meta.counts;
 	// One first-page refetch at a time and a second apart, longer after failures; a change meanwhile asks for one more, with the filters then; a hidden tab waits to show.
@@ -216,46 +224,16 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 	const era = useRef(0);
 	// When each row last took an event, so an older page never undoes it.
 	const touched = useRef({});
-	// The minute's resync reads every loaded row, not just the first page.
-	const deep = useRef(false);
-	const refresh = (all = false) => {
-		deep.current ||= all;
+	const refresh = () => {
 		if (document.visibilityState === "hidden") return void (hidden.current = true);
 		if (refetching.current) return void (again.current = true);
 		const started = refetching.current = Date.now();
 		const before = era.current;
-		const loaded = deep.current ? rows : [];
-		deep.current = false;
-		// Pages of up to 200 until every loaded row is covered.
-		const read = async () => {
-			const first = await client.tasks.list({
-				...options,
-				limit: Math.min(200, Math.max(LIST_PAGE, loaded.length)),
-				cursor: ""
-			});
-			let page = first;
-			const items = [...first.items];
-			while (page.next && items.length < loaded.length) {
-				page = await client.tasks.list({
-					...options,
-					limit: 200,
-					cursor: page.next
-				});
-				items.push(...page.items);
-			}
-			return {
-				...page,
-				items,
-				counts: first.counts
-			};
-		};
-		void read().then((page) => {
+		void client.tasks.list({
+			...options,
+			cursor: ""
+		}).then((page) => {
 			if (era.current !== before) return;
-			// A loaded row the read covers but no longer lists has left this view.
-			const last = page.items.at(-1);
-			const fetched = new Set(page.items.map((row) => row.task.id));
-			const left = loaded.filter((row) => !fetched.has(row.task.id) && (touched.current[row.task.id] ?? 0) <= started && (!page.next || last && listOrder(row, last) < 0));
-			if (left.length) setGone((current) => [...current, ...left.map((row) => row.task.id)]);
 			setFresh((current) => ({
 				rows: {
 					...current.rows,
@@ -307,11 +285,11 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 			rows: {},
 			added: []
 		});
-		setGone([]);
+		setGone(() => []);
 		nav.refresh();
 	};
 	// Rows follow the events stream at once; counts, and tasks the list lacks, come with its first page again.
-	useTaskEvents((event) => {
+	const heard = (event) => {
 		const row = rows.find((task) => task.task.id === event.id);
 		if (!row) {
 			// A deleted or archived task stays out even if a read from before it brings it; an unarchived one comes back.
@@ -350,7 +328,38 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 				}
 			};
 		});
-	}, reset, () => refresh(true));
+	};
+	// The minute's resync reads only rows changed since the newest one it has seen, each as an event.
+	const since = useRef({ since: first.items.reduce((most, row) => Math.max(most, row.updatedAt), 0) || now });
+	const resync = () => {
+		if (document.visibilityState === "hidden") return;
+		const started = Date.now();
+		const before = era.current;
+		void client.tasks.list({
+			...since.current,
+			limit: DELTA_ROWS,
+			agent: options.agent,
+			source: options.source,
+			archived: options.archived
+		}).then((changed) => {
+			if (era.current !== before) return;
+			const delta = readDelta(changed, since.current, touched.current, started);
+			since.current = delta.cursor;
+			for (const row of delta.rows) heard({
+				id: row.task.id,
+				agent: row.task.agent,
+				status: row.status,
+				approval: row.approval,
+				archivedAt: row.archivedAt,
+				createdAt: row.createdAt,
+				startedAt: row.startedAt,
+				finishedAt: row.finishedAt
+			});
+			// A full page has more past its cursor.
+			if (changed.length === DELTA_ROWS) resync();
+		}).catch((reason) => console.error("coder dashboard: task resync", reason));
+	};
+	useTaskEvents(heard, reset, resync);
 	return /* @__PURE__ */ _jsxs(_Fragment, { children: [
 		/* @__PURE__ */ _jsxs(Toolbar, {
 			head,
@@ -370,21 +379,17 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 		/* @__PURE__ */ _jsxs(Card, {
 			title: "Tasks",
 			count: counts ? formatCount(counts.all) : undefined,
-			actions: counts ? /* @__PURE__ */ _jsxs(_Fragment, { children: [
-				/* @__PURE__ */ _jsx(ErrorText, { value: actionError }),
-				counts.active ? /* @__PURE__ */ _jsxs("button", {
-					type: "button",
-					class: "badge acc",
-					onClick: () => set("status", "active"),
-					children: [formatCount(counts.active), " active"]
-				}) : null,
-				counts.waiting ? /* @__PURE__ */ _jsxs("button", {
-					type: "button",
-					class: "badge warn",
-					onClick: () => set("status", "waiting"),
-					children: [formatCount(counts.waiting), " awaiting approval"]
-				}) : null
-			] }) : undefined,
+			actions: counts ? /* @__PURE__ */ _jsxs(_Fragment, { children: [counts.active ? /* @__PURE__ */ _jsxs("button", {
+				type: "button",
+				class: "badge acc",
+				onClick: () => set("status", "active"),
+				children: [formatCount(counts.active), " active"]
+			}) : null, counts.waiting ? /* @__PURE__ */ _jsxs("button", {
+				type: "button",
+				class: "badge warn",
+				onClick: () => set("status", "waiting"),
+				children: [formatCount(counts.waiting), " awaiting approval"]
+			}) : null] }) : undefined,
 			children: [rows.length ? /* @__PURE__ */ _jsx("div", {
 				class: "table-scroll",
 				children: /* @__PURE__ */ _jsxs("table", {
@@ -406,7 +411,6 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 						scoped: Boolean(agent),
 						tz,
 						now,
-						onError: setActionError,
 						onDone: (what) => {
 							// An archived row leaves every view but the archive; a stopped one just refreshes.
 							if (what === "delete" || what === "archive" && values.status !== "archived") setGone((current) => [...current, task.task.id]);

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{tasks/list/tasks-section.2cbc1550d723661d.js → [org]/tasks/list/tasks-section.fd72404364042b87.js}

@@ -1,20 +1,20 @@
-import "./tasks-list.291e81e56d54513c.css.pnext-asset.js";
-import { dynamic } from "../../../../../../../../../node_modules/@wular/pnext/src/api/dynamic.tsx";
-import { zoneOf } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
-import { FILTER_ROWS, LIST_PAGE } from "../../../../utils/paged.7e5713a82abf0211.js";
-import { load } from "../../../../api/load.35be1b07171553e7.js";
-import { Settle } from "../../../../comps/frame/stream.77a2ec038d97b2b8.js";
-import { LoadingCard, LoadingToolbar } from "../../../../comps/frame/loading-card.bf58af8330a78704.js";
-import { listFilters } from "./task.465c2af602cce783.js";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import "./tasks-list.2282a7cef8b15bd8.css.pnext-asset.js";
+import { dynamic } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/dynamic.tsx";
+import { zoneOf } from "../../../../../utils/format.6a7d1beaf4d09d9c.js";
+import { FILTER_ROWS, LIST_PAGE } from "../../../../../utils/paged.18f5872fc5aebe96.js";
+import { load } from "../../../../../api/load.4f942c7f68b2e273.js";
+import { Settle } from "../../../../../comps/frame/stream.2fea238dc4f4f9a4.js";
+import { LoadingCard, LoadingToolbar } from "../../../../../comps/frame/loading-card.df3717186948c93f.js";
+import { listFilters } from "./task.af5001e51d2f612b.js";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 // Rows arrive rendered; paging and filters hydrate once the list is in view.
-const TasksList = dynamic(() => import("./tasks-list.2a0e1eb5c396be42.js").then((m) => m.TasksList), {
+const TasksList = dynamic(() => import("./tasks-list.0976f1812d6d15f5.js").then((m) => m.TasksList), {
 	load: "visible",
 	ssr: true
 }, {
-	"file": decodeURIComponent(new URL("../../../../../../../../../../../../src/server/dash/app/dash/tasks/list/tasks-list.tsx", import.meta.url).pathname),
+	"file": decodeURIComponent(new URL("../../../../../../../../../../../../../src/server/dash/app/dash/[org]/tasks/list/tasks-list.tsx", import.meta.url).pathname),
 	"exportName": "TasksList",
-	"id": "c-1819c7eef5"
+	"id": "c-ea95c61a2c"
 });
 /** A task list before it arrives; an agent's own tab has no head and no agent filter. */
 export function TasksLoading({ head, agent }) {
@@ -48,7 +48,8 @@ export function loadTasks(request, agent) {
 	// The agent filter's first rows, one past what it shows so it knows to offer typing; an agent's own tab has none.
 	const agents = agent ? undefined : load(request).agents.list({
 		cursor: "",
-		limit: FILTER_ROWS + 1
+		limit: FILTER_ROWS + 1,
+		fields: "id,name"
 	}).then((page) => page.items.map((row) => [row.id, row.name]), () => []);
 	return {
 		filters,

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/page.293492d13a9dca2e.js

@@ -0,0 +1,16 @@
+import { load } from "../../../../api/load.4f942c7f68b2e273.js";
+import { HEADS } from "../../../../comps/frame/heads.20414ddcb2d08bcd.js";
+import { Page } from "../../../../comps/frame/page-head.e5d2185c1cdac740.js";
+import { TasksSection, loadTasks } from "./list/tasks-section.fd72404364042b87.js";
+import { credentialMissing } from "./composer-data.ff108c0ef82a4d7b.js";
+import { jsx as _jsx } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+/** Every task, with New task in the head. */
+export default function TasksPage({ request }) {
+	if (!request) return null;
+	const client = load(request);
+	return /* @__PURE__ */ _jsx(Page, { children: /* @__PURE__ */ _jsx(TasksSection, {
+		tasks: loadTasks(request),
+		head: HEADS.tasks,
+		missing: credentialMissing(client)
+	}) });
+}

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/custom-range.d85de32fb6ec4fe6.js → [org]/usage/custom-range.471edcb853889c2e.js}

@@ -1,10 +1,10 @@
 "use client";
-import { iDown } from "../../../comps/ui/icons.1777c0350d5d215e.js";
-import { useRouter } from "../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
-import { withSearch } from "../../../comps/nav/to.0116bedfbe5f1133.js";
-import { Icon } from "../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { useId } from "../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
-import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import { iDown } from "../../../../comps/ui/icons.868385119bf2de28.js";
+import { useRouter } from "../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
+import { linkOf, withSearch } from "../../../../comps/nav/to.a2c840c09bd4bf4a.js";
+import { Icon } from "../../../../comps/ui/icon.0874ca2f58f7db14.js";
+import { useId } from "../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
+import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 /** Custom from and to dates; applying them moves the page to that range. */
 export function CustomRange({ page, from, to, today, on }) {
 	const nav = useRouter();
@@ -25,7 +25,7 @@ export function CustomRange({ page, from, to, today, on }) {
 				const [start, end] = [String(values.get("from")), String(values.get("to"))].sort();
 				event.currentTarget.hidePopover();
 				nav.push(page.href, {
-					params: page.params,
+					params: linkOf(page).params,
 					search: withSearch(page.search, {
 						from: String(start),
 						to: String(end)

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/day-chart.5e716070459d785c.js → [org]/usage/day-chart.d40438efa74b0596.js}

@@ -1,7 +1,7 @@
-import "./day-chart.c566c1a55d15bf58.css.pnext-asset.js";
-import { Empty } from "../../../comps/ui/card.b0873d38765c9d20.js";
-import { formatMetric } from "./metric.ca0466e33225f184.js";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import "./day-chart.4b3dbef8704de0e0.css.pnext-asset.js";
+import { Empty } from "../../../../comps/ui/card.6227f43fc0ae4bd1.js";
+import { formatMetric } from "./metric.ada350d2b7449b39.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 const OTHER = {
 	key: "",
 	label: "Other agents",

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/usage/loading.5b28c7d8f3a473a3.js

@@ -0,0 +1,15 @@
+import "./@/comps/ui/segmented.41728247cda62f82.css.pnext-asset.js";
+import "./@/app/dash/[org]/usage/range-bar.85d30ec5f022f124.css.pnext-asset.js";
+import "./usage.775df2f43187c487.css.pnext-asset.js";
+import { HEADS } from "../../../../comps/frame/heads.20414ddcb2d08bcd.js";
+import { LoadingRange } from "./range-bar.884e58b044238e98.js";
+import { Loading } from "../../../../comps/ui/card.6227f43fc0ae4bd1.js";
+import { Page, PageHead } from "../../../../comps/frame/page-head.e5d2185c1cdac740.js";
+import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+export default function UsageLoading() {
+	return /* @__PURE__ */ _jsxs(Page, { children: [
+		/* @__PURE__ */ _jsx(PageHead, { ...HEADS.usage }),
+		/* @__PURE__ */ _jsx(LoadingRange, {}),
+		/* @__PURE__ */ _jsx(Loading, { label: "Loading usage" })
+	] });
+}

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/metric.ca0466e33225f184.js → [org]/usage/metric.ada350d2b7449b39.js}

@@ -1,4 +1,4 @@
-import { formatCompact, formatCount, formatDuration } from "../../../utils/format.6a7d1beaf4d09d9c.js";
+import { formatCompact, formatCount, formatDuration } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
 export const METRIC_LABEL = {
 	tasks: "Tasks",
 	runnerMs: "Runner time",

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/page.c2b88b495780b12a.js → [org]/usage/page.69adbf6cde427292.js}

@@ -1,19 +1,19 @@
-import "./@/comps/ui/segmented.2ca6fee7dd2830ad.css.pnext-asset.js";
-import "./@/app/dash/usage/range-bar.53967f3261c8387e.css.pnext-asset.js";
-import "./usage.0f646568d57d13e8.css.pnext-asset.js";
-import { formatCompact, formatCount, formatDuration, zoneOf } from "../../../utils/format.6a7d1beaf4d09d9c.js";
-import { daysIn, rangeFor } from "../../../utils/range.f73ba9cac0a60af1.js";
-import { load } from "../../../api/load.35be1b07171553e7.js";
-import { Card } from "../../../comps/ui/card.b0873d38765c9d20.js";
-import { Page, PageHead } from "../../../comps/frame/page-head.a2336c95004aed4b.js";
-import { Stat, Stats } from "./stats.4793e81a32ea5e8f.js";
-import { Settle } from "../../../comps/frame/stream.77a2ec038d97b2b8.js";
-import { HEADS } from "../../../comps/frame/heads.fa2157b3b36647f3.js";
-import { TopAgents } from "./top-agents.b228062d012dc17b.js";
-import { DayChart } from "./day-chart.5e716070459d785c.js";
-import { RangeBar } from "./range-bar.76e3de97583e6eab.js";
-import { METRIC_LABEL } from "./metric.ca0466e33225f184.js";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import "./@/comps/ui/segmented.41728247cda62f82.css.pnext-asset.js";
+import "./@/app/dash/[org]/usage/range-bar.85d30ec5f022f124.css.pnext-asset.js";
+import "./usage.775df2f43187c487.css.pnext-asset.js";
+import { formatCompact, formatCount, formatDuration, zoneOf } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
+import { daysIn, rangeFor } from "../../../../utils/range.f73ba9cac0a60af1.js";
+import { load, orgOf } from "../../../../api/load.4f942c7f68b2e273.js";
+import { Card } from "../../../../comps/ui/card.6227f43fc0ae4bd1.js";
+import { Page, PageHead } from "../../../../comps/frame/page-head.e5d2185c1cdac740.js";
+import { Stat, Stats } from "./stats.de820599cf126120.js";
+import { Settle } from "../../../../comps/frame/stream.2fea238dc4f4f9a4.js";
+import { HEADS } from "../../../../comps/frame/heads.20414ddcb2d08bcd.js";
+import { TopAgents } from "./top-agents.b00f571862b5b608.js";
+import { DayChart } from "./day-chart.d40438efa74b0596.js";
+import { RangeBar } from "./range-bar.884e58b044238e98.js";
+import { METRIC_LABEL } from "./metric.ada350d2b7449b39.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 const SORT_METRIC = {
 	tasks: "tasks",
 	runner: "runnerMs",
@@ -43,7 +43,7 @@ export default function UsagePage({ request }) {
 		limit: TOP_AGENTS,
 		sort
 	});
-	const agents = load(request).agents.list();
+	const agents = load(request).agents.list({ fields: "id" });
 	const days = load(request).usage({
 		by: "day",
 		since: range.since,
@@ -57,8 +57,8 @@ export default function UsagePage({ request }) {
 		/* @__PURE__ */ _jsx(RangeBar, {
 			range,
 			to: {
-				href: "/dash/usage",
-				params: {},
+				href: "/dash/[org]/usage",
+				params: { org: orgOf(request) },
 				search: sort === "tokens" ? undefined : { sort }
 			},
 			tz
@@ -114,6 +114,7 @@ export default function UsagePage({ request }) {
 					})
 				}) : null,
 				/* @__PURE__ */ _jsx(TopAgents, {
+					org: orgOf(request),
 					rows: items,
 					known: new Set(known.map((agent) => agent.id)),
 					other: summary.agents > items.length ? {

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/range-bar.76e3de97583e6eab.js → [org]/usage/range-bar.884e58b044238e98.js}

@@ -1,13 +1,13 @@
-import "./@/comps/ui/segmented.2ca6fee7dd2830ad.css.pnext-asset.js";
-import "./range-bar.5504dd2c591a3056.css.pnext-asset.js";
-import { Link } from "../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
-import { PRESETS, dayOf } from "../../../utils/range.f73ba9cac0a60af1.js";
-import { CustomRange } from "./custom-range.d85de32fb6ec4fe6.js";
-import { withSearch } from "../../../comps/nav/to.0116bedfbe5f1133.js";
-import { iDown } from "../../../comps/ui/icons.1777c0350d5d215e.js";
-import { Icon } from "../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { BLANK } from "../../../comps/frame/loading-card.bf58af8330a78704.js";
-import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import "./@/comps/ui/segmented.41728247cda62f82.css.pnext-asset.js";
+import "./range-bar.1da88d087e3b5302.css.pnext-asset.js";
+import { Link } from "../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
+import { PRESETS, dayOf } from "../../../../utils/range.f73ba9cac0a60af1.js";
+import { CustomRange } from "./custom-range.471edcb853889c2e.js";
+import { linkOf, withSearch } from "../../../../comps/nav/to.a2c840c09bd4bf4a.js";
+import { iDown } from "../../../../comps/ui/icons.868385119bf2de28.js";
+import { Icon } from "../../../../comps/ui/icon.0874ca2f58f7db14.js";
+import { BLANK } from "../../../../comps/frame/loading-card.df3717186948c93f.js";
+import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 /** Presets and a custom span, for the usage pages. */
 export function RangeBar({ range, to, tz }) {
 	const today = dayOf(Date.now(), tz);
@@ -18,7 +18,7 @@ export function RangeBar({ range, to, tz }) {
 			role: "group",
 			"aria-label": "Range",
 			children: [Object.entries(PRESETS).map(([key, preset]) => /* @__PURE__ */ _jsx(Link, {
-				...to,
+				...linkOf(to),
 				search: withSearch(to.search, { range: key }),
 				scroll: false,
 				"aria-current": range.key === key ? "page" : undefined,

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{usage/stats.4793e81a32ea5e8f.js → [org]/usage/stats.de820599cf126120.js}

@@ -1,5 +1,5 @@
-import "./stats.cd1d20f46f1347bf.css.pnext-asset.js";
-import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import "./stats.bb7cb568c0174557.css.pnext-asset.js";
+import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 export function Stats({ label, children }) {
 	return /* @__PURE__ */ _jsx("section", {
 		class: "stats",