@skillcdn/console 0.4.3 → 0.4.5

package/src/client.ts

@@ -3,6 +3,8 @@ import {
   CLAIM_PATH,
   categoryPath,
   connectPath,
+  decisionFilePath,
+  decisionPath,
   personTokensPath,
   personWorkPath,
   pluginPath,
@@ -73,6 +75,7 @@ import {
   type RestProjectPatch,
   type RestProjectRules,
   type RestProjects,
+  type RestReachedDecision,
   type RestReportInput,
   type RestRules,
   type RestRulesInput,
@@ -89,6 +92,10 @@ import {
   type RestTaskInput,
   type RestTaskPatch,
   type RestTasks,
+  type RestTeam,
+  type RestTeamInput,
+  type RestTeamPatch,
+  type RestTeams,
   type RestTokenCreated,
   type RestTokenInput,
   type RestTokens,
@@ -137,6 +144,7 @@ import {
   restProjectRulesSchema,
   restProjectSchema,
   restProjectsSchema,
+  restReachedDecisionSchema,
   restRulesSchema,
   restRunSchema,
   restRunsSchema,
@@ -147,6 +155,8 @@ import {
   restSkillsSchema,
   restTaskSchema,
   restTasksSchema,
+  restTeamSchema,
+  restTeamsSchema,
   restTokenCreatedSchema,
   restTokensSchema,
   restVersionSchema,
@@ -498,6 +508,8 @@ export interface PluginClient {
   fileUrl(fileId: string): string;
   /** The bytes of a record's file, with the name and the type the console says. */
   readFile(fileId: string, signal?: AbortSignal): Promise<FileRead>;
+  /** A person's picture, for a frame, which names the person and never an address (ADR-0063). */
+  personPicture(personId: string, signal?: AbortSignal): Promise<FileRead>;
   /** Where the frame of a page or a widget is (ADR-0054), on a project when its key is given. */
   frameUrl(options: {
     readonly page?: string | undefined;
@@ -543,6 +555,8 @@ export interface PluginClient {
   disable(): Promise<RestPluginDetail>;
   /** Changes the settings' values, without secrets; `null` clears one. */
   updateSettings(patch: RestPluginSettingsPatch): Promise<RestPluginDetail>;
+  /** Says what an enabled plugin holds: those it requires, named again, and the optional ones to turn on. */
+  updateConsent(consent: readonly string[]): Promise<RestPluginDetail>;
   /** Seals a secret for the plugin; it is answered by nothing from then on. */
   setSecret(name: string, value: string): Promise<void>;
   removeSecret(name: string): Promise<void>;
@@ -584,6 +598,17 @@ export interface ConsoleClient {
   createListing(input: RestListingInput): Promise<RestListing>;
   /** Takes a listing away before anyone signed in with it; for an administrator. */
   removeListing(id: string): Promise<void>;
+  /** The teams of the workspace (ADR-0073), each with the members the asker may see. */
+  teams(signal?: AbortSignal): Promise<RestTeams>;
+  /**
+   * Makes, renames and removes a team, and puts a person in one or takes them out; for an
+   * administrator. A team is called by its key (ADR-0074), which never changes.
+   */
+  createTeam(input: RestTeamInput): Promise<RestTeam>;
+  renameTeam(key: string, patch: RestTeamPatch): Promise<RestTeam>;
+  removeTeam(key: string): Promise<void>;
+  addTeamMember(key: string, personId: string): Promise<RestTeam>;
+  removeTeamMember(key: string, personId: string): Promise<RestTeam>;
   /** The projects the asker may see, with what they are in each. */
   projects(signal?: AbortSignal): Promise<RestProjects>;
   /** Makes a project, whose owner the asker becomes. */
@@ -620,6 +645,26 @@ export interface ConsoleClient {
     filter?: { readonly open?: boolean; readonly raised?: boolean } & Page,
     signal?: AbortSignal,
   ): Promise<RestMyDecisions>;
+  /**
+   * One decision by its id, wherever it is (ADR-0068): in a project the asker may see, or one
+   * that reaches them from elsewhere, addressed to them, raised by them, or a plugin's addressed
+   * to someone they manage; with its project and whether they may answer it.
+   */
+  decision(id: string, signal?: AbortSignal): Promise<RestReachedDecision>;
+  /** The same, after waiting up to `waitSeconds` for its answer, as a project's `awaitDecision` waits. */
+  awaitDecision(
+    id: string,
+    waitSeconds: number,
+    signal?: AbortSignal,
+  ): Promise<RestReachedDecision>;
+  /** Answers a decision wherever it is, as whoever it reaches with the right to answer (ADR-0068). */
+  answerDecision(id: string, input: RestAnswerInput): Promise<RestDecision>;
+  /**
+   * Where the bytes of a file put on a decision (ADR-0055) are read at the decision's own address,
+   * by the decision's id and the file's: for whoever the decision reaches, in a project they may
+   * see or not (ADR-0068), as the project's `fileUrl` is for whoever may see the project.
+   */
+  decisionFileUrl(decisionId: string, fileId: string): string;
   /** Another person's plate, within what the asker may see: for an administrator, or an owner of a project they are in. */
   personWork(personId: string, signal?: AbortSignal): Promise<RestPersonWork>;
   /** The tokens of whoever asks. */
@@ -1143,6 +1188,8 @@ export function createClient(options: ClientOptions = {}): ConsoleClient {
         ),
       fileUrl: (fileId) => `${base}${at("files", fileId)}`,
       readFile: (fileId, signal) => read(`${base}${at("files", fileId)}`, fileId, signal),
+      personPicture: (personId, signal) =>
+        read(`${base}${at("people", personId, "picture")}`, personId, signal),
       frameUrl: (options) =>
         withQuery(at("frame"), {
           page: options.page,
@@ -1213,6 +1260,8 @@ export function createClient(options: ClientOptions = {}): ConsoleClient {
       disable: () => request("POST", `${base}${at("disable")}`, undefined, restPluginDetailSchema),
       updateSettings: (patch) =>
         request("PATCH", `${base}${at("settings")}`, patch, restPluginDetailSchema),
+      updateConsent: (consent) =>
+        request("PATCH", `${base}${at("consent")}`, { consent }, restPluginDetailSchema),
       setSecret: (name, value) =>
         request("PUT", `${base}${at("secrets", name)}`, { value }, undefined),
       removeSecret: (name) =>
@@ -1277,6 +1326,22 @@ export function createClient(options: ClientOptions = {}): ConsoleClient {
       request("POST", `${base}${REST_ROUTES.listings}`, input, restListingSchema),
     removeListing: (id) =>
       request("DELETE", `${base}${restPath("listings", id)}`, undefined, undefined),
+    teams: (signal) =>
+      request("GET", `${base}${REST_ROUTES.teams}`, undefined, restTeamsSchema, signal),
+    createTeam: (input) => request("POST", `${base}${REST_ROUTES.teams}`, input, restTeamSchema),
+    renameTeam: (key, patch) =>
+      request("PATCH", `${base}${restPath("teams", key)}`, patch, restTeamSchema),
+    removeTeam: (key) =>
+      request("DELETE", `${base}${restPath("teams", key)}`, undefined, undefined),
+    addTeamMember: (key, personId) =>
+      request("POST", `${base}${restPath("teams", key)}/members`, { personId }, restTeamSchema),
+    removeTeamMember: (key, personId) =>
+      request(
+        "DELETE",
+        `${base}${restPath("teams", key)}/members/${encodeURIComponent(personId)}`,
+        undefined,
+        restTeamSchema,
+      ),
     projects: (signal) =>
       request("GET", `${base}${REST_ROUTES.projects}`, undefined, restProjectsSchema, signal),
     createProject: (input) =>
@@ -1323,6 +1388,19 @@ export function createClient(options: ClientOptions = {}): ConsoleClient {
         restMyDecisionsSchema,
         signal,
       ),
+    decision: (id, signal) =>
+      request("GET", `${base}${decisionPath(id)}`, undefined, restReachedDecisionSchema, signal),
+    awaitDecision: (id, waitSeconds, signal) =>
+      request(
+        "GET",
+        withQuery(decisionPath(id), { wait: String(waitSeconds) }),
+        undefined,
+        restReachedDecisionSchema,
+        signal,
+      ),
+    answerDecision: (id, input) =>
+      request("POST", `${base}${decisionPath(id)}/answer`, input, restDecisionSchema),
+    decisionFileUrl: (decisionId, fileId) => `${base}${decisionFilePath(decisionId, fileId)}`,
     personWork: (personId, signal) =>
       request("GET", `${base}${personWorkPath(personId)}`, undefined, restPersonWorkSchema, signal),
     tokens: (signal) =>

package/src/compat.ts

@@ -113,7 +113,7 @@ export interface ClientPolicy {
  * last changed what the command reads or sends (ADR-0038), whose changelog entry begins with
  * `Breaking:`; `pnpm check` holds it to a version the package has, or is about to have.
  */
-export const CLIENT_POLICY: ClientPolicy = { atLeast: "0.4.2" };
+export const CLIENT_POLICY: ClientPolicy = { atLeast: "0.4.5" };
 
 /**
  * The oldest console this command works with (ADR-0038): raised by the release that last

package/src/components/board.tsx

@@ -18,6 +18,8 @@ import {
 } from "../api.js";
 import { useWords } from "../i18n/index.js";
 import type { BoardFilter } from "../router.js";
+import { Picker } from "./picker.js";
+import { listSearch } from "./searches.js";
 import { isPlainClick } from "./shell.js";
 import {
   Badge,
@@ -25,6 +27,7 @@ import {
   CategoryBadge,
   cx,
   DueBadge,
+  PersonChip,
   PriorityBadge,
   personName,
   Workers,
@@ -71,13 +74,13 @@ export interface BoardProps {
 export const FOLDED_STATES: readonly TaskState[] = ["done", "dropped"];
 
 /** How far a mouse travels on a card before the press is a drag and not a click. */
-const DRAG_SLACK = 4;
+export const DRAG_SLACK = 4;
 /**
  * How long a finger rests on a card before the card comes loose, and how far it may wander
  * meanwhile; a finger that moves sooner is scrolling the page, not moving the card.
  */
-const HOLD_MS = 300;
-const HOLD_SLACK = 8;
+export const HOLD_MS = 300;
+export const HOLD_SLACK = 8;
 /** How near the pointer comes to the board's edge before the board scrolls to show more columns. */
 const EDGE = 48;
 /** How fast the board scrolls, in pixels a second, with the pointer at the edge itself; slower further in. */
@@ -727,6 +730,13 @@ export function filterTasks(
   });
 }
 
+/** A goal to narrow the board to, or no goal at all. */
+type GoalChoice = { readonly kind: "none" } | { readonly kind: "goal"; readonly goal: RestGoal };
+/** A person to narrow the board to, or whoever is looking. */
+type PersonChoice =
+  | { readonly kind: "mine" }
+  | { readonly kind: "person"; readonly person: RestPerson };
+
 export interface BoardFiltersProps {
   readonly filter: BoardFilter;
   readonly categories: readonly RestCategory[];
@@ -754,6 +764,44 @@ export function BoardFilters(props: BoardFiltersProps) {
     }
     props.onChange(next as BoardFilter);
   };
+  // The goal and the person are searched for (ADR-0037), among the page's own; what the address
+  // names and the page does not hold is held as it is, so that the filter still shows.
+  const goalChoices: readonly GoalChoice[] = [
+    { kind: "none" },
+    ...goals.map((goal) => ({ kind: "goal" as const, goal })),
+  ];
+  const chosenGoal = goals.find((goal) => goal.id === filter.goal);
+  const goalChoice: GoalChoice | undefined =
+    filter.goal === undefined
+      ? undefined
+      : filter.goal === ""
+        ? { kind: "none" }
+        : chosenGoal === undefined
+          ? undefined
+          : { kind: "goal", goal: chosenGoal };
+  const goalWords = (choice: GoalChoice) =>
+    choice.kind === "none" ? words.noGoal : choice.goal.title;
+  const findGoal = listSearch(goalChoices, (choice, typed) =>
+    goalWords(choice).toLowerCase().includes(typed),
+  );
+  const personChoices: readonly PersonChoice[] = [
+    ...(props.me === undefined ? [] : [{ kind: "mine" as const }]),
+    ...props.people
+      .filter((person) => person.id !== props.me?.id)
+      .map((person) => ({ kind: "person" as const, person })),
+  ];
+  const chosenPerson = props.people.find((person) => person.id === filter.person);
+  const personChoice: PersonChoice | undefined =
+    filter.mine === true
+      ? { kind: "mine" }
+      : filter.person === undefined || chosenPerson === undefined
+        ? undefined
+        : { kind: "person", person: chosenPerson };
+  const personWords = (choice: PersonChoice) =>
+    choice.kind === "mine" ? words.mine : `${personName(choice.person)} ${choice.person.login}`;
+  const findPerson = listSearch(personChoices, (choice, typed) =>
+    personWords(choice).toLowerCase().includes(typed),
+  );
   return (
     <form
       className="sc-filters"
@@ -795,54 +843,47 @@ export function BoardFilters(props: BoardFiltersProps) {
         </select>
       </label>
       {goals.length > 0 && (
-        <label className="sc-field sc-field-inline">
-          <span className="sc-visually-hidden">{words.anyGoal}</span>
-          <select
-            className="sc-input"
-            value={filter.goal ?? "*"}
-            onChange={(event) =>
-              event.target.value === "*" ? change({}, "goal") : change({ goal: event.target.value })
+        <div className="sc-field sc-field-inline">
+          <Picker
+            value={goalChoice}
+            held={goalChoice === undefined && filter.goal !== undefined ? filter.goal : undefined}
+            search={findGoal}
+            keyOf={(choice) => (choice.kind === "none" ? "" : choice.goal.id)}
+            render={goalWords}
+            label={words.anyGoal}
+            placeholder={words.anyGoal}
+            onChange={(choice) =>
+              choice === undefined
+                ? change({}, "goal")
+                : change({ goal: choice.kind === "none" ? "" : choice.goal.id })
             }
-          >
-            <option value="*">{words.anyGoal}</option>
-            <option value="">{words.noGoal}</option>
-            {goals.map((goal) => (
-              <option key={goal.id} value={goal.id}>
-                {goal.title}
-              </option>
-            ))}
-          </select>
-        </label>
+          />
+        </div>
       )}
-      <label className="sc-field sc-field-inline">
-        <span className="sc-visually-hidden">{words.everyone}</span>
-        <select
-          className="sc-input"
-          value={filter.mine === true ? "mine" : (filter.person ?? "*")}
-          onChange={(event) => {
-            const value = event.target.value;
-            if (value === "*") {
+      <div className="sc-field sc-field-inline">
+        <Picker
+          value={personChoice}
+          held={
+            personChoice === undefined && filter.person !== undefined ? filter.person : undefined
+          }
+          search={findPerson}
+          keyOf={(choice) => (choice.kind === "mine" ? "mine" : choice.person.id)}
+          render={(choice) =>
+            choice.kind === "mine" ? words.mine : <PersonChip person={choice.person} size="sm" />
+          }
+          label={words.everyone}
+          placeholder={words.everyone}
+          onChange={(choice) => {
+            if (choice === undefined) {
               change({ mine: undefined, person: undefined });
-              return;
-            }
-            if (value === "mine") {
+            } else if (choice.kind === "mine") {
               change({ mine: true, person: undefined });
-              return;
+            } else {
+              change({ person: choice.person.id, mine: undefined });
             }
-            change({ person: value, mine: undefined });
           }}
-        >
-          <option value="*">{words.everyone}</option>
-          {props.me !== undefined && <option value="mine">{words.mine}</option>}
-          {props.people
-            .filter((person) => person.id !== props.me?.id)
-            .map((person) => (
-              <option key={person.id} value={person.id}>
-                {personName(person)}
-              </option>
-            ))}
-        </select>
-      </label>
+        />
+      </div>
       <span className="sc-filters-count sc-muted">{words.showing(props.shown, props.total)}</span>
       {narrowed && (
         <Button variant="ghost" size="sm" onClick={() => props.onChange({})}>

package/src/components/decision-form.tsx

@@ -1,6 +1,7 @@
 import { type ClipboardEvent, type FormEvent, useMemo, useState } from "react";
 import {
   MAX_BODY_LENGTH,
+  MAX_DECIDERS,
   MAX_FILES_PER_DECISION,
   MAX_OPTION_LABEL_LENGTH,
   MAX_OPTIONS,
@@ -12,9 +13,10 @@ import {
 } from "../api.js";
 import { useWords } from "../i18n/index.js";
 import { isPicture, placing, unusedName } from "./files.js";
-import { Picker, type PickerSearch } from "./picker.js";
+import { Picker } from "./picker.js";
+import { peopleSearch } from "./searches.js";
 import { type TaskSearch, taskLabel } from "./task-form.js";
-import { Button, formatBytes, PersonChip, personName } from "./ui.js";
+import { Button, Chip, formatBytes, PersonChip, personName } from "./ui.js";
 
 // Raising a decision: the question, what a person needs to know, the options to choose from,
 // and who is to answer (ADR-0042): the person raising it, unless they name another of the
@@ -39,21 +41,21 @@ export interface DecisionFormProps {
   readonly onCancel?: (() => void) | undefined;
 }
 
-/** The people of the project found by the words typed, a page at a time, as a picker searches. */
-export function peopleSearch(people: readonly RestPerson[]): PickerSearch<RestPerson> {
-  return async (query, page) => {
-    const words = query.trim().toLowerCase();
-    const found = people.filter(
-      (person) =>
-        words.length === 0 ||
-        personName(person).toLowerCase().includes(words) ||
-        person.login.toLowerCase().includes(words),
-    );
-    return {
-      items: found.slice(page.offset, page.offset + page.limit),
-      more: found.length > page.offset + page.limit,
-    };
-  };
+/**
+ * What the form sends of whom the decision is for: nothing for the raiser alone, `deciderId` for
+ * one other person, `deciderIds` for several (ADR-0057), the first among them repeated as
+ * `deciderId` for a console of before.
+ */
+export function decidersInput(
+  deciders: readonly RestPerson[],
+  me: RestPerson | undefined,
+): Pick<RestDecisionInput, "deciderId" | "deciderIds"> {
+  const ids = deciders.map((person) => person.id);
+  if (ids.length === 0 || (ids.length === 1 && ids[0] === me?.id)) {
+    return {};
+  }
+  const first = ids[0] ?? "";
+  return ids.length === 1 ? { deciderId: first } : { deciderId: first, deciderIds: ids };
 }
 
 export function DecisionForm(props: DecisionFormProps) {
@@ -63,9 +65,20 @@ export function DecisionForm(props: DecisionFormProps) {
   const [body, setBody] = useState("");
   const [about, setAbout] = useState<RestTask | undefined>(undefined);
   const [options, setOptions] = useState<readonly string[]>(["", ""]);
-  const [decider, setDecider] = useState<RestPerson | undefined>(props.me);
+  // Whom it is for (ADR-0042, ADR-0057): the raiser, until others are named in their place.
+  const [deciders, setDeciders] = useState<readonly RestPerson[]>(
+    props.me === undefined ? [] : [props.me],
+  );
   const [files, setFiles] = useState<readonly File[]>([]);
-  const findDeciders = useMemo(() => peopleSearch(props.deciders ?? []), [props.deciders]);
+  const findDeciders = useMemo(
+    () =>
+      peopleSearch(
+        (props.deciders ?? []).filter(
+          (person) => !deciders.some((chosen) => chosen.id === person.id),
+        ),
+      ),
+    [props.deciders, deciders],
+  );
 
   const labels = options.map((option) => option.trim()).filter((option) => option.length > 0);
   const ready = question.trim().length > 0 && labels.length >= MIN_OPTIONS;
@@ -115,7 +128,7 @@ export function DecisionForm(props: DecisionFormProps) {
         body,
         options: labels.map((label) => ({ label })),
         taskId: props.taskId ?? about?.id ?? null,
-        ...(decider === undefined || decider.id === props.me?.id ? {} : { deciderId: decider.id }),
+        ...decidersInput(deciders, props.me),
       },
       files,
     );
@@ -195,24 +208,48 @@ export function DecisionForm(props: DecisionFormProps) {
         </div>
       )}
       {props.deciders !== undefined && (
-        <div className="sc-field">
-          <span className="sc-field-label">{form.decider}</span>
-          <Picker
-            value={decider}
-            search={findDeciders}
-            keyOf={(person) => person.id}
-            render={(person) => (
-              <>
-                <PersonChip person={person} size="sm" />
+        <fieldset className="sc-field sc-workers-field">
+          <legend className="sc-field-label">{form.decider}</legend>
+          <div className="sc-chips">
+            {deciders.map((person) => (
+              <Chip
+                key={person.id}
+                onRemove={() =>
+                  setDeciders((current) => current.filter((chosen) => chosen.id !== person.id))
+                }
+                removeLabel={`${words.common.remove}: ${personName(person)}`}
+                disabled={props.busy}
+              >
+                <PersonChip person={person} />
                 {person.id === props.me?.id && <span className="sc-muted"> {form.me}</span>}
-              </>
+              </Chip>
+            ))}
+            {deciders.length === 0 && <span className="sc-muted">{form.deciderPlaceholder}</span>}
+            {deciders.length < MAX_DECIDERS && (
+              <Picker
+                className="sc-picker-add"
+                value={undefined}
+                search={findDeciders}
+                keyOf={(person) => person.id}
+                render={(person) => (
+                  <>
+                    <PersonChip person={person} size="sm" />
+                    {person.id === props.me?.id && <span className="sc-muted"> {form.me}</span>}
+                  </>
+                )}
+                label={form.addDecider}
+                placeholder={form.addDecider}
+                disabled={props.busy}
+                onChange={(person) => {
+                  if (person !== undefined) {
+                    setDeciders((current) => [...current, person]);
+                  }
+                }}
+              />
             )}
-            label={form.decider}
-            placeholder={form.deciderPlaceholder}
-            disabled={props.busy}
-            onChange={(person) => setDecider(person ?? props.me)}
-          />
-        </div>
+          </div>
+          {deciders.length > 1 && <p className="sc-field-hint">{form.decidersHint}</p>}
+        </fieldset>
       )}
       <fieldset className="sc-field sc-options">
         <legend className="sc-field-label">{form.options}</legend>

package/src/components/decision-list.tsx

@@ -8,6 +8,7 @@ import {
   type RestDecision,
   type RestDecisionFile,
   type RestDecisionPatch,
+  type RestPerson,
   type RestTask,
 } from "../api.js";
 import { useWords } from "../i18n/index.js";
@@ -43,13 +44,34 @@ export interface DecisionCardProps {
   readonly busy?: boolean | undefined;
 }
 
+/** The word beside who answered: through their agent, when the answer came that way (ADR-0056). */
+function answeredWord(words: ReturnType<typeof useWords>, agent: string | null | undefined) {
+  return agent === null || agent === undefined
+    ? words.decisions.answeredBy
+    : words.decisions.answeredThrough(agentLabel(agent));
+}
+
+/** Everyone a decision is addressed to (ADR-0057): `deciders` where the console answers it, else the one decider. */
+export function decidersOf(decision: RestDecision): readonly RestPerson[] {
+  return decision.deciders !== undefined && decision.deciders.length > 0
+    ? decision.deciders
+    : [decision.decider];
+}
+
+/** The names of everyone a decision is addressed to, one after another. */
+export function deciderNames(decision: RestDecision): string {
+  return decidersOf(decision).map(personName).join(", ");
+}
+
 /**
  * Who asked, and when: the person, through their agent when a run asked; and whom the decision
- * is for, where that is someone else (ADR-0042).
+ * is for, where that is not the asker alone (ADR-0042, ADR-0057).
  */
 function Asked(props: { readonly decision: RestDecision; readonly day?: boolean }) {
   const words = useWords();
   const { decision } = props;
+  const deciders = decidersOf(decision);
+  const addressed = deciders.some((person) => person.id !== decision.raisedBy.id);
   return (
     <>
       <PersonChip person={decision.raisedBy} />{" "}
@@ -57,18 +79,17 @@ function Asked(props: { readonly decision: RestDecision; readonly day?: boolean
         ? words.decisions.asked
         : words.decisions.askedThrough(agentLabel(decision.run.agent))}{" "}
       <Time iso={decision.createdAt} precision={props.day === true ? "day" : "minute"} />
-      {decision.decider.id !== decision.raisedBy.id && (
+      {addressed && (
         <span className="sc-decision-for">
           <span className="sc-visually-hidden">
-            {words.decisions.peopleLabel(
-              personName(decision.raisedBy),
-              personName(decision.decider),
-            )}
+            {words.decisions.peopleLabel(personName(decision.raisedBy), deciderNames(decision))}
           </span>
           <span className="sc-decision-arrow" aria-hidden="true">
             →
           </span>{" "}
-          <PersonChip person={decision.decider} />
+          {deciders.map((person) => (
+            <PersonChip key={person.id} person={person} />
+          ))}
         </span>
       )}
     </>
@@ -233,7 +254,20 @@ function Outcome(props: {
           {decision.outcome === null ? (
             <p className="sc-muted">{words.decisions.nothingWritten}</p>
           ) : (
-            <Markdown source={decision.outcome} docHref={props.docHref} />
+            <>
+              <Markdown source={decision.outcome} docHref={props.docHref} />
+              {decision.outcomeBy != null && decision.outcomeAt != null && (
+                <p className="sc-decision-meta">
+                  <PersonChip person={decision.outcomeBy} />{" "}
+                  {decision.outcomeAgent == null
+                    ? words.decisions.wroteWhatFollowed
+                    : words.decisions.wroteWhatFollowedThrough(
+                        agentLabel(decision.outcomeAgent),
+                      )}{" "}
+                  <Time iso={decision.outcomeAt} />
+                </p>
+              )}
+            </>
           )}
           {props.onUpdate !== undefined && (
             <Button
@@ -368,14 +402,12 @@ export function DecisionCard(props: DecisionCardProps) {
             </div>
           )}
           <p className="sc-decision-meta">
-            <PersonChip person={decision.answer.by} /> {words.decisions.answeredBy}{" "}
+            <PersonChip person={decision.answer.by} /> {answeredWord(words, decision.answer.agent)}{" "}
             <Time iso={decision.answer.at} />
           </p>
         </div>
       ) : props.onAnswer === undefined ? (
-        <p className="sc-decision-waiting">
-          {words.decisions.waitingFor(personName(decision.decider))}
-        </p>
+        <p className="sc-decision-waiting">{words.decisions.waitingFor(deciderNames(decision))}</p>
       ) : (
         <AnswerForm decision={decision} onAnswer={props.onAnswer} busy={props.busy} />
       )}
@@ -474,7 +506,7 @@ function RecordRow(props: {
             </div>
           )}
           <p className="sc-decision-record-meta">
-            <PersonChip person={answer.by} /> {words.decisions.answeredBy}{" "}
+            <PersonChip person={answer.by} /> {answeredWord(words, answer.agent)}{" "}
             <Time iso={answer.at} precision="day" />
           </p>
         </div>