From eba17f0332315743e270bff7027fe0707e508217 Mon Sep 17 00:00:00 2001
From: saadiqbal-dev <saadiqbal.dev@outlook.com>
Date: Fri, 30 Oct 2026 11:00:58 +0500
Subject: [PATCH 1/2] feat(work-orders): simpler first work order, Home,
 clearer list and detail pages

Work order creation
- Prefill the builder's GitHub login and email from their profile or the
  Agency's last work order (new builderDefaults route, Agency-scoped)
- Create a project or builder inline from the form; project slugs avoid
  collisions
- Keep an unsent work order as a local draft per user, network and Agency;
  representative details are never stored and drafts clear on sign-out
- Import repositories from GitHub (NEARBuilders and MultiAgency by default,
  or any organization); public repositories only, cached for 10 minutes,
  each chosen repo shown as a link
- Explain why "Send for signature" is disabled

Home and lists
- New Home page with the work orders waiting on you; Home added to the menu
- Work orders list: one row of tabs, full titles, builder account,
  "$X of $Y" budget
- list() loads requests, documents, signatures and builders in batches

Work order page
- Overview, payouts and documents tabs (old tab links still work), key
  facts strip, Edit and More menu, Terminate for offered orders
- "Withdraw and delete" checks Documenso first: it refuses when the builder
  already signed, when Documenso can't be checked, or when the envelope
  can't be cancelled
- Payout account shows "Confirmed when they sign" only for Documenso
  signing; no duplicate payout-account warning on accepted orders
- Shows how the order was signed (Documenso, Google Docs or MultiAgency)

Fixes
- Store created/updated times in UTC (PGlite and pg sessions)
- Renewals keep the project title and slug; "Unknown project" instead of
  raw ids, and documents refuse to generate without a project title
- Editing an order never auto-fills terms from builder defaults
- Shorter setup and status copy across admin pages
---
 api/src/db/index.ts                           |   6 +
 api/src/index.ts                              |   8 +
 api/src/services/work-orders/github.ts        |  44 ++
 api/src/services/work-orders/progress.ts      |   3 +-
 api/src/services/work-orders/service.ts       | 228 +++++-
 api/src/services/work-orders/setup-status.ts  |  26 +-
 api/src/work-orders-contract.ts               |  37 +
 api/tests/fakes/github.ts                     |  10 +
 .../integration/work-order-setup.test.ts      |   4 +-
 api/tests/integration/work-orders.test.ts     | 167 +++++
 api/tests/unit/progress.test.ts               |  42 ++
 ui/src/components/admin-sidebar.tsx           |   6 +-
 .../components/admin/applications-section.tsx |   8 +-
 .../components/admin/contributors-section.tsx |  10 +-
 ui/src/components/admin/project-form.tsx      |   8 +-
 ui/src/components/admin/projects-section.tsx  |   7 +-
 .../components/home/home-work-order-lists.tsx | 125 ++++
 ui/src/components/home/home-work-orders.ts    |  19 +
 ui/src/components/user-nav.tsx                |   2 +
 .../work-orders/activity-timeline.tsx         |   6 +-
 .../work-orders/builder-signing.tsx           |   8 +-
 .../work-orders/delivered-work-section.tsx    |  14 +-
 .../duplicate-work-order-button.tsx           |  41 --
 .../components/work-orders/evidence-list.tsx  |   7 +-
 .../work-orders/github-repo-picker.tsx        | 145 ++++
 .../work-orders/google-settings.tsx           |   5 +-
 .../work-orders/integration-settings.tsx      |  11 +-
 .../components/work-orders/next-step-card.tsx |  45 +-
 .../components/work-orders/operator-hint.tsx  |   2 +-
 .../work-orders/payee-payouts-prompt.tsx      |   4 +-
 .../work-orders/quick-create-builder.tsx      |  95 +++
 .../work-orders/quick-create-project.tsx      | 112 +++
 .../components/work-orders/renewal-panel.tsx  |   9 +-
 .../work-orders/representative-settings.tsx   |  15 +-
 .../components/work-orders/requests-panel.tsx |  10 +-
 .../work-orders/setup-checklist.tsx           |  48 +-
 .../components/work-orders/signing-panel.tsx  |  62 +-
 .../work-orders/template-fields.tsx           |   2 +-
 .../components/work-orders/template-setup.tsx |   5 +-
 .../components/work-orders/trust-settings.tsx |   7 +-
 .../work-orders/work-order-form.tsx           | 677 ++++++++++++------
 .../work-orders/work-order-key-facts.tsx      |  73 ++
 .../work-orders/work-order-status.tsx         |  14 +
 .../work-orders/work-orders-card.tsx          |   5 +-
 .../work-orders/work-orders-inbox.tsx         |  99 +--
 ui/src/lib/navigation.ts                      |   5 +-
 ui/src/lib/queries.ts                         |  24 +
 ui/src/lib/setup-status.ts                    |  10 +-
 ui/src/lib/work-order-defaults.ts             |  39 +
 ui/src/lib/work-order-draft.ts                |  67 ++
 ui/src/lib/work-orders-inbox.ts               |   2 +-
 .../admin/contributors/$nearAccount.tsx       |  20 +-
 .../admin/contributors/index.tsx              |   5 +-
 .../_layout/_authenticated/admin/index.tsx    |  75 +-
 .../_layout/_authenticated/admin/members.tsx  |   2 +-
 .../_authenticated/admin/projects/$slug.tsx   |  14 +-
 .../_authenticated/admin/projects/index.tsx   |   5 +-
 .../_layout/_authenticated/admin/settings.tsx |  28 +-
 .../_authenticated/admin/work-orders/$id.tsx  | 224 +++---
 .../admin/work-orders/index.tsx               |   2 +-
 .../routes/_layout/_authenticated/profile.tsx |   2 +
 .../_authenticated/work-orders/$id.tsx        | 104 ++-
 ui/tests/home-work-orders.test.ts             |  35 +
 ui/tests/landing.test.ts                      |   8 +-
 ui/tests/navigation.test.ts                   |  19 +-
 ui/tests/setup-status.test.ts                 |  37 +-
 ui/tests/work-order-defaults.test.ts          |  50 ++
 ui/tests/work-order-draft.test.ts             |  89 +++
 68 files changed, 2415 insertions(+), 732 deletions(-)
 create mode 100644 ui/src/components/home/home-work-order-lists.tsx
 create mode 100644 ui/src/components/home/home-work-orders.ts
 delete mode 100644 ui/src/components/work-orders/duplicate-work-order-button.tsx
 create mode 100644 ui/src/components/work-orders/github-repo-picker.tsx
 create mode 100644 ui/src/components/work-orders/quick-create-builder.tsx
 create mode 100644 ui/src/components/work-orders/quick-create-project.tsx
 create mode 100644 ui/src/components/work-orders/work-order-key-facts.tsx
 create mode 100644 ui/src/lib/work-order-draft.ts
 create mode 100644 ui/tests/home-work-orders.test.ts
 create mode 100644 ui/tests/work-order-draft.test.ts

diff --git a/api/src/db/index.ts b/api/src/db/index.ts
index 67d3fa7e..46269408 100644
--- a/api/src/db/index.ts
+++ b/api/src/db/index.ts
@@ -47,6 +47,7 @@ export async function createDatabaseDriver(url: string): Promise<DatabaseDriver>
       mkdirSync(dirname(dataDir), { recursive: true });
     }
     const pglite = new PGlite(dataDir);
+    await pglite.exec("SET TIME ZONE 'UTC'");
     const db = drizzle(pglite, { schema });
     return {
       db,
@@ -71,6 +72,11 @@ export async function createDatabaseDriver(url: string): Promise<DatabaseDriver>
   pool.on("error", (err: Error) => {
     console.error("[Database] Unexpected pool error:", err.message);
   });
+  pool.on("connect", (client) => {
+    client.query("SET TIME ZONE 'UTC'").catch((err: Error) => {
+      console.error("[Database] Couldn't set the session time zone to UTC:", err.message);
+    });
+  });
   let closed = false;
   return {
     db: drizzle(pool, { schema }),
diff --git a/api/src/index.ts b/api/src/index.ts
index 44ce0015..e472bd9f 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -1184,6 +1184,14 @@ export default createPlugin.withPlugins<PluginsClient>()({
           .use(agencyManager)
           .handler(async ({ context }) => workOrders.nextCode(context.scope)),
 
+        githubRepos: builder.workOrders.githubRepos
+          .use(agencyManager)
+          .handler(async ({ context, input }) => workOrders.githubRepos(context.scope, input)),
+
+        builderDefaults: builder.workOrders.builderDefaults
+          .use(agencyManager)
+          .handler(async ({ context, input }) => workOrders.builderDefaults(context.scope, input)),
+
         offer: builder.workOrders.offer
           .use(agencyManager)
           .handler(async ({ context, input }) => workOrders.offer(context.scope, input)),
diff --git a/api/src/services/work-orders/github.ts b/api/src/services/work-orders/github.ts
index 3e2e0bf7..7919b2c4 100644
--- a/api/src/services/work-orders/github.ts
+++ b/api/src/services/work-orders/github.ts
@@ -72,6 +72,13 @@ export type GhReviewBy = {
   submittedAt: string;
 };
 
+export type GhRepo = {
+  fullName: string;
+  url: string;
+  description: string | null;
+  pushedAt: string | null;
+};
+
 export interface GitHubPort {
   getPull(repo: string, number: number): Promise<GhPull>;
   getClosingIssues(repo: string, number: number): Promise<GhIssueRef[]>;
@@ -82,6 +89,7 @@ export interface GitHubPort {
   getAssignmentEvents(repo: string, number: number): Promise<GhAssignmentEvent[]>;
   listPullsByAuthor(repo: string, login: string, since: string): Promise<GhPullSummary[]>;
   listReviewsBy(repo: string, login: string, since: string): Promise<GhReviewBy[]>;
+  listOrgRepos(org: string): Promise<GhRepo[]>;
 }
 
 export class GitHubError extends Error {
@@ -137,6 +145,15 @@ type RestSearchItem = {
   user?: { login: string } | null;
 };
 
+type RestRepo = {
+  full_name: string;
+  html_url: string;
+  description: string | null;
+  pushed_at: string | null;
+  archived?: boolean;
+  private?: boolean;
+};
+
 type RestReview = { user: { login: string } | null; state: string; submitted_at?: string | null };
 
 type ClosingData = {
@@ -374,6 +391,33 @@ export function createGitHub(token: string | null, fetcher: typeof fetch = fetch
       }
       return out;
     },
+
+    async listOrgRepos(org) {
+      const repos = await pages<RestRepo>(
+        `/orgs/${encodeURIComponent(org)}/repos?type=public&sort=pushed`,
+      );
+      return repos
+        .filter((r) => !r.archived && !r.private)
+        .map((r) => ({
+          fullName: r.full_name,
+          url: r.html_url,
+          description: r.description,
+          pushedAt: r.pushed_at,
+        }));
+    },
+  };
+}
+
+export function cachedOrgRepos(github: GitHubPort, ttlMs: number, now: () => number = Date.now) {
+  const cache = new Map<string, { until: number; value: Promise<GhRepo[]> }>();
+  return (org: string): Promise<GhRepo[]> => {
+    const key = org.toLowerCase();
+    const hit = cache.get(key);
+    if (hit && hit.until > now()) return hit.value;
+    const value = github.listOrgRepos(org);
+    cache.set(key, { until: now() + ttlMs, value });
+    value.catch(() => cache.delete(key));
+    return value;
   };
 }
 
diff --git a/api/src/services/work-orders/progress.ts b/api/src/services/work-orders/progress.ts
index 2db24a5e..83aa858b 100644
--- a/api/src/services/work-orders/progress.ts
+++ b/api/src/services/work-orders/progress.ts
@@ -372,7 +372,8 @@ export function progressOf(input: ProgressInput): Progress {
       });
     }
   }
-  if (input.payeeNeedsConfirmation && !terminated && input.status !== "draft") {
+  const blockersShown = input.status === "accepted" && input.blockers.length > 0;
+  if (input.payeeNeedsConfirmation && !blockersShown && (input.status === "accepted" || started)) {
     attention.push({
       key: "payee",
       message: `${builder} hasn't confirmed their payout account yet`,
diff --git a/api/src/services/work-orders/service.ts b/api/src/services/work-orders/service.ts
index 84668179..232a4669 100644
--- a/api/src/services/work-orders/service.ts
+++ b/api/src/services/work-orders/service.ts
@@ -42,7 +42,7 @@ import {
 } from "./documents";
 import { eventId, type WorkOrderEvent, type WorkOrderEventType } from "./events";
 import { collectEvidence, summarizeActivity } from "./evidence";
-import type { GhRepoOwnership, GitHubPort } from "./github";
+import { cachedOrgRepos, type GhRepoOwnership, GitHubError, type GitHubPort } from "./github";
 import type { DriveFile, GooglePort } from "./google";
 import { type PriceFeed, type PriceQuote, USD, USD_DECIMALS, usdToTokens } from "./prices";
 import { type Progress, progressOf } from "./progress";
@@ -225,6 +225,7 @@ const TICK_LOCK_MS = 2 * 60_000;
 const SIGNATURE_LOCK_MS = 2 * 60_000;
 const AUTO_PAY_RETRY_MS = 5 * 60_000;
 const NO_AGENT = "No payout agent";
+const UNKNOWN_PROJECT = "Unknown project";
 
 const IN_FLIGHT: AgentPayoutView["status"][] = [
   "sending",
@@ -398,6 +399,7 @@ const sum = (amounts: (string | null)[]) =>
 
 export function createWorkOrdersService(deps: WorkOrderDeps) {
   const { db, directory } = deps;
+  const orgRepos = cachedOrgRepos(deps.github, 10 * 60_000);
   const now = () => deps.now?.() ?? new Date();
   const timeZone = deps.timeZone ?? UTC;
   const today = () => dateOf(now(), timeZone);
@@ -522,7 +524,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         workOrder: {
           id: row.code,
           title: row.title,
-          project: project?.title ?? row.projectId,
+          project: project?.title ?? UNKNOWN_PROJECT,
           periodStart: row.periodStart,
           periodEnd: row.periodEnd,
           budget: display(row.budgetAmount, row.tokenId),
@@ -659,7 +661,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     const contacts = await contactsOf(row, builder);
     const fields = documentFields({
       code: row.code,
-      project: project?.title ?? row.projectId,
+      project: documentProjectTitle(row, project),
       contractorName: row.contractorName ?? builder?.name ?? row.builderNearAccount,
       contractorEmail: contacts.contractorEmail,
       representativeName: row.representativeName ?? agencyName,
@@ -862,7 +864,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return [
       ["Work order", `${row.code}: ${row.title}`],
       ["Agency", agencyName],
-      ["Project", project?.title ?? row.projectId],
+      ["Project", documentProjectTitle(row, project)],
       ["Builder (contractor)", row.contractorName ?? builder?.name ?? row.builderNearAccount],
       ["Builder's email", contacts.contractorEmail ?? ""],
       ["Agency representative", row.representativeName ?? agencyName],
@@ -1108,7 +1110,15 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return false;
   }
 
-  async function payeeOf(row: WorkOrderRow) {
+  function paidBeforeOnce(row: WorkOrderRow, paidCache?: Map<string, Promise<boolean>>) {
+    if (!paidCache) return paidBefore(row);
+    const key = `${row.organizationId}:${row.builderNearAccount}`;
+    const cached = paidCache.get(key) ?? paidBefore(row);
+    paidCache.set(key, cached);
+    return cached;
+  }
+
+  async function payeeOf(row: WorkOrderRow, paidCache?: Map<string, Promise<boolean>>) {
     if (row.payeeConfirmedAt) {
       return {
         account: row.builderNearAccount,
@@ -1117,7 +1127,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         needsConfirmation: false,
       };
     }
-    const known = EDITABLE.includes(row.status) ? await paidBefore(row) : null;
+    const known = EDITABLE.includes(row.status) ? await paidBeforeOnce(row, paidCache) : null;
     return {
       account: row.builderNearAccount,
       confirmedAt: null,
@@ -1235,6 +1245,14 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return { committed, paid, remaining };
   }
 
+  function documentProjectTitle(row: WorkOrderRow, project: { title: string } | null): string {
+    if (project) return project.title;
+    throw badRequest(
+      "PROJECT_UNAVAILABLE",
+      `Couldn't load the project of ${row.code}, so its document wasn't made. Try again in a moment.`,
+    );
+  }
+
   async function projectOf(
     row: Pick<WorkOrderRow, "organizationId" | "projectId"> &
       Partial<Pick<WorkOrderRow, "projectTitle" | "projectSlug">>,
@@ -1286,9 +1304,18 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
   }
 
   async function signingOf(row: WorkOrderRow) {
-    const esign = esignOf(row);
     const offered = await latestDocument(row.id, "offered");
-    if (!offered || offered.termsHash !== termsHash(row)) {
+    const current = offered && offered.termsHash === termsHash(row) ? offered : null;
+    return signingFrom(row, current, current ? await signaturesOf(row.id, current.sha256) : []);
+  }
+
+  function signingFrom(
+    row: WorkOrderRow,
+    offered: { sha256: string } | null,
+    signatures: Pick<WorkOrderSignatureRow, "role" | "name" | "signedAt">[],
+  ) {
+    const esign = esignOf(row);
+    if (!offered) {
       return {
         documentSha256: null,
         builder: null,
@@ -1298,7 +1325,6 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         esign,
       };
     }
-    const signatures = await signaturesOf(row.id, offered.sha256);
     const signer = (role: "contractor" | "representative") => {
       const found = signatures.find((s) => s.role === role);
       return found ? { name: found.name, signedAt: found.signedAt.toISOString() } : null;
@@ -1398,12 +1424,18 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     }
   }
 
-  async function cancelEnvelope(row: WorkOrderRow, reason: string) {
+  async function cancelEnvelope(row: WorkOrderRow, reason: string, strict = false) {
     if (!deps.esign || !row.esignEnvelopeId || row.signedAt) return;
     try {
       await deps.esign.cancel(row.esignEnvelopeId, reason);
     } catch (error) {
       console.warn(`[API] couldn't cancel the Documenso envelope of ${row.code}`, error);
+      if (strict) {
+        throw badRequest(
+          "ESIGN_CANCEL_FAILED",
+          `Couldn't withdraw ${row.code} in Documenso, so it wasn't deleted: ${errorText(error)}`,
+        );
+      }
     }
   }
 
@@ -1740,14 +1772,92 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     };
   }
 
-  async function view(row: WorkOrderRow, cache?: { projects?: Map<string, Project> }) {
+  type ViewCache = {
+    projects?: Map<string, Project>;
+    requests?: Map<string, CompensationRequestRow[]>;
+    builders?: Map<string, Promise<BuilderProfile | null>>;
+    paid?: Map<string, Promise<boolean>>;
+    signing?: Map<string, ReturnType<typeof signingFrom>>;
+  };
+
+  async function viewCacheOf(rows: WorkOrderRow[], projects: Map<string, Project>) {
+    const ids = rows.map((r) => r.id);
+    const [requestRows, offeredRows, signatureRows] = ids.length
+      ? await Promise.all([
+          db
+            .select()
+            .from(compensationRequests)
+            .where(inArray(compensationRequests.workOrderId, ids))
+            .orderBy(asc(compensationRequests.seq)),
+          db
+            .select({
+              workOrderId: workOrderDocuments.workOrderId,
+              termsHash: workOrderDocuments.termsHash,
+              sha256: workOrderDocuments.sha256,
+            })
+            .from(workOrderDocuments)
+            .where(
+              and(
+                inArray(workOrderDocuments.workOrderId, ids),
+                eq(workOrderDocuments.kind, "offered"),
+              ),
+            )
+            .orderBy(desc(workOrderDocuments.createdAt)),
+          db
+            .select({
+              workOrderId: workOrderSignatures.workOrderId,
+              documentSha256: workOrderSignatures.documentSha256,
+              role: workOrderSignatures.role,
+              name: workOrderSignatures.name,
+              signedAt: workOrderSignatures.signedAt,
+            })
+            .from(workOrderSignatures)
+            .where(inArray(workOrderSignatures.workOrderId, ids)),
+        ])
+      : [[], [], []];
+    const requests = new Map<string, CompensationRequestRow[]>(ids.map((id) => [id, []]));
+    for (const r of requestRows) requests.get(r.workOrderId)?.push(r);
+    const latestOffered = new Map<string, (typeof offeredRows)[number]>();
+    for (const doc of offeredRows) {
+      if (!latestOffered.has(doc.workOrderId)) latestOffered.set(doc.workOrderId, doc);
+    }
+    const signing = new Map(
+      rows.map((row) => {
+        const offered = latestOffered.get(row.id);
+        const current = offered && offered.termsHash === termsHash(row) ? offered : null;
+        return [
+          row.id,
+          signingFrom(
+            row,
+            current,
+            current
+              ? signatureRows.filter(
+                  (s) => s.workOrderId === row.id && s.documentSha256 === current.sha256,
+                )
+              : [],
+          ),
+        ] as const;
+      }),
+    );
+    const builders = new Map<string, Promise<BuilderProfile | null>>();
+    for (const account of new Set(rows.map((r) => r.builderNearAccount))) {
+      builders.set(
+        account,
+        deps.builders.get(account).catch(() => null),
+      );
+    }
+    return { projects, requests, builders, paid: new Map(), signing } satisfies ViewCache;
+  }
+
+  async function view(row: WorkOrderRow, cache?: ViewCache) {
     const [requests, builder] = await Promise.all([
-      requestsOf(row.id),
-      deps.builders.get(row.builderNearAccount).catch(() => null),
+      cache?.requests?.get(row.id) ?? requestsOf(row.id),
+      cache?.builders?.get(row.builderNearAccount) ??
+        deps.builders.get(row.builderNearAccount).catch(() => null),
     ]);
     const project = cache?.projects?.get(row.projectId) ?? (await projectOf(row));
-    const payee = await payeeOf(row);
-    const signing = await signingOf(row);
+    const payee = await payeeOf(row, cache?.paid);
+    const signing = cache?.signing?.get(row.id) ?? (await signingOf(row));
     const { committed, paid, remaining } = amountsOf(row, requests);
     const renewal = parseJson<RenewalAssessment | null>(row.renewalAssessment, null);
     const blockers = activationBlockers(
@@ -1805,7 +1915,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
       code: row.code,
       organizationId: row.organizationId,
       projectId: row.projectId,
-      projectTitle: project?.title ?? row.projectId,
+      projectTitle: project?.title ?? UNKNOWN_PROJECT,
       projectSlug: project?.slug ?? null,
       builder: {
         nearAccount: row.builderNearAccount,
@@ -2008,7 +2118,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     ]);
     return {
       code: row.code,
-      projectTitle: project?.title ?? row.projectId,
+      projectTitle: project?.title ?? UNKNOWN_PROJECT,
       agencyName,
       builderName: builder?.name ?? row.builderNearAccount,
       budget: display(row.budgetAmount, row.tokenId),
@@ -2327,7 +2437,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         ? await deps.summarizer
             .draftReport({
               workOrderCode: row.code,
-              project: project?.title ?? row.projectId,
+              project: project?.title ?? UNKNOWN_PROJECT,
               contractorGithub: row.githubLogin ?? "",
               periodStart: coversFrom,
               periodEnd: coversTo,
@@ -2350,6 +2460,8 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         summary: draft?.summary ?? null,
         contributionsMd,
         assessmentMd,
+        createdAt: now(),
+        updatedAt: now(),
       })
       .returning();
     if (auto) await update(row.id, { autoDraftedFor: row.periodEnd });
@@ -2794,7 +2906,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     const description = proposalDescription({
       title: `${row.code}-R${request.seq}: ${row.title}`,
       notes: [
-        `Project: ${project?.title ?? row.projectId}`,
+        `Project: ${project?.title ?? UNKNOWN_PROJECT}`,
         `Covers ${request.coversFrom} to ${request.coversTo}`,
         payout.priceUsd
           ? `${display(request.approvedAmount ?? "0", row.tokenId)} at ${payout.priceUsd} USD per ${symbolOf(payout.tokenId)}`
@@ -2954,6 +3066,8 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
           code,
           organizationId: parent.organizationId,
           projectId: parent.projectId,
+          projectTitle: parent.projectTitle,
+          projectSlug: parent.projectSlug,
           builderNearAccount: parent.builderNearAccount,
           githubLogin: parent.githubLogin,
           title: parent.title,
@@ -2979,6 +3093,8 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
           renewalRoot: root,
           renewalSeq: seq,
           createdBy: "renewal",
+          createdAt: now(),
+          updatedAt: now(),
         })
         .returning();
       await tx
@@ -3285,8 +3401,9 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
           .catch(() => [])
       ).map((p) => [p.id, p]),
     );
+    const cache = await viewCacheOf(rows, projects);
     return {
-      data: await Promise.all(rows.map(async (row) => adminView(await view(row, { projects })))),
+      data: await Promise.all(rows.map(async (row) => adminView(await view(row, cache)))),
     };
   }
 
@@ -3331,6 +3448,56 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
 
     nextCode: async (scope: OrganizationScope) => ({ code: await nextCode(scope.organizationId) }),
 
+    githubRepos: async (_scope: OrganizationScope, input: { org: string }) => {
+      try {
+        return { org: input.org, repos: await orgRepos(input.org) };
+      } catch (error) {
+        if (error instanceof GitHubError && error.status === 404) {
+          throw badRequest("GITHUB_ORG_NOT_FOUND", `GitHub has no organization "${input.org}"`);
+        }
+        throw badRequest(
+          "GITHUB_FAILED",
+          `Couldn't load repositories from GitHub: ${errorText(error)}`,
+        );
+      }
+    },
+
+    builderDefaults: async (scope: OrganizationScope, input: { nearAccount: string }) => {
+      const nearAccount = input.nearAccount.trim();
+      const latestOf = (
+        column: typeof workOrders.contractorEmail | typeof workOrders.githubLogin,
+      ) =>
+        db
+          .select({ value: column })
+          .from(workOrders)
+          .where(
+            and(
+              eq(workOrders.organizationId, scope.organizationId),
+              eq(workOrders.builderNearAccount, nearAccount),
+              isNotNull(column),
+            ),
+          )
+          .orderBy(desc(workOrders.createdAt))
+          .limit(1)
+          .then(([row]) => row?.value ?? null);
+      const [builder, remembered, previousEmail, previousLogin] = await Promise.all([
+        nearAccount ? deps.builders.get(nearAccount).catch(() => null) : null,
+        nearAccount ? rememberedLogin(db, scope.organizationId, nearAccount) : null,
+        latestOf(workOrders.contractorEmail),
+        latestOf(workOrders.githubLogin),
+      ]);
+      const accountEmail =
+        builder?.userId && deps.userEmail
+          ? !!(await deps.userEmail(builder.userId).catch(() => null))
+          : false;
+      return {
+        githubLogin: builder?.githubLogin?.toLowerCase() ?? remembered ?? previousLogin,
+        contractorEmail: previousEmail,
+        accountEmail,
+        needsEmails: !!deps.esign,
+      };
+    },
+
     create: async (scope: OrganizationScope, input: WorkOrderFields) => {
       const code = input.code?.trim() || (await nextCode(scope.organizationId));
       const builder = await deps.builders.get(input.builderNearAccount);
@@ -3382,6 +3549,8 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
           customFields: customFieldsText(fields.customFields),
           status: "draft",
           createdBy: scope.actorId,
+          createdAt: now(),
+          updatedAt: now(),
         })
         .returning();
       await rememberBuilderLogin(
@@ -3689,8 +3858,21 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
             "Only a draft or offered work order can be deleted; terminate it instead",
           );
         }
-        await cancelEnvelope(row, "The work order was withdrawn");
-        await db.delete(workOrders).where(eq(workOrders.id, row.id));
+        const current = await syncEnvelope(row);
+        if (current.status !== "draft" && current.status !== "offered") {
+          throw badRequest(
+            "ALREADY_SIGNED",
+            `The builder has already signed ${row.code}; terminate it instead`,
+          );
+        }
+        if (current.esignEnvelopeId && current.esignError) {
+          throw badRequest(
+            "ESIGN_UNCHECKED",
+            `${current.esignError}. ${row.code} wasn't deleted; try again in a moment.`,
+          );
+        }
+        await cancelEnvelope(current, "The work order was withdrawn", true);
+        await db.delete(workOrders).where(eq(workOrders.id, current.id));
         return { deleted: true as const };
       });
     },
@@ -4387,7 +4569,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
       const frozen = renderReport({
         requestId: `${row.code}-R${request.seq}`,
         workOrderCode: row.code,
-        projectTitle: project?.title ?? row.projectId,
+        projectTitle: project?.title ?? UNKNOWN_PROJECT,
         contractor: builder?.name ?? row.builderNearAccount,
         github: row.githubLogin ?? "",
         coversFrom: request.coversFrom,
diff --git a/api/src/services/work-orders/setup-status.ts b/api/src/services/work-orders/setup-status.ts
index b0ba1742..ee192ebc 100644
--- a/api/src/services/work-orders/setup-status.ts
+++ b/api/src/services/work-orders/setup-status.ts
@@ -84,7 +84,7 @@ export function createSetupStatus(deps: SetupStatusDeps) {
     return missing(
       name
         ? `“${name}” looks like a placeholder; builders see it in every email and document`
-        : "Your agency has no name; builders see it in every email and document",
+        : "No name yet; builders see it in every email and document",
     );
   }
 
@@ -104,9 +104,7 @@ export function createSetupStatus(deps: SetupStatusDeps) {
 
   async function email(organizationId: string): Promise<Outcome> {
     if (!deps.emailEnabled) {
-      return missing(
-        "Emails are off, so builders and your representative only get notifications in MultiAgency",
-      );
+      return missing("Emails are off on this server. Ask your server admin to turn them on.");
     }
     const { email } = await deps.representative(organizationId);
     return ok(
@@ -119,7 +117,7 @@ export function createSetupStatus(deps: SetupStatusDeps) {
   async function signing(): Promise<Outcome> {
     return deps.esignEnabled
       ? ok("Builders sign the work order document")
-      : warning("No e-signature: builders accept the terms in MultiAgency");
+      : warning("E-signature is off on this server. Builders accept the terms in MultiAgency.");
   }
 
   async function google(organizationId: string): Promise<Outcome> {
@@ -138,14 +136,14 @@ export function createSetupStatus(deps: SetupStatusDeps) {
     ].filter((item): item is string => !!item);
     if (!linked) {
       return lacking.length === 3
-        ? optional("Connect Google Drive to fill your own work order template")
-        : warning("Connect Google Drive to use the template you chose");
+        ? optional("Connect Drive to use your own template")
+        : warning("Connect Drive to use the template you chose");
     }
     const via = connection.connected
       ? `Connected${connection.email ? ` as ${connection.email}` : ""}`
       : "Using the server's Google account";
     if (lacking.length === 3) {
-      return optional(`${via}; choose a template and folders to use your own document`);
+      return optional(`${via}; choose a template and folders`);
     }
     if (lacking.length > 0) return warning(`${via}; choose ${listOf(lacking)}`);
     if (settings?.googleLastError) return warning(`Google Drive: ${settings.googleLastError}`);
@@ -162,16 +160,14 @@ export function createSetupStatus(deps: SetupStatusDeps) {
     const agent = async (): Promise<Outcome> => {
       const current = await viewOnce();
       if (!current.available) {
-        return optional(
-          "Not available on this server: approved requests are paid through DAO proposals",
-        );
+        return optional("Not on this server; requests are paid by DAO proposal");
       }
       if (!current.agentId) {
-        return optional("No payout agent: approved requests are paid through DAO proposals");
+        return optional("None; requests are paid by DAO proposal");
       }
       if (current.error) return warning(`Couldn't check: ${current.error}`);
       if (!current.ready) return warning(current.blockers.join(". "));
-      return ok("The agent's rules are applied and MultiAgency can pay approved requests");
+      return ok("Rules applied; can pay approved requests");
     };
 
     const funding = async (): Promise<Outcome> => {
@@ -196,7 +192,7 @@ export function createSetupStatus(deps: SetupStatusDeps) {
       }
       if (check.budgetTooLow) {
         problems.push(
-          `The $${check.monthlyBudgetUsd} monthly payout limit is below the ≈$${check.monthlyNeededUsd} active work orders need`,
+          `$${check.monthlyBudgetUsd} monthly limit is below the ≈$${check.monthlyNeededUsd} active work orders need`,
         );
       } else if (
         check.monthlyRemainingUsd !== null &&
@@ -210,7 +206,7 @@ export function createSetupStatus(deps: SetupStatusDeps) {
       if (problems.length > 0) return warning(problems.join(". "));
       return ok(
         needed === 0n
-          ? `Holds ${check.balanceNear} NEAR; no unpaid work order budgets yet`
+          ? `Holds ${check.balanceNear} NEAR; no unpaid budgets yet`
           : `Holds ${check.balanceNear} NEAR, enough for the ≈${check.neededNear} NEAR active work orders need`,
       );
     };
diff --git a/api/src/work-orders-contract.ts b/api/src/work-orders-contract.ts
index 09948a7e..452fa8ca 100644
--- a/api/src/work-orders-contract.ts
+++ b/api/src/work-orders-contract.ts
@@ -623,6 +623,43 @@ export const workOrdersContract = {
     .output(z.object({ code: z.string() }))
     .errors({ UNAUTHORIZED, FORBIDDEN }),
 
+  githubRepos: oc
+    .route({ method: "GET", path: "/admin/work-order-github-repos" })
+    .input(
+      z.object({
+        org: z
+          .string()
+          .regex(/^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})$/, "Enter a GitHub organization name"),
+      }),
+    )
+    .output(
+      z.object({
+        org: z.string(),
+        repos: z.array(
+          z.object({
+            fullName: z.string(),
+            url: z.string(),
+            description: z.string().nullable(),
+            pushedAt: z.string().nullable(),
+          }),
+        ),
+      }),
+    )
+    .errors(errors),
+
+  builderDefaults: oc
+    .route({ method: "GET", path: "/admin/work-order-builder-defaults" })
+    .input(z.object({ nearAccount: z.string() }))
+    .output(
+      z.object({
+        githubLogin: z.string().nullable(),
+        contractorEmail: z.string().nullable(),
+        accountEmail: z.boolean(),
+        needsEmails: z.boolean(),
+      }),
+    )
+    .errors({ UNAUTHORIZED, FORBIDDEN }),
+
   offer: oc
     .route({ method: "POST", path: "/admin/work-orders/{id}/offer" })
     .input(byId)
diff --git a/api/tests/fakes/github.ts b/api/tests/fakes/github.ts
index 195854a7..44cf2b9f 100644
--- a/api/tests/fakes/github.ts
+++ b/api/tests/fakes/github.ts
@@ -4,11 +4,13 @@ import type {
   GhIssueRef,
   GhPull,
   GhPullSummary,
+  GhRepo,
   GhRepoOwnership,
   GhReview,
   GhReviewBy,
   GitHubPort,
 } from "../../src/services/work-orders/github";
+import { GitHubError } from "../../src/services/work-orders/github";
 
 type PullRec = {
   pull: GhPull;
@@ -30,6 +32,7 @@ type RepoRec = {
 
 export class FakeGitHub implements GitHubPort {
   repos = new Map<string, RepoRec>();
+  orgs = new Map<string, GhRepo[]>();
   calls: string[] = [];
   private failures = new Map<string, Error[]>();
 
@@ -126,6 +129,13 @@ export class FakeGitHub implements GitHubPort {
     this.failures.set(method, list);
   }
 
+  async listOrgRepos(org: string): Promise<GhRepo[]> {
+    this.enter("listOrgRepos");
+    const repos = this.orgs.get(org.toLowerCase());
+    if (!repos) throw new GitHubError(404, `GitHub GET /orgs/${org}/repos → 404`);
+    return structuredClone(repos);
+  }
+
   private enter(method: string) {
     this.calls.push(method);
     const error = this.failures.get(method)?.shift();
diff --git a/api/tests/integration/work-order-setup.test.ts b/api/tests/integration/work-order-setup.test.ts
index ded20580..c069258b 100644
--- a/api/tests/integration/work-order-setup.test.ts
+++ b/api/tests/integration/work-order-setup.test.ts
@@ -133,7 +133,9 @@ describe("work order setup status", () => {
       detail: "Add the default representative's name and email",
       fixHref: "/admin/settings#work-orders",
     });
-    expect(check.signing.detail).toBe("No e-signature: builders accept the terms in MultiAgency");
+    expect(check.signing.detail).toBe(
+      "E-signature is off on this server. Builders accept the terms in MultiAgency.",
+    );
     expect(check.google.fixHref).toBe("/admin/settings#work-orders");
     expect(check.payouts_agent.fixHref).toBe("/admin/settings#payouts");
   });
diff --git a/api/tests/integration/work-orders.test.ts b/api/tests/integration/work-orders.test.ts
index 88975afc..e811c7c1 100644
--- a/api/tests/integration/work-orders.test.ts
+++ b/api/tests/integration/work-orders.test.ts
@@ -7,6 +7,7 @@ import {
   billings,
   compensationRequests,
   notifications,
+  organizationBuilderLogins,
   workOrderDocuments,
   workOrderDriveFiles,
   workOrderIntegrations,
@@ -228,6 +229,23 @@ describe("work orders", () => {
       expect((await service.create(await studio(), fields())).code).toBe("WO-0002");
     });
 
+    test("timestamps follow the service clock, so a new draft is waiting since now", async () => {
+      const created = await service.create(await studio(), fields());
+      expect(created.createdAt).toBe("2026-09-20T12:00:00.000Z");
+      expect(created.progress.since).toBe("2026-09-20T12:00:00.000Z");
+    });
+
+    test("a project that can't be found shows as unknown, never as its id", async () => {
+      const created = await service.create(await studio(), fields());
+      await db
+        .update(workOrders)
+        .set({ projectId: "proj_gone", projectTitle: null, projectSlug: null })
+        .where(eq(workOrders.id, created.id));
+      const view = await service.get(await studio(), { id: created.id });
+      expect(view.projectId).toBe("proj_gone");
+      expect(view.projectTitle).toBe("Unknown project");
+    });
+
     test("draft → offered → accepted by the builder's own account → active", async () => {
       const created = await service.create(await studio(), fields());
       expect(created.code).toBe("WO-0001");
@@ -801,6 +819,8 @@ describe("work orders", () => {
         signature: { method: null },
       });
       expect(child.signing.builder).toBeNull();
+      const [childRow] = await db.select().from(workOrders).where(eq(workOrders.id, child.id));
+      expect(childRow?.projectTitle).toBe(parent.projectTitle);
       expect(
         (await service.get(await studio(), { id: parent.id })).requests.map((r) => r.status),
       ).toEqual(["draft"]);
@@ -1506,6 +1526,33 @@ describe("work orders", () => {
       expect(documenso.cancelled.at(-1)?.envelopeId).toBe("envelope_3");
     });
 
+    test("an offered work order the builder already signed in Documenso can't be deleted", async () => {
+      const created = await offered();
+      documenso.sign("representative", "2026-09-20T13:00:00.000Z");
+      documenso.sign("contractor", "2026-09-20T14:00:00.000Z");
+      await refused(service.remove(await studio(), { id: created.id }), "ALREADY_SIGNED");
+      expect(documenso.cancelled).toEqual([]);
+      expect((await service.get(await studio(), { id: created.id })).status).not.toBe("offered");
+    });
+
+    test("deleting stops when Documenso can't be checked or the envelope can't be cancelled", async () => {
+      const created = await offered();
+      const status = documenso.status.bind(documenso);
+      documenso.status = async () => {
+        throw new Error("Documenso is down");
+      };
+      await refused(service.remove(await studio(), { id: created.id }), "ESIGN_UNCHECKED");
+      documenso.status = status;
+      const cancel = documenso.cancel.bind(documenso);
+      documenso.cancel = async () => {
+        throw new Error("timeout");
+      };
+      await refused(service.remove(await studio(), { id: created.id }), "ESIGN_CANCEL_FAILED");
+      documenso.cancel = cancel;
+      expect((await service.get(await studio(), { id: created.id })).status).toBe("offered");
+      await service.remove(await studio(), { id: created.id });
+    });
+
     async function completed() {
       const created = await offered();
       documenso.sign("representative", "2026-09-20T13:00:00.000Z");
@@ -2996,4 +3043,124 @@ describe("work orders", () => {
       }
     });
   });
+
+  describe("importing repositories from GitHub", () => {
+    test("lists an organization's public repositories and caches them", async () => {
+      github.orgs.set("nearbuilders", [
+        {
+          fullName: "NEARBuilders/citynode.app",
+          url: "https://github.com/NEARBuilders/citynode.app",
+          description: "City node",
+          pushedAt: "2026-10-01T00:00:00Z",
+        },
+      ]);
+      const listed = await service.githubRepos(await studio(), { org: "NEARBuilders" });
+      expect(listed.repos.map((r) => r.fullName)).toEqual(["NEARBuilders/citynode.app"]);
+      await service.githubRepos(await studio(), { org: "nearbuilders" });
+      expect(github.calls.filter((c) => c === "listOrgRepos")).toHaveLength(1);
+    });
+
+    test("an unknown organization or a GitHub outage is a clear error", async () => {
+      await refused(service.githubRepos(await studio(), { org: "nobody" }), "GITHUB_ORG_NOT_FOUND");
+      github.orgs.set("down", []);
+      github.failNext("listOrgRepos", new Error("timeout"));
+      await refused(service.githubRepos(await studio(), { org: "down" }), "GITHUB_FAILED");
+    });
+  });
+
+  describe("builder defaults for a new work order", () => {
+    const rival = () => world.manager("rival-admin", "rival");
+
+    test("the profile login, a linked account email, and no email demand without e-signature", async () => {
+      expect(await service.builderDefaults(await studio(), { nearAccount: CAROL })).toEqual({
+        githubLogin: "carol-gh",
+        contractorEmail: null,
+        accountEmail: true,
+        needsEmails: false,
+      });
+    });
+
+    test("an unknown builder gets empty defaults, and e-signature asks for emails", async () => {
+      service = createWorkOrdersService({ ...serviceDeps, esign: new FakeDocumenso() });
+      expect(await service.builderDefaults(await studio(), { nearAccount: "ghost.near" })).toEqual({
+        githubLogin: null,
+        contractorEmail: null,
+        accountEmail: false,
+        needsEmails: true,
+      });
+    });
+
+    test("no account email when the linked user has none", async () => {
+      service = createWorkOrdersService({ ...serviceDeps, userEmail: async () => null });
+      const defaults = await service.builderDefaults(await studio(), { nearAccount: CAROL });
+      expect(defaults.accountEmail).toBe(false);
+    });
+
+    test("the remembered login and latest email stay inside the organization", async () => {
+      const first = await service.create(
+        await studio(),
+        fields({
+          builderNearAccount: "nogit.near",
+          githubLogin: "nogit-gh",
+          contractorEmail: "old@nogit.example",
+        }),
+      );
+      clock = new Date("2026-09-21T12:00:00.000Z");
+      await service.create(
+        await studio(),
+        fields({
+          builderNearAccount: "nogit.near",
+          githubLogin: "nogit-gh",
+          contractorEmail: "new@nogit.example",
+        }),
+      );
+      clock = new Date("2026-09-22T12:00:00.000Z");
+      const leaked = await service.create(
+        await studio(),
+        fields({
+          builderNearAccount: "nogit.near",
+          githubLogin: "nogit-gh",
+          contractorEmail: "rival@nogit.example",
+        }),
+      );
+      await db
+        .update(workOrders)
+        .set({ organizationId: "rival", githubLogin: "rival-gh" })
+        .where(eq(workOrders.id, leaked.id));
+      await db.update(workOrders).set({ contractorEmail: null }).where(eq(workOrders.id, first.id));
+
+      expect(await service.builderDefaults(await studio(), { nearAccount: "nogit.near" })).toEqual({
+        githubLogin: "nogit-gh",
+        contractorEmail: "new@nogit.example",
+        accountEmail: true,
+        needsEmails: false,
+      });
+      expect(await service.builderDefaults(await rival(), { nearAccount: "nogit.near" })).toEqual({
+        githubLogin: "rival-gh",
+        contractorEmail: "rival@nogit.example",
+        accountEmail: true,
+        needsEmails: false,
+      });
+    });
+
+    test("the latest login on the organization's work orders fills in when none is remembered", async () => {
+      await service.create(
+        await studio(),
+        fields({ builderNearAccount: "nogit.near", githubLogin: "old-gh" }),
+      );
+      clock = new Date("2026-09-21T12:00:00.000Z");
+      await service.create(
+        await studio(),
+        fields({ builderNearAccount: "nogit.near", githubLogin: "new-gh" }),
+      );
+      await db.delete(organizationBuilderLogins);
+
+      expect(
+        (await service.builderDefaults(await studio(), { nearAccount: "nogit.near" })).githubLogin,
+      ).toBe("new-gh");
+      expect(
+        (await service.builderDefaults(await rival(), { nearAccount: "nogit.near" })).githubLogin,
+      ).toBeNull();
+    });
+  });
 });
diff --git a/api/tests/unit/progress.test.ts b/api/tests/unit/progress.test.ts
index efd8cc54..2e0708e4 100644
--- a/api/tests/unit/progress.test.ts
+++ b/api/tests/unit/progress.test.ts
@@ -301,4 +301,46 @@ describe("work order progress", () => {
     });
     expect(p.attention.map((a) => a.key)).toEqual(["esign", "payee", "drive"]);
   });
+
+  test("an unconfirmed payout account only needs attention once the builder has signed", () => {
+    const payeeKeys = (input: Partial<ProgressInput>) =>
+      progressOf({ ...base, payeeNeedsConfirmation: true, ...input }).attention.map((a) => a.key);
+    expect(payeeKeys({})).toEqual([]);
+    expect(
+      payeeKeys({
+        status: "offered",
+        offeredAt: "2026-10-26T10:01:00.000Z",
+        awaitingRepresentative: true,
+      }),
+    ).toEqual([]);
+    expect(
+      payeeKeys({
+        status: "offered",
+        offeredAt: "2026-10-26T10:01:00.000Z",
+        representativeSignedAt: "x",
+      }),
+    ).toEqual([]);
+    expect(
+      payeeKeys({
+        status: "accepted",
+        acceptedAt: "2026-10-26T10:05:00.000Z",
+        builderSignedAt: "a",
+        representativeSignedAt: "b",
+      }),
+    ).toEqual(["payee"]);
+    expect(payeeKeys(signedActive)).toEqual(["payee"]);
+    expect(
+      payeeKeys({
+        status: "accepted",
+        acceptedAt: "2026-10-26T10:05:00.000Z",
+        builderSignedAt: "a",
+        representativeSignedAt: "b",
+        blockers: [
+          "Add the builder's GitHub login",
+          "The builder hasn't confirmed the payout account",
+        ],
+      }),
+    ).toEqual(["blocker-1"]);
+    expect(payeeKeys({ ...signedActive, status: "terminated" })).toEqual([]);
+  });
 });
diff --git a/ui/src/components/admin-sidebar.tsx b/ui/src/components/admin-sidebar.tsx
index a8da52b7..ebc64c48 100644
--- a/ui/src/components/admin-sidebar.tsx
+++ b/ui/src/components/admin-sidebar.tsx
@@ -11,7 +11,7 @@ import {
   workspaceNavigation,
 } from "@/lib/navigation";
 
-const WORK_ORDERS = "/admin/work-orders";
+const NEEDS_YOU_BADGE = new Set(["/admin", "/admin/work-orders"]);
 
 const VIEW_LABELS: Record<WorkspaceView, string> = { agency: "Agency", client: "Client" };
 
@@ -35,7 +35,7 @@ export function AdminSidebar() {
 
   const matching = groups
     .flatMap((group) => group.items)
-    .filter((item) => !!matchRoute({ to: item.match ?? item.to, fuzzy: true }));
+    .filter((item) => !!matchRoute({ to: item.match ?? item.to, fuzzy: !item.exact }));
   const activeTo = matching.reduce<string | null>(
     (best, item) => (best === null || item.to.length > best.length ? item.to : best),
     null,
@@ -89,7 +89,7 @@ export function AdminSidebar() {
                 >
                   <Link to={item.to} aria-current={active ? "page" : undefined}>
                     {item.label}
-                    {item.to === WORK_ORDERS && <WorkOrdersNeedsYouBadge />}
+                    {NEEDS_YOU_BADGE.has(item.to) && <WorkOrdersNeedsYouBadge />}
                   </Link>
                 </Button>
               );
diff --git a/ui/src/components/admin/applications-section.tsx b/ui/src/components/admin/applications-section.tsx
index 091ddbbc..69bd157d 100644
--- a/ui/src/components/admin/applications-section.tsx
+++ b/ui/src/components/admin/applications-section.tsx
@@ -128,9 +128,7 @@ export function ApplicationsAdminSection() {
         <CardTitle>
           <h2>Applications</h2>
         </CardTitle>
-        <CardDescription>
-          Founder, builder and client applications from the public site.
-        </CardDescription>
+        <CardDescription>From the public site.</CardDescription>
         <CardAction>
           <Badge variant="secondary">{apps.length}</Badge>
         </CardAction>
@@ -233,7 +231,7 @@ function ApplicationActions({ application }: { application: Application }) {
       await refreshAfter(queryClient, { type: "applications" });
       toast.success("Status updated");
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to update status"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't update the status"),
   });
 
   const convertMutation = useMutation({
@@ -242,7 +240,7 @@ function ApplicationActions({ application }: { application: Application }) {
       await refreshAfter(queryClient, { type: "applications" }, { type: "builders" });
       toast.success("Converted to builder");
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to convert"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't convert"),
   });
 
   return (
diff --git a/ui/src/components/admin/contributors-section.tsx b/ui/src/components/admin/contributors-section.tsx
index f8ce4d47..64cacdf9 100644
--- a/ui/src/components/admin/contributors-section.tsx
+++ b/ui/src/components/admin/contributors-section.tsx
@@ -175,9 +175,7 @@ export function ContributorsAdminSection() {
           <CardTitle>
             <h2>Builder directory</h2>
           </CardTitle>
-          <CardDescription>
-            Profiles are shared across Agencies and keyed by NEAR account.
-          </CardDescription>
+          <CardDescription>Shared across Agencies.</CardDescription>
           {!creating && (
             <CardAction className="flex flex-wrap gap-2">
               {!importing && (
@@ -237,7 +235,7 @@ function ContributorCreateForm({ onDone }: { onDone: () => void }) {
       toast.success("Builder created");
       onDone();
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to create builder"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't create the builder"),
   });
 
   const isPending = createMutation.isPending;
@@ -380,7 +378,7 @@ export function ContributorProfileForm({
       await refreshAfter(queryClient, { type: "builders" });
       toast.success("Profile saved");
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to save profile"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't save"),
   });
 
   const isPending = saveMutation.isPending;
@@ -502,7 +500,7 @@ export function RemoveBuilderButton({
         open={confirming}
         onOpenChange={setConfirming}
         title={`Remove ${name}?`}
-        description="Their profile is deleted from the builder directory. Billings already recorded for them are kept."
+        description="Their profile leaves the directory. Recorded billings are kept."
         confirmLabel="Remove builder"
         destructive
         onConfirm={async () => {
diff --git a/ui/src/components/admin/project-form.tsx b/ui/src/components/admin/project-form.tsx
index 4fedd164..f76ca0e7 100644
--- a/ui/src/components/admin/project-form.tsx
+++ b/ui/src/components/admin/project-form.tsx
@@ -6,7 +6,6 @@ import {
   Button,
   Card,
   CardContent,
-  CardDescription,
   CardFooter,
   CardHeader,
   CardTitle,
@@ -129,7 +128,7 @@ export function ProjectForm({
     },
     onError: (err: Error) => {
       if (isSlugTakenError(err)) return;
-      toast.error(err.message || (mode === "create" ? "Failed to create" : "Failed to update"));
+      toast.error(err.message || "Couldn't save the project");
     },
   });
 
@@ -187,11 +186,6 @@ export function ProjectForm({
         <CardTitle>
           <h2>{mode === "create" ? "New project" : "Project details"}</h2>
         </CardTitle>
-        <CardDescription>
-          {mode === "create"
-            ? "Projects hold the team, budget and billings for work you deliver."
-            : "Title, notes, repository, NEARN link, status and visibility."}
-        </CardDescription>
       </CardHeader>
       <form
         className="flex flex-col gap-4"
diff --git a/ui/src/components/admin/projects-section.tsx b/ui/src/components/admin/projects-section.tsx
index eba08d75..a8e1ed4e 100644
--- a/ui/src/components/admin/projects-section.tsx
+++ b/ui/src/components/admin/projects-section.tsx
@@ -171,9 +171,6 @@ export function ProjectsAdminSection() {
           <CardTitle>
             <h2>Your projects</h2>
           </CardTitle>
-          <CardDescription>
-            Open a project to manage its builders, budget and billings.
-          </CardDescription>
           {!creating && (
             <CardAction className="flex flex-wrap gap-2">
               {!importing && (
@@ -302,9 +299,7 @@ function NearnSponsorBountiesPanel({
         <CardTitle>
           <h2>Unlinked NEARN bounties</h2>
         </CardTitle>
-        <CardDescription>
-          Bounties from your NEARN sponsor account that no project tracks yet.
-        </CardDescription>
+        <CardDescription>No project tracks these yet.</CardDescription>
       </CardHeader>
       <CardContent>
         <ItemGroup>
diff --git a/ui/src/components/home/home-work-order-lists.tsx b/ui/src/components/home/home-work-order-lists.tsx
new file mode 100644
index 00000000..6a803d69
--- /dev/null
+++ b/ui/src/components/home/home-work-order-lists.tsx
@@ -0,0 +1,125 @@
+import { ArrowRightIcon } from "@phosphor-icons/react";
+import { Link } from "@tanstack/react-router";
+import { LoadError } from "@/components/load-error";
+import { SectionHeader } from "@/components/page-header";
+import { Button } from "@/components/ui/button";
+import {
+  Item,
+  ItemActions,
+  ItemContent,
+  ItemDescription,
+  ItemGroup,
+  ItemTitle,
+} from "@/components/ui/item";
+import { Skeleton } from "@/components/ui/skeleton";
+import type { WorkOrder } from "@/components/work-orders/work-order-status";
+import { waitingPhrase } from "@/lib/work-orders-inbox";
+
+function builderName(workOrder: WorkOrder): string {
+  return workOrder.builder.name ?? workOrder.builder.nearAccount;
+}
+
+function ListSkeleton() {
+  return (
+    <div className="flex flex-col gap-2">
+      {Array.from({ length: 2 }).map((_, i) => (
+        <Skeleton key={i} className="h-14 w-full" />
+      ))}
+    </div>
+  );
+}
+
+export function WaitingOnYouList({
+  workOrders,
+  isLoading,
+  error,
+  onRetry,
+}: {
+  workOrders: WorkOrder[];
+  isLoading: boolean;
+  error: Error | null;
+  onRetry: () => void;
+}) {
+  return (
+    <section aria-labelledby="waiting-on-you" className="flex flex-col gap-3">
+      <SectionHeader id="waiting-on-you" title="Work orders waiting on you" />
+      {error ? (
+        <LoadError title="Could not load work orders" onRetry={onRetry} />
+      ) : isLoading ? (
+        <ListSkeleton />
+      ) : workOrders.length === 0 ? (
+        <p className="border px-4 py-3 text-sm text-muted-foreground">
+          No work orders are waiting on you.
+        </p>
+      ) : (
+        <ItemGroup>
+          {workOrders.map((workOrder) => (
+            <li key={workOrder.id}>
+              <Item variant="outline" size="sm">
+                <ItemContent className="min-w-0">
+                  <ItemTitle>
+                    {workOrder.code}
+                    <span className="font-normal text-muted-foreground">
+                      {builderName(workOrder)}
+                    </span>
+                  </ItemTitle>
+                  <ItemDescription>{workOrder.progress.headline}</ItemDescription>
+                </ItemContent>
+                <ItemActions>
+                  <Button asChild size="sm">
+                    <Link to="/admin/work-orders/$id" params={{ id: workOrder.id }}>
+                      {workOrder.progress.next?.label ?? "Open"}
+                      <ArrowRightIcon aria-hidden />
+                    </Link>
+                  </Button>
+                </ItemActions>
+              </Item>
+            </li>
+          ))}
+        </ItemGroup>
+      )}
+    </section>
+  );
+}
+
+export function InProgressList({ workOrders }: { workOrders: WorkOrder[] }) {
+  if (workOrders.length === 0) return null;
+  return (
+    <section aria-labelledby="in-progress" className="flex flex-col gap-3">
+      <SectionHeader
+        id="in-progress"
+        title="In progress"
+        actions={
+          <Button asChild size="sm" variant="ghost">
+            <Link to="/admin/work-orders" search={{ view: "all" }}>
+              All work orders
+              <ArrowRightIcon aria-hidden />
+            </Link>
+          </Button>
+        }
+      />
+      <ItemGroup>
+        {workOrders.map((workOrder) => (
+          <li key={workOrder.id}>
+            <Item asChild variant="outline" size="xs">
+              <Link to="/admin/work-orders/$id" params={{ id: workOrder.id }}>
+                <ItemContent className="min-w-0">
+                  <ItemTitle>
+                    {workOrder.code}
+                    <span className="font-normal text-muted-foreground">
+                      {builderName(workOrder)}
+                    </span>
+                  </ItemTitle>
+                </ItemContent>
+                <span className="text-muted-foreground">
+                  {waitingPhrase(workOrder.progress.waitingOn, builderName(workOrder)) ??
+                    "In progress"}
+                </span>
+              </Link>
+            </Item>
+          </li>
+        ))}
+      </ItemGroup>
+    </section>
+  );
+}
diff --git a/ui/src/components/home/home-work-orders.ts b/ui/src/components/home/home-work-orders.ts
new file mode 100644
index 00000000..add4a2eb
--- /dev/null
+++ b/ui/src/components/home/home-work-orders.ts
@@ -0,0 +1,19 @@
+import { type InboxItem, inboxCategory, sortInbox } from "@/lib/work-orders-inbox";
+
+export const IN_PROGRESS_LIMIT = 5;
+
+export function waitingOnYou<T extends Pick<InboxItem, "status" | "progress">>(items: T[]): T[] {
+  return sortInbox(items.filter((item) => item.progress.needsYou));
+}
+
+export function activeWorkOrders<T extends Pick<InboxItem, "status" | "progress">>(
+  items: T[],
+  limit = IN_PROGRESS_LIMIT,
+): T[] {
+  return sortInbox(
+    items.filter((item) => {
+      const category = inboxCategory(item);
+      return category === "in-progress" || category === "builder";
+    }),
+  ).slice(0, limit);
+}
diff --git a/ui/src/components/user-nav.tsx b/ui/src/components/user-nav.tsx
index b2153b10..f8fb73dd 100644
--- a/ui/src/components/user-nav.tsx
+++ b/ui/src/components/user-nav.tsx
@@ -20,6 +20,7 @@ import { sessionQueryOptions } from "@/lib/auth";
 import { formatCount } from "@/lib/format-count";
 import { nearProfileQueryOptions } from "@/lib/near-profile";
 import { meRolesQueryOptions } from "@/lib/queries";
+import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export function UserNav() {
   const queryClient = useQueryClient();
@@ -55,6 +56,7 @@ export function UserNav() {
       await authClient.near.disconnect().catch(() => {});
     },
     onSuccess: async () => {
+      clearAllWorkOrderDrafts();
       queryClient.clear();
       navigate({ to: "/", replace: true });
     },
diff --git a/ui/src/components/work-orders/activity-timeline.tsx b/ui/src/components/work-orders/activity-timeline.tsx
index 182be307..d526fef3 100644
--- a/ui/src/components/work-orders/activity-timeline.tsx
+++ b/ui/src/components/work-orders/activity-timeline.tsx
@@ -34,11 +34,7 @@ export function ActivityTimeline({ workOrder }: { workOrder: WorkOrderDetail })
         <CardTitle>
           <h2>Activity</h2>
         </CardTitle>
-        <CardDescription>
-          {activity.isError
-            ? "Everything that happened to this work order. The emails couldn't be loaded."
-            : "Everything that happened to this work order, newest first, with the emails it sent."}
-        </CardDescription>
+        {activity.isError && <CardDescription>The emails couldn't be loaded.</CardDescription>}
       </CardHeader>
       <CardContent>
         {events.length === 0 ? (
diff --git a/ui/src/components/work-orders/builder-signing.tsx b/ui/src/components/work-orders/builder-signing.tsx
index 30e8854a..b2e72f70 100644
--- a/ui/src/components/work-orders/builder-signing.tsx
+++ b/ui/src/components/work-orders/builder-signing.tsx
@@ -67,18 +67,18 @@ export function BuilderSigning({
         <CardTitle>
           <h2>{waiting ? `Sign Work Order ${wo.code}` : "Work order document"}</h2>
         </CardTitle>
-        <CardDescription>
+        <CardDescription className="empty:hidden">
           {agencyFirst
             ? `${wo.agencyName} is signing this work order first. We'll email you a link to sign it as soon as they have.`
             : waiting && esign
-              ? `${wo.agencyName} signed this work order. Sign it to accept; it starts right away. We emailed you a link to sign it; you can also open it from here. You'll be paid to ${wo.builder.nearAccount}.`
+              ? `${wo.agencyName} signed. Sign to accept; it starts right away. You'll be paid to ${wo.builder.nearAccount}.`
               : waiting
-                ? `${wo.agencyName} sent you this work order to sign. Read it, then sign with your full name below. You're signed in with ${wo.builder.nearAccount}, the account you'll be paid to.`
+                ? `Read it, then sign with your full name. You'll be paid to ${wo.builder.nearAccount}.`
                 : complete
                   ? `Signed by you on ${signedByBuilder.signedAt.slice(0, 10)} and by ${wo.signing.representative?.name} on ${wo.signing.representative?.signedAt.slice(0, 10)}.`
                   : signedByBuilder
                     ? `You signed on ${signedByBuilder.signedAt.slice(0, 10)}. Waiting for ${wo.agencyName} to countersign.`
-                    : "The document of this work order."}
+                    : null}
         </CardDescription>
       </CardHeader>
       <CardContent className="flex flex-col gap-4">
diff --git a/ui/src/components/work-orders/delivered-work-section.tsx b/ui/src/components/work-orders/delivered-work-section.tsx
index a165ca36..36c199f4 100644
--- a/ui/src/components/work-orders/delivered-work-section.tsx
+++ b/ui/src/components/work-orders/delivered-work-section.tsx
@@ -1,13 +1,5 @@
 import { useState } from "react";
-import {
-  Badge,
-  Button,
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components";
+import { Badge, Button, Card, CardContent, CardHeader, CardTitle } from "@/components";
 import { formatTokenAmount } from "@/lib/format-amount";
 import { ReportMarkdown } from "./report-markdown";
 
@@ -71,10 +63,6 @@ export function DeliveredWorkSection({ items }: { items: DeliveredWork[] }) {
         <CardTitle>
           <h2>Delivered work</h2>
         </CardTitle>
-        <CardDescription>
-          Work accepted for this period: the GitHub issues each builder was assigned, the pull
-          requests the repository owner approved or merged, and their reviews.
-        </CardDescription>
       </CardHeader>
       <CardContent>
         <ul className="flex flex-col gap-3">
diff --git a/ui/src/components/work-orders/duplicate-work-order-button.tsx b/ui/src/components/work-orders/duplicate-work-order-button.tsx
deleted file mode 100644
index b3077a93..00000000
--- a/ui/src/components/work-orders/duplicate-work-order-button.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useNavigate } from "@tanstack/react-router";
-import { useState } from "react";
-import { Button, Dialog, DialogContent } from "@/components";
-import { WorkOrderForm } from "./work-order-form";
-import type { WorkOrder } from "./work-order-status";
-
-export function DuplicateWorkOrderButton({
-  workOrder,
-  variant = "outline",
-  className,
-}: {
-  workOrder: WorkOrder;
-  variant?: "outline" | "ghost" | "secondary";
-  className?: string;
-}) {
-  const navigate = useNavigate();
-  const [open, setOpen] = useState(false);
-  return (
-    <>
-      <Button size="sm" variant={variant} className={className} onClick={() => setOpen(true)}>
-        Duplicate
-      </Button>
-      <Dialog open={open} onOpenChange={setOpen}>
-        <DialogContent
-          className="max-h-[90vh] overflow-y-auto sm:max-w-2xl"
-          onInteractOutside={(event) => event.preventDefault()}
-        >
-          {open && (
-            <WorkOrderForm
-              template={workOrder}
-              onDone={(created) => {
-                setOpen(false);
-                void navigate({ to: "/admin/work-orders/$id", params: { id: created.id } });
-              }}
-            />
-          )}
-        </DialogContent>
-      </Dialog>
-    </>
-  );
-}
diff --git a/ui/src/components/work-orders/evidence-list.tsx b/ui/src/components/work-orders/evidence-list.tsx
index 0ccbe878..2590ade5 100644
--- a/ui/src/components/work-orders/evidence-list.tsx
+++ b/ui/src/components/work-orders/evidence-list.tsx
@@ -17,12 +17,7 @@ const STATE_LABEL: Record<string, string> = {
 
 export function EvidenceList({ evidence }: { evidence: Evidence[] }) {
   if (evidence.length === 0) {
-    return (
-      <p className="text-sm text-muted-foreground">
-        Nothing collected yet. Evidence comes from GitHub: issues assigned to the builder, pull
-        requests the repository owner approved or merged, and reviews.
-      </p>
-    );
+    return <p className="text-sm text-muted-foreground">Nothing collected from GitHub yet.</p>;
   }
   return (
     <div className="flex flex-col gap-5">
diff --git a/ui/src/components/work-orders/github-repo-picker.tsx b/ui/src/components/work-orders/github-repo-picker.tsx
new file mode 100644
index 00000000..7fd1c0b3
--- /dev/null
+++ b/ui/src/components/work-orders/github-repo-picker.tsx
@@ -0,0 +1,145 @@
+import { ArrowSquareOutIcon } from "@phosphor-icons/react";
+import { useQuery } from "@tanstack/react-query";
+import { type KeyboardEvent, useState } from "react";
+import { Button, Input } from "@/components";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Skeleton } from "@/components/ui/skeleton";
+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { useApiClient } from "@/lib/api";
+import { workOrderGithubReposQueryOptions } from "@/lib/queries";
+
+export const DEFAULT_GITHUB_ORGS = ["NEARBuilders", "MultiAgency"] as const;
+const OTHER = "other";
+
+const sameRepo = (a: string, b: string) => a.toLowerCase() === b.toLowerCase();
+
+export function GithubRepoPicker({
+  selected,
+  onToggle,
+  onClose,
+}: {
+  selected: string[];
+  onToggle: (repo: string, checked: boolean) => void;
+  onClose: () => void;
+}) {
+  const apiClient = useApiClient();
+  const [choice, setChoice] = useState<string>(DEFAULT_GITHUB_ORGS[0]);
+  const [otherInput, setOtherInput] = useState("");
+  const [otherOrg, setOtherOrg] = useState("");
+  const [search, setSearch] = useState("");
+  const org = choice === OTHER ? otherOrg : choice;
+  const reposQuery = useQuery(workOrderGithubReposQueryOptions(apiClient, org));
+  const term = search.trim().toLowerCase();
+  const repos = (reposQuery.data?.repos ?? []).filter(
+    (r) =>
+      !term ||
+      r.fullName.toLowerCase().includes(term) ||
+      r.description?.toLowerCase().includes(term),
+  );
+
+  const applyOther = () => setOtherOrg(otherInput.trim());
+  const onOtherEnter = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key !== "Enter") return;
+    e.preventDefault();
+    e.stopPropagation();
+    applyOther();
+  };
+
+  return (
+    <div className="flex flex-col gap-3 rounded-md border bg-muted/40 p-3">
+      <div className="flex flex-wrap items-center justify-between gap-2">
+        <p className="text-sm font-medium">Import from GitHub</p>
+        <Button type="button" size="sm" variant="ghost" onClick={onClose}>
+          Done
+        </Button>
+      </div>
+      <ToggleGroup
+        type="single"
+        variant="outline"
+        size="sm"
+        spacing={0}
+        value={choice}
+        onValueChange={(value) => {
+          if (value) setChoice(value);
+        }}
+        aria-label="GitHub organization"
+      >
+        {DEFAULT_GITHUB_ORGS.map((name) => (
+          <ToggleGroupItem key={name} value={name}>
+            {name}
+          </ToggleGroupItem>
+        ))}
+        <ToggleGroupItem value={OTHER}>Other</ToggleGroupItem>
+      </ToggleGroup>
+      {choice === OTHER && (
+        <div className="flex gap-2">
+          <Input
+            aria-label="GitHub organization"
+            placeholder="organization"
+            value={otherInput}
+            onKeyDown={onOtherEnter}
+            onChange={(e) => setOtherInput(e.target.value)}
+          />
+          <Button type="button" size="sm" variant="outline" onClick={applyOther}>
+            Load
+          </Button>
+        </div>
+      )}
+      {org !== "" && (
+        <Input
+          aria-label="Search repositories"
+          placeholder="Search repositories"
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+        />
+      )}
+      {org === "" ? null : reposQuery.isPending ? (
+        <div className="flex flex-col gap-2">
+          {Array.from({ length: 3 }).map((_, i) => (
+            <Skeleton key={i} className="h-8 w-full" />
+          ))}
+        </div>
+      ) : reposQuery.error ? (
+        <p className="text-sm text-muted-foreground">{reposQuery.error.message}</p>
+      ) : repos.length === 0 ? (
+        <p className="text-sm text-muted-foreground">No public repositories match.</p>
+      ) : (
+        <ul
+          className="flex max-h-64 flex-col gap-1 overflow-y-auto"
+          aria-label={`${org} repositories`}
+        >
+          {repos.map((repo) => {
+            const id = `gh-repo-${repo.fullName}`;
+            const checked = selected.some((s) => sameRepo(s, repo.fullName));
+            return (
+              <li key={repo.fullName} className="flex items-start gap-2 py-1">
+                <Checkbox
+                  id={id}
+                  checked={checked}
+                  onCheckedChange={(value) => onToggle(repo.fullName, value === true)}
+                />
+                <label htmlFor={id} className="flex min-w-0 flex-1 flex-col text-sm">
+                  <span className="truncate font-medium">{repo.fullName}</span>
+                  {repo.description && (
+                    <span className="truncate text-xs text-muted-foreground">
+                      {repo.description}
+                    </span>
+                  )}
+                </label>
+                <a
+                  href={`https://github.com/${repo.fullName}`}
+                  target="_blank"
+                  rel="noreferrer"
+                  aria-label={`Open ${repo.fullName} on GitHub`}
+                  className="text-muted-foreground hover:text-foreground"
+                >
+                  <ArrowSquareOutIcon aria-hidden className="size-4" />
+                </a>
+              </li>
+            );
+          })}
+        </ul>
+      )}
+    </div>
+  );
+}
diff --git a/ui/src/components/work-orders/google-settings.tsx b/ui/src/components/work-orders/google-settings.tsx
index 1ad710df..311cc1fd 100644
--- a/ui/src/components/work-orders/google-settings.tsx
+++ b/ui/src/components/work-orders/google-settings.tsx
@@ -114,7 +114,7 @@ export function GoogleDriveSettings({
     mutationFn: () => apiClient.workOrders.copyStarterTemplate({}),
     onSuccess: (next) => {
       onUpdate(next);
-      toast.success("The starter template was copied to your folder and selected");
+      toast.success("Starter template copied");
     },
     onError: (err: Error) => toast.error(err.message || "Couldn't copy the starter template"),
   });
@@ -148,8 +148,7 @@ export function GoogleDriveSettings({
           Google Docs and Drive
         </h3>
         <p className="text-sm text-muted-foreground">
-          MultiAgency fills your template in your Drive when you create a work order, and saves the
-          signed PDF, with its signature certificate, to the Signed folder.
+          Each work order is filled from your template. Signed PDFs go to the Signed folder.
         </p>
       </div>
 
diff --git a/ui/src/components/work-orders/integration-settings.tsx b/ui/src/components/work-orders/integration-settings.tsx
index 01b6d650..3b453471 100644
--- a/ui/src/components/work-orders/integration-settings.tsx
+++ b/ui/src/components/work-orders/integration-settings.tsx
@@ -6,7 +6,6 @@ import {
   Badge,
   Card,
   CardContent,
-  CardDescription,
   CardHeader,
   CardTitle,
   Table,
@@ -49,10 +48,6 @@ export function WorkOrderIntegrationSettings() {
         <CardTitle>
           <h2>Work orders: documents and email</h2>
         </CardTitle>
-        <CardDescription>
-          MultiAgency fills your Google Docs template for each work order, collects both signatures
-          in the dashboard and emails the builder and your representative at each step.
-        </CardDescription>
       </CardHeader>
       <CardContent className="flex flex-col gap-6">
         <div className="flex flex-wrap gap-2">
@@ -67,10 +62,8 @@ export function WorkOrderIntegrationSettings() {
           <Alert>
             <AlertTitle>Emails are off on this server</AlertTitle>
             <AlertDescription>
-              <OperatorHint>
-                Set RESEND_API_KEY and NOTIFY_FROM_EMAIL. Until then people get in-app notifications
-                only.
-              </OperatorHint>
+              <OperatorHint>Set RESEND_API_KEY and NOTIFY_FROM_EMAIL.</OperatorHint> Until then,
+              notifications are in-app only.
             </AlertDescription>
           </Alert>
         )}
diff --git a/ui/src/components/work-orders/next-step-card.tsx b/ui/src/components/work-orders/next-step-card.tsx
index eecb6772..52da2faf 100644
--- a/ui/src/components/work-orders/next-step-card.tsx
+++ b/ui/src/components/work-orders/next-step-card.tsx
@@ -10,11 +10,15 @@ import type { WorkOrderProgress } from "./progress-stepper";
 export type ProgressAction = NonNullable<WorkOrderProgress["next"]>;
 export type InPageAction = Exclude<ProgressAction, { kind: "link" }>;
 
-function waitingLine(progress: WorkOrderProgress, builderName: string): string | null {
-  const since = progress.since ? relativeTime(progress.since) : null;
-  const who = waitingPhrase(progress.waitingOn, builderName);
-  if (who) return since ? `${who} · since ${since}` : who;
-  return since ? `Since ${since}` : null;
+function metaLine(progress: WorkOrderProgress, builderName: string): string | null {
+  const since = progress.since ? `since ${relativeTime(progress.since)}` : null;
+  const who =
+    progress.waitingOn === "builder" && !progress.headline.includes(builderName)
+      ? waitingPhrase(progress.waitingOn, builderName)
+      : null;
+  if (who && since) return `${who} · ${since}`;
+  if (who) return who;
+  return since ? since.charAt(0).toUpperCase() + since.slice(1) : null;
 }
 
 export function ActionButton({
@@ -75,40 +79,37 @@ export function NextStepCard({
   children?: ReactNode;
 }) {
   const needsYou = progress.waitingOn === "you";
-  const waiting = waitingLine(progress, builderName);
+  const meta = metaLine(progress, builderName);
   return (
-    <Card
-      variant={needsYou ? "highlight" : "default"}
-      className={cn(needsYou ? "ring-primary/40" : "bg-muted/30")}
-      aria-label="Next step"
-    >
+    <Card variant={needsYou ? "highlight" : "default"} aria-label="Next step">
       <CardHeader>
-        <span className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
-          Next step
+        <span
+          className={cn(
+            "text-xs font-medium tracking-wide uppercase",
+            needsYou ? "text-primary" : "text-muted-foreground",
+          )}
+        >
+          {needsYou ? "Your turn" : "Next step"}
         </span>
         <CardTitle>
           <h2 className="text-base">{progress.headline}</h2>
         </CardTitle>
-        {waiting && (
-          <CardDescription className={cn(needsYou && "font-medium text-primary")}>
-            {waiting}
-          </CardDescription>
-        )}
+        {meta && <CardDescription>{meta}</CardDescription>}
       </CardHeader>
-      <CardContent className="flex flex-col gap-4 empty:hidden">
+      <CardContent className="flex flex-col gap-3 empty:hidden">
         {canManage && progress.next && (
           <div className="flex flex-wrap gap-2">
             <ActionButton action={progress.next} onAction={onAction} busy={busy} />
           </div>
         )}
         {progress.attention.length > 0 && (
-          <section aria-label="Needs attention" className="flex flex-col gap-2 border-t pt-3">
+          <section aria-label="Needs attention" className="flex flex-col gap-1.5">
             <h3 className="text-xs font-medium text-muted-foreground">Needs attention</h3>
-            <ul className="flex flex-col gap-2">
+            <ul className="flex flex-col gap-1.5">
               {progress.attention.map((item) => (
                 <li
                   key={item.key}
-                  className="flex flex-col gap-2 text-sm sm:flex-row sm:items-center sm:justify-between"
+                  className="flex flex-col gap-1.5 text-sm sm:flex-row sm:items-center sm:justify-between"
                 >
                   <span className="flex min-w-0 items-start gap-2">
                     <WarningCircleIcon
diff --git a/ui/src/components/work-orders/operator-hint.tsx b/ui/src/components/work-orders/operator-hint.tsx
index 2abdbd5b..74a0236a 100644
--- a/ui/src/components/work-orders/operator-hint.tsx
+++ b/ui/src/components/work-orders/operator-hint.tsx
@@ -7,5 +7,5 @@ export function OperatorHint({ children }: { children: ReactNode }) {
   const authClient = useAuthClient();
   const { data: session } = useQuery(sessionQueryOptions(authClient));
   if (session?.user?.role === "admin") return <>{children}</>;
-  return <>Ask your MultiAgency operator to turn this on.</>;
+  return <>Ask your server admin to turn this on.</>;
 }
diff --git a/ui/src/components/work-orders/payee-payouts-prompt.tsx b/ui/src/components/work-orders/payee-payouts-prompt.tsx
index 6250ceba..9afa46b9 100644
--- a/ui/src/components/work-orders/payee-payouts-prompt.tsx
+++ b/ui/src/components/work-orders/payee-payouts-prompt.tsx
@@ -28,8 +28,8 @@ export function PayeePayoutsPrompt({ workOrder }: { workOrder: WorkOrderDetail }
       <AlertTitle>The payout agent can't pay {name} yet</AlertTitle>
       <AlertDescription className="flex flex-col gap-3">
         <span>
-          The rules you signed don't include {payee}. Sign the updated rules with your wallet so
-          approved requests are paid automatically.
+          The rules you signed don't include {payee}. Sign the updated rules so approved requests
+          are paid automatically.
         </span>
         <span className="flex flex-wrap gap-2">
           {agent.changes.length > 0 ? (
diff --git a/ui/src/components/work-orders/quick-create-builder.tsx b/ui/src/components/work-orders/quick-create-builder.tsx
new file mode 100644
index 00000000..6ca79893
--- /dev/null
+++ b/ui/src/components/work-orders/quick-create-builder.tsx
@@ -0,0 +1,95 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { type KeyboardEvent, useState } from "react";
+import { toast } from "sonner";
+import { Button, FieldError, Input } from "@/components";
+import { Field } from "@/components/admin-form";
+import { type ApiClient, useApiClient } from "@/lib/api";
+import { isValidNearAccountId } from "@/lib/near-account";
+import { refreshAfter } from "@/lib/queries";
+
+type CreatedBuilder = Awaited<ReturnType<ApiClient["contributors"]["create"]>>["contributor"];
+
+export function QuickCreateBuilder({
+  onCreated,
+  onCancel,
+}: {
+  onCreated: (builder: CreatedBuilder) => void;
+  onCancel?: () => void;
+}) {
+  const apiClient = useApiClient();
+  const queryClient = useQueryClient();
+  const [nearAccount, setNearAccount] = useState("");
+  const [name, setName] = useState("");
+  const nearTrimmed = nearAccount.trim();
+  const nearOk = nearTrimmed !== "" && isValidNearAccountId(nearTrimmed);
+
+  const create = useMutation({
+    mutationFn: async () => {
+      const { contributor } = await apiClient.contributors.create({
+        nearAccount: nearTrimmed,
+        name: name.trim() || undefined,
+      });
+      return contributor;
+    },
+    onSuccess: async (builder) => {
+      await refreshAfter(queryClient, { type: "builders" });
+      toast.success(`${builder.name ?? builder.nearAccount} added`);
+      onCreated(builder);
+    },
+    onError: (err: Error) => toast.error(err.message || "Failed to add the builder"),
+  });
+
+  const canSubmit = nearOk && !create.isPending;
+  const submit = () => {
+    if (canSubmit) create.mutate();
+  };
+  const onEnter = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key !== "Enter") return;
+    e.preventDefault();
+    e.stopPropagation();
+    submit();
+  };
+
+  return (
+    <div className="flex flex-col gap-3 rounded-md border bg-muted/40 p-3">
+      <p className="text-sm font-medium">New builder</p>
+      <Field label="NEAR account" htmlFor="qc-builder-near" helper="Where they get paid.">
+        <Input
+          id="qc-builder-near"
+          placeholder="builder.near"
+          value={nearAccount}
+          disabled={create.isPending}
+          aria-invalid={nearTrimmed !== "" && !nearOk ? true : undefined}
+          onKeyDown={onEnter}
+          onChange={(e) => setNearAccount(e.target.value)}
+        />
+        {nearTrimmed !== "" && !nearOk && <FieldError>Invalid NEAR account ID</FieldError>}
+      </Field>
+      <Field label="Name" htmlFor="qc-builder-name">
+        <Input
+          id="qc-builder-name"
+          value={name}
+          disabled={create.isPending}
+          onKeyDown={onEnter}
+          onChange={(e) => setName(e.target.value)}
+        />
+      </Field>
+      <div className="flex flex-wrap gap-2">
+        <Button type="button" size="sm" disabled={!canSubmit} onClick={submit}>
+          {create.isPending ? "Adding…" : "Add builder"}
+        </Button>
+        {onCancel && (
+          <Button
+            type="button"
+            size="sm"
+            variant="ghost"
+            disabled={create.isPending}
+            onClick={onCancel}
+          >
+            Cancel
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/ui/src/components/work-orders/quick-create-project.tsx b/ui/src/components/work-orders/quick-create-project.tsx
new file mode 100644
index 00000000..427f7c61
--- /dev/null
+++ b/ui/src/components/work-orders/quick-create-project.tsx
@@ -0,0 +1,112 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { type KeyboardEvent, useState } from "react";
+import { toast } from "sonner";
+import { Button, Input } from "@/components";
+import { Field } from "@/components/admin-form";
+import { type ApiClient, useApiClient } from "@/lib/api";
+import { refreshAfter } from "@/lib/queries";
+import { isSlugTakenError, slugify } from "@/lib/slugify";
+import { isHttpUrl } from "@/lib/url";
+
+type CreatedProject = Awaited<ReturnType<ApiClient["agency"]["projects"]["create"]>>["project"];
+
+const SLUG_ATTEMPTS = 5;
+
+export function QuickCreateProject({
+  onCreated,
+  onCancel,
+}: {
+  onCreated: (project: CreatedProject) => void;
+  onCancel?: () => void;
+}) {
+  const apiClient = useApiClient();
+  const queryClient = useQueryClient();
+  const [title, setTitle] = useState("");
+  const [repository, setRepository] = useState("");
+  const repositoryTrimmed = repository.trim();
+  const repositoryOk = isHttpUrl(repositoryTrimmed);
+
+  const create = useMutation({
+    mutationFn: async () => {
+      const base = slugify(title) || "project";
+      let slug = base;
+      for (let attempt = 0; ; attempt++) {
+        try {
+          const { project } = await apiClient.agency.projects.create({
+            slug,
+            title: title.trim(),
+            repository: repositoryTrimmed,
+            kind: "project",
+            status: "active",
+            visibility: "private",
+          });
+          return project;
+        } catch (err) {
+          if (!isSlugTakenError(err) || attempt >= SLUG_ATTEMPTS) throw err;
+          const suffix = `-${attempt + 2}`;
+          slug = `${base.slice(0, 80 - suffix.length).replace(/-+$/, "")}${suffix}`;
+        }
+      }
+    },
+    onSuccess: async (project) => {
+      await refreshAfter(queryClient, { type: "projects" });
+      toast.success(`${project.title} created`);
+      onCreated(project);
+    },
+    onError: (err: Error) => toast.error(err.message || "Failed to create the project"),
+  });
+
+  const canSubmit = title.trim() !== "" && repositoryOk && !create.isPending;
+  const submit = () => {
+    if (canSubmit) create.mutate();
+  };
+  const onEnter = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key !== "Enter") return;
+    e.preventDefault();
+    e.stopPropagation();
+    submit();
+  };
+
+  return (
+    <div className="flex flex-col gap-3 rounded-md border bg-muted/40 p-3">
+      <p className="text-sm font-medium">New project</p>
+      <Field label="Name" htmlFor="qc-project-title">
+        <Input
+          id="qc-project-title"
+          value={title}
+          disabled={create.isPending}
+          onKeyDown={onEnter}
+          onChange={(e) => setTitle(e.target.value)}
+        />
+      </Field>
+      <Field label="Repository URL" htmlFor="qc-project-repo">
+        <Input
+          id="qc-project-repo"
+          type="url"
+          placeholder="https://github.com/owner/name"
+          value={repository}
+          disabled={create.isPending}
+          aria-invalid={repositoryTrimmed !== "" && !repositoryOk ? true : undefined}
+          onKeyDown={onEnter}
+          onChange={(e) => setRepository(e.target.value)}
+        />
+      </Field>
+      <div className="flex flex-wrap gap-2">
+        <Button type="button" size="sm" disabled={!canSubmit} onClick={submit}>
+          {create.isPending ? "Creating…" : "Create project"}
+        </Button>
+        {onCancel && (
+          <Button
+            type="button"
+            size="sm"
+            variant="ghost"
+            disabled={create.isPending}
+            onClick={onCancel}
+          >
+            Cancel
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/ui/src/components/work-orders/renewal-panel.tsx b/ui/src/components/work-orders/renewal-panel.tsx
index ff5e4dba..6946e9a8 100644
--- a/ui/src/components/work-orders/renewal-panel.tsx
+++ b/ui/src/components/work-orders/renewal-panel.tsx
@@ -45,9 +45,8 @@ export function RenewalPanel({
             <h2>Monthly renewal</h2>
           </CardTitle>
           <CardDescription>
-            After {workOrder.periodEnd} and {workOrder.graceDays} grace days, this period's work is
-            measured against the base metrics. All met: next month's work order starts by itself.
-            Any missed: you decide whether it renews.
+            Checked after {workOrder.periodEnd} + {workOrder.graceDays} grace days. Renews by itself
+            if every base metric is met; otherwise you decide.
           </CardDescription>
         </CardHeader>
       </Card>
@@ -153,8 +152,8 @@ function DecideRenewal({ workOrder }: { workOrder: WorkOrder }) {
       <AlertTitle>Renewal needs your decision</AlertTitle>
       <AlertDescription className="flex flex-col gap-3">
         <span>
-          Renew anyway to start next month's work order with the same terms, or let {workOrder.code}{" "}
-          end here. The builder is told either way.
+          Renew with the same terms, or let {workOrder.code} end here. The builder is told either
+          way.
         </span>
         <Input
           aria-label="Note (optional)"
diff --git a/ui/src/components/work-orders/representative-settings.tsx b/ui/src/components/work-orders/representative-settings.tsx
index 3743a6bb..729d1966 100644
--- a/ui/src/components/work-orders/representative-settings.tsx
+++ b/ui/src/components/work-orders/representative-settings.tsx
@@ -31,7 +31,7 @@ export function WorkOrderRepresentativeSettings() {
     onSuccess: (data) => {
       queryClient.setQueryData(workOrderRepresentativeQueryOptions(apiClient).queryKey, data);
       setForm(null);
-      toast.success("Default representative saved");
+      toast.success("Representative saved");
     },
     onError: (err: Error) => toast.error(err.message || "Couldn't save"),
   });
@@ -50,8 +50,7 @@ export function WorkOrderRepresentativeSettings() {
           <h2>Default representative</h2>
         </CardTitle>
         <CardDescription>
-          Who signs work orders for your Agency. New work orders start with these; you can change
-          them on each one.
+          Signs first and gets agency emails. You can change it per work order.
         </CardDescription>
       </CardHeader>
       <CardContent>
@@ -66,11 +65,7 @@ export function WorkOrderRepresentativeSettings() {
         >
           <FieldGroup>
             <div className="grid gap-6 sm:grid-cols-2 sm:items-start">
-              <Field
-                label="Default representative name"
-                htmlFor="rep-default-name"
-                helper="Printed on the document."
-              >
+              <Field label="Name" htmlFor="rep-default-name" helper="Printed on the document.">
                 <Input
                   id="rep-default-name"
                   value={values.name}
@@ -79,12 +74,12 @@ export function WorkOrderRepresentativeSettings() {
                 />
               </Field>
               <Field
-                label="Default representative email"
+                label="Email"
                 htmlFor="rep-default-email"
                 helper={
                   placeholder
                     ? "This looks like a wallet placeholder address: emails sent to it are lost."
-                    : "Agency emails (payout requested, signed, renewed) go only to this address."
+                    : "Agency emails go only here."
                 }
               >
                 <Input
diff --git a/ui/src/components/work-orders/requests-panel.tsx b/ui/src/components/work-orders/requests-panel.tsx
index cfce4b38..b3b4b76f 100644
--- a/ui/src/components/work-orders/requests-panel.tsx
+++ b/ui/src/components/work-orders/requests-panel.tsx
@@ -10,7 +10,6 @@ import {
   Card,
   CardAction,
   CardContent,
-  CardDescription,
   CardHeader,
   CardTitle,
   Dialog,
@@ -89,10 +88,6 @@ export function RequestsPanel({
         <CardTitle>
           <h2>Compensation requests</h2>
         </CardTitle>
-        <CardDescription>
-          Each period the builder sends a report and you approve an amount within the budget. Your
-          payout agent pays it right away, or you pay it through an Agency DAO proposal.
-        </CardDescription>
         {canDraft && (
           <CardAction>
             <Button
@@ -108,10 +103,7 @@ export function RequestsPanel({
       </CardHeader>
       <CardContent className="flex flex-col gap-4">
         {workOrder.requests.length === 0 ? (
-          <Empty
-            label="No requests yet."
-            description="A request is drafted automatically when the period ends."
-          />
+          <Empty label="No requests yet." description="One is drafted when the period ends." />
         ) : (
           workOrder.requests
             .slice()
diff --git a/ui/src/components/work-orders/setup-checklist.tsx b/ui/src/components/work-orders/setup-checklist.tsx
index a21ab098..0b56f6f6 100644
--- a/ui/src/components/work-orders/setup-checklist.tsx
+++ b/ui/src/components/work-orders/setup-checklist.tsx
@@ -1,4 +1,5 @@
 import {
+  CaretRightIcon,
   CheckCircleIcon,
   CircleIcon,
   WarningIcon,
@@ -20,6 +21,7 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { useApiClient } from "@/lib/api";
 import { activeOrganizationKey, workOrderSetupQueryOptions } from "@/lib/queries";
 import {
@@ -28,6 +30,7 @@ import {
   type SetupState,
   setupDismissKey,
   setupSummary,
+  splitOptional,
 } from "@/lib/setup-status";
 import { cn } from "@/lib/utils";
 
@@ -99,7 +102,7 @@ function FixLink({
   );
 }
 
-function CheckRow({ check }: { check: SetupCheck }) {
+function CheckRow({ check, tagged = true }: { check: SetupCheck; tagged?: boolean }) {
   const { icon: Icon, className, label } = ICONS[check.state];
   return (
     <li className="flex items-start gap-3 py-2">
@@ -107,7 +110,7 @@ function CheckRow({ check }: { check: SetupCheck }) {
       <div className="flex min-w-0 flex-1 flex-col gap-0.5">
         <span className="text-sm font-medium">
           {check.label}
-          {!check.required && (
+          {tagged && !check.required && (
             <span className="ml-2 text-xs font-normal text-muted-foreground">optional</span>
           )}
         </span>
@@ -140,6 +143,7 @@ export function SetupChecklist({ compact = false }: { compact?: boolean }) {
   const summary = setupSummary(query.data);
   if (summary.ready && dismissed) return null;
   const open = expanded ?? (!compact && !summary.ready);
+  const groups = splitOptional(query.data);
 
   if (!open) {
     return (
@@ -152,17 +156,17 @@ export function SetupChecklist({ compact = false }: { compact?: boolean }) {
         <span className="flex-1">
           {summary.ready
             ? "All set to send work orders"
-            : `Ready to send work orders: ${summary.done} of ${summary.total} done`}
+            : `Setup: ${summary.done} of ${summary.total} done`}
           {summary.attention.length > 0 && (
             <span className="ml-2 text-xs text-muted-foreground">
               {summary.attention.length === 1
-                ? "1 item needs attention"
-                : `${summary.attention.length} items need attention`}
+                ? "1 needs attention"
+                : `${summary.attention.length} need attention`}
             </span>
           )}
         </span>
         <Button size="xs" variant="ghost" onClick={() => setExpanded(true)}>
-          Show checklist
+          Show
         </Button>
         {dismissible && summary.ready && (
           <Button
@@ -189,23 +193,42 @@ export function SetupChecklist({ compact = false }: { compact?: boolean }) {
         </CardTitle>
         <CardDescription>
           {summary.done} of {summary.total} done
-          {summary.blocking.length > 0 &&
-            `. Fix ${summary.blocking.length === 1 ? "the missing item" : `the ${summary.blocking.length} missing items`} before sending work orders.`}
         </CardDescription>
         {(summary.ready || compact) && (
           <CardAction>
             <Button size="xs" variant="ghost" onClick={() => setExpanded(false)}>
-              Hide checklist
+              Hide
             </Button>
           </CardAction>
         )}
       </CardHeader>
       <CardContent>
         <ul className="flex flex-col divide-y">
-          {query.data.map((check) => (
+          {groups.main.map((check) => (
             <CheckRow key={check.key} check={check} />
           ))}
         </ul>
+        {groups.optional.length > 0 && (
+          <Collapsible>
+            <CollapsibleTrigger asChild>
+              <Button type="button" variant="ghost" size="xs" className="group/optional mt-2">
+                <CaretRightIcon
+                  data-icon="inline-start"
+                  aria-hidden
+                  className="transition-transform group-data-[state=open]/optional:rotate-90"
+                />
+                Optional
+              </Button>
+            </CollapsibleTrigger>
+            <CollapsibleContent>
+              <ul className="flex flex-col divide-y">
+                {groups.optional.map((check) => (
+                  <CheckRow key={check.key} check={check} tagged={false} />
+                ))}
+              </ul>
+            </CollapsibleContent>
+          </Collapsible>
+        )}
       </CardContent>
     </Card>
   );
@@ -240,10 +263,7 @@ export function SetupPreflight() {
             </li>
           ))}
         </ul>
-        <span>
-          Fix links open in a new tab, so this draft stays open. You can still save it and fix these
-          before you send it.
-        </span>
+        <span>Fix links open in a new tab. You can still save this draft.</span>
       </AlertDescription>
     </Alert>
   );
diff --git a/ui/src/components/work-orders/signing-panel.tsx b/ui/src/components/work-orders/signing-panel.tsx
index a30237dd..f46754a8 100644
--- a/ui/src/components/work-orders/signing-panel.tsx
+++ b/ui/src/components/work-orders/signing-panel.tsx
@@ -1,21 +1,12 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import { toast } from "sonner";
-import {
-  Badge,
-  Button,
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-  Input,
-} from "@/components";
+import { Badge, Button, Card, CardContent, CardHeader, CardTitle, Input } from "@/components";
 import { Checkbox } from "@/components/ui/checkbox";
 import { useApiClient } from "@/lib/api";
 import { adminWorkOrdersQueryKey } from "@/lib/queries";
 import { OpenDocumentButton } from "./open-document-button";
-import type { WorkOrderDetail } from "./work-order-status";
+import { payeeConfirmedBySigning, type WorkOrderDetail } from "./work-order-status";
 
 function Row({ label, children }: { label: string; children: React.ReactNode }) {
   return (
@@ -35,6 +26,7 @@ export function SigningPanel({
   canManage: boolean;
   onAttach: () => void;
 }) {
+  const confirmsOnSigning = payeeConfirmedBySigning(wo);
   const apiClient = useApiClient();
   const queryClient = useQueryClient();
   const [github, setGithub] = useState("");
@@ -66,11 +58,6 @@ export function SigningPanel({
         <CardTitle>
           <h2>Signature and payout account</h2>
         </CardTitle>
-        <CardDescription>
-          Offering the work order sends it for e-signature: the representative signs first, then the
-          builder, and it starts as soon as the builder signs. A payout account this Agency hasn't
-          paid before is confirmed by its wallet.
-        </CardDescription>
       </CardHeader>
       <CardContent>
         <dl className="grid gap-x-6 gap-y-4 text-sm sm:grid-cols-[10rem_1fr]">
@@ -88,27 +75,31 @@ export function SigningPanel({
                   <Badge variant="outline">Confirmed {date(wo.payee.confirmedAt)}</Badge>
                 ) : wo.payee.paidBefore ? (
                   <Badge variant="outline">Paid by this Agency before</Badge>
+                ) : confirmsOnSigning ? (
+                  <span className="text-muted-foreground">Confirmed when they sign</span>
                 ) : wo.payee.needsConfirmation ? (
                   <Badge>Needs the builder's confirmation</Badge>
                 ) : null}
               </span>
-              {wo.payee.needsConfirmation && (
+              {wo.payee.needsConfirmation && !confirmsOnSigning && (
                 <span className="text-muted-foreground">
-                  This Agency hasn't paid this account before, so the builder confirms it by signing
-                  in with that NEAR wallet. Accepting in MultiAgency confirms it too.
+                  New account: the builder confirms it by signing in with that NEAR wallet.
                 </span>
               )}
-              {canManage && wo.payee.needsConfirmation && wo.status !== "draft" && (
-                <Button
-                  size="sm"
-                  variant="outline"
-                  className="self-start"
-                  disabled={askPayee.isPending}
-                  onClick={() => askPayee.mutate()}
-                >
-                  Ask the builder to confirm
-                </Button>
-              )}
+              {canManage &&
+                wo.payee.needsConfirmation &&
+                !confirmsOnSigning &&
+                wo.status !== "draft" && (
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    className="self-start"
+                    disabled={askPayee.isPending}
+                    onClick={() => askPayee.mutate()}
+                  >
+                    Ask the builder to confirm
+                  </Button>
+                )}
             </div>
           </Row>
           <Row label="GitHub login">
@@ -154,7 +145,6 @@ export function SigningPanel({
               <span className="text-muted-foreground"> · {wo.representativeEmail}</span>
             ) : null}
           </Row>
-          {wo.ipModel && <Row label="IP model">{wo.ipModel.replace("_", " ")}</Row>}
         </dl>
       </CardContent>
     </Card>
@@ -267,8 +257,8 @@ function SignatureStatus({
       <div className="flex flex-col gap-3">
         <span>
           {canManage
-            ? "Sign it in Documenso to send it to the builder. They're emailed a link to sign as soon as you've signed."
-            : `Waiting for ${wo.representativeName ?? "the representative"} to sign it in Documenso; then it's sent to the builder.`}
+            ? "Sign it in Documenso to send it to the builder."
+            : `Waiting for ${wo.representativeName ?? "the representative"} to sign it in Documenso.`}
         </span>
         {esignError}
         <div className="flex flex-wrap gap-2">
@@ -294,8 +284,7 @@ function SignatureStatus({
       <div className="flex flex-col gap-3">
         <span className="text-muted-foreground">
           {representative ? `Signed by ${representative.name}. ` : ""}Sent to {builderName} on{" "}
-          {day(representative?.signedAt ?? wo.offeredAt)}; waiting for their signature. It becomes
-          active as soon as they sign.
+          {day(representative?.signedAt ?? wo.offeredAt)}; waiting for their signature.
         </span>
         {esignError}
         <Button size="sm" variant="outline" className="self-start" onClick={check}>
@@ -317,8 +306,7 @@ function SignatureStatus({
   return (
     <div className="flex flex-col gap-1">
       <span className="text-muted-foreground">
-        Not sent yet. Offering it prepares the document for signature: the representative signs
-        first, then the builder is sent a signing request.
+        Not sent yet. When offered, the representative signs first, then the builder.
       </span>
       {esignError}
     </div>
diff --git a/ui/src/components/work-orders/template-fields.tsx b/ui/src/components/work-orders/template-fields.tsx
index 311c4b30..a1d242a1 100644
--- a/ui/src/components/work-orders/template-fields.tsx
+++ b/ui/src/components/work-orders/template-fields.tsx
@@ -93,7 +93,7 @@ export function TemplateFields({
     mutationFn: (_tab: PendingTab) => apiClient.workOrders.previewTemplate({}),
     onSuccess: ({ url }, tab) => {
       tab.go(url);
-      toast.success("A preview with sample data is in your documents folder");
+      toast.success("Preview saved to your documents folder");
     },
     onError: (err: Error, tab) => {
       tab.close();
diff --git a/ui/src/components/work-orders/template-setup.tsx b/ui/src/components/work-orders/template-setup.tsx
index 036bb0d9..e6abd203 100644
--- a/ui/src/components/work-orders/template-setup.tsx
+++ b/ui/src/components/work-orders/template-setup.tsx
@@ -120,7 +120,7 @@ export function TemplateSetup({
         })),
       }),
     onSuccess: (next, tab) => {
-      toast.success("A tagged copy of your template is ready and selected");
+      toast.success("Tagged copy ready");
       tab.go(next.url);
       onDone(next);
     },
@@ -148,8 +148,7 @@ export function TemplateSetup({
       <DialogHeader>
         <DialogTitle>Set up the template's fields</DialogTitle>
         <DialogDescription>
-          MultiAgency found the spots to fill in. Pick what goes in each: it makes a copy of your
-          template with tags in those spots and uses the copy from now on. Your original isn't
+          Pick what goes in each spot. We use a tagged copy from now on; your original isn't
           changed.
         </DialogDescription>
       </DialogHeader>
diff --git a/ui/src/components/work-orders/trust-settings.tsx b/ui/src/components/work-orders/trust-settings.tsx
index 6c74d31c..dfc99796 100644
--- a/ui/src/components/work-orders/trust-settings.tsx
+++ b/ui/src/components/work-orders/trust-settings.tsx
@@ -57,10 +57,9 @@ export function WorkOrderTrustSettings() {
           <h2>Automatic approval for trusted builders</h2>
         </CardTitle>
         <CardDescription>
-          Builders with a clean payment history need fewer manual steps. New builders always wait
-          for you. Established builders (2 clean paid periods) are approved after a window you can
-          stop. Trusted builders (4 clean periods over 60 days, no flagged work) are approved and
-          paid as soon as they submit.
+          New builders always wait for you. Established builders (2 clean paid periods) are approved
+          after a window you can stop. Trusted builders (4 clean periods over 60 days, no flagged
+          work) are approved and paid as soon as they submit.
         </CardDescription>
       </CardHeader>
       <CardContent>
diff --git a/ui/src/components/work-orders/work-order-form.tsx b/ui/src/components/work-orders/work-order-form.tsx
index 0da4650f..5f7586bf 100644
--- a/ui/src/components/work-orders/work-order-form.tsx
+++ b/ui/src/components/work-orders/work-order-form.tsx
@@ -1,5 +1,6 @@
+import { ArrowSquareOutIcon, GithubLogoIcon } from "@phosphor-icons/react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import { useAuthClient } from "@/app";
 import {
@@ -23,21 +24,41 @@ import { type ApiClient, useApiClient } from "@/lib/api";
 import { sessionQueryOptions } from "@/lib/auth";
 import { nextCycle } from "@/lib/budget-periods";
 import { baseToDecimal, tokenSymbol } from "@/lib/format-amount";
+import { getNetwork } from "@/lib/network";
 import { warnIfPayoutsUncovered } from "@/lib/payout-coverage";
 import { openPendingTab, type PendingTab } from "@/lib/pending-tab";
 import {
+  activeOrganizationKey,
   adminContributorsListQueryOptions,
   adminProjectsListQueryOptions,
   adminWorkOrdersQueryKey,
   adminWorkOrdersQueryOptions,
   tokensListQueryOptions,
+  workOrderBuilderDefaultsQueryOptions,
   workOrderIntegrationQueryOptions,
   workOrderNextCodeQueryOptions,
   workOrderRepresentativeQueryOptions,
 } from "@/lib/queries";
 import { defaultRepresentative } from "@/lib/representative";
-import { defaultPeriod, duplicateTitle, recentBudgets, todayIn } from "@/lib/work-order-defaults";
+import {
+  defaultPeriod,
+  duplicateTitle,
+  recentBudgets,
+  repoFromProject,
+  sendBlocker,
+  todayIn,
+} from "@/lib/work-order-defaults";
+import {
+  clearWorkOrderDraft,
+  mergeStoredDraft,
+  readWorkOrderDraft,
+  type WorkOrderDraftScope,
+  writeWorkOrderDraft,
+} from "@/lib/work-order-draft";
 import { BudgetChips } from "./budget-chips";
+import { GithubRepoPicker } from "./github-repo-picker";
+import { QuickCreateBuilder } from "./quick-create-builder";
+import { QuickCreateProject } from "./quick-create-project";
 import { SetupPreflight } from "./setup-checklist";
 import type { WorkOrder } from "./work-order-status";
 
@@ -73,11 +94,14 @@ const USD_DECIMALS = 6;
 const REPO = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
 const GITHUB_LOGIN = /^[A-Za-z\d](?:[A-Za-z\d]|-(?=[A-Za-z\d])){0,38}$/;
 const EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const NEW_ITEM = "__new__";
 
-function repoFromProject(repository: string | null | undefined): string {
-  if (!repository) return "";
-  const match = /github\.com\/([^/]+\/[^/#?]+)/i.exec(repository);
-  return (match?.[1] ?? repository).replace(/\.git$/, "");
+function isDirty(draft: Draft, custom: Record<string, string>): boolean {
+  return (
+    [draft.projectId, draft.builderNearAccount, draft.title, draft.repos, draft.amount, draft.scope]
+      .map((value) => value.trim())
+      .some(Boolean) || Object.values(custom).some((value) => value.trim() !== "")
+  );
 }
 
 function amountOf(budgetAmount: string, tokenId: string, tokens: Lists["tokens"]): string {
@@ -152,20 +176,12 @@ export function WorkOrderForm({
     askFields: integrationQuery.data?.google.askFields ?? [],
   };
   if (lists.tokens.length === 0 && !editing) {
-    return (
-      <>
-        {title}
-        <Empty label="No tokens yet" description="No tokens are configured for this network." />
-      </>
-    );
-  }
-  if (lists.projects.length === 0 || lists.builders.length === 0) {
     return (
       <>
         {title}
         <Empty
-          label={lists.projects.length === 0 ? "No projects yet" : "No builders yet"}
-          description="A work order links one builder to one project. Add them first."
+          label="Payments aren't set up on this network"
+          description="Builders are paid in NEAR, and no payment tokens are configured here yet. Ask the platform admin to add NEAR."
         />
       </>
     );
@@ -197,35 +213,14 @@ function WorkOrderFields({
     enabled: !editing,
   });
   const budgetChoices = editing ? [] : recentBudgets(listQuery.data?.data ?? []);
-  const [draft, setDraft] = useState<Draft>(() => {
+  const [draftScope] = useState<WorkOrderDraftScope | null>(() =>
+    me?.id
+      ? { userId: me.id, network: getNetwork(), organizationId: activeOrganizationKey() }
+      : null,
+  );
+  const keepsLocalDraft = !editing && !template && draftScope !== null;
+  const blank = (): Draft => {
     const defaults = defaultRepresentative(representative, me);
-    const source = editing ?? template;
-    if (source) {
-      const period = editing
-        ? { start: editing.periodStart, end: editing.periodEnd }
-        : nextCycle(source.periodStart, source.periodEnd);
-      return {
-        code: editing ? editing.code : "",
-        projectId: source.projectId,
-        builderNearAccount: source.builder.nearAccount,
-        title: editing
-          ? source.title
-          : duplicateTitle(source.title, source.periodStart, period.start),
-        scope: source.scope ?? "",
-        repos: source.repos.join("\n"),
-        periodStart: period.start,
-        periodEnd: period.end,
-        graceDays: String(source.graceDays),
-        tokenId: source.tokenId,
-        amount: amountOf(source.budgetAmount, source.tokenId, tokens),
-        autoRenew: source.autoRenew,
-        githubLogin: source.builder.githubLogin ?? "",
-        contractorEmail: source.contractorEmail ?? "",
-        representativeName: source.representativeName ?? (editing ? "" : defaults.name),
-        representativeEmail: source.representativeEmail ?? (editing ? "" : defaults.email),
-        ipModel: source.ipModel ?? "",
-      };
-    }
     const period = defaultPeriod(todayIn(listQuery.data?.data[0]?.timeZone));
     return {
       code: "",
@@ -246,10 +241,97 @@ function WorkOrderFields({
       representativeEmail: defaults.email,
       ipModel: "",
     };
+  };
+  const [initial] = useState(() => {
+    const source = editing ?? template;
+    if (source) {
+      const defaults = defaultRepresentative(representative, me);
+      const period = editing
+        ? { start: editing.periodStart, end: editing.periodEnd }
+        : nextCycle(source.periodStart, source.periodEnd);
+      return {
+        restored: false,
+        custom: source.customFields ?? {},
+        draft: {
+          code: editing ? editing.code : "",
+          projectId: source.projectId,
+          builderNearAccount: source.builder.nearAccount,
+          title: editing
+            ? source.title
+            : duplicateTitle(source.title, source.periodStart, period.start),
+          scope: source.scope ?? "",
+          repos: source.repos.join("\n"),
+          periodStart: period.start,
+          periodEnd: period.end,
+          graceDays: String(source.graceDays),
+          tokenId: source.tokenId,
+          amount: amountOf(source.budgetAmount, source.tokenId, tokens),
+          autoRenew: source.autoRenew,
+          githubLogin: source.builder.githubLogin ?? "",
+          contractorEmail: source.contractorEmail ?? "",
+          representativeName: source.representativeName ?? (editing ? "" : defaults.name),
+          representativeEmail: source.representativeEmail ?? (editing ? "" : defaults.email),
+          ipModel: source.ipModel ?? "",
+        } satisfies Draft,
+      };
+    }
+    const fresh = blank();
+    const stored = keepsLocalDraft && draftScope ? readWorkOrderDraft<Draft>(draftScope) : null;
+    if (!stored) return { restored: false, custom: {}, draft: fresh };
+    const merged = mergeStoredDraft(fresh, stored.draft);
+    const draft: Draft = {
+      ...merged,
+      code: "",
+      projectId: projects.some((p) => p.id === merged.projectId) ? merged.projectId : "",
+      builderNearAccount: builders.some((b) => b.nearAccount === merged.builderNearAccount)
+        ? merged.builderNearAccount
+        : "",
+    };
+    return isDirty(draft, stored.custom)
+      ? { restored: true, custom: stored.custom, draft }
+      : { restored: false, custom: {}, draft: fresh };
   });
-  const [custom, setCustom] = useState<Record<string, string>>(
-    () => (editing ?? template)?.customFields ?? {},
+  const [draft, setDraft] = useState<Draft>(initial.draft);
+  const [custom, setCustom] = useState<Record<string, string>>(initial.custom);
+  const [restored, setRestored] = useState(initial.restored);
+  const finished = useRef(false);
+  const [creatingProject, setCreatingProject] = useState(false);
+  const [creatingBuilder, setCreatingBuilder] = useState(false);
+  const [importingRepos, setImportingRepos] = useState(false);
+
+  useEffect(() => {
+    if (!keepsLocalDraft || !draftScope || finished.current) return;
+    if (isDirty(draft, custom)) {
+      const { representativeName: _name, representativeEmail: _email, ...kept } = draft;
+      writeWorkOrderDraft(draftScope, { draft: kept, custom });
+    } else clearWorkOrderDraft(draftScope);
+  }, [keepsLocalDraft, draftScope, draft, custom]);
+
+  const builderDefaultsQuery = useQuery(
+    workOrderBuilderDefaultsQueryOptions(apiClient, draft.builderNearAccount),
   );
+  const builderDefaults = builderDefaultsQuery.data;
+  const builderAccount = draft.builderNearAccount;
+  useEffect(() => {
+    if (editing || !builderDefaults || !builderAccount) return;
+    setDraft((current) => {
+      if (current.builderNearAccount !== builderAccount) return current;
+      const githubLogin = current.githubLogin || builderDefaults.githubLogin || "";
+      const contractorEmail = current.contractorEmail || builderDefaults.contractorEmail || "";
+      return githubLogin === current.githubLogin && contractorEmail === current.contractorEmail
+        ? current
+        : { ...current, githubLogin, contractorEmail };
+    });
+  }, [editing, builderDefaults, builderAccount]);
+
+  const discard = () => {
+    finished.current = false;
+    if (draftScope) clearWorkOrderDraft(draftScope);
+    setDraft(blank());
+    setCustom({});
+    setRestored(false);
+  };
+
   const set = <K extends keyof Draft>(key: K, value: Draft[K]) =>
     setDraft((current) => ({ ...current, [key]: value }));
   const token =
@@ -262,6 +344,16 @@ function WorkOrderFields({
     .map((r) => r.trim())
     .filter(Boolean);
   const badRepo = repos.find((r) => !REPO.test(r));
+  const validRepos = repos.filter((r) => REPO.test(r));
+  const toggleRepo = (repo: string, checked: boolean) =>
+    setDraft((current) => {
+      const lines = current.repos
+        .split(/[\s,]+/)
+        .map((r) => r.trim())
+        .filter(Boolean);
+      const others = lines.filter((r) => r.toLowerCase() !== repo.toLowerCase());
+      return { ...current, repos: (checked ? [...others, repo] : others).join("\n") };
+    });
   const tokenId = draft.tokenId || tokens[0]?.tokenId || "";
 
   const save = useMutation({
@@ -297,8 +389,10 @@ function WorkOrderFields({
       };
       if (editing) return apiClient.workOrders.update({ id: editing.id, ...fields });
       const created = await apiClient.workOrders.create(fields);
+      finished.current = true;
+      if (draftScope) clearWorkOrderDraft(draftScope);
       if (intent === "draft") {
-        toast.success(`${created.code} created as a draft`);
+        toast.success(`${created.code} saved as a draft`);
         return created;
       }
       try {
@@ -309,14 +403,14 @@ function WorkOrderFields({
           toast.success(`${offered.code} created: sign it in Documenso to send it to the builder`);
         } else {
           tab?.close();
-          toast.success(`${offered.code} created and offered to the builder`);
+          toast.success(`${offered.code} sent to the builder`);
         }
         await warnIfPayoutsUncovered(queryClient, apiClient, offered.id);
         return offered;
       } catch (err) {
         tab?.close();
         toast.error(
-          `${created.code} is saved as a draft but wasn't offered: ${(err as Error).message || "something went wrong"}`,
+          `${created.code} is saved as a draft but wasn't sent: ${(err as Error).message || "something went wrong"}`,
         );
         return created;
       }
@@ -335,17 +429,23 @@ function WorkOrderFields({
   const selectedBuilder = builders.find((b) => b.nearAccount === draft.builderNearAccount);
   const github = draft.githubLogin.trim().replace(/^@/, "");
   const badGithub = github !== "" && !GITHUB_LOGIN.test(github);
-  const badEmail = [draft.contractorEmail, draft.representativeEmail]
-    .map((e) => e.trim())
-    .find((e) => e !== "" && !EMAIL.test(e));
-  const badRepresentativeEmail =
-    draft.representativeEmail.trim() !== "" && !EMAIL.test(draft.representativeEmail.trim());
-  const [moreShown, setMoreOpen] = useState(!!editing || !!template);
-  const moreOpen = moreShown || badRepresentativeEmail;
-  const reason = !draft.projectId
-    ? "Choose a project."
-    : !draft.builderNearAccount
-      ? "Choose a builder."
+  const contractorEmail = draft.contractorEmail.trim();
+  const representativeEmail = draft.representativeEmail.trim();
+  const badContractorEmail = contractorEmail !== "" && !EMAIL.test(contractorEmail);
+  const badRepresentativeEmail = representativeEmail !== "" && !EMAIL.test(representativeEmail);
+  const badGrace = !/^\d+$/.test(draft.graceDays);
+  const builderChosen = draft.builderNearAccount !== "";
+  const githubInMain =
+    builderChosen && !selectedBuilder?.githubLogin && !builderDefaults?.githubLogin;
+  const emailInMain =
+    builderChosen &&
+    !!builderDefaults?.needsEmails &&
+    !builderDefaults.contractorEmail &&
+    !builderDefaults.accountEmail;
+  const reason = !draft.builderNearAccount
+    ? "Choose a builder."
+    : !draft.projectId
+      ? "Choose a project."
       : !draft.title.trim()
         ? "Give the work order a title."
         : repos.length === 0
@@ -356,18 +456,41 @@ function WorkOrderFields({
               ? "The period must end on or after its start."
               : !budgetAmount || amountError
                 ? amountError || "Enter the budget."
-                : !/^\d+$/.test(draft.graceDays)
+                : badGrace
                   ? "Grace days must be a whole number."
                   : badGithub
                     ? "The GitHub login has letters, digits and single dashes only."
-                    : badEmail
-                      ? `${badEmail} isn't an email address.`
-                      : null;
+                    : badContractorEmail
+                      ? `${contractorEmail} isn't an email address.`
+                      : badRepresentativeEmail
+                        ? `${representativeEmail} isn't an email address.`
+                        : null;
+  const checking = builderChosen && builderDefaultsQuery.isLoading;
+  const blocker = editing
+    ? null
+    : checking
+      ? { reason: "Checking the builder's details…", inDetails: false }
+      : sendBlocker({
+          githubLogin: github,
+          contractorEmail,
+          representativeEmail,
+          needsEmails: builderDefaults?.needsEmails ?? false,
+          accountEmail: builderDefaults?.accountEmail ?? false,
+        });
+  const detailsNeeded =
+    badGrace ||
+    badRepresentativeEmail ||
+    (badGithub && !githubInMain) ||
+    (badContractorEmail && !emailInMain) ||
+    (!reason && !!blocker?.inDetails);
+  const [detailsShown, setDetailsShown] = useState(!!editing || !!template);
+  const detailsOpen = detailsShown || detailsNeeded;
   const primary: Intent = editing ? "draft" : "sign";
   const [confirmingResign, setConfirmingResign] = useState(false);
   const resigns = !!editing && editing.status !== "draft";
   const submit = (intent: Intent, confirmed = false) => {
     if (reason || save.isPending) return;
+    if (intent === "sign" && blocker) return;
     if (resigns && !confirmed) {
       setConfirmingResign(true);
       return;
@@ -376,6 +499,37 @@ function WorkOrderFields({
     save.mutate({ intent, tab });
   };
 
+  const githubField = (
+    <Field
+      label="Builder's GitHub login"
+      htmlFor="wo-github"
+      helper={githubInMain ? "Not on their profile yet. Their work is found by it." : undefined}
+    >
+      <Input
+        id="wo-github"
+        placeholder="octocat"
+        value={draft.githubLogin}
+        aria-invalid={badGithub}
+        onChange={(e) => set("githubLogin", e.target.value)}
+      />
+    </Field>
+  );
+  const emailField = (
+    <Field
+      label="Builder's email"
+      htmlFor="wo-contractor-email"
+      helper={emailInMain ? "The signing request goes here." : "Where their work order emails go."}
+    >
+      <Input
+        id="wo-contractor-email"
+        type="email"
+        value={draft.contractorEmail}
+        aria-invalid={badContractorEmail}
+        onChange={(e) => set("contractorEmail", e.target.value)}
+      />
+    </Field>
+  );
+
   return (
     <form
       className="flex flex-col gap-4"
@@ -393,93 +547,115 @@ function WorkOrderFields({
       <DialogHeader>
         <DialogTitle>{formTitle(editing, template)}</DialogTitle>
         <DialogDescription>
-          A period, a budget cap and the repositories in scope for one builder on one project. It
-          starts as a draft; the builder accepts the terms from their own account.
+          One builder, one project: the repositories, a period and a budget cap. The builder accepts
+          the terms from their own account.
           {editing && editing.status !== "draft"
             ? " Changing a term sends it back to draft, so the builder accepts it again."
             : ""}
         </DialogDescription>
       </DialogHeader>
       {!editing && <SetupPreflight />}
+      {restored && (
+        <p className="flex flex-wrap items-center gap-1 text-xs text-muted-foreground">
+          Restored your unsent work order ·
+          <Button type="button" variant="link" size="xs" onClick={discard}>
+            Discard
+          </Button>
+        </p>
+      )}
       <FieldGroup>
         <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
-          <Field label="Project" htmlFor="wo-project">
-            <ChoiceSelect
-              id="wo-project"
-              value={draft.projectId}
-              placeholder="Choose a project"
-              onValueChange={(value) => {
-                const project = projects.find((p) => p.id === value);
-                setDraft((current) => ({
-                  ...current,
-                  projectId: value,
-                  repos: current.repos || repoFromProject(project?.repository),
-                }));
-              }}
-              options={projects.map((p) => ({ value: p.id, label: p.title }))}
-            />
-          </Field>
           <Field label="Builder" htmlFor="wo-builder" helper="Their NEAR account is paid.">
-            <ChoiceSelect
-              id="wo-builder"
-              value={draft.builderNearAccount}
-              placeholder="Choose a builder"
-              onValueChange={(value) => {
-                const builder = builders.find((b) => b.nearAccount === value);
-                setDraft((current) => ({
-                  ...current,
-                  builderNearAccount: value,
-                  githubLogin: builder?.githubLogin ?? "",
-                }));
-              }}
-              options={builders.map((b) => ({
-                value: b.nearAccount,
-                label: `${b.name ?? b.nearAccount}${b.githubLogin ? ` · @${b.githubLogin}` : " · no GitHub login"}`,
-              }))}
-            />
-          </Field>
-        </div>
-        <div className="grid gap-4 sm:grid-cols-[1fr_2fr] sm:items-start">
-          <Field
-            label="Code"
-            htmlFor="wo-code"
-            helper={
-              nextCodeQuery.data
-                ? `Optional, e.g. SI-004. Left empty it's ${nextCodeQuery.data.code}.`
-                : "Optional, e.g. SI-004. Default WO-0001…"
-            }
-          >
-            <Input
-              id="wo-code"
-              value={draft.code}
-              placeholder={editing ? undefined : nextCodeQuery.data?.code}
-              onChange={(e) => set("code", e.target.value)}
-            />
+            {builders.length === 0 || creatingBuilder ? (
+              <QuickCreateBuilder
+                onCancel={builders.length > 0 ? () => setCreatingBuilder(false) : undefined}
+                onCreated={(builder) => {
+                  setCreatingBuilder(false);
+                  setDraft((current) => ({
+                    ...current,
+                    builderNearAccount: builder.nearAccount,
+                    githubLogin: builder.githubLogin ?? "",
+                    contractorEmail: "",
+                  }));
+                }}
+              />
+            ) : (
+              <ChoiceSelect
+                id="wo-builder"
+                value={draft.builderNearAccount}
+                placeholder="Choose a builder"
+                onValueChange={(value) => {
+                  if (value === NEW_ITEM) {
+                    setCreatingBuilder(true);
+                    return;
+                  }
+                  const builder = builders.find((b) => b.nearAccount === value);
+                  setDraft((current) => ({
+                    ...current,
+                    builderNearAccount: value,
+                    githubLogin: builder?.githubLogin ?? "",
+                    contractorEmail: "",
+                  }));
+                }}
+                options={[
+                  ...builders.map((b) => ({
+                    value: b.nearAccount,
+                    label: `${b.name ?? b.nearAccount}${b.githubLogin ? ` · @${b.githubLogin}` : ""}`,
+                  })),
+                  { value: NEW_ITEM, label: "+ New builder" },
+                ]}
+              />
+            )}
           </Field>
-          <Field label="Title" htmlFor="wo-title">
-            <Input
-              id="wo-title"
-              value={draft.title}
-              onChange={(e) => set("title", e.target.value)}
-            />
+          <Field label="Project" htmlFor="wo-project">
+            {projects.length === 0 || creatingProject ? (
+              <QuickCreateProject
+                onCancel={projects.length > 0 ? () => setCreatingProject(false) : undefined}
+                onCreated={(project) => {
+                  setCreatingProject(false);
+                  setDraft((current) => ({
+                    ...current,
+                    projectId: project.id,
+                    repos: current.repos.trim()
+                      ? current.repos
+                      : repoFromProject(project.repository),
+                  }));
+                }}
+              />
+            ) : (
+              <ChoiceSelect
+                id="wo-project"
+                value={draft.projectId}
+                placeholder="Choose a project"
+                onValueChange={(value) => {
+                  if (value === NEW_ITEM) {
+                    setCreatingProject(true);
+                    return;
+                  }
+                  const project = projects.find((p) => p.id === value);
+                  setDraft((current) => ({
+                    ...current,
+                    projectId: value,
+                    repos: current.repos.trim()
+                      ? current.repos
+                      : repoFromProject(project?.repository),
+                  }));
+                }}
+                options={[
+                  ...projects.map((p) => ({ value: p.id, label: p.title })),
+                  { value: NEW_ITEM, label: "+ New project" },
+                ]}
+              />
+            )}
           </Field>
         </div>
-        <Field
-          label="Authorized work"
-          htmlFor="wo-scope"
-          helper="Optional. Shown to the builder with the terms."
-        >
-          <Textarea
-            id="wo-scope"
-            rows={3}
-            value={draft.scope}
-            onChange={(e) => set("scope", e.target.value)}
-          />
+        <Field label="Title" htmlFor="wo-title">
+          <Input id="wo-title" value={draft.title} onChange={(e) => set("title", e.target.value)} />
         </Field>
         <Field
           label="GitHub repositories"
           htmlFor="wo-repos"
-          helper="owner/name, one per line. Work counts once the repository owner approves or merges it."
+          helper="owner/name, one per line. Work counts once it's approved or merged."
         >
           <Textarea
             id="wo-repos"
@@ -487,8 +663,43 @@ function WorkOrderFields({
             value={draft.repos}
             onChange={(e) => set("repos", e.target.value)}
           />
+          {validRepos.length > 0 && (
+            <ul className="flex flex-wrap gap-x-3 gap-y-1 text-xs" aria-label="Repository links">
+              {validRepos.map((repo) => (
+                <li key={repo}>
+                  <a
+                    href={`https://github.com/${repo}`}
+                    target="_blank"
+                    rel="noreferrer"
+                    className="inline-flex items-center gap-1 text-muted-foreground underline underline-offset-4 hover:text-foreground"
+                  >
+                    {repo}
+                    <ArrowSquareOutIcon aria-hidden className="size-3" />
+                  </a>
+                </li>
+              ))}
+            </ul>
+          )}
+          {importingRepos ? (
+            <GithubRepoPicker
+              selected={repos}
+              onToggle={toggleRepo}
+              onClose={() => setImportingRepos(false)}
+            />
+          ) : (
+            <Button
+              type="button"
+              size="sm"
+              variant="outline"
+              className="self-start"
+              onClick={() => setImportingRepos(true)}
+            >
+              <GithubLogoIcon data-icon="inline-start" aria-hidden />
+              Import from GitHub
+            </Button>
+          )}
         </Field>
-        <div className="grid gap-4 sm:grid-cols-3 sm:items-start">
+        <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
           <Field label="Period start" htmlFor="wo-start">
             <Input
               id="wo-start"
@@ -505,14 +716,6 @@ function WorkOrderFields({
               onChange={(e) => set("periodEnd", e.target.value)}
             />
           </Field>
-          <Field label="Grace days" htmlFor="wo-grace" helper="For work merged just after.">
-            <Input
-              id="wo-grace"
-              inputMode="numeric"
-              value={draft.graceDays}
-              onChange={(e) => set("graceDays", e.target.value)}
-            />
-          </Field>
         </div>
         <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
           <Field label="Budget in" htmlFor="wo-token">
@@ -555,43 +758,18 @@ function WorkOrderFields({
             />
           </Field>
         </div>
-        <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
-          <Field
-            label="Builder's GitHub login"
-            htmlFor="wo-github"
-            helper={
-              selectedBuilder && !selectedBuilder.githubLogin
-                ? "Missing on their profile: add it here. Their work is found by it."
-                : "Their work is found by it. Part of the terms."
-            }
-          >
-            <Input
-              id="wo-github"
-              placeholder="octocat"
-              value={draft.githubLogin}
-              aria-invalid={badGithub}
-              onChange={(e) => set("githubLogin", e.target.value)}
-            />
-          </Field>
-          <Field
-            label="Builder's email"
-            htmlFor="wo-contractor-email"
-            helper="Where the work order emails go. Optional if they have a MultiAgency account."
-          >
-            <Input
-              id="wo-contractor-email"
-              type="email"
-              value={draft.contractorEmail}
-              onChange={(e) => set("contractorEmail", e.target.value)}
-            />
-          </Field>
-        </div>
+        {(githubInMain || emailInMain) && (
+          <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
+            {githubInMain && githubField}
+            {emailInMain && emailField}
+          </div>
+        )}
         {askFields.map((field) => (
           <Field
             key={field.tag}
             label={field.label}
             htmlFor={`wo-custom-${field.tag}`}
-            helper="Asked by your document template."
+            helper="Printed in your document."
           >
             <Input
               id={`wo-custom-${field.tag}`}
@@ -602,67 +780,112 @@ function WorkOrderFields({
             />
           </Field>
         ))}
-        <Collapsible open={moreOpen} onOpenChange={setMoreOpen}>
+        <Collapsible open={detailsOpen} onOpenChange={setDetailsShown}>
           <CollapsibleTrigger asChild>
-            <Button type="button" variant="ghost" size="sm" className="self-start px-0">
-              {moreOpen ? "Hide options" : "More options: representative, IP model, renewal"}
+            <Button type="button" variant="ghost" size="sm" className="self-start">
+              {detailsOpen ? "Hide details" : "Details"}
             </Button>
           </CollapsibleTrigger>
-          <CollapsibleContent className="flex flex-col gap-4 pt-2">
-            <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
+          <CollapsibleContent>
+            <div className="flex flex-col gap-4 pt-2">
+              <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
+                <Field
+                  label="Code"
+                  htmlFor="wo-code"
+                  helper={
+                    nextCodeQuery.data
+                      ? `Left empty it's ${nextCodeQuery.data.code}.`
+                      : "Left empty it's numbered for you."
+                  }
+                >
+                  <Input
+                    id="wo-code"
+                    value={draft.code}
+                    placeholder={editing ? undefined : nextCodeQuery.data?.code}
+                    onChange={(e) => set("code", e.target.value)}
+                  />
+                </Field>
+                <Field label="Grace days" htmlFor="wo-grace" helper="For work merged just after.">
+                  <Input
+                    id="wo-grace"
+                    inputMode="numeric"
+                    value={draft.graceDays}
+                    aria-invalid={badGrace}
+                    onChange={(e) => set("graceDays", e.target.value)}
+                  />
+                </Field>
+              </div>
               <Field
-                label="Representative"
-                htmlFor="wo-rep-name"
-                helper="Signs for the Agency; printed on the document."
+                label="Authorized work"
+                htmlFor="wo-scope"
+                helper="Shown to the builder with the terms."
               >
-                <Input
-                  id="wo-rep-name"
-                  value={draft.representativeName}
-                  onChange={(e) => set("representativeName", e.target.value)}
+                <Textarea
+                  id="wo-scope"
+                  rows={3}
+                  value={draft.scope}
+                  onChange={(e) => set("scope", e.target.value)}
                 />
               </Field>
-              <Field
-                label="Representative's email"
-                htmlFor="wo-rep-email"
-                helper="Agency emails (payout requested, signed, renewed) go only to this address."
-              >
-                <Input
-                  id="wo-rep-email"
-                  type="email"
-                  value={draft.representativeEmail}
-                  onChange={(e) => set("representativeEmail", e.target.value)}
+              {(!githubInMain || !emailInMain) && (
+                <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
+                  {!githubInMain && githubField}
+                  {!emailInMain && emailField}
+                </div>
+              )}
+              <div className="grid gap-4 sm:grid-cols-2 sm:items-start">
+                <Field label="Representative" htmlFor="wo-rep-name" helper="Signs for the Agency.">
+                  <Input
+                    id="wo-rep-name"
+                    value={draft.representativeName}
+                    onChange={(e) => set("representativeName", e.target.value)}
+                  />
+                </Field>
+                <Field
+                  label="Representative's email"
+                  htmlFor="wo-rep-email"
+                  helper="Agency emails go only here."
+                >
+                  <Input
+                    id="wo-rep-email"
+                    type="email"
+                    value={draft.representativeEmail}
+                    aria-invalid={badRepresentativeEmail || (!reason && !!blocker?.inDetails)}
+                    onChange={(e) => set("representativeEmail", e.target.value)}
+                  />
+                </Field>
+              </div>
+              <Field label="IP model" htmlFor="wo-ip" helper="Printed on the document.">
+                <ChoiceSelect
+                  id="wo-ip"
+                  value={draft.ipModel}
+                  emptyLabel="Not specified"
+                  onValueChange={(value) => set("ipModel", value)}
+                  options={IP_MODELS}
                 />
               </Field>
+              <ShadcnField orientation="horizontal">
+                <Checkbox
+                  id="wo-renew"
+                  checked={draft.autoRenew}
+                  onCheckedChange={(checked) => set("autoRenew", checked === true)}
+                />
+                <FieldLabel htmlFor="wo-renew" className="flex flex-col items-start">
+                  <span>Renew monthly when the base metrics are met</span>
+                  <span className="text-xs font-normal text-muted-foreground">
+                    Each period is measured at its end. All met: next month's work order starts by
+                    itself. Any missed: you decide. Part of the accepted terms.
+                  </span>
+                </FieldLabel>
+              </ShadcnField>
             </div>
-            <Field label="IP model" htmlFor="wo-ip" helper="Printed on the document.">
-              <ChoiceSelect
-                id="wo-ip"
-                value={draft.ipModel}
-                emptyLabel="Not specified"
-                onValueChange={(value) => set("ipModel", value)}
-                options={IP_MODELS}
-              />
-            </Field>
-            <ShadcnField orientation="horizontal">
-              <Checkbox
-                id="wo-renew"
-                checked={draft.autoRenew}
-                onCheckedChange={(checked) => set("autoRenew", checked === true)}
-              />
-              <FieldLabel htmlFor="wo-renew" className="flex flex-col items-start gap-0.5">
-                <span>Renew monthly when the base metrics are met</span>
-                <span className="text-xs font-normal text-muted-foreground">
-                  At the end of each period the work is measured. All met: next month's work order
-                  starts by itself. Any missed: you decide whether it renews. Part of the accepted
-                  terms.
-                </span>
-              </FieldLabel>
-            </ShadcnField>
           </CollapsibleContent>
         </Collapsible>
       </FieldGroup>
-      <DialogFooter className="flex-wrap items-center gap-3">
-        {reason && <p className="mr-auto text-xs text-muted-foreground">{reason}</p>}
+      <DialogFooter className="flex-wrap items-center">
+        {(reason ?? blocker?.reason) && (
+          <p className="mr-auto text-xs text-muted-foreground">{reason ?? blocker?.reason}</p>
+        )}
         {editing ? (
           <>
             <Button type="submit" value="draft" disabled={reason !== null || save.isPending}>
@@ -691,11 +914,11 @@ function WorkOrderFields({
               type="submit"
               value="sign"
               title="Ctrl or ⌘ + Enter"
-              disabled={reason !== null || save.isPending}
+              disabled={reason !== null || blocker !== null || save.isPending}
             >
               {save.isPending && save.variables?.intent === "sign"
-                ? "Creating…"
-                : "Create and sign"}
+                ? "Sending…"
+                : "Send for signature"}
             </Button>
           </>
         )}
diff --git a/ui/src/components/work-orders/work-order-key-facts.tsx b/ui/src/components/work-orders/work-order-key-facts.tsx
new file mode 100644
index 00000000..63e8f96d
--- /dev/null
+++ b/ui/src/components/work-orders/work-order-key-facts.tsx
@@ -0,0 +1,73 @@
+import type { ReactNode } from "react";
+import { Badge, Card, CardContent } from "@/components";
+import { formatTokenAmount } from "@/lib/format-amount";
+import { periodRange } from "@/lib/format-date";
+import { payeeConfirmedBySigning, type WorkOrderDetail } from "./work-order-status";
+
+function Fact({ label, value, detail }: { label: string; value: ReactNode; detail?: ReactNode }) {
+  return (
+    <div className="flex min-w-0 flex-col gap-0.5">
+      <dt className="text-xs text-muted-foreground">{label}</dt>
+      <dd className="min-w-0 truncate text-sm font-medium">{value}</dd>
+      {detail && <dd className="min-w-0 truncate text-xs text-muted-foreground">{detail}</dd>}
+    </div>
+  );
+}
+
+function PayoutAccount({ workOrder: wo }: { workOrder: WorkOrderDetail }) {
+  if (wo.payee.confirmedAt) return <Badge variant="success">Confirmed</Badge>;
+  if (wo.payee.paidBefore) return <Badge variant="outline">Paid before</Badge>;
+  if (payeeConfirmedBySigning(wo)) {
+    return <span className="text-muted-foreground">When they sign</span>;
+  }
+  if (wo.payee.needsConfirmation) return <Badge variant="warning">Not confirmed</Badge>;
+  return <span>Their NEAR account</span>;
+}
+
+export function WorkOrderKeyFacts({ workOrder: wo }: { workOrder: WorkOrderDetail }) {
+  const amount = (value: string) => formatTokenAmount(value, wo.tokenId);
+  const name = wo.builder.name ?? wo.builder.nearAccount;
+  const otherAccount = wo.payee.account !== wo.builder.nearAccount;
+  return (
+    <Card size="sm" aria-label="Key facts">
+      <CardContent>
+        <dl className="grid grid-cols-2 gap-x-6 gap-y-4 lg:grid-cols-4">
+          <Fact
+            label="Builder"
+            value={<span title={name}>{name}</span>}
+            detail={<span title={wo.builder.nearAccount}>{wo.builder.nearAccount}</span>}
+          />
+          <Fact
+            label="Period"
+            value={
+              <span title={`${wo.periodStart} → ${wo.periodEnd}`} className="tabular-nums">
+                {periodRange(wo.periodStart, wo.periodEnd)}
+              </span>
+            }
+            detail={wo.periodStart.slice(0, 4)}
+          />
+          <Fact
+            label="Budget"
+            value={
+              <span className="tabular-nums">
+                {amount(wo.committedAmount)} of {amount(wo.budgetAmount)}
+              </span>
+            }
+            detail={
+              <span className="tabular-nums">
+                {amount(wo.remainingAmount)} left · {amount(wo.paidAmount)} paid
+              </span>
+            }
+          />
+          <Fact
+            label="Payout account"
+            value={<PayoutAccount workOrder={wo} />}
+            detail={
+              otherAccount ? <span title={wo.payee.account}>{wo.payee.account}</span> : undefined
+            }
+          />
+        </dl>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/ui/src/components/work-orders/work-order-status.tsx b/ui/src/components/work-orders/work-order-status.tsx
index 4ed691d6..e380318d 100644
--- a/ui/src/components/work-orders/work-order-status.tsx
+++ b/ui/src/components/work-orders/work-order-status.tsx
@@ -39,6 +39,20 @@ const RENEWAL_STATUS: Record<Renewal["status"], { label: string; variant: BadgeV
   declined: { label: "Not renewed", variant: "secondary" },
 };
 
+export function payeeConfirmedBySigning(wo: WorkOrderDetail): boolean {
+  return (
+    wo.payee.needsConfirmation &&
+    (wo.status === "draft" || wo.status === "offered") &&
+    wo.signing.esign !== null
+  );
+}
+
+export function signedHow(method: WorkOrderDetail["signature"]["method"]): string {
+  if (method === "google_esign") return "E-signed in Google Docs";
+  if (method === "documenso") return "Signed in Documenso";
+  return "Accepted in MultiAgency";
+}
+
 export function WorkOrderStatusBadge({ status }: { status: WorkOrder["status"] }) {
   const { label, variant } = WORK_ORDER_STATUS[status];
   return <Badge variant={variant}>{label}</Badge>;
diff --git a/ui/src/components/work-orders/work-orders-card.tsx b/ui/src/components/work-orders/work-orders-card.tsx
index 9450a770..63a4b845 100644
--- a/ui/src/components/work-orders/work-orders-card.tsx
+++ b/ui/src/components/work-orders/work-orders-card.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { Link } from "@tanstack/react-router";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components";
 import { AdminError } from "@/components/admin-error";
 import { useApiClient } from "@/lib/api";
 import { formatTokenAmount } from "@/lib/format-amount";
@@ -9,10 +9,8 @@ import { RenewalBadge, WorkOrderStatusBadge } from "./work-order-status";
 
 export function WorkOrdersCard({
   filter,
-  description,
 }: {
   filter: { builderNearAccount: string } | { projectId: string };
-  description: string;
 }) {
   const apiClient = useApiClient();
   const query = useQuery({
@@ -30,7 +28,6 @@ export function WorkOrdersCard({
         <CardTitle>
           <h2>Work orders</h2>
         </CardTitle>
-        <CardDescription>{description}</CardDescription>
       </CardHeader>
       <CardContent>
         <ul className="flex flex-col divide-y">
diff --git a/ui/src/components/work-orders/work-orders-inbox.tsx b/ui/src/components/work-orders/work-orders-inbox.tsx
index 08d1d029..76ead8f1 100644
--- a/ui/src/components/work-orders/work-orders-inbox.tsx
+++ b/ui/src/components/work-orders/work-orders-inbox.tsx
@@ -9,6 +9,7 @@ import { Link, useNavigate } from "@tanstack/react-router";
 import { cn } from "cn";
 import { type MouseEvent, useMemo, useState } from "react";
 import { LoadError } from "@/components/load-error";
+import { ScrollableTabsList } from "@/components/scrollable-tabs-list";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -30,7 +31,7 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { Tabs, TabsTrigger } from "@/components/ui/tabs";
 import { type WorkOrder, WorkOrderStatusBadge } from "@/components/work-orders/work-order-status";
 import { formatTokenAmount } from "@/lib/format-amount";
 import { periodHint, periodRange } from "@/lib/format-date";
@@ -136,40 +137,35 @@ function NextStep({ workOrder }: { workOrder: WorkOrder }) {
   const { waitingOn, headline, since } = workOrder.progress;
   const ago = relativeSince(since);
   return (
-    <div className="flex min-w-0 flex-col items-start gap-1.5">
-      <div className="flex min-w-0 items-center gap-1.5 text-xs">
+    <div className="flex min-w-0 flex-col items-start gap-1">
+      <p
+        className={cn(
+          "line-clamp-2 text-pretty",
+          waitingOn === "you" ? "text-foreground" : "text-muted-foreground",
+        )}
+        title={headline}
+      >
+        {headline}
+      </p>
+      <div className="flex min-w-0 items-center gap-1.5 text-muted-foreground text-xs">
         <span
           aria-hidden
           className={cn("size-1.5 shrink-0 rounded-full", WAITING_DOT[waitingOn ?? "none"])}
         />
-        <span
-          className={cn(
-            "truncate font-medium",
-            waitingOn === "you" ? "text-primary" : "text-muted-foreground",
-          )}
-        >
+        <span className={cn("truncate", waitingOn === "you" && "font-medium text-primary")}>
           {waitingText(workOrder)}
         </span>
         {ago && since && (
           <time
             dateTime={since}
             title={new Date(since).toLocaleString()}
-            className="shrink-0 text-muted-foreground tabular-nums"
+            className="shrink-0 tabular-nums"
           >
             · {ago}
           </time>
         )}
       </div>
-      <p
-        className={cn(
-          "line-clamp-2 text-pretty",
-          waitingOn === "you" ? "text-foreground" : "text-muted-foreground",
-        )}
-        title={headline}
-      >
-        {headline}
-      </p>
-      <div className="empty:hidden">
+      <div className="mt-1 empty:hidden">
         <NextAction workOrder={workOrder} />
       </div>
     </div>
@@ -195,9 +191,14 @@ function BuilderCell({ workOrder }: { workOrder: WorkOrder }) {
         <span className="truncate" title={name}>
           {name}
         </span>
-        <span className="truncate text-muted-foreground text-xs" title={workOrder.projectTitle}>
-          {workOrder.projectTitle}
-        </span>
+        {name !== workOrder.builder.nearAccount && (
+          <span
+            className="truncate text-muted-foreground text-xs"
+            title={workOrder.builder.nearAccount}
+          >
+            {workOrder.builder.nearAccount}
+          </span>
+        )}
       </div>
     </div>
   );
@@ -214,7 +215,7 @@ function PeriodCell({ workOrder }: { workOrder: WorkOrder }) {
       >
         {periodRange(workOrder.periodStart, workOrder.periodEnd)}
       </span>
-      {hint && <span className="text-muted-foreground text-xs">{hint}</span>}
+      {hint && <span className="whitespace-nowrap text-muted-foreground text-xs">{hint}</span>}
     </div>
   );
 }
@@ -233,7 +234,7 @@ function Committed({ workOrder, bar = true }: { workOrder: WorkOrder; bar?: bool
         {formatTokenAmount(workOrder.committedAmount, workOrder.tokenId)}
         <span className="text-muted-foreground">
           {" "}
-          / {formatTokenAmount(workOrder.budgetAmount, workOrder.tokenId)}
+          of {formatTokenAmount(workOrder.budgetAmount, workOrder.tokenId)}
         </span>
       </span>
       {bar && (
@@ -259,23 +260,23 @@ function InboxTable({ rows }: { rows: WorkOrder[] }) {
       <Table className="table-fixed">
         <TableHeader>
           <TableRow className="bg-muted/30 hover:bg-muted/30">
-            <TableHead scope="col" className="w-[24%] pl-4 text-muted-foreground text-xs">
+            <TableHead scope="col" className="w-[28%] pl-4 text-muted-foreground text-xs">
               Work order
             </TableHead>
-            <TableHead scope="col" className="w-[36%] text-muted-foreground text-xs">
+            <TableHead scope="col" className="w-[32%] text-muted-foreground text-xs">
               Next step
             </TableHead>
-            <TableHead scope="col" className="w-[18%] text-muted-foreground text-xs">
+            <TableHead scope="col" className="w-[16%] text-muted-foreground text-xs">
               Builder
             </TableHead>
             <TableHead
               scope="col"
-              className="hidden w-[11%] text-muted-foreground text-xs lg:table-cell"
+              className="hidden w-[12%] text-muted-foreground text-xs lg:table-cell"
             >
               Period
             </TableHead>
-            <TableHead scope="col" className="w-[11%] pr-4 text-muted-foreground text-xs">
-              Committed
+            <TableHead scope="col" className="w-[12%] pr-4 text-muted-foreground text-xs">
+              Budget
             </TableHead>
           </TableRow>
         </TableHeader>
@@ -295,9 +296,15 @@ function InboxTable({ rows }: { rows: WorkOrder[] }) {
                     <CodeLink workOrder={workOrder} />
                     <StatusLine workOrder={workOrder} />
                   </div>
-                  <span className="truncate text-muted-foreground" title={workOrder.title}>
+                  <span className="line-clamp-2 text-pretty" title={workOrder.title}>
                     {workOrder.title}
                   </span>
+                  <span
+                    className="truncate text-muted-foreground text-xs"
+                    title={workOrder.projectTitle}
+                  >
+                    {workOrder.projectTitle}
+                  </span>
                 </div>
               </TableCell>
               <TableCell className="whitespace-normal py-3.5">
@@ -399,27 +406,23 @@ export function WorkOrdersInbox({
 
   return (
     <div className="flex min-w-0 flex-col gap-3">
-      <div className="flex flex-col gap-2 lg:flex-row lg:items-center lg:justify-between">
-        <ToggleGroup
-          type="single"
-          variant="outline"
-          size="sm"
-          spacing={1}
+      <div className="flex flex-col gap-2 lg:flex-row lg:items-end lg:justify-between">
+        <Tabs
           value={active}
           onValueChange={(value) => {
             if (isInboxView(value)) onViewChange(value);
           }}
-          aria-label="Show work orders"
-          className="flex-wrap"
         >
-          {INBOX_VIEWS.map((v) => (
-            <ToggleGroupItem key={v} value={v} className="gap-1.5">
-              {INBOX_VIEW_LABELS[v]}
-              <span className="text-muted-foreground tabular-nums">{counts[v]}</span>
-            </ToggleGroupItem>
-          ))}
-        </ToggleGroup>
-        <InputGroup className="w-full lg:w-64">
+          <ScrollableTabsList aria-label="Show work orders">
+            {INBOX_VIEWS.map((v) => (
+              <TabsTrigger key={v} value={v}>
+                {INBOX_VIEW_LABELS[v]}
+                <span className="text-muted-foreground tabular-nums">{counts[v]}</span>
+              </TabsTrigger>
+            ))}
+          </ScrollableTabsList>
+        </Tabs>
+        <InputGroup className="w-full lg:mb-2 lg:w-56">
           <InputGroupAddon>
             <MagnifyingGlassIcon aria-hidden />
           </InputGroupAddon>
diff --git a/ui/src/lib/navigation.ts b/ui/src/lib/navigation.ts
index 660e2fe1..1e378f57 100644
--- a/ui/src/lib/navigation.ts
+++ b/ui/src/lib/navigation.ts
@@ -3,7 +3,7 @@ import { prepaymentsEnabled } from "@/lib/prepayments";
 
 export type WorkspaceRole = "owner" | "admin" | "member";
 
-export type NavItem = { to: string; label: string; match?: string };
+export type NavItem = { to: string; label: string; match?: string; exact?: boolean };
 
 export type NavGroup = { title: string; items: NavItem[] };
 
@@ -37,7 +37,7 @@ export function resolveView(
 }
 
 export function viewHome(view: WorkspaceView): string {
-  return view === "client" ? "/client/projects" : "/admin/projects";
+  return view === "client" ? "/client/projects" : "/admin";
 }
 
 export const CLIENT_ADMIN_PATHS = ["/admin/members"];
@@ -69,6 +69,7 @@ export function workspaceNavigation(
     {
       title: "Work",
       items: [
+        { to: "/admin", label: "Home", exact: true },
         { to: "/admin/projects", label: "Projects" },
         { to: "/admin/reports", label: "Reports" },
       ],
diff --git a/ui/src/lib/queries.ts b/ui/src/lib/queries.ts
index 8a2261e0..385bee56 100644
--- a/ui/src/lib/queries.ts
+++ b/ui/src/lib/queries.ts
@@ -903,3 +903,27 @@ export async function invalidateWorkspaceQueries(
     router.invalidate(),
   ]);
 }
+
+export function workOrderBuilderDefaultsQueryOptions(apiClient: ApiClient, nearAccount: string) {
+  return queryOptions({
+    queryKey: [
+      ...adminWorkOrdersQueryKey,
+      "builder-defaults",
+      ...workspaceKey(),
+      nearAccount,
+    ] as const,
+    queryFn: () => apiClient.workOrders.builderDefaults({ nearAccount }),
+    enabled: nearAccount !== "",
+    retry: false,
+  });
+}
+
+export function workOrderGithubReposQueryOptions(apiClient: ApiClient, org: string) {
+  return queryOptions({
+    queryKey: [...adminWorkOrdersQueryKey, "github-repos", org.toLowerCase()] as const,
+    queryFn: () => apiClient.workOrders.githubRepos({ org }),
+    enabled: org !== "",
+    staleTime: 10 * 60_000,
+    retry: false,
+  });
+}
diff --git a/ui/src/lib/setup-status.ts b/ui/src/lib/setup-status.ts
index 415a6710..615a8423 100644
--- a/ui/src/lib/setup-status.ts
+++ b/ui/src/lib/setup-status.ts
@@ -6,7 +6,7 @@ export type SetupState = SetupCheck["state"];
 
 export function setupSummary(checks: SetupCheck[]) {
   const counted = checks.filter((c) => c.required || c.state !== "optional");
-  const blocking = checks.filter((c) => c.required && c.state === "missing");
+  const blocking = checks.filter((c) => c.required && c.state === "missing" && c.fixHref !== null);
   return {
     done: counted.filter((c) => c.state === "ok").length,
     total: counted.length,
@@ -16,6 +16,14 @@ export function setupSummary(checks: SetupCheck[]) {
   };
 }
 
+export function splitOptional(checks: SetupCheck[]) {
+  const quiet = (c: SetupCheck) => !c.required && (c.state === "ok" || c.state === "optional");
+  return {
+    main: checks.filter((c) => !quiet(c)),
+    optional: checks.filter(quiet),
+  };
+}
+
 export function fixTarget(href: string): { path: string; hash: string | null } {
   const at = href.indexOf("#");
   if (at === -1) return { path: href, hash: null };
diff --git a/ui/src/lib/work-order-defaults.ts b/ui/src/lib/work-order-defaults.ts
index 1374d8d2..7948dbf6 100644
--- a/ui/src/lib/work-order-defaults.ts
+++ b/ui/src/lib/work-order-defaults.ts
@@ -99,3 +99,42 @@ export function recentBudgets(
   }
   return choices;
 }
+
+const GITHUB_REPO = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
+
+export function repoFromProject(repository: string | null | undefined): string {
+  if (!repository) return "";
+  const match = /^(?:https?:\/\/)?(?:www\.)?github\.com\/([^/#?\s]+)\/([^/#?\s]+)/i.exec(
+    repository.trim(),
+  );
+  if (!match) return "";
+  const repo = `${match[1]}/${match[2]?.replace(/\.git$/i, "")}`;
+  return GITHUB_REPO.test(repo) ? repo : "";
+}
+
+export type SendCheck = {
+  githubLogin: string;
+  contractorEmail: string;
+  representativeEmail: string;
+  needsEmails: boolean;
+  accountEmail: boolean;
+};
+
+export type SendBlocker = { reason: string; inDetails: boolean };
+
+export function sendBlocker(check: SendCheck): SendBlocker | null {
+  if (!check.githubLogin.trim()) {
+    return { reason: "Add the builder's GitHub login to send it.", inDetails: false };
+  }
+  if (!check.needsEmails) return null;
+  if (!check.contractorEmail.trim() && !check.accountEmail) {
+    return {
+      reason: "Add the builder's email: the signing request goes to them.",
+      inDetails: false,
+    };
+  }
+  if (!check.representativeEmail.trim()) {
+    return { reason: "Add the representative's email under Details.", inDetails: true };
+  }
+  return null;
+}
diff --git a/ui/src/lib/work-order-draft.ts b/ui/src/lib/work-order-draft.ts
new file mode 100644
index 00000000..378b301e
--- /dev/null
+++ b/ui/src/lib/work-order-draft.ts
@@ -0,0 +1,67 @@
+export type StoredWorkOrderDraft<T> = { draft: T; custom: Record<string, string> };
+
+export type WorkOrderDraftScope = {
+  userId: string;
+  network: string;
+  organizationId: string | null;
+};
+
+const PREFIX = "work-order-draft:";
+
+export function workOrderDraftKey(scope: WorkOrderDraftScope): string {
+  return `${PREFIX}${scope.network}:${scope.userId}:${scope.organizationId ?? "personal"}`;
+}
+
+export function readWorkOrderDraft<T extends object>(
+  scope: WorkOrderDraftScope,
+): StoredWorkOrderDraft<T> | null {
+  try {
+    const raw = localStorage.getItem(workOrderDraftKey(scope));
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as Partial<StoredWorkOrderDraft<T>> | null;
+    if (!parsed || typeof parsed.draft !== "object" || parsed.draft === null) return null;
+    const custom =
+      parsed.custom && typeof parsed.custom === "object"
+        ? Object.fromEntries(
+            Object.entries(parsed.custom).filter(
+              (entry): entry is [string, string] => typeof entry[1] === "string",
+            ),
+          )
+        : {};
+    return { draft: parsed.draft, custom };
+  } catch {
+    return null;
+  }
+}
+
+export function writeWorkOrderDraft<T>(
+  scope: WorkOrderDraftScope,
+  value: StoredWorkOrderDraft<T>,
+): void {
+  try {
+    localStorage.setItem(workOrderDraftKey(scope), JSON.stringify(value));
+  } catch {}
+}
+
+export function clearWorkOrderDraft(scope: WorkOrderDraftScope): void {
+  try {
+    localStorage.removeItem(workOrderDraftKey(scope));
+  } catch {}
+}
+
+export function clearAllWorkOrderDrafts(): void {
+  try {
+    const keys = Array.from({ length: localStorage.length }, (_, i) => localStorage.key(i));
+    for (const key of keys) {
+      if (key?.startsWith(PREFIX)) localStorage.removeItem(key);
+    }
+  } catch {}
+}
+
+export function mergeStoredDraft<T extends Record<string, unknown>>(fresh: T, stored: object): T {
+  const merged: Record<string, unknown> = { ...fresh };
+  for (const [key, value] of Object.entries(stored)) {
+    if (key in fresh && typeof value === typeof fresh[key]) merged[key] = value;
+  }
+  return merged as T;
+}
diff --git a/ui/src/lib/work-orders-inbox.ts b/ui/src/lib/work-orders-inbox.ts
index 7e3659a7..48b18305 100644
--- a/ui/src/lib/work-orders-inbox.ts
+++ b/ui/src/lib/work-orders-inbox.ts
@@ -19,7 +19,7 @@ export type InboxItem = {
 
 export const INBOX_VIEW_LABELS: Record<InboxView, string> = {
   "needs-you": "Needs you",
-  builder: "Waiting on builder",
+  builder: "With builder",
   "in-progress": "In progress",
   done: "Done",
   all: "All",
diff --git a/ui/src/routes/_layout/_authenticated/admin/contributors/$nearAccount.tsx b/ui/src/routes/_layout/_authenticated/admin/contributors/$nearAccount.tsx
index 51343307..26cba9b7 100644
--- a/ui/src/routes/_layout/_authenticated/admin/contributors/$nearAccount.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/contributors/$nearAccount.tsx
@@ -7,7 +7,6 @@ import {
   Button,
   Card,
   CardContent,
-  CardDescription,
   CardHeader,
   CardTitle,
   DataTable,
@@ -170,11 +169,7 @@ function ContributorDetailPage() {
         <PageHeader
           className="min-w-0 flex-1"
           title={contributor.name ?? nearAccount}
-          description={
-            contributor.name
-              ? `${nearAccount} · profile, project assignments and billing history.`
-              : "Profile, project assignments and billing history."
-          }
+          description={contributor.name ? nearAccount : undefined}
         />
         {contributor.githubLogin && <VerifiedGithub login={contributor.githubLogin} />}
         {contributorQuery.data?.canDelete && (
@@ -191,26 +186,20 @@ function ContributorDetailPage() {
       ) : (
         <p className="text-sm text-muted-foreground">
           {contributor.githubLogin
-            ? "This builder is a member of the contribution board, which verifies their identity, so only they or a platform admin can edit their profile."
-            : "This builder manages their own profile, so only they or a platform admin can edit it."}
+            ? "Verified on the contribution board. Only they or a platform admin can edit this profile."
+            : "Only they or a platform admin can edit this profile."}
         </p>
       )}
 
       <BuilderSummaryPanel billings={billings} projectCount={assignments.length} />
 
-      <WorkOrdersCard
-        filter={{ builderNearAccount: nearAccount }}
-        description="Their terms on each project: period, budget cap and what's committed."
-      />
+      <WorkOrdersCard filter={{ builderNearAccount: nearAccount }} />
 
       <Card>
         <CardHeader>
           <CardTitle>
             <h2>Projects</h2>
           </CardTitle>
-          <CardDescription>
-            Projects this builder is assigned to in your Organization.
-          </CardDescription>
         </CardHeader>
         <CardContent>
           <DataTable
@@ -229,7 +218,6 @@ function ContributorDetailPage() {
           <CardTitle>
             <h2>Billings</h2>
           </CardTitle>
-          <CardDescription>Every billing recorded for this builder.</CardDescription>
         </CardHeader>
         <CardContent>
           <DataTable
diff --git a/ui/src/routes/_layout/_authenticated/admin/contributors/index.tsx b/ui/src/routes/_layout/_authenticated/admin/contributors/index.tsx
index 8cb9ebc4..f74114ed 100644
--- a/ui/src/routes/_layout/_authenticated/admin/contributors/index.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/contributors/index.tsx
@@ -31,10 +31,7 @@ function AdminContributorsPage() {
 
   return (
     <div className="flex flex-col gap-6">
-      <PageHeader
-        title="Builders"
-        description="People who do project work. Assign them from a project page; manage profiles and applications here."
-      />
+      <PageHeader title="Builders" description="People who do project work." />
 
       <Tabs
         value={activeTab}
diff --git a/ui/src/routes/_layout/_authenticated/admin/index.tsx b/ui/src/routes/_layout/_authenticated/admin/index.tsx
index 783e0e17..8e2a1182 100644
--- a/ui/src/routes/_layout/_authenticated/admin/index.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/index.tsx
@@ -1,7 +1,74 @@
-import { createFileRoute, redirect } from "@tanstack/react-router";
+import { useQuery } from "@tanstack/react-query";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { useMemo, useState } from "react";
+import { Button, Dialog, DialogContent, PageHeader } from "@/components";
+import { InProgressList, WaitingOnYouList } from "@/components/home/home-work-order-lists";
+import { activeWorkOrders, waitingOnYou } from "@/components/home/home-work-orders";
+import { SetupChecklist } from "@/components/work-orders/setup-checklist";
+import { WorkOrderForm } from "@/components/work-orders/work-order-form";
+import { useMeRoles } from "@/hooks/use-me-roles";
+import { useApiClient } from "@/lib/api";
+import { adminWorkOrdersQueryOptions, workOrderSetupQueryOptions } from "@/lib/queries";
+import { setupSummary } from "@/lib/setup-status";
 
 export const Route = createFileRoute("/_layout/_authenticated/admin/")({
-  beforeLoad: () => {
-    throw redirect({ to: "/admin/projects" });
-  },
+  head: () => ({
+    meta: [{ title: "Home" }, { name: "description", content: "What needs you next." }],
+  }),
+  component: HomePage,
 });
+
+function HomePage() {
+  const apiClient = useApiClient();
+  const navigate = useNavigate();
+  const { canAccessAdmin: canManage } = useMeRoles();
+  const query = useQuery(adminWorkOrdersQueryOptions(apiClient));
+  const setup = useQuery({ ...workOrderSetupQueryOptions(apiClient), enabled: canManage });
+  const [creating, setCreating] = useState(false);
+
+  const workOrders = query.data?.data ?? [];
+  const waiting = useMemo(() => waitingOnYou(workOrders), [workOrders]);
+  const active = useMemo(() => activeWorkOrders(workOrders), [workOrders]);
+  const setupPending = canManage && !!setup.data && !setupSummary(setup.data).ready;
+
+  return (
+    <div className="flex flex-col gap-8">
+      <PageHeader
+        title="Home"
+        actions={
+          canManage && (
+            <Button size="sm" onClick={() => setCreating(true)}>
+              New work order
+            </Button>
+          )
+        }
+      />
+      {setupPending && <SetupChecklist compact />}
+
+      <WaitingOnYouList
+        workOrders={waiting}
+        isLoading={query.isLoading}
+        error={query.error}
+        onRetry={() => void query.refetch()}
+      />
+
+      {!query.error && <InProgressList workOrders={active} />}
+
+      <Dialog open={creating} onOpenChange={setCreating}>
+        <DialogContent
+          className="max-h-[90vh] overflow-y-auto sm:max-w-2xl"
+          onInteractOutside={(event) => event.preventDefault()}
+        >
+          {creating && (
+            <WorkOrderForm
+              onDone={(workOrder) => {
+                setCreating(false);
+                void navigate({ to: "/admin/work-orders/$id", params: { id: workOrder.id } });
+              }}
+            />
+          )}
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+}
diff --git a/ui/src/routes/_layout/_authenticated/admin/members.tsx b/ui/src/routes/_layout/_authenticated/admin/members.tsx
index 63de68d0..36f59684 100644
--- a/ui/src/routes/_layout/_authenticated/admin/members.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/members.tsx
@@ -14,7 +14,7 @@ function AdminMembersPage() {
     <div className="flex flex-col gap-6">
       <PageHeader
         title="Team"
-        description="People in this Organization, invited by email as owner, admin or member. Not the same as builders (project workers) or clients (paying customers)."
+        description="People who run this Organization. Builders and clients are listed separately."
       />
       <MembersAdminSection />
     </div>
diff --git a/ui/src/routes/_layout/_authenticated/admin/projects/$slug.tsx b/ui/src/routes/_layout/_authenticated/admin/projects/$slug.tsx
index 706b6b48..4a07e3f6 100644
--- a/ui/src/routes/_layout/_authenticated/admin/projects/$slug.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/projects/$slug.tsx
@@ -172,7 +172,6 @@ function AdminProjectDetail() {
                 <CardTitle>
                   <h2>Overview</h2>
                 </CardTitle>
-                <CardDescription>Key facts about this project.</CardDescription>
               </CardHeader>
               <CardContent className="flex flex-col gap-4">
                 <dl className="grid gap-4 text-sm sm:grid-cols-3">
@@ -234,10 +233,7 @@ function AdminProjectDetail() {
           ) : agencyDao ? (
             <div className="flex flex-col gap-6">
               <ProjectBudgetPanel projectId={project.id} showAgencyBudgetLink />
-              <WorkOrdersCard
-                filter={{ projectId: project.id }}
-                description="Builders contracted on this project: each work order's budget cap and what's committed under it."
-              />
+              <WorkOrdersCard filter={{ projectId: project.id }} />
             </div>
           ) : null}
         </TabsContent>
@@ -250,7 +246,6 @@ function AdminProjectDetail() {
                   <CardTitle>
                     <h2>NEARN listing</h2>
                   </CardTitle>
-                  <CardDescription>The public bounty this project tracks on NEARN.</CardDescription>
                 </CardHeader>
                 <CardContent>
                   <NearnSnapshot slug={project.nearnListingId} nearnSponsor={nearnSponsor} />
@@ -507,7 +502,7 @@ function DeleteProjectSection({
       toast.success(`Project @${projectSlug} deleted`);
       navigate({ to: "/work" });
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to delete project"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't delete the project"),
   });
 
   return (
@@ -517,9 +512,8 @@ function DeleteProjectSection({
           <h2>Delete this project</h2>
         </CardTitle>
         <CardDescription>
-          Removes the project with its builder assignments and listings. A project shared with a
-          Client, or with budget entries or billings, keeps its history: archive it instead. This
-          cannot be undone.
+          This cannot be undone. Projects with money history or shared with a Client can only be
+          archived.
         </CardDescription>
       </CardHeader>
       <CardFooter className="justify-end">
diff --git a/ui/src/routes/_layout/_authenticated/admin/projects/index.tsx b/ui/src/routes/_layout/_authenticated/admin/projects/index.tsx
index 1b1bdff8..6e7d0ea6 100644
--- a/ui/src/routes/_layout/_authenticated/admin/projects/index.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/projects/index.tsx
@@ -23,10 +23,7 @@ export const Route = createFileRoute("/_layout/_authenticated/admin/projects/")(
 function AdminProjectsPage() {
   return (
     <div className="flex flex-col gap-6">
-      <PageHeader
-        title="Projects"
-        description="Each project holds the team, budget and billings for work you deliver to clients."
-      />
+      <PageHeader title="Projects" description="Team, budget and billings for client work." />
       <ProjectsAdminSection />
       <SharedWithUsSection />
     </div>
diff --git a/ui/src/routes/_layout/_authenticated/admin/settings.tsx b/ui/src/routes/_layout/_authenticated/admin/settings.tsx
index 6ab6df78..a400b9f6 100644
--- a/ui/src/routes/_layout/_authenticated/admin/settings.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/settings.tsx
@@ -58,29 +58,26 @@ export const Route = createFileRoute("/_layout/_authenticated/admin/settings")({
 function AdminSettingsPage() {
   return (
     <div className="flex flex-col gap-6">
-      <PageHeader
-        title="Settings"
-        description="Your Organization's identity, treasury and public Agency details."
-      />
+      <PageHeader title="Settings" />
       <SetupChecklist compact />
       <SettingsSection
         id="organization"
         title="Organization"
-        description="The name and slug an Agency uses to propose an Engagement to you."
+        description="Name and slug Agencies use to reach you."
       >
         <OrganizationIdentity />
       </SettingsSection>
       <SettingsSection
         id="treasury"
         title="Treasury"
-        description="The Agency DAO that funds your Projects' budgets and billings."
+        description="The DAO that funds your Projects."
       >
         <TreasurySettings />
       </SettingsSection>
       <SettingsSection
         id="work-orders"
         title="Work orders: documents and email"
-        description="Default representative, Google Docs template, Drive folders, e-signature and emails."
+        description="Representative, template, Drive and emails."
       >
         <div className="flex flex-col gap-4">
           <WorkOrderRepresentativeSettings />
@@ -90,18 +87,18 @@ function AdminSettingsPage() {
       <SettingsSection
         id="work-order-approval"
         title="Automatic approval"
-        description="How much builders' trust lets compensation requests skip your approval."
+        description="When requests skip your approval."
       >
         <WorkOrderTrustSettings />
       </SettingsSection>
       <SettingsSection
         id="payouts"
         title="Automatic payouts (NEAR Intents)"
-        description="The payout agent: rules, monthly budget, balance and top-ups."
+        description="Rules, monthly budget, balance and top-ups."
       >
         <PayoutAgentSettings />
       </SettingsSection>
-      <SettingsSection id="agency" title="Agency details" description="Your public Agency profile.">
+      <SettingsSection id="agency" title="Agency details" description="Your public profile.">
         <AdminSettings />
       </SettingsSection>
     </div>
@@ -141,10 +138,7 @@ function OrganizationIdentity() {
           <CardTitle>
             <h2>Organization</h2>
           </CardTitle>
-          <CardDescription>
-            An Agency needs this slug and the exact name to propose an Engagement to your
-            Organization. Builders see the name in every work order email.
-          </CardDescription>
+          <CardDescription>Builders see this name in every work order email.</CardDescription>
         </CardHeader>
         <CardContent className="flex flex-col gap-4">
           {canManage ? (
@@ -288,7 +282,7 @@ function SettingsForm({
       toast.success("Settings updated");
       void refreshAfter(queryClient, { type: "settings" });
     },
-    onError: (err: Error) => toast.error(err.message || "Failed to update settings"),
+    onError: (err: Error) => toast.error(err.message || "Couldn't save"),
   });
 
   const form = useForm({
@@ -330,9 +324,7 @@ function SettingsForm({
         <CardTitle>
           <h2>Agency details</h2>
         </CardTitle>
-        <CardDescription>
-          Public details for the {data.network} deployment, saved to this workspace's settings.
-        </CardDescription>
+        <CardDescription>Public details for {data.network}.</CardDescription>
       </CardHeader>
       <form
         className="flex flex-col gap-4"
diff --git a/ui/src/routes/_layout/_authenticated/admin/work-orders/$id.tsx b/ui/src/routes/_layout/_authenticated/admin/work-orders/$id.tsx
index 6096811c..98bfd742 100644
--- a/ui/src/routes/_layout/_authenticated/admin/work-orders/$id.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/work-orders/$id.tsx
@@ -3,7 +3,6 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { createFileRoute, Link, useNavigate } from "@tanstack/react-router";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
-import { z } from "zod";
 import {
   Badge,
   Button,
@@ -37,7 +36,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { ActivityTimeline } from "@/components/work-orders/activity-timeline";
-import { DuplicateWorkOrderButton } from "@/components/work-orders/duplicate-work-order-button";
 import { EvidenceList } from "@/components/work-orders/evidence-list";
 import { type InPageAction, NextStepCard } from "@/components/work-orders/next-step-card";
 import { PayeePayoutsPrompt } from "@/components/work-orders/payee-payouts-prompt";
@@ -47,25 +45,37 @@ import { RenewalPanel } from "@/components/work-orders/renewal-panel";
 import { RequestsPanel } from "@/components/work-orders/requests-panel";
 import { SigningPanel } from "@/components/work-orders/signing-panel";
 import { WorkOrderForm } from "@/components/work-orders/work-order-form";
+import { WorkOrderKeyFacts } from "@/components/work-orders/work-order-key-facts";
 import {
   RenewalBadge,
+  signedHow,
   type WorkOrderDetail,
   WorkOrderStatusBadge,
 } from "@/components/work-orders/work-order-status";
 import { useMeRoles } from "@/hooks/use-me-roles";
 import { useApiClient } from "@/lib/api";
-import { formatTokenAmount } from "@/lib/format-amount";
 import { dateTime } from "@/lib/format-date";
 import { warnIfPayoutsUncovered } from "@/lib/payout-coverage";
 import { adminWorkOrderQueryOptions, adminWorkOrdersQueryKey } from "@/lib/queries";
 
-const WORK_ORDER_TABS = ["overview", "documents", "payouts", "evidence", "activity"] as const;
+const WORK_ORDER_TABS = ["overview", "payouts", "documents"] as const;
 type WorkOrderTab = (typeof WORK_ORDER_TABS)[number];
 
+const LEGACY_TABS: Record<string, WorkOrderTab> = {
+  evidence: "documents",
+  activity: "overview",
+};
+
+function workOrderTabOf(value: unknown): WorkOrderTab | undefined {
+  if (typeof value !== "string") return undefined;
+  if ((WORK_ORDER_TABS as readonly string[]).includes(value)) return value as WorkOrderTab;
+  return LEGACY_TABS[value];
+}
+
 export const Route = createFileRoute("/_layout/_authenticated/admin/work-orders/$id")({
   head: () => ({ meta: [{ title: "Work order" }] }),
-  validateSearch: z.object({
-    tab: z.enum(WORK_ORDER_TABS).optional().catch(undefined),
+  validateSearch: (search: Record<string, unknown>): { tab?: WorkOrderTab } => ({
+    tab: workOrderTabOf(search.tab),
   }),
   component: WorkOrderPage,
 });
@@ -92,6 +102,7 @@ function WorkOrderPage() {
   const [editing, setEditing] = useState(false);
   const [confirming, setConfirming] = useState<null | "terminate" | "delete">(null);
   const [documenting, setDocumenting] = useState(false);
+  const [duplicating, setDuplicating] = useState(false);
   const [approveRequestId, setApproveRequestId] = useState<string | null>(null);
   const [scrollTo, setScrollTo] = useState<string | null>(null);
   const clearApprove = useCallback(() => setApproveRequestId(null), []);
@@ -159,11 +170,11 @@ function WorkOrderPage() {
   const editable = canManage && ["draft", "offered", "accepted"].includes(wo.status);
   const payable = ["active", "ended", "exhausted"].includes(wo.status);
   const deletable = wo.status === "draft" || wo.status === "offered";
-  const terminable = !deletable && wo.status !== "terminated";
+  const terminable = wo.status !== "draft" && wo.status !== "terminated";
   const nextKind = progress.next?.kind ?? null;
   const showOffer = wo.status === "draft" && nextKind !== "offer";
   const showActivate = wo.status === "accepted" && nextKind !== "activate";
-  const hasMore = payable || deletable || terminable;
+  const blocked = act.isPending || wo.activationBlockers.length > 0;
 
   const onAction = (action: InPageAction) => {
     if (action.kind === "offer") act.mutate("offer");
@@ -199,74 +210,58 @@ function WorkOrderPage() {
         actions={
           canManage && (
             <>
-              {showOffer && (
-                <Button
-                  size="sm"
-                  variant="outline"
-                  disabled={act.isPending}
-                  onClick={() => act.mutate("offer")}
-                >
-                  Offer to the builder
-                </Button>
-              )}
-              {showActivate && (
-                <Button
-                  size="sm"
-                  variant="outline"
-                  disabled={act.isPending || wo.activationBlockers.length > 0}
-                  onClick={() => act.mutate("activate")}
-                >
-                  Activate now
-                </Button>
-              )}
-              <DuplicateWorkOrderButton workOrder={wo} />
               {editable && (
                 <Button size="sm" variant="outline" onClick={() => setEditing(true)}>
                   Edit
                 </Button>
               )}
-              {hasMore && (
-                <DropdownMenu>
-                  <DropdownMenuTrigger asChild>
-                    <Button size="sm" variant="ghost" aria-label="More actions">
-                      <DotsThreeIcon weight="bold" aria-hidden />
-                      More
-                    </Button>
-                  </DropdownMenuTrigger>
-                  <DropdownMenuContent align="end" className="w-48">
-                    {payable && (
-                      <DropdownMenuItem
-                        disabled={act.isPending}
-                        onSelect={() => act.mutate("collect")}
-                      >
-                        Collect evidence now
-                      </DropdownMenuItem>
-                    )}
-                    {payable && (deletable || terminable) && <DropdownMenuSeparator />}
-                    {deletable && (
-                      <DropdownMenuItem
-                        variant="destructive"
-                        onSelect={() => setConfirming("delete")}
-                      >
-                        Delete
-                      </DropdownMenuItem>
-                    )}
-                    {terminable && (
-                      <DropdownMenuItem
-                        variant="destructive"
-                        onSelect={() => setConfirming("terminate")}
-                      >
-                        Terminate
-                      </DropdownMenuItem>
-                    )}
-                  </DropdownMenuContent>
-                </DropdownMenu>
-              )}
+              <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                  <Button size="sm" variant="ghost" aria-label="More actions">
+                    <DotsThreeIcon weight="bold" aria-hidden />
+                    More
+                  </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" className="w-48">
+                  {showOffer && (
+                    <DropdownMenuItem disabled={act.isPending} onSelect={() => act.mutate("offer")}>
+                      Offer to the builder
+                    </DropdownMenuItem>
+                  )}
+                  {showActivate && (
+                    <DropdownMenuItem disabled={blocked} onSelect={() => act.mutate("activate")}>
+                      Activate now
+                    </DropdownMenuItem>
+                  )}
+                  <DropdownMenuItem onSelect={() => setDuplicating(true)}>
+                    Duplicate
+                  </DropdownMenuItem>
+                  {(deletable || terminable) && <DropdownMenuSeparator />}
+                  {deletable && (
+                    <DropdownMenuItem
+                      variant="destructive"
+                      onSelect={() => setConfirming("delete")}
+                    >
+                      {wo.status === "offered" ? "Withdraw and delete" : "Delete"}
+                    </DropdownMenuItem>
+                  )}
+                  {terminable && (
+                    <DropdownMenuItem
+                      variant="destructive"
+                      onSelect={() => setConfirming("terminate")}
+                    >
+                      Terminate
+                    </DropdownMenuItem>
+                  )}
+                </DropdownMenuContent>
+              </DropdownMenu>
             </>
           )
         }
       />
 
+      <WorkOrderKeyFacts workOrder={wo} />
+
       <ProgressStepper progress={progress} />
 
       <NextStepCard
@@ -283,13 +278,11 @@ function WorkOrderPage() {
       <Tabs value={activeTab} onValueChange={(value) => selectTab(value as WorkOrderTab)}>
         <ScrollableTabsList>
           <TabsTrigger value="overview">Overview</TabsTrigger>
-          <TabsTrigger value="documents">Documents & signatures</TabsTrigger>
           <TabsTrigger value="payouts">
             Payouts
             {wo.waiting > 0 && <Badge className="ml-1">{wo.waiting}</Badge>}
           </TabsTrigger>
-          <TabsTrigger value="evidence">Evidence</TabsTrigger>
-          <TabsTrigger value="activity">Activity</TabsTrigger>
+          <TabsTrigger value="documents">Documents</TabsTrigger>
         </ScrollableTabsList>
 
         <TabsContent value="overview" className="flex flex-col gap-6">
@@ -297,14 +290,7 @@ function WorkOrderPage() {
           <div id="work-order-renewal" className="scroll-mt-4 empty:hidden">
             <RenewalPanel workOrder={wo} canManage={canManage} />
           </div>
-        </TabsContent>
-
-        <TabsContent value="documents" className="flex flex-col gap-6">
-          <SigningPanel
-            workOrder={wo}
-            canManage={canManage}
-            onAttach={() => setDocumenting(true)}
-          />
+          <ActivityTimeline workOrder={wo} />
         </TabsContent>
 
         <TabsContent value="payouts" className="flex flex-col gap-6">
@@ -321,14 +307,19 @@ function WorkOrderPage() {
               <CardContent>
                 <Empty
                   label="No payouts yet."
-                  description="Payout requests start once the work order is active."
+                  description="They start once the work order is active."
                 />
               </CardContent>
             </Card>
           )}
         </TabsContent>
 
-        <TabsContent value="evidence" className="flex flex-col gap-6">
+        <TabsContent value="documents" className="flex flex-col gap-6">
+          <SigningPanel
+            workOrder={wo}
+            canManage={canManage}
+            onAttach={() => setDocumenting(true)}
+          />
           <Card>
             <CardHeader>
               <CardTitle>
@@ -336,7 +327,7 @@ function WorkOrderPage() {
               </CardTitle>
               <CardDescription>
                 {wo.lastCollectedAt
-                  ? `Collected from GitHub on ${dateTime(wo.lastCollectedAt)}. It's collected again every 6 hours.`
+                  ? `From GitHub, last collected ${dateTime(wo.lastCollectedAt)}.`
                   : "Collected from GitHub once the work order is active."}
               </CardDescription>
               {canManage && payable && (
@@ -357,10 +348,6 @@ function WorkOrderPage() {
             </CardContent>
           </Card>
         </TabsContent>
-
-        <TabsContent value="activity" className="flex flex-col gap-6">
-          <ActivityTimeline workOrder={wo} />
-        </TabsContent>
       </Tabs>
 
       <Dialog open={editing} onOpenChange={setEditing}>
@@ -371,6 +358,22 @@ function WorkOrderPage() {
           {editing && <WorkOrderForm editing={wo} onDone={() => setEditing(false)} />}
         </DialogContent>
       </Dialog>
+      <Dialog open={duplicating} onOpenChange={setDuplicating}>
+        <DialogContent
+          className="max-h-[90vh] overflow-y-auto sm:max-w-2xl"
+          onInteractOutside={(event) => event.preventDefault()}
+        >
+          {duplicating && (
+            <WorkOrderForm
+              template={wo}
+              onDone={(created) => {
+                setDuplicating(false);
+                void navigate({ to: "/admin/work-orders/$id", params: { id: created.id } });
+              }}
+            />
+          )}
+        </DialogContent>
+      </Dialog>
       <Dialog open={documenting} onOpenChange={setDocumenting}>
         <DialogContent className="sm:max-w-lg">
           {documenting && <DocumentForm workOrder={wo} onDone={() => setDocumenting(false)} />}
@@ -379,15 +382,29 @@ function WorkOrderPage() {
       <ConfirmDialog
         open={confirming !== null}
         onOpenChange={(open) => !open && setConfirming(null)}
-        title={confirming === "delete" ? `Delete ${wo.code}?` : `Terminate ${wo.code}?`}
+        title={
+          confirming === "delete"
+            ? wo.status === "offered"
+              ? `Withdraw and delete ${wo.code}?`
+              : `Delete ${wo.code}?`
+            : `Terminate ${wo.code}?`
+        }
         description={
           confirming === "delete"
             ? wo.status === "offered"
-              ? `It was already sent to ${wo.builder.name ?? wo.builder.nearAccount}; their signing link stops working.`
+              ? `It was already sent to ${wo.builder.name ?? wo.builder.nearAccount}; their signing link stops working and the record is removed.`
               : "The draft is removed. The builder hasn't started work under it."
-            : "Nothing more can be approved or paid under it. Requests already linked to a DAO proposal keep their billing."
+            : wo.status === "offered"
+              ? `The offer is withdrawn: ${wo.builder.name ?? wo.builder.nearAccount}'s signing link stops working. The record is kept as terminated, and nothing can be approved or paid under it.`
+              : "Nothing more can be approved or paid under it. Requests already linked to a DAO proposal keep their billing."
+        }
+        confirmLabel={
+          confirming === "delete"
+            ? wo.status === "offered"
+              ? "Withdraw and delete"
+              : "Delete"
+            : "Terminate"
         }
-        confirmLabel={confirming === "delete" ? "Delete" : "Terminate"}
         destructive
         onConfirm={() =>
           act.mutateAsync(confirming === "delete" ? "delete" : "terminate").then(() => undefined)
@@ -400,23 +417,8 @@ function WorkOrderPage() {
 function Summary({ workOrder: wo }: { workOrder: WorkOrderDetail }) {
   const rows: [string, React.ReactNode][] = [
     [
-      "Builder",
-      <span key="b">
-        {wo.builder.name ?? wo.builder.nearAccount}{" "}
-        <span className="text-muted-foreground">
-          · paid to {wo.builder.nearAccount}
-          {wo.builder.githubLogin ? ` · @${wo.builder.githubLogin}` : " · no GitHub login"}
-        </span>
-      </span>,
-    ],
-    ["Project", wo.projectTitle],
-    [
-      "Period",
-      `${wo.periodStart} → ${wo.periodEnd} (+ ${wo.graceDays} grace days), days end at midnight ${wo.timeZone}`,
-    ],
-    [
-      "Budget",
-      `${formatTokenAmount(wo.budgetAmount, wo.tokenId)} cap · ${formatTokenAmount(wo.committedAmount, wo.tokenId)} committed · ${formatTokenAmount(wo.paidAmount, wo.tokenId)} paid · ${formatTokenAmount(wo.remainingAmount, wo.tokenId)} left`,
+      "Schedule",
+      `${wo.graceDays} grace ${wo.graceDays === 1 ? "day" : "days"} after ${wo.periodEnd}; days end at midnight ${wo.timeZone}`,
     ],
     [
       "Repositories",
@@ -443,10 +445,13 @@ function Summary({ workOrder: wo }: { workOrder: WorkOrderDetail }) {
       </ul>,
     ],
     ...(wo.scope ? ([["Authorized work", wo.scope]] as [string, React.ReactNode][]) : []),
+    ...(wo.ipModel
+      ? ([["IP model", wo.ipModel.replace("_", " ")]] as [string, React.ReactNode][])
+      : []),
     [
       "Terms",
       wo.acceptedAt
-        ? `${wo.signature.method === "google_esign" ? "E-signed" : "Accepted by the builder"} on ${wo.acceptedAt.slice(0, 10)}${wo.termsChanged ? " (changed since)" : ""}`
+        ? `${wo.signature.method ? signedHow(wo.signature.method) : "Accepted by the builder"} on ${wo.acceptedAt.slice(0, 10)}${wo.termsChanged ? " (changed since)" : ""}`
         : wo.offeredAt
           ? `Offered on ${wo.offeredAt.slice(0, 10)}, waiting for the builder`
           : "Not offered yet",
@@ -474,8 +479,8 @@ function Summary({ workOrder: wo }: { workOrder: WorkOrderDetail }) {
           <h2>Terms</h2>
         </CardTitle>
         <CardDescription>
-          A contribution counts once the repository owner approves or merges its pull request on
-          GitHub. The budget is a maximum, not a guarantee.
+          Work counts once the repo owner approves or merges it. The budget is a cap, not a
+          guarantee.
         </CardDescription>
         {wo.waiting > 0 && (
           <CardAction>
@@ -538,8 +543,7 @@ function DocumentForm({ workOrder, onDone }: { workOrder: WorkOrderDetail; onDon
       <DialogHeader>
         <DialogTitle>Signed document</DialogTitle>
         <DialogDescription>
-          Optional legal record. Pick the signed PDF to fingerprint it in your browser (the file
-          isn't uploaded), and link where it's stored.
+          Optional. The PDF is fingerprinted in your browser, not uploaded.
         </DialogDescription>
       </DialogHeader>
       <Field label="Signed PDF" htmlFor="doc-file">
diff --git a/ui/src/routes/_layout/_authenticated/admin/work-orders/index.tsx b/ui/src/routes/_layout/_authenticated/admin/work-orders/index.tsx
index b9437b68..bb427a38 100644
--- a/ui/src/routes/_layout/_authenticated/admin/work-orders/index.tsx
+++ b/ui/src/routes/_layout/_authenticated/admin/work-orders/index.tsx
@@ -48,7 +48,7 @@ function WorkOrdersPage() {
     <div className="flex flex-col gap-8">
       <PageHeader
         title="Work orders"
-        description="A work order sets what a builder works on, for how long and up to what budget. Work counts once it's approved or merged on GitHub, and approved requests are paid by your payout agent or through your Agency DAO."
+        description="What each builder works on, for how long and up to what budget."
         actions={newWorkOrder}
       />
       {canManage && <SetupChecklist />}
diff --git a/ui/src/routes/_layout/_authenticated/profile.tsx b/ui/src/routes/_layout/_authenticated/profile.tsx
index 2479ed3b..ed61037c 100644
--- a/ui/src/routes/_layout/_authenticated/profile.tsx
+++ b/ui/src/routes/_layout/_authenticated/profile.tsx
@@ -28,6 +28,7 @@ import { SignInMethods } from "@/components/sign-in-methods";
 import { sessionQueryKey, sessionQueryOptions } from "@/lib/auth";
 import { realEmail } from "@/lib/membership";
 import { type NearProfile, nearProfileQueryOptions } from "@/lib/near-profile";
+import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export const Route = createFileRoute("/_layout/_authenticated/profile")({
   head: () => ({
@@ -66,6 +67,7 @@ function ProfilePage() {
   const signOutMutation = useMutation({
     mutationFn: () => authClient.signOut(),
     onSuccess: async () => {
+      clearAllWorkOrderDrafts();
       queryClient.setQueryData(sessionQueryKey, null);
       await queryClient.invalidateQueries({ queryKey: sessionQueryKey });
       navigate({ to: "/", replace: true });
diff --git a/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx b/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
index cce722c9..538d79ee 100644
--- a/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
+++ b/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
@@ -1,5 +1,6 @@
+import { UserSwitchIcon } from "@phosphor-icons/react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { createFileRoute, Link, useBlocker } from "@tanstack/react-router";
+import { createFileRoute, Link, useBlocker, useNavigate } from "@tanstack/react-router";
 import { useState } from "react";
 import { toast } from "sonner";
 import {
@@ -13,9 +14,16 @@ import {
   CardDescription,
   CardHeader,
   CardTitle,
+  EmptyContent,
+  EmptyDescription,
+  EmptyHeader,
+  EmptyMedia,
+  Empty as EmptyState,
+  EmptyTitle,
   FieldGroup,
   Input,
   PageHeader,
+  Spinner,
   Textarea,
 } from "@/components";
 import { AdminError } from "@/components/admin-error";
@@ -27,9 +35,12 @@ import { ReportMarkdown } from "@/components/work-orders/report-markdown";
 import {
   type CompensationRequest,
   RequestStatusBadge,
+  signedHow,
   WorkOrderStatusBadge,
 } from "@/components/work-orders/work-order-status";
+import { refreshAfterAccountChange } from "@/lib/account";
 import { type ApiClient, useApiClient } from "@/lib/api";
+import { useAuthClient } from "@/lib/auth";
 import {
   baseToDecimal,
   formatTokenAmount,
@@ -38,6 +49,7 @@ import {
 } from "@/lib/format-amount";
 import { dateTime } from "@/lib/format-date";
 import { myWorkOrderQueryOptions, myWorkOrdersQueryKey } from "@/lib/queries";
+import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export const Route = createFileRoute("/_layout/_authenticated/work-orders/$id")({
   head: () => ({ meta: [{ title: "Work order" }] }),
@@ -80,7 +92,13 @@ function MyWorkOrderPage() {
     onError: (err: Error) => toast.error(err.message || "Couldn't draft a request"),
   });
 
-  if (query.isError) return <AdminError error={query.error} />;
+  if (query.isError) {
+    return isNotFound(query.error) ? (
+      <NotYourWorkOrder id={id} />
+    ) : (
+      <AdminError error={query.error} />
+    );
+  }
   if (!query.data) return <Loading label="Loading the work order" />;
   const wo = query.data;
   const payable = ["active", "ended", "exhausted"].includes(wo.status);
@@ -114,8 +132,8 @@ function MyWorkOrderPage() {
           <AlertTitle>Confirm your payout account</AlertTitle>
           <AlertDescription className="flex flex-col gap-3">
             <span>
-              {wo.agencyName} hasn't paid {wo.payee.account} before. You're signed in with that NEAR
-              account, so confirming proves it's yours. It's free and moves no money.
+              {wo.agencyName} hasn't paid {wo.payee.account} before. Confirming is free and moves no
+              money.
             </span>
             <Button
               size="sm"
@@ -135,8 +153,8 @@ function MyWorkOrderPage() {
             <h2>Terms</h2>
           </CardTitle>
           <CardDescription>
-            Work counts once the repository owner approves or merges your pull request on GitHub.
-            The budget is a maximum, not a guarantee.
+            Work counts once the repo owner approves or merges it. The budget is a cap, not a
+            guarantee.
           </CardDescription>
         </CardHeader>
         <CardContent>
@@ -179,11 +197,7 @@ function MyWorkOrderPage() {
               </>
             )}
             <dt className="text-muted-foreground">Monthly renewal</dt>
-            <dd>
-              {wo.autoRenew
-                ? "Renews by itself each month when the base metrics are met; otherwise the Agency decides."
-                : "No"}
-            </dd>
+            <dd>{wo.autoRenew ? "Yes, when the base metrics are met" : "No"}</dd>
             <dt className="text-muted-foreground">Payee</dt>
             <dd>
               {wo.builder.nearAccount}
@@ -200,10 +214,7 @@ function MyWorkOrderPage() {
               <>
                 <dt className="text-muted-foreground">Signed</dt>
                 <dd>
-                  {wo.signature.method === "google_esign"
-                    ? "E-signed in Google Docs"
-                    : "Accepted here"}{" "}
-                  on {wo.signature.signedAt?.slice(0, 10)}
+                  {signedHow(wo.signature.method)} on {wo.signature.signedAt?.slice(0, 10)}
                   {wo.documentUrl ? (
                     <>
                       {" · "}
@@ -233,8 +244,7 @@ function MyWorkOrderPage() {
               <h2>Compensation requests</h2>
             </CardTitle>
             <CardDescription>
-              At the end of each period a request is drafted from your GitHub work. Write your
-              assessment, add work GitHub can't see, set the amount and submit it.
+              Drafted from your GitHub work at the end of each period.
             </CardDescription>
             {payable &&
               !openDraft &&
@@ -283,9 +293,7 @@ function MyWorkOrderPage() {
               <h2>Your work on GitHub</h2>
             </CardTitle>
             <CardDescription>
-              {wo.lastCollectedAt
-                ? `Last collected ${dateTime(wo.lastCollectedAt)}.`
-                : "Collected every 6 hours."}
+              {wo.lastCollectedAt ? `Last collected ${dateTime(wo.lastCollectedAt)}.` : null}
             </CardDescription>
           </CardHeader>
           <CardContent>
@@ -307,6 +315,62 @@ function MyWorkOrderPage() {
   );
 }
 
+function isNotFound(error: unknown): boolean {
+  return (
+    typeof error === "object" &&
+    error !== null &&
+    (error as { code?: unknown }).code === "NOT_FOUND"
+  );
+}
+
+function NotYourWorkOrder({ id }: { id: string }) {
+  const authClient = useAuthClient();
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const switchAccount = useMutation({
+    mutationFn: async () => {
+      const { error } = await authClient.signOut();
+      if (error) throw new Error(error.message ?? "Failed to sign out");
+      await authClient.near.disconnect().catch(() => {});
+    },
+    onSuccess: async () => {
+      clearAllWorkOrderDrafts();
+      await refreshAfterAccountChange(queryClient, authClient);
+      void navigate({ to: "/sign-in", search: { redirect: `/work-orders/${id}` }, replace: true });
+    },
+    onError: (err: Error) => toast.error(err.message),
+  });
+  return (
+    <EmptyState variant="outline">
+      <EmptyHeader>
+        <EmptyMedia variant="icon">
+          <UserSwitchIcon aria-hidden />
+        </EmptyMedia>
+        <EmptyTitle>Work order not available</EmptyTitle>
+        <EmptyDescription>
+          This work order isn't available to the account you're signed in with. Sign in with the
+          NEAR account it was sent to.
+        </EmptyDescription>
+      </EmptyHeader>
+      <EmptyContent>
+        <div className="flex flex-wrap justify-center gap-2">
+          <Button
+            size="sm"
+            disabled={switchAccount.isPending}
+            onClick={() => switchAccount.mutate()}
+          >
+            {switchAccount.isPending && <Spinner data-icon="inline-start" />}
+            {switchAccount.isPending ? "Signing out…" : "Switch account"}
+          </Button>
+          <Button asChild variant="outline" size="sm">
+            <Link to="/dashboard">My work</Link>
+          </Button>
+        </div>
+      </EmptyContent>
+    </EmptyState>
+  );
+}
+
 function SubmittedRequest({
   request,
   tokenId,
diff --git a/ui/tests/home-work-orders.test.ts b/ui/tests/home-work-orders.test.ts
new file mode 100644
index 00000000..1c9a5a14
--- /dev/null
+++ b/ui/tests/home-work-orders.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+import { activeWorkOrders, waitingOnYou } from "../src/components/home/home-work-orders";
+
+type Waiting = "you" | "builder" | "system" | "dao" | null;
+
+const order = (
+  code: string,
+  status: string,
+  needsYou: boolean,
+  waitingOn: Waiting,
+  since: string,
+) => ({
+  code,
+  status,
+  progress: { needsYou, waitingOn, since, headline: code },
+});
+
+const orders = [
+  order("WO-1", "active", false, "system", "2026-01-03"),
+  order("WO-2", "offered", true, "you", "2026-01-02"),
+  order("WO-3", "offered", false, "builder", "2026-01-01"),
+  order("WO-4", "ended", false, null, "2026-01-01"),
+  order("WO-5", "active", true, "you", "2026-01-01"),
+];
+
+describe("home work orders", () => {
+  it("lists only work orders waiting on you, oldest first", () => {
+    expect(waitingOnYou(orders).map((o) => o.code)).toEqual(["WO-5", "WO-2"]);
+  });
+
+  it("lists a few active work orders, leaving out the ones waiting on you and the finished ones", () => {
+    expect(activeWorkOrders(orders).map((o) => o.code)).toEqual(["WO-3", "WO-1"]);
+    expect(activeWorkOrders(orders, 1).map((o) => o.code)).toEqual(["WO-3"]);
+  });
+});
diff --git a/ui/tests/landing.test.ts b/ui/tests/landing.test.ts
index 5c0999de..10576d98 100644
--- a/ui/tests/landing.test.ts
+++ b/ui/tests/landing.test.ts
@@ -31,7 +31,7 @@ describe("organizationToActivate", () => {
 describe("organizationHome", () => {
   const none = { canManageMembers: false, hasAgencySections: false, hasClientSections: false };
 
-  test("owners and admins land on the Agency admin sections", () => {
+  test("owners and admins land on the Agency Home", () => {
     expect(organizationHome({ ...none, canManageMembers: true, hasAgencySections: true })).toBe(
       "/admin",
     );
@@ -45,6 +45,12 @@ describe("organizationHome", () => {
     expect(organizationHome({ ...none, hasClientSections: true })).toBe("/client/projects");
   });
 
+  test("a recommended Client view lands on shared Projects", () => {
+    expect(
+      organizationHome({ ...none, hasAgencySections: true, hasClientSections: true }, "client"),
+    ).toBe("/client/projects");
+  });
+
   test("users without sections land on My work", () => {
     expect(organizationHome(none)).toBe("/dashboard");
   });
diff --git a/ui/tests/navigation.test.ts b/ui/tests/navigation.test.ts
index f8fed676..6a3fddfc 100644
--- a/ui/tests/navigation.test.ts
+++ b/ui/tests/navigation.test.ts
@@ -5,6 +5,7 @@ import {
   clientEngagementSections,
   resolveView,
   viewForPath,
+  viewHome,
   workspaceNavigation,
 } from "../src/lib/navigation";
 import { prepaymentsEnabled } from "../src/lib/prepayments";
@@ -22,7 +23,7 @@ describe("workspaceNavigation", () => {
       "owner",
       false,
       false,
-      ["Projects", "Reports", "Engagements", "Builders", "Work orders", "Team", "Settings"],
+      ["Home", "Projects", "Reports", "Engagements", "Builders", "Work orders", "Team", "Settings"],
     ],
     [
       "money only with an Agency DAO",
@@ -30,6 +31,7 @@ describe("workspaceNavigation", () => {
       true,
       false,
       [
+        "Home",
         "Projects",
         "Reports",
         "Engagements",
@@ -46,7 +48,7 @@ describe("workspaceNavigation", () => {
       "member",
       true,
       true,
-      ["Projects", "Reports", "Builders", "Work orders", "Billings", "Budgets"],
+      ["Home", "Projects", "Reports", "Builders", "Work orders", "Billings", "Budgets"],
     ],
   ] as const)("gives %s", (_, role, hasAgencyDao, hasClientSections, expected) => {
     expect(
@@ -70,6 +72,14 @@ describe("workspaceNavigation", () => {
     ]);
   });
 
+  it("puts Home first in the Agency Work group and matches it exactly", () => {
+    const [work] = workspaceNavigation(
+      { role: "member", hasAgencyDao: false, hasAgencySections: true, hasClientSections: false },
+      "agency",
+    );
+    expect(work.items[0]).toEqual({ to: "/admin", label: "Home", exact: true });
+  });
+
   it("leaves Team out of the client screens for members", () => {
     expect(
       labels(
@@ -102,6 +112,11 @@ describe("viewing role", () => {
     expect(viewForPath("/admin/members")).toBeNull();
     expect(viewForPath("/dashboard")).toBeNull();
   });
+
+  it("sends each view to its home", () => {
+    expect(viewHome("agency")).toBe("/admin");
+    expect(viewHome("client")).toBe("/client/projects");
+  });
 });
 
 describe("clientEngagementSections", () => {
diff --git a/ui/tests/setup-status.test.ts b/ui/tests/setup-status.test.ts
index 2b5b213c..852d2a31 100644
--- a/ui/tests/setup-status.test.ts
+++ b/ui/tests/setup-status.test.ts
@@ -1,5 +1,11 @@
 import { describe, expect, it } from "vitest";
-import { fixTarget, type SetupCheck, setupDismissKey, setupSummary } from "@/lib/setup-status";
+import {
+  fixTarget,
+  type SetupCheck,
+  setupDismissKey,
+  setupSummary,
+  splitOptional,
+} from "@/lib/setup-status";
 
 const check = (over: Partial<SetupCheck>): SetupCheck => ({
   key: "k",
@@ -15,7 +21,11 @@ describe("setupSummary", () => {
   it("counts required checks and optional ones that are set up", () => {
     const summary = setupSummary([
       check({ key: "agency_name" }),
-      check({ key: "representative", state: "missing" }),
+      check({
+        key: "representative",
+        state: "missing",
+        fixHref: "/admin/settings#work-orders",
+      }),
       check({ key: "signing", state: "warning" }),
       check({ key: "google", state: "optional", required: false }),
       check({ key: "payouts_agent", required: false }),
@@ -38,6 +48,29 @@ describe("setupSummary", () => {
     ]);
     expect(summary.ready).toBe(true);
   });
+
+  it("flags server settings an agency can't fix without blocking", () => {
+    const summary = setupSummary([
+      check({ key: "agency_name", fixHref: null }),
+      check({ key: "email", state: "missing", fixHref: null }),
+    ]);
+    expect(summary.ready).toBe(true);
+    expect(summary.blocking).toEqual([]);
+    expect(summary.attention.map((c) => c.key)).toEqual(["email"]);
+  });
+});
+
+describe("splitOptional", () => {
+  it("tucks away optional checks unless they need attention", () => {
+    const { main, optional } = splitOptional([
+      check({ key: "agency_name" }),
+      check({ key: "google", state: "optional", required: false }),
+      check({ key: "payouts_agent", required: false }),
+      check({ key: "payouts_funding", state: "warning", required: false }),
+    ]);
+    expect(main.map((c) => c.key)).toEqual(["agency_name", "payouts_funding"]);
+    expect(optional.map((c) => c.key)).toEqual(["google", "payouts_agent"]);
+  });
 });
 
 describe("fixTarget", () => {
diff --git a/ui/tests/work-order-defaults.test.ts b/ui/tests/work-order-defaults.test.ts
index d723affd..ad5205f5 100644
--- a/ui/tests/work-order-defaults.test.ts
+++ b/ui/tests/work-order-defaults.test.ts
@@ -4,6 +4,8 @@ import {
   defaultPeriod,
   duplicateTitle,
   recentBudgets,
+  repoFromProject,
+  sendBlocker,
   todayIn,
 } from "../src/lib/work-order-defaults";
 
@@ -99,3 +101,51 @@ describe("recentBudgets", () => {
     expect(recentBudgets([])).toEqual([]);
   });
 });
+
+describe("repoFromProject", () => {
+  test("reads owner/name from a GitHub URL", () => {
+    expect(repoFromProject("https://github.com/near/multiagency")).toBe("near/multiagency");
+    expect(repoFromProject("https://github.com/near/multiagency.git")).toBe("near/multiagency");
+    expect(repoFromProject("https://www.github.com/near/app/tree/main")).toBe("near/app");
+  });
+
+  test("is empty for anything that isn't a GitHub repository", () => {
+    expect(repoFromProject(null)).toBe("");
+    expect(repoFromProject("https://gitlab.com/near/app")).toBe("");
+    expect(repoFromProject("https://github.com/near")).toBe("");
+    expect(repoFromProject("not a url")).toBe("");
+  });
+});
+
+describe("sendBlocker", () => {
+  const ready = {
+    githubLogin: "octocat",
+    contractorEmail: "b@example.com",
+    representativeEmail: "r@example.com",
+    needsEmails: true,
+    accountEmail: false,
+  };
+
+  test("lets a complete work order through", () => {
+    expect(sendBlocker(ready)).toBeNull();
+  });
+
+  test("needs a GitHub login", () => {
+    expect(sendBlocker({ ...ready, githubLogin: " " })?.reason).toMatch(/GitHub login/);
+  });
+
+  test("needs the builder's email only with e-signature and no account email", () => {
+    expect(sendBlocker({ ...ready, contractorEmail: "" })?.reason).toMatch(/builder's email/);
+    expect(sendBlocker({ ...ready, contractorEmail: "", accountEmail: true })).toBeNull();
+    expect(
+      sendBlocker({ ...ready, contractorEmail: "", representativeEmail: "", needsEmails: false }),
+    ).toBeNull();
+  });
+
+  test("points to Details for the representative's email", () => {
+    expect(sendBlocker({ ...ready, representativeEmail: "" })).toEqual({
+      reason: expect.stringMatching(/representative's email/),
+      inDetails: true,
+    });
+  });
+});
diff --git a/ui/tests/work-order-draft.test.ts b/ui/tests/work-order-draft.test.ts
new file mode 100644
index 00000000..cbc515e1
--- /dev/null
+++ b/ui/tests/work-order-draft.test.ts
@@ -0,0 +1,89 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import {
+  clearAllWorkOrderDrafts,
+  clearWorkOrderDraft,
+  mergeStoredDraft,
+  readWorkOrderDraft,
+  workOrderDraftKey,
+  writeWorkOrderDraft,
+} from "../src/lib/work-order-draft";
+
+function memoryStorage() {
+  const items = new Map<string, string>();
+  return {
+    getItem: (key: string) => items.get(key) ?? null,
+    setItem: (key: string, value: string) => void items.set(key, value),
+    removeItem: (key: string) => void items.delete(key),
+    key: (index: number) => [...items.keys()][index] ?? null,
+    get length() {
+      return items.size;
+    },
+  };
+}
+
+const orgA = { userId: "user-1", network: "mainnet", organizationId: "org-a" };
+const orgB = { ...orgA, organizationId: "org-b" };
+
+beforeEach(() => {
+  vi.stubGlobal("localStorage", memoryStorage());
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe("work order draft storage", () => {
+  test("keeps one draft per organization", () => {
+    writeWorkOrderDraft(orgA, { draft: { title: "A" }, custom: { client: "Acme" } });
+    writeWorkOrderDraft(orgB, { draft: { title: "B" }, custom: {} });
+    expect(readWorkOrderDraft(orgA)).toEqual({
+      draft: { title: "A" },
+      custom: { client: "Acme" },
+    });
+    expect(readWorkOrderDraft<{ title: string }>(orgB)?.draft.title).toBe("B");
+    expect(readWorkOrderDraft({ ...orgA, organizationId: null })).toBeNull();
+  });
+
+  test("never shows one user's or network's draft to another", () => {
+    writeWorkOrderDraft(orgA, { draft: { title: "A" }, custom: {} });
+    expect(readWorkOrderDraft({ ...orgA, userId: "user-2" })).toBeNull();
+    expect(readWorkOrderDraft({ ...orgA, network: "testnet" })).toBeNull();
+  });
+
+  test("clears a draft", () => {
+    writeWorkOrderDraft(orgA, { draft: { title: "A" }, custom: {} });
+    clearWorkOrderDraft(orgA);
+    expect(readWorkOrderDraft(orgA)).toBeNull();
+  });
+
+  test("clears every draft on sign-out and leaves other keys", () => {
+    writeWorkOrderDraft(orgA, { draft: { title: "A" }, custom: {} });
+    writeWorkOrderDraft(orgB, { draft: { title: "B" }, custom: {} });
+    localStorage.setItem("theme", "dark");
+    clearAllWorkOrderDrafts();
+    expect(readWorkOrderDraft(orgA)).toBeNull();
+    expect(readWorkOrderDraft(orgB)).toBeNull();
+    expect(localStorage.getItem("theme")).toBe("dark");
+  });
+
+  test("ignores broken storage", () => {
+    localStorage.setItem(workOrderDraftKey(orgA), "{not json");
+    expect(readWorkOrderDraft(orgA)).toBeNull();
+    vi.stubGlobal("localStorage", {
+      ...memoryStorage(),
+      setItem: () => {
+        throw new Error("quota");
+      },
+    });
+    expect(() => writeWorkOrderDraft(orgA, { draft: {}, custom: {} })).not.toThrow();
+  });
+});
+
+describe("mergeStoredDraft", () => {
+  test("takes stored values of the right type for known fields only", () => {
+    const fresh = { title: "", graceDays: "2", autoRenew: false };
+    expect(
+      mergeStoredDraft(fresh, { title: "Build", graceDays: 5, autoRenew: true, extra: "x" }),
+    ).toEqual({ title: "Build", graceDays: "2", autoRenew: true });
+  });
+});

From da7e8409034292196d10c73a24a80671e5556dd8 Mon Sep 17 00:00:00 2001
From: James Waugh <multidaomensional@gmail.com>
Date: Fri, 30 Oct 2026 14:59:31 -0400
Subject: [PATCH 2/2] fix(work-orders): safer terminate and delete, project and
 draft guards

---
 api/src/db/index.ts                           |   6 +-
 api/src/index.ts                              |   5 +-
 api/src/services/work-orders/github.ts        |  37 ++--
 api/src/services/work-orders/progress.ts      |   9 -
 api/src/services/work-orders/service.ts       | 202 ++++++++++++------
 .../work-order-auto-approval.test.ts          |   1 +
 api/tests/integration/work-orders.test.ts     |  80 ++++++-
 api/tests/unit/cached-by-name.test.ts         |  47 ++++
 api/tests/unit/progress.test.ts               |  57 ++---
 ui/src/components/user-nav.tsx                |   9 +-
 .../work-orders/work-order-form.tsx           |  44 ++--
 ui/src/lib/account.ts                         |   8 +
 ui/src/lib/work-order-defaults.ts             |   2 +-
 ui/src/lib/work-order-draft.ts                |  10 +
 .../routes/_layout/_authenticated/profile.tsx |   5 +-
 .../_authenticated/work-orders/$id.tsx        |  20 +-
 .../routes/_layout/accept-invitation/$id.tsx  |   8 +-
 ui/tests/work-order-draft.test.ts             |  19 ++
 18 files changed, 382 insertions(+), 187 deletions(-)
 create mode 100644 api/tests/unit/cached-by-name.test.ts

diff --git a/api/src/db/index.ts b/api/src/db/index.ts
index 46269408..55badbb1 100644
--- a/api/src/db/index.ts
+++ b/api/src/db/index.ts
@@ -68,15 +68,11 @@ export async function createDatabaseDriver(url: string): Promise<DatabaseDriver>
     max: Number(process.env.DB_POOL_MAX) || 10,
     connectionTimeoutMillis: Number(process.env.DB_CONNECTION_TIMEOUT_MS) || 30_000,
     idleTimeoutMillis: Number(process.env.DB_IDLE_TIMEOUT_MS) || 30_000,
+    options: "-c TimeZone=UTC",
   });
   pool.on("error", (err: Error) => {
     console.error("[Database] Unexpected pool error:", err.message);
   });
-  pool.on("connect", (client) => {
-    client.query("SET TIME ZONE 'UTC'").catch((err: Error) => {
-      console.error("[Database] Couldn't set the session time zone to UTC:", err.message);
-    });
-  });
   let closed = false;
   return {
     db: drizzle(pool, { schema }),
diff --git a/api/src/index.ts b/api/src/index.ts
index e472bd9f..15ac1655 100644
--- a/api/src/index.ts
+++ b/api/src/index.ts
@@ -63,7 +63,7 @@ import { createTokensService } from "./services/tokens";
 import { createTreasuryService } from "./services/treasury";
 import { createConsistencyChecker } from "./services/work-orders/consistency";
 import { createDocumenso } from "./services/work-orders/documenso";
-import { cachedOwnership, createGitHub } from "./services/work-orders/github";
+import { cachedByName, createGitHub } from "./services/work-orders/github";
 import {
   createGoogle,
   GoogleError,
@@ -361,7 +361,8 @@ export default createPlugin.withPlugins<PluginsClient>()({
           },
         },
         github,
-        ownership: cachedOwnership(github, 10 * 60_000),
+        ownership: cachedByName((repo) => github.getRepoOwnership(repo), 10 * 60_000),
+        orgRepos: cachedByName((org) => github.listOrgRepos(org), 10 * 60_000),
         proposal: (daoAccountId, proposalId) => findProposal(db, daoAccountId, proposalId),
         proposalBond: getProposalBond,
         prices: createPriceFeed(),
diff --git a/api/src/services/work-orders/github.ts b/api/src/services/work-orders/github.ts
index 7919b2c4..59231c4f 100644
--- a/api/src/services/work-orders/github.ts
+++ b/api/src/services/work-orders/github.ts
@@ -408,28 +408,23 @@ export function createGitHub(token: string | null, fetcher: typeof fetch = fetch
   };
 }
 
-export function cachedOrgRepos(github: GitHubPort, ttlMs: number, now: () => number = Date.now) {
-  const cache = new Map<string, { until: number; value: Promise<GhRepo[]> }>();
-  return (org: string): Promise<GhRepo[]> => {
-    const key = org.toLowerCase();
+export function cachedByName<T>(
+  load: (name: string) => Promise<T>,
+  ttlMs: number,
+  now: () => number = Date.now,
+) {
+  const cache = new Map<string, { until: number; value: Promise<T> }>();
+  return (name: string): Promise<T> => {
+    const key = name.toLowerCase();
+    const at = now();
     const hit = cache.get(key);
-    if (hit && hit.until > now()) return hit.value;
-    const value = github.listOrgRepos(org);
-    cache.set(key, { until: now() + ttlMs, value });
-    value.catch(() => cache.delete(key));
-    return value;
-  };
-}
-
-export function cachedOwnership(github: GitHubPort, ttlMs: number, now: () => number = Date.now) {
-  const cache = new Map<string, { until: number; value: Promise<GhRepoOwnership> }>();
-  return (repo: string): Promise<GhRepoOwnership> => {
-    const key = repo.toLowerCase();
-    const hit = cache.get(key);
-    if (hit && hit.until > now()) return hit.value;
-    const value = github.getRepoOwnership(repo);
-    cache.set(key, { until: now() + ttlMs, value });
-    value.catch(() => cache.delete(key));
+    if (hit && hit.until > at) return hit.value;
+    for (const [stale, entry] of cache) if (entry.until <= at) cache.delete(stale);
+    const value = load(name);
+    cache.set(key, { until: at + ttlMs, value });
+    value.catch(() => {
+      if (cache.get(key)?.value === value) cache.delete(key);
+    });
     return value;
   };
 }
diff --git a/api/src/services/work-orders/progress.ts b/api/src/services/work-orders/progress.ts
index 83aa858b..e605e438 100644
--- a/api/src/services/work-orders/progress.ts
+++ b/api/src/services/work-orders/progress.ts
@@ -90,7 +90,6 @@ export type ProgressInput = {
   representativeUrl: string | null;
   esignError: string | null;
   blockers: string[];
-  payeeNeedsConfirmation: boolean;
   documentWarning: string | null;
   driveError: string | null;
   renewalStatus: "renewed" | "needs_approval" | "declined" | null;
@@ -372,14 +371,6 @@ export function progressOf(input: ProgressInput): Progress {
       });
     }
   }
-  const blockersShown = input.status === "accepted" && input.blockers.length > 0;
-  if (input.payeeNeedsConfirmation && !blockersShown && (input.status === "accepted" || started)) {
-    attention.push({
-      key: "payee",
-      message: `${builder} hasn't confirmed their payout account yet`,
-      action: null,
-    });
-  }
   if (input.documentWarning) {
     attention.push({ key: "document", message: input.documentWarning, action: null });
   }
diff --git a/api/src/services/work-orders/service.ts b/api/src/services/work-orders/service.ts
index 232a4669..dbe147ad 100644
--- a/api/src/services/work-orders/service.ts
+++ b/api/src/services/work-orders/service.ts
@@ -31,7 +31,7 @@ import { type DaoProposal, proposalDescription } from "../sputnik";
 import { baseUnitsToDisplay, getTokenMetadata, NATIVE_TOKEN_ID } from "../tokens";
 import { createAutoApproval, trustViewOf } from "./auto-approval";
 import type { ConsistencyChecker } from "./consistency";
-import type { EsignPort, EsignRole } from "./documenso";
+import type { EsignPort, EsignRole, EsignStatus } from "./documenso";
 import {
   codeIn,
   documentFields,
@@ -42,7 +42,7 @@ import {
 } from "./documents";
 import { eventId, type WorkOrderEvent, type WorkOrderEventType } from "./events";
 import { collectEvidence, summarizeActivity } from "./evidence";
-import { cachedOrgRepos, type GhRepoOwnership, GitHubError, type GitHubPort } from "./github";
+import { type GhRepo, type GhRepoOwnership, GitHubError, type GitHubPort } from "./github";
 import type { DriveFile, GooglePort } from "./google";
 import { type PriceFeed, type PriceQuote, USD, USD_DECIMALS, usdToTokens } from "./prices";
 import { type Progress, progressOf } from "./progress";
@@ -109,6 +109,7 @@ export type WorkOrderDeps = {
   builders: { get(nearAccount: string): Promise<BuilderProfile | null> };
   github: GitHubPort;
   ownership: (repo: string) => Promise<GhRepoOwnership>;
+  orgRepos: (org: string) => Promise<GhRepo[]>;
   proposal: (daoAccountId: string, proposalId: number) => Promise<DaoProposal | null>;
   proposalBond: (daoAccountId: string) => Promise<string>;
   prices?: PriceFeed | null;
@@ -209,6 +210,13 @@ export type WorkOrderFields = {
 
 type WorkOrderStatus = WorkOrderRow["status"];
 type RequestStatus = CompensationRequestRow["status"];
+type PendingEnvelope = { esign: EsignPort; envelopeId: string };
+type GoogleTemplate = {
+  google: GooglePort;
+  templateId: string;
+  folderId: string;
+  fieldMap: string | null;
+};
 
 const COMMITTED: readonly RequestStatus[] = ["approved", "paying", "proposed", "paid"];
 const OPEN_REQUEST: readonly RequestStatus[] = ["draft", "submitted"];
@@ -399,7 +407,6 @@ const sum = (amounts: (string | null)[]) =>
 
 export function createWorkOrdersService(deps: WorkOrderDeps) {
   const { db, directory } = deps;
-  const orgRepos = cachedOrgRepos(deps.github, 10 * 60_000);
   const now = () => deps.now?.() ?? new Date();
   const timeZone = deps.timeZone ?? UTC;
   const today = () => dateOf(now(), timeZone);
@@ -649,19 +656,31 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return (await deps.googleFor?.(organizationId)) ?? deps.google ?? null;
   }
 
-  async function fillGoogleDocument(row: WorkOrderRow): Promise<WorkOrderRow | null> {
-    const google = await googleOf(row.organizationId);
-    const settings = google ? await integrationOf(row.organizationId) : null;
+  async function googleTemplateOf(organizationId: string) {
+    const google = await googleOf(organizationId);
+    const settings = google ? await integrationOf(organizationId) : null;
     if (!google || !settings?.googleTemplateId || !settings.googleDocumentsFolderId) return null;
-    const [project, agencyName, builder] = await Promise.all([
-      projectOf(row),
+    return {
+      google,
+      templateId: settings.googleTemplateId,
+      folderId: settings.googleDocumentsFolderId,
+      fieldMap: settings.googleFieldMap,
+    };
+  }
+
+  async function fillGoogleDocument(
+    row: WorkOrderRow,
+    { google, templateId, folderId, fieldMap }: GoogleTemplate,
+    projectTitle: string,
+  ): Promise<WorkOrderRow> {
+    const [agencyName, builder] = await Promise.all([
       deps.organizationName(row.organizationId).catch(() => row.organizationId),
       deps.builders.get(row.builderNearAccount).catch(() => null),
     ]);
     const contacts = await contactsOf(row, builder);
     const fields = documentFields({
       code: row.code,
-      project: documentProjectTitle(row, project),
+      project: projectTitle,
       contractorName: row.contractorName ?? builder?.name ?? row.builderNearAccount,
       contractorEmail: contacts.contractorEmail,
       representativeName: row.representativeName ?? agencyName,
@@ -679,12 +698,12 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     });
     const { values, blank } = mappedValues({
       fields,
-      map: parseFieldMap(settings.googleFieldMap),
+      map: parseFieldMap(fieldMap),
       custom: customFieldsOf(row.customFields),
     });
-    const copy = await google.copy(settings.googleTemplateId, {
+    const copy = await google.copy(templateId, {
       name: `Work Order ${row.code}: ${row.title}`,
-      parentId: settings.googleDocumentsFolderId,
+      parentId: folderId,
     });
     const occurrences = await google.fill(copy.id, values);
     const leftover = await google
@@ -707,9 +726,21 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
   }
 
   async function draftDocument(row: WorkOrderRow, strict = false): Promise<WorkOrderRow> {
+    const template = await googleTemplateOf(row.organizationId);
+    if (!template) {
+      await announce(row, "work_order.created");
+      return row;
+    }
+    let projectTitle: string;
+    try {
+      projectTitle = await documentProjectTitle(row);
+    } catch (error) {
+      console.warn(`[API] ${errorText(error)}`);
+      if (strict) throw error;
+      return row;
+    }
     try {
-      const filled = await fillGoogleDocument(row);
-      if (filled) return filled;
+      return await fillGoogleDocument(row, template, projectTitle);
     } catch (error) {
       const message = `Couldn't fill the Google Docs template for ${row.code}: ${errorText(error)}`;
       await recordGoogle(row.organizationId, message);
@@ -717,8 +748,6 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
       if (strict) throw badRequest("GOOGLE_FAILED", message);
       return row;
     }
-    await announce(row, "work_order.created");
-    return row;
   }
 
   async function recordDriveFile(input: {
@@ -855,8 +884,8 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
   }
 
   async function termsRows(row: WorkOrderRow): Promise<[string, string][]> {
-    const [project, agencyName, builder] = await Promise.all([
-      projectOf(row),
+    const [projectTitle, agencyName, builder] = await Promise.all([
+      documentProjectTitle(row),
       deps.organizationName(row.organizationId).catch(() => row.organizationId),
       deps.builders.get(row.builderNearAccount).catch(() => null),
     ]);
@@ -864,7 +893,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return [
       ["Work order", `${row.code}: ${row.title}`],
       ["Agency", agencyName],
-      ["Project", documentProjectTitle(row, project)],
+      ["Project", projectTitle],
       ["Builder (contractor)", row.contractorName ?? builder?.name ?? row.builderNearAccount],
       ["Builder's email", contacts.contractorEmail ?? ""],
       ["Agency representative", row.representativeName ?? agencyName],
@@ -895,15 +924,16 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
   async function prepareOfferDocument(row: WorkOrderRow) {
     let current = row;
     let pdf: Uint8Array;
-    const google = await googleOf(row.organizationId);
-    const settings = google ? await integrationOf(row.organizationId) : null;
-    if (google && settings?.googleTemplateId && settings.googleDocumentsFolderId) {
+    const template = await googleTemplateOf(row.organizationId);
+    if (template) {
+      const refill = !current.documentId || !current.documentFields;
+      const projectTitle = refill ? await documentProjectTitle(current) : null;
       try {
-        if (!current.documentId || !current.documentFields) {
-          current = (await fillGoogleDocument(current)) ?? current;
+        if (projectTitle !== null) {
+          current = await fillGoogleDocument(current, template, projectTitle);
         }
         if (!current.documentId) throw new Error("The template wasn't filled");
-        pdf = await google.exportPdf(current.documentId);
+        pdf = await template.google.exportPdf(current.documentId);
       } catch (error) {
         const message = `Couldn't prepare the document of ${row.code}: ${errorText(error)}`;
         await recordGoogle(row.organizationId, message);
@@ -1245,11 +1275,12 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return { committed, paid, remaining };
   }
 
-  function documentProjectTitle(row: WorkOrderRow, project: { title: string } | null): string {
+  async function documentProjectTitle(row: WorkOrderRow): Promise<string> {
+    const project = await projectOf(row);
     if (project) return project.title;
     throw badRequest(
       "PROJECT_UNAVAILABLE",
-      `Couldn't load the project of ${row.code}, so its document wasn't made. Try again in a moment.`,
+      `Couldn't load the project of ${row.code}, so its document wasn't made. If the project was deleted, edit the work order and choose another one.`,
     );
   }
 
@@ -1424,18 +1455,26 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     }
   }
 
-  async function cancelEnvelope(row: WorkOrderRow, reason: string, strict = false) {
-    if (!deps.esign || !row.esignEnvelopeId || row.signedAt) return;
+  async function cancelEnvelope(row: WorkOrderRow, reason: string): Promise<string | null> {
+    if (!deps.esign || !row.esignEnvelopeId || row.signedAt) return null;
     try {
       await deps.esign.cancel(row.esignEnvelopeId, reason);
+      return null;
     } catch (error) {
       console.warn(`[API] couldn't cancel the Documenso envelope of ${row.code}`, error);
-      if (strict) {
-        throw badRequest(
-          "ESIGN_CANCEL_FAILED",
-          `Couldn't withdraw ${row.code} in Documenso, so it wasn't deleted: ${errorText(error)}`,
-        );
-      }
+      return errorText(error);
+    }
+  }
+
+  async function envelopeStillSignable(row: WorkOrderRow): Promise<boolean> {
+    if (!deps.esign || !row.esignEnvelopeId) return false;
+    try {
+      const state = await deps.esign.status(row.esignEnvelopeId, {
+        representativeFirst: row.esignRepresentativeFirst,
+      });
+      return state.status === "pending";
+    } catch {
+      return true;
     }
   }
 
@@ -1469,18 +1508,38 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     return synced?.value ?? row;
   }
 
+  function pendingEnvelope(row: WorkOrderRow): PendingEnvelope | null {
+    if (!deps.esign || !row.esignEnvelopeId || row.signedAt) return null;
+    if (row.status !== "offered" && row.status !== "accepted") return null;
+    return { esign: deps.esign, envelopeId: row.esignEnvelopeId };
+  }
+
+  async function checkEnvelope(
+    row: WorkOrderRow,
+  ): Promise<{ envelope: PendingEnvelope; state: EsignStatus } | null> {
+    const envelope = pendingEnvelope(row);
+    if (!envelope) return null;
+    const state = await envelope.esign.status(envelope.envelopeId, {
+      representativeFirst: row.esignRepresentativeFirst,
+    });
+    return { envelope, state };
+  }
+
   async function syncEnvelope(row: WorkOrderRow): Promise<WorkOrderRow> {
-    const esign = deps.esign;
-    if (!esign || !row.esignEnvelopeId || row.signedAt) return row;
-    if (row.status !== "offered" && row.status !== "accepted") return row;
-    let state: Awaited<ReturnType<EsignPort["status"]>>;
+    let checked: Awaited<ReturnType<typeof checkEnvelope>>;
     try {
-      state = await esign.status(row.esignEnvelopeId, {
-        representativeFirst: row.esignRepresentativeFirst,
-      });
+      checked = await checkEnvelope(row);
     } catch (error) {
       return update(row.id, { esignError: `Couldn't check Documenso: ${errorText(error)}` });
     }
+    return checked ? applyEnvelope(row, checked.envelope, checked.state) : row;
+  }
+
+  async function applyEnvelope(
+    row: WorkOrderRow,
+    { esign, envelopeId }: PendingEnvelope,
+    state: EsignStatus,
+  ): Promise<WorkOrderRow> {
     const offered = await latestDocument(row.id, "offered");
     if (!offered) return row;
     let current = row.esignError ? await update(row.id, { esignError: null }) : row;
@@ -1552,7 +1611,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     if (state.status !== "completed") return current;
     let final: Uint8Array;
     try {
-      final = await esign.downloadSigned(row.esignEnvelopeId);
+      final = await esign.downloadSigned(envelopeId);
     } catch (error) {
       return update(row.id, {
         esignError: `Couldn't download the signed PDF: ${errorText(error)}`,
@@ -1821,6 +1880,13 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
     for (const doc of offeredRows) {
       if (!latestOffered.has(doc.workOrderId)) latestOffered.set(doc.workOrderId, doc);
     }
+    const signaturesByDocument = new Map<string, (typeof signatureRows)[number][]>();
+    for (const s of signatureRows) {
+      const key = `${s.workOrderId}:${s.documentSha256}`;
+      const list = signaturesByDocument.get(key);
+      if (list) list.push(s);
+      else signaturesByDocument.set(key, [s]);
+    }
     const signing = new Map(
       rows.map((row) => {
         const offered = latestOffered.get(row.id);
@@ -1830,11 +1896,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
           signingFrom(
             row,
             current,
-            current
-              ? signatureRows.filter(
-                  (s) => s.workOrderId === row.id && s.documentSha256 === current.sha256,
-                )
-              : [],
+            current ? (signaturesByDocument.get(`${row.id}:${current.sha256}`) ?? []) : [],
           ),
         ] as const;
       }),
@@ -1890,7 +1952,6 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
       representativeUrl: signing.esign?.representativeUrl ?? null,
       esignError: signing.esign?.error ?? null,
       blockers,
-      payeeNeedsConfirmation: payee.needsConfirmation,
       documentWarning: row.documentWarning,
       driveError: row.signedDriveFileId ? null : row.signedDriveError,
       renewalStatus: row.renewalStatus,
@@ -3450,7 +3511,7 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
 
     githubRepos: async (_scope: OrganizationScope, input: { org: string }) => {
       try {
-        return { org: input.org, repos: await orgRepos(input.org) };
+        return { org: input.org, repos: await deps.orgRepos(input.org) };
       } catch (error) {
         if (error instanceof GitHubError && error.status === 404) {
           throw badRequest("GITHUB_ORG_NOT_FOUND", `GitHub has no organization "${input.org}"`);
@@ -3843,8 +3904,16 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
         const row = await ownRow(scope, input.id);
         if (FINAL.includes(row.status))
           throw badRequest("CLOSED", `Work order ${row.code} is already terminated`);
-        await cancelEnvelope(row, "The work order was terminated");
-        return adminView(await view(await update(row.id, { status: "terminated" })));
+        const failed = await cancelEnvelope(row, "The work order was terminated");
+        const terminated = await update(row.id, {
+          status: "terminated",
+          ...(failed && (await envelopeStillSignable(row))
+            ? {
+                esignError: `Couldn't withdraw it in Documenso, so the builder may still be able to sign there: ${failed}`,
+              }
+            : {}),
+        });
+        return adminView(await view(terminated));
       });
     },
 
@@ -3858,21 +3927,32 @@ export function createWorkOrdersService(deps: WorkOrderDeps) {
             "Only a draft or offered work order can be deleted; terminate it instead",
           );
         }
-        const current = await syncEnvelope(row);
-        if (current.status !== "draft" && current.status !== "offered") {
+        let checked: Awaited<ReturnType<typeof checkEnvelope>>;
+        try {
+          checked = await checkEnvelope(row);
+        } catch (error) {
           throw badRequest(
-            "ALREADY_SIGNED",
-            `The builder has already signed ${row.code}; terminate it instead`,
+            "ESIGN_UNCHECKED",
+            `Couldn't check Documenso, so ${row.code} wasn't deleted: ${errorText(error)}`,
           );
         }
-        if (current.esignEnvelopeId && current.esignError) {
+        if (checked?.state.signers.some((s) => s.role === "contractor" && s.signedAt)) {
+          await applyEnvelope(row, checked.envelope, checked.state);
           throw badRequest(
-            "ESIGN_UNCHECKED",
-            `${current.esignError}. ${row.code} wasn't deleted; try again in a moment.`,
+            "ALREADY_SIGNED",
+            `The builder has already signed ${row.code}; terminate it instead`,
           );
         }
-        await cancelEnvelope(current, "The work order was withdrawn", true);
-        await db.delete(workOrders).where(eq(workOrders.id, current.id));
+        if (checked?.state.status !== "rejected") {
+          const failed = await cancelEnvelope(row, "The work order was withdrawn");
+          if (failed) {
+            throw badRequest(
+              "ESIGN_CANCEL_FAILED",
+              `Couldn't withdraw ${row.code} in Documenso, so it wasn't deleted: ${failed}`,
+            );
+          }
+        }
+        await db.delete(workOrders).where(eq(workOrders.id, row.id));
         return { deleted: true as const };
       });
     },
diff --git a/api/tests/integration/work-order-auto-approval.test.ts b/api/tests/integration/work-order-auto-approval.test.ts
index 009a2afc..e8158750 100644
--- a/api/tests/integration/work-order-auto-approval.test.ts
+++ b/api/tests/integration/work-order-auto-approval.test.ts
@@ -69,6 +69,7 @@ describe("work order trust tiers and automatic approval", () => {
       builders: { get: async (nearAccount) => builders.get(nearAccount) ?? null },
       github,
       ownership: (repo) => github.getRepoOwnership(repo),
+      orgRepos: (org) => github.listOrgRepos(org),
       proposal: async () => null,
       proposalBond: async () => "100000000000000000000000",
       prices: { price: async () => ({ priceUsd: "4.99", at: "2026-09-20T12:00:00.000Z" }) },
diff --git a/api/tests/integration/work-orders.test.ts b/api/tests/integration/work-orders.test.ts
index e811c7c1..c27ce0d4 100644
--- a/api/tests/integration/work-orders.test.ts
+++ b/api/tests/integration/work-orders.test.ts
@@ -111,6 +111,7 @@ describe("work orders", () => {
       builders: { get: async (nearAccount) => builders.get(nearAccount) ?? null },
       github,
       ownership: (repo) => github.getRepoOwnership(repo),
+      orgRepos: (org) => github.listOrgRepos(org),
       proposal: async (dao, id) => proposals.get(`${dao}#${id}`) ?? null,
       proposalBond: async () => "100000000000000000000000",
       prices: { price: async () => ({ priceUsd, at: "2026-09-20T12:00:00.000Z" }) },
@@ -1036,6 +1037,25 @@ describe("work orders", () => {
       ];
     };
 
+    test("a work order whose project is gone is refused without blaming Google", async () => {
+      const created = await service.create(await studio(), fields());
+      await db
+        .update(workOrders)
+        .set({ projectId: "deleted-project", projectTitle: null })
+        .where(eq(workOrders.id, created.id));
+      const copies = google.copies.length;
+      await refused(
+        service.prepareDocument(await studio(), { id: created.id }),
+        "PROJECT_UNAVAILABLE",
+      );
+      expect(google.copies).toHaveLength(copies);
+      const [integration] = await db
+        .select()
+        .from(workOrderIntegrations)
+        .where(eq(workOrderIntegrations.organizationId, "studio"));
+      expect(integration?.googleLastError).toBeNull();
+    });
+
     test("a new work order gets its filled Google Doc and the representative is told", async () => {
       const created = await service.create(
         await studio(),
@@ -1553,6 +1573,62 @@ describe("work orders", () => {
       await service.remove(await studio(), { id: created.id });
     });
 
+    test("deleting after the representative signed doesn't send the builder the offer", async () => {
+      const created = await offered();
+      documenso.sign("representative", "2026-09-20T13:00:00.000Z");
+      await service.remove(await studio(), { id: created.id });
+      expect(events.map((e) => e.type)).not.toContain("work_order.offered");
+      expect((await notificationsOf("carol")).map((n) => n.kind)).not.toContain(
+        "work_order_offered",
+      );
+      expect(documenso.cancelled.at(-1)?.reason).toBe("The work order was withdrawn");
+    });
+
+    test("deleting a work order the builder declined in Documenso tells no one", async () => {
+      const created = await offered();
+      documenso.reject("contractor");
+      await service.remove(await studio(), { id: created.id });
+      expect((await notificationsOf("studio-admin")).map((n) => n.kind)).not.toContain(
+        "work_order_declined",
+      );
+      expect(documenso.cancelled).toEqual([]);
+    });
+
+    test("terminating goes through when Documenso can't withdraw the envelope, and says so", async () => {
+      const created = await offered();
+      documenso.status = async () => {
+        throw new Error("Documenso is down");
+      };
+      documenso.cancel = async () => {
+        throw new Error("timeout");
+      };
+      const terminated = await service.terminate(await studio(), { id: created.id });
+      expect(terminated.status).toBe("terminated");
+      expect(terminated.signing.esign?.error).toBe(
+        "Couldn't withdraw it in Documenso, so the builder may still be able to sign there: timeout",
+      );
+      expect(terminated.progress.attention.map((a) => a.key)).toContain("esign");
+    });
+
+    test("terminating doesn't warn about an envelope that was already rejected in Documenso", async () => {
+      const created = await offered();
+      documenso.reject("contractor");
+      const terminated = await service.terminate(await studio(), { id: created.id });
+      expect(terminated.status).toBe("terminated");
+      expect(terminated.signing.esign?.error ?? null).toBeNull();
+      expect(documenso.cancelled).toEqual([]);
+    });
+
+    test("terminating withdraws the envelope without recording signatures first", async () => {
+      const created = await offered();
+      documenso.sign("representative", "2026-09-20T13:00:00.000Z");
+      const terminated = await service.terminate(await studio(), { id: created.id });
+      expect(terminated.status).toBe("terminated");
+      expect(terminated.signing.esign?.error ?? null).toBeNull();
+      expect(documenso.cancelled.at(-1)?.reason).toBe("The work order was terminated");
+      expect(events.map((e) => e.type)).not.toContain("work_order.offered");
+    });
+
     async function completed() {
       const created = await offered();
       documenso.sign("representative", "2026-09-20T13:00:00.000Z");
@@ -3045,7 +3121,7 @@ describe("work orders", () => {
   });
 
   describe("importing repositories from GitHub", () => {
-    test("lists an organization's public repositories and caches them", async () => {
+    test("lists an organization's public repositories", async () => {
       github.orgs.set("nearbuilders", [
         {
           fullName: "NEARBuilders/citynode.app",
@@ -3056,8 +3132,6 @@ describe("work orders", () => {
       ]);
       const listed = await service.githubRepos(await studio(), { org: "NEARBuilders" });
       expect(listed.repos.map((r) => r.fullName)).toEqual(["NEARBuilders/citynode.app"]);
-      await service.githubRepos(await studio(), { org: "nearbuilders" });
-      expect(github.calls.filter((c) => c === "listOrgRepos")).toHaveLength(1);
     });
 
     test("an unknown organization or a GitHub outage is a clear error", async () => {
diff --git a/api/tests/unit/cached-by-name.test.ts b/api/tests/unit/cached-by-name.test.ts
new file mode 100644
index 00000000..a9768fd8
--- /dev/null
+++ b/api/tests/unit/cached-by-name.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from "vitest";
+import { cachedByName } from "../../src/services/work-orders/github";
+
+function counted(fail = new Set<string>()) {
+  const calls: string[] = [];
+  const load = async (name: string) => {
+    calls.push(name);
+    if (fail.has(name)) throw new Error(`${name} failed`);
+    return `${name}:${calls.length}`;
+  };
+  return { calls, load };
+}
+
+describe("cachedByName", () => {
+  it("serves a name from the cache regardless of case until it expires", async () => {
+    let clock = 0;
+    const { calls, load } = counted();
+    const cached = cachedByName(load, 1000, () => clock);
+    expect(await cached("NEARBuilders")).toBe("NEARBuilders:1");
+    expect(await cached("nearbuilders")).toBe("NEARBuilders:1");
+    clock = 1000;
+    expect(await cached("nearbuilders")).toBe("nearbuilders:2");
+    expect(calls).toEqual(["NEARBuilders", "nearbuilders"]);
+  });
+
+  it("doesn't keep a failure", async () => {
+    const fail = new Set(["down"]);
+    const { calls, load } = counted(fail);
+    const cached = cachedByName(load, 1000, () => 0);
+    await expect(cached("down")).rejects.toThrow("down failed");
+    fail.clear();
+    expect(await cached("down")).toBe("down:2");
+    expect(calls).toEqual(["down", "down"]);
+  });
+
+  it("drops expired names when it loads a new one", async () => {
+    let clock = 0;
+    const { calls, load } = counted();
+    const cached = cachedByName(load, 1000, () => clock);
+    await cached("a");
+    clock = 2000;
+    await cached("b");
+    clock = 0;
+    await cached("a");
+    expect(calls).toEqual(["a", "b", "a"]);
+  });
+});
diff --git a/api/tests/unit/progress.test.ts b/api/tests/unit/progress.test.ts
index 2e0708e4..9257c371 100644
--- a/api/tests/unit/progress.test.ts
+++ b/api/tests/unit/progress.test.ts
@@ -25,7 +25,6 @@ const base: ProgressInput = {
   representativeUrl: null,
   esignError: null,
   blockers: [],
-  payeeNeedsConfirmation: false,
   documentWarning: null,
   driveError: null,
   renewalStatus: null,
@@ -297,50 +296,22 @@ describe("work order progress", () => {
       ...signedActive,
       esignError: "Couldn't check Documenso",
       driveError: "403",
-      payeeNeedsConfirmation: true,
     });
-    expect(p.attention.map((a) => a.key)).toEqual(["esign", "payee", "drive"]);
+    expect(p.attention.map((a) => a.key)).toEqual(["esign", "drive"]);
   });
 
-  test("an unconfirmed payout account only needs attention once the builder has signed", () => {
-    const payeeKeys = (input: Partial<ProgressInput>) =>
-      progressOf({ ...base, payeeNeedsConfirmation: true, ...input }).attention.map((a) => a.key);
-    expect(payeeKeys({})).toEqual([]);
-    expect(
-      payeeKeys({
-        status: "offered",
-        offeredAt: "2026-10-26T10:01:00.000Z",
-        awaitingRepresentative: true,
-      }),
-    ).toEqual([]);
-    expect(
-      payeeKeys({
-        status: "offered",
-        offeredAt: "2026-10-26T10:01:00.000Z",
-        representativeSignedAt: "x",
-      }),
-    ).toEqual([]);
-    expect(
-      payeeKeys({
-        status: "accepted",
-        acceptedAt: "2026-10-26T10:05:00.000Z",
-        builderSignedAt: "a",
-        representativeSignedAt: "b",
-      }),
-    ).toEqual(["payee"]);
-    expect(payeeKeys(signedActive)).toEqual(["payee"]);
-    expect(
-      payeeKeys({
-        status: "accepted",
-        acceptedAt: "2026-10-26T10:05:00.000Z",
-        builderSignedAt: "a",
-        representativeSignedAt: "b",
-        blockers: [
-          "Add the builder's GitHub login",
-          "The builder hasn't confirmed the payout account",
-        ],
-      }),
-    ).toEqual(["blocker-1"]);
-    expect(payeeKeys({ ...signedActive, status: "terminated" })).toEqual([]);
+  test("an accepted work order lists the blockers its headline doesn't already show", () => {
+    const p = progressOf({
+      ...base,
+      status: "accepted",
+      acceptedAt: "2026-10-26T10:05:00.000Z",
+      builderSignedAt: "a",
+      representativeSignedAt: "b",
+      blockers: [
+        "Add the builder's GitHub login",
+        "The builder hasn't confirmed the payout account",
+      ],
+    });
+    expect(p.attention.map((a) => a.key)).toEqual(["blocker-1"]);
   });
 });
diff --git a/ui/src/components/user-nav.tsx b/ui/src/components/user-nav.tsx
index f8fb73dd..535c923a 100644
--- a/ui/src/components/user-nav.tsx
+++ b/ui/src/components/user-nav.tsx
@@ -15,12 +15,12 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { useNearSignIn } from "@/hooks/use-near-sign-in";
+import { signOut } from "@/lib/account";
 import { useApiClient } from "@/lib/api";
 import { sessionQueryOptions } from "@/lib/auth";
 import { formatCount } from "@/lib/format-count";
 import { nearProfileQueryOptions } from "@/lib/near-profile";
 import { meRolesQueryOptions } from "@/lib/queries";
-import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export function UserNav() {
   const queryClient = useQueryClient();
@@ -50,13 +50,8 @@ export function UserNav() {
   const invitationCount = invitationsQuery.data?.length ?? 0;
 
   const signOutMutation = useMutation({
-    mutationFn: async () => {
-      const { error } = await authClient.signOut();
-      if (error) throw new Error(error.message || "Failed to sign out");
-      await authClient.near.disconnect().catch(() => {});
-    },
+    mutationFn: () => signOut(authClient),
     onSuccess: async () => {
-      clearAllWorkOrderDrafts();
       queryClient.clear();
       navigate({ to: "/", replace: true });
     },
diff --git a/ui/src/components/work-orders/work-order-form.tsx b/ui/src/components/work-orders/work-order-form.tsx
index 5f7586bf..fc58ad54 100644
--- a/ui/src/components/work-orders/work-order-form.tsx
+++ b/ui/src/components/work-orders/work-order-form.tsx
@@ -43,6 +43,7 @@ import { defaultRepresentative } from "@/lib/representative";
 import {
   defaultPeriod,
   duplicateTitle,
+  GITHUB_REPO,
   recentBudgets,
   repoFromProject,
   sendBlocker,
@@ -53,6 +54,7 @@ import {
   mergeStoredDraft,
   readWorkOrderDraft,
   type WorkOrderDraftScope,
+  withLivePeriod,
   writeWorkOrderDraft,
 } from "@/lib/work-order-draft";
 import { BudgetChips } from "./budget-chips";
@@ -91,7 +93,6 @@ const IP_MODELS = [
 const USD = "usd";
 const NEAR = "near";
 const USD_DECIMALS = 6;
-const REPO = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
 const GITHUB_LOGIN = /^[A-Za-z\d](?:[A-Za-z\d]|-(?=[A-Za-z\d])){0,38}$/;
 const EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 const NEW_ITEM = "__new__";
@@ -219,9 +220,10 @@ function WorkOrderFields({
       : null,
   );
   const keepsLocalDraft = !editing && !template && draftScope !== null;
+  const today = () => todayIn(listQuery.data?.data[0]?.timeZone);
   const blank = (): Draft => {
     const defaults = defaultRepresentative(representative, me);
-    const period = defaultPeriod(todayIn(listQuery.data?.data[0]?.timeZone));
+    const period = defaultPeriod(today());
     return {
       code: "",
       projectId: "",
@@ -278,7 +280,7 @@ function WorkOrderFields({
     const fresh = blank();
     const stored = keepsLocalDraft && draftScope ? readWorkOrderDraft<Draft>(draftScope) : null;
     if (!stored) return { restored: false, custom: {}, draft: fresh };
-    const merged = mergeStoredDraft(fresh, stored.draft);
+    const merged = withLivePeriod(mergeStoredDraft(fresh, stored.draft), fresh, today());
     const draft: Draft = {
       ...merged,
       code: "",
@@ -343,8 +345,8 @@ function WorkOrderFields({
     .split(/[\s,]+/)
     .map((r) => r.trim())
     .filter(Boolean);
-  const badRepo = repos.find((r) => !REPO.test(r));
-  const validRepos = repos.filter((r) => REPO.test(r));
+  const badRepo = repos.find((r) => !GITHUB_REPO.test(r));
+  const validRepos = repos.filter((r) => GITHUB_REPO.test(r));
   const toggleRepo = (repo: string, checked: boolean) =>
     setDraft((current) => {
       const lines = current.repos
@@ -466,17 +468,20 @@ function WorkOrderFields({
                         ? `${representativeEmail} isn't an email address.`
                         : null;
   const checking = builderChosen && builderDefaultsQuery.isLoading;
+  const checkFailed = builderChosen && builderDefaultsQuery.isError;
   const blocker = editing
     ? null
     : checking
       ? { reason: "Checking the builder's details…", inDetails: false }
-      : sendBlocker({
-          githubLogin: github,
-          contractorEmail,
-          representativeEmail,
-          needsEmails: builderDefaults?.needsEmails ?? false,
-          accountEmail: builderDefaults?.accountEmail ?? false,
-        });
+      : checkFailed
+        ? { reason: "Couldn't check the builder's details ·", inDetails: false }
+        : sendBlocker({
+            githubLogin: github,
+            contractorEmail,
+            representativeEmail,
+            needsEmails: builderDefaults?.needsEmails ?? false,
+            accountEmail: builderDefaults?.accountEmail ?? false,
+          });
   const detailsNeeded =
     badGrace ||
     badRepresentativeEmail ||
@@ -884,7 +889,20 @@ function WorkOrderFields({
       </FieldGroup>
       <DialogFooter className="flex-wrap items-center">
         {(reason ?? blocker?.reason) && (
-          <p className="mr-auto text-xs text-muted-foreground">{reason ?? blocker?.reason}</p>
+          <p className="mr-auto flex flex-wrap items-center gap-1 text-xs text-muted-foreground">
+            {reason ?? blocker?.reason}
+            {!reason && checkFailed && (
+              <Button
+                type="button"
+                variant="link"
+                size="xs"
+                disabled={builderDefaultsQuery.isFetching}
+                onClick={() => void builderDefaultsQuery.refetch()}
+              >
+                {builderDefaultsQuery.isFetching ? "Trying…" : "Try again"}
+              </Button>
+            )}
+          </p>
         )}
         {editing ? (
           <>
diff --git a/ui/src/lib/account.ts b/ui/src/lib/account.ts
index f0a6175b..22a49695 100644
--- a/ui/src/lib/account.ts
+++ b/ui/src/lib/account.ts
@@ -10,6 +10,7 @@ import {
   myOrganizationsQueryKey,
   setActiveOrganizationKey,
 } from "./queries";
+import { clearAllWorkOrderDrafts } from "./work-order-draft";
 import { announceWorkspace, switchWorkspace } from "./workspace";
 
 export const WELCOME_PATH = "/welcome";
@@ -68,6 +69,13 @@ export async function refreshAccountQueries(queryClient: QueryClient) {
   ]);
 }
 
+export async function signOut(authClient: AuthClient) {
+  const { error } = await authClient.signOut();
+  if (error) throw new Error(error.message || "Failed to sign out");
+  await authClient.near.disconnect().catch(() => {});
+  clearAllWorkOrderDrafts();
+}
+
 export async function refreshAfterAccountChange(queryClient: QueryClient, authClient: AuthClient) {
   queryClient.clear();
   return queryClient.fetchQuery(
diff --git a/ui/src/lib/work-order-defaults.ts b/ui/src/lib/work-order-defaults.ts
index 7948dbf6..cf72dc9f 100644
--- a/ui/src/lib/work-order-defaults.ts
+++ b/ui/src/lib/work-order-defaults.ts
@@ -100,7 +100,7 @@ export function recentBudgets(
   return choices;
 }
 
-const GITHUB_REPO = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
+export const GITHUB_REPO = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
 
 export function repoFromProject(repository: string | null | undefined): string {
   if (!repository) return "";
diff --git a/ui/src/lib/work-order-draft.ts b/ui/src/lib/work-order-draft.ts
index 378b301e..d9a8fc39 100644
--- a/ui/src/lib/work-order-draft.ts
+++ b/ui/src/lib/work-order-draft.ts
@@ -58,6 +58,16 @@ export function clearAllWorkOrderDrafts(): void {
   } catch {}
 }
 
+export function withLivePeriod<T extends { periodStart: string; periodEnd: string }>(
+  draft: T,
+  fresh: T,
+  today: string,
+): T {
+  return draft.periodEnd < today
+    ? { ...draft, periodStart: fresh.periodStart, periodEnd: fresh.periodEnd }
+    : draft;
+}
+
 export function mergeStoredDraft<T extends Record<string, unknown>>(fresh: T, stored: object): T {
   const merged: Record<string, unknown> = { ...fresh };
   for (const [key, value] of Object.entries(stored)) {
diff --git a/ui/src/routes/_layout/_authenticated/profile.tsx b/ui/src/routes/_layout/_authenticated/profile.tsx
index ed61037c..b58547ce 100644
--- a/ui/src/routes/_layout/_authenticated/profile.tsx
+++ b/ui/src/routes/_layout/_authenticated/profile.tsx
@@ -25,10 +25,10 @@ import { MyOrganizations } from "@/components/my-organizations";
 import { PageHeader } from "@/components/page-header";
 import { PendingInvitationsList } from "@/components/pending-invitations";
 import { SignInMethods } from "@/components/sign-in-methods";
+import { signOut } from "@/lib/account";
 import { sessionQueryKey, sessionQueryOptions } from "@/lib/auth";
 import { realEmail } from "@/lib/membership";
 import { type NearProfile, nearProfileQueryOptions } from "@/lib/near-profile";
-import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export const Route = createFileRoute("/_layout/_authenticated/profile")({
   head: () => ({
@@ -65,9 +65,8 @@ function ProfilePage() {
   const avatarUrl = resolveAvatarUrl(profile);
 
   const signOutMutation = useMutation({
-    mutationFn: () => authClient.signOut(),
+    mutationFn: () => signOut(authClient),
     onSuccess: async () => {
-      clearAllWorkOrderDrafts();
       queryClient.setQueryData(sessionQueryKey, null);
       await queryClient.invalidateQueries({ queryKey: sessionQueryKey });
       navigate({ to: "/", replace: true });
diff --git a/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx b/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
index 538d79ee..6cec1770 100644
--- a/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
+++ b/ui/src/routes/_layout/_authenticated/work-orders/$id.tsx
@@ -38,7 +38,7 @@ import {
   signedHow,
   WorkOrderStatusBadge,
 } from "@/components/work-orders/work-order-status";
-import { refreshAfterAccountChange } from "@/lib/account";
+import { refreshAfterAccountChange, signOut } from "@/lib/account";
 import { type ApiClient, useApiClient } from "@/lib/api";
 import { useAuthClient } from "@/lib/auth";
 import {
@@ -49,7 +49,6 @@ import {
 } from "@/lib/format-amount";
 import { dateTime } from "@/lib/format-date";
 import { myWorkOrderQueryOptions, myWorkOrdersQueryKey } from "@/lib/queries";
-import { clearAllWorkOrderDrafts } from "@/lib/work-order-draft";
 
 export const Route = createFileRoute("/_layout/_authenticated/work-orders/$id")({
   head: () => ({ meta: [{ title: "Work order" }] }),
@@ -328,13 +327,8 @@ function NotYourWorkOrder({ id }: { id: string }) {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
   const switchAccount = useMutation({
-    mutationFn: async () => {
-      const { error } = await authClient.signOut();
-      if (error) throw new Error(error.message ?? "Failed to sign out");
-      await authClient.near.disconnect().catch(() => {});
-    },
+    mutationFn: () => signOut(authClient),
     onSuccess: async () => {
-      clearAllWorkOrderDrafts();
       await refreshAfterAccountChange(queryClient, authClient);
       void navigate({ to: "/sign-in", search: { redirect: `/work-orders/${id}` }, replace: true });
     },
@@ -348,13 +342,16 @@ function NotYourWorkOrder({ id }: { id: string }) {
         </EmptyMedia>
         <EmptyTitle>Work order not available</EmptyTitle>
         <EmptyDescription>
-          This work order isn't available to the account you're signed in with. Sign in with the
-          NEAR account it was sent to.
+          It may have been withdrawn, or it was sent to a NEAR account you're not signed in with.
         </EmptyDescription>
       </EmptyHeader>
       <EmptyContent>
         <div className="flex flex-wrap justify-center gap-2">
+          <Button asChild size="sm">
+            <Link to="/dashboard">My work</Link>
+          </Button>
           <Button
+            variant="outline"
             size="sm"
             disabled={switchAccount.isPending}
             onClick={() => switchAccount.mutate()}
@@ -362,9 +359,6 @@ function NotYourWorkOrder({ id }: { id: string }) {
             {switchAccount.isPending && <Spinner data-icon="inline-start" />}
             {switchAccount.isPending ? "Signing out…" : "Switch account"}
           </Button>
-          <Button asChild variant="outline" size="sm">
-            <Link to="/dashboard">My work</Link>
-          </Button>
         </div>
       </EmptyContent>
     </EmptyState>
diff --git a/ui/src/routes/_layout/accept-invitation/$id.tsx b/ui/src/routes/_layout/accept-invitation/$id.tsx
index e1228499..9b26f29b 100644
--- a/ui/src/routes/_layout/accept-invitation/$id.tsx
+++ b/ui/src/routes/_layout/accept-invitation/$id.tsx
@@ -25,7 +25,7 @@ import { AuthCardHeader } from "@/components/auth-card-header";
 import { roleLabel } from "@/components/organization-row-card";
 import { useInvitationActions } from "@/components/pending-invitations";
 import { ResendVerificationButton } from "@/components/resend-verification-button";
-import { refreshAfterAccountChange } from "@/lib/account";
+import { refreshAfterAccountChange, signOut } from "@/lib/account";
 import { sessionQueryOptions } from "@/lib/auth";
 import { classifyInvitation, type InvitationState } from "@/lib/invitations";
 import { realEmail } from "@/lib/membership";
@@ -293,11 +293,7 @@ function WrongEmail({ email, redirect }: { email: string | null; redirect: strin
   const shownEmail = realEmail(email);
 
   const switchAccount = useMutation({
-    mutationFn: async () => {
-      const { error } = await authClient.signOut();
-      if (error) throw new Error(error.message ?? "Failed to sign out");
-      await authClient.near.disconnect().catch(() => {});
-    },
+    mutationFn: () => signOut(authClient),
     onSuccess: async () => {
       await refreshAfterAccountChange(queryClient, authClient);
       navigate({ to: "/sign-in", search: { redirect }, replace: true });
diff --git a/ui/tests/work-order-draft.test.ts b/ui/tests/work-order-draft.test.ts
index cbc515e1..1de6bdd7 100644
--- a/ui/tests/work-order-draft.test.ts
+++ b/ui/tests/work-order-draft.test.ts
@@ -4,6 +4,7 @@ import {
   clearWorkOrderDraft,
   mergeStoredDraft,
   readWorkOrderDraft,
+  withLivePeriod,
   workOrderDraftKey,
   writeWorkOrderDraft,
 } from "../src/lib/work-order-draft";
@@ -87,3 +88,21 @@ describe("mergeStoredDraft", () => {
     ).toEqual({ title: "Build", graceDays: "2", autoRenew: true });
   });
 });
+
+describe("withLivePeriod", () => {
+  const fresh = { title: "", periodStart: "2026-11-01", periodEnd: "2026-11-30" };
+
+  test("replaces a stored period that has already ended", () => {
+    const stored = { title: "Build", periodStart: "2026-09-01", periodEnd: "2026-09-30" };
+    expect(withLivePeriod(stored, fresh, "2026-10-30")).toEqual({
+      title: "Build",
+      periodStart: "2026-11-01",
+      periodEnd: "2026-11-30",
+    });
+  });
+
+  test("keeps a stored period that ends today or later", () => {
+    const stored = { title: "Build", periodStart: "2026-10-01", periodEnd: "2026-10-30" };
+    expect(withLivePeriod(stored, fresh, "2026-10-30")).toBe(stored);
+  });
+});