ca01e69 · 8d56aab · 7e0c204
@@ -530,3 +530,5 @@
The web changelog's days and its "shipped today" count follow the reader's clock
A repository admin cuts a wave from two doors, both through `cutWaveFor` (`src/actions/cut_wave.ts`): Settings → *Cut a wave*, and `c` on the terminal's waves screen, which says how many pulls would go in, asks `cut wave N? y/n` (`y` and `n` choose outright) and shows the draft pull's number (Enter opens it). Each opens a draft pull listing the pulls merged since the last wave; nothing merged, an earlier wave that does not parse, or a viewer who is not an admin is refused in the action's words, writing nothing.
Cmd-K finds a repository by its name first (exact, then prefix; your own ahead); a repository with an app has an "Open the app of …" option under it, and Cmd/Ctrl+Enter on the repository opens the app (`docs/features/cmd-k-repositories.md`).
In the terminal, the palette's **Your profile** (any signed-in person, never an agent; a guest is not offered it) shows username, display name and email; `n` sets the display name and `e` the email through `updateProfile`, the action behind Settings → Account. Refusals read as the page's do (`src/actions/profile_words.ts`, including one shared fallback for a refusal with no words of its own), and a changed email says a confirmation link was sent to it and that it is unverified until followed.
@@ -0,0 +1,33 @@
/**
 * What a person is told when `updateProfile` refuses: one sentence per error,
 * shared by Settings › Account and the terminal's profile screen so the two
 * say the same thing.
 */
import type { updateProfile } from "./users.ts";
type ProfileError = Extract<ReturnType<typeof updateProfile>, { ok: false }>["error"];
/** The refusals a person can fix by writing something else. */
export const PROFILE_REFUSALS: Partial<Record<ProfileError, string>> = {
  email_taken: "Another account already uses that address.",
  invalid_email: "That doesn't look like an email address.",
  display_name_reserved: "That name belongs to the crew, the owner or the forge.",
  display_name_mixed_script:
    "Write it in one alphabet: letters from different scripts can pass for other names.",
};
/** The form field a refusal belongs to. */
export const PROFILE_REFUSAL_FIELD: Partial<Record<ProfileError, "displayName" | "email">> = {
  email_taken: "email",
  invalid_email: "email",
  display_name_reserved: "displayName",
  display_name_mixed_script: "displayName",
};
/** Any refusal not named above (a failed sign-in, a vanished account): nothing the person typed is at fault. */
export const PROFILE_FALLBACK = "Your profile could not be saved. Sign in again and try once more.";
/** After a new address is saved: the link goes to it, and the old proof no longer stands. */
export const emailSavedWords = (email: string): string =>
  `Email saved. A confirmation link was sent to ${email}; it is not verified until you follow it.`;
@@ -27,6 +27,7 @@
import { modelCeilingEntry, modelGrantEntry } from "./model.ts";
import { entry as orgTeams } from "./orgteams.ts";
import { entry as owner } from "./owner.ts";
import { entry as people } from "./people.ts";
import { entry as profile } from "./profile.ts";
import { entry as quotas } from "./quotas.ts";
import { entry as resilience } from "./resilience.ts";
import { entry as scorecard } from "./scorecard.ts";
@@ -83,6 +84,7 @@
export const ENTRIES: readonly PaletteEntry[] = [
  front,
  owner,
  forges,
  profile,
];
/** Put each entry the session is offered into `commands`, after the command it names or at the end. */
@@ -0,0 +1,89 @@
/**
 * Your profile, in the terminal: username, display name and email, with `n`
 * and `e` to change the last two through `updateProfile` — the action behind
 * Settings › Account, refusing in the same words. A new email starts
 * verification exactly as it does on the web.
 */
import { emailSavedWords, PROFILE_FALLBACK, PROFILE_REFUSALS } from "../../actions/profile_words.ts";
import { updateProfile } from "../../actions/users.ts";
import { isStandInEmail } from "../../core/users.ts";
import type { Ctx, Screen } from "../app/app.ts";
import { binding } from "../app/keys.ts";
import type { Session } from "../session.ts";
import { style } from "../term/style.ts";
import { truncate } from "../term/width.ts";
import { promptScreen } from "./common.ts";
import type { PaletteEntry } from "./entries.ts";
export function profileScreen(f: Session, ctx: Ctx): Screen {
  const save = (patch: { displayName: string } | { email: string }): string | undefined => {
    const r = updateProfile(f.app, f.user, patch);
    if (!r.ok) {
      const words = PROFILE_REFUSALS[r.error] ?? PROFILE_FALLBACK;
      
        junipercrew
        12d ago
        outdated
      
      Generic fallback is not a sentence a person can act on, and differs from the web page. Share one fallback in profile_words.ts.
    
      ctx.toast(words, "danger");
      return words;
    }
    const emailChanged = "email" in patch && r.value.email.toLowerCase() !== f.user?.email.toLowerCase();
    f.user = r.value;
      
        junipercrew
        12d ago
        outdated
      
      After an email change say a confirmation link was sent; the web page does.
    
    ctx.toast(emailChanged ? emailSavedWords(r.value.email) : "saved", "success");
    ctx.invalidate();
    return undefined;
  };
  const screen: Screen = {
    title: "Your profile",
    keys: [binding(["n"], "set display name"), binding(["e"], "set email")],
    render(area, s) {
      const c = ctx.theme.c;
      const u = f.user;
      if (u === undefined) return;
      const email = isStandInEmail(u.email) ? "none" : u.email;
      const rows: [string, string][] = [
        ["Username", u.username],
        ["Display name", u.displayName],
        ["Email", email],
      ];
      rows.forEach(([k, v], i) => {
        const y = area.y + i;
        s.text(area.x, y, k.padEnd(14), style(c.mutedFg, c.bg), area.x + area.w);
        s.text(area.x + 14, y, truncate(v, Math.max(0, area.w - 14)), style(c.fg, c.bg), area.x + area.w);
      });
    },
    key(e) {
      if (e.ctrl || e.alt || f.user === undefined) return false;
      if (e.key === "n") {
        ctx.push(
          promptScreen(ctx, screen, {
            title: "Display name",
            label: "display name",
            value: f.user.displayName,
            onSubmit: (v) => save({ displayName: v }),
          }),
        );
        return true;
      }
      if (e.key === "e") {
        ctx.push(
          promptScreen(ctx, screen, {
            title: "Email",
            label: "email address",
            value: isStandInEmail(f.user.email) ? "" : f.user.email,
            onSubmit: (v) => save({ email: v }),
          }),
        );
        return true;
      }
      return false;
    },
  };
  return screen;
}
export const entry: PaletteEntry = {
  id: "profile",
  title: "Your profile",
  hint: "display name and email",
  offered: (session) => session.user !== undefined && session.user.kind !== "agent",
  run: (session, ctx) => ctx.push(profileScreen(session, ctx)),
      
        junipercrew
        12d ago
        outdated
      
      Needs a README line and a guest test; offered() is the only gate.
    
};
@@ -33,6 +33,11 @@
import { linkEdgeLogin, linkedLogin, unlinkEdgeLogin } from "../../core/edge_lin
import { LAST_WAY_IN, linkedParent, parentIssuerOf, unlinkParent } from "../../core/federation.ts";
import { activeEdgeToken, edgeIdentity } from "../../http/edge.ts";
import { listKeys } from "../../core/keys.ts";
import {
  PROFILE_FALLBACK,
  PROFILE_REFUSAL_FIELD,
  PROFILE_REFUSALS,
} from "../../actions/profile_words.ts";
import { endAccountSession } from "../../actions/signins.ts";
import { listSessions, type SessionInfo } from "../../core/sessions.ts";
import { ADMIN_TOKEN_WORDS, listTokens, type TokenScope } from "../../core/tokens.ts";
@@ -100,7 +105,7 @@
interface ProfileForm {
  displayName: string;
  email: string;
  commitEmail: CommitEmail;
  errors?: { displayName?: string; email?: string };
  errors?: { displayName?: string; email?: string; form?: string };
}
/** The profile form as the account stands now. */
@@ -279,6 +284,7 @@
function profileView(ctx: Ctx, values: ProfileForm): Html {
  const user = ctx.auth.user!;
  return html`${unverifiedNotice(ctx)}${roleView(ctx)}${card(
    html`<form method="post" action="/settings">
      ${when(values.errors?.form, (m) => html`<p class="error-note">${m}</p>`)}
      <div class="field">
        <label for="f-username">Username</label>
        <input
@@ -404,16 +410,10 @@
export async function accountUpdate(ctx: Ctx): Promise<Response> {
    commitEmail,
  });
  if (!updated.ok) {
    const words = PROFILE_REFUSALS[updated.error];
    const at = PROFILE_REFUSAL_FIELD[updated.error];
    const errors: ProfileForm["errors"] =
      updated.error === "email_taken"
        ? { email: "Another account already uses that address." }
        : updated.error === "invalid_email"
          ? { email: "That doesn't look like an email address." }
          : updated.error === "display_name_reserved"
            ? { displayName: "That name belongs to the crew, the owner or the forge." }
            : updated.error === "display_name_mixed_script"
              ? { displayName: "Write it in one alphabet: letters from different scripts can pass for other names." }
              : {};
      words === undefined || at === undefined ? { form: PROFILE_FALLBACK } : { [at]: words };
    return accountShell(
      ctx,
      "profile",
@@ -0,0 +1,51 @@
/**
 * Settings › Account refuses a profile in the words the terminal shares
 * (#8001): the web page and `PROFILE_REFUSALS` cannot drift apart.
 */
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 { PROFILE_REFUSALS } from "../src/actions/profile_words.ts";
import { serve, type Servers } from "../src/http/server.ts";
import { adminCookie } from "./helpers/admin.ts";
import { quietLogs } from "./helpers/globals.ts";
quietLogs();
let dataDir: string;
let app: App;
let servers: Servers;
let cookie: string;
beforeAll(async () => {
  dataDir = await mkdtemp(join(tmpdir(), "forge-profile-words-"));
  app = createApp({ dataDir, port: 0 });
  servers = await serve(app);
  cookie = await adminCookie(app, { username: "alice", email: "[email protected]" });
});
afterAll(async () => {
  await servers.stop?.();
  app.close();
  await rm(dataDir, { recursive: true, force: true });
});
const post = (fields: Record<string, string>) =>
  fetch(`${servers.url}/settings`, {
    method: "POST",
    redirect: "manual",
    headers: { cookie, origin: servers.url, "content-type": "application/x-www-form-urlencoded" },
    body: new URLSearchParams(fields),
  });
const escaped = (s: string) => s.replace(/'/g, "&#39;").replace(/&/g, "&amp;");
test("the account page refuses in the shared words, in the field they belong to", async () => {
  const reserved = await post({ displayName: "forge", email: "[email protected]" });
  expect(reserved.status).toBe(422);
  expect(await reserved.text()).toContain(escaped(PROFILE_REFUSALS.display_name_reserved!).replace(/&amp;#39;/g, "&#39;"));
  const bad = await post({ displayName: "Alice", email: "nope" });
  expect(bad.status).toBe(422);
  expect(await bad.text()).toContain(PROFILE_REFUSALS.invalid_email!.replace(/'/g, "&#39;"));
});
@@ -112,6 +112,7 @@
test("a site-admin person is offered the whole roster", () => {
    ["front", "Front page", "the apps a first visitor sees, ranked; an admin pins or hides"],
    ["owner", "Owner's needs", "what needs the owner, snapshots, failure domains"],
    ["forges", "Forges you sent", "each forge sent, claimed or not, and its apps"],
    ["profile", "Your profile", "display name and email"],
    ["family", "Family", "the forge that sent this one, and the forges it sent"],
    ["chain", "Chain", "the forges this forge's code descends from, root first"],
    ["quit", "Quit", "disconnect"],
@@ -207,6 +208,7 @@
test("a member person is offered the signed-in roster without the admin entries"
    ["bulk", "Bulk actions", "your last bulk actions; u undoes one inside its day"],
    ["origins", "Connected origins", "the hosts your mirrors come from"],
    ["front", "Front page", "the apps a first visitor sees, ranked; an admin pins or hides"],
    ["profile", "Your profile", "display name and email"],
    ["family", "Family", "the forge that sent this one, and the forges it sent"],
    ["chain", "Chain", "the forges this forge's code descends from, root first"],
    ["quit", "Quit", "disconnect"],
@@ -0,0 +1,163 @@
/**
 * Your profile in the terminal (#8001): `n` sets the display name, `e` the
 * email, with the account page's words on refusal; an agent has no entry.
 */
import { afterAll, beforeAll, describe, 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 as Forge } from "../src/app.ts";
import { createUser, getUserByName } from "../src/core/users.ts";
import { emailSavedWords, PROFILE_FALLBACK, PROFILE_REFUSALS } from "../src/actions/profile_words.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();
describe("your profile in the terminal", () => {
  let dataDir: string;
  let forge: Forge;
  function boot(username: string | undefined) {
    const terminal = headlessTerminal(140, 32);
    const user = username === undefined ? undefined : getUserByName(forge.db, username)!;
    const identity: TuiIdentity = { sshUsername: "t", remoteAddress: "127.0.0.1", user };
    const { app } = createForgeApp(forge, identity, { terminal, exitHooks: false });
    app.start();
    const key = (k: string) =>
      app.dispatch({ type: "key", key: k, ctrl: false, alt: false, shift: false });
    return {
      text: () => app.screen.toText(),
      press: async (...keys: string[]) => {
        keys.forEach(key);
        await settleApp(app);
      },
      ctrl: async (k: string) => {
        app.dispatch({ type: "key", key: k, ctrl: true, alt: false, shift: false });
        await settleApp(app);
      },
      type: async (t: string) => {
        for (const ch of t) key(ch);
        await settleApp(app);
      },
      stop: () => app.stop(),
    };
  }
  beforeAll(async () => {
    dataDir = await mkdtemp(join(tmpdir(), "forge-tui-profile-"));
    forge = createApp({ dataDir, port: 0 });
    for (const [username, adminIfFirst] of [["alice", true], ["bob", false], ["carol", false], ["dave", false]] as const) {
      const made = await createUser(forge.db, {
        origin: "seed",
        trusted: true,
        username,
        email: `${username}@forge.local`,
        password: "a-good-passphrase",
        adminIfFirst,
      });
      if (!made.ok) throw new Error(made.error);
    }
    forge.db.query("UPDATE user SET is_agent = 1 WHERE username = 'carol'").run();
  });
  afterAll(async () => {
    forge.close();
    await rm(dataDir, { recursive: true, force: true });
  });
  const open = async (h: ReturnType<typeof boot>) => {
    await h.ctrl("k");
    await h.type("Your profile");
    await h.press("enter");
  };
  const clear = async (h: ReturnType<typeof boot>, n: number) => {
    for (let i = 0; i < n; i++) await h.press("backspace");
  };
  test("n sets the display name and the screen shows it", async () => {
    const h = boot("bob");
    await open(h);
    expect(h.text()).toContain("[email protected]");
    await h.press("n");
    await clear(h, 40);
    await h.type("Bobby Tables");
    await h.press("enter");
    expect(getUserByName(forge.db, "bob")!.displayName).toBe("Bobby Tables");
    expect(h.text()).toContain("saved");
    expect(h.text()).toContain("Bobby Tables");
    h.stop();
  });
  test("a reserved name is refused in the account page's words and changes nothing", async () => {
    const before = getUserByName(forge.db, "bob")!.displayName;
    const h = boot("bob");
    await open(h);
    await h.press("n");
    await clear(h, 40);
    await h.type("forge");
    await h.press("enter");
    expect(h.text()).toContain(PROFILE_REFUSALS.display_name_reserved!);
    expect(getUserByName(forge.db, "bob")!.displayName).toBe(before);
    h.stop();
  });
  test("e with a taken email toasts that refusal", async () => {
    const h = boot("bob");
    await open(h);
    await h.press("e");
    await clear(h, 40);
    await h.type("[email protected]");
    await h.press("enter");
    expect(h.text()).toContain("Another account already uses that address.");
    expect(getUserByName(forge.db, "bob")!.email).toBe("[email protected]");
    h.stop();
  });
  test("an agent is not offered the entry", async () => {
    const h = boot("carol");
    await h.ctrl("k");
    await h.type("Your profile");
    expect(h.text()).not.toContain("display name and email");
    h.stop();
  });
  test("a new email says a confirmation link was sent to it", async () => {
    const h = boot("bob");
    await open(h);
    await h.press("e");
    await clear(h, 40);
    await h.type("[email protected]");
    await h.press("enter");
    expect(getUserByName(forge.db, "bob")!.email).toBe("[email protected]");
    expect(h.text()).toContain(emailSavedWords("[email protected]"));
    expect(emailSavedWords("[email protected]")).toContain("confirmation link was sent to [email protected]");
    h.stop();
  });
  test("a refusal with no words of its own gets the shared fallback", async () => {
    const h = boot("dave");
    await open(h);
    // The account vanishes under an open session: updateProfile answers no_such_user.
    forge.db.query("DELETE FROM user WHERE username = 'dave'").run();
    await h.press("n");
    await clear(h, 40);
    await h.type("Davey");
    await h.press("enter");
    expect(h.text()).toContain(PROFILE_FALLBACK);
    h.stop();
  });
  test("a guest is not offered the entry and cannot reach the screen", async () => {
    const h = boot(undefined);
    await h.ctrl("k");
    await h.type("Your profile");
    expect(h.text()).not.toContain("display name and email");
    await h.press("enter");
    expect(h.text()).not.toContain("set display name");
    expect(h.text()).not.toContain("Display name");
    h.stop();
  });
});
		@@ -530,3 +530,5 @@ The web changelog's days and its "shipped today" count follow the reader's clock
530	530	A repository admin cuts a wave from two doors, both through `cutWaveFor` (`src/actions/cut_wave.ts`): Settings → Cut a wave, and `c` on the terminal's waves screen, which says how many pulls would go in, asks `cut wave N? y/n` (`y` and `n` choose outright) and shows the draft pull's number (Enter opens it). Each opens a draft pull listing the pulls merged since the last wave; nothing merged, an earlier wave that does not parse, or a viewer who is not an admin is refused in the action's words, writing nothing.
531	531
532	532	Cmd-K finds a repository by its name first (exact, then prefix; your own ahead); a repository with an app has an "Open the app of …" option under it, and Cmd/Ctrl+Enter on the repository opens the app (`docs/features/cmd-k-repositories.md`).
	533
	534	In the terminal, the palette's Your profile (any signed-in person, never an agent; a guest is not offered it) shows username, display name and email; `n` sets the display name and `e` the email through `updateProfile`, the action behind Settings → Account. Refusals read as the page's do (`src/actions/profile_words.ts`, including one shared fallback for a refusal with no words of its own), and a changed email says a confirmation link was sent to it and that it is unverified until followed.
		@@ -0,0 +1,33 @@
	1	/**
	2	* What a person is told when `updateProfile` refuses: one sentence per error,
	3	* shared by Settings › Account and the terminal's profile screen so the two
	4	* say the same thing.
	5	*/
	6
	7	import type { updateProfile } from "./users.ts";
	8
	9	type ProfileError = Extract<ReturnType<typeof updateProfile>, { ok: false }>["error"];
	10
	11	/** The refusals a person can fix by writing something else. */
	12	export const PROFILE_REFUSALS: Partial<Record<ProfileError, string>> = {
	13	email_taken: "Another account already uses that address.",
	14	invalid_email: "That doesn't look like an email address.",
	15	display_name_reserved: "That name belongs to the crew, the owner or the forge.",
	16	display_name_mixed_script:
	17	"Write it in one alphabet: letters from different scripts can pass for other names.",
	18	};
	19
	20	/** The form field a refusal belongs to. */
	21	export const PROFILE_REFUSAL_FIELD: Partial<Record<ProfileError, "displayName" \| "email">> = {
	22	email_taken: "email",
	23	invalid_email: "email",
	24	display_name_reserved: "displayName",
	25	display_name_mixed_script: "displayName",
	26	};
	27
	28	/** Any refusal not named above (a failed sign-in, a vanished account): nothing the person typed is at fault. */
	29	export const PROFILE_FALLBACK = "Your profile could not be saved. Sign in again and try once more.";
	30
	31	/** After a new address is saved: the link goes to it, and the old proof no longer stands. */
	32	export const emailSavedWords = (email: string): string =>
	33	`Email saved. A confirmation link was sent to ${email}; it is not verified until you follow it.`;
		@@ -27,6 +27,7 @@ import { modelCeilingEntry, modelGrantEntry } from "./model.ts";
27	27	import { entry as orgTeams } from "./orgteams.ts";
28	28	import { entry as owner } from "./owner.ts";
29	29	import { entry as people } from "./people.ts";
	30	import { entry as profile } from "./profile.ts";
30	31	import { entry as quotas } from "./quotas.ts";
31	32	import { entry as resilience } from "./resilience.ts";
32	33	import { entry as scorecard } from "./scorecard.ts";
		@@ -83,6 +84,7 @@ export const ENTRIES: readonly PaletteEntry[] = [
83	84	front,
84	85	owner,
85	86	forges,
	87	profile,
86	88	];
87	89
88	90	/** Put each entry the session is offered into `commands`, after the command it names or at the end. */
		@@ -0,0 +1,89 @@
	1	/**
	2	* Your profile, in the terminal: username, display name and email, with `n`
	3	* and `e` to change the last two through `updateProfile` — the action behind
	4	* Settings › Account, refusing in the same words. A new email starts
	5	* verification exactly as it does on the web.
	6	*/
	7
	8	import { emailSavedWords, PROFILE_FALLBACK, PROFILE_REFUSALS } from "../../actions/profile_words.ts";
	9	import { updateProfile } from "../../actions/users.ts";
	10	import { isStandInEmail } from "../../core/users.ts";
	11	import type { Ctx, Screen } from "../app/app.ts";
	12	import { binding } from "../app/keys.ts";
	13	import type { Session } from "../session.ts";
	14	import { style } from "../term/style.ts";
	15	import { truncate } from "../term/width.ts";
	16	import { promptScreen } from "./common.ts";
	17	import type { PaletteEntry } from "./entries.ts";
	18
	19	export function profileScreen(f: Session, ctx: Ctx): Screen {
	20	const save = (patch: { displayName: string } \| { email: string }): string \| undefined => {
	21	const r = updateProfile(f.app, f.user, patch);
	22	if (!r.ok) {
	23	const words = PROFILE_REFUSALS[r.error] ?? PROFILE_FALLBACK;
		junipercrew 12d ago outdated Generic fallback is not a sentence a person can act on, and differs from the web page. Share one fallback in profile_words.ts.
	24	ctx.toast(words, "danger");
	25	return words;
	26	}
	27	const emailChanged = "email" in patch && r.value.email.toLowerCase() !== f.user?.email.toLowerCase();
	28	f.user = r.value;
		junipercrew 12d ago outdated After an email change say a confirmation link was sent; the web page does.
	29	ctx.toast(emailChanged ? emailSavedWords(r.value.email) : "saved", "success");
	30	ctx.invalidate();
	31	return undefined;
	32	};
	33
	34	const screen: Screen = {
	35	title: "Your profile",
	36	keys: [binding(["n"], "set display name"), binding(["e"], "set email")],
	37	render(area, s) {
	38	const c = ctx.theme.c;
	39	const u = f.user;
	40	if (u === undefined) return;
	41	const email = isStandInEmail(u.email) ? "none" : u.email;
	42	const rows: [string, string][] = [
	43	["Username", u.username],
	44	["Display name", u.displayName],
	45	["Email", email],
	46	];
	47	rows.forEach(([k, v], i) => {
	48	const y = area.y + i;
	49	s.text(area.x, y, k.padEnd(14), style(c.mutedFg, c.bg), area.x + area.w);
	50	s.text(area.x + 14, y, truncate(v, Math.max(0, area.w - 14)), style(c.fg, c.bg), area.x + area.w);
	51	});
	52	},
	53	key(e) {
	54	if (e.ctrl \|\| e.alt \|\| f.user === undefined) return false;
	55	if (e.key === "n") {
	56	ctx.push(
	57	promptScreen(ctx, screen, {
	58	title: "Display name",
	59	label: "display name",
	60	value: f.user.displayName,
	61	onSubmit: (v) => save({ displayName: v }),
	62	}),
	63	);
	64	return true;
	65	}
	66	if (e.key === "e") {
	67	ctx.push(
	68	promptScreen(ctx, screen, {
	69	title: "Email",
	70	label: "email address",
	71	value: isStandInEmail(f.user.email) ? "" : f.user.email,
	72	onSubmit: (v) => save({ email: v }),
	73	}),
	74	);
	75	return true;
	76	}
	77	return false;
	78	},
	79	};
	80	return screen;
	81	}
	82
	83	export const entry: PaletteEntry = {
	84	id: "profile",
	85	title: "Your profile",
	86	hint: "display name and email",
	87	offered: (session) => session.user !== undefined && session.user.kind !== "agent",
	88	run: (session, ctx) => ctx.push(profileScreen(session, ctx)),
		junipercrew 12d ago outdated Needs a README line and a guest test; offered() is the only gate.
	89	};
		@@ -33,6 +33,11 @@ import { linkEdgeLogin, linkedLogin, unlinkEdgeLogin } from "../../core/edge_lin
33	33	import { LAST_WAY_IN, linkedParent, parentIssuerOf, unlinkParent } from "../../core/federation.ts";
34	34	import { activeEdgeToken, edgeIdentity } from "../../http/edge.ts";
35	35	import { listKeys } from "../../core/keys.ts";
	36	import {
	37	PROFILE_FALLBACK,
	38	PROFILE_REFUSAL_FIELD,
	39	PROFILE_REFUSALS,
	40	} from "../../actions/profile_words.ts";
36	41	import { endAccountSession } from "../../actions/signins.ts";
37	42	import { listSessions, type SessionInfo } from "../../core/sessions.ts";
38	43	import { ADMIN_TOKEN_WORDS, listTokens, type TokenScope } from "../../core/tokens.ts";
		@@ -100,7 +105,7 @@ interface ProfileForm {
100	105	displayName: string;
101	106	email: string;
102	107	commitEmail: CommitEmail;
103		errors?: { displayName?: string; email?: string };
	108	errors?: { displayName?: string; email?: string; form?: string };
104	109	}
105	110
106	111	/** The profile form as the account stands now. */
		@@ -279,6 +284,7 @@ function profileView(ctx: Ctx, values: ProfileForm): Html {
279	284	const user = ctx.auth.user!;
280	285	return html`${unverifiedNotice(ctx)}${roleView(ctx)}${card(
281	286	html`<form method="post" action="/settings">
	287	${when(values.errors?.form, (m) => html`<p class="error-note">${m}</p>`)}
282	288	<div class="field">
283	289	<label for="f-username">Username</label>
284	290	<input
		@@ -404,16 +410,10 @@ export async function accountUpdate(ctx: Ctx): Promise<Response> {
404	410	commitEmail,
405	411	});
406	412	if (!updated.ok) {
	413	const words = PROFILE_REFUSALS[updated.error];
	414	const at = PROFILE_REFUSAL_FIELD[updated.error];
407	415	const errors: ProfileForm["errors"] =
408		updated.error === "email_taken"
409		? { email: "Another account already uses that address." }
410		: updated.error === "invalid_email"
411		? { email: "That doesn't look like an email address." }
412		: updated.error === "display_name_reserved"
413		? { displayName: "That name belongs to the crew, the owner or the forge." }
414		: updated.error === "display_name_mixed_script"
415		? { displayName: "Write it in one alphabet: letters from different scripts can pass for other names." }
416		: {};
	416	words === undefined \|\| at === undefined ? { form: PROFILE_FALLBACK } : { [at]: words };
417	417	return accountShell(
418	418	ctx,
419	419	"profile",
		@@ -0,0 +1,51 @@
	1	/**
	2	* Settings › Account refuses a profile in the words the terminal shares
	3	* (#8001): the web page and `PROFILE_REFUSALS` cannot drift apart.
	4	*/
	5	import { afterAll, beforeAll, expect, test } from "bun:test";
	6	import { mkdtemp, rm } from "node:fs/promises";
	7	import { tmpdir } from "node:os";
	8	import { join } from "node:path";
	9	import { createApp, type App } from "../src/app.ts";
	10	import { PROFILE_REFUSALS } from "../src/actions/profile_words.ts";
	11	import { serve, type Servers } from "../src/http/server.ts";
	12	import { adminCookie } from "./helpers/admin.ts";
	13	import { quietLogs } from "./helpers/globals.ts";
	14
	15	quietLogs();
	16
	17	let dataDir: string;
	18	let app: App;
	19	let servers: Servers;
	20	let cookie: string;
	21
	22	beforeAll(async () => {
	23	dataDir = await mkdtemp(join(tmpdir(), "forge-profile-words-"));
	24	app = createApp({ dataDir, port: 0 });
	25	servers = await serve(app);
	26	cookie = await adminCookie(app, { username: "alice", email: "[email protected]" });
	27	});
	28	afterAll(async () => {
	29	await servers.stop?.();
	30	app.close();
	31	await rm(dataDir, { recursive: true, force: true });
	32	});
	33
	34	const post = (fields: Record<string, string>) =>
	35	fetch(`${servers.url}/settings`, {
	36	method: "POST",
	37	redirect: "manual",
	38	headers: { cookie, origin: servers.url, "content-type": "application/x-www-form-urlencoded" },
	39	body: new URLSearchParams(fields),
	40	});
	41
	42	const escaped = (s: string) => s.replace(/'/g, "'").replace(/&/g, "&");
	43
	44	test("the account page refuses in the shared words, in the field they belong to", async () => {
	45	const reserved = await post({ displayName: "forge", email: "[email protected]" });
	46	expect(reserved.status).toBe(422);
	47	expect(await reserved.text()).toContain(escaped(PROFILE_REFUSALS.display_name_reserved!).replace(/&#39;/g, "'"));
	48	const bad = await post({ displayName: "Alice", email: "nope" });
	49	expect(bad.status).toBe(422);
	50	expect(await bad.text()).toContain(PROFILE_REFUSALS.invalid_email!.replace(/'/g, "'"));
	51	});
		@@ -112,6 +112,7 @@ test("a site-admin person is offered the whole roster", () => {
112	112	["front", "Front page", "the apps a first visitor sees, ranked; an admin pins or hides"],
113	113	["owner", "Owner's needs", "what needs the owner, snapshots, failure domains"],
114	114	["forges", "Forges you sent", "each forge sent, claimed or not, and its apps"],
	115	["profile", "Your profile", "display name and email"],
115	116	["family", "Family", "the forge that sent this one, and the forges it sent"],
116	117	["chain", "Chain", "the forges this forge's code descends from, root first"],
117	118	["quit", "Quit", "disconnect"],
		@@ -207,6 +208,7 @@ test("a member person is offered the signed-in roster without the admin entries"
207	208	["bulk", "Bulk actions", "your last bulk actions; u undoes one inside its day"],
208	209	["origins", "Connected origins", "the hosts your mirrors come from"],
209	210	["front", "Front page", "the apps a first visitor sees, ranked; an admin pins or hides"],
	211	["profile", "Your profile", "display name and email"],
210	212	["family", "Family", "the forge that sent this one, and the forges it sent"],
211	213	["chain", "Chain", "the forges this forge's code descends from, root first"],
212	214	["quit", "Quit", "disconnect"],
		@@ -0,0 +1,163 @@
	1	/**
	2	* Your profile in the terminal (#8001): `n` sets the display name, `e` the
	3	* email, with the account page's words on refusal; an agent has no entry.
	4	*/
	5	import { afterAll, beforeAll, describe, expect, test } from "bun:test";
	6	import { mkdtemp, rm } from "node:fs/promises";
	7	import { tmpdir } from "node:os";
	8	import { join } from "node:path";
	9	import { createApp, type App as Forge } from "../src/app.ts";
	10	import { createUser, getUserByName } from "../src/core/users.ts";
	11	import { emailSavedWords, PROFILE_FALLBACK, PROFILE_REFUSALS } from "../src/actions/profile_words.ts";
	12	import { createForgeApp } from "../src/tui/forge.ts";
	13	import { type TuiIdentity } from "../src/tui/session.ts";
	14	import { headlessTerminal } from "../src/tui/term/terminal.ts";
	15	import { quietLogs } from "./helpers/globals.ts";
	16	import { settleApp } from "./helpers/tui.ts";
	17
	18	quietLogs();
	19
	20	describe("your profile in the terminal", () => {
	21	let dataDir: string;
	22	let forge: Forge;
	23
	24	function boot(username: string \| undefined) {
	25	const terminal = headlessTerminal(140, 32);
	26	const user = username === undefined ? undefined : getUserByName(forge.db, username)!;
	27	const identity: TuiIdentity = { sshUsername: "t", remoteAddress: "127.0.0.1", user };
	28	const { app } = createForgeApp(forge, identity, { terminal, exitHooks: false });
	29	app.start();
	30	const key = (k: string) =>
	31	app.dispatch({ type: "key", key: k, ctrl: false, alt: false, shift: false });
	32	return {
	33	text: () => app.screen.toText(),
	34	press: async (...keys: string[]) => {
	35	keys.forEach(key);
	36	await settleApp(app);
	37	},
	38	ctrl: async (k: string) => {
	39	app.dispatch({ type: "key", key: k, ctrl: true, alt: false, shift: false });
	40	await settleApp(app);
	41	},
	42	type: async (t: string) => {
	43	for (const ch of t) key(ch);
	44	await settleApp(app);
	45	},
	46	stop: () => app.stop(),
	47	};
	48	}
	49
	50	beforeAll(async () => {
	51	dataDir = await mkdtemp(join(tmpdir(), "forge-tui-profile-"));
	52	forge = createApp({ dataDir, port: 0 });
	53	for (const [username, adminIfFirst] of [["alice", true], ["bob", false], ["carol", false], ["dave", false]] as const) {
	54	const made = await createUser(forge.db, {
	55	origin: "seed",
	56	trusted: true,
	57	username,
	58	email: `${username}@forge.local`,
	59	password: "a-good-passphrase",
	60	adminIfFirst,
	61	});
	62	if (!made.ok) throw new Error(made.error);
	63	}
	64	forge.db.query("UPDATE user SET is_agent = 1 WHERE username = 'carol'").run();
	65	});
	66	afterAll(async () => {
	67	forge.close();
	68	await rm(dataDir, { recursive: true, force: true });
	69	});
	70
	71	const open = async (h: ReturnType<typeof boot>) => {
	72	await h.ctrl("k");
	73	await h.type("Your profile");
	74	await h.press("enter");
	75	};
	76	const clear = async (h: ReturnType<typeof boot>, n: number) => {
	77	for (let i = 0; i < n; i++) await h.press("backspace");
	78	};
	79
	80	test("n sets the display name and the screen shows it", async () => {
	81	const h = boot("bob");
	82	await open(h);
	83	expect(h.text()).toContain("[email protected]");
	84	await h.press("n");
	85	await clear(h, 40);
	86	await h.type("Bobby Tables");
	87	await h.press("enter");
	88	expect(getUserByName(forge.db, "bob")!.displayName).toBe("Bobby Tables");
	89	expect(h.text()).toContain("saved");
	90	expect(h.text()).toContain("Bobby Tables");
	91	h.stop();
	92	});
	93
	94	test("a reserved name is refused in the account page's words and changes nothing", async () => {
	95	const before = getUserByName(forge.db, "bob")!.displayName;
	96	const h = boot("bob");
	97	await open(h);
	98	await h.press("n");
	99	await clear(h, 40);
	100	await h.type("forge");
	101	await h.press("enter");
	102	expect(h.text()).toContain(PROFILE_REFUSALS.display_name_reserved!);
	103	expect(getUserByName(forge.db, "bob")!.displayName).toBe(before);
	104	h.stop();
	105	});
	106
	107	test("e with a taken email toasts that refusal", async () => {
	108	const h = boot("bob");
	109	await open(h);
	110	await h.press("e");
	111	await clear(h, 40);
	112	await h.type("[email protected]");
	113	await h.press("enter");
	114	expect(h.text()).toContain("Another account already uses that address.");
	115	expect(getUserByName(forge.db, "bob")!.email).toBe("[email protected]");
	116	h.stop();
	117	});
	118
	119	test("an agent is not offered the entry", async () => {
	120	const h = boot("carol");
	121	await h.ctrl("k");
	122	await h.type("Your profile");
	123	expect(h.text()).not.toContain("display name and email");
	124	h.stop();
	125	});
	126
	127	test("a new email says a confirmation link was sent to it", async () => {
	128	const h = boot("bob");
	129	await open(h);
	130	await h.press("e");
	131	await clear(h, 40);
	132	await h.type("[email protected]");
	133	await h.press("enter");
	134	expect(getUserByName(forge.db, "bob")!.email).toBe("[email protected]");
	135	expect(h.text()).toContain(emailSavedWords("[email protected]"));
	136	expect(emailSavedWords("[email protected]")).toContain("confirmation link was sent to [email protected]");
	137	h.stop();
	138	});
	139
	140	test("a refusal with no words of its own gets the shared fallback", async () => {
	141	const h = boot("dave");
	142	await open(h);
	143	// The account vanishes under an open session: updateProfile answers no_such_user.
	144	forge.db.query("DELETE FROM user WHERE username = 'dave'").run();
	145	await h.press("n");
	146	await clear(h, 40);
	147	await h.type("Davey");
	148	await h.press("enter");
	149	expect(h.text()).toContain(PROFILE_FALLBACK);
	150	h.stop();
	151	});
	152
	153	test("a guest is not offered the entry and cannot reach the screen", async () => {
	154	const h = boot(undefined);
	155	await h.ctrl("k");
	156	await h.type("Your profile");
	157	expect(h.text()).not.toContain("display name and email");
	158	await h.press("enter");
	159	expect(h.text()).not.toContain("set display name");
	160	expect(h.text()).not.toContain("Display name");
	161	h.stop();
	162	});
	163	});