@wular/coder 0.4.13 → 0.5.0

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/{composer.dbf06b05c5e2eba3.js → composer.ee326fbf5e526fb1.js}

@@ -1,27 +1,29 @@
 "use client";
-import "./composer.5b8687662e1629fa.css.pnext-asset.js";
-import { Fragment } from "../../../../../../../../../node_modules/preact/dist/preact.mjs";
+import "./composer.33d49ad218253703.css.pnext-asset.js";
 import { useEffect, useId, useLayoutEffect, useRef, useState } from "../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
-import { client } from "../../../../utils/client.78267fa3d7905d17.js";
-import { toastFailure, useAction } from "../../../../utils/action.67dd6f8ab1ae067d.js";
+import { client } from "../../../../utils/client.c8d7efefb6194d7d.js";
+import { toastFailure, useAction } from "../../../../utils/action.f22057e7dfac40fe.js";
 import { formatDate } from "../../../../utils/format.ceeaafa10a0563f3.js";
-import { iAlert, iPlus, iRight, iSliders, iSteer, iX } from "../../../../comps/ui/icons.e36c72f54750663a.js";
-import { useRouter } from "../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
-import { useOrg } from "../../../../comps/nav/org.d3abfd4053b711ce.js";
-import { Loading } from "../../../../comps/ui/card.9f0d45b73bc78b4f.js";
-import { Button, IconButton } from "../../../../comps/ui/button.ce9e6cdb08ca86db.js";
+import { iAlert, iPlus, iRight, iSliders, iSteer, iX } from "../../../../comps/ui/icons.f769275420d072ce.js";
+import { useRouter, useSearchParams } from "../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
+import { useOrg } from "../../../../comps/nav/org.853d173b55368728.js";
+import { Loading } from "../../../../comps/ui/card.c0030eafd76587e3.js";
+import { Button, IconButton } from "../../../../comps/ui/button.b62fa52e18fa338b.js";
 import { reasonText } from "../../../../utils/format.ceeaafa10a0563f3.js";
 import { Icon } from "../../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { Select } from "../../../../comps/ui/select.2eb33e5bea28d804.js";
-import { MenuLabel, MenuLink, MenuNote, MenuOption, MenuPanel, MenuRadio, MenuRow } from "../../../../comps/ui/menu-items.1d082ac4dae8f3d4.js";
-import { connectRepositories } from "../agents/editor/connect-repositories.ff8b78a03153239b.js";
-import { EFFORTS, ENGINES, ENGINE_NAMES, PERMISSIONS, defaultLabel, modelValue, splitModel } from "../settings/model-options.73f8d0d54f79d8e3.js";
-import { folderName } from "./list/task.f089c1c122ed6dd2.js";
-import { watchTask } from "../../../../comps/frame/task-toasts.44075fa7e04575e8.js";
-import { CHOICE, PLACEHOLDER, loadComposer, savedChoice, usableAgent } from "./composer-data.05fc39e1a7fd1ab7.js";
+import { Select } from "../../../../comps/ui/select.0ee9e8f04ddd8b47.js";
+import { MenuItem, MenuLabel, MenuNote, MenuOption, MenuPanel, MenuRadio, MenuRow } from "../../../../comps/ui/menu-items.759a1b1f7c5ee365.js";
+import { connectRepositories } from "../agents/editor/connect-repositories.9abe365f0098d358.js";
+import { ACCESS, EFFORTS, specName } from "../settings/model-options.dc630cb6e2cbf83a.js";
+import { ModelChoices, placeBeside } from "../settings/model-pick.a143e77f5ed5f9d3.js";
+import { folderName } from "./list/task.a25847399a4dfb30.js";
+import { watchTask } from "../../../../comps/frame/task-toasts.3b7eeee29fc327de.js";
+import { CHOICE, PLACEHOLDER, loadComposer, savedChoice, usableAgent } from "./composer-data.73225456d60d63e3.js";
 import { Notice } from "../../../../comps/ui/notice.f395f231cbb96445.js";
-import { CredentialsLink } from "../../../../comps/nav/back.d6109e72fbd04b45.js";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+import { CredentialsLink } from "../../../../comps/nav/back.7aa0ae82dbec38cd.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+/** A spec with `effort` in place of its own. */
+export const withEffort = (spec, effort) => [...spec.split("/").filter((part) => !EFFORTS.some(([key]) => key === part)), effort].join("/");
 const DRAFT = "coder:draft";
 const CONNECT = "+connect";
 const REFRESH = "+refresh";
@@ -42,19 +44,39 @@ const folderOptions = (folders, added, value) => {
 		[CLONE, "Repository…"]
 	];
 };
-/** The chain.s default first, then one section per engine: its own default and its models. */
-function modelSections(groups, defaults) {
-	const sections = [["", [["", `Default · ${[ENGINE_NAMES[defaults.engine] ?? defaults.engine, defaults.engines[defaults.engine]?.model].filter(Boolean).join(" ")}`]]]];
-	for (const engine of ENGINES) {
-		if (!groups[engine]?.length) continue;
-		sections.push([ENGINE_NAMES[engine] ?? engine, [[modelValue(engine, ""), defaultLabel(defaults.engines[engine]?.model)], ...groups[engine].map((model) => [modelValue(engine, model), model])]]);
-	}
-	return sections;
+/** A setting as one row naming its pick; its options open beside it, as a model's efforts do. */
+function NestedPick({ label, options, value, onPick }) {
+	const flyout = `${useId()}-pick`;
+	return /* @__PURE__ */ _jsxs(MenuRow, { children: [
+		/* @__PURE__ */ _jsx(MenuItem, {
+			title: options.find(([key]) => key === value)?.[1] ?? options[0]?.[1],
+			"aria-label": label,
+			"data-keep": true,
+			popovertarget: flyout
+		}),
+		/* @__PURE__ */ _jsx("button", {
+			type: "button",
+			class: "pop-chev",
+			"data-keep": true,
+			popovertarget: flyout,
+			"aria-label": `${label} options`,
+			children: /* @__PURE__ */ _jsx(Icon, { d: iRight })
+		}),
+		/* @__PURE__ */ _jsx(MenuPanel, {
+			id: flyout,
+			class: "pop-flyout",
+			popover: "auto",
+			role: "group",
+			"aria-label": label,
+			onBeforeToggle: placeBeside,
+			children: options.map(([key, text]) => /* @__PURE__ */ _jsx(MenuRadio, {
+				on: key === value,
+				onPick: () => onPick(key),
+				children: text
+			}, key))
+		})
+	] });
 }
-const resolved = (options, value) => {
-	const label = options.find(([key]) => key === value)?.[1];
-	return [["", defaultLabel(label?.toLowerCase())], ...options];
-};
 /** Places an opening popover under its button, right-aligned to it. */
 function place(event) {
 	const pop = event.currentTarget;
@@ -127,7 +149,7 @@ export function NeedsCredential({ reason, label }) {
 	});
 }
 /** The dashboard's one box: type and press Enter to start a task, or `/` for reviews and flows. */
-export function Composer({ initial, data, defaults, missing, connectLabel, tz }) {
+function Composer({ initial, data, defaults, missing, connectLabel, tz }) {
 	const nav = useRouter();
 	const org = useOrg();
 	const [choice, setChoice] = useState(() => usableAgent({
@@ -140,7 +162,6 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 	// Why no credential can run it, once a start says so.
 	const [needs, setNeeds] = useState();
 	// The model row whose effort choices are open.
-	const [expanded, setExpanded] = useState();
 	const [text, setText] = useState("");
 	const [dismissed, setDismissed] = useState(false);
 	const [at, setAt] = useState(0);
@@ -279,15 +300,15 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 		if (!pr && command && !(command === "flow" ? name : /^#?\d+$/.test(name))) return void setDismissed(false);
 		const review = pr ?? (command === "review" ? Number(name.replace("#", "")) : undefined);
 		if (review && !choice.repo) return toastFailure("Pick a repository first.");
-		const { agent, engine, model, effort, permissions, runner } = choice;
+		const { agent, model, effort, access, runner } = choice;
 		const [repo, cwd] = lists.folders ? ["", choice.cwd] : [choice.repo, ""];
+		// An effort on the Default row goes on the chain's first model; the rest still follow.
+		const first = model || (effort ? defaults.chain[0] : "");
 		const fields = Object.fromEntries(Object.entries({
 			repo,
 			cwd,
-			engine,
-			model,
-			effort,
-			permissions,
+			model: first && effort ? withEffort(first, effort) : first,
+			access: access === "auto" ? "" : access,
 			runner
 		}).filter(([, value]) => value));
 		setBusy(true);
@@ -403,20 +424,16 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 			removeEventListener("resize", position);
 		};
 	}, [open, text]);
-	const engine = choice.engine || defaults.engine;
-	const own = defaults.engines[engine] ?? {};
+	const head = defaults.chain[0] ?? "";
 	const agents = lists.agents.some(([id]) => id === choice.agent) ? lists.agents : [...lists.agents, [choice.agent, choice.agent]];
-	// Only the settings that differ from the workspace's defaults.
-	const changed = [
-		choice.agent !== lists.defaultAgent && choice.agent,
-		choice.engine !== defaults.engine && choice.engine,
-		...[
-			"model",
-			"effort",
-			"permissions"
-		].map((key) => choice[key] !== own[key] && choice[key]),
-		choice.runner && (lists.runners.find(([id]) => id === choice.runner)?.[1] ?? choice.runner)
-	].filter(Boolean).join(" · ");
+	// What a task gets: the model, effort and access, the workspace's defaults dimmer.
+	const picks = [
+		[choice.model || specName(head, defaults.builtin), Boolean(choice.model)],
+		[choice.effort, Boolean(choice.effort)],
+		[choice.access, choice.access !== "auto"]
+	].filter(([text]) => text);
+	// The agent and runner only when they differ from the workspace's defaults.
+	const changed = [choice.agent !== lists.defaultAgent && choice.agent, choice.runner && (lists.runners.find(([id]) => id === choice.runner)?.[1] ?? choice.runner)].filter(Boolean).join(" · ");
 	return /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsxs("form", {
 		ref: form,
 		class: "composer",
@@ -515,8 +532,18 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 						class: "quiet",
 						popovertarget: `${id}-settings`,
 						"aria-label": "Run options",
-						title: "Model, effort, permissions and more",
-						children: [/* @__PURE__ */ _jsx(Icon, { d: iSliders }), changed ? /* @__PURE__ */ _jsx("span", { children: changed }) : null]
+						title: "Model, effort, access and more",
+						children: [
+							/* @__PURE__ */ _jsx(Icon, { d: iSliders }),
+							/* @__PURE__ */ _jsx("span", {
+								class: "run-picks",
+								children: picks.map(([text, picked], index) => /* @__PURE__ */ _jsx("span", {
+									class: picked ? undefined : "dim",
+									children: index ? ` · ${text}` : text
+								}, index))
+							}),
+							changed ? /* @__PURE__ */ _jsx("span", { children: changed }) : null
+						]
 					}),
 					/* @__PURE__ */ _jsx(Button, {
 						type: "submit",
@@ -545,86 +572,43 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 				onBeforeToggle: place,
 				children: [
 					/* @__PURE__ */ _jsx(MenuLabel, { children: "Model" }),
-					/* @__PURE__ */ _jsxs("div", {
-						role: "group",
-						"aria-label": "Model",
-						class: "pop-radios",
-						children: [modelSections(lists.models, defaults).map(([engine, items]) => /* @__PURE__ */ _jsxs(Fragment, { children: [engine ? /* @__PURE__ */ _jsx("p", {
-							class: "pop-group",
-							children: engine
-						}) : null, items.map(([value, label]) => {
-							const on = value === modelValue(choice.engine, choice.model);
-							const picked = splitModel(value);
-							const efforts = resolved(EFFORTS, defaults.engines[picked.engine || defaults.engine]?.effort);
-							const effortLabel = on && choice.effort ? efforts.find(([key]) => key === choice.effort)?.[1] : undefined;
-							const showing = expanded === value;
-							return /* @__PURE__ */ _jsxs(Fragment, { children: [/* @__PURE__ */ _jsxs(MenuRow, { children: [/* @__PURE__ */ _jsx(MenuRadio, {
-								on,
-								onPick: () => {
-									apply({
-										...picked,
-										effort: ""
-									});
-									document.getElementById(`${id}-settings`)?.hidePopover();
-								},
-								end: effortLabel ? /* @__PURE__ */ _jsx("small", { children: effortLabel.toLowerCase() }) : null,
-								children: label
-							}), /* @__PURE__ */ _jsx("button", {
-								type: "button",
-								class: "pop-chev",
-								"data-keep": true,
-								"aria-label": `Effort for ${label}`,
-								"aria-expanded": showing,
-								onClick: () => setExpanded(showing ? undefined : value),
-								children: /* @__PURE__ */ _jsx(Icon, { d: iRight })
-							})] }), showing ? /* @__PURE__ */ _jsx("div", {
-								role: "group",
-								"aria-label": `Effort for ${label}`,
-								class: "pop-sub",
-								children: efforts.map(([effort, text]) => /* @__PURE__ */ _jsx(MenuRadio, {
-									on: on && choice.effort === effort,
-									onPick: () => {
-										apply({
-											...picked,
-											effort
-										});
-										document.getElementById(`${id}-settings`)?.hidePopover();
-									},
-									children: text
-								}, effort))
-							}) : null] }, value);
-						})] }, engine)), /* @__PURE__ */ _jsx(MenuLink, {
-							class: "add-models",
-							href: "/dash/[org]/settings/[tab]",
-							params: {
-								org,
-								tab: "models"
-							},
-							icon: iPlus,
-							children: "Add models"
-						})]
+					/* @__PURE__ */ _jsx(ModelChoices, {
+						groups: lists.models,
+						first: {
+							label: `Default: ${defaults.chain.map((spec) => specName(spec, defaults.builtin)).join(", then ")}`,
+							efforts: true
+						},
+						model: choice.model,
+						effort: choice.effort,
+						onPick: (model, effort) => {
+							apply({
+								model,
+								effort
+							});
+							document.getElementById(`${id}-settings`)?.hidePopover();
+						}
 					}),
-					/* @__PURE__ */ _jsx(MenuLabel, { children: "Permissions" }),
+					/* @__PURE__ */ _jsx(MenuLabel, { children: "Access" }),
 					/* @__PURE__ */ _jsx("div", {
 						role: "group",
-						"aria-label": "Permissions",
-						children: resolved(PERMISSIONS, own.permissions ?? "auto").map(([value, label]) => /* @__PURE__ */ _jsx(MenuRadio, {
-							on: choice.permissions === value,
-							onPick: () => apply({ permissions: value }),
+						"aria-label": "Access",
+						children: ACCESS.map(([value, label]) => /* @__PURE__ */ _jsx(MenuRadio, {
+							on: choice.access === value,
+							onPick: () => apply({ access: value }),
 							children: label
 						}, value))
 					}),
-					agents.length > 1 ? /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(MenuLabel, { children: "Agent" }), /* @__PURE__ */ _jsx(Select, {
+					agents.length > 1 ? /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(MenuLabel, { children: "Agent" }), /* @__PURE__ */ _jsx(NestedPick, {
 						label: "Agent",
-						value: choice.agent,
 						options: agents,
-						onChange: (value) => apply({ agent: value })
+						value: choice.agent,
+						onPick: (value) => apply({ agent: value })
 					})] }) : null,
-					lists.runners.length > 1 ? /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(MenuLabel, { children: "Runs on" }), /* @__PURE__ */ _jsx(Select, {
+					lists.runners.length > 1 ? /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(MenuLabel, { children: "Runs on" }), /* @__PURE__ */ _jsx(NestedPick, {
 						label: "Runs on",
 						options: lists.runners,
 						value: choice.runner,
-						onChange: (value) => apply({ runner: value })
+						onPick: (value) => apply({ runner: value })
 					})] }) : null
 				]
 			}),
@@ -653,7 +637,7 @@ export function Composer({ initial, data, defaults, missing, connectLabel, tz })
 	}), needs === undefined || missing ? null : /* @__PURE__ */ _jsx(NeedsCredential, { reason: needs })] });
 }
 /** The composer before it arrives: the same box and prompt, inert. */
-export function LoadingComposer() {
+function LoadingComposer() {
 	return /* @__PURE__ */ _jsxs("div", {
 		class: "composer",
 		"aria-hidden": "true",
@@ -677,6 +661,15 @@ export function NewTaskButton({ agent }) {
 		dialog.current?.showModal();
 		loading.current ??= loadComposer(client).then(setSetup, (reason) => setError(reasonText(reason)));
 	};
+	// The Create menu's `?new` link opens the composer, then drops the param.
+	const asked = useSearchParams().has("new");
+	useEffect(() => {
+		if (!asked) return;
+		const url = new URL(location.href);
+		url.searchParams.delete("new");
+		history.replaceState(history.state, "", url);
+		open();
+	}, [asked]);
 	return /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(Button, {
 		class: "new-task",
 		leftIcon: iPlus,

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/list/pending-approvals.7607998094780fdd.js

@@ -0,0 +1,40 @@
+"use client";
+import "./pending-approvals.07e59a9cae7ccf29.css.pnext-asset.js";
+import { useState } from "../../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
+import { Button } from "../../../../../comps/ui/button.b62fa52e18fa338b.js";
+import { Card } from "../../../../../comps/ui/card.c0030eafd76587e3.js";
+import { Approval, pendingApproval } from "../[id]/task-actions.4a4052a38db4bad3.js";
+import { jsx as _jsx } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
+/** Rows the queue shows before Show all. */
+const FOLDED_ROWS = 3;
+/** The viewer's approval queue: each open approval a row with its buttons, unfolding to its details; a sent decision hides its row unless it fails. */
+export function PendingApprovals({ rows, me }) {
+	const [sent, setSent] = useState([]);
+	const [all, setAll] = useState(false);
+	const open = rows.filter((row) => !sent.includes(row.task.id) && pendingApproval(row));
+	if (!open.length) return null;
+	const shown = all ? open : open.slice(0, FOLDED_ROWS);
+	const hide = (id) => (sending) => {
+		setSent((current) => [...current, id]);
+		void sending.then((ok) => ok || setSent((current) => current.filter((each) => each !== id)));
+	};
+	return /* @__PURE__ */ _jsx(Card, {
+		tone: "accent",
+		title: "Pending approvals",
+		count: open.length,
+		actions: open.length > FOLDED_ROWS ? /* @__PURE__ */ _jsx(Button, {
+			variant: "secondary",
+			size: "sm",
+			onClick: () => setAll(!all),
+			children: all ? "Show fewer" : `Show all ${open.length}`
+		}) : undefined,
+		children: /* @__PURE__ */ _jsx("ul", {
+			class: all ? "approval-queue scroll-box" : "approval-queue",
+			children: shown.map((row) => /* @__PURE__ */ _jsx(Approval, {
+				task: row,
+				me,
+				queue: { onSent: hide(row.task.id) }
+			}, row.task.id))
+		})
+	});
+}

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/list/{status.cb704b48ce86cc7d.js → status.d2c05c397780b833.js}

@@ -1,5 +1,6 @@
 import "./status.7e63f2b02469ca40.css.pnext-asset.js";
-import { awaitsApproval } from "../../../../../../../core/defaults.e972c134a1ae918f.js";
+import { awaitsApproval } from "../../../../../../../core/task/view.e20379d8f741754a.js";
+import { Badge } from "../../../../../comps/ui/badge.9f63fd615cf0ee22.js";
 import { jsx as _jsx, jsxs as _jsxs } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 /** A task's state; an open escalation reads as needing approval whatever its turn does. */
 export function Status({ status, approvals }) {
@@ -9,6 +10,11 @@ export function Status({ status, approvals }) {
 		children: [/* @__PURE__ */ _jsx("i", {}), STATUS_LABEL[shown] ?? shown]
 	});
 }
+/** A task that ran with read-only access, on its page head and its list row. */
+export const ReadOnlyBadge = () => /* @__PURE__ */ _jsx(Badge, {
+	title: "Ran with read-only access",
+	children: "read-only"
+});
 export const STATUS_LABEL = {
 	queued: "waiting for slot",
 	running: "running",

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/list/{task.f089c1c122ed6dd2.js → task.a25847399a4dfb30.js}

@@ -1,5 +1,5 @@
-import { byListKey, listRank } from "../../../../../../../core/defaults.e972c134a1ae918f.js";
-import { eventJsons, replyRequired as turnReplyRequired } from "../../../../../../../agent/context/turn.6bb73458768e222e.js";
+import { byListKey, listRank, promptTitle } from "../../../../../../../core/task/view.e20379d8f741754a.js";
+import { replyRequired as turnReplyRequired } from "../../../../../../../agent/event-json.856d33f567e58d0e.js";
 /** A task page's tabs, the loading frame's too. */
 export const TASK_TABS = ["Conversation", "Activity"];
 /** Task statuses a list filters by. */
@@ -62,39 +62,22 @@ export function readDelta(changed, cursor, touched, started) {
 		} : cursor
 	};
 }
-/** A platform turn's messages from its `<event>` prompt; undefined for any other prompt. */
-export function eventMessages(prompt) {
-	return eventJsons(prompt)?.flatMap((json) => {
-		if (json.reactions) return json.reactions.map(({ emoji, by }) => ({
-			author: by.join(", "),
-			text: `reacted ${emoji}`,
-			reaction: true
-		}));
-		return (json.messages ?? (json.message ? [json.message] : [])).map(({ text, author }) => ({
-			author: author.handle ?? author.name ?? author.id,
-			text: text || (json.event ?? "")
-		}));
-	});
-}
 /** Whether a turn had to be answered: any of its events asks for a reply, else the task's event decides. */
 export const replyRequired = (task, prompt) => turnReplyRequired(prompt, task.task.event?.mustReply !== false);
 /** A platform task is titled by its first message; dashboard and CLI tasks by their prompt. */
 export function taskTitle(task) {
 	// The first turn's prompt: a follow-up or a decision never retitles the task.
-	const prompt = (task.turns?.[0]?.prompt ?? task.task.prompt)?.trim();
-	const first = !prompt || eventMessages(prompt) ? task.task.event?.text?.trim() || eventMessages(prompt ?? "")?.find((message) => !message.reaction)?.text.trim() : prompt;
+	const first = promptTitle(task.turns?.[0]?.prompt ?? task.task.prompt, task.task.event?.text);
 	return task.task.name?.trim() || first || `${task.task.event?.type ?? "task"} on ${task.task.agent}`;
 }
-/** The engine, model and effort a task runs on, as `claude/opus/high`. */
+/** The engine, model and effort a task runs on, as `claude/opus/high`; else its agent's model spec. */
 export function taskModel(task) {
-	const { engine, model, effort } = {
-		...task.task.definition,
-		...task.task.usage
-	};
+	const { usage, definition } = task.task;
+	const own = usage?.engine || usage?.model ? usage : undefined;
 	return [
-		engine,
-		model,
-		effort
+		own?.engine,
+		task.model ?? own?.model ?? definition?.model,
+		own?.effort
 	].filter(Boolean).join("/");
 }
 /** A folder path's last segment. */

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/list/{tasks-list.5a00d69851dae119.js → tasks-list.e486cbd16ea3e963.js}

@@ -1,37 +1,39 @@
 "use client";
-import "./tasks-list.2f90c4410f843fff.css.pnext-asset.js";
+import "./tasks-list.f3737549b4696cc8.css.pnext-asset.js";
+import { Fragment } from "../../../../../../../../../../node_modules/preact/dist/preact.mjs";
 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.78267fa3d7905d17.js";
-import { useAction } from "../../../../../utils/action.67dd6f8ab1ae067d.js";
+import { client } from "../../../../../utils/client.c8d7efefb6194d7d.js";
+import { useAction } from "../../../../../utils/action.f22057e7dfac40fe.js";
 import { formatCount, formatDate, formatDay, formatDuration } from "../../../../../utils/format.ceeaafa10a0563f3.js";
-import { iAgent, iClock, iDots, iFolder, iMonitor, iPlug, iPlus, iTerminal } from "../../../../../comps/ui/icons.e36c72f54750663a.js";
-import { Menu } from "../../../../../comps/ui/menu.ee45bace979944b6.js";
-import { MenuItem } from "../../../../../comps/ui/menu-items.1d082ac4dae8f3d4.js";
+import { iAgent, iClock, iDots, iFolder, iMonitor, iPlug, iPlus, iTerminal } from "../../../../../comps/ui/icons.f769275420d072ce.js";
+import { Menu } from "../../../../../comps/ui/menu.7f558c7c6f6345d5.js";
+import { MenuItem } from "../../../../../comps/ui/menu-items.759a1b1f7c5ee365.js";
 import { Link } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
+import { PendingApprovals } from "./pending-approvals.7607998094780fdd.js";
 import { useRouter } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
 import { usePaged } from "../../../../../utils/paged.0e54c3044f8ca567.js";
 import { useZone } from "../../../../zone.0515a688ee5ff6ca.js";
-import { pendingApproval } from "../[id]/task-actions.51fbeac76459433a.js";
-import { BrandIcon } from "../../agents/agent/agent-pills.44e689e546fb042b.js";
-import { Button } from "../../../../../comps/ui/button.ce9e6cdb08ca86db.js";
-import { Card, Empty } from "../../../../../comps/ui/card.9f0d45b73bc78b4f.js";
-import { Badge, Id } from "../../../../../comps/ui/badge.c0bc352791a95fd6.js";
-import { ConfirmDialog } from "../../../../../comps/ui/confirm.29e198be34578222.js";
-import { Status } from "./status.cb704b48ce86cc7d.js";
+import { pendingApproval } from "../[id]/task-actions.4a4052a38db4bad3.js";
+import { BrandIcon } from "../../agents/agent/agent-pills.1012e04bfbc7bffd.js";
+import { Button } from "../../../../../comps/ui/button.b62fa52e18fa338b.js";
+import { Card, Empty } from "../../../../../comps/ui/card.c0030eafd76587e3.js";
+import { Badge } from "../../../../../comps/ui/badge.9f63fd615cf0ee22.js";
+import { ConfirmDialog } from "../../../../../comps/ui/confirm.e21b7f5e486dafb8.js";
+import { Status } from "./status.d2c05c397780b833.js";
 import { Icon } from "../../../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { Filter } from "../../../../../comps/ui/filter.81bb9a5c60cd1089.js";
-import { addRows, readDelta, taskActive, withAdded } from "./task.f089c1c122ed6dd2.js";
-import { taskModel, taskTitle } from "./task.f089c1c122ed6dd2.js";
+import { Filter } from "../../../../../comps/ui/filter.0730dccad6332327.js";
+import { addRows, readDelta, taskActive, withAdded } from "./task.a25847399a4dfb30.js";
+import { taskModel, taskTitle } from "./task.a25847399a4dfb30.js";
 import { LIST_PAGE } from "../../../../../utils/paged.0e54c3044f8ca567.js";
-import { Search, Toolbar, queryOf, useFilters } from "../../../../../comps/ui/toolbar.8b3a460a65edf85a.js";
-import { Tail } from "../../../../../comps/ui/tail.04132db0c5033d4f.js";
-import { SOURCES, STATUSES, folderName, listFilters, sourceLabel } from "./task.f089c1c122ed6dd2.js";
-import { NeedsCredential } from "../composer.dbf06b05c5e2eba3.js";
-import { useTaskEvents } from "../../../../../comps/frame/task-toasts.44075fa7e04575e8.js";
-import { useOrg } from "../../../../../comps/nav/org.d3abfd4053b711ce.js";
+import { Search, Toolbar, queryOf, useFilters } from "../../../../../comps/ui/toolbar.ff8367c641d28c1e.js";
+import { Tail } from "../../../../../comps/ui/tail.7eb303330802ac18.js";
+import { SOURCES, STATUSES, folderName, listFilters, sourceLabel } from "./task.a25847399a4dfb30.js";
+import { NeedsCredential } from "../composer.ee326fbf5e526fb1.js";
+import { useTaskEvents } from "../../../../../comps/frame/task-toasts.3b7eeee29fc327de.js";
+import { useOrg } from "../../../../../comps/nav/org.853d173b55368728.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
-const NewTaskButton = dynamic(() => import("../composer.dbf06b05c5e2eba3.js").then((m) => m.NewTaskButton), { 
+const NewTaskButton = dynamic(() => import("../composer.ee326fbf5e526fb1.js").then((m) => m.NewTaskButton), { 
 // TODO: stays disabled after client navigation until pnext SSRs nested dynamic() like Next.js.
 loading: () => /* @__PURE__ */ _jsx(Button, {
 	class: "new-task",
@@ -41,7 +43,7 @@ loading: () => /* @__PURE__ */ _jsx(Button, {
 }) }, {
 	"file": decodeURIComponent(new URL("../../../../../../../../../../../../../src/server/dash/app/dash/[org]/tasks/composer.tsx", import.meta.url).pathname),
 	"exportName": "NewTaskButton",
-	"id": "c-a41dab3334"
+	"id": "c-2a236216a0"
 });
 const SOURCE_ICONS = {
 	dashboard: iMonitor,
@@ -74,17 +76,16 @@ function TaskRowView({ task, brand, back, scoped, tz, now, onDone }) {
 			},
 			search: back ? { back } : undefined,
 			children: taskTitle(task)
-		}), /* @__PURE__ */ _jsxs("span", {
+		}), /* @__PURE__ */ _jsx("span", {
 			class: "sub",
 			children: [
-				scoped ? null : /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(Icon, { d: iAgent }), `${task.task.agent} · `] }),
-				/* @__PURE__ */ _jsx(Id, { value: task.task.id }),
-				kind ? ` · ${kind}` : null,
-				task.task.cwd ? /* @__PURE__ */ _jsxs(_Fragment, { children: [" · ", /* @__PURE__ */ _jsxs("span", {
+				scoped ? null : /* @__PURE__ */ _jsxs(_Fragment, { children: [/* @__PURE__ */ _jsx(Icon, { d: iAgent }), task.task.agent] }),
+				kind,
+				task.task.cwd ? /* @__PURE__ */ _jsxs("span", {
 					title: task.task.cwd,
 					children: [/* @__PURE__ */ _jsx(Icon, { d: iFolder }), folderName(task.task.cwd)]
-				})] }) : null
-			]
+				}) : null
+			].filter(Boolean).map((part, index) => /* @__PURE__ */ _jsxs(Fragment, { children: [index ? " · " : null, part] }, index))
 		})] }),
 		/* @__PURE__ */ _jsx("td", { children: /* @__PURE__ */ _jsx(Status, {
 			status: task.status,
@@ -93,7 +94,7 @@ function TaskRowView({ task, brand, back, scoped, tz, now, onDone }) {
 		/* @__PURE__ */ _jsx("td", {
 			class: "model",
 			title: taskModel(task),
-			children: taskModel(task)
+			children: task.model ?? task.task.usage?.model ?? task.task.definition?.model
 		}),
 		/* @__PURE__ */ _jsx("td", {
 			class: "when",
@@ -102,7 +103,7 @@ function TaskRowView({ task, brand, back, scoped, tz, now, onDone }) {
 		}),
 		/* @__PURE__ */ _jsx("td", {
 			class: "num",
-			children: formatDuration(elapsed)
+			children: task.startedAt === undefined ? null : formatDuration(elapsed)
 		}),
 		/* @__PURE__ */ _jsxs("td", { children: [/* @__PURE__ */ _jsxs("span", {
 			class: "source",
@@ -164,7 +165,7 @@ function RowActions({ task, onDone }) {
 	})] });
 }
 /** 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: serverZone, now }) {
+export function TasksList({ first, platforms, brands = {}, agents = [], filters, agent, head, missing, pendingApprovals, me, tz: serverZone, now }) {
 	const tz = useZone(serverZone);
 	const org = useOrg();
 	const { values, set, query } = useFilters(filters);
@@ -323,7 +324,10 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 		touched.current[event.id] = Date.now();
 		if (refetching.current) again.current = true;
 		// A change that moves the counts asks the server; a continued task also brings its new prompt.
-		if (event.deleted || event.status !== row.status || Boolean(event.archivedAt) !== Boolean(row.archivedAt)) refresh();
+		if (event.deleted || event.status !== row.status || Boolean(event.archivedAt) !== Boolean(row.archivedAt) || Boolean(pendingApproval(row)) !== Boolean(pendingApproval({
+			approval: event.approval,
+			approvals: event.approvals
+		}))) refresh();
 		if (event.deleted || event.archivedAt && values.status !== "archived") return setGone((current) => [...current, event.id]);
 		setFresh((current) => {
 			const was = current.rows[event.id] ?? row;
@@ -392,6 +396,10 @@ export function TasksList({ first, platforms, brands = {}, agents = [], filters,
 			})]
 		}),
 		missing ? /* @__PURE__ */ _jsx(NeedsCredential, {}) : null,
+		pendingApprovals?.length ? /* @__PURE__ */ _jsx(PendingApprovals, {
+			rows: pendingApprovals.map((row) => fresh.rows[row.task.id] ?? row),
+			me
+		}) : null,
 		/* @__PURE__ */ _jsxs(Card, {
 			title: "Tasks",
 			count: counts ? formatCount(counts.all) : undefined,