toolroll 0.9.54 → 0.9.55

package/dist/server/task-views.d.ts

@@ -1,9 +1,16 @@
+import { type Html } from "../html.js";
 import { type AssignmentSnapshot } from '../assignment.js';
 import { type FailureExplanation } from '../needs-you.js';
 import type { TaskFamily } from "../store.js";
 import { type ServerResponse } from "node:http";
 import { type Scope } from "../scope.js";
-import { taskBody, type Chrome, type CompletionReceiptView, type MilestoneProgressView, type PlanContractView, type PlanRevisionLedgerView, type ProjectPeek, type ResultDetail, type RevisionDocView, type RevisionView, type RouteView, type Screen, type ServeOptions, type TaskChatFocus, type TaskPullRequest, type Who, type WorkRow } from "./shared.js";
+import { type Chrome, type Screen } from "./chrome.js";
+import { type ServeOptions } from "./http.js";
+import { type TaskChatFocus } from "./render-chat.js";
+import { type ProjectPeek, type WorkRow } from "./render-pages.js";
+import { type CompletionReceiptView, type ResultDetail, type TaskPullRequest } from "./render-results.js";
+import { taskBody, type MilestoneProgressView, type PlanContractView, type PlanRevisionLedgerView, type RevisionDocView, type RevisionView, type RouteView } from "./render-tasks.js";
+import { type Who } from "./session.js";
 import type { PlanRevision, TaskRef } from "../store.js";
 import { type Run, type Store, type Task, type TaskState } from "../store.js";
 import { type ReviewFacts } from "../workspace-ui.js";
@@ -27,7 +34,7 @@ export interface TaskViewsRuntime {
     restricted: () => boolean;
     options: ServeOptions;
     sendScreen: (response: ServerResponse, status: number, s: Screen) => void;
-    chromeFor: (project: string | null, active: Chrome["active"], listPane?: string, scope?: Chrome["scope"]) => Chrome;
+    chromeFor: (project: string | null, active: Chrome["active"], listPane?: Html, scope?: Chrome["scope"]) => Chrome;
     unscopedMode: boolean;
     dockedConversation: (who: Who, focusTask: TaskChatFocus | null, chatProject: string | null, now: Date, back: string, resultRunId?: number | null) => import("../browser-workspace.js").BrowserConversation | null;
     liveRefreshSeconds: () => number;
@@ -41,13 +48,13 @@ export declare function createTaskViews(runtime: TaskViewsRuntime): {
     })[];
     revisionDestination: (child: string, back: string) => string;
     earlierLiveVersions: (family: TaskFamily, now: Date) => string[];
-    familyHistory: (family: TaskFamily) => string;
+    familyHistory: (family: TaskFamily) => Html;
     freshAssignment: (assignment: AssignmentSnapshot | null, receipt: CompletionReceiptView | null) => AssignmentSnapshot | null;
     workRowOf: (task: Task & {
         repo: string | null;
         family?: TaskFamily;
     }, now: Date, receipt?: CompletionReceiptView | null) => WorkRow;
-    taskListPane: (project: string | null, currentId: string | null) => string;
+    taskListPane: (project: string | null, currentId: string | null) => Html;
     runIsLive: (run: Pick<Run, "outcome" | "leaseId" | "taskRef">) => boolean;
     runIsTaskResult: (run: Pick<Run, "role" | "finishedAt">) => boolean;
     revisionViewOf: (ref: ReturnType<Store["lookupRef"]>) => RevisionView | null;

package/dist/server/task-views.js

@@ -1,4 +1,5 @@
 import { assignmentPresentationOf, historicalAssessmentReason } from '../assignment-presentation.js';
+import { html, joinHtml } from "../html.js";
 import { assignmentStatusOf, assignmentWithEvidence } from '../assignment-ui.js';
 import { assignmentOf } from '../assignment.js';
 import { knowledgeContextHtml } from "../knowledge-ui.js";
@@ -32,7 +33,13 @@ import { isRevisionFeedback } from "../result-review.js";
 import { buildReviewOf } from "../review-switch.js";
 import { isAlive as runnerAlive } from "../runner.js";
 import { approvalOf } from "../scope.js";
-import { approvalFormDigest, nonceHashOf, chatResultHref, completionReceiptView, consentDoorOf, decisionsFor, diffFileAnchor, escape, evidenceLinksFor, followUpsFor, oneLineOf, orderChangedFiles, parseReviewDiff, proofBundleView, publicationFactsOf, receiptStatusOf, refuse, resumeCeremonyPage, resumeDigestOf, reviewHref, screen, taskBody, taskChatHref, taskHref, taskPage, withinSignedTouches } from "./shared.js";
+import { oneLineOf, refuse, screen } from "./chrome.js";
+import { chatResultHref, reviewHref, taskChatHref, taskHref } from "./http.js";
+import { decisionsFor } from "./render-chat.js";
+import {} from "./render-pages.js";
+import { completionReceiptView, diffFileAnchor, evidenceLinksFor, followUpsFor, orderChangedFiles, parseReviewDiff, proofBundleView, receiptStatusOf, withinSignedTouches } from "./render-results.js";
+import { approvalFormDigest, consentDoorOf, nonceHashOf, publicationFactsOf, resumeCeremonyPage, resumeDigestOf, taskBody, taskPage } from "./render-tasks.js";
+import {} from "./session.js";
 import { budgetHoldWords, budgetLabel, monthOf } from "../spend.js";
 import {} from "../store.js";
 import { taskControlOf } from "../task-control.js";
@@ -74,20 +81,19 @@ export function createTaskViews(runtime) {
             .filter(task => workRowOf(task, now).status.views.includes("running")).map(task => task.id);
     }
     function familyHistory(family) {
-        const warning = family.problem === null ? "" : `<p class="problem" data-history-problem>${escape(family.problem)}</p>`;
+        const warning = family.problem === null ? "" : html `<p class="problem" data-history-problem>${family.problem}</p>`;
         const otherActive = new Set([...family.otherActive.map(one => one.id), ...earlierLiveVersions(family, runtime.clock())]).size;
-        const active = otherActive === 0 ? "" : `<p class="problem" data-other-active>${otherActive} earlier version${otherActive === 1 ? " is" : "s are"} still waiting or running. Review History.</p>`;
+        const active = otherActive === 0 ? "" : html `<p class="problem" data-other-active>${otherActive} earlier version${otherActive === 1 ? " is" : "s are"} still waiting or running. Review History.</p>`;
         if (family.versions.length < 2)
-            return warning;
+            return html `${warning}`;
         const versions = family.versions.map((version, index) => {
             const label = index === 0 ? "Original" : `Revision ${index}`;
             const status = workRowOf(version, runtime.clock()).status;
             const runs = runtime.store.runsFor(version.refId).filter(runIsTaskResult);
             const href = `${taskHref(family.root.id)}?version=${encodeURIComponent(version.id)}`;
-            return `<li data-history-version="${escape(version.id)}"><a href="${href}">${label}</a>${version.id === family.current.id ? " · Current" : ""} · ${escape(status.label)}` +
-                runs.map(run => `<a href="${escape(run.outcome === "built" || run.outcome === "no-change" ? chatResultHref(family.root.id, run.id) : `/r/${run.id}`)}">Build #${run.id}${run.outcome === "built" ? "" : ` · ${escape(run.outcome === "no-change" ? "No changes" : run.outcome === "failed" ? "Failed" : run.outcome ?? "Unfinished")}`}</a>`).join("") + `</li>`;
+            return html `<li data-history-version="${version.id}"><a href="${href}">${label}</a>${version.id === family.current.id ? " · Current" : ""} · ${status.label}${runs.map(run => html `<a href="${run.outcome === "built" || run.outcome === "no-change" ? chatResultHref(family.root.id, run.id) : `/r/${run.id}`}">Build #${run.id}${run.outcome === "built" ? "" : ` · ${run.outcome === "no-change" ? "No changes" : run.outcome === "failed" ? "Failed" : run.outcome ?? "Unfinished"}`}</a>`)}</li>`;
         });
-        return warning + active + `<details class="task-history" data-root-task="${escape(family.root.id)}"><summary>History</summary><ol>${versions.join("")}</ol></details>`;
+        return html `${warning}${active}<details class="task-history" data-root-task="${family.root.id}"><summary>History</summary><ol>${versions}</ol></details>`;
     }
     /** Keep detailed receipt diagnostics; shared assignment reads own readiness. */
     function freshAssignment(assignment, receipt) {
@@ -166,11 +172,9 @@ export function createTaskViews(runtime) {
             if (family !== null && (project === null || family.root.repo === null || family.root.repo === project))
                 rows.push({ ...family.current, id: family.root.id, title: family.root.title });
         }
-        const items = rows
-            .map(task => `<a class="item${task.id === currentId ? " current" : ""}" href="${taskHref(task.id)}">` +
-            `<span class="t">${escape(task.title)}</span></a>`)
-            .join("\n");
-        return `<h2>Tasks</h2>\n${items === "" ? `<p class="meta">None yet</p>` : items}`;
+        const items = joinHtml(rows
+            .map(task => html `<a class="item${task.id === currentId ? " current" : ""}" href="${taskHref(task.id)}"><span class="t">${task.title}</span></a>`), "\n");
+        return html `<h2>Tasks</h2>\n${rows.length === 0 ? html `<p class="meta">None yet</p>` : items}`;
     }
     /**
      * The one liveness fact (round-4 findings 14/15): a run is being built
@@ -677,13 +681,13 @@ export function createTaskViews(runtime) {
     function taskScreen(response, who, taskId, problem, status, scopeDraft, cancelDraft, editPlan = false) {
         const admittedFamily = runtime.familyOf(taskId);
         if (admittedFamily?.problem != null)
-            return runtime.sendScreen(response, status, screen(admittedFamily.root.title, `<h1>${escape(admittedFamily.root.title)}</h1><p>${escape(admittedFamily.current.state)}</p><p class="problem" data-history-problem>${escape(admittedFamily.problem)}</p>`, { chrome: runtime.chromeFor(admittedFamily.root.repo, "tasks") }));
+            return runtime.sendScreen(response, status, screen(admittedFamily.root.title, html `<h1>${admittedFamily.root.title}</h1><p>${admittedFamily.current.state}</p><p class="problem" data-history-problem>${admittedFamily.problem}</p>`, { chrome: runtime.chromeFor(admittedFamily.root.repo, "tasks") }));
         const data = taskViewData(taskId, who, problem);
         if (data === null)
             return refuse(response, who, 404, "no such task", "/tasks");
         const family = runtime.familyOf(taskId);
         const presentedData = { ...data, rootId: family?.root.id ?? taskId, rootTitle: family?.root.title ?? data.task.title,
-            history: family === null || data.assignment != null ? "" : familyHistory(family),
+            ...(family === null || data.assignment != null ? {} : { history: familyHistory(family) }),
             versionLabel: family !== null && family.current.id !== taskId ? `Viewing ${family.versions.findIndex(one => one.id === taskId) === 0 ? "Original" : `Revision ${family.versions.findIndex(one => one.id === taskId)}`} · ${family.current.state === "running" ? "A newer revision is running" : "A newer revision is current"}` : null };
         if (scopeDraft !== undefined)
             presentedData.scopeDraft = scopeDraft;
@@ -716,7 +720,7 @@ export function createTaskViews(runtime) {
         // only an approver is offered a road to message the agent.
         const taskView = page.workspace?.view?.kind === "task" ? { ...page.workspace.view, ...(docked === null ? {} : { tabs: [] }), ...(who.role === "approver" ? {} : { chatHref: null }),
             // A signed-in page hears the moment the task changes, and who else has it open.
-            ...(who.via === "cookie" ? { live: { href: `${taskHref(family?.root.id ?? taskId)}/live`, at: (() => { try {
+            ...(who.via === "cookie" ? { live: { room: `task:${encodeURIComponent(family?.root.id ?? taskId)}`, at: (() => { try {
                         return taskFingerprint(runtime.store, family?.root.id ?? taskId, runtime.clock());
                     }
                     catch {
@@ -755,7 +759,7 @@ export function createTaskViews(runtime) {
         if (run.role === "reviewer")
             return taskScreen(response, who, taskId, `run #${runId} is a historical review run — nothing reruns it; open the saved result instead`, 409);
         if (stop.resumedAt !== null)
-            return taskScreen(response, who, taskId, `run #${runId} was already resumed by ${escape(stop.resumedBy ?? "?")}`, 409);
+            return taskScreen(response, who, taskId, `run #${runId} was already resumed by ${stop.resumedBy ?? "?"}`, 409);
         const control = taskControlOf(runtime.store, ref.id, now);
         if (control.kind !== "paused" || control.run !== runId) {
             return taskScreen(response, who, taskId, control.kind === "stopping" ? `run #${runId} is still stopping — its processes are not yet established gone` : `run #${runId} is no longer the attempt a resume can name — reload and decide against the current state`, 409);
@@ -957,7 +961,7 @@ export function createTaskViews(runtime) {
             cited: cited.has(file.path),
         })), cited.size > 0);
         const publication = runtime.store.publicationForRun(run.id);
-        let learning = "", skillTest = false;
+        let learning = html ``, skillTest = false;
         const learningRepo = runtime.store.refForId(run.taskRef)?.repo;
         if (learningRepo && runtime.visible(learningRepo)) {
             try {
@@ -968,17 +972,17 @@ export function createTaskViews(runtime) {
                 const test = skillTestResult(runtime.store, run.id, who.name);
                 if (test) {
                     skillTest = true;
-                    learning = skillTestFeedbackHtml(test, who.via === 'cookie' ? who.session.csrf : '', who.role === 'approver') + learning;
+                    learning = html `${skillTestFeedbackHtml(test, who.via === 'cookie' ? who.session.csrf : '', who.role === 'approver')}${learning}`;
                 }
             }
             catch {
-                learning = '<p role="alert">The saved skill test could not be verified.</p>' + learning;
+                learning = html `<p role="alert">The saved skill test could not be verified.</p>${learning}`;
             }
             try {
-                learning = skillsSnapshotHtml(readSkillsSnapshot(runtime.store, run.id)) + knowledgeContextHtml(readKnowledgeSnapshot(runtime.store, run.id)) + learning;
+                learning = html `${skillsSnapshotHtml(readSkillsSnapshot(runtime.store, run.id))}${knowledgeContextHtml(readKnowledgeSnapshot(runtime.store, run.id))}${learning}`;
             }
             catch {
-                learning = '<p class="problem" role="alert">The context saved for this run could not be verified.</p>' + learning;
+                learning = html `<p class="problem" role="alert">The context saved for this run could not be verified.</p>${learning}`;
             }
         }
         return {
@@ -986,7 +990,7 @@ export function createTaskViews(runtime) {
             skillTest,
             taskId,
             rootId: runtime.familyOf(taskId)?.root.id ?? taskId,
-            history: (() => { const family = runtime.familyOf(taskId); return family === null ? "" : familyHistory(family); })(),
+            ...(() => { const family = runtime.familyOf(taskId); return family === null ? {} : { history: familyHistory(family) }; })(),
             run,
             receipt,
             assignment: (() => {

package/dist/server/tasks.d.ts

@@ -1,21 +1,21 @@
-import type { Registration } from './handler-registry.js';
+/** tasks handlers, moved without changing their route bodies. */
+import { type Html } from "../html.js";
 import { type ServerResponse } from "node:http";
 import { type Artifact, type Run, type Store } from "../store.js";
-import type { HandlerContext } from './handler-context.js';
 import type { ServerRuntime } from './runtime.js';
-import { type CompletedWorkRow, type PeekAdmission, type RankedReviewRow, type ReviewCockpitView, type Who } from "./shared.js";
+import { type PeekAdmission } from "./render-pages.js";
+import { type CompletedWorkRow, type RankedReviewRow, type ReviewCockpitView } from "./render-results.js";
+import { type Who } from "./session.js";
 export declare function createTasksHandlers(runtime: ServerRuntime): {
-    registrations: Registration[];
-    get: (ctx: HandlerContext) => Promise<void>;
-    post: (ctx: HandlerContext) => Promise<void>;
-    runListPane: (project: string | null, currentId: number | null) => string;
+    registrations: import("./handler-registry.js").Registration[];
+    runListPane: (project: string | null, currentId: number | null) => Html;
     peekFragment: (runId: number, sessionKey: string, editorMode?: boolean) => Promise<{
         status: number;
-        body: string;
+        body: Html;
         retryAfter?: number;
     }>;
     taskMutation: (response: ServerResponse, who: Who, taskId: string, verb: string, posted: URLSearchParams, now: Date) => void;
-    queueRegionFor: (project: string | null, csrf: string, revision: number, now: Date) => string;
+    queueRegionFor: (project: string | null, csrf: string, revision: number, now: Date) => Html;
     ciFailingFor: (runId: number | null, prNumber: number | null) => boolean;
     completedRowFor: (taskId: string, project: string | null) => CompletedWorkRow | null;
     attemptRowFor: (taskId: string, runId: number | null, project: string | null) => CompletedWorkRow | null;