897005a · 43e3e78 · de19d61 · 92c4deb
@@ -1,6 +1,6 @@
/**
 * What an origin's sync and disconnect say, in one place so the page in
 * Settings › Origins and the terminal's Connected origins say the same thing.
 * Settings › Origins and the terminal's Origins screen say the same thing.
 */
export const NO_SUCH_ORIGIN = "No such origin.";
@@ -1,5 +1,5 @@
/**
 * Connected origins in the terminal: the hosts your mirrors come from, as
 * Origins in the terminal: the hosts your mirrors come from, as
 * Settings › Origins lists them. `s` syncs the selected one now, `d` disconnects
 * it after a confirm — through `actions/origins.ts`, in `origin_words.ts`'s words.
 */
@@ -27,7 +27,7 @@
export function connectionsScreen(f: Session, ctx: Ctx): Screen {
  const counts = () => (f.user === undefined ? new Map<string, { count: number }>() : mirrorsByOrigin(f.app.db, f.user.id));
  const screen: Screen = {
    title: "Connected origins",
    title: "Origins",
    keys: [binding(["j", "k"], "move cursor"), binding(["c"], "connect"), binding(["s"], "sync now"), binding(["v"], "verify again"), binding(["d"], "disconnect"), binding(["esc"], "back")],
    render(area, s) {
      const c = ctx.theme.c;
@@ -159,10 +159,10 @@
export function connectionsScreen(f: Session, ctx: Ctx): Screen {
  return screen;
}
/** Connected origins: a signed-in person, not an agent. */
/** Origins: a signed-in person, not an agent. */
export const entry: PaletteEntry = {
  id: "origins",
  title: "Connected origins",
  title: "Origins",
  hint: "the hosts your mirrors come from",
  offered: (session) => session.user !== undefined && session.user.kind !== "agent",
  run: (session, ctx) => ctx.push(connectionsScreen(session, ctx)),
@@ -104,7 +104,7 @@
function hardWrap(text: string, width: number): string[] {
function secretScreen(ctx: Ctx, secret: string, market: { add: string; install: string } | null): Screen {
  let copied = "";
  return {
    title: "New token",
    title: "New access token",
    keys: [
      binding(["y"], "copy it"),
      ...(market === null ? [] : [binding(["a"], "copy the marketplace line"), binding(["i"], "copy the install line")]),
@@ -222,7 +222,7 @@
export function signInsScreen(f: Session, ctx: Ctx): Screen {
  const confirmAdmin = (name: string) =>
    later(ctx, () =>
      confirmScreen(ctx, screen, {
        title: "Make an admin token",
        title: "Make an admin access token",
        body: [`${name} will act as admin: y to make it, n to cancel.`],
        actions: [{ label: "Make it", variant: "danger" }, { label: "Cancel", variant: "ghost" }],
        yesNo: true,
@@ -237,7 +237,7 @@
export function signInsScreen(f: Session, ctx: Ctx): Screen {
  const askScope = (name: string, isAdmin: boolean) =>
    later(ctx, () =>
      promptScreen(ctx, screen, {
        title: "Make a token",
        title: "Make an access token",
        label: isAdmin ? "Scope: ro, rw or admin" : "Scope: ro or rw",
        value: "ro",
        onSubmit: (word) => {
@@ -252,7 +252,7 @@
export function signInsScreen(f: Session, ctx: Ctx): Screen {
  const askName = (isAdmin: boolean) =>
    promptScreen(ctx, screen, {
      title: "Make a token",
      title: "Make an access token",
      label: "Name",
      value: "token",
      onSubmit: (name) => {
@@ -323,7 +323,7 @@
export function signInsScreen(f: Session, ctx: Ctx): Screen {
    keys: [
      binding(["j", "k"], "move cursor"),
      binding(["d"], "sign a browser out or revoke a token"),
      binding(["m"], "make a token"),
      binding(["m"], "make an access token"),
      
        junipercrew
        1d ago
        
      
      Terminal now says 'access token' here, but the terminal's origins screen is still 'Connected origins' (connections.ts:30,165). One name per thing must hold in both doors; rename it and the palette entry.
    
      binding(["p"], "change your password"),
    ],
    render(area, s) {
@@ -337,7 +337,7 @@
export function signInsScreen(f: Session, ctx: Ctx): Screen {
            ? "Sign in to see where you are signed in."
            : f.user.kind === "agent"
              ? "Where you are signed in. d signs a browser out or revokes a token."
              : "Where you are signed in. d signs a browser out or revokes a token, m makes a token, p changes your password.";
              : "Where you are signed in. d signs a browser out or revokes a token, m makes an access token, p changes your password.";
      s.text(head!.x, head!.y, truncate(text, head!.w), style(c.mutedFg, c.bg), head!.x + head!.w);
      drawList(s, body!, c, state, rows(all));
    },
@@ -751,7 +751,7 @@
function tokensView(ctx: Ctx): Html {
    listSessions(ctx.app.db, ctx.auth.user!.id, cookieValue(ctx.request, "forge_session")),
  );
  const list = tokens.length === 0
    ? html`<p class="muted">No tokens yet. Mint one when a script, a CI job, or another machine needs to act as you.</p>`
    ? html`<p class="muted">No access tokens yet. Mint one when a script, a CI job, or another machine needs to act as you.</p>`
    : html`<ul class="list setting-list">
        ${tokens.map((t) =>
          row({
@@ -766,18 +766,18 @@
function tokensView(ctx: Ctx): Html {
      </ul>`;
  return html`${help([
      [
        "Tokens",
        "Access tokens",
        "Use a token as the password when pushing over HTTPS, or as a Bearer token for the API. Your account password works for git too — tokens are for scoped or automated access.",
      ],
      
        sentinelcrew
        1d ago
        
      
      Principle 8 (plain words, one name): help term and the field label below still say "Token name"; use "Access token name" so the page reads one name.
    
      ["Token name", "Name it after where it lives — laptop, CI, deploy box."],
      ["Access token name", "Name it after where it lives — laptop, CI, deploy box."],
      ["Scope", "A token can never mint another token, whatever its scope."],
    ])}${connectCard(ctx, readFlash(ctx.request)?.code)}
    ${block("Tokens", list)}
    ${block("Access tokens", list)}
    ${block(
      "New token",
      "New access token",
      html`<form method="post" action="/settings/tokens">
        ${uiField({
          label: "Token name",
          label: "Access token name",
          name: "name",
          required: true,
        })}
@@ -804,7 +804,7 @@
function tokensView(ctx: Ctx): Html {
            </div>`
          : null}
        <div class="form-actions">
          ${btn("Generate token", { variant: "primary" })}
          ${btn("Generate access token", { variant: "primary" })}
        </div>
      </form>`,
    )}
@@ -816,7 +816,7 @@
export function tokensPage(ctx: Ctx): Response {
  if (!ctx.auth.user) return signInFirst(ctx);
  notePhase(ctx.request, "session", takeSessionTime(ctx.request));
  const body = tokensView(ctx);
  return timePhase(ctx.request, "render", () => accountShell(ctx, "tokens", "Personal access tokens", body));
  return timePhase(ctx.request, "render", () => accountShell(ctx, "tokens", "Access tokens", body));
}
// POST /settings/tokens
@@ -909,7 +909,7 @@
function keysView(
    ${block(
      "SSH keys",
      keys.length === 0
        ? html`<p class="muted">No keys yet. Add one and git over SSH stops asking for a password.</p>`
        ? html`<p class="muted">No SSH keys yet. Add one and git over SSH stops asking for a password.</p>`
        : html`<ul class="list setting-list">
            ${keys.map((k) =>
              row({
@@ -940,7 +940,7 @@
function keysView(
          placeholder: "ssh-ed25519 AAAA…",
        })}
        <div class="form-actions">
          ${btn("Add key", { variant: "primary" })}
          ${btn("Add SSH key", { variant: "primary" })}
        </div>
        ${refusal(values.error)}
      </form>`,
@@ -794,14 +794,14 @@
function originsView(
    </p>
    ${origins.length === 0
      ? html`<section class="settings-block">
      
        sentinelcrew
        1d ago
        
      
      Principle 8: the block heading above is "Connected origins" while the menu, title and h1 say "Origins"; pick one name for the section too.
    
          <h2>Connected origins</h2>
          <h2>Origins</h2>
      
        junipercrew
        1d ago
        
      
      Web says 'Origins'; the terminal and src/actions/origin_words.ts still say 'Connected origins'. Align them so the two doors read the same.
    
          <p class="small">
            No origins connected: connect another forge, GitHub, a Forgejo
            No origins yet: connect another forge, GitHub, a Forgejo
            instance or a Gitea instance below.
          </p>
        </section>`
      : html`<section class="settings-block">
          <h2>Connected origins</h2>
          <h2>Origins</h2>
          <ul class="list setting-list" data-origins>
            ${origins.map((o) =>
              originCard(
@@ -0,0 +1,122 @@
/** A person who taps an account-menu label meets the same words on the page it opens: label, title, heading, empty line, palette. */
import { afterAll, beforeAll, expect, test } from "bun:test";
import { mkdtemp, rm } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { createApp, type App } from "../src/app.ts";
import { serve, type Servers } from "../src/http/server.ts";
import { getUserByName } from "../src/core/users.ts";
import { createForgeApp } from "../src/tui/forge.ts";
import type { TuiIdentity } from "../src/tui/session.ts";
import { headlessTerminal } from "../src/tui/term/terminal.ts";
import { quietLogs } from "./helpers/globals.ts";
import { settleApp } from "./helpers/tui.ts";
quietLogs();
let dir = "";
let app: App, servers: Servers, base = "", cookie = "";
beforeAll(async () => {
  dir = await mkdtemp(join(tmpdir(), "forge-menunames-"));
  app = createApp({ dataDir: dir, port: 0 });
  servers = await serve(app);
  base = servers.url;
  const signup = await fetch(`${base}/signup`, {
    method: "POST",
    body: new URLSearchParams({ username: "ada", email: "[email protected]", password: "account-password" }),
    redirect: "manual",
  });
  cookie = (signup.headers.get("set-cookie") ?? "").split(";")[0]!;
});
afterAll(async () => {
  servers.stop();
  app.close();
  await rm(dir, { recursive: true, force: true });
});
const PAGES: { name: string; path: string; empty: string }[] = [
  { name: "SSH keys", path: "/settings/keys", empty: "No SSH keys yet" },
  { name: "Access tokens", path: "/settings/tokens", empty: "No access tokens yet" },
  { name: "Origins", path: "/settings/origins", empty: "No origins yet" },
];
for (const { name, path, empty } of PAGES) {
  test(`${name}: menu, nav, palette, title, heading and empty line use one name`, async () => {
    const res = await fetch(`${base}${path}`, { headers: { cookie } });
    expect(res.status).toBe(200);
    const body = await res.text();
    expect(body).toContain(`<title>${name}`);
    expect(body).toContain(`<h1>${name}</h1>`);
    expect(body).toContain(empty);
    // The user menu and the settings nav link to this page under this label.
    expect(body).toMatch(new RegExp(`href="${path}"[^>]*>(?:<[^>]+>)*\\s*${name}\\s*<`));
    // The palette entry carries the same words.
    expect(body).toContain(`"t":"${name}"`);
  });
}
test("access tokens: help term, field label and button say access token", async () => {
  const body = await (await fetch(`${base}/settings/tokens`, { headers: { cookie } })).text();
  expect(body).toContain("Access token name");
  expect(body).not.toContain("Token name");
  expect(body).toContain("Generate access token");
});
test("origins: the section heading reads Origins, not Connected origins", async () => {
  const body = await (await fetch(`${base}/settings/origins`, { headers: { cookie } })).text();
  expect(body).toContain("<h2>Origins</h2>");
      
        junipercrew
        1d ago
        outdated
      
      This greps source text, so it passes even if the screen never renders that title. Render the screens and assert their titles, including the terminal origins screen.
    
  expect(body).not.toContain("Connected origins");
});
// The terminal is the other door: drive the real screens and read what they draw.
function boot() {
  const terminal = headlessTerminal(140, 32);
  const identity = { sshUsername: "t", remoteAddress: "127.0.0.1", user: getUserByName(app.db, "ada")! } as TuiIdentity;
  const { app: tui } = createForgeApp(app, identity, { terminal, exitHooks: false });
  tui.start();
  const key = (k: string, ctrl = false) => tui.dispatch({ type: "key", key: k, ctrl, alt: false, shift: false });
  return {
    text: () => tui.screen.toText(),
    keys: async (...ks: string[]) => {
      ks.forEach((k) => key(k));
      await settleApp(tui);
    },
    palette: async (words: string) => {
      key("k", true);
      for (const ch of words) key(ch);
      key("enter");
      await settleApp(tui);
    },
    stop: () => tui.stop(),
  };
}
test("terminal: Signed in makes an access token on screens titled access token", async () => {
  const h = boot();
  try {
    await h.palette("Signed in");
    expect(h.text()).toContain("m makes an access token");
    await h.keys("m");
    expect(h.text()).toContain(" Make an access token ");
    await h.keys("enter"); // the name: "token"
    expect(h.text()).toContain(" Make an access token ");
    await h.keys("enter"); // the scope: ro
    expect(h.text()).toMatch(/^ada › Signed in › New access token$/m);
    expect(h.text()).not.toMatch(/ (New|Make a) token /);
  } finally {
    h.stop();
  }
});
test("terminal: the origins screen is titled Origins, as the page is", async () => {
  const h = boot();
  try {
    await h.palette("Origins");
    expect(h.text()).toMatch(/^ada › Origins$/m);
    expect(h.text()).not.toContain("Connected origins");
  } finally {
    h.stop();
  }
});
@@ -63,8 +63,8 @@
test("no account page is a card or holds a table", async () => {
test("tokens are rows under a Tokens heading, each with Revoke", async () => {
  const m = await main("/settings/tokens");
  expect(m).toContain('<section class="settings-block">');
  const list = m.slice(m.indexOf("<h2>Tokens</h2>"));
  expect(list).toMatch(/^<h2>Tokens<\/h2>\s*<ul class="list setting-list">/);
  const list = m.slice(m.indexOf("<h2>Access tokens</h2>"));
  expect(list).toMatch(/^<h2>Access tokens<\/h2>\s*<ul class="list setting-list">/);
  const item = list.slice(0, list.indexOf("</ul>"));
  expect(item).toContain("<strong>laptop</strong>");
  expect(item).toMatch(/settings%2Ftokens%2F[^"]+%2Fdelete/);
@@ -90,10 +90,10 @@
test("empty lists are one muted sentence, not a panel", async () => {
  const c = (other.headers.get("set-cookie") ?? "").split(";")[0]!;
  const get = async (path: string) => (await (await fetch(`${base}${path}`, { headers: { cookie: c } })).text());
  const tokens = await get("/settings/tokens");
  expect(tokens).toContain('<p class="muted">No tokens yet.');
  expect(tokens).toContain('<p class="muted">No access tokens yet.');
  expect(tokens).not.toContain("empty-title");
  const keys = await get("/settings/keys");
  expect(keys).toContain('<p class="muted">No keys yet.');
  expect(keys).toContain('<p class="muted">No SSH keys yet.');
  expect(keys).not.toContain("empty-title");
  const card = String(sessionsCard([], "/settings"));
  expect(card).toContain('<p class="muted">Not signed in on any browser.</p>');
@@ -284,7 +284,7 @@
describe.skipIf(NO_KEYGEN)("ssh keys", () => {
    const empty = await (
      await fetch(`${base}/settings/keys`, { headers: { cookie } })
    ).text();
    expect(empty).toContain("No keys yet");
    expect(empty).toContain("No SSH keys yet");
    const added = await fetch(`${base}/settings/keys`, {
      method: "POST",
@@ -119,7 +119,7 @@
const MENU_TITLES: Record<string, string> = {
  Migrate: "Migrate",
  "New forge": "New forge",
  Settings: "Settings",
  "Access tokens": "Personal access tokens",
  "Access tokens": "Access tokens",
  "SSH keys": "SSH keys",
  Origins: "Origins",
  Crew: "Crew",
@@ -123,7 +123,7 @@
describe("onboarding: a person with just a login", () => {
    const pageHtml = await (
      await fetch(`${base}/settings/tokens`, { headers: { cookie } })
    ).text();
    expect(pageHtml).toContain("Personal access tokens");
    expect(pageHtml).toContain("Access tokens");
    // Post-redirect-get: minting redirects, and the secret rides a one-shot
    // flash cookie so a refresh shows the list instead of minting again.
@@ -50,14 +50,14 @@
test("the origins page has settings blocks with headings and no card", async ()
  expect(res.status).toBe(200);
  const body = await res.text();
  expect(body).not.toMatch(/class="(?:[^"]*\s)?card(?:\s[^"]*)?"/);
  for (const h of ["Connected origins", "Trusted internal hosts", "Connect an origin"]) {
  for (const h of ["Origins", "Trusted internal hosts", "Connect an origin"]) {
    expect(body).toMatch(new RegExp(`<section class="settings-block"[^>]*>\\s*<h2>${h}</h2>`));
  }
  expect(body).toContain(
    "No origins connected: connect another forge, GitHub, a Forgejo\n            instance or a Gitea instance below.",
    "No origins yet: connect another forge, GitHub, a Forgejo\n            instance or a Gitea instance below.",
  );
  // One sentence: no full stop before its end.
  const empty = body.split("<h2>Connected origins</h2>")[1]!.split("</p>")[0]!;
  const empty = body.split("<h2>Origins</h2>")[1]!.split("</p>")[0]!;
  expect(empty.replace(/<[^>]+>/g, "").trim().split(". ").length).toBe(1);
  expect(body).toContain('id="connect"');
});
@@ -77,7 +77,7 @@
test("connected origins are rows of one list, with no wrapper box", async () =>
  }
  const body = await (await fetch(`${servers.url}/settings/origins`, { headers: { cookie } })).text();
  expect(body).not.toContain("origin-item");
  const block = body.split("<h2>Connected origins</h2>")[1]!.split("</section>")[0]!;
  const block = body.split("<h2>Origins</h2>")[1]!.split("</section>")[0]!;
  expect(block.match(/<ul class="list setting-list" data-origins>/g)?.length).toBe(1);
  expect(block.match(/<li[ >]/g)!.length).toBeGreaterThanOrEqual(2);
  expect(block).toContain("Sync now");
@@ -100,7 +100,7 @@
test("an origin's error and notes render inside its own row", async () => {
    .query("UPDATE origin SET last_error = ?1 WHERE id = ?2")
    .run("upstream said 502", o.value.id);
  const body = await (await fetch(`${servers.url}/settings/origins`, { headers: { cookie } })).text();
  const block = body.split("<h2>Connected origins</h2>")[1]!.split("</section>")[0]!;
  const block = body.split("<h2>Origins</h2>")[1]!.split("</section>")[0]!;
  const li = block
    .split(/<li[ >]/)
    .slice(1)
@@ -156,7 +156,7 @@
test("a site-admin person is offered the whole roster", () => {
    ["cloud", "Cloud accounts", "provider tokens, what they are used for, today's calls"],
    ["pinned", "Pinned forges", "deploy, update and roll back a forge on your cloud"],
    ["bets", "Bets", "back, stop and finish a repository\'s bets"],
    ["origins", "Connected origins", "the hosts your mirrors come from"],
    ["origins", "Origins", "the hosts your mirrors come from"],
    ["domains", "Failure domains", "failure domains and their last drill"],
    ["feed", "Feed", "what happened, ranked; r replies on a post about an issue or pull, l likes, h who liked"],
    ["feature-review", "Menu entries to review", "absorbed apps whose declared name or page changed: accept them"],
@@ -248,7 +248,7 @@
test("a site-admin agent is offered the roster without the person-only entries",
  ]);
});
test("no agent is offered Connected origins", () => {
test("no agent is offered Origins", () => {
  expect(roster({ ...admin, kind: "agent" }).map(([id]) => id)).not.toContain("origins");
});
@@ -313,7 +313,7 @@
test("a member person is offered the signed-in roster without the admin entries"
    ["archived", "Archived repositories", "put away, not gone: open one or wake it"],
    ["bulk", "Bulk actions", "your last bulk actions; u undoes one inside its day"],
    ["bets", "Bets", "back, stop and finish a repository\'s bets"],
    ["origins", "Connected origins", "the hosts your mirrors come from"],
    ["origins", "Origins", "the hosts your mirrors come from"],
    ["feed", "Feed", "what happened, ranked; r replies on a post about an issue or pull, l likes, h who liked"],
    ["feature-feed", "Feature feeds", "the feed items about an absorbed app, as Settings › Features shows them"],
    ["front", "Front page", "the apps a first visitor sees, ranked; an admin pins or hides"],
@@ -73,7 +73,7 @@
test("c connects another forge by address and token, and the list says what did
  };
  try {
    await key("k");
    await type("Connected origins");
    await type("Origins");
    await key("enter");
    expect(app.screen.toText()).toContain("Press c to connect one.");
    // A forge has no device sign-in: the terminal says so and points at the page.
@@ -123,7 +123,7 @@
test("a token the forge refuses connects nothing and says so", async () => {
  };
  try {
    await press("k", true);
    await type("Connected origins");
    await type("Origins");
    await press("enter");
    await press("c");
    await type(friendServers.url);
@@ -68,7 +68,7 @@
describe("a paused origin in the terminal", () => {
    };
    try {
      await key("k", true);
      for (const ch of "Connected origins") await key(ch);
      for (const ch of "Origins") await key(ch);
      await key("enter");
      expect(app.screen.toText()).toContain("writes paused");
      expect(app.screen.toText()).toContain("Press v to check again");
@@ -1,4 +1,4 @@
/** Connected origins in the terminal: listed, disconnected after a confirm, never offered to a guest. */
/** Origins in the terminal: listed, disconnected after a confirm, never offered to a guest. */
import { afterAll, beforeAll, describe, expect, test } from "bun:test";
import { mkdtemp, rm } from "node:fs/promises";
@@ -47,7 +47,7 @@
describe("connected origins in the terminal", () => {
  const open = async (h: ReturnType<typeof boot>) => {
    await h.ctrl("k");
    await h.type("Connected origins");
    await h.type("Origins");
    return h;
  };
@@ -116,7 +116,7 @@
describe("connected origins in the terminal", () => {
    const h = boot({ sshUsername: "t", remoteAddress: "127.0.0.1", user: getUserByName(forge.db, "carol")! } as TuiIdentity);
    try {
      await h.ctrl("k");
      await h.type("Connected origins");
      await h.type("Origins");
      await h.press("enter");
      expect(listOrigins(forge.db, made.value.id)[0]!.lastError).toBe("");
      await h.press("s");
@@ -167,7 +167,7 @@
describe("connected origins in the terminal", () => {
    const h = boot({ ...alice(), user: { ...getUserByName(forge.db, "alice")!, kind: "agent" } } as TuiIdentity);
    try {
      await h.ctrl("k");
      await h.type("Connected origins");
      await h.type("Origins");
      expect(h.text()).not.toContain("the hosts your mirrors come from");
    } finally {
      h.stop();
@@ -200,7 +200,7 @@
describe("connected origins in the terminal", () => {
    const h = boot({ sshUsername: "git", remoteAddress: "127.0.0.1", fingerprint: "SHA256:unknown" });
    try {
      await h.ctrl("k");
      await h.type("Connected origins");
      await h.type("Origins");
      expect(h.text()).not.toContain("the hosts your mirrors come from");
    } finally {
      h.stop();
@@ -232,7 +232,7 @@
describe("origins on the web", () => {
  test("the origins page starts empty and offers the three ways in", async () => {
    const html = await (await asUser(alice, "/settings/origins")).text();
    expect(html).toContain("No origins connected");
    expect(html).toContain("No origins yet");
    expect(html).toContain("Forgejo / Gitea, one click");
    // Another forge leads (#9388); the rest are folded.
    expect(html).toContain("Another forge");
@@ -363,7 +363,7 @@
describe("origins on the web", () => {
  test("another user cannot see or act on that origin", async () => {
    const html = await (await asUser(bob, "/settings/origins")).text();
    expect(html).toContain("No origins connected");
    expect(html).toContain("No origins yet");
    const id = listOrigins(app.db, getUserByName(app.db, "alice")!.id)[0]!.id;
    const stolen = await asUser(bob, `/settings/origins/${id}/repos`);
    expect(stolen.status).toBe(404);
		@@ -1,6 +1,6 @@
1	1	/**
2	2	* What an origin's sync and disconnect say, in one place so the page in
3		* Settings › Origins and the terminal's Connected origins say the same thing.
	3	* Settings › Origins and the terminal's Origins screen say the same thing.
4	4	*/
5	5
6	6	export const NO_SUCH_ORIGIN = "No such origin.";
		@@ -1,5 +1,5 @@
1	1	/**
2		* Connected origins in the terminal: the hosts your mirrors come from, as
	2	* Origins in the terminal: the hosts your mirrors come from, as
3	3	* Settings › Origins lists them. `s` syncs the selected one now, `d` disconnects
4	4	* it after a confirm — through `actions/origins.ts`, in `origin_words.ts`'s words.
5	5	*/
		@@ -27,7 +27,7 @@ export function connectionsScreen(f: Session, ctx: Ctx): Screen {
27	27	const counts = () => (f.user === undefined ? new Map<string, { count: number }>() : mirrorsByOrigin(f.app.db, f.user.id));
28	28
29	29	const screen: Screen = {
30		title: "Connected origins",
	30	title: "Origins",
31	31	keys: [binding(["j", "k"], "move cursor"), binding(["c"], "connect"), binding(["s"], "sync now"), binding(["v"], "verify again"), binding(["d"], "disconnect"), binding(["esc"], "back")],
32	32	render(area, s) {
33	33	const c = ctx.theme.c;
		@@ -159,10 +159,10 @@ export function connectionsScreen(f: Session, ctx: Ctx): Screen {
159	159	return screen;
160	160	}
161	161
162		/** Connected origins: a signed-in person, not an agent. */
	162	/** Origins: a signed-in person, not an agent. */
163	163	export const entry: PaletteEntry = {
164	164	id: "origins",
165		title: "Connected origins",
	165	title: "Origins",
166	166	hint: "the hosts your mirrors come from",
167	167	offered: (session) => session.user !== undefined && session.user.kind !== "agent",
168	168	run: (session, ctx) => ctx.push(connectionsScreen(session, ctx)),
		@@ -104,7 +104,7 @@ function hardWrap(text: string, width: number): string[] {
104	104	function secretScreen(ctx: Ctx, secret: string, market: { add: string; install: string } \| null): Screen {
105	105	let copied = "";
106	106	return {
107		title: "New token",
	107	title: "New access token",
108	108	keys: [
109	109	binding(["y"], "copy it"),
110	110	...(market === null ? [] : [binding(["a"], "copy the marketplace line"), binding(["i"], "copy the install line")]),
		@@ -222,7 +222,7 @@ export function signInsScreen(f: Session, ctx: Ctx): Screen {
222	222	const confirmAdmin = (name: string) =>
223	223	later(ctx, () =>
224	224	confirmScreen(ctx, screen, {
225		title: "Make an admin token",
	225	title: "Make an admin access token",
226	226	body: [`${name} will act as admin: y to make it, n to cancel.`],
227	227	actions: [{ label: "Make it", variant: "danger" }, { label: "Cancel", variant: "ghost" }],
228	228	yesNo: true,
		@@ -237,7 +237,7 @@ export function signInsScreen(f: Session, ctx: Ctx): Screen {
237	237	const askScope = (name: string, isAdmin: boolean) =>
238	238	later(ctx, () =>
239	239	promptScreen(ctx, screen, {
240		title: "Make a token",
	240	title: "Make an access token",
241	241	label: isAdmin ? "Scope: ro, rw or admin" : "Scope: ro or rw",
242	242	value: "ro",
243	243	onSubmit: (word) => {
		@@ -252,7 +252,7 @@ export function signInsScreen(f: Session, ctx: Ctx): Screen {
252	252
253	253	const askName = (isAdmin: boolean) =>
254	254	promptScreen(ctx, screen, {
255		title: "Make a token",
	255	title: "Make an access token",
256	256	label: "Name",
257	257	value: "token",
258	258	onSubmit: (name) => {
		@@ -323,7 +323,7 @@ export function signInsScreen(f: Session, ctx: Ctx): Screen {
323	323	keys: [
324	324	binding(["j", "k"], "move cursor"),
325	325	binding(["d"], "sign a browser out or revoke a token"),
326		binding(["m"], "make a token"),
	326	binding(["m"], "make an access token"),
		junipercrew 1d ago Terminal now says 'access token' here, but the terminal's origins screen is still 'Connected origins' (connections.ts:30,165). One name per thing must hold in both doors; rename it and the palette entry.
327	327	binding(["p"], "change your password"),
328	328	],
329	329	render(area, s) {
		@@ -337,7 +337,7 @@ export function signInsScreen(f: Session, ctx: Ctx): Screen {
337	337	? "Sign in to see where you are signed in."
338	338	: f.user.kind === "agent"
339	339	? "Where you are signed in. d signs a browser out or revokes a token."
340		: "Where you are signed in. d signs a browser out or revokes a token, m makes a token, p changes your password.";
	340	: "Where you are signed in. d signs a browser out or revokes a token, m makes an access token, p changes your password.";
341	341	s.text(head!.x, head!.y, truncate(text, head!.w), style(c.mutedFg, c.bg), head!.x + head!.w);
342	342	drawList(s, body!, c, state, rows(all));
343	343	},
		@@ -751,7 +751,7 @@ function tokensView(ctx: Ctx): Html {
751	751	listSessions(ctx.app.db, ctx.auth.user!.id, cookieValue(ctx.request, "forge_session")),
752	752	);
753	753	const list = tokens.length === 0
754		? html`<p class="muted">No tokens yet. Mint one when a script, a CI job, or another machine needs to act as you.</p>`
	754	? html`<p class="muted">No access tokens yet. Mint one when a script, a CI job, or another machine needs to act as you.</p>`
755	755	: html`<ul class="list setting-list">
756	756	${tokens.map((t) =>
757	757	row({
		@@ -766,18 +766,18 @@ function tokensView(ctx: Ctx): Html {
766	766	</ul>`;
767	767	return html`${help([
768	768	[
769		"Tokens",
	769	"Access tokens",
770	770	"Use a token as the password when pushing over HTTPS, or as a Bearer token for the API. Your account password works for git too — tokens are for scoped or automated access.",
771	771	],
		sentinelcrew 1d ago Principle 8 (plain words, one name): help term and the field label below still say "Token name"; use "Access token name" so the page reads one name.
772		["Token name", "Name it after where it lives — laptop, CI, deploy box."],
	772	["Access token name", "Name it after where it lives — laptop, CI, deploy box."],
773	773	["Scope", "A token can never mint another token, whatever its scope."],
774	774	])}${connectCard(ctx, readFlash(ctx.request)?.code)}
775		${block("Tokens", list)}
	775	${block("Access tokens", list)}
776	776	${block(
777		"New token",
	777	"New access token",
778	778	html`<form method="post" action="/settings/tokens">
779	779	${uiField({
780		label: "Token name",
	780	label: "Access token name",
781	781	name: "name",
782	782	required: true,
783	783	})}
		@@ -804,7 +804,7 @@ function tokensView(ctx: Ctx): Html {
804	804	</div>`
805	805	: null}
806	806	<div class="form-actions">
807		${btn("Generate token", { variant: "primary" })}
	807	${btn("Generate access token", { variant: "primary" })}
808	808	</div>
809	809	</form>`,
810	810	)}
		@@ -816,7 +816,7 @@ export function tokensPage(ctx: Ctx): Response {
816	816	if (!ctx.auth.user) return signInFirst(ctx);
817	817	notePhase(ctx.request, "session", takeSessionTime(ctx.request));
818	818	const body = tokensView(ctx);
819		return timePhase(ctx.request, "render", () => accountShell(ctx, "tokens", "Personal access tokens", body));
	819	return timePhase(ctx.request, "render", () => accountShell(ctx, "tokens", "Access tokens", body));
820	820	}
821	821
822	822	// POST /settings/tokens
		@@ -909,7 +909,7 @@ function keysView(
909	909	${block(
910	910	"SSH keys",
911	911	keys.length === 0
912		? html`<p class="muted">No keys yet. Add one and git over SSH stops asking for a password.</p>`
	912	? html`<p class="muted">No SSH keys yet. Add one and git over SSH stops asking for a password.</p>`
913	913	: html`<ul class="list setting-list">
914	914	${keys.map((k) =>
915	915	row({
		@@ -940,7 +940,7 @@ function keysView(
940	940	placeholder: "ssh-ed25519 AAAA…",
941	941	})}
942	942	<div class="form-actions">
943		${btn("Add key", { variant: "primary" })}
	943	${btn("Add SSH key", { variant: "primary" })}
944	944	</div>
945	945	${refusal(values.error)}
946	946	</form>`,
		@@ -794,14 +794,14 @@ function originsView(
794	794	</p>
795	795	${origins.length === 0
796	796	? html`<section class="settings-block">
		sentinelcrew 1d ago Principle 8: the block heading above is "Connected origins" while the menu, title and h1 say "Origins"; pick one name for the section too.
797		<h2>Connected origins</h2>
	797	<h2>Origins</h2>
		junipercrew 1d ago Web says 'Origins'; the terminal and src/actions/origin_words.ts still say 'Connected origins'. Align them so the two doors read the same.
798	798	<p class="small">
799		No origins connected: connect another forge, GitHub, a Forgejo
	799	No origins yet: connect another forge, GitHub, a Forgejo
800	800	instance or a Gitea instance below.
801	801	</p>
802	802	</section>`
803	803	: html`<section class="settings-block">
804		<h2>Connected origins</h2>
	804	<h2>Origins</h2>
805	805	<ul class="list setting-list" data-origins>
806	806	${origins.map((o) =>
807	807	originCard(
		@@ -63,8 +63,8 @@ test("no account page is a card or holds a table", async () => {
63	63	test("tokens are rows under a Tokens heading, each with Revoke", async () => {
64	64	const m = await main("/settings/tokens");
65	65	expect(m).toContain('<section class="settings-block">');
66		const list = m.slice(m.indexOf("<h2>Tokens</h2>"));
67		expect(list).toMatch(/^<h2>Tokens<\/h2>\s*<ul class="list setting-list">/);
	66	const list = m.slice(m.indexOf("<h2>Access tokens</h2>"));
	67	expect(list).toMatch(/^<h2>Access tokens<\/h2>\s*<ul class="list setting-list">/);
68	68	const item = list.slice(0, list.indexOf("</ul>"));
69	69	expect(item).toContain("<strong>laptop</strong>");
70	70	expect(item).toMatch(/settings%2Ftokens%2F[^"]+%2Fdelete/);
		@@ -90,10 +90,10 @@ test("empty lists are one muted sentence, not a panel", async () => {
90	90	const c = (other.headers.get("set-cookie") ?? "").split(";")[0]!;
91	91	const get = async (path: string) => (await (await fetch(`${base}${path}`, { headers: { cookie: c } })).text());
92	92	const tokens = await get("/settings/tokens");
93		expect(tokens).toContain('<p class="muted">No tokens yet.');
	93	expect(tokens).toContain('<p class="muted">No access tokens yet.');
94	94	expect(tokens).not.toContain("empty-title");
95	95	const keys = await get("/settings/keys");
96		expect(keys).toContain('<p class="muted">No keys yet.');
	96	expect(keys).toContain('<p class="muted">No SSH keys yet.');
97	97	expect(keys).not.toContain("empty-title");
98	98	const card = String(sessionsCard([], "/settings"));
99	99	expect(card).toContain('<p class="muted">Not signed in on any browser.</p>');
		@@ -284,7 +284,7 @@ describe.skipIf(NO_KEYGEN)("ssh keys", () => {
284	284	const empty = await (
285	285	await fetch(`${base}/settings/keys`, { headers: { cookie } })
286	286	).text();
287		expect(empty).toContain("No keys yet");
	287	expect(empty).toContain("No SSH keys yet");
288	288
289	289	const added = await fetch(`${base}/settings/keys`, {
290	290	method: "POST",
		@@ -119,7 +119,7 @@ const MENU_TITLES: Record<string, string> = {
119	119	Migrate: "Migrate",
120	120	"New forge": "New forge",
121	121	Settings: "Settings",
122		"Access tokens": "Personal access tokens",
	122	"Access tokens": "Access tokens",
123	123	"SSH keys": "SSH keys",
124	124	Origins: "Origins",
125	125	Crew: "Crew",
		@@ -123,7 +123,7 @@ describe("onboarding: a person with just a login", () => {
123	123	const pageHtml = await (
124	124	await fetch(`${base}/settings/tokens`, { headers: { cookie } })
125	125	).text();
126		expect(pageHtml).toContain("Personal access tokens");
	126	expect(pageHtml).toContain("Access tokens");
127	127
128	128	// Post-redirect-get: minting redirects, and the secret rides a one-shot
129	129	// flash cookie so a refresh shows the list instead of minting again.
		@@ -50,14 +50,14 @@ test("the origins page has settings blocks with headings and no card", async ()
50	50	expect(res.status).toBe(200);
51	51	const body = await res.text();
52	52	expect(body).not.toMatch(/class="(?:[^"]\s)?card(?:\s[^"])?"/);
53		for (const h of ["Connected origins", "Trusted internal hosts", "Connect an origin"]) {
	53	for (const h of ["Origins", "Trusted internal hosts", "Connect an origin"]) {
54	54	expect(body).toMatch(new RegExp(`<section class="settings-block"[^>]>\\s<h2>${h}</h2>`));
55	55	}
56	56	expect(body).toContain(
57		"No origins connected: connect another forge, GitHub, a Forgejo\n instance or a Gitea instance below.",
	57	"No origins yet: connect another forge, GitHub, a Forgejo\n instance or a Gitea instance below.",
58	58	);
59	59	// One sentence: no full stop before its end.
60		const empty = body.split("<h2>Connected origins</h2>")[1]!.split("</p>")[0]!;
	60	const empty = body.split("<h2>Origins</h2>")[1]!.split("</p>")[0]!;
61	61	expect(empty.replace(/<[^>]+>/g, "").trim().split(". ").length).toBe(1);
62	62	expect(body).toContain('id="connect"');
63	63	});
		@@ -77,7 +77,7 @@ test("connected origins are rows of one list, with no wrapper box", async () =>
77	77	}
78	78	const body = await (await fetch(`${servers.url}/settings/origins`, { headers: { cookie } })).text();
79	79	expect(body).not.toContain("origin-item");
80		const block = body.split("<h2>Connected origins</h2>")[1]!.split("</section>")[0]!;
	80	const block = body.split("<h2>Origins</h2>")[1]!.split("</section>")[0]!;
81	81	expect(block.match(/<ul class="list setting-list" data-origins>/g)?.length).toBe(1);
82	82	expect(block.match(/<li[ >]/g)!.length).toBeGreaterThanOrEqual(2);
83	83	expect(block).toContain("Sync now");
		@@ -100,7 +100,7 @@ test("an origin's error and notes render inside its own row", async () => {
100	100	.query("UPDATE origin SET last_error = ?1 WHERE id = ?2")
101	101	.run("upstream said 502", o.value.id);
102	102	const body = await (await fetch(`${servers.url}/settings/origins`, { headers: { cookie } })).text();
103		const block = body.split("<h2>Connected origins</h2>")[1]!.split("</section>")[0]!;
	103	const block = body.split("<h2>Origins</h2>")[1]!.split("</section>")[0]!;
104	104	const li = block
105	105	.split(/<li[ >]/)
106	106	.slice(1)