@vibe-commit/capture 0.7.0 → 0.9.0

package/dist/picker.d.ts

@@ -12,14 +12,19 @@
  *               typing `-N`, deletes the grant. It is not an exclusion (`off` is), so the repo can be chosen again.
  *   owners      one group per owner NOT yet granted, its repos behind an `aN` "all, including repos you clone later"
  *               row (D9: at most 8 repos before `+ N more`).
+ *   folders     (any-folder capture, R3) folders outside every work tree that hold sessions, one `Folders` group. A folder grant
+ *               captures the sessions there that touch no repository, under a `local:folder:` identity that only the uploader
+ *               can read; its grant line SAYS so ("private to you", R7). Granted folders are `on now` rows, removable like any.
  *   turned off  slugs in `excluded`. Choosing one is a re-include; the grant block names it on a `turn on` row, inside
  *               the same y/N (D7 · 3A), and only a yes clears the exclusion.
+ *   on your account  (slice 2) what the account grants that this machine has not named. Unticked until chosen, like any
+ *               row: choosing one is an ordinary addition, so it goes through the same disclosure and y/N (R3-8, R3-9).
  *
  * ⛔ **A pre-tick is not a consent** (D34): the working folder's repo starts ticked, and Enter on it leads to the naming
  * y/N, which defaults to N. It is an ADDITION to the diff, never part of the baseline.
  */
 import { type Grants } from "./consent.js";
-import type { ScanClone, ScanRepo } from "./commands/scan.js";
+import type { ScanClone, ScanFolder, ScanRepo } from "./commands/scan.js";
 import type { AgentId } from "./agents/types.js";
 /** D9: each owner group shows at most this many repos before the `+ N more` row. */
 export declare const GROUP_CAP = 8;
@@ -41,11 +46,22 @@ export interface PickRepo extends Counts {
     /** Starts ticked in the checklist. Only ever the working folder's repo, and only when it is not `$HOME`. */
     readonly pre: boolean;
 }
+/** A folder the person can grant: outside every work tree, with sessions. `label` is how the row names it (`~/Documents/work`). */
+export interface PickFolder extends Counts {
+    /** The REAL path: the key of the grant. */
+    readonly path: string;
+    readonly label: string;
+    readonly latestMs: number;
+    /** The person turned this folder off (or declined it). It is offered again, and choosing it turns it back on. */
+    readonly excluded?: boolean;
+}
 /** One `on now` row. `kind` says what removing it deletes. */
 export interface OnNowRow {
-    readonly kind: "owner" | "repo" | "clone";
-    /** `alexvibecommit` (owner) or a slug. */
+    readonly kind: "owner" | "repo" | "clone" | "folder";
+    /** `alexvibecommit` (owner), a slug, or a folder's REAL path. */
     readonly key: string;
+    /** How a `folder` row is named on screen (its `key` is the path). */
+    readonly label?: string;
     readonly reason: string;
     readonly counts: Counts | null;
     /** Repos found here under an owner row. */
@@ -66,10 +82,19 @@ export interface TurnedOffRow {
     /** The working folder's repo, turned off: `connect` inside it pre-selects the `turn on` (D34 + the re-include rule). */
     readonly pre: boolean;
 }
+/** One account grant this machine has not named (slice 2): an owner (`key` without its slash) or a repo (`key` is the slug). */
+export interface AccountRow {
+    readonly kind: "owner" | "repo";
+    readonly key: string;
+}
 export interface PickerModel {
     readonly onNow: readonly OnNowRow[];
     readonly owners: readonly OwnerGroup[];
+    /** What the account grants that this machine has not named. Empty before a sync, or on a machine with no credential. */
+    readonly account: readonly AccountRow[];
     readonly turnedOff: readonly TurnedOffRow[];
+    /** Folders outside every work tree that hold sessions and are not yet granted, newest first (R3). */
+    readonly folders: readonly PickFolder[];
     /** The picker's `Not listed here:` lines (no remote, can't be matched, unreadable agents). */
     readonly notListed: readonly string[];
     /** Repos the scan listed, for the `Found N repositories` line. */
@@ -86,6 +111,9 @@ export interface PickerChange {
     readonly stopRepos: readonly string[];
     /** The slugs of per-clone consents to withdraw. */
     readonly stopClones: readonly string[];
+    /** Folder grants to add / withdraw, by REAL path. Optional so a change built before folders existed still types. */
+    readonly addFolders?: readonly string[];
+    readonly stopFolders?: readonly string[];
 }
 export declare const NO_CHANGE: PickerChange;
 export declare function isNoChange(change: PickerChange): boolean;
@@ -114,7 +142,34 @@ export interface ModelInput {
     readonly notListed: readonly string[];
     readonly sawNothing: boolean;
     readonly here: HereRepo | null;
+    /** The account's grants this machine has not named, as `accountView` lists them: `owner/` for an owner, the slug for a repo. */
+    readonly accountNotHere?: readonly string[];
+    /** Folders outside every work tree that hold sessions (`ScanResult.folders`). */
+    readonly folders?: readonly ScanFolder[];
+    /** The REAL paths of the folders already granted (`folders.json`). */
+    readonly grantedFolders?: readonly string[];
+    /** The REAL paths of the folders turned off or declined: offered again, marked, so they can be granted later. */
+    readonly excludedFolders?: readonly string[];
+    /** How a folder path is shown (`~`-relative). Default: the path as is. */
+    readonly folderLabel?: (path: string) => string;
+    /**
+     * C34: may this agent's sessions be captured under a folder? Default `agentIsolatesRecords`, the registry value the resolver gates on.
+     * A seam so a cell can flip one agent and prove the picker reads the predicate rather than a list.
+     */
+    readonly isolates?: (agent: AgentId) => boolean;
 }
+/**
+ * The folder as a FOLDER GRANT would capture it (C34): only the sessions of agents whose records can be isolated count, because a
+ * Cursor session (or a Codex one, until its isolation lands) under a granted folder is never captured, and a count or an offer that
+ * included it would promise what does not happen. `null` when no session passes. Times and counts are recomputed from the members
+ * when the scan kept them; a hand-built folder without members keeps its own times and zeroes the agents that fail.
+ */
+export declare function capturableFolder(folder: ScanFolder, isolates?: (agent: AgentId) => boolean): ScanFolder | null;
+/**
+ * The agents a folder grant captures, as the copy names them: `Claude Code`, `Claude Code or Codex`, `Claude Code, Codex or Cursor`.
+ * Built from the same predicate as the offers (C34), so the sentence and the behaviour cannot disagree.
+ */
+export declare function folderCaptureAgents(isolates?: (agent: AgentId) => boolean): string;
 export declare function buildModel(input: ModelInput): PickerModel;
 /** What a number on screen stands for. On-now rows come first, then each owner's repos, then turned-off. */
 export type RowRef = {
@@ -123,6 +178,12 @@ export type RowRef = {
 } | {
     readonly kind: "repo";
     readonly repo: PickRepo;
+} | {
+    readonly kind: "folder";
+    readonly folder: PickFolder;
+} | {
+    readonly kind: "account";
+    readonly row: AccountRow;
 } | {
     readonly kind: "off";
     readonly row: TurnedOffRow;
@@ -136,6 +197,10 @@ export type Parsed = {
     readonly kind: "empty";
 } | {
     readonly kind: "more";
+}
+/** `g`, alone, where it was offered (slice 2, exception 3): use the repositories the account already grants. */
+ | {
+    readonly kind: "account";
 } | {
     readonly kind: "change";
     readonly change: PickerChange;
@@ -148,13 +213,19 @@ export type Parsed = {
  * Parse one typed answer (D8 · 4A). ⛔ **Never applies part of an answer:** any token that is not understood returns
  * `error` naming each such token, and nothing is chosen. `owner/` and `owner/repo` are always accepted, a clone here or
  * not, because a new laptop needs them; the grant block flags `(no clone here yet)`.
+ *
+ * ⛔ **`g` STANDS ALONE** (exception 3, R3-12): where `offerAccount` is true, `g` alone is the account's grants, and `g` mixed with
+ * any other token is refused with nothing applied, so the y/N after it always names a single list. Where it was not offered `g` is
+ * an ordinary token nobody understands.
  */
-export declare function parseTyped(input: string, model: PickerModel, showAll: boolean): Parsed;
+export declare function parseTyped(input: string, model: PickerModel, showAll: boolean, offerAccount?: boolean): Parsed;
 export interface RenderOptions {
     readonly colour: boolean;
     readonly nowMs: number;
     /** Show every repo, numbered afresh (the `more` token). */
     readonly showAll: boolean;
+    /** Slice 2: the prompt block's `g` line (screen 1a). Only on a machine with no credential, a terminal and a browser to sign in with. */
+    readonly offerAccount?: boolean;
 }
 /** The `Not listed here:` block, muted, or nothing. */
 export declare function notListedBlock(model: PickerModel, colour: boolean): string[];
@@ -168,13 +239,19 @@ export interface BlockFacts {
     readonly reposHere: ReadonlyMap<string, number>;
     /** Typed `owner/` and `owner/repo` with no clone here. */
     readonly noClone: ReadonlySet<string>;
+    /** `turn on` slugs the ACCOUNT has turned off: the row says so, because the yes re-includes them on every machine. */
+    readonly accountOff?: ReadonlySet<string>;
+    /** How each folder in the change is named (`~`-relative); a folder with no entry shows its path. */
+    readonly folderLabels?: ReadonlyMap<string, string>;
 }
 /**
  * The `You chose:` block — the thing the y/N is asking about (D7 · 3A), on the §13.5 label gutter. One label per kind of
  * change; an owner row says how many repos are here and that later clones are covered, and a typed name with no clone
  * on this machine says so, so a typo shows BEFORE the question.
  */
-export declare function renderGrantBlock(change: PickerChange, facts: BlockFacts, colour: boolean): string[];
+export declare function renderGrantBlock(change: PickerChange, facts: BlockFacts, colour: boolean, 
+/** `You chose:` for the person's picks; the account's own list (`g`, screen 1b) is headed `Your account grants:`. */
+heading?: string): string[];
 /** The grant y/N: additions (with or without removals) get the upload question, removals alone the stop question. */
 export declare function grantQuestion(change: PickerChange, colour: boolean, answers: string): string;
 export {};

package/dist/picker.js

@@ -12,14 +12,20 @@
  *               typing `-N`, deletes the grant. It is not an exclusion (`off` is), so the repo can be chosen again.
  *   owners      one group per owner NOT yet granted, its repos behind an `aN` "all, including repos you clone later"
  *               row (D9: at most 8 repos before `+ N more`).
+ *   folders     (any-folder capture, R3) folders outside every work tree that hold sessions, one `Folders` group. A folder grant
+ *               captures the sessions there that touch no repository, under a `local:folder:` identity that only the uploader
+ *               can read; its grant line SAYS so ("private to you", R7). Granted folders are `on now` rows, removable like any.
  *   turned off  slugs in `excluded`. Choosing one is a re-include; the grant block names it on a `turn on` row, inside
  *               the same y/N (D7 · 3A), and only a yes clears the exclusion.
+ *   on your account  (slice 2) what the account grants that this machine has not named. Unticked until chosen, like any
+ *               row: choosing one is an ordinary addition, so it goes through the same disclosure and y/N (R3-8, R3-9).
  *
  * ⛔ **A pre-tick is not a consent** (D34): the working folder's repo starts ticked, and Enter on it leads to the naming
  * y/N, which defaults to N. It is an ADDITION to the diff, never part of the baseline.
  */
 import { ownerOfSlug, normalizeSlug, normalizeOwner, isLocalSlug } from "./consent.js";
 import { AGENT_HOOKS, SCAN, PICKER, shortDate } from "./copy/index.js";
+import { DIALECTS, agentIsolatesRecords } from "./agents/registry.js";
 import { LABEL_GUTTER, paint, truncateMiddle, wrap } from "./term.js";
 /** D9: each owner group shows at most this many repos before the `+ N more` row. */
 export const GROUP_CAP = 8;
@@ -42,7 +48,9 @@ export function isNoChange(change) {
         change.turnOn.length === 0 &&
         change.stopOwners.length === 0 &&
         change.stopRepos.length === 0 &&
-        change.stopClones.length === 0);
+        change.stopClones.length === 0 &&
+        (change.addFolders ?? []).length === 0 &&
+        (change.stopFolders ?? []).length === 0);
 }
 /**
  * What Enter means when the working folder's repo is pre-selected (D34): choosing it, which leads to the y/N and never to
@@ -57,7 +65,48 @@ export function preChange(model) {
 }
 /** Anything the person is ADDING needs the D65 disclosure; removals alone do not. */
 export function hasAdditions(change) {
-    return change.addOwners.length + change.addRepos.length + change.turnOn.length > 0;
+    return change.addOwners.length + change.addRepos.length + change.turnOn.length + (change.addFolders ?? []).length > 0;
+}
+/**
+ * The folder as a FOLDER GRANT would capture it (C34): only the sessions of agents whose records can be isolated count, because a
+ * Cursor session (or a Codex one, until its isolation lands) under a granted folder is never captured, and a count or an offer that
+ * included it would promise what does not happen. `null` when no session passes. Times and counts are recomputed from the members
+ * when the scan kept them; a hand-built folder without members keeps its own times and zeroes the agents that fail.
+ */
+export function capturableFolder(folder, isolates = agentIsolatesRecords) {
+    const agents = emptyAgents();
+    if (folder.members !== undefined) {
+        const kept = folder.members.filter((member) => isolates(member.agent));
+        if (kept.length === 0)
+            return null;
+        let sinceMs = Infinity;
+        let latestMs = 0;
+        for (const member of kept) {
+            const at = member.session.startedMs ?? member.session.mtimeMs;
+            sinceMs = Math.min(sinceMs, at);
+            latestMs = Math.max(latestMs, at);
+            agents[member.agent] += 1;
+        }
+        return { path: folder.path, sessions: kept.length, sinceMs, latestMs, agents, members: kept };
+    }
+    let sessions = 0;
+    for (const agent of Object.keys(agents)) {
+        if (isolates(agent)) {
+            agents[agent] = folder.agents[agent] ?? 0;
+            sessions += agents[agent];
+        }
+    }
+    return sessions === 0 ? null : { path: folder.path, sessions, sinceMs: folder.sinceMs, latestMs: folder.latestMs, agents };
+}
+/**
+ * The agents a folder grant captures, as the copy names them: `Claude Code`, `Claude Code or Codex`, `Claude Code, Codex or Cursor`.
+ * Built from the same predicate as the offers (C34), so the sentence and the behaviour cannot disagree.
+ */
+export function folderCaptureAgents(isolates = agentIsolatesRecords) {
+    const names = DIALECTS.filter((dialect) => isolates(dialect.id)).map((dialect) => SCAN.agent[dialect.id]);
+    if (names.length <= 1)
+        return names.join("");
+    return `${names.slice(0, -1).join(", ")} or ${names[names.length - 1]}`;
 }
 function splitSlug(slug) {
     const owner = ownerOfSlug(slug);
@@ -134,6 +183,37 @@ export function buildModel(input) {
             continue;
         onNow.push({ kind: "clone", key: slug, reason: PICKER.reasonPerClone, counts: countsOf(slug), reposHere: 0, commonDirs });
     }
+    // Folder grants (R3): a granted folder is an `on now` row (removable); every other folder with sessions is offered.
+    const folderLabel = input.folderLabel ?? ((path) => path);
+    const grantedFolders = new Set(input.grantedFolders ?? []);
+    // ⛔ C34: counts and offers cover only what a folder grant would capture. A folder with no passing session is not offered; a granted
+    // one stays a removable `on now` row, with no counts.
+    const isolates = input.isolates ?? agentIsolatesRecords;
+    const capturable = (input.folders ?? []).flatMap((folder) => {
+        const kept = capturableFolder(folder, isolates);
+        return kept === null ? [] : [kept];
+    });
+    const folderCounts = new Map(capturable.map((folder) => [folder.path, folder]));
+    for (const path of input.grantedFolders ?? []) {
+        onNow.push({ kind: "folder", key: path, label: folderLabel(path), reason: PICKER.reasonFolder, counts: folderCounts.get(path) ?? null, reposHere: 0, commonDirs: [] });
+    }
+    const excludedSet = new Set(input.excludedFolders ?? []);
+    const offered = capturable.filter((folder) => !grantedFolders.has(folder.path));
+    const folders = [
+        ...offered.map((folder) => ({
+            path: folder.path,
+            label: folderLabel(folder.path),
+            sessions: folder.sessions,
+            sinceMs: folder.sinceMs,
+            latestMs: folder.latestMs,
+            agents: folder.agents,
+            ...(excludedSet.has(folder.path) ? { excluded: true } : {}),
+        })),
+        // A folder turned off that no scan found any more is still a row, so it can be turned back on.
+        ...[...excludedSet]
+            .filter((path) => !offered.some((folder) => folder.path === path))
+            .map((path) => ({ path, label: folderLabel(path), sessions: 0, sinceMs: 0, latestMs: 0, agents: emptyAgents(), excluded: true })),
+    ];
     const isOn = (slug) => coveredByGrant(slug) || perCloneSlugs.has(slug);
     const byOwner = new Map();
     for (const repo of repos.values()) {
@@ -152,10 +232,21 @@ export function buildModel(input) {
     const turnedOff = [...excluded]
         .sort()
         .map((slug) => ({ slug, counts: countsOf(slug), pre: slug === hereSlug }));
+    // ⛔ THE SCAN ROW WINS: an owner that already has a group above, and a repo already listed under one, are not repeated under "on
+    // your account" — choosing the scan row is the same change, and one row per thing is what a person can read.
+    const shownOwners = new Set(owners.map((group) => group.owner));
+    const shownRepos = new Set(owners.flatMap((group) => group.repos.map((repo) => repo.slug)));
+    const account = (input.accountNotHere ?? [])
+        .map((name) => name.endsWith("/")
+        ? { kind: "owner", key: normalizeOwner(name.slice(0, -1)) }
+        : { kind: "repo", key: normalizeSlug(name) })
+        .filter((row) => (row.kind === "owner" ? !shownOwners.has(row.key) : !shownRepos.has(row.key)));
     return {
         onNow,
         owners,
+        account,
         turnedOff,
+        folders,
         notListed: input.notListed,
         found: input.repos.length,
         sawNothing: input.sawNothing,
@@ -172,6 +263,10 @@ export function numberedRows(model, showAll) {
         for (const repo of shown)
             rows.push({ kind: "repo", repo });
     }
+    for (const folder of showAll ? model.folders : model.folders.slice(0, GROUP_CAP))
+        rows.push({ kind: "folder", folder });
+    for (const row of model.account)
+        rows.push({ kind: "account", row });
     for (const row of model.turnedOff)
         rows.push({ kind: "off", row });
     return rows;
@@ -182,13 +277,20 @@ const REPO_TOKEN = /^[^\s/]+(?:\/[^\s/]+)*\/[^\s/]+$/u;
  * Parse one typed answer (D8 · 4A). ⛔ **Never applies part of an answer:** any token that is not understood returns
  * `error` naming each such token, and nothing is chosen. `owner/` and `owner/repo` are always accepted, a clone here or
  * not, because a new laptop needs them; the grant block flags `(no clone here yet)`.
+ *
+ * ⛔ **`g` STANDS ALONE** (exception 3, R3-12): where `offerAccount` is true, `g` alone is the account's grants, and `g` mixed with
+ * any other token is refused with nothing applied, so the y/N after it always names a single list. Where it was not offered `g` is
+ * an ordinary token nobody understands.
  */
-export function parseTyped(input, model, showAll) {
+export function parseTyped(input, model, showAll, offerAccount = false) {
     const tokens = input.split(/[\s,]+/u).filter((t) => t !== "");
     if (tokens.length === 0)
         return { kind: "empty" };
     if (tokens.length === 1 && tokens[0].toLowerCase() === "more")
         return { kind: "more" };
+    if (offerAccount && tokens.some((t) => t.toLowerCase() === "g")) {
+        return tokens.length === 1 ? { kind: "account" } : { kind: "error", tokens: [PICKER.gMixedToken] };
+    }
     const rows = numberedRows(model, showAll);
     const bad = [];
     const addOwners = new Set();
@@ -197,6 +299,8 @@ export function parseTyped(input, model, showAll) {
     const stopOwners = new Set();
     const stopRepos = new Set();
     const stopClones = new Set();
+    const addFolders = new Set();
+    const stopFolders = new Set();
     const grantedOwners = new Set(model.onNow.filter((r) => r.kind === "owner").map((r) => r.key));
     const grantedRepos = new Set(model.onNow.filter((r) => r.kind === "repo").map((r) => r.key));
     const cloneSlugs = new Set(model.onNow.filter((r) => r.kind === "clone").map((r) => r.key));
@@ -206,6 +310,8 @@ export function parseTyped(input, model, showAll) {
             stopOwners.add(row.key);
         else if (row.kind === "repo")
             stopRepos.add(row.key);
+        else if (row.kind === "folder")
+            stopFolders.add(row.key);
         else
             stopClones.add(row.key);
     };
@@ -236,6 +342,14 @@ export function parseTyped(input, model, showAll) {
                 bad.push(PICKER.alreadyOn(token, `-${token}`));
             else if (row.kind === "off")
                 turnOn.add(row.row.slug);
+            else if (row.kind === "folder")
+                addFolders.add(row.folder.path);
+            else if (row.kind === "account") {
+                if (row.row.kind === "owner")
+                    addOwners.add(row.row.key);
+                else
+                    addSlug(row.row.key, token);
+            }
             else
                 addSlug(row.repo.slug, token);
         }
@@ -300,6 +414,9 @@ export function parseTyped(input, model, showAll) {
             stopOwners: [...stopOwners],
             stopRepos: [...stopRepos],
             stopClones: [...stopClones],
+            // Present only when something was chosen, so a repo-only answer is the object it always was.
+            ...(addFolders.size > 0 ? { addFolders: [...addFolders] } : {}),
+            ...(stopFolders.size > 0 ? { stopFolders: [...stopFolders] } : {}),
         },
     };
 }
@@ -322,11 +439,19 @@ function onNowDisplay(row, nowMs) {
         return { name: `${row.key}/`, meta: joinMeta(row.reason, PICKER.ownerOnReposHere(row.reposHere)), agents: "" };
     }
     return {
-        name: row.key,
+        name: row.kind === "folder" ? (row.label ?? row.key) : row.key,
         meta: joinMeta(row.reason, countsText(row.counts, nowMs)),
         agents: agentsText(row.counts),
     };
 }
+function folderDisplay(folder, nowMs) {
+    const counts = folder.sessions === 0 ? null : folder;
+    return {
+        name: folder.label,
+        meta: joinMeta(folder.excluded === true ? PICKER.turnOnHint : "", countsText(counts, nowMs)),
+        agents: agentsText(counts),
+    };
+}
 function repoDisplay(repo, nowMs) {
     const flag = repo.here === "repo" ? PICKER.thisRepo : repo.here === "folder" ? PICKER.thisFolder : "";
     return {
@@ -377,7 +502,12 @@ export function notListedBlock(model, colour) {
 export function renderTyped(model, options) {
     const { colour, nowMs, showAll } = options;
     const lines = [""];
-    if (model.found === 0 && model.onNow.length === 0 && model.turnedOff.length === 0 && model.owners.length === 0) {
+    if (model.found === 0 &&
+        model.onNow.length === 0 &&
+        model.turnedOff.length === 0 &&
+        model.owners.length === 0 &&
+        model.folders.length === 0 &&
+        model.account.length === 0) {
         return [
             ...lines,
             ...wrap(model.sawNothing ? PICKER.emptyNone : SCAN.noneListable, 2).map((l) => paint(colour, "strong", l)),
@@ -385,6 +515,7 @@ export function renderTyped(model, options) {
             ...notListedBlock(model, colour),
             "",
             ...wrap(model.sawNothing ? PICKER.emptyType : PICKER.emptyListable, 2),
+            ...(options.offerAccount === true ? wrap(PICKER.gLine, 2) : []),
             `  ${PICKER.enterNothing}`,
         ];
     }
@@ -392,12 +523,19 @@ export function renderTyped(model, options) {
     const onNow = model.onNow.map((row) => onNowDisplay(row, nowMs));
     const shown = (g) => (showAll ? g.repos : g.repos.slice(0, GROUP_CAP));
     const repoRows = model.owners.flatMap((g) => shown(g).map((r) => repoDisplay(r, nowMs)));
+    const shownFolders = showAll ? model.folders : model.folders.slice(0, GROUP_CAP);
+    const folderRows = shownFolders.map((f) => folderDisplay(f, nowMs));
+    const account = model.account.map((row) => ({
+        name: row.kind === "owner" ? `${row.key}/` : row.key,
+        meta: PICKER.onAccountHint,
+        agents: "",
+    }));
     const off = model.turnedOff.map((row) => ({
         name: row.slug,
         meta: PICKER.turnOnHint,
         agents: "",
     }));
-    const { cut, column, withAgents } = layout([...onNow, ...repoRows, ...off]);
+    const { cut, column, withAgents } = layout([...onNow, ...repoRows, ...folderRows, ...account, ...off]);
     const row = (n, display) => `${String(n).padStart(6)}  ${paint(colour, "text", cut(display.name).padEnd(column))}${" ".repeat(GAP)}${paint(colour, "muted", withAgents(display))}`;
     let n = 0;
     if (model.onNow.length > 0) {
@@ -414,6 +552,19 @@ export function renderTyped(model, options) {
             lines.push(paint(colour, "muted", `     +  ${PICKER.moreTyped(hidden, group.owner)}`));
         }
     }
+    if (folderRows.length > 0) {
+        lines.push(paint(colour, "muted", `  ${PICKER.folders}`));
+        for (const d of folderRows)
+            lines.push(row(++n, d));
+        const hiddenFolders = model.folders.length - shownFolders.length;
+        if (hiddenFolders > 0)
+            lines.push(paint(colour, "muted", `     +  ${PICKER.moreFoldersTyped(hiddenFolders)}`));
+    }
+    if (account.length > 0) {
+        lines.push(paint(colour, "muted", `  ${PICKER.onAccount}`));
+        for (const d of account)
+            lines.push(row(++n, d));
+    }
     if (model.turnedOff.length > 0) {
         lines.push(paint(colour, "muted", `  ${PICKER.turnedOff}`));
         for (const d of off)
@@ -421,6 +572,8 @@ export function renderTyped(model, options) {
     }
     lines.push(...notListedBlock(model, colour), "");
     lines.push(`  ${paint(colour, "text", PICKER.choose(model.owners.length > 0))}`);
+    if (options.offerAccount === true)
+        lines.push(...wrap(PICKER.gLine, 2).map((l) => paint(colour, "text", l)));
     if (model.onNow.length > 0)
         lines.push(`  ${paint(colour, "text", PICKER.removeHint)}`);
     const pre = preChange(model);
@@ -437,8 +590,10 @@ export function notUnderstoodLines(tokens) {
  * change; an owner row says how many repos are here and that later clones are covered, and a typed name with no clone
  * on this machine says so, so a typo shows BEFORE the question.
  */
-export function renderGrantBlock(change, facts, colour) {
-    const lines = [`  ${paint(colour, "strong", PICKER.chose)}`];
+export function renderGrantBlock(change, facts, colour, 
+/** `You chose:` for the person's picks; the account's own list (`g`, screen 1b) is headed `Your account grants:`. */
+heading = PICKER.chose) {
+    const lines = [`  ${paint(colour, "strong", heading)}`];
     const rows = [
         [
             PICKER.labelOwners,
@@ -451,13 +606,23 @@ export function renderGrantBlock(change, facts, colour) {
             PICKER.labelRepos,
             change.addRepos.map((r) => (facts.noClone.has(r) ? `${r}  ${PICKER.noCloneHere}` : r)),
         ],
-        [PICKER.labelTurnOn, [...change.turnOn]],
+        [
+            PICKER.labelTurnOn,
+            change.turnOn.map((slug) => (facts.accountOff?.has(slug) === true ? `${slug}  ${PICKER.turnedOffOnAccount}` : slug)),
+        ],
+        // ⛔ THE FOLDER GRANT LINE SAYS WHO CAN READ IT (R7 · D9): the server makes a folder repository private to its uploader, and the
+        // person is told so at the one moment they are asked. Nothing here claims more than that.
+        [
+            PICKER.labelFolders,
+            (change.addFolders ?? []).map((path) => `${facts.folderLabels?.get(path) ?? path}  ${PICKER.folderPrivate}`),
+        ],
         [
             PICKER.labelStop,
             [
                 ...change.stopOwners.map((o) => `${o}/`),
                 ...change.stopRepos,
                 ...change.stopClones,
+                ...(change.stopFolders ?? []).map((path) => facts.folderLabels?.get(path) ?? path),
             ],
         ],
     ];
@@ -471,7 +636,15 @@ export function renderGrantBlock(change, facts, colour) {
 }
 /** The grant y/N: additions (with or without removals) get the upload question, removals alone the stop question. */
 export function grantQuestion(change, colour, answers) {
-    const q = hasAdditions(change) ? PICKER.questionGrant : PICKER.questionStop;
+    const folders = (change.addFolders ?? []).length > 0 || (change.stopFolders ?? []).length > 0;
+    const repos = change.addOwners.length + change.addRepos.length + change.turnOn.length + change.stopOwners.length + change.stopRepos.length + change.stopClones.length > 0;
+    const q = hasAdditions(change)
+        ? folders
+            ? repos ? PICKER.questionGrantMixed : PICKER.questionGrantFolders
+            : PICKER.questionGrant
+        : folders
+            ? repos ? PICKER.questionStopMixed : PICKER.questionStopFolders
+            : PICKER.questionStop;
     return `  ${paint(colour, "text", q)} ${paint(colour, "muted", answers)} `;
 }
 //# sourceMappingURL=picker.js.map