create-ailk 0.25.1 → 0.27.0

package/templates/apps/api/src/lib/__mocks__/prisma-client.js

@@ -18,9 +18,25 @@ const MockPrismaClient = jest.fn().mockImplementation((options) => ({
 // nullable Json column reset. Real distinct sentinel objects, matching the
 // generated client's own runtime shape closely enough for identity checks
 // (`toBe(Prisma.JsonNull)`) in tests.
+//
+// #9686 — `Prisma.Sql`: a minimal stand-in for the query class
+// `tenant-db.ts`'s raw reads build (`new Prisma.Sql(strings, values)`), so a
+// suite that stubs `prisma.$queryRaw` can assert what was sent: `text` is the
+// SQL with `?` where each bound value goes, `values` the bound values in order.
+class MockSql {
+  constructor(strings, values) {
+    this.strings = strings;
+    this.values = values;
+  }
+  get text() {
+    return this.strings.join("?");
+  }
+}
+
 const Prisma = {
   JsonNull: Symbol("Prisma.JsonNull"),
   DbNull: Symbol("Prisma.DbNull"),
+  Sql: MockSql,
 };
 
 module.exports = {

package/templates/apps/api/vercel.json

@@ -13,5 +13,11 @@
   ],
   "env": {
     "NODE_ENV": "production"
-  }
+  },
+  "crons": [
+    {
+      "path": "/v1/cron/prospect-channel-archive",
+      "schedule": "0 7 * * *"
+    }
+  ]
 }

package/templates/apps/mcp/CLAUDE.md

@@ -124,7 +124,7 @@ Every tool maps 1:1 to an `apps/api` endpoint. When you change a tool, change th
 
 - **21 in the `TOOLS` array / parity test**: the `TOOLS` array in
   `packages/metadata/src/mcp-tool-catalog.ts` defines 21 anonymous tools; the
-  parity test counts that full array. It also holds the eighteen signed-in
+  parity test counts that full array. It also holds the thirty-one signed-in
   workspace tools (#3591), which no anonymous view returns — see § The
   signed-in workspace surface below.
 - **19 registered on a KEYLESS deployment, 20 on a commerce-claimed one,
@@ -170,29 +170,38 @@ here. Spec: `docs/specs/3591-tenant-scoped-agent-auth-secure-spec.md` D13–D16.
 - **apps/mcp checks only the key's shape.** The key is attached as the SDK's `req.auth` for that
   request alone and reaches a tool as `extra.authInfo.token`. apps/api is the one place it is
   checked, and its tenant guard and the caller's clamped role decide every answer.
-- **Eighteen tools, each a `twin`.** The catalog rows carry `surface: "workspace"`, `tier: "pro"`
+- **Thirty-one tools, each a `twin`.** The catalog rows carry `surface: "workspace"`, `tier: "pro"`
   and `modulesAnyOf` (the modules any one of which registers the tool — its twin route's gate):
-  `get_agent_context`, the four message tools, the three submission tools, the three
+  `get_agent_context`, (#9683) `get_workspace_knowledge` — twin of `GET
+  /v1/workspaces/:workspaceId/knowledge`: the business's shown offerings, live magnets, listed
+  meeting types, sites served and strategy documents, read with the `people-read` or
+  `people-memory-propose` grant — the five message tools (#9686 added `list_inbox_threads`, twin of
+  `GET …/messages/threads`: the inbox's threads, 25 to a page with a count per view; Done now
+  archives the message's thread and accept no longer marks it done, and an agent reaches any
+  inbox tool only with the `inbox-act` grant), the three submission tools, the three
   listing application tools (#9137: `list_listing_applications`, `get_listing_application`,
   `decide_listing_application` — a `ProjectListing` row, never a job application, which is a Job
   application magnet's submission; the pre-rename `list_inbox_applications`,
   `get_inbox_application` and `decide_inbox_application` stay registered for one release as
-  deprecated aliases of the same handlers, each description opening `Deprecated: use …`) and (#8514) the two People notes tools, `get_person_notes` and
+  deprecated aliases of the same handlers, each description opening `Deprecated: use …`) and (#9714) `list_people` — twin of `GET /v1/workspaces/:workspaceId/people` in both its modes: newest-first pages by `cursor`, or with `changedSince` the clients whose thread gained an inbound item since then, oldest first with `more`, needing the `people-read` grant — and (#8514) the two People notes tools, `get_person_notes` and
   `set_person_notes` — the team's private note on one client, which an agent reads and writes
   only with the `member-pieces-manage` grant; `set_person_notes` requires the `ifUpdatedAt` it
   read and is refused `notes_changed` when someone saved since — and (#8516) the two proposals
   tools, `list_proposals` and `create_proposal`, twinning `GET`/`POST
   /v1/workspaces/:workspaceId/people/:personId/proposals` with the same grant: a proposal is
   private to one client, `payments` says whether approval leads to a Stripe page, and an agent's
-  price is refused `proposal_needs_person` (a person prices). Each takes its route's params, query and body and returns the route's
+  price is refused `proposal_needs_person` (a person prices) — and (#9681) the four person-thread tools, `get_person_thread`, `set_person_thread_state`, `list_external_threads` and `add_external_thread`, twinning `GET`/`PATCH …/people/:personId/thread` and `GET`/`POST …/people/:personId/external-threads`: a client's whole thread page by page with its read/archived/resolved state, and pointers to email and Slack threads (never message text); reading needs the `people-read` grant, writing also `inbox-act`, and the client erasure route has no tool, by decision — and (#9682) the three person-memory tools, `list_person_memories`, `get_person_memory` and `propose_person_memory`, twinning `GET …/people/:personId/memories`, `GET …/memories/:path` and `POST …/memories`: an agent reads only live, unexpired memories (confirmed by a person, read within 180 days) and its proposal is never live — a new path is a draft, a confirmed one gets a pending version — needing the `people-read` or `people-memory-propose` grant to read and `people-memory-propose` to propose; the six person-only memory routes (edit, delete, confirm, redact, the versions list, restore) have no tool, by decision — and (#9749) `get_slack_connection_status`, twin of `GET /v1/workspaces/:workspaceId/slack-connection` (registered with `workspace`/`multi-tenant`, its route's `TENANCY` row: whether the Organization's Slack is connected, its team name and the date, never a credential; connect and disconnect are a person's act and have no tool, by decision), and `get_prospect_channel_settings` / `set_prospect_channel_settings`, twins of `GET`/`PUT …/prospect-channel` (registered with `scheduling`, their routes' module): the update replaces every field, needs the `meeting-types-manage` grant, is refused `slack_not_connected` while the Organization has no Slack connection, and an agent may change only `enabled`, `channelPrefix` and `archiveDays` — a change to `memberIds` or `welcomeTemplate` is refused `prospect_channel_needs_person`. Each takes its route's params, query and body and returns the route's
   `data`. They are in the parity guard like every other tool, and never in
   `/.well-known/mcp.json`.
 - **Handlers forward, nothing else.** `workspace-server.ts` resolves each tool from
-  `@working-theory/mcp-workspace`'s `workspaceTools` (`agent_context.ts`, `inbox_messages.ts`,
-  `inbox_submissions.ts`, `inbox_applications.ts`, `person_notes.ts`, `proposals.ts`, all
-  `// oss: false`), loaded through the site's generated registry, as `server.ts` resolves the
+  `@working-theory/mcp-workspace`'s `workspaceTools` (`agent_context.ts`, `knowledge.ts`, `inbox_messages.ts`,
+  `inbox_submissions.ts`, `inbox_applications.ts`, `people_list.ts`, `person_notes.ts`, `person_thread.ts`, `person_memory.ts`, `proposals.ts`, `slack_connection.ts`, all
+  `// oss: false`) and, for the two prospect-channel settings tools, `@working-theory/mcp-scheduling`'s
+  `workspaceTools` (`prospect_channel_settings.ts`, #9749 — the pack the scheduling module carries, so a
+  scheduling-only build serves what it lists), loaded through the site's generated registry, as `server.ts` resolves the
   module-gated tools from their packs (#9460). Each calls `@working-theory/api-client`'s `inbox` surface
-  (the notes and proposals tools, its `people` surface) with the key. A refusal from the
+  (the people-list, notes, person-thread, person-memory and proposals tools, its `people` surface; the
+  Slack status and prospect-channel tools, its `slack` surface) with the key. A refusal from the
   route is an MCP tool error naming the route's `error.code` and HTTP status only.
 - **Never log or return the key.** Don't log or serialise `extra`, `extra.authInfo` or
   `extra.requestInfo` — the SDK puts the raw `authorization` header there.
@@ -268,7 +277,15 @@ Example (lead routing):
 - Don't add a tool without the matching `apps/api` endpoint.
 - Don't put business logic in tool handlers — they're adapters.
 
-Last updated: 2026-10-22 — #9460: the server is `@working-theory/mcp-server` and the paid tools ride `packages-paid/mcp-*`; `src/` is the five-file boot set, `lib/paid-tools.generated.ts` is the one door to a paid MCP package, and the specifier tables are gone — verified against `packages/mcp-server/src/{server,workspace-server,boot,run,site}.ts`, `apps/mcp/src/{index,app,site}.ts` and `packages/create-ailk/src/paid-sections.ts`.
+Last updated: 2026-10-24 — #9749: `get_slack_connection_status` (`mcp-workspace`'s `slack_connection.ts`) and `get_prospect_channel_settings` / `set_prospect_channel_settings` (`mcp-scheduling`'s `prospect_channel_settings.ts`, the first signed-in handlers outside `mcp-workspace`) twin the Slack status read and the prospect-channel settings pair — the signed-in workspace surface is thirty-one tools — verified against `packages/metadata/src/mcp-tool-catalog.ts`, `packages-paid/mcp-workspace/src/index.ts`, `packages-paid/mcp-scheduling/src/index.ts` and `tests/parity/api-parity/kinds/site.ts`.
+
+Prior: 2026-10-24 — #9714: `list_people` (`people_list.ts`) twins `GET /v1/workspaces/:workspaceId/people` in both its modes — the signed-in workspace surface is twenty-eight tools — verified against `packages/metadata/src/mcp-tool-catalog.ts`, `packages-paid/mcp-workspace/src/index.ts` and `tests/parity/api-parity/kinds/site.ts`.
+
+Prior: 2026-10-24 — #9686: `list_inbox_threads` (`inbox_messages.ts`) twins `GET /v1/workspaces/:workspaceId/messages/threads` — the signed-in workspace surface is twenty-seven tools — verified against `packages/metadata/src/mcp-tool-catalog.ts`, `packages-paid/mcp-workspace/src/index.ts` and `tests/parity/api-parity/kinds/site.ts`.
+
+Prior: 2026-10-24 — #9683: `get_workspace_knowledge` (`knowledge.ts`) twins `GET /v1/workspaces/:workspaceId/knowledge` — the signed-in workspace surface is twenty-three tools; the inbox write twins forward no agent-session header — verified against `packages/metadata/src/mcp-tool-catalog.ts`, `packages-paid/mcp-workspace/src/index.ts` and `tests/parity/api-parity/kinds/site.ts`.
+
+Prior: 2026-10-22 — #9460: the server is `@working-theory/mcp-server` and the paid tools ride `packages-paid/mcp-*`; `src/` is the five-file boot set, `lib/paid-tools.generated.ts` is the one door to a paid MCP package, and the specifier tables are gone — verified against `packages/mcp-server/src/{server,workspace-server,boot,run,site}.ts`, `apps/mcp/src/{index,app,site}.ts` and `packages/create-ailk/src/paid-sections.ts`.
 
 Prior: 2026-10-22 — #9534: `create_project` registers only while create-ailk's `release-scope.json` marks the Free level released (the release-scope filter in `shouldRegister`, re-applied at call time) — 19 registered keyless and 20 claimed while Free is held — and the content-root rule names the tool's `<cwd>/packages/create-ailk` root as its standing exception — verified against `apps/mcp/src/tools/create_project.ts`, `apps/mcp/src/server.ts` and `apps/web/app/.well-known/mcp.json/route.ts`.
 

package/templates/apps/web/.env.example

@@ -47,6 +47,19 @@ CONTENT_ADAPTER=mdx
 # NEXT_PUBLIC_; see the repo-root .env.example, #7394). A cross-site post is
 # refused before the hub is called.
 #
+# THE BOOKING BOT CHECK (#9889). On Vercel, POST /v1/schedule/book asks Vercel
+# BotID for a verdict before the hub is called: a bot is refused 403
+# bot_detected, so no booking and no Slack invite exist. A real visitor sees no
+# extra step. It is ON by default; set this to `off` to turn it off (any other
+# value leaves it on). Off Vercel it cannot run, so it is inert and the server
+# logs that once. On Vercel it needs the project's OIDC token (on by default):
+# without it every booking answers 503 bot_check_unavailable, as it does when
+# BotID cannot answer. A self-hosted or local `next start` must not carry
+# VERCEL=1 (as `vercel env pull` writes it), or every booking answers 503.
+# Basic or Deep Analysis is the Vercel project's own setting; Deep Analysis is
+# billed per check.
+# AILK_BOOKING_BOT_CHECK=
+#
 # EDGE PRECONDITION: the relay forwards x-forwarded-for exactly as this site
 # received it, so run the site behind an edge that OVERWRITES the client-address
 # headers (as Vercel does), not one that appends to them. Otherwise a caller

package/templates/apps/web/CLAUDE.md

@@ -14,7 +14,7 @@ Inherits root `CLAUDE.md`. This file adds web-specific rules.
 
 ## Always do first
 
-- For any UI work: read § Theme & styling and § Iterate visually below before writing code. To add a whole page, run the `/ailk:add-page` skill.
+- For any UI work: read § Theme & styling and § Iterate visually below before writing code. To add a whole page, run `/ailk:growth-ops page add`.
 - For any page-rendering or schema-emission work: read `packages/schema/README.md` (catalog) and `packages/schema/CLAUDE.md` (operational layer + component map) if you haven't this session.
 - For content authoring questions: read `content/CLAUDE.md` first.
 - For a full page build, follow the per-page loop (Content intent → Layout → Author content → Visual iterate). The visual-iterate step uses `screenshots/` as scratch (see § Iterate visually).
@@ -130,6 +130,25 @@ older hub's 404). The carried `__Host-ailk-signup-agreements` cookie is
 retired. Policy links on every agreement surface come from
 `lib/consent-policies.ts`'s `consentPoliciesFor(locale)`.
 
+**A magic link can create the account while sign-up is open (#9667).** With
+the email sign-in link on, an open `/sign-up` is the one-field "Send me a
+magic link" body (the page's method is `magic-link` before `password`), and
+the card POSTs `/api/auth/sign-in/magic-link` with the ticked agreements and
+locale in `metadata`. A request carrying that key is a sign-up request: the
+plugin refuses it `400 SIGN_UP_CLOSED` on a closed site and
+`400 AGREEMENTS_REQUIRED` without the agreements, before any lookup; the
+callback binds the accepted agreements to the token (a `verification` row
+keyed on SHA-256 of the token) and mails the address whether or not it has
+an account (`userId: "sign-up"` for a new one). The plugin's
+`disableSignUp` follows `isSignUpOpen()`. On verify, the user hook refuses —
+a redirect to `/sign-up?error=AGREEMENTS_REQUIRED` — a new user whose token
+has no binding or whose binding no longer covers the evidence, and the
+session hook writes the grants in their own transaction before the session
+exists, deleting the user if that write fails. A request with no `metadata`
+(every `/sign-in` one) is a sign-in, unchanged. Not one transaction: a crash
+between the user and grant inserts leaves a user with no grant, whom the
+account interstitial stops.
+
 ## Contact page
 
 The contact page (`apps/web/app/[locale]/contact/page.tsx`) renders the
@@ -470,10 +489,12 @@ one `[offerings-checkout] refused reason=<reason>` warning; no response or
 log line carries the key. It sends `OSS_API_INTERNAL_SECRET` as
 `x-internal-auth` only from a site that is not a spoke and only to an
 `https:` or loopback API, so the hub's own `apps/web` must hold the API's
-value when the API sets it. A spoke never holds that secret: it sells only
-when its hub lists the spoke's origin in `AILK_TRUSTED_ORIGINS` and does not
-set `OSS_API_INTERNAL_SECRET`, and otherwise every spoke buy returns to
-`/pricing`.
+value when the API sets it. A spoke never holds that secret: on a hub that
+sets `OSS_API_INTERNAL_SECRET` its spoke key authenticates the buy, which
+sells when the spoke's hub sign-in client is enabled with its callback on the
+spoke's own origin (#9910); on a hub that does not set it, the buy sells when
+the hub lists the spoke's origin in `AILK_TRUSTED_ORIGINS`. Otherwise every
+spoke buy returns to `/pricing`.
 
 An existing scaffold adopts the new page by bringing
 `lib/offerings-pricing.ts`, `app/api/offerings/checkout/[lookupKey]/route.ts`
@@ -533,6 +554,7 @@ A visitor's browser never calls the hub. Lead capture, newsletter signup, callba
 - **No cross-site POST.** A `Sec-Fetch-Site` other than `same-origin`, or an `Origin` not on this site's own host, is refused 403 before the hub is called.
 - **Headers are an allow-list.** The visitor's `x-forwarded-for` (else `x-real-ip`) and `user-agent` pass through so per-visitor rate limits still count each visitor; no `authorization`, client-sent `x-ailk-*` or `host` is forwarded, and a `cookie` goes only on `POST /v1/commerce/invoices`, the one session route.
 - **The relay has its own per-visitor budget (#7707).** Each visitor gets 8 calls per 10 minutes across the five visitor routes, and the session route (`POST /v1/commerce/invoices`) gets its own, wider budget of 30 per 10 minutes; the call that exceeds either gets `429 rate_limited` before any hub call. The budget is held in this instance's own process (no shared store, no env variable) and holds only where the site's edge overwrites `x-forwarded-for` and `x-real-ip` — Vercel does; a bare self-hosted Next server does not.
+- **A bot check on the booking (#9889).** On Vercel, `POST /v1/schedule/book` asks Vercel BotID (`checkBotId`, from `BOT_CHECKED_ROUTES`) for a verdict after every refusal above and before the hub is called: a bot is `403 bot_detected`, and a check that throws, answers no boolean or takes over 5 seconds is `503 bot_check_unavailable`, so a scripted booking never reaches Cal.com or Slack. It is on unless `AILK_BOOKING_BOT_CHECK=off` and inert off Vercel; the locale layout mounts `BotIdClient` on the same list and predicate, `next.config.mjs` wraps `withBotId`, and `middleware.ts` keeps BotID's proxy prefix out of its matcher.
 - `/v1` is exempt from next-intl's locale rewrite in `middleware.ts`, as `/api` is.
 
 ## AEO & performance
@@ -551,7 +573,13 @@ A visitor's browser never calls the hub. Lead capture, newsletter signup, callba
 - Don't reach into `apps/api` or `apps/mcp` from `apps/web`. They're peer apps — talk via HTTP/MCP.
 - Don't commit images to `screenshots/` — only the `.gitkeep` is tracked.
 
-Last updated: 2026-10-21 — § Pricing page and § Magnet pages: `/pricing`, the magnet pages and the results permalink read the browser-facing API origin through `browserApiOrigin()` (#7874 D12), so a spoke that enables them passes its own `env:check` (#9480) — verified against `app/[locale]/pricing/page.tsx`, `app/[locale]/flows/[slug]/{magnet-page.tsx,results/[payload]/page.tsx}` and `lib/api-origin.generated.ts`.
+Last updated: 2026-10-25 — the Offerings buy route's spoke sentence: on a hub that sets `OSS_API_INTERNAL_SECRET` a spoke's key authenticates its buy, held to its hub sign-in client's origin (#9910) — verified against `app/api/offerings/checkout/[lookupKey]/route.ts` and `packages/api/src/routes/checkout/sessions.ts`.
+
+Prior: 2026-10-25 — § The same-origin relay: the booking bot check — Vercel BotID on `POST /v1/schedule/book`, `bot_detected` / `bot_check_unavailable`, the `AILK_BOOKING_BOT_CHECK` switch and the middleware's BotID exclusion (#9889) — verified against `lib/relay.ts`, `app/[locale]/layout.tsx`, `next.config.mjs` and `middleware.ts`.
+
+Prior: 2026-10-24 — § The `(auth)` route group: a magic link can create the account while sign-up is open, carrying the ticked agreements bound to its token (#9667) — verified against `lib/auth-email.ts`, `lib/sign-up-agreements.ts` and `app/[locale]/(auth)/sign-up/{page,sign-up-card}.tsx`.
+
+Prior: 2026-10-21 — § Pricing page and § Magnet pages: `/pricing`, the magnet pages and the results permalink read the browser-facing API origin through `browserApiOrigin()` (#7874 D12), so a spoke that enables them passes its own `env:check` (#9480) — verified against `app/[locale]/pricing/page.tsx`, `app/[locale]/flows/[slug]/{magnet-page.tsx,results/[payload]/page.tsx}` and `lib/api-origin.generated.ts`.
 
 Prior: 2026-10-20 — § Magnet pages: the trial magnet's pair, `/trial` (its button to `/trial/request` through `renderMagnetLanding`'s `startPath`) and the chrome-free `/trial/request` walk with its own `<h1>` fallback (#9287 C2, DD10) — verified against `app/[locale]/flows/[slug]/magnet-page.tsx`, `app/[locale]/trial/{page,request/page}.tsx` and `lib/magnet-routes.ts`.
 

package/templates/apps/web/app/[locale]/(auth)/__tests__/auth-pages.test.tsx

@@ -17,7 +17,7 @@
  * `next-intl/server` is mocked globally (apps/web/__tests__/setup.ts) against
  * the real en.json, so the `auth` copy is asserted by its real strings.
  */
-import { render, screen } from "@testing-library/react";
+import { render, screen, within } from "@testing-library/react";
 
 const mockGetActiveProviderIds = jest.fn();
 const mockIsSignUpOpen = jest.fn();
@@ -217,12 +217,51 @@ describe("/sign-up follows isSignUpOpen()", () => {
   it("renders the invitation intent when sign-up is closed", async () => {
     mockIsSignUpOpen.mockReturnValue(false);
     await renderPage(SignUpPage);
-    expect(screen.getByTestId("auth-invitation-body")).toBeInTheDocument();
+    expect(screen.getByTestId("auth-invitation-body")).toHaveTextContent(
+      en.auth.invitationBody,
+    );
     expect(
-      screen.getByRole("heading", { name: en.auth.invitationHeading }),
+      screen.getByRole("heading", { name: en.auth.signUpHeading }),
     ).toBeInTheDocument();
     expect(screen.queryByTestId("auth-submit")).not.toBeInTheDocument();
   });
+
+  // The one card (#9662) frames both branches: the mark, "Sign up", the toggle
+  // line to /sign-in (no footer cross-link) and the acknowledgement.
+  it.each([
+    ["closed", false],
+    ["open", true],
+  ] as const)("frames the %s card: mark, 'Sign up', toggle line, footnote (#9662)", async (_name, open) => {
+    mockIsSignUpOpen.mockReturnValue(open);
+    mockGetActiveProviderIds.mockReturnValue(["google", "email"]);
+    await renderPage(SignUpPage);
+    expect(screen.getByTestId("auth-card-logo")).toBeInTheDocument();
+    expect(screen.getByRole("heading", { name: "Sign up" })).toBeInTheDocument();
+    expect(screen.getByTestId("auth-card-prospect")).toHaveTextContent(
+      /^Already have an account\? Sign in$/,
+    );
+    expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+      "href",
+      "/sign-in",
+    );
+    expect(screen.queryByTestId("auth-footer-link")).not.toBeInTheDocument();
+    expect(screen.getByTestId("auth-card-footnote")).toHaveTextContent(
+      /^You acknowledge that you read, and agree to our Terms of Service and our Privacy Policy\.$/,
+    );
+    const footnote = within(screen.getByTestId("auth-card-footnote"));
+    expect(footnote.getByRole("link", { name: "Terms of Service" })).toHaveAttribute("href", "/terms");
+    expect(footnote.getByRole("link", { name: "Privacy Policy" })).toHaveAttribute("href", "/privacy");
+  });
+
+  it("offers 'or' + Google under the open card's form, with the consent checkboxes kept (#9662; #8438 D13)", async () => {
+    mockIsSignUpOpen.mockReturnValue(true);
+    mockGetActiveProviderIds.mockReturnValue(["google", "email"]);
+    await renderPage(SignUpPage);
+    expect(screen.getByLabelText("Email")).toBeInTheDocument();
+    expect(screen.getByTestId("auth-divider")).toHaveTextContent(/^or$/);
+    expect(screen.getByTestId("auth-social-google")).toBeInTheDocument();
+    expect(screen.getByTestId("sign-up-agreements")).toBeInTheDocument();
+  });
 });
 
 describe("/forgot-password and /reset-password follow the reset predicate", () => {
@@ -266,9 +305,9 @@ describe("/forgot-password and /reset-password follow the reset predicate", () =
 
 // ── Every non-form page routes back to sign-in ───────────────────────────────
 
+// A closed /sign-up routes back through its toggle line instead (#9662, above).
 describe("the copy-only intents route back to sign-in", () => {
   it.each([
-    ["sign-up (closed)", SignUpPage],
     ["forgot-password (unavailable)", ForgotPasswordPage],
     ["reset-password (unavailable)", ResetPasswordPage],
     ["verify-email", VerifyEmailPage],

package/templates/apps/web/app/[locale]/(auth)/legal-footnote.tsx

@@ -0,0 +1,35 @@
+/**
+ * The acknowledgement at the foot of every auth card (#8790 D6) — "You
+ * acknowledge that you read, and agree to our Terms of Service and our Privacy
+ * Policy." (#9662) — linking the site's own policy routes through the inline
+ * link variant, so the card never hardcodes a path.
+ *
+ * One builder for `/sign-in`, `/sign-up` and the `(authed)` gate.
+ * `caption` is the muted footnote role; a default `Text` would re-impose body
+ * size and the foreground colour over the card's footnote wrapper.
+ */
+
+import { localeHref } from "@working-theory/ui";
+import { Link, Text } from "@working-theory/ui/primitives";
+import type { ReactElement } from "react";
+
+import type { SignInCardText } from "./sign-in/sign-in-text";
+
+export function legalFootnote(
+  locale: string,
+  text: SignInCardText["acknowledgement"],
+): ReactElement {
+  return (
+    <Text as="p" variant="caption">
+      {text.lead}{" "}
+      <Link variant="inline" href={localeHref(locale, "/terms")}>
+        {text.terms}
+      </Link>{" "}
+      {text.and}{" "}
+      <Link variant="inline" href={localeHref(locale, "/privacy")}>
+        {text.privacy}
+      </Link>
+      {text.end}
+    </Text>
+  );
+}

package/templates/apps/web/app/[locale]/(auth)/sign-in/__tests__/next-path.test.ts

@@ -2,8 +2,11 @@
  * Tests for `resolveNextPath` — the /sign-in `?next=` sanitizer (#4984).
  * Foreign, protocol-relative, backslash, control-char, and non-string inputs
  * all fall back; plain in-app paths pass through unchanged.
+ *
+ * `hrefWithNext` (#9912 D4) — a toggle carries `?next=` only when the page's
+ * resolved `next` is not its fallback.
  */
-import { resolveNextPath } from "../next-path";
+import { hrefWithNext, resolveNextPath } from "../next-path";
 
 const FALLBACK = "/account";
 
@@ -29,3 +32,23 @@ describe("resolveNextPath()", () => {
     expect(resolveNextPath(raw, FALLBACK)).toBe(FALLBACK);
   });
 });
+
+describe("hrefWithNext()", () => {
+  it("the fallback gives the bare href", () => {
+    expect(hrefWithNext("/sign-up", "/account", "/account")).toBe("/sign-up");
+  });
+
+  it("any other next rides as ?next=, URL-encoded", () => {
+    expect(
+      hrefWithNext("/sign-up", "/api/auth/hub/continue/abc_-1", "/account"),
+    ).toBe("/sign-up?next=%2Fapi%2Fauth%2Fhub%2Fcontinue%2Fabc_-1");
+    expect(
+      hrefWithNext("/fr/sign-in", "/fr/account?tab=x", "/fr/account"),
+    ).toBe("/fr/sign-in?next=%2Ffr%2Faccount%3Ftab%3Dx");
+  });
+
+  it("a refused next resolves to the fallback, so its toggle is bare", () => {
+    const next = resolveNextPath("//evil.example", FALLBACK);
+    expect(hrefWithNext("/sign-up", next, FALLBACK)).toBe("/sign-up");
+  });
+});

package/templates/apps/web/app/[locale]/(auth)/sign-in/__tests__/page.test.tsx

@@ -24,11 +24,19 @@
  *   (i) the hinted email (#8757 D9): a valid single `?email=` is the starting
  *       value of every email input of the card; an invalid or repeated value,
  *       or none, leaves them empty as before. It signs no one in.
+ *   (j) the one card (#9662): the site's logo and "Sign in to <site>" from
+ *       the deployment's own data — a crafted query parameter cannot change
+ *       the name — the "Don't have an account? Sign up" line linking
+ *       /sign-up, and the Terms + Privacy acknowledgement.
+ *   (k) the Sign up toggle (#9912 D4): it carries the validated `?next=` to
+ *       /sign-up; a `next` resolveNextPath refuses, or none, gives the bare
+ *       /sign-up.
  *
- * `next-intl/server` is mocked globally (apps/web/__tests__/setup.ts) against
- * the real en.json, so `signIn` copy is asserted by its real strings.
+ * `next-intl/server` is mocked here against the real en.json, with `{name}`
+ * placeholders filled from the values passed, so `signIn` copy is asserted
+ * by its real strings and the heading by the name actually interpolated.
  */
-import { render, screen } from "@testing-library/react";
+import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 
 const mockGetActiveProviderIds = jest.fn();
@@ -75,7 +83,31 @@ jest.mock("@working-theory/api-client", () => ({
   __esModule: true,
   hubSignIn: { clientInfo: (...args: unknown[]) => mockClientInfo(...args) },
 }));
+// The global shim (__tests__/__mocks__/next-intl-server.ts) returns messages
+// uninterpolated; this suite fills `{name}` placeholders so the heading's
+// organization name is the one the page actually passed (#9662).
+jest.mock("next-intl/server", () => {
+  const messages = jest.requireActual("../../../../../messages/en.json") as Record<
+    string,
+    Record<string, string>
+  >;
+  return {
+    __esModule: true,
+    getTranslations: async ({ namespace }: { namespace: string }) => {
+      const catalog = messages[namespace];
+      const t = (key: string, values?: Record<string, string>): string =>
+        (catalog?.[key] ?? `${namespace}.${key}`).replace(
+          /\{(\w+)\}/g,
+          (match, name: string) => values?.[name] ?? match,
+        );
+      t.has = (key: string): boolean => catalog?.[key] !== undefined;
+      return t;
+    },
+  };
+});
+
 import { mintContinuation } from "../../../../api/auth/hub/continuation";
+import { SITE_NAME } from "../../../../../lib/site-brand";
 import en from "../../../../../messages/en.json";
 import Page, { generateMetadata } from "../page";
 
@@ -119,7 +151,9 @@ describe("/sign-in page", () => {
     expect(screen.queryByTestId("auth-submit")).toBeNull();
     expect(screen.queryByTestId("auth-footer-link")).toBeNull();
     expect(screen.queryByText(/create an account/i)).toBeNull();
-    expect(screen.getByText(en.signIn.heading)).toBeInTheDocument();
+    expect(
+      screen.getByRole("heading", { name: `Sign in to ${SITE_NAME}` }),
+    ).toBeInTheDocument();
   });
 
   it("(b) email + OAuth: password body with both social buttons, no sign-up footer", async () => {
@@ -241,7 +275,7 @@ describe("/sign-in page — the email sign-in link (#7435)", () => {
     expect(screen.getByTestId("auth-submit")).toHaveTextContent(
       en.signIn.emailLinkSubmit,
     );
-    expect(en.signIn.emailLinkSubmit).toBe("Email me a sign-in link");
+    expect(en.signIn.emailLinkSubmit).toBe("Send me a magic link");
     // One "or" divider between the primary and Google (#8790 D5).
     expect(screen.getAllByTestId("auth-divider")).toHaveLength(1);
     expect(screen.queryByTestId("auth-email-link-divider")).toBeNull();
@@ -252,9 +286,11 @@ describe("/sign-in page — the email sign-in link (#7435)", () => {
     await renderPage();
     expect(screen.getByTestId("auth-email")).toBeInTheDocument();
     expect(screen.queryByText(en.signIn.notConfiguredSubhead)).toBeNull();
-    // "Welcome back" stands alone — no subhead (#8790 D3).
-    expect(screen.getByText(en.signIn.heading)).toBeInTheDocument();
-    expect(en.signIn.heading).toBe("Welcome back");
+    // The heading stands alone — no subhead (#8790 D3); #9662 names the site.
+    expect(
+      screen.getByRole("heading", { name: `Sign in to ${SITE_NAME}` }),
+    ).toBeInTheDocument();
+    expect(en.signIn.heading).toBe("Sign in to {site}");
     expect(screen.queryByTestId("auth-method-switch")).toBeNull();
   });
 
@@ -415,3 +451,127 @@ describe("/sign-in page — the hinted email (#8757 D9)", () => {
     },
   );
 });
+
+describe("/sign-in page — the one card (#9662)", () => {
+  beforeEach(() => {
+    mockGetActiveProviderIds.mockReturnValue(["google", "email", "magic-link"]);
+  });
+
+  it("(j) renders the site's logo and 'Sign in to <site>' from the deployment's data", async () => {
+    await renderPage("/account");
+    expect(screen.getByTestId("auth-card-logo")).toBeInTheDocument();
+    expect(screen.getByRole("heading", { level: 2 })).toHaveTextContent(
+      `Sign in to ${SITE_NAME}`,
+    );
+    expect(screen.getByLabelText(en.signIn.email)).toBe(
+      screen.getByTestId("auth-email"),
+    );
+    expect(en.signIn.email).toBe("Email");
+  });
+
+  it("(j) a crafted query parameter cannot change the organization name", async () => {
+    const crafted = "Evil Corp";
+    expect(SITE_NAME).not.toBe(crafted);
+    const el = await Page({
+      params: Promise.resolve({ locale: "en" }),
+      searchParams: Promise.resolve({
+        next: `/account?site=${encodeURIComponent(crafted)}`,
+        site: crafted,
+        organization: crafted,
+        name: crafted,
+        siteName: crafted,
+      }),
+    });
+    render(el);
+    expect(screen.getByRole("heading", { level: 2 })).toHaveTextContent(
+      `Sign in to ${SITE_NAME}`,
+    );
+    expect(document.body.textContent).not.toContain(crafted);
+  });
+
+  it("(j) the prospect line toggles to /sign-up, with no trailing period", async () => {
+    await renderPage("/account");
+    expect(screen.getByTestId("auth-card-prospect")).toHaveTextContent(
+      /^Don't have an account\? Sign up$/,
+    );
+    expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+      "href",
+      "/sign-up",
+    );
+  });
+
+  it("(j) 'Send me a magic link' first, the in-place password switch, then 'or' and Google", async () => {
+    await renderPage("/account");
+    expect(screen.getByTestId("auth-submit")).toHaveTextContent(
+      "Send me a magic link",
+    );
+    expect(screen.getByTestId("auth-method-switch")).toHaveTextContent(
+      "Sign in using password",
+    );
+    expect(screen.getByTestId("auth-divider")).toHaveTextContent(/^or$/);
+    expect(screen.getByTestId("auth-social-google")).toBeInTheDocument();
+  });
+
+  it("(j) ends on the Terms of Service + Privacy Policy acknowledgement, linking the site's own routes", async () => {
+    await renderPage("/account");
+    const footnote = screen.getByTestId("auth-card-footnote");
+    expect(footnote).toHaveTextContent(
+      /^You acknowledge that you read, and agree to our Terms of Service and our Privacy Policy\.$/,
+    );
+    expect(
+      within(footnote).getByRole("link", { name: "Terms of Service" }),
+    ).toHaveAttribute("href", "/terms");
+    expect(
+      within(footnote).getByRole("link", { name: "Privacy Policy" }),
+    ).toHaveAttribute("href", "/privacy");
+    expect(within(footnote).getAllByRole("link")).toHaveLength(2);
+  });
+});
+
+describe("/sign-in page — the Sign up toggle keeps the next (#9912 D4)", () => {
+  beforeEach(() => {
+    mockClientInfo.mockReset().mockResolvedValue({ ok: false, status: 404 });
+  });
+
+  it("(k) a continuation next rides the toggle to /sign-up, URL-encoded", async () => {
+    const ref = mintContinuation("client_id=spoke_1", TEST_SECRET);
+    const next = `/api/auth/hub/continue/${ref}`;
+    await renderPage(next);
+    expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+      "href",
+      `/sign-up?next=${encodeURIComponent(next)}`,
+    );
+  });
+
+  it("(k) an in-app next rides the toggle too", async () => {
+    await renderPage("/account/billing");
+    expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+      "href",
+      "/sign-up?next=%2Faccount%2Fbilling",
+    );
+  });
+
+  it.each([
+    ["a protocol-relative next", "//evil.example"],
+    ["an absolute next", "https://evil.example/x"],
+    ["a backslash next", "/\\evil.example"],
+    ["a control character", "/x\r\ny"],
+  ])(
+    "(k) %s fails resolveNextPath, so the toggle is the bare /sign-up",
+    async (_label, next) => {
+      await renderPage(next);
+      expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+        "href",
+        "/sign-up",
+      );
+    },
+  );
+
+  it("(k) no next: the bare /sign-up", async () => {
+    await renderPage();
+    expect(screen.getByTestId("auth-card-prospect-link")).toHaveAttribute(
+      "href",
+      "/sign-up",
+    );
+  });
+});

package/templates/apps/web/app/[locale]/(auth)/sign-in/next-path.ts

@@ -3,5 +3,18 @@
  * `lib/next-path.ts` (#7894 D7) so the hub-session callback, which a spoke
  * keeps when it drops this route group, shares it. Re-exported here so this
  * group's importers are unchanged.
+ *
+ * `hrefWithNext` (#9912 D4) builds the /sign-in ↔ /sign-up toggle: it carries
+ * the page's validated `next` only when that is not the page's fallback, so a
+ * refused or absent `next` gives today's bare link.
  */
 export { resolveNextPath } from "../../../../lib/next-path";
+
+/** `href` with `?next=<next>` when `next` is not the page's fallback, else `href`. */
+export function hrefWithNext(
+  href: string,
+  next: string,
+  fallback: string,
+): string {
+  return next === fallback ? href : `${href}?next=${encodeURIComponent(next)}`;
+}