toolroll 0.9.54 → 0.9.56

package/dist/spend.d.ts

@@ -7,8 +7,8 @@
  * Models), or at the provider's highest listed price when the model isn't
  * listed; work with no tokens and no cost is "unpriced" and said so.
  *
- * Spend counts toward a project (a run's task, a teammate's, a project chat),
- * a person (who filed the task, or had the chat), a teammate (its turns, and
+ * Spend counts toward a project (a run's task, a subagent's, a project chat),
+ * a person (who filed the task, or had the chat), a subagent (its turns, and
  * tasks it filed), and the whole installation. Budgets are per calendar
  * month (UTC).
  */
@@ -30,7 +30,7 @@ export declare function claudeBillingFrom(seen: {
     model: string | null;
     planWindows: boolean;
 }): Billing | null;
-/** How Claude bills on this computer when Toolroll gives it no key (teammate turns, drafts): as its keyless runs
+/** How Claude bills on this computer when Toolroll gives it no key (subagent turns, drafts): as its keyless runs
  * were last seen, and its plan until one has been. */
 export declare function claudeMachineBilling(db: Database): Billing;
 /** Whether API work on this provider can be priced: it reports its cost, or the catalogue has its prices. */
@@ -60,8 +60,8 @@ export declare function priceWork(db: Database, work: {
     source: PriceSource;
     price: Price | null;
 };
-export declare const SPEND_SCHEMA = "\nCREATE TABLE IF NOT EXISTS run_spend (\n  run         INTEGER PRIMARY KEY,\n  microusd    INTEGER,\n  source      TEXT NOT NULL CHECK (source IN ('reported', 'estimated', 'unpriced', 'subscription')),\n  billing     TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  -- 1 once the run's own evidence set it (a key it was given, what its CLI said); a later turn can only make it a key.\n  billing_fixed INTEGER NOT NULL DEFAULT 0,\n  price_model TEXT,\n  input_usd   REAL,\n  output_usd  REAL,\n  priced_at   TEXT NOT NULL\n);\nCREATE TABLE IF NOT EXISTS budget (\n  id          INTEGER PRIMARY KEY AUTOINCREMENT,\n  scope_kind  TEXT NOT NULL CHECK (scope_kind IN ('installation', 'project', 'person', 'teammate')),\n  scope_key   TEXT NOT NULL,\n  limit_microusd INTEGER NOT NULL CHECK (limit_microusd > 0),\n  hard_stop   INTEGER NOT NULL DEFAULT 1,\n  created_by  TEXT NOT NULL,\n  created_at  TEXT NOT NULL,\n  updated_by  TEXT NOT NULL,\n  updated_at  TEXT NOT NULL,\n  removed_by  TEXT,\n  removed_at  TEXT\n);\nCREATE UNIQUE INDEX IF NOT EXISTS budget_live ON budget (scope_kind, scope_key) WHERE removed_at IS NULL;\nCREATE TABLE IF NOT EXISTS provider_limit (\n  provider       TEXT NOT NULL,\n  window         TEXT NOT NULL,\n  used_percent   REAL NOT NULL,\n  window_minutes INTEGER,\n  resets_at      TEXT,\n  reached        INTEGER NOT NULL DEFAULT 0,\n  plan           TEXT,\n  observed_at    TEXT NOT NULL,\n  PRIMARY KEY (provider, window)\n);\n-- Spend that isn't a run, a teammate turn or a chat: a flow's Claude draft.\nCREATE TABLE IF NOT EXISTS side_spend (\n  id        INTEGER PRIMARY KEY AUTOINCREMENT,\n  kind      TEXT NOT NULL CHECK (kind IN ('draft')),\n  repo      TEXT,\n  provider  TEXT NOT NULL,\n  model     TEXT,\n  cost_usd  REAL,\n  billing   TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  at        TEXT NOT NULL\n);\nCREATE INDEX IF NOT EXISTS side_spend_at ON side_spend (at);\nCREATE TABLE IF NOT EXISTS provider_account (\n  provider    TEXT PRIMARY KEY,\n  billing     TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  observed_at TEXT NOT NULL\n);\nCREATE INDEX IF NOT EXISTS chat_turn_created ON chat_turn (created_at);\nCREATE INDEX IF NOT EXISTS mate_turn_created ON mate_turn (created_at);\nCREATE INDEX IF NOT EXISTS teammate_turn_at ON teammate_turn (at);\n";
-export type BudgetScope = "installation" | "project" | "person" | "teammate";
+export declare const SPEND_SCHEMA = "\nCREATE TABLE IF NOT EXISTS run_spend (\n  run         INTEGER PRIMARY KEY,\n  microusd    INTEGER,\n  source      TEXT NOT NULL CHECK (source IN ('reported', 'estimated', 'unpriced', 'subscription')),\n  billing     TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  -- 1 once the run's own evidence set it (a key it was given, what its CLI said); a later turn can only make it a key.\n  billing_fixed INTEGER NOT NULL DEFAULT 0,\n  price_model TEXT,\n  input_usd   REAL,\n  output_usd  REAL,\n  priced_at   TEXT NOT NULL\n);\nCREATE TABLE IF NOT EXISTS budget (\n  id          INTEGER PRIMARY KEY AUTOINCREMENT,\n  scope_kind  TEXT NOT NULL CHECK (scope_kind IN ('installation', 'project', 'person', 'subagent')),\n  scope_key   TEXT NOT NULL,\n  limit_microusd INTEGER NOT NULL CHECK (limit_microusd > 0),\n  hard_stop   INTEGER NOT NULL DEFAULT 1,\n  created_by  TEXT NOT NULL,\n  created_at  TEXT NOT NULL,\n  updated_by  TEXT NOT NULL,\n  updated_at  TEXT NOT NULL,\n  removed_by  TEXT,\n  removed_at  TEXT\n);\nCREATE UNIQUE INDEX IF NOT EXISTS budget_live ON budget (scope_kind, scope_key) WHERE removed_at IS NULL;\nCREATE TABLE IF NOT EXISTS provider_limit (\n  provider       TEXT NOT NULL,\n  window         TEXT NOT NULL,\n  used_percent   REAL NOT NULL,\n  window_minutes INTEGER,\n  resets_at      TEXT,\n  reached        INTEGER NOT NULL DEFAULT 0,\n  plan           TEXT,\n  observed_at    TEXT NOT NULL,\n  PRIMARY KEY (provider, window)\n);\n-- Spend that isn't a run, a subagent turn or a chat: a flow's Claude draft.\nCREATE TABLE IF NOT EXISTS side_spend (\n  id        INTEGER PRIMARY KEY AUTOINCREMENT,\n  kind      TEXT NOT NULL CHECK (kind IN ('draft')),\n  repo      TEXT,\n  provider  TEXT NOT NULL,\n  model     TEXT,\n  cost_usd  REAL,\n  billing   TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  at        TEXT NOT NULL\n);\nCREATE INDEX IF NOT EXISTS side_spend_at ON side_spend (at);\nCREATE TABLE IF NOT EXISTS provider_account (\n  provider    TEXT PRIMARY KEY,\n  billing     TEXT NOT NULL CHECK (billing IN ('subscription', 'api-key')),\n  observed_at TEXT NOT NULL\n);\nCREATE INDEX IF NOT EXISTS chat_turn_created ON chat_turn (created_at);\nCREATE INDEX IF NOT EXISTS mate_turn_created ON mate_turn (created_at);\nCREATE INDEX IF NOT EXISTS subagent_turn_at ON subagent_turn (at);\n";
+export type BudgetScope = "installation" | "project" | "person" | "subagent";
 export type Budget = {
     id: number;
     scope: BudgetScope;
@@ -74,12 +74,12 @@ export type Budget = {
 /** One piece of spend, whatever made it, with what it counts toward. */
 export type SpendItem = {
     at: string;
-    kind: "run" | "teammate" | "chat" | "sort" | "draft";
+    kind: "run" | "subagent" | "chat" | "sort" | "draft";
     microusd: number | null;
     source: PriceSource;
     project: string | null;
     person: string | null;
-    teammate: number | null;
+    subagent: number | null;
     provider: string;
     model: string | null;
     tokensIn: number | null;
@@ -100,9 +100,9 @@ export declare function monthNamed(name: string | null): {
     to: string;
     name: string;
 } | null;
-/** Every teammate's name by id (its handle when its soul file names none). */
-export declare function teammateNames(db: Database): Map<number, string>;
-export declare function teammateFilers(db: Database): (repo: string | null, filedBy: string | null, kind: string | null) => number | null;
+/** Every subagent's name by id (its handle when its soul file names none). */
+export declare function subagentNames(db: Database): Map<number, string>;
+export declare function subagentFilers(db: Database): (repo: string | null, filedBy: string | null, kind: string | null) => number | null;
 /** Who a task's work counts toward: its own filer, or, for a revision filed by automation (an automatic repair), the
  * filer of the task it revises, up its ancestry (bounded). */
 export declare function filersOf(db: Database): (taskRef: number) => {
@@ -110,7 +110,7 @@ export declare function filersOf(db: Database): (taskRef: number) => {
     filedBy: string | null;
     kind: string | null;
 };
-/** Every piece of spend in [from, to): runs (by when they started), teammate turns and chat turns. `modeOf` says how
+/** Every piece of spend in [from, to): runs (by when they started), subagent turns and chat turns. `modeOf` says how
  * a provider bills when a record doesn't (older rows): its current login or key. */
 export declare function spendItems(db: Database, from: string, to: string, modeOf?: (provider: string) => Billing): SpendItem[];
 /** Whether a piece of spend counts toward a budget. */
@@ -134,9 +134,9 @@ export type BudgetHold = {
     remainingMicrousd: number | null;
 };
 /** Why work waits on a budget, in words. */
-export declare function budgetHoldWords(hold: BudgetHold, month: string, teammateName?: string): string;
+export declare function budgetHoldWords(hold: BudgetHold, month: string, subagentName?: string): string;
 /** Each budget's month so far: what counted toward it, and how many pieces of work had no price. */
 export declare function budgetStates(budgets: readonly Budget[], items: readonly SpendItem[]): BudgetState[];
-/** A budget in words: "The shop project's", "alex's", "Maya's (teammate)", "The whole installation's". */
-export declare function budgetLabel(budget: Pick<Budget, "scope" | "key">, teammateName?: string): string;
+/** A budget in words: "The shop project's", "alex's", "Maya's (subagent)", "The whole installation's". */
+export declare function budgetLabel(budget: Pick<Budget, "scope" | "key">, subagentName?: string): string;
 export declare const usd: (microusd: number | null) => string;

package/dist/spend.js

@@ -30,7 +30,7 @@ export function claudeBillingFrom(seen) {
         return "subscription";
     return seen.keySource === "none" ? "api-key" : null;
 }
-/** How Claude bills on this computer when Toolroll gives it no key (teammate turns, drafts): as its keyless runs
+/** How Claude bills on this computer when Toolroll gives it no key (subagent turns, drafts): as its keyless runs
  * were last seen, and its plan until one has been. */
 export function claudeMachineBilling(db) {
     return seenBilling(db, "claude") ?? "subscription";
@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS run_spend (
 );
 CREATE TABLE IF NOT EXISTS budget (
   id          INTEGER PRIMARY KEY AUTOINCREMENT,
-  scope_kind  TEXT NOT NULL CHECK (scope_kind IN ('installation', 'project', 'person', 'teammate')),
+  scope_kind  TEXT NOT NULL CHECK (scope_kind IN ('installation', 'project', 'person', 'subagent')),
   scope_key   TEXT NOT NULL,
   limit_microusd INTEGER NOT NULL CHECK (limit_microusd > 0),
   hard_stop   INTEGER NOT NULL DEFAULT 1,
@@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS provider_limit (
   observed_at    TEXT NOT NULL,
   PRIMARY KEY (provider, window)
 );
--- Spend that isn't a run, a teammate turn or a chat: a flow's Claude draft.
+-- Spend that isn't a run, a subagent turn or a chat: a flow's Claude draft.
 CREATE TABLE IF NOT EXISTS side_spend (
   id        INTEGER PRIMARY KEY AUTOINCREMENT,
   kind      TEXT NOT NULL CHECK (kind IN ('draft')),
@@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS provider_account (
 );
 CREATE INDEX IF NOT EXISTS chat_turn_created ON chat_turn (created_at);
 CREATE INDEX IF NOT EXISTS mate_turn_created ON mate_turn (created_at);
-CREATE INDEX IF NOT EXISTS teammate_turn_at ON teammate_turn (at);
+CREATE INDEX IF NOT EXISTS subagent_turn_at ON subagent_turn (at);
 `;
 /** The calendar month (UTC) `at` falls in: [start, end) as ISO strings, and its name (YYYY-MM). */
 export function monthOf(at) {
@@ -156,25 +156,25 @@ export function monthNamed(name) {
         return null;
     return monthOf(new Date(`${name}-01T00:00:00.000Z`));
 }
-/** The teammate behind a filing: tasks a teammate files are filed as its name ("Maya (AI)", from its soul file), in
- * its project. A later teammate with the same name and project wins, as it would read on the card. */
-/** A teammate's name as its soul file gives it ("Maya"), or null. */
+/** The subagent behind a filing: tasks a subagent files are filed as its name ("Maya (AI)", from its soul file), in
+ * its project. A later subagent with the same name and project wins, as it would read on the card. */
+/** A subagent's name as its soul file gives it ("Maya"), or null. */
 const soulName = (soul) => {
     const front = /^---\s*\n([\s\S]*?)\n---/.exec(String(soul ?? ""));
     return front === null ? null : /^name:\s*(.+?)\s*$/m.exec(front[1])?.[1] ?? null;
 };
-/** Every teammate's name by id (its handle when its soul file names none). */
-export function teammateNames(db) {
-    return new Map(db.prepare("SELECT id, handle, soul FROM teammate").all().map(row => [Number(row["id"]), soulName(row["soul"]) ?? String(row["handle"])]));
+/** Every subagent's name by id (its handle when its soul file names none). */
+export function subagentNames(db) {
+    return new Map(db.prepare("SELECT id, handle, soul FROM subagent").all().map(row => [Number(row["id"]), soulName(row["soul"]) ?? String(row["handle"])]));
 }
-export function teammateFilers(db) {
+export function subagentFilers(db) {
     const byName = new Map();
-    for (const row of db.prepare("SELECT id, repo, handle, soul FROM teammate ORDER BY id").all()) {
+    for (const row of db.prepare("SELECT id, repo, handle, soul FROM subagent ORDER BY id").all()) {
         const name = soulName(row["soul"]);
         for (const one of [String(row["handle"]), ...(name === null ? [] : [name])])
             byName.set(`${String(row["repo"])}\n${one} (AI)`, Number(row["id"]));
     }
-    return (repo, filedBy, kind) => kind !== "teammate" || repo === null || filedBy === null ? null : byName.get(`${repo}\n${filedBy}`) ?? null;
+    return (repo, filedBy, kind) => kind !== "subagent" || repo === null || filedBy === null ? null : byName.get(`${repo}\n${filedBy}`) ?? null;
 }
 /** Who a task's work counts toward: its own filer, or, for a revision filed by automation (an automatic repair), the
  * filer of the task it revises, up its ancestry (bounded). */
@@ -198,10 +198,10 @@ export function filersOf(db) {
         return found;
     };
 }
-/** Every piece of spend in [from, to): runs (by when they started), teammate turns and chat turns. `modeOf` says how
+/** Every piece of spend in [from, to): runs (by when they started), subagent turns and chat turns. `modeOf` says how
  * a provider bills when a record doesn't (older rows): its current login or key. */
 export function spendItems(db, from, to, modeOf = provider => billingOf(provider, db)) {
-    const teammateOf = teammateFilers(db);
+    const subagentOf = subagentFilers(db);
     const filerOf = filersOf(db);
     const text = (value) => value == null ? null : String(value);
     const count = (value) => value == null ? null : Number(value);
@@ -224,19 +224,19 @@ export function spendItems(db, from, to, modeOf = provider => billingOf(provider
             source: settled ? String(row["source"]) : priced.source,
             project: text(row["repo"]),
             person: kind === "person" || kind === "coordinator" ? filer.filedBy : null,
-            teammate: teammateOf(filer.repo, filer.filedBy, kind), provider, model: text(row["model"]),
+            subagent: subagentOf(filer.repo, filer.filedBy, kind), provider, model: text(row["model"]),
             tokensIn: count(row["tokens_in"]), tokensOut: count(row["tokens_out"]),
             taskId: String(row["task"]), runId: Number(row["id"]), authMode: billing,
         };
     });
-    // A teammate's own turns get no key from Toolroll (teammates.ts claudeTurnRunner): they bill as this computer's
+    // A subagent's own turns get no key from Toolroll (subagents.ts claudeTurnRunner): they bill as this computer's
     // Claude sign-in was seen billing when the turn ran (a plan, or a Console login, key helper or gateway).
-    for (const row of db.prepare(`SELECT t.at, t.teammate, t.model, t.cost_usd, t.tokens_in, t.tokens_out, t.billing, m.repo FROM teammate_turn t JOIN teammate m ON m.id = t.teammate
+    for (const row of db.prepare(`SELECT t.at, t.subagent, t.model, t.cost_usd, t.tokens_in, t.tokens_out, t.billing, m.repo FROM subagent_turn t JOIN subagent m ON m.id = t.subagent
       WHERE t.at >= ? AND t.at < ? ORDER BY t.id`).all(from, to)) {
         const billing = row["billing"] === "api-key" ? "api-key" : "subscription";
         const priced = priceWork(db, { provider: "claude", model: text(row["model"]), costUsd: count(row["cost_usd"]), tokensIn: count(row["tokens_in"]), tokensOut: count(row["tokens_out"]), billing });
-        items.push({ at: String(row["at"]), kind: "teammate", microusd: priced.microusd, source: priced.source, project: String(row["repo"]), person: null,
-            teammate: Number(row["teammate"]), provider: "claude", model: text(row["model"]),
+        items.push({ at: String(row["at"]), kind: "subagent", microusd: priced.microusd, source: priced.source, project: String(row["repo"]), person: null,
+            subagent: Number(row["subagent"]), provider: "claude", model: text(row["model"]),
             tokensIn: count(row["tokens_in"]), tokensOut: count(row["tokens_out"]), taskId: null, runId: null, authMode: billing });
     }
     // A chat turn that mirrors a project chat's turn is that turn: counted once, as the project chat's. A task's chat
@@ -246,19 +246,19 @@ export function spendItems(db, from, to, modeOf = provider => billingOf(provider
     UNION ALL SELECT t.created_at, t.approver, COALESCE((SELECT c.provider FROM chat_turn c WHERE c.mate_turn = t.id ORDER BY c.id LIMIT 1), 'lead'),
         (SELECT c.model FROM chat_turn c WHERE c.mate_turn = t.id ORDER BY c.id LIMIT 1), t.settled_microusd, t.tokens_in, t.tokens_out,
         CASE th.scope_kind WHEN 'project' THEN th.scope_key WHEN 'task' THEN (SELECT r.repo FROM task_ref r WHERE r.external_id = th.scope_key ORDER BY r.id DESC LIMIT 1) END
-      FROM mate_turn t LEFT JOIN mate_thread th ON th.id = t.thread WHERE t.created_at >= ? AND t.created_at < ?`).all(from, to, from, to)) {
+      FROM mate_turn t LEFT JOIN lead_thread th ON th.id = t.thread WHERE t.created_at >= ? AND t.created_at < ?`).all(from, to, from, to)) {
         const provider = String(row["provider"]);
         const subscription = provider.endsWith("-subscription") && modeOf(provider) === "subscription";
         const settled = count(row["settled_microusd"]);
         items.push({ at: String(row["at"]), kind: "chat", microusd: subscription ? 0 : settled, source: subscription ? "subscription" : settled === null ? "unpriced" : "reported",
-            project: text(row["project"]), person: text(row["approver"]), teammate: null, provider, model: text(row["model"]),
+            project: text(row["project"]), person: text(row["approver"]), subagent: null, provider, model: text(row["model"]),
             tokensIn: count(row["tokens_in"]), tokensOut: count(row["tokens_out"]), taskId: null, runId: null, authMode: subscription ? "subscription" : "api-key" });
     }
-    // A flow's Claude drafts: like a teammate's turns, billed as the sign-in was.
+    // A flow's Claude drafts: like a subagent's turns, billed as the sign-in was.
     for (const row of db.prepare("SELECT at, kind, repo, provider, model, cost_usd, billing FROM side_spend WHERE at >= ? AND at < ? ORDER BY id").all(from, to)) {
         const billing = row["billing"] === "api-key" ? "api-key" : "subscription";
         const priced = priceWork(db, { provider: String(row["provider"]), model: text(row["model"]), costUsd: count(row["cost_usd"]), tokensIn: null, tokensOut: null, billing });
-        items.push({ at: String(row["at"]), kind: "draft", microusd: priced.microusd, source: priced.source, project: text(row["repo"]), person: null, teammate: null,
+        items.push({ at: String(row["at"]), kind: "draft", microusd: priced.microusd, source: priced.source, project: text(row["repo"]), person: null, subagent: null,
             provider: String(row["provider"]), model: text(row["model"]), tokensIn: null, tokensOut: null, taskId: null, runId: null, authMode: billing });
     }
     // A flow's Sort zone asks Jev on OpenRouter (the key's credit): what it cost is kept with its answer.
@@ -267,7 +267,7 @@ export function spendItems(db, from, to, modeOf = provider => billingOf(provider
       WHERE fs.kind = 'sort' AND fs.decision_json IS NOT NULL AND fs.started_at >= ? AND fs.started_at < ? ORDER BY fs.started_at`).all(from, to)) {
         const cost = typeof row["cost"] === "number" && Number.isFinite(row["cost"]) && row["cost"] >= 0 ? row["cost"] : null;
         items.push({ at: String(row["at"]), kind: "sort", microusd: cost === null ? null : Math.round(cost * 1_000_000), source: cost === null ? "unpriced" : "reported",
-            project: text(row["repo"]), person: null, teammate: null, provider: "openrouter", model: text(row["model"]), tokensIn: null, tokensOut: null, taskId: null, runId: null, authMode: "api-key" });
+            project: text(row["repo"]), person: null, subagent: null, provider: "openrouter", model: text(row["model"]), tokensIn: null, tokensOut: null, taskId: null, runId: null, authMode: "api-key" });
     }
     return items;
 }
@@ -279,14 +279,14 @@ export function countsToward(item, budget) {
         return item.project === budget.key;
     if (budget.scope === "person")
         return item.person === budget.key;
-    return item.teammate !== null && String(item.teammate) === budget.key;
+    return item.subagent !== null && String(item.subagent) === budget.key;
 }
 const PROVIDER_WORDS = { claude: "Claude", codex: "Codex", gemini: "Gemini", openrouter: "OpenRouter" };
 /** Why work waits on a budget, in words. */
-export function budgetHoldWords(hold, month, teammateName) {
+export function budgetHoldWords(hold, month, subagentName) {
     if (hold.over === null)
         return "";
-    const label = budgetLabel(hold.over, teammateName);
+    const label = budgetLabel(hold.over, subagentName);
     return hold.why === "unpriced"
         ? `${label} budget can't price ${PROVIDER_WORDS[hold.unpricedProvider ?? ""] ?? hold.unpricedProvider} work on a key yet. Open Settings → Models to load prices`
         : `${label} budget is used up for ${month}`;
@@ -300,14 +300,14 @@ export function budgetStates(budgets, items) {
             percent: Math.floor((spent / budget.limitMicrousd) * 100) };
     });
 }
-/** A budget in words: "The shop project's", "alex's", "Maya's (teammate)", "The whole installation's". */
-export function budgetLabel(budget, teammateName) {
+/** A budget in words: "The shop project's", "alex's", "Maya's (subagent)", "The whole installation's". */
+export function budgetLabel(budget, subagentName) {
     if (budget.scope === "installation")
         return "The whole installation's";
     if (budget.scope === "project")
         return `The ${budget.key.split("/").filter(Boolean).pop() ?? budget.key} project's`;
     if (budget.scope === "person")
         return `${budget.key}'s`;
-    return `${teammateName ?? `Teammate ${budget.key}`}'s`;
+    return `${subagentName ?? `Subagent ${budget.key}`}'s`;
 }
 export const usd = (microusd) => microusd === null ? "unpriced" : `$${(microusd / 1_000_000).toFixed(microusd !== 0 && Math.abs(microusd) < 10_000_000 ? 2 : 0)}`;

package/dist/sso-ui.d.ts

@@ -4,6 +4,7 @@
  * operator's page; changes take their password.
  */
 import type { OidcSettings } from "./oidc.js";
+import { type Html } from "./html.js";
 export declare const SSO_CSS: string;
 export type SsoSettingsView = {
     settings: OidcSettings | null;
@@ -16,7 +17,7 @@ export type SsoSettingsView = {
     /** Whether the person looking is linked to the provider already. */
     linked: boolean;
 };
-export declare function ssoSettingsHtml(view: SsoSettingsView, csrf: string, notice: {
+export declare function ssoSettingsHtml(view: SsoSettingsView, notice: {
     said?: string | null;
     problem?: string | null;
-}): string;
+}): Html;

package/dist/sso-ui.js

@@ -1,39 +1,38 @@
-const e = (value) => String(value ?? "").replace(/[&<>"']/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+import { html, postForm } from "./html.js";
 export const SSO_CSS = `.sign-in{max-width:780px;min-width:0}.sign-in form{display:grid;gap:12px;margin:0}.sign-in label{display:grid;gap:6px}.sign-in input,.sign-in select{box-sizing:border-box;width:100%;max-width:100%;min-width:0}` +
     `.sign-in .card{padding:16px 18px;margin:12px 0}.sign-in .card h2{font-size:1.05rem;margin:0 0 6px}.sign-in .redirect code{user-select:all;overflow-wrap:anywhere}.sign-in button{justify-self:start;min-height:44px}` +
     `.sign-in .rules{display:grid;gap:8px}.sign-in .rule{display:grid;grid-template-columns:minmax(0,2fr) minmax(0,1fr) minmax(0,2fr);gap:8px;align-items:start}.sign-in .rule select[multiple]{min-height:5.5rem}` +
     `.sign-in .row{display:flex;gap:12px;flex-wrap:wrap;align-items:center}.sign-in fieldset{border:0;padding:0;margin:0;display:grid;gap:6px}.sign-in fieldset label{display:flex;gap:8px;align-items:center}.sign-in fieldset input{width:auto}` +
     `@media(max-width:600px){.sign-in .rule{grid-template-columns:1fr}.sign-in input,.sign-in select{font-size:16px}}`;
-const password = '<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label>';
+const password = html `<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label>`;
 function ruleRow(index, rule, projects) {
     const chosen = rule === null ? [] : rule.projects === "all" ? ["all"] : rule.projects;
-    return `<div class="rule"><label>Group<input type="text" name="group-${index}" value="${e(rule?.group ?? "")}" placeholder="${index === 0 ? "for example: engineering" : ""}" autocomplete="off"></label>` +
-        `<label>Role<select name="role-${index}"><option value="operator"${rule?.role === "operator" ? " selected" : ""}>Operator</option><option value="viewer"${rule?.role === "viewer" ? " selected" : ""}>Viewer</option></select></label>` +
-        `<label>Projects<select name="projects-${index}" multiple><option value="all"${chosen.includes("all") ? " selected" : ""}>All projects</option>${projects.map(one => `<option value="${e(one.path)}"${chosen.includes(one.path) ? " selected" : ""}>${e(one.name)}</option>`).join("")}</select></label></div>`;
+    return html `<div class="rule"><label>Group<input type="text" name="group-${index}" value="${rule?.group ?? ""}" placeholder="${index === 0 ? "for example: engineering" : ""}" autocomplete="off"></label>\
+<label>Role<select name="role-${index}"><option value="operator"${rule?.role === "operator" ? " selected" : ""}>Operator</option><option value="viewer"${rule?.role === "viewer" ? " selected" : ""}>Viewer</option></select></label>\
+<label>Projects<select name="projects-${index}" multiple><option value="all"${chosen.includes("all") ? " selected" : ""}>All projects</option>${projects.map(one => html `<option value="${one.path}"${chosen.includes(one.path) ? " selected" : ""}>${one.name}</option>`)}</select></label></div>`;
 }
-export function ssoSettingsHtml(view, csrf, notice) {
+export function ssoSettingsHtml(view, notice) {
     const s = view.settings;
-    const hidden = (fields) => Object.entries(fields).map(([k, v]) => `<input type="hidden" name="${e(k)}" value="${e(v)}">`).join("");
-    const rows = [...(s?.rules ?? []), null, null].slice(0, Math.max(3, (s?.rules.length ?? 0) + 1)).map((rule, index) => ruleRow(index, rule, view.projects)).join("");
-    const note = notice.problem ? `<p class="problem" role="alert">${e(notice.problem)}</p>` : notice.said ? `<p role="status">${e(notice.said)}</p>` : "";
+    const rows = [...(s?.rules ?? []), null, null].slice(0, Math.max(3, (s?.rules.length ?? 0) + 1)).map((rule, index) => ruleRow(index, rule, view.projects));
+    const note = notice.problem ? html `<p class="problem" role="alert">${notice.problem}</p>` : notice.said ? html `<p role="status">${notice.said}</p>` : "";
     const redirect = view.redirect === null
-        ? `<p class="meta">Open this page from the address people use (your https address) to see the redirect address to register.</p>`
-        : `<p class="redirect">Register this redirect address with the provider: <code>${e(view.redirect)}</code></p>`;
-    const form = `<form method="post" action="/settings/sign-in">${hidden({ csrf, action: "save" })}` +
-        `<label>Provider address (issuer)<input type="url" name="issuer" value="${e(s?.issuer ?? "")}" placeholder="https://acme.okta.com/oauth2/default" required inputmode="url" autocomplete="off"></label>` +
-        `<label>Client ID<input type="text" name="client-id" value="${e(s?.clientId ?? "")}" required autocomplete="off"></label>` +
-        `<label>Client secret<input type="password" name="client-secret" autocomplete="off" placeholder="${s?.clientSecret ? "Saved. Leave blank to keep it" : "Leave blank for a public client"}"></label>` +
-        `<details><summary>More</summary><label>Button says “Sign in with …”<input type="text" name="label" value="${e(s?.label ?? "")}" placeholder="Okta"></label>` +
-        `<label>Scopes<input type="text" name="scopes" value="${e(s?.scopes ?? "openid email profile")}"></label><label>Groups claim<input type="text" name="groups-claim" value="${e(s?.groupsClaim ?? "groups")}"></label></details>` +
-        `<h2>Who may sign in</h2><p class="meta">A person's first matching group sets their role and projects, again at every sign-in. No match, no entry. Use * for everyone.</p><div class="rules">${rows}</div>` +
-        `<fieldset><legend>Passwords</legend><label><input type="radio" name="passwords" value="everyone"${s?.passwords !== "operators" ? " checked" : ""}> Everyone may still use a password</label>` +
-        `<label><input type="radio" name="passwords" value="operators"${s?.passwords === "operators" ? " checked" : ""}> Only instance operators (a way in if the provider is down)</label></fieldset>` +
-        `${password}<button>${s === null ? "Turn on sign-in with the provider" : "Save"}</button></form>`;
-    const test = s === null ? "" : `<form method="post" action="/settings/sign-in" class="row">${hidden({ csrf, action: "test" })}<button class="secondary">Check the provider</button></form>`;
+        ? html `<p class="meta">Open this page from the address people use (your https address) to see the redirect address to register.</p>`
+        : html `<p class="redirect">Register this redirect address with the provider: <code>${view.redirect}</code></p>`;
+    const form = postForm("/settings/sign-in", html `\
+<label>Provider address (issuer)<input type="url" name="issuer" value="${s?.issuer ?? ""}" placeholder="https://acme.okta.com/oauth2/default" required inputmode="url" autocomplete="off"></label>\
+<label>Client ID<input type="text" name="client-id" value="${s?.clientId ?? ""}" required autocomplete="off"></label>\
+<label>Client secret<input type="password" name="client-secret" autocomplete="off" placeholder="${s?.clientSecret ? "Saved. Leave blank to keep it" : "Leave blank for a public client"}"></label>\
+<details><summary>More</summary><label>Button says “Sign in with …”<input type="text" name="label" value="${s?.label ?? ""}" placeholder="Okta"></label>\
+<label>Scopes<input type="text" name="scopes" value="${s?.scopes ?? "openid email profile"}"></label><label>Groups claim<input type="text" name="groups-claim" value="${s?.groupsClaim ?? "groups"}"></label></details>\
+<h2>Who may sign in</h2><p class="meta">A person's first matching group sets their role and projects, again at every sign-in. No match, no entry. Use * for everyone.</p><div class="rules">${rows}</div>\
+<fieldset><legend>Passwords</legend><label><input type="radio" name="passwords" value="everyone"${s?.passwords !== "operators" ? " checked" : ""}> Everyone may still use a password</label>\
+<label><input type="radio" name="passwords" value="operators"${s?.passwords === "operators" ? " checked" : ""}> Only instance operators (a way in if the provider is down)</label></fieldset>\
+${password}<button>${s === null ? "Turn on sign-in with the provider" : "Save"}</button>`, { hidden: { action: "save" } });
+    const test = s === null ? "" : postForm("/settings/sign-in", html `<button class="secondary">Check the provider</button>`, { attrs: { class: "row" }, hidden: { action: "test" } });
     const link = s === null ? "" : view.linked
-        ? `<p class="meta">You sign in with ${e(s.label)}.</p>`
-        : `<section class="card"><h2>Your account</h2><p>Sign in with ${e(s.label)} as this account from now on.</p><p><a class="button-link" href="/login/sso?link=1">Link to ${e(s.label)}</a></p></section>`;
-    const off = s === null ? "" : `<details class="card"><summary>Turn off</summary><form method="post" action="/settings/sign-in">${hidden({ csrf, action: "remove" })}<p>People who signed in with ${e(s.label)} can't sign in until it's on again, unless they have a password.</p>${password}<button class="danger">Turn off sign-in with ${e(s.label)}</button></form></details>`;
-    return `<section class="sign-in">${note}<p>People sign in with your organisation's identity provider (Okta, Microsoft Entra, Google, anything that speaks OpenID Connect), and its groups decide what they may do.</p>` +
-        `${redirect}<section class="card">${form}</section>${test}${link}${off}</section>`;
+        ? html `<p class="meta">You sign in with ${s.label}.</p>`
+        : html `<section class="card"><h2>Your account</h2><p>Sign in with ${s.label} as this account from now on.</p><p><a class="button-link" href="/login/sso?link=1">Link to ${s.label}</a></p></section>`;
+    const off = s === null ? "" : html `<details class="card"><summary>Turn off</summary>${postForm("/settings/sign-in", html `<p>People who signed in with ${s.label} can't sign in until it's on again, unless they have a password.</p>${password}<button class="danger">Turn off sign-in with ${s.label}</button>`, { hidden: { action: "remove" } })}</details>`;
+    return html `<section class="sign-in">${note}<p>People sign in with your organisation's identity provider (Okta, Microsoft Entra, Google, anything that speaks OpenID Connect), and its groups decide what they may do.</p>\
+${redirect}<section class="card">${form}</section>${test}${link}${off}</section>`;
 }

package/dist/storage-ui.d.ts

@@ -1,3 +1,4 @@
+import { type Html } from "./html.js";
 import { type CheckoutPlan } from "./checkout-cleanup.js";
 import { type SweepRecord } from "./storage-sweep.js";
 export declare const STORAGE_CSS: string;
@@ -12,4 +13,4 @@ export type StorageView = {
 export declare function storageHtml(view: StorageView, notice: {
     said?: string | null;
     problem?: string | null;
-}): string;
+}): Html;

package/dist/storage-ui.js

@@ -6,10 +6,10 @@
  */
 import { homedir } from "node:os";
 import { basename } from "node:path";
+import { html, postForm } from "./html.js";
 import { previewDigest, whyWords } from "./checkout-cleanup.js";
 import { CLEANUP_CHOICES, bytesWords } from "./storage.js";
 import { sweepDetails, sweepWords } from "./storage-sweep.js";
-const e = (value) => String(value ?? "").replace(/[&<>"']/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 const plural = (count, one, many = `${one}s`) => `${count} ${count === 1 ? one : many}`;
 export const STORAGE_CSS = `.storage{max-width:720px;min-width:0;overflow-wrap:anywhere}.storage h2{font-size:1.0625rem;margin:24px 0 4px}` +
     `.storage .storage-state{display:grid;gap:12px}.storage .storage-state h2{margin:0}.storage .storage-state p{margin:0}` +
@@ -45,49 +45,30 @@ function whenWords(at) {
 function sweepHtml(sweep) {
     const last = sweep.last;
     if (last === null)
-        return `<p class="meta" data-last-sweep="">${sweep.off ? "Automatic sweep is off." : "Toolroll sweeps leftovers once a day. It hasn't run yet."}</p>`;
-    const who = last.source === "manual" ? `Cleaned up by ${e(last.actor)}` : "Swept";
+        return html `<p class="meta" data-last-sweep="">${sweep.off ? "Automatic sweep is off." : html `Toolroll sweeps leftovers once a day. It hasn't run yet.`}</p>`;
+    const who = last.source === "manual" ? `Cleaned up by ${last.actor}` : "Swept";
     const details = sweepDetails(last.parts);
     const problem = last.parts.some(one => one.failed > 0 || one.problem !== undefined);
-    return `<div class="sweep" data-last-sweep="${e(last.at)}"><p${problem ? ' class="problem"' : ""}>${who} <time datetime="${e(last.at)}">${e(whenWords(last.at))}</time>. ${e(sweepWords(last.parts))}</p>` +
-        (details.length === 0 ? "" : `<details class="sweep-details"><summary>Details</summary><ul>${details.map(line => `<li>${e(homeAsTilde(line))}</li>`).join("")}</ul></details>`) + `</div>`;
+    return html `<div class="sweep" data-last-sweep="${last.at}"><p${problem ? html ` class="problem"` : ""}>${who} <time datetime="${last.at}">${whenWords(last.at)}</time>. ${sweepWords(last.parts)}</p>${details.length === 0 ? "" : html `<details class="sweep-details"><summary>Details</summary><ul>${details.map(line => html `<li>${homeAsTilde(line)}</li>`)}</ul></details>`}</div>`;
 }
-function item(one, csrf) {
+function item(one) {
     const discard = one.why === "has changes"
-        ? `<details class="discard"><summary>Discard</summary><form method="post" action="/settings/storage/discard"><input type="hidden" name="csrf" value="${e(csrf)}"><input type="hidden" name="path" value="${e(one.path)}">` +
-            `<p class="meta">Throws away this checkout and its uncommitted changes. Its branch stays.</p>` +
-            `<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label><button type="submit" class="danger">Discard changes</button></form></details>`
+        ? html `<details class="discard"><summary>Discard</summary>${postForm("/settings/storage/discard", html `<p class="meta">Throws away this checkout and its uncommitted changes. Its branch stays.</p><label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label><button type="submit" class="danger">Discard changes</button>`, { hidden: { path: one.path } })}</details>`
         : "";
     // The task it was for, then where it is (the home folder as ~), then why it stays.
     const home = homedir();
     const where = home !== "" && one.path.startsWith(`${home}/`) ? `~${one.path.slice(home.length)}` : one.path;
-    return `<li data-checkout="${e(one.path)}"><span class="name">${e(one.taskId ?? basename(one.path))}</span><span class="size">${e(bytesWords(one.bytes))}</span>` +
-        `<span class="path">${e(where)}</span>` +
-        (one.why === null ? "" : `<span class="why">${e(whyWords(one)[0].toUpperCase() + whyWords(one).slice(1))}</span>`) + discard + `</li>`;
+    return html `<li data-checkout="${one.path}"><span class="name">${one.taskId ?? basename(one.path)}</span><span class="size">${bytesWords(one.bytes)}</span><span class="path">${where}</span>${one.why === null ? "" : html `<span class="why">${whyWords(one)[0].toUpperCase() + whyWords(one).slice(1)}</span>`}${discard}</li>`;
 }
 export function storageHtml(view, notice) {
-    const { plan, csrf } = view;
-    const note = notice.problem ? `<p class="problem" role="alert">${e(notice.problem)}</p>` : notice.said ? `<p role="status">${e(notice.said)}</p>` : "";
-    const hidden = `<input type="hidden" name="csrf" value="${e(csrf)}">`;
+    const { plan } = view;
+    const note = notice.problem ? html `<p class="problem" role="alert">${notice.problem}</p>` : notice.said ? html `<p role="status">${notice.said}</p>` : "";
     const facts = [plural(plan.count, "checkout"), `${plan.waitingReview} waiting for review`, `${plan.withChanges} kept for their changes`].join(" · ");
     const frees = plan.go.length === 0 ? "Nothing to clean up now." : `Cleaning up now frees about ${bytesWords(plan.freeBytes)}.`;
     const remove = plan.go.length === 0 ? "" :
-        `<form method="post" action="/settings/storage/clean" class="remove">${hidden}<input type="hidden" name="preview" value="${e(previewDigest(plan))}">` +
-            `<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label>` +
-            `<button type="submit">Remove ${plural(plan.go.length, "checkout")}</button></form>`;
-    const preview = `<details class="clean-up" data-clean-up${notice.problem?.startsWith("Enter your Toolroll password to clean") ? " open" : ""}><summary>Clean up</summary><div class="preview">` +
-        (plan.go.length === 0 ? `<p>Nothing to remove now.</p>` :
-            `<h3>Removes ${plural(plan.go.length, "checkout")}, about ${e(bytesWords(plan.freeBytes))}</h3><p class="meta">Their branches stay, so nothing committed is lost.</p>` +
-                `<ul class="checkouts" data-goes>${plan.go.map(one => item(one, csrf)).join("")}</ul>`) +
-        (plan.stay.length === 0 ? "" : `<h3>Stays (${plan.stay.length})</h3><ul class="checkouts" data-stays>${plan.stay.map(one => item(one, csrf)).join("")}</ul>`) +
-        remove + `</div></details>`;
-    const options = CLEANUP_CHOICES.map(one => `<option value="${one.value}"${one.value === plan.cleanup ? " selected" : ""}>${e(one.label)}</option>`).join("");
-    return `<section class="storage">${note}` +
-        `<div class="card storage-state"><h2 data-checkout-bytes="${plan.totalBytes}">Checkouts use ${e(bytesWords(plan.totalBytes))}</h2><p class="meta">${e(facts)}</p>` +
-        `<p data-clean-bytes="${plan.freeBytes}">${e(frees)}</p>${view.sweep === undefined ? "" : sweepHtml(view.sweep)}${preview}</div>` +
-        `<h2>Automatic cleanup</h2>` +
-        `<form method="post" action="/settings/storage" class="setting">${hidden}` +
-        `<label>Remove a finished task's clean checkout<select name="cleanup">${options}</select></label>` +
-        `<p class="meta">Its branch always stays. Checkouts with changes, commits on no branch, in use, or waiting for review are kept.</p>` +
-        `<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label><button type="submit">Save</button></form></section>`;
+        postForm("/settings/storage/clean", html `<label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label><button type="submit">Remove ${plural(plan.go.length, "checkout")}</button>`, { attrs: { class: "remove" }, hidden: { preview: previewDigest(plan) } });
+    const preview = html `<details class="clean-up" data-clean-up${notice.problem?.startsWith("Enter your Toolroll password to clean") ? html ` open` : ""}><summary>Clean up</summary><div class="preview">${plan.go.length === 0 ? html `<p>Nothing to remove now.</p>` :
+        html `<h3>Removes ${plural(plan.go.length, "checkout")}, about ${bytesWords(plan.freeBytes)}</h3><p class="meta">Their branches stay, so nothing committed is lost.</p><ul class="checkouts" data-goes>${plan.go.map(one => item(one))}</ul>`}${plan.stay.length === 0 ? "" : html `<h3>Stays (${plan.stay.length})</h3><ul class="checkouts" data-stays>${plan.stay.map(one => item(one))}</ul>`}${remove}</div></details>`;
+    const options = CLEANUP_CHOICES.map(one => html `<option value="${one.value}"${one.value === plan.cleanup ? html ` selected` : ""}>${one.label}</option>`);
+    return html `<section class="storage">${note}<div class="card storage-state"><h2 data-checkout-bytes="${plan.totalBytes}">Checkouts use ${bytesWords(plan.totalBytes)}</h2><p class="meta">${facts}</p><p data-clean-bytes="${plan.freeBytes}">${frees}</p>${view.sweep === undefined ? "" : sweepHtml(view.sweep)}${preview}</div><h2>Automatic cleanup</h2>${postForm("/settings/storage", html `<label>Remove a finished task's clean checkout<select name="cleanup">${options}</select></label><p class="meta">Its branch always stays. Checkouts with changes, commits on no branch, in use, or waiting for review are kept.</p><label>Your Toolroll password<input type="password" name="password" autocomplete="current-password" required></label><button type="submit">Save</button>`, { attrs: { class: "setting" } })}</section>`;
 }