toolroll 0.9.55 → 0.9.56

package/dist/slack-chat.js

@@ -1,13 +1,13 @@
 import { chatFlowButtons } from "./chat-flow.js";
 import { refuseResultShots, resultShotsPruned, shotWaitsUntil } from "./result-shots.js";
-import { chatQuestionButtons } from "./teammate-question.js";
+import { chatQuestionButtons } from "./subagent-question.js";
 import { chatAskButtons } from "./chat-ask.js";
 import { channelInbox } from "./chat-inbox.js";
 import { roomCommand } from "./chat-rooms.js";
 import { processChatEvent, applyChatAction, planChatNotifications, channelAccess, planRoomMessages, } from "./chat-delivery.js";
 /** Slack is a transport for the same saved assistant and confirmation doors. */
 import { proposalPreview, proposalLink, proposalOutcomeText, armedCardText, armedYesLabel, } from "./chat-channel.js";
-import { MATE_MESSAGE_MAX_CHARS } from "./mate.js";
+import { LEAD_MESSAGE_MAX_CHARS } from "./lead.js";
 import { renderReply } from "./reply-shape.js";
 import { ChatDeliveryError, ChatState, chatHash, partContent } from "./chat-delivery-state.js";
 import { readChatPart } from "./contracts/chat-content.js";
@@ -65,7 +65,7 @@ export function receiveSlack(state, identity, type, raw, now) {
         payload = match
             ? { hash: chatHash(match[1]) }
             : {
-                text: event.text.slice(0, MATE_MESSAGE_MAX_CHARS + 1),
+                text: event.text.slice(0, LEAD_MESSAGE_MAX_CHARS + 1),
                 originalLength: event.text.length,
             };
         id = chatHash(`${identity.installation}:event:${body.event_id}`);
@@ -217,7 +217,7 @@ export async function deliverSlackPart(options) {
         return true;
     }
     try {
-        const session = event.session === null ? null : store.getMateSession(event.session);
+        const session = event.session === null ? null : store.getLeadSession(event.session);
         const repos = await access(options, binding, session?.ceilingDigest);
         if (event.kind === "notice" && options.canNotify?.() === false)
             return false;
@@ -300,7 +300,7 @@ export async function deliverSlackPart(options) {
             }
         }
         if (content.proposal) {
-            const proposal = store.getMateProposal(content.proposal);
+            const proposal = store.getLeadProposal(content.proposal);
             if (!proposal)
                 text = "This proposal is unavailable.";
             else if (proposal.state !== "pending")
@@ -363,7 +363,7 @@ export async function deliverSlackPart(options) {
                         ...(one.action === "approve" ? { style: "primary" } : {}),
                     }))
                     : []),
-                // A teammate's question (v93): its options, then "Answer in words".
+                // A subagent's question (v93): its options, then "Answer in words".
                 ...(content.question
                     ? chatQuestionButtons(state, row.id, now).map((one) => ({
                         type: "button",

package/dist/spend-ui.d.ts

@@ -16,9 +16,9 @@ export type SpendView = {
     targets: {
         value: string;
         label: string;
-        group: "Everything" | "Projects" | "People" | "Teammates";
+        group: "Everything" | "Projects" | "People" | "Subagents";
     }[];
-    teammateNames: Map<number, string>;
+    subagentNames: Map<number, string>;
     csrf: string;
 };
 export declare function spendHtml(view: SpendView, notice: {
@@ -26,4 +26,4 @@ export declare function spendHtml(view: SpendView, notice: {
     problem?: string | null;
 }): Html;
 /** One row per piece of spend, for a spreadsheet. */
-export declare function spendCsv(items: readonly SpendItem[], teammateNames: Map<number, string>): string;
+export declare function spendCsv(items: readonly SpendItem[], subagentNames: Map<number, string>): string;

package/dist/spend-ui.js

@@ -41,32 +41,32 @@ export function spendHtml(view, notice) {
     const note = notice.problem ? html `<p class="problem" role="alert">${notice.problem}</p>` : notice.said ? html `<p role="status">${notice.said}</p>` : "";
     const total = view.items.reduce((sum, item) => sum + (item.microusd ?? 0), 0);
     const unpriced = view.items.filter(item => item.microusd === null && (item.tokensIn !== null || item.kind !== "run")).length;
-    const counts = { run: view.items.filter(item => item.kind === "run").length, teammate: view.items.filter(item => item.kind === "teammate").length, chat: view.items.filter(item => item.kind === "chat").length, sort: view.items.filter(item => item.kind === "sort").length };
-    const parts = [`${counts.run} ${counts.run === 1 ? "run" : "runs"}`, ...(counts.teammate > 0 ? [`${counts.teammate} teammate turns`] : []), ...(counts.chat > 0 ? [`${counts.chat} chat turns`] : []), ...(counts.sort > 0 ? [`${counts.sort} ${counts.sort === 1 ? "sort" : "sorts"}`] : [])];
-    const nameOfTeammate = (key) => view.teammateNames.get(Number(key)) ?? `Teammate ${key}`;
+    const counts = { run: view.items.filter(item => item.kind === "run").length, subagent: view.items.filter(item => item.kind === "subagent").length, chat: view.items.filter(item => item.kind === "chat").length, sort: view.items.filter(item => item.kind === "sort").length };
+    const parts = [`${counts.run} ${counts.run === 1 ? "run" : "runs"}`, ...(counts.subagent > 0 ? [`${counts.subagent} subagent turns`] : []), ...(counts.chat > 0 ? [`${counts.chat} chat turns`] : []), ...(counts.sort > 0 ? [`${counts.sort} ${counts.sort === 1 ? "sort" : "sorts"}`] : [])];
+    const nameOfSubagent = (key) => view.subagentNames.get(Number(key)) ?? `Subagent ${key}`;
     const budgets = view.budgets.map(budget => {
         const width = Math.min(100, Math.max(0, budget.percent));
         const over = budget.spentMicrousd >= budget.limitMicrousd;
-        const label = budgetLabel(budget, budget.scope === "teammate" ? nameOfTeammate(budget.key) : undefined).replace(/'s$/, "");
+        const label = budgetLabel(budget, budget.scope === "subagent" ? nameOfSubagent(budget.key) : undefined).replace(/'s$/, "");
         return html `<div class="budget${over ? " over" : ""}" data-budget="${budget.id}"><span class="name">${label}</span><span class="figures">${usd(budget.spentMicrousd)} of ${usd(budget.limitMicrousd)} · ${budget.percent}%</span><span class="bar" aria-hidden="true"><span style="width:${width}%"></span></span><span class="meta">${over && budget.hardStop ? "Used up: new API work waits until next month or a higher budget." : budget.hardStop ? "Stops API work at 100%." : "Alerts only."}${budget.unpriced > 0 ? ` ${budget.unpriced} unpriced` : ""}</span><details><summary>Change</summary>${postForm("/spend/budget", html `<label>Monthly limit (US dollars)<input type="number" name="usd" min="1" step="1" value="${Math.round(budget.limitMicrousd / 1_000_000)}" required></label><label class="choice"><input type="checkbox" name="stop" value="1"${budget.hardStop ? html ` checked` : ""}> Stop new work at 100%</label><label>Your Toolroll password<input type="password" name="password" autocomplete="current-password"></label><button type="submit" name="action" value="save">Save</button> <button type="submit" name="action" value="remove">Remove</button>`, { attrs: { class: "budget-form" }, hidden: { target: `${budget.scope}:${budget.key}` } })}</details></div>`;
     });
-    const groups = ["Everything", "Projects", "People", "Teammates"];
+    const groups = ["Everything", "Projects", "People", "Subagents"];
     const options = groups.map(group => {
         const members = view.targets.filter(one => one.group === group);
         return members.length === 0 ? "" : html `<optgroup label="${group}">${members.map(one => html `<option value="${one.value}">${one.label}</option>`)}</optgroup>`;
     });
     const add = html `<details${view.budgets.length === 0 ? html ` open` : ""}><summary>Add a budget</summary>${postForm("/spend/budget", html `<label>For<select name="target" required>${options}</select></label><label>Monthly limit (US dollars)<input type="number" name="usd" min="1" step="1" required></label><label class="choice"><input type="checkbox" name="stop" value="1" checked> Stop new work at 100%</label><label>Your Toolroll password<input type="password" name="password" autocomplete="current-password"></label><button type="submit" name="action" value="save">Add budget</button>`, { attrs: { class: "budget-form" } })}</details>`;
-    return html `<article class="spend"><div class="spend-head"><h1>Spend</h1><p class="spend-month"><a href="/spend?month=${view.previous}">← ${view.previous}</a><strong>${view.month}</strong>${view.next === null ? "" : html `<a href="/spend?month=${view.next}">${view.next} →</a>`}<a href="/spend?month=${view.month}&amp;format=csv" download>CSV</a></p></div>${note}<p class="spend-total" data-spend-total="${total}">${usd(total)}</p><p class="meta">${parts.join(" · ")}${unpriced > 0 ? ` · ${unpriced} unpriced (no reported cost or catalogue price)` : ""} · UTC month</p><section><h2>Budgets</h2>${budgets.length === 0 ? html `<p class="meta">No budgets yet.</p>` : budgets}${add}</section><div class="spend-grid">${table("By project", breakdown(view.items, item => item.project), projectName)}${table("By person", breakdown(view.items, item => item.person), key => key)}${table("By teammate", breakdown(view.items, item => item.teammate === null ? null : String(item.teammate)), nameOfTeammate)}${table("By model", breakdown(view.items, item => `${item.provider}${item.model === null ? "" : ` · ${item.model}`}`), key => key)}</div><p class="meta">Subscription work is $0; its limits are on Tasks. API work is what the provider reported, or its tokens at the prices in Settings → Models.</p></article>`;
+    return html `<article class="spend"><div class="spend-head"><h1>Spend</h1><p class="spend-month"><a href="/spend?month=${view.previous}">← ${view.previous}</a><strong>${view.month}</strong>${view.next === null ? "" : html `<a href="/spend?month=${view.next}">${view.next} →</a>`}<a href="/spend?month=${view.month}&amp;format=csv" download>CSV</a></p></div>${note}<p class="spend-total" data-spend-total="${total}">${usd(total)}</p><p class="meta">${parts.join(" · ")}${unpriced > 0 ? ` · ${unpriced} unpriced (no reported cost or catalogue price)` : ""} · UTC month</p><section><h2>Budgets</h2>${budgets.length === 0 ? html `<p class="meta">No budgets yet.</p>` : budgets}${add}</section><div class="spend-grid">${table("By project", breakdown(view.items, item => item.project), projectName)}${table("By person", breakdown(view.items, item => item.person), key => key)}${table("By subagent", breakdown(view.items, item => item.subagent === null ? null : String(item.subagent)), nameOfSubagent)}${table("By model", breakdown(view.items, item => `${item.provider}${item.model === null ? "" : ` · ${item.model}`}`), key => key)}</div><p class="meta">Subscription work is $0; its limits are on Tasks. API work is what the provider reported, or its tokens at the prices in Settings → Models.</p></article>`;
 }
 /** One row per piece of spend, for a spreadsheet. */
-export function spendCsv(items, teammateNames) {
+export function spendCsv(items, subagentNames) {
     const cell = (value) => {
         const text = value === null || value === undefined ? "" : String(value);
         const safe = /^[=+\-@\t\r]/.test(text) ? `'${text}` : text;
         return /[",\n\r]/.test(safe) ? `"${safe.replace(/"/g, '""')}"` : safe;
     };
-    const head = ["time_utc", "kind", "project", "person", "teammate", "task", "run", "provider", "model", "tokens_in", "tokens_out", "cost_usd", "priced_by", "billing"];
-    const rows = items.map(item => [item.at, item.kind, item.project, item.person, item.teammate === null ? null : teammateNames.get(item.teammate) ?? item.teammate,
+    const head = ["time_utc", "kind", "project", "person", "subagent", "task", "run", "provider", "model", "tokens_in", "tokens_out", "cost_usd", "priced_by", "billing"];
+    const rows = items.map(item => [item.at, item.kind, item.project, item.person, item.subagent === null ? null : subagentNames.get(item.subagent) ?? item.subagent,
         item.taskId, item.runId, item.provider, item.model, item.tokensIn, item.tokensOut, item.microusd === null ? null : (item.microusd / 1_000_000).toFixed(6), item.source, item.authMode].map(cell).join(","));
     return `${head.join(",")}\r\n${rows.map(row => `${row}\r\n`).join("")}`;
 }

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)}`;