@wular/coder 0.4.7 → 0.4.8

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/{tasks/[id]/task-view.1c54f267d127f4e3.js → [org]/tasks/[id]/task-view.8a5908c42647923f.js}

@@ -1,28 +1,30 @@
 "use client";
-import "./task-view.2110bc4a16798cde.css.pnext-asset.js";
-import { Fragment } from "../../../../../../../../../node_modules/preact/dist/preact.mjs";
-import { useEffect, useMemo, useRef, useState } from "../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
-import { serverEvents } from "../../../../../../client/index.b7c6e5f49704993d.js";
-import { LogView } from "../../../../../../core/task/log-view.58ba9a3d545808d7.js";
-import { client } from "../../../../utils/client.a8205c524e63d4a9.js";
-import { formatDate, formatDuration, reasonText } from "../../../../utils/format.6a7d1beaf4d09d9c.js";
-import { Link } from "../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
-import { useSearchParams } from "../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
-import { iAgent, iCheck, iClock, iDown, iFolder, iPlug, iTerminal } from "../../../../comps/ui/icons.1777c0350d5d215e.js";
-import { Badge } from "../../../../comps/ui/badge.5abdef72e9189fdc.js";
-import { Card, Loading } from "../../../../comps/ui/card.b0873d38765c9d20.js";
-import { Collapse } from "../../../../comps/ui/collapse.dab7f208cbbe6a33.js";
-import { Icon } from "../../../../comps/ui/icon.0874ca2f58f7db14.js";
-import { Menu } from "../../../../comps/ui/menu.a4dd9fb9f566689a.js";
-import { Back, PageHead } from "../../../../comps/frame/page-head.a2336c95004aed4b.js";
-import { backFrom } from "../../../../comps/frame/heads.fa2157b3b36647f3.js";
-import { markdown } from "../../agents/agent/instructions.2f4229d42e7c99ef.js";
-import { Status } from "../list/status.b90b76ffa62e957a.js";
-import { folderName, sourceLabel, taskActive, taskTitle } from "../list/task.465c2af602cce783.js";
-import { Approval, TaskActions, useAction } from "./task-actions.ee523c68a38a7975.js";
-import { Activity } from "./activity.4aeb0734da711e10.js";
-import { toastError, useTaskEvents, watchTask } 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";
+import "./task-view.38b1b7ef3976ba71.css.pnext-asset.js";
+import { Fragment } from "../../../../../../../../../../node_modules/preact/dist/preact.mjs";
+import { useEffect, useMemo, useRef, useState } from "../../../../../../../../../../node_modules/preact/hooks/dist/hooks.mjs";
+import { serverEvents } from "../../../../../../../client/index.8e150ef2bc6a5f4e.js";
+import { LogView } from "../../../../../../../core/task/log-view.871cbff2605b5cfd.js";
+import { client } from "../../../../../utils/client.d25e6dcc6704eb60.js";
+import { formatDate, formatDuration, reasonText } from "../../../../../utils/format.6a7d1beaf4d09d9c.js";
+import { Link } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/link.tsx";
+import { useSearchParams } from "../../../../../../../../../../node_modules/@wular/pnext/src/api/client-navigation.ts";
+import { useOrg } from "../../../../../comps/nav/org.813dc34bd23a336f.js";
+import { iAgent, iCheck, iClock, iDown, iFolder, iPlug, iRight, iTerminal } from "../../../../../comps/ui/icons.868385119bf2de28.js";
+import { Badge } from "../../../../../comps/ui/badge.3d9163a51e6f6d6e.js";
+import { Card, Loading } from "../../../../../comps/ui/card.6227f43fc0ae4bd1.js";
+import { Collapse } from "../../../../../comps/ui/collapse.dab7f208cbbe6a33.js";
+import { Icon } from "../../../../../comps/ui/icon.0874ca2f58f7db14.js";
+import { Menu } from "../../../../../comps/ui/menu.0f064f75822888be.js";
+import { Back, PageHead } from "../../../../../comps/frame/page-head.e5d2185c1cdac740.js";
+import { backFrom } from "../../../../../comps/frame/heads.20414ddcb2d08bcd.js";
+import { markdown } from "../../agents/agent/instructions.6558ffd02a59ad53.js";
+import { Status } from "../list/status.16190fdd5fd7daad.js";
+import { folderName, sourceLabel, taskActive, taskTitle } from "../list/task.af5001e51d2f612b.js";
+import { useAction } from "../../../../../utils/action.568346602027ac74.js";
+import { Approval, TaskActions } from "./task-actions.ece7ec732352ce70.js";
+import { Activity, RunPreview, runSummary } from "./activity.ed49ee2686d1ee41.js";
+import { toastError, useTaskEvents, watchTask } from "../../../../../comps/frame/task-toasts.4282affa47415a36.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "../../../../../../../../../../node_modules/preact/jsx-runtime/dist/jsxRuntime.mjs";
 const TABS = ["Conversation", "Activity"];
 function messageOf(value, fallback) {
 	if (typeof value === "string") return value;
@@ -99,10 +101,11 @@ function ResultBody({ value }) {
 /** Back to where the task was opened from: a `back` path, a `from` list, or Tasks. */
 function TaskBack() {
 	const search = useSearchParams();
+	const org = useOrg();
 	return /* @__PURE__ */ _jsx(Back, {
 		...backFrom(search.get("from"), {
-			href: "/dash/tasks",
-			params: {},
+			href: "/dash/[org]/tasks",
+			params: { org },
 			label: "Tasks"
 		}),
 		back: search.get("back")
@@ -110,6 +113,7 @@ function TaskBack() {
 }
 /** The task's one-row head: back, title, status, source and agent, its actions, and a muted line with created time, source, folder, and the agent with its model. */
 function TaskHead({ task, tz }) {
+	const org = useOrg();
 	const live = taskActive(task);
 	const { engine, model, effort } = {
 		...task.task.definition,
@@ -145,9 +149,12 @@ function TaskHead({ task, tz }) {
 				class: "fact",
 				children: [/* @__PURE__ */ _jsxs(Link, {
 					class: "agent-link",
-					href: "/dash/agents/[slug]",
-					params: { slug: task.task.agent },
-					search: { from: `/dash/tasks/${task.task.id}` },
+					href: "/dash/[org]/agents/[slug]",
+					params: {
+						org,
+						slug: task.task.agent
+					},
+					search: { from: `/dash/${org}/tasks/${task.task.id}` },
 					children: [/* @__PURE__ */ _jsx(Icon, { d: iAgent }), task.task.agent]
 				}), engine ? /* @__PURE__ */ _jsx("span", {
 					class: "fact-dim",
@@ -189,13 +196,12 @@ export function TaskView({ initial, tz }) {
 	const [lines, setLines] = useState(initial.logs ?? []);
 	const [complete, setComplete] = useState((initial.logs?.length ?? 0) < LOG_CHUNK);
 	const [tab, setTab] = useState("conversation");
+	const [at, setAt] = useState();
 	const [sent, setSent] = useState([]);
-	const [sending, setSending] = useState(false);
 	const [asking, setAsking] = useState(0);
 	// Answers already there at open have no known question; later ones pair with this session's asks in order.
 	const knownAnswers = useRef(task.answer?.length ?? 0);
 	const [ask, setAsk] = useState(false);
-	const [status, setStatus] = useState("");
 	const after = useRef(initial.logs?.at(-1)?.seq ?? -1);
 	const input = useRef(null);
 	const reply = useRef(null);
@@ -208,14 +214,13 @@ export function TaskView({ initial, tz }) {
 		observer.observe(form);
 		return () => observer.disconnect();
 	}, [task.task.flow]);
-	const action = useAction(task.task.id);
+	const sender = useAction({ toast: "Not sent" });
+	const asker = useAction({ toast: "Not sent" });
+	const sending = Boolean(sender.pending);
 	const live = taskActive(task);
 	const replies = task.task.flow === "default";
 	const rows = useDisplayRows(lines);
 	useEffect(() => watchTask(task.task.id, task.status, taskTitle(task)), [task.status]);
-	useEffect(() => {
-		if (action.error) toastError("Not sent", action.error);
-	}, [action.error]);
 	const pending = useRef([]);
 	const append = (more) => {
 		const fresh = more.filter((line) => line.seq > after.current);
@@ -239,9 +244,6 @@ export function TaskView({ initial, tz }) {
 	}, []);
 	// Logs stream from when the task runs until the stream ends them, which waits for logs still arriving.
 	const [streaming, setStreaming] = useState(live);
-	useEffect(() => {
-		if (live) setStreaming(true);
-	}, [live]);
 	// Each turn's reads apply to it alone: a continue, here or from elsewhere, starts the next.
 	const [round, setRound] = useState(0);
 	const roundNow = useRef(0);
@@ -249,8 +251,10 @@ export function TaskView({ initial, tz }) {
 	const reload = () => {
 		const started = roundNow.current;
 		void client.tasks.get(task.task.id).then(({ logs: _logs, ...full }) => {
-			if (roundNow.current === started) setTask(full);
-		}).catch((reason) => setStatus(reasonText(reason)));
+			if (roundNow.current !== started) return;
+			setTask(full);
+			if (taskActive(full)) setStreaming(true);
+		}).catch((reason) => toastError("Task not refreshed", reasonText(reason)));
 	};
 	// A running stream follows its own cursor; a stopped page fetches the lines it missed.
 	const catchUp = () => {
@@ -258,15 +262,17 @@ export function TaskView({ initial, tz }) {
 		if (!streaming) setComplete(false);
 	};
 	// A new turn's prompt, from this page or elsewhere; its state comes from the events stream.
-	useEffect(() => {
-		if (!round) return;
+	const nextRound = () => {
+		const next = ++roundNow.current;
+		setRound(next);
+		setStreaming(true);
 		void client.tasks.get(task.task.id).then(({ turns }) => {
-			if (roundNow.current === round) setTask((current) => taskActive(current) ? {
+			if (roundNow.current === next) setTask((current) => taskActive(current) ? {
 				...current,
 				turns
 			} : current);
-		}).catch(() => {});
-	}, [round]);
+		}).catch((reason) => console.error("coder dashboard: task turns", reason));
+	};
 	// The head follows the browser's events stream; a finish brings the full task.
 	useTaskEvents(
 		(event) => {
@@ -274,10 +280,7 @@ export function TaskView({ initial, tz }) {
 			if (live && !taskActive(event)) reload();
 			// A new run, even one that finished and was continued between two events.
 			const rerun = live && task.startedAt !== undefined && event.startedAt !== task.startedAt;
-			if (taskActive(event) && (!live || rerun)) {
-				setRound((value) => value + 1);
-				setStreaming(true);
-			}
+			if (taskActive(event) && (!live || rerun)) nextRound();
 			// A turn continued and finished elsewhere while this page heard nothing of it.
 			if (!live && !taskActive(event) && event.finishedAt !== task.finishedAt) {
 				reload();
@@ -298,8 +301,7 @@ export function TaskView({ initial, tz }) {
 			}));
 		},
 		// Missed events: refetch the task and catch up its logs from the cursor.
-		catchUp,
-		() => document.visibilityState === "visible" && catchUp()
+		catchUp
 	);
 	// Older lines a chunk at a time, then the stream follows the run.
 	useEffect(() => {
@@ -307,7 +309,7 @@ export function TaskView({ initial, tz }) {
 		void client.tasks.logs(task.task.id, after.current, LOG_CHUNK).then((more) => {
 			append(more);
 			if (more.length < LOG_CHUNK) setComplete(true);
-		}).catch((reason) => setStatus(reasonText(reason)));
+		}).catch((reason) => toastError("Activity not loaded", reasonText(reason)));
 	}, [complete, lines.length]);
 	// A hidden tab holds no log stream and resumes from its cursor.
 	useEffect(() => {
@@ -318,10 +320,9 @@ export function TaskView({ initial, tz }) {
 				try {
 					const response = await client.tasks.stream(task.task.id, after.current, abort.signal);
 					if (!response.ok || !response.body) {
-						setStatus("Live updates stopped.");
+						toastError("Live updates stopped", "Reload the page to see new activity.");
 						return;
 					}
-					setStatus("");
 					for await (const event of serverEvents(response.body)) {
 						if (abort.signal.aborted) return;
 						if (event.event === "log") append([JSON.parse(event.data)]);
@@ -330,7 +331,6 @@ export function TaskView({ initial, tz }) {
 				} catch {
 					if (abort.signal.aborted) return;
 				}
-				setStatus("Reconnecting.");
 				await new Promise((done) => setTimeout(done, 1e3));
 			}
 		};
@@ -362,18 +362,17 @@ export function TaskView({ initial, tz }) {
 			}]);
 			setAsking((count) => count + 1);
 			setTab("conversation");
-			void action.run(kind, { question: text }).then((ok) => {
+			void asker.run(kind, () => client.tasks.ask(task.task.id, text)).then((ok) => {
 				setAsking((count) => count - 1);
 				if (!ok) setSent((value) => value.filter((message) => message.text !== text || message.kind !== kind));
 			});
 			return;
 		}
-		setSending(true);
-		const ok = await action.run(kind, { text }).finally(() => setSending(false));
+		const ok = await sender.run(kind, () => client.tasks.steer(task.task.id, text));
 		if (!ok) return;
 		input.current.value = "";
 		if (kind === "continue") {
-			setRound((value) => value + 1);
+			nextRound();
 			setTask((current) => ({
 				...current,
 				status: "queued",
@@ -392,9 +391,24 @@ export function TaskView({ initial, tz }) {
 				text,
 				turn: turns.length - 1
 			}]);
-			setTab("activity");
+			openActivity();
 		}
 	};
+	const openActivity = (to) => {
+		setAt(to);
+		setTab("activity");
+	};
+	const activityLink = /* @__PURE__ */ _jsxs("button", {
+		type: "button",
+		class: "btn ghost sm",
+		onClick: () => openActivity("end"),
+		children: ["Activity", /* @__PURE__ */ _jsx(Icon, { d: iRight })]
+	});
+	const run = rows.filter((row) => row.at >= (task.startedAt ?? 0));
+	const foot = !live && task.startedAt && task.finishedAt ? /* @__PURE__ */ _jsxs("p", {
+		class: "run-foot",
+		children: [runSummary(run, task.finishedAt - task.startedAt), activityLink]
+	}) : null;
 	// The menu hands focus back to its button as it closes, so the box takes it after.
 	const pickMode = (next) => {
 		setAsk(next);
@@ -418,7 +432,6 @@ export function TaskView({ initial, tz }) {
 				"."
 			]
 		}, index)),
-		task.approval ? /* @__PURE__ */ _jsx(Approval, { task }) : null,
 		/* @__PURE__ */ _jsx("nav", {
 			class: "tabs",
 			role: "tablist",
@@ -430,20 +443,16 @@ export function TaskView({ initial, tz }) {
 					role: "tab",
 					"aria-selected": tab === key,
 					"aria-current": tab === key ? "page" : undefined,
-					onClick: () => setTab(key),
+					onClick: () => key === "activity" ? openActivity() : setTab(key),
 					children: label
 				}, key);
 			})
 		}),
-		status ? /* @__PURE__ */ _jsx("p", {
-			class: "flash err",
-			role: "status",
-			children: status
-		}) : null,
 		tab === "activity" ? /* @__PURE__ */ _jsx(Activity, {
 			rows,
 			live,
-			tz
+			tz,
+			at
 		}) : /* @__PURE__ */ _jsx("div", {
 			class: "convo",
 			children: turns.map((turn, index) => {
@@ -500,27 +509,25 @@ export function TaskView({ initial, tz }) {
 							]
 						}, index);
 					}),
-					turn.result ? /* @__PURE__ */ _jsx(Card, {
+					turn.result ? /* @__PURE__ */ _jsxs(Card, {
 						title: "Result",
-						children: /* @__PURE__ */ _jsx(ResultBody, { value: turn.result })
+						children: [/* @__PURE__ */ _jsx(ResultBody, { value: turn.result }), last ? foot : null]
 					}) : last && live ? /* @__PURE__ */ _jsx(Card, {
 						title: "Result",
-						children: /* @__PURE__ */ _jsx("div", {
-							class: "body waiting",
-							children: /* @__PURE__ */ _jsx(Loading, {
-								inline: true,
-								dots: true,
-								label: "The result appears here when the task finishes."
-							})
+						actions: activityLink,
+						children: /* @__PURE__ */ _jsx(RunPreview, {
+							rows: run,
+							startedAt: task.startedAt,
+							onOpen: openActivity
 						})
 					}) : null,
-					turn.error ? /* @__PURE__ */ _jsx(Card, {
+					turn.error ? /* @__PURE__ */ _jsxs(Card, {
 						tone: "danger",
 						title: "Error",
-						children: /* @__PURE__ */ _jsx("div", {
+						children: [/* @__PURE__ */ _jsx("div", {
 							class: "body prose",
 							children: turn.error
-						})
+						}), last && !turn.result ? foot : null]
 					}) : null
 				] }, index);
 			})
@@ -586,6 +593,10 @@ export function TaskView({ initial, tz }) {
 		}) : /* @__PURE__ */ _jsx("p", {
 			class: "muted no-reply",
 			children: "This flow takes no follow-ups."
+		}),
+		/* @__PURE__ */ _jsx("div", {
+			class: "approval-dock",
+			children: task.approval ? /* @__PURE__ */ _jsx(Approval, { task }) : null
 		})
 	] });
 }

package/dist/dash/standalone/server/modules-server-server-react-server/src/server/dash/app/dash/[org]/tasks/composer-data.ff108c0ef82a4d7b.js

@@ -0,0 +1,69 @@
+import { localServer } from "../../../../api/types.9f59e6c761d6aac4.js";
+import { modelsByEngine } from "../settings/model-options.2eacf7f8ac0032df.js";
+import { DEFAULT_ENGINE } from "../../../../../../core/defaults.e6ce0944639198a2.js";
+export const PLACEHOLDER = "What should the agent do? Type / for flows and reviews.";
+export const CHOICE = {
+	repo: "",
+	cwd: "",
+	agent: "",
+	engine: "",
+	model: "",
+	effort: "",
+	permissions: "",
+	runner: ""
+};
+/** No agent picked yet, or one this workspace no longer runs, falls back to the server's default agent, else the first. */
+export function usableAgent(choice, lists) {
+	const ids = lists.agents.map(([id]) => id);
+	if (!ids.length || ids.includes(choice.agent)) return choice;
+	return {
+		...choice,
+		agent: lists.defaultAgent ?? ids[0]
+	};
+}
+/** The composer's last choice, from its cookie. */
+export function savedChoice(cookie) {
+	const raw = cookie.match(/(?:^|; )compose=([^;]*)/)?.[1];
+	try {
+		return raw ? JSON.parse(decodeURIComponent(raw)) : {};
+	} catch {
+		return {};
+	}
+}
+/** Defaults first, then by name. */
+export const sortedRunners = (rows) => [...rows].sort((a, b) => Number(b.default) - Number(a.default) || a.name.localeCompare(b.name));
+/** Runners as [id, name]; unset is the requester's default, named. */
+export const runnerOptions = (rows) => {
+	const own = rows.find((row) => row.default);
+	return [["", own ? `Default · ${own.name}` : "Default"], ...sortedRunners(rows).filter((row) => row !== own).map((row) => [row.id, row.name])];
+};
+/** No credential can run a task yet; a local server runs on the machine's own sign-ins. */
+export const credentialMissing = (api) => Promise.all([api.credentials.list({
+	cursor: "",
+	limit: 1,
+	fields: "id"
+}).catch(() => undefined), api.me().catch(() => undefined)]).then(([credentials, me]) => credentials?.items.length === 0 && !(me && localServer(me)));
+/** What the composer offers and falls back to, read in one request. */
+export async function loadComposer(api) {
+	const options = await api.composer();
+	const preferred = options.agents.find((agent) => agent.default)?.id;
+	const data = {
+		agents: options.agents.map(({ id, name }) => [id, name]),
+		...preferred ? { defaultAgent: preferred } : {},
+		// Built-in agents always exist, so an empty list means every agent is disabled.
+		...options.agents.length ? {} : { agentsOff: true },
+		models: modelsByEngine(options.models),
+		runners: runnerOptions(options.runners),
+		flows: options.flows,
+		folders: options.folders
+	};
+	const defaults = {
+		engine: options.engine ?? DEFAULT_ENGINE,
+		engines: options.engines
+	};
+	return {
+		data,
+		defaults,
+		connectLabel: options.connectLabel ?? "Connect repositories"
+	};
+}