@plinth-music/cli 0.12.0 → 0.13.0

package/dist/cli.js

@@ -7584,7 +7584,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "@plinth-music/cli",
-  version: "0.12.0",
+  version: "0.13.0",
   description: "Plinth capstone sync daemon and CLI",
   type: "module",
   private: false,
@@ -26170,7 +26170,7 @@ function composeGroundingBlock(today, workspaceRules, workspaceMemory, userMemor
   add("grounding", `Plinth session grounding:`, ``, `Today's date: ${today}. You have no inherent sense of the current date and ` + `your training has a knowledge cutoff, so treat this injected date as ` + `authoritative for anything time-relative: deadlines, what counts as ` + `"recent" or "upcoming", and the age of any data or of your own knowledge.`);
   if (identity !== null)
     add("identity", ``, identity);
-  add("grounding", ``, `Resolve Plinth entities before answering about them. For any answer grounded ` + `in a specific artist, project, task, or other workspace entity, first look ` + `the name up in THIS workspace with the Plinth MCP tools ` + `(\`mcp__plinth__search_entities\`, \`mcp__plinth__list_artists\`, or ` + `\`mcp__plinth__list_projects\`) and ground your answer in what they return. ` + `Do not answer from name recognition alone: a globally famous name may not ` + `exist in this workspace, and an entity here may differ from the public ` + `figure of the same name. If the lookup returns nothing, say so instead of ` + `inventing details.`, ``, `Plan before you write. The first time you call any mutating Plinth MCP tool ` + `in a session (create_*, update_*, delete_*, mark_*: anything that changes ` + `workspace data), do not commit silently: state exactly what you would write, ` + `naming the tool, the entity, and the fields and values, and proceed only after ` + `the user confirms or amends.`, ``, `Write through the canonical surface. In this cockpit the file tree is your edit ` + `surface, so reach for it before the most direct tool. Change prose (document ` + `bodies, free-form notes, anything textual) by editing the mirror markdown ` + `file; the daemon syncs it up. An artist's master context is the clearest case: ` + `it lives in the body of that artist's \`artists/<slug>/_artist.md\` mirror file, ` + `the file the web context pane renders, and one of only two files under ` + `\`artists/<slug>/\` the daemon syncs both ways (\`memory.md\` is the other), ` + `so change it by editing that body, never by creating ` + `a separate document or context entity (e.g. \`create_document\`) the pane won't ` + `render. One carve-out inside that file: a block labelled as rendered from ` + `Plinth is regenerated on every sync and your edits to it are discarded, so ` + `write those through the tool the block names. Change structured fields (task ` + `status, priority, assignees, due dates, a project's category) through the ` + `Plinth MCP (\`mcp__plinth__*\`) or the task file's frontmatter, which is ` + `row-canonical but still written through the validated API. Make a bulk or ` + `destructive change (a mass delete, a gutting overwrite) by editing the file ` + `path, so the daemon's confirm-gate can quarantine it for \`plinth confirm\`. ` + `Never write the database directly, which rules out raw SQL and ` + `\`execute_sql\`, \`apply_migration\` and \`psql\`: those bypass the daemon, the ` + `mirror, the confirm-gate, canonicality, and API validation.`, ``, `Dates belong on the calendar, not in \`key_dates\`. The date surface for an artist ` + `is their mapped Google Calendar; the \`key_dates\` table is retired. Reading ` + `dates is yours, and this mirror already holds them: the daemon projects every ` + `mapped calendar into \`views/calendar/upcoming.md\` and ` + `\`views/calendar/<slug>.md\`, so read those before reaching for a tool ` + `(\`list_artist_calendars\`). They are derived and overwritten, ` + `so they are current only as of the \`generated_at\` in their header - quote that ` + `stamp, never edit them, and check the status line, because a calendar Plinth ` + `could not reach is unknown rather than empty. When a tool is the only way, ` + `resolve the calendar through \`mcp__plinth__list_artist_calendars\` and use its ` + `\`calendar_id\` field, not the mapping row's \`id\`, because the default ` + `\`primary\` is almost never theirs.`, ``, `Writing a date is not yours, by any route: not a calendar tool, and not a ` + `shell command line either, the Google Workspace one included. The calendar ` + `tools are refused for you where Plinth has configured this workspace. ` + `Nothing refuses a shell, anywhere, and where Plinth has not configured ` + `this workspace nothing is refused at all: you are the only thing holding ` + `those. The way ` + `through is a person, not a workaround, so when a date needs adding or ` + `correcting say plainly what the change is, say that it goes in through ` + `Plinth's calendar view, and say that a person makes it. Say why, too: a date ` + `left looking handled is worse than one openly outstanding, and a calendar ` + `write goes out to everyone invited the moment it lands and cannot be recalled.`, ``, `Draft email. Never send it. Writing the draft is yours: use the draft tools ` + `(\`create_draft\`, \`update_draft\`), then say where the draft is and what it ` + `says, so the person can read it and send it in their own name. Sending, ` + `replying and forwarding are not yours, by any route: not a mail tool, and ` + `not a shell command line either. The mail tools are refused for you where ` + `Plinth has configured this workspace. Nothing refuses a shell, anywhere, ` + `and where Plinth has not configured this workspace nothing is refused at ` + `all: you are the only thing holding those. This is not a comment on your ` + `writing. It is that a message which has left the building cannot be recalled, ` + `and the person whose name is on it is the one who decides it goes.`);
+  add("grounding", ``, `Resolve Plinth entities before answering about them. For any answer grounded ` + `in a specific artist, project, task, or other workspace entity, first look ` + `the name up in THIS workspace with the Plinth MCP tools ` + `(\`mcp__plinth__search_entities\`, \`mcp__plinth__list_artists\`, or ` + `\`mcp__plinth__list_projects\`) and ground your answer in what they return. ` + `Do not answer from name recognition alone: a globally famous name may not ` + `exist in this workspace, and an entity here may differ from the public ` + `figure of the same name. If the lookup returns nothing, say so instead of ` + `inventing details.`, ``, `Plan before you write. The first time you call any mutating Plinth MCP tool ` + `in a session (create_*, update_*, delete_*, mark_*: anything that changes ` + `workspace data), do not commit silently: state exactly what you would write, ` + `naming the tool, the entity, and the fields and values, and proceed only after ` + `the user confirms or amends.`, ``, `Write through the canonical surface. In this cockpit the file tree is your edit ` + `surface, so reach for it before the most direct tool. Change prose (document ` + `bodies, free-form notes, anything textual) by editing the mirror markdown ` + `file; the daemon syncs it up. An artist's master context is the clearest case: ` + `it lives in the body of that artist's \`artists/<slug>/_artist.md\` mirror file, ` + `the file the web context pane renders, and one of only two files under ` + `\`artists/<slug>/\` the daemon syncs both ways (\`memory.md\` is the other), ` + `so change it by editing that body, never by creating ` + `a separate document or context entity (e.g. \`create_document\`) the pane won't ` + `render. One carve-out inside that file: a block labelled as rendered from ` + `Plinth is regenerated on every sync and your edits to it are discarded, so ` + `write those through the tool the block names. Change structured fields (task ` + `status, priority, assignees, due dates, a project's category) through the ` + `Plinth MCP (\`mcp__plinth__*\`) or the task file's frontmatter, which is ` + `row-canonical but still written through the validated API. Make a bulk or ` + `destructive change (a mass delete, a gutting overwrite) by editing the file ` + `path, so the daemon's confirm-gate can quarantine it for \`plinth confirm\`. ` + `Never write the database directly, which rules out raw SQL and ` + `\`execute_sql\`, \`apply_migration\` and \`psql\`: those bypass the daemon, the ` + `mirror, the confirm-gate, canonicality, and API validation.`, ``, `Dates belong on the calendar, not in \`key_dates\`. The date surface for an artist ` + `is their mapped Google Calendar; the \`key_dates\` table is retired. Reading ` + `dates is yours, and this mirror already holds them: the daemon projects every ` + `mapped calendar into \`views/calendar/upcoming.md\` and ` + `\`views/calendar/<slug>.md\`, so read those before reaching for a tool ` + `(\`list_artist_calendars\`). They are derived and overwritten, ` + `so they are current only as of the \`generated_at\` in their header - quote that ` + `stamp, never edit them, and check the status line, because a calendar Plinth ` + `could not reach is unknown rather than empty. When a tool is the only way, ` + `resolve the calendar through \`mcp__plinth__list_artist_calendars\` and use its ` + `\`calendar_id\` field, not the mapping row's \`id\`, because the default ` + `\`primary\` is almost never theirs.`, ``, `Writing a date is not yours, by any route: not a calendar tool, and not a ` + `shell command line either, the Google Workspace one included. The calendar ` + `tools are refused for you where Plinth has configured this workspace. ` + `Nothing refuses a shell, anywhere, and where Plinth has not configured ` + `this workspace nothing is refused at all: you are the only thing holding ` + `those. The way ` + `through is a person, not a workaround, so when a date needs adding or ` + `correcting say plainly what the change is, say that it goes in through ` + `Plinth's calendar view, and say that a person makes it. Say why, too: a date ` + `left looking handled is worse than one openly outstanding, and a calendar ` + `write goes out to everyone invited the moment it lands and cannot be recalled.`, ``, `Draft email. Never send it. Writing the draft is yours: use the draft tools ` + `(\`create_draft\`, \`update_draft\`), then say where the draft is and what it ` + `says, so the person can read it and send it in their own name. Sending, ` + `replying, forwarding and deleting are not yours, by any route: not a mail tool, and ` + `not a shell command line either. The mail tools are refused for you where ` + `Plinth has configured this workspace. Nothing refuses a shell, anywhere, ` + `and where Plinth has not configured this workspace nothing is refused at ` + `all: you are the only thing holding those. This is not a comment on your ` + `writing. It is that a message which has left the building cannot be recalled, ` + `and one deleted out of a mailbox is not yours to lose; the person whose name ` + `is on it is the one who decides.`);
   if (workspaceRules === null && voiceProfile === null) {
     add("voice", ``, `Check the voice yourself, because nothing else checks it now. Two files carry ` + `it: \`workspace-rules.md\` at the mirror root holds this workspace's house ` + `style, and \`${VOICE_FILENAME}\` beside it holds your own voice profile, the ` + `sign-off and the habits that belong to one member rather than the team. Read ` + `them before you write and follow them as written, rather than drafting in ` + `your own register and correcting after. Nothing inspects a draft between you ` + `and the person reading it, so the rules in those files are the whole of it.`);
   }
@@ -26458,7 +26458,25 @@ var RejectedWriteSchema = exports_external.object({
   reason: exports_external.string().min(1),
   detail: exports_external.string().optional(),
   message: exports_external.string().optional(),
-  rejected_at: exports_external.string().datetime({ offset: true }).optional()
+  rejected_at: exports_external.string().datetime({ offset: true }).optional(),
+  size_bytes: exports_external.number().int().nonnegative().optional(),
+  max_bytes: exports_external.number().int().nonnegative().optional(),
+  reported_at: exports_external.string().datetime({ offset: true }).optional()
+});
+var TeamFileRejectionSchema = exports_external.object({
+  path: exports_external.string().min(1),
+  reason: exports_external.string().min(1),
+  detail: exports_external.string().nullish(),
+  size_bytes: exports_external.number().int().nonnegative().nullish(),
+  max_bytes: exports_external.number().int().nonnegative().nullish(),
+  reported_by: exports_external.string().nullish(),
+  reported_by_name: exports_external.string().nullish(),
+  first_seen_at: exports_external.string().nullish(),
+  last_seen_at: exports_external.string().nullish()
+});
+var TeamRejectedSchema = exports_external.object({
+  fetched_at: exports_external.string().datetime({ offset: true }),
+  rows: exports_external.array(TeamFileRejectionSchema)
 });
 var WorkspaceStateV2Schema = exports_external.object({
   version: exports_external.literal(2),
@@ -26472,7 +26490,8 @@ var WorkspaceStateV2Schema = exports_external.object({
   user_memory: UserMemoryStateSchema.optional(),
   user_voice: UserVoiceStateSchema.optional(),
   derived_text_version: exports_external.number().int().nonnegative().optional(),
-  frontmatter_id_backfill_version: exports_external.number().int().nonnegative().optional()
+  frontmatter_id_backfill_version: exports_external.number().int().nonnegative().optional(),
+  team_rejected: TeamRejectedSchema.optional()
 });
 var WorkspaceStateV1Schema = exports_external.object({
   version: exports_external.literal(1),
@@ -26654,7 +26673,8 @@ function commitState(before, after) {
     user_memory: userMemory.value,
     user_voice: userVoice.value,
     derived_text_version: mergeScalar(fresh.derived_text_version, before.derived_text_version, after.derived_text_version),
-    frontmatter_id_backfill_version: mergeScalar(fresh.frontmatter_id_backfill_version, before.frontmatter_id_backfill_version, after.frontmatter_id_backfill_version)
+    frontmatter_id_backfill_version: mergeScalar(fresh.frontmatter_id_backfill_version, before.frontmatter_id_backfill_version, after.frontmatter_id_backfill_version),
+    team_rejected: mergeScalar(fresh.team_rejected, before.team_rejected, after.team_rejected)
   };
   writeState(merged);
   const singletonOverruled = rules.overruled || memory.overruled || userMemory.overruled || userVoice.overruled;
@@ -26825,6 +26845,7 @@ function upsertRejected(state, candidate) {
   const list = state.rejected ?? [];
   const idx = list.findIndex((o) => o.target === candidate.target && o.path === candidate.path);
   const existing = idx >= 0 ? list[idx] : undefined;
+  const payloadMoved = existing !== undefined && (existing.reason !== candidate.reason || (existing.detail ?? existing.message) !== (candidate.detail ?? candidate.message) || existing.size_bytes !== candidate.size_bytes || existing.max_bytes !== candidate.max_bytes);
   const merged = {
     target: candidate.target,
     op: candidate.op,
@@ -26834,7 +26855,10 @@ function upsertRejected(state, candidate) {
     reason: candidate.reason,
     detail: candidate.detail,
     message: candidate.message,
-    rejected_at: existing?.rejected_at ?? candidate.rejected_at
+    rejected_at: existing?.rejected_at ?? candidate.rejected_at,
+    size_bytes: candidate.size_bytes,
+    max_bytes: candidate.max_bytes,
+    reported_at: payloadMoved ? undefined : existing?.reported_at
   };
   const next = [...list];
   if (idx >= 0)
@@ -26850,6 +26874,53 @@ function removeRejected(state, target, path3) {
     return { state, changed: false };
   return { state: { ...state, rejected: next }, changed: true };
 }
+function markRejectedReported(state, path3, reportedAt) {
+  const list = state.rejected ?? [];
+  const idx = list.findIndex((o) => o.target === "file" && o.path === path3);
+  if (idx < 0)
+    return { state, changed: false };
+  if (list[idx].reported_at === reportedAt)
+    return { state, changed: false };
+  const next = [...list];
+  next[idx] = { ...list[idx], reported_at: reportedAt };
+  return { state: { ...state, rejected: next }, changed: true };
+}
+function clearRejectedReported(state, path3) {
+  const list = state.rejected ?? [];
+  const idx = list.findIndex((o) => o.target === "file" && o.path === path3);
+  if (idx < 0)
+    return { state, changed: false };
+  if (list[idx].reported_at === undefined)
+    return { state, changed: false };
+  const next = [...list];
+  const { reported_at: _dropped, ...rest } = list[idx];
+  next[idx] = rest;
+  return { state: { ...state, rejected: next }, changed: true };
+}
+function listTeamRejected(state) {
+  return state.team_rejected?.rows ?? [];
+}
+function teamRejectedFetchedAt(state) {
+  return state.team_rejected?.fetched_at;
+}
+function setTeamRejected(state, rows, fetchedAt) {
+  const existing = state.team_rejected;
+  if (existing && rowsEqual(existing.rows, rows)) {
+    return { state, changed: false };
+  }
+  return {
+    state: { ...state, team_rejected: { fetched_at: fetchedAt, rows } },
+    changed: true
+  };
+}
+function rowsEqual(a, b) {
+  if (a.length !== b.length)
+    return false;
+  return a.every((x, i) => {
+    const y = b[i];
+    return x.path === y.path && x.reason === y.reason && x.detail === y.detail && x.size_bytes === y.size_bytes && x.max_bytes === y.max_bytes && x.reported_by === y.reported_by && x.reported_by_name === y.reported_by_name && x.first_seen_at === y.first_seen_at && x.last_seen_at === y.last_seen_at;
+  });
+}
 function getWorkspaceRulesState(state) {
   return state.workspace_rules;
 }
@@ -28555,16 +28626,24 @@ var MANAGED_COMMENT = [
   "entries in this file (they are preserved verbatim, including their matchers)",
   "or in .claude/settings.local.json.",
   "The permissions.deny entries below are managed the same way. They stop an agent",
-  "in this workspace sending, replying to or forwarding mail and writing a calendar;",
-  "drafting and reading stay allowed. They match by VERB FAMILY rather than by",
+  "in this workspace sending, replying to or forwarding mail, deleting or trashing",
+  "it, marking it spam, and writing a calendar; drafting, filing, labelling and",
+  "reading stay allowed. The refusal covers a draft the agent staged itself: on a",
+  "Gmail mount there is no delete-draft tool, so trashing was the only way to",
+  "discard one and it is now refused. Fix a wrong draft with update_draft, which",
+  "keeps its thread. They match by VERB FAMILY rather than by",
   "tool name - send_mail, sendEmail, send-mail and outlook_send_message are one",
   "rule set, not four - and the matcher cannot express an alternation, so each",
   "spelling needs its own line. That width also catches a few reads whose name",
-  "merely begins with a send verb - getForwardingSettings is the live example.",
+  "merely begins with a send verb - getForwardingSettings is the live example -",
+  "and it stops an agent trashing any file, not only mail: nothing here can tell",
+  "a mailbox's trash from a drive's.",
   "You cannot re-open one of these here: a deny beats an allow, including yours,",
   "and this list is rewritten every sync. Tell us and we will narrow the pattern.",
   "We took that trade knowingly - a refusal is visible and recoverable, and a",
-  "message that has gone cannot be recalled.",
+  "message that has gone cannot be recalled. Nor is a deleted one yours to lose:",
+  "it is somebody else's mailbox, spam-marking is deletion on a thirty-day fuse,",
+  "and neither is undone by noticing afterwards.",
   "One more entry stops an agent EDITING voice.md, the",
   "voice profile it is judged against: that file is yours to write and theirs to read.",
   "Your own allow list is untouched, and your own",
@@ -28643,6 +28722,36 @@ var MANAGED_DENY = [
   "mcp__*__*_cancel*Event*",
   "mcp__*__*-cancel*Event*",
   "mcp__*__*Cancel*Event*",
+  "mcp__*__trash*",
+  "mcp__*__*_trash*",
+  "mcp__*__*-trash*",
+  "mcp__*__*Trash*",
+  "mcp__*__delete*message*",
+  "mcp__*__*_delete*message*",
+  "mcp__*__*-delete*message*",
+  "mcp__*__*Delete*message*",
+  "mcp__*__delete*Message*",
+  "mcp__*__*_delete*Message*",
+  "mcp__*__*-delete*Message*",
+  "mcp__*__*Delete*Message*",
+  "mcp__*__delete*thread*",
+  "mcp__*__*_delete*thread*",
+  "mcp__*__*-delete*thread*",
+  "mcp__*__*Delete*thread*",
+  "mcp__*__delete*Thread*",
+  "mcp__*__*_delete*Thread*",
+  "mcp__*__*-delete*Thread*",
+  "mcp__*__*Delete*Thread*",
+  "mcp__*__delete*mail*",
+  "mcp__*__*_delete*mail*",
+  "mcp__*__*-delete*mail*",
+  "mcp__*__*Delete*mail*",
+  "mcp__*__delete*Mail*",
+  "mcp__*__*_delete*Mail*",
+  "mcp__*__*-delete*Mail*",
+  "mcp__*__*Delete*Mail*",
+  "mcp__*__*spam*",
+  "mcp__*__*Spam*",
   "Edit(//**/voice.md)"
 ];
 var RETIRED_DENY = [
@@ -28865,7 +28974,7 @@ function ensureSessionHook(workspaceSlug, baseRelDir, out, resolved) {
       parsed = raw;
     } catch (err) {
       const msg = err instanceof Error ? err.message : "unknown error";
-      out.error(`${rel} could not be parsed (${msg}), so the Plinth session-grounding ` + `hook, the session-visibility hook and the permissions.deny list were ` + `NOT installed there. Fix or remove the file and re-run — until then ` + `this workspace is ungrounded and an agent here can SEND mail and ` + `write calendars.`);
+      out.error(`${rel} could not be parsed (${msg}), so the Plinth session-grounding ` + `hook, the session-visibility hook and the permissions.deny list were ` + `NOT installed there. Fix or remove the file and re-run — until then ` + `this workspace is ungrounded and an agent here can SEND mail, ` + `DELETE mail and write calendars.`);
       return "skipped";
     }
   }
@@ -28874,7 +28983,7 @@ function ensureSessionHook(workspaceSlug, baseRelDir, out, resolved) {
     generated = buildSettingsJson(resolved.invocation, workspaceSlug, parsed);
   } catch (err) {
     const msg = err instanceof Error ? err.message : "unknown error";
-    out.error(`${rel} has a structure the generator could not merge into (${msg}), so ` + `the Plinth session-grounding hook, the session-visibility hook and the ` + `permissions.deny list were NOT installed there. This workspace is ` + `ungrounded and an agent here can SEND mail and write calendars. Fix or ` + `remove the file and re-run.`);
+    out.error(`${rel} has a structure the generator could not merge into (${msg}), so ` + `the Plinth session-grounding hook, the session-visibility hook and the ` + `permissions.deny list were NOT installed there. This workspace is ` + `ungrounded and an agent here can SEND mail, DELETE mail and write ` + `calendars. Fix or ` + `remove the file and re-run.`);
     return "skipped";
   }
   if (existing === generated)
@@ -28900,7 +29009,7 @@ function reportResolution(out, resolved) {
   }
 }
 function warnUnresolvedBinary(out) {
-  out.error("Could not locate an installed `plinth` binary, so no Claude Code settings " + "were written for this workspace — sessions will be UNGROUNDED and an " + "agent here can SEND mail and write calendars. Install the CLI globally " + "(`npm i -g @plinth-music/cli`) so `command -v plinth` resolves, then " + "re-run `plinth refresh-context`.");
+  out.error("Could not locate an installed `plinth` binary, so no Claude Code settings " + "were written for this workspace — sessions will be UNGROUNDED and an " + "agent here can SEND mail, DELETE mail and write calendars. Install the " + "CLI globally " + "(`npm i -g @plinth-music/cli`) so `command -v plinth` resolves, then " + "re-run `plinth refresh-context`.");
 }
 
 // src/lib/context/artist-context.ts
@@ -29208,6 +29317,8 @@ function buildCloseCommandMd(workspaceSlug) {
     "",
     "**A session that touched no artist writes one dated note under `documents/` instead**, with the same content. That is a new file rather than an edit to a tracked one, so it reaches the cloud only with the sync running - Step 2 is where you already saw whether it is.",
     "",
+    "**Something rule-shaped is not a loose end and is not memory. Sort it here, before Step 4 offers it a memory index. This close writes none of them** - name which of these four it is in the closing summary and write no prose for it. *Mechanical* (a tool to refuse, or a check a program could run): a deny rule or a hook. *Procedural* (a sequence somebody repeats): a skill, or a step in the customisable block at the foot of these commands. *Workspace-wide and stable*: `workspace-rules.md`, and **the member writes it, not you** - it reaches every teammate on every machine. *A preference dressed as a rule*: say so and let it go.",
+    "",
     "## Step 4: bank what was learned, by type first and scope second",
     "",
     "**Two sorts, in this order, and the order is the whole of it.** First: does this fact already have a surface of its own? Then, and only then: whose fact is it? Sorting by scope alone is how a contact record ends up in a memory file wearing a memory line's clothes.",
@@ -29229,6 +29340,12 @@ function buildCloseCommandMd(workspaceSlug) {
     "",
     "### Step 4b: two piles, and the artist pile comes first",
     "",
+    "**Before either pile, the gate. These four are never banked:** *raw transcript* - what it taught you may be a fact, what was said is not · *a guess, or anything only true today* - live state, which Step 3 routes · *a duplicate of a line already in the index* · *anything the generated `CLAUDE.md` or this session's grounding already states*. **Every line you do bank names its source** - who told you, or which tool read returned it - with an absolute date. **If you cannot name the source, write `source: unknown` - never infer one.**",
+    "",
+    "**Read the index before you add to it, and reconcile what disagrees.** If two lines on your subject contradict each other, **which pair it is decides what you may do**. *One is the line you are adding now*: do not add a third - edit the older line until it reads as superseded, then write yours. **It may well be a teammate's, so mark it superseded, never delete it, and name whose line you changed in the closing summary.** *Both were there before this session*: **propose the supersede and let the member confirm it**, as Step 6 does. Neither is yours and this step has no confirmation gate, so **resolving somebody else's is not yours to do unasked**.",
+    "",
+    "**When two lines disagree, this order decides which is current:** a line the member confirmed outranks a newer one the agent wrote; then the newer line; then one verified against a tool read; then one repeated across sessions; mark the loser superseded in place, never delete it silently.",
+    "",
     "**Most of what a session learns is true of exactly one artist**, and that is the pile that gets forgotten. The other is true of the member in front of you. Write both directly: they are scoped to the person or the act they describe, and a wrong line in either is theirs to prune.",
     "",
     "**The sorting test: would a teammate who never touches that artist be worse off without this line?** If not, it is the artist pile.",
@@ -29239,7 +29356,7 @@ function buildCloseCommandMd(workspaceSlug) {
     "",
     "That artist's rate card, a contact of theirs whose behaviour you had to learn, how their kit actually works, what a venue reliably does. It syncs to that artist's Plinth record, so a teammate opening that artist gets it. **List what you wrote here in the closing summary.**",
     "",
-    "**Follow the conventions in the file's own header comment**, which states them and is the version that stays current. Do not work from a copy of them here.",
+    "**Follow the conventions in the file's own header comment**, which states them and is the version that stays current. Do not work from a copy of them here. **The source convention and the conflict order above are the exception**: they reach a header only on a file this command creates, so they hold wherever an existing header is silent.",
     "",
     "**Re-read the file at the moment you write it, not when you were planning.** The daemon can pull a `memory.md` down from Plinth at any point in a session, so a file that was missing minutes ago may exist now - and if it does, add your line to it rather than creating it over the top. This is not hypothetical: a close on 26 Aug 2026 checked, found nothing, and clobbered a copy the daemon had pulled in ninety seconds earlier.",
     "",
@@ -29251,6 +29368,11 @@ function buildCloseCommandMd(workspaceSlug) {
     "<!-- Durable facts about <Artist> that hold across sessions. One line per fact, with",
     "     provenance and an absolute date. SUPERSEDE, do not accumulate - when a fact here",
     "     becomes wrong, edit that line in place rather than adding a contradicting one.",
+    "     If you cannot name the source, write `source: unknown` - never infer one.",
+    "     When two lines disagree, this order decides which is current: a line the member",
+    "     confirmed outranks a newer one the agent wrote; then the newer line; then one",
+    "     verified against a tool read; then one repeated across sessions; mark the loser",
+    "     superseded in place, never delete it silently.",
     "     Live state does NOT belong here - that goes in the body of `_artist.md`. -->",
     "```",
     "",
@@ -29278,7 +29400,9 @@ function buildCloseCommandMd(workspaceSlug) {
     "",
     "**Anything named there was NOT banked, whatever the write appeared to return.** Say so plainly, name the file, and point the user at the restore command rather than reporting the work as done. A close that reports a stashed session record as banked is the one failure this step exists to prevent, because the record was the point of the close.",
     "",
-    "**Five to seven lines**, and no file-by-file dump: **where the session record went, named per artist**, what now lives on a durable surface, what is still in flight and on whom, **what was banked to memory and to which of the two piles**, anything you named as having no home yet, any fact you judged true of the whole team and left unwritten, any date you handed to a person, and the obvious next move. **This is how the user sees what was stored without opening a file**, so name the files rather than saying that memory was updated.",
+    "**Five to seven lines**, and no file-by-file dump: **where the session record went, named per artist**, what now lives on a durable surface, what is still in flight and on whom, **what was banked to memory and to which of the two piles**, anything you named as having no home yet, any fact you judged true of the whole team and left unwritten, **anything rule-shaped you are handing back**, **any contradicting pair you found**, any date you handed to a person, and the obvious next move. **This is how the user sees what was stored without opening a file**, so name the files rather than saying that memory was updated.",
+    "",
+    "**When more than seven lines is needed, what this close could NOT do comes first** - a proposal handed back, a contradiction unresolved, a fact with no home. Those exist nowhere else once this session ends.",
     "",
     "## Step 6: offer to trim what has outgrown its file, and do not trim it",
     "",
@@ -29294,20 +29418,38 @@ function buildCloseCommandMd(workspaceSlug) {
     "",
     "**Running the trim on your own initiative is the failure this step exists to prevent**, and it is the same failure as reporting a sweep nobody asked for. A `no` ends it here, in one line, and the next close offers it again in the same clause without arguing.",
     "",
-    "**On yes: propose the cut, and write nothing yet.** Take one file at a time and show the member what would change before anything does:",
+    "**On yes: propose it line by line, and write nothing yet.** Take one file at a time. **This is a list of proposals, not a file operation.** The member accepts or rejects each line on its own, and a line they reject stays exactly as it is. For every line you want to remove or rewrite, give these three fields and no others; a line you leave alone still appears in the listing:",
+    "",
+    "1. **The line itself, verbatim.**",
+    "2. **Its age**, counted from the absolute date the line carries to the date the session hook injected. **A line carrying no date has no age - say so rather than estimating one.**",
+    "3. **What you propose, and one reason.** **To REMOVE**, the reason is one of these four and no others: **superseded** by a later line you name · **duplicate** of another line here · **live state** belonging in the body of `artists/<slug>/_artist.md` · **over-long**, whose remedy is a split and never a cut. **To KEEP but change**, say which rewrite it is: **shortened**, the fact whole and only the wording gone, or **merged** with a line you name. A rewrite is not a removal and needs none of the four.",
+    "",
+    "**Shortening is what actually clears the bar, so reach for it first** - a split makes the file longer, and the four removal reasons are about lines that should not be there rather than about size. **A file whose lines are all correct, current and singular is trimmed by shortening or not at all**: say so rather than manufacturing a removal to reach a number. **An undated line is the member's call** - you cannot show it is over 30 days, so the floor cannot clear it: say it has no date, give your reason, let them decide. **Never treat undated as recent and drop it silently.**",
+    "",
+    "Then the rules the proposal itself obeys:",
     "",
     "- **Every surviving fact appears either unchanged or beside its rewrite**, so the member is reading a diff rather than trusting a summary of one.",
     "- **A fact that is now wrong is edited where it stands, not deleted** - the correction and the date it changed are the record. The file's own header comment states its conventions and is the version that stays current; follow it rather than a copy.",
     "- **Provenance and the absolute date survive on every line you keep.** A fact whose source you drop while shortening it has been damaged, not trimmed.",
     "- **Nothing banked in the last 30 days is dropped**, measured against the date the session hook injected. Recent facts have not had time to prove whether they were durable, and a trim is not the place to decide.",
     "- **Merging two facts into one is a rewrite and shows as one**, with both original lines visible in the proposal.",
+    "- **A contradicting pair is a supersede, not a cut**, resolved by Step 4b's order; the loser stays in the file.",
     "",
     "**Then write only what the member confirms**, and only to the files this command can reach:",
     "",
-    "- `artists/<slug>/memory.md` syncs, and a teammate may be in the same file. **Re-read it at the moment you write**, exactly as Step 4b requires, and change only the lines the proposal named. This is the only file this step ever writes.",
+    "- `artists/<slug>/memory.md` syncs, and a teammate may be in the same file. **Re-read it at the moment you write**, exactly as Step 4b requires, and change only the lines the proposal named. **This is the only file this step writes that reaches Plinth.**",
     `- \`${VOICE_FILENAME}\` is named and nothing else. You are denied editing it, and that is deliberate: the profile a draft is judged against is not the drafter's to rewrite. Say its size, say the member edits it themselves, and propose nothing.`,
+    "- **`workspace-rules.md` is reported here and never edited, and nothing in the harness stops you.** It is injected whole into every teammate's session, so **it is the member's to change** - Step 3's call, and a size row does not change it. Say how far over it is and propose nothing.",
     "- **A memory file the whole workspace shares is not this command's to trim.** `plinth status` names it and says how far over it is; trimming it is a deliberate act by a person who can see who else it belongs to, not a step at the end of somebody's session.",
     "",
+    "**Every line the trim changes is preserved, rewrites included.** The ORIGINAL of each line you remove, shorten or merge goes verbatim into `artists/<slug>/memory-archive.md` beside the store, under a heading carrying the date the session hook injected. Create it if absent, with this first line:",
+    "",
+    "```md",
+    "# <Artist> - RETIRED facts, removed from `memory.md`. Not current, and not synced.",
+    "```",
+    "",
+    "**Write the archive first and `artists/<slug>/memory.md` second, never the other way round** - two files cannot be one edit, and in this order a failure between them over-claims rather than losing lines. **Say plainly that the archive stays on this machine**: Plinth never syncs, reads or rewrites it, so a teammate sees the facts gone from `memory.md` and no trace of where they went. Undoing a trim is a copy back by hand. **The proposal is the control; the archive is only the undo.** **Report it when you report the trim, not in the Step 5 summary**, which is already written - name the file, and **if the `memory.md` write was set aside say so**, because the archive then lists lines still in the store.",
+    "",
     "**Anything you write here lands after Step 5 looked at the conflicts list**, so it can be set aside within seconds like any other write. If you wrote a trim, run the Step 5 check once more on what you wrote and report it the same way.",
     "",
     "## Step 7: end the session",
@@ -29896,6 +30038,18 @@ function fileOverCapLine(f) {
 function fileConflictLine(f) {
   return `[FILE_CONFLICT path=${f.path} stash=${f.stash}]`;
 }
+function fileRejectionSyncFailedLine(f) {
+  const parts = [`[FILE_REJECTION_SYNC_FAILED verb=${f.verb}`];
+  if (f.path !== undefined)
+    parts.push(`path=${f.path}`);
+  parts.push(`reason=${f.reason}`);
+  if (f.status !== undefined)
+    parts.push(`status=${f.status}`);
+  return `${parts.join(" ")}]`;
+}
+function fileRejectionWithdrawnLine(f) {
+  return `[FILE_REJECTION_WITHDRAWN path=${f.path} disposition=${f.disposition}]`;
+}
 function conflictsViewFailedLine(f) {
   const msg = f.message === undefined ? "" : sanitizeServerMessage(f.message);
   const msgPart = msg === "" ? "" : ` message="${msg.replace(/"/g, "'")}"`;
@@ -30005,7 +30159,7 @@ function humanBytes(bytes) {
 function recordFileOverCap(args) {
   const withoutStale = removeUnsynced(args.state, "file", args.relPath).state;
   const ceiling = args.source === "server" ? `the ${humanBytes(args.max)} server limit` : `the ${humanBytes(args.max)} upload ceiling (measured platform limit)`;
-  const message = args.tracked ? `Your local change to this file (${humanBytes(args.size)}) exceeds ${ceiling}, ` + `so it cannot be pushed. The copy in Plinth is unchanged; your edit is on disk here only.` : `${humanBytes(args.size)} exceeds ${ceiling}. The file is still on disk ` + `here but is not in Plinth; shrink or split it to sync it.`;
+  const message = args.tracked ? `A local change to this file (${humanBytes(args.size)}) exceeds ${ceiling}, ` + `so it cannot be pushed and the copy in Plinth is unchanged. ` + `Your edit is on disk here only.` : `${humanBytes(args.size)} exceeds ${ceiling}. The file is still on disk ` + `here but is not in Plinth; shrink or split it to sync it.`;
   return persist(withoutStale, upsertRejected(withoutStale, {
     target: "file",
     op: "upsert",
@@ -30013,6 +30167,8 @@ function recordFileOverCap(args) {
     status: 413,
     reason: "over_cap",
     message,
+    size_bytes: args.size,
+    max_bytes: args.max,
     rejected_at: args.now().toISOString()
   }));
 }
@@ -30066,6 +30222,12 @@ function clearFileRejected(state, relPath) {
     return state;
   return commitState(state, next.state);
 }
+function clearReportedSafeFileRejected(state, relPath) {
+  const existing = (state.rejected ?? []).find((o) => o.target === "file" && o.path === relPath);
+  if (existing?.reported_at !== undefined)
+    return state;
+  return clearFileRejected(state, relPath);
+}
 
 // src/lib/context/workspace-claude-md.ts
 var EXTRACTED_TEXT_DIR = extractedTextRelPath("x").replace(/x\.md$/, "");
@@ -30937,7 +31099,7 @@ var sessionCommand = defineCommand({
 
 // src/commands/start.ts
 var import_gray_matter13 = __toESM(require_gray_matter(), 1);
-import { existsSync as existsSync8, readFileSync as readFileSync24, statSync as statSync16 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync25, statSync as statSync17 } from "node:fs";
 
 // src/lib/daemon-log.ts
 import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync9, renameSync as renameSync7, statSync as statSync4 } from "node:fs";
@@ -31190,9 +31352,9 @@ function conflictsRoot(workspaceSlug) {
   return join11(plinthHome(), "_conflicts", workspaceSlug);
 }
 function conflictFilePath(args) {
-  const { workspaceSlug, entityType, entitySlug, timestamp } = args;
+  const { workspaceSlug, entityType, entitySlug, timestamp, side } = args;
   const iso = timestamp.toISOString().replace(/[:.]/g, "-");
-  return join11(conflictsRoot(workspaceSlug), `${entityType}.${entitySlug}.${iso}.md`);
+  return join11(conflictsRoot(workspaceSlug), `${entityType}.${entitySlug}.${iso}.${side}.md`);
 }
 function stashConflict(args) {
   const target = conflictFilePath(args);
@@ -31201,10 +31363,10 @@ function stashConflict(args) {
   return target;
 }
 function fileConflictPath(args) {
-  const { workspaceSlug, relPath, timestamp } = args;
+  const { workspaceSlug, relPath, timestamp, side } = args;
   const iso = timestamp.toISOString().replace(/[:.]/g, "-");
   const safe = relPath.replace(/[/\\]/g, "__");
-  return join11(conflictsRoot(workspaceSlug), `files.${safe}.${iso}`);
+  return join11(conflictsRoot(workspaceSlug), `files.${safe}.${iso}.${side}`);
 }
 function stashFileConflict(args) {
   const target = fileConflictPath(args);
@@ -31212,7 +31374,7 @@ function stashFileConflict(args) {
   writeFileSync7(target, args.bytes, { mode: 384 });
   return target;
 }
-var STAMP_RE2 = /\.(\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z)(\.md)?$/;
+var STAMP_RE2 = /\.(\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z)(?:\.(local|cloud))?(?:\.md)?$/;
 function parseStamp(stamp) {
   const iso = stamp.replace(/T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z$/, "T$1:$2:$3.$4Z");
   const d = new Date(iso);
@@ -31253,11 +31415,13 @@ function listConflictStashes(workspaceSlug) {
     if (file2.startsWith("."))
       continue;
     const m = STAMP_RE2.exec(file2);
+    const side = m?.[2];
     out.push({
       file: file2,
       absPath,
       label: labelFor(file2),
       stashedAt: m ? parseStamp(m[1]) : null,
+      side: side === "local" || side === "cloud" ? side : null,
       mtimeMs: st.mtimeMs
     });
   }
@@ -31512,7 +31676,7 @@ async function pushFilesUpsert(args) {
       cloudRow = undefined;
     }
   }
-  const stashPath = stashFileConflict({ workspaceSlug, relPath, timestamp: now(), bytes });
+  const stashPath = stashFileConflict({ workspaceSlug, relPath, timestamp: now(), bytes, side: "local" });
   output?.log(fileConflictLine({ path: relPath, stash: stashPath }));
   if (existing) {
     nextState = await restoreFileFromCloud({
@@ -32002,7 +32166,8 @@ async function reconcileContextDocConflict(args) {
       entityType: strategy.type,
       entitySlug: fileSlug,
       timestamp: now(),
-      contents: raw
+      contents: raw,
+      side: "local"
     });
     const nextState = await pullAndWriteMirror({
       strategy,
@@ -32034,12 +32199,13 @@ async function reconcileContextDocConflict(args) {
       state: nextState
     };
   }
-  const preLandStash = stashConflict({
+  const stashPreLandCloudCopy = () => stashConflict({
     workspaceSlug,
     entityType: strategy.type,
     entitySlug: existingSlug,
     timestamp: now(),
-    contents: strategy.serialise(existing)
+    contents: strategy.serialise(existing),
+    side: "cloud"
   });
   const fm = parsed.data ?? {};
   const lifted = splitUserFrontmatter(strategy, fm);
@@ -32073,6 +32239,7 @@ async function reconcileContextDocConflict(args) {
       body_len: hashBody.length
     };
     state = persistEntry(state, strategy.type, updated);
+    const preLandStash = stashPreLandCloudCopy();
     output?.log(contextDocConflictLine({
       entityType: strategy.type,
       localSlug: fileSlug,
@@ -32088,7 +32255,8 @@ async function reconcileContextDocConflict(args) {
       outcome: {
         kind: "pushed",
         entityType: strategy.type,
-        entitySlug: updated.slug
+        entitySlug: updated.slug,
+        stashPath: preLandStash
       },
       state
     };
@@ -32112,7 +32280,8 @@ async function reconcileContextDocConflict(args) {
       entityType: strategy.type,
       entitySlug: fileSlug,
       timestamp: now(),
-      contents: raw
+      contents: raw,
+      side: "local"
     });
     if (staleEntryId && staleEntryId !== existingId) {
       state = dropEntry(state, strategy.type, staleEntryId);
@@ -32384,7 +32553,8 @@ async function runPushUpsert(args) {
       entityType: strategy.type,
       entitySlug: liveEntry.slug,
       timestamp: args.now(),
-      contents: args.raw
+      contents: args.raw,
+      side: "local"
     });
     const nextState = await pullAndWriteMirror({
       strategy,
@@ -32422,16 +32592,18 @@ async function reconcileTaskConflict(args) {
     output
   } = args;
   let state = args.state;
-  const stashPath = stashConflict({
+  const stashLocalSide = () => stashConflict({
     workspaceSlug,
     entityType: strategy.type,
     entitySlug: liveEntry.slug,
     timestamp: now(),
-    contents: raw
+    contents: raw,
+    side: "local"
   });
   const localProse = stripSyncErrorBlock(stripCommentsBlock(parsed.content));
   const wireBody = normaliseWireBody(strategy.bodyToWire(localProse).body);
   if (wireBody == null) {
+    const stashPath2 = stashLocalSide();
     state = await pullAndWriteMirror({
       strategy,
       workspaceSlug,
@@ -32446,11 +32618,37 @@ async function reconcileTaskConflict(args) {
         kind: "conflict",
         entityType: strategy.type,
         entitySlug: liveEntry.slug,
-        stashPath
+        stashPath: stashPath2
+      },
+      state
+    };
+  }
+  let cloudRow = null;
+  try {
+    cloudRow = await getEntity({ strategy, baseUrl, pat, id: liveEntry.id, fetchImpl });
+  } catch (err) {
+    if (!(err instanceof ApiError) || err.status !== 404)
+      throw err;
+  }
+  if (cloudRow === null) {
+    stashLocalSide();
+    return {
+      outcome: {
+        kind: "not_found",
+        entityType: strategy.type,
+        entitySlug: liveEntry.slug
       },
       state
     };
   }
+  const stashCloudSide = () => stashConflict({
+    workspaceSlug,
+    entityType: strategy.type,
+    entitySlug: liveEntry.slug,
+    timestamp: now(),
+    contents: strategy.serialise(cloudRow),
+    side: "cloud"
+  });
   const patchResult = await patchEntity({
     strategy,
     baseUrl,
@@ -32461,6 +32659,7 @@ async function reconcileTaskConflict(args) {
     fetchImpl
   });
   if (patchResult.ok) {
+    const stashPath2 = stashCloudSide();
     writeMirrorWithBodyPreserve(workspaceSlug, strategy, patchResult.doc);
     state = stampStateFromMirror({
       strategy,
@@ -32474,12 +32673,14 @@ async function reconcileTaskConflict(args) {
       outcome: {
         kind: "pushed",
         entityType: strategy.type,
-        entitySlug: patchResult.doc.slug
+        entitySlug: patchResult.doc.slug,
+        stashPath: stashPath2
       },
       state
     };
   }
   if (patchResult.code === 404) {
+    stashLocalSide();
     return {
       outcome: {
         kind: "not_found",
@@ -32489,6 +32690,7 @@ async function reconcileTaskConflict(args) {
       state
     };
   }
+  const stashPath = stashLocalSide();
   state = await pullAndWriteMirror({
     strategy,
     workspaceSlug,
@@ -32650,7 +32852,8 @@ async function runPushCreate(args) {
       entityType: strategy.type,
       entitySlug: args.slug,
       timestamp: args.now(),
-      contents: args.raw
+      contents: args.raw,
+      side: "local"
     });
     const nextState = await pullAndWriteMirror({
       strategy,
@@ -32876,7 +33079,8 @@ async function pushRename(args) {
         entityType,
         entitySlug: fromSlug,
         timestamp: now(),
-        contents: contents2
+        contents: contents2,
+        side: "local"
       });
       const afterColliding = await pullAndWriteMirror({
         strategy,
@@ -32916,7 +33120,8 @@ async function pushRename(args) {
       entityType,
       entitySlug: fromSlug,
       timestamp: now(),
-      contents
+      contents,
+      side: "local"
     });
     const nextState = await pullAndWriteMirror({
       strategy,
@@ -33040,7 +33245,8 @@ async function discardBatchOps(batch, deps) {
             entityType: op.entityType,
             entitySlug: op.slug,
             timestamp: (deps.now ?? (() => new Date))(),
-            contents: local
+            contents: local,
+            side: "local"
           });
         }
       }
@@ -33073,7 +33279,8 @@ async function discardFileOp(op, deps) {
       workspaceSlug: deps.workspaceSlug,
       relPath: op.path,
       timestamp: (deps.now ?? (() => new Date))(),
-      bytes: local
+      bytes: local,
+      side: "local"
     });
   }
   const next = await restoreFileFromCloud({
@@ -35328,6 +35535,7 @@ async function reconcileFilesSubtree(args) {
         case "created":
         case "updated":
           countPushed();
+          state = clearFileRejected(state, relPath);
           break;
         case "conflict":
           conflicts++;
@@ -35567,7 +35775,8 @@ function applyArtistMemoryOnPull(args) {
         entityType: ENTITY_TYPE,
         entitySlug: conflictSlug(slug),
         timestamp: now(),
-        contents: local
+        contents: local,
+        side: "local"
       });
       out.warn(`Conflict on artists/${slug}/memory.md → stashed local edit to ${stashPath} (cloud-wins).`);
     }
@@ -35647,7 +35856,8 @@ async function pushArtistMemory(args) {
           entityType: ENTITY_TYPE,
           entitySlug: conflictSlug(slug),
           timestamp: now(),
-          contents: local
+          contents: local,
+          side: "local"
         });
         const nextState = adoptCloudMemory({ workspaceSlug, slug, cloud, state: base2, suppressor });
         output?.log(`[ARTIST_MEMORY_CONFLICT slug=${slug} id=${entry2.id} action=cloud_wins_stash]`);
@@ -37192,6 +37402,7 @@ async function reconcileDivergedRows(args) {
   let scanned = 0;
   let diverged = 0;
   let pushed = 0;
+  let merged = 0;
   let conflicts = 0;
   let noop = 0;
   let failed = 0;
@@ -37214,7 +37425,10 @@ async function reconcileDivergedRows(args) {
       state = result.state;
       switch (result.outcome.kind) {
         case "pushed":
-          pushed++;
+          if (result.outcome.stashPath)
+            merged++;
+          else
+            pushed++;
           break;
         case "conflict":
         case "create_slug_conflict":
@@ -37382,6 +37596,7 @@ async function reconcileDivergedRows(args) {
     scanned,
     diverged,
     pushed,
+    merged,
     conflicts,
     noop,
     failed,
@@ -37578,7 +37793,8 @@ async function pullWorkspaceRules(args) {
         entityType: CONFLICT_ENTITY,
         entitySlug: CONFLICT_SLUG,
         timestamp: now(),
-        contents: local
+        contents: local,
+        side: "local"
       });
       output?.warn(`Conflict on ${WORKSPACE_RULES_FILENAME} -> stashed local edit to ${stashPath} (cloud-wins).`);
       output?.log(`[WORKSPACE_RULES_PULL_CONFLICT ws=${workspaceSlug} stashed]`);
@@ -37664,7 +37880,8 @@ async function pushWorkspaceRules(args) {
     entityType: CONFLICT_ENTITY,
     entitySlug: CONFLICT_SLUG,
     timestamp: now(),
-    contents: local
+    contents: local,
+    side: "local"
   });
   const next = await restoreFromCloud(args);
   output?.warn(`Conflict on ${WORKSPACE_RULES_FILENAME} -> stashed local edit to ${stashPath} (cloud-wins; cloud copy restored).`);
@@ -37844,7 +38061,8 @@ async function pullWorkspaceMemory(args) {
         entityType: CONFLICT_ENTITY2,
         entitySlug: CONFLICT_SLUG2,
         timestamp: now(),
-        contents: local
+        contents: local,
+        side: "local"
       });
       output?.warn(`Conflict on ${WORKSPACE_MEMORY_FILENAME} -> stashed local edit to ${stashPath} (cloud-wins).`);
       output?.log(`[WORKSPACE_MEMORY_PULL_CONFLICT ws=${workspaceSlug} stashed]`);
@@ -37930,7 +38148,8 @@ async function pushWorkspaceMemory(args) {
     entityType: CONFLICT_ENTITY2,
     entitySlug: CONFLICT_SLUG2,
     timestamp: now(),
-    contents: local
+    contents: local,
+    side: "local"
   });
   const next = await restoreFromCloud2(args);
   output?.warn(`Conflict on ${WORKSPACE_MEMORY_FILENAME} -> stashed local edit to ${stashPath} (cloud-wins; cloud copy restored).`);
@@ -38118,7 +38337,8 @@ async function pullSingleton(descriptor, args) {
         entityType: descriptor.conflictEntity,
         entitySlug: descriptor.conflictSlug,
         timestamp: now(),
-        contents: local
+        contents: local,
+        side: "local"
       });
       output?.warn(`Conflict on ${descriptor.filename} -> stashed local edit to ${stashPath} (cloud-wins).`);
       output?.log(`[${descriptor.logTag}_PULL_CONFLICT ws=${workspaceSlug} stashed]`);
@@ -38192,7 +38412,8 @@ async function pushSingleton(descriptor, args) {
     entityType: descriptor.conflictEntity,
     entitySlug: descriptor.conflictSlug,
     timestamp: now(),
-    contents: local
+    contents: local,
+    side: "local"
   });
   const next = await restoreFromCloud3(descriptor, args);
   output?.warn(`Conflict on ${descriptor.filename} -> stashed local edit to ${stashPath} (cloud-wins; cloud copy restored).`);
@@ -38385,8 +38606,8 @@ function createThrottledFetch(baseFetch, opts = {}) {
 import {
   existsSync as existsSync7,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync23,
-  statSync as statSync15,
+  readFileSync as readFileSync24,
+  statSync as statSync16,
   unlinkSync as unlinkSync8
 } from "node:fs";
 import { join as join16 } from "node:path";
@@ -38405,8 +38626,8 @@ var FOOTER = [
 var NOTHING_SET_ASIDE = [
   "# Conflicts",
   "",
-  "**Nothing has been set aside.** No local edit in this workspace has been",
-  "replaced by a cloud copy."
+  "**Nothing has been set aside.** Nothing in this workspace has changed in two",
+  "places at once and had one side put aside."
 ].join(`
 `);
 function absolute(date5) {
@@ -38443,9 +38664,47 @@ function resolveConflictRows(workspaceSlug, stashes) {
     };
   });
 }
+function entityNoun(label) {
+  const head = label.slice(0, label.indexOf("/"));
+  switch (head) {
+    case "tasks":
+      return "task";
+    case "documents":
+      return "document";
+    case "projects":
+      return "project";
+    case "artists":
+      return "artist";
+    default:
+      return "record";
+  }
+}
 function renderRow(row) {
   const { stash } = row;
   const when = stash.stashedAt === null ? "at a time its filename does not record" : `on ${absolute(stash.stashedAt)}`;
+  if (stash.side === "cloud") {
+    const noun = entityNoun(stash.label);
+    return [
+      `## ${stash.label}`,
+      "",
+      `Set aside ${when}.`,
+      "",
+      "**This one is the cloud's copy, not yours.** This " + noun + " changed in",
+      "two places at once and Plinth merged it field by field: your writing won",
+      "and is in your file now, the cloud's other fields won, and what is set",
+      "aside below is the version your writing replaced. That is someone else's",
+      "work, and it is nowhere else.",
+      "",
+      "It is at:",
+      "",
+      "```",
+      stash.absPath,
+      "```",
+      "",
+      `Read it, fold anything worth keeping into the ${noun}, then delete the stash.`
+    ].join(`
+`);
+  }
   const out = [`## ${stash.label}`, "", `Set aside ${when}.`, ""];
   if (row.kind !== "restorable") {
     out.push("Your version is at:", "", "```", stash.absPath, "```", "");
@@ -38471,15 +38730,24 @@ function renderConflictsView(rows) {
 ${FOOTER}
 `;
   const n = rows.length;
+  const cloudSide = rows.filter((r) => r.stash.side === "cloud").length;
+  const localSide = n - cloudSide;
   const head = [
     "# Conflicts",
     "",
-    `**${n} local ${n === 1 ? "copy was" : "copies were"} set aside because the cloud version won.**`,
-    `Your ${n === 1 ? "edit is" : "edits are"} not lost. ${n === 1 ? "It is" : "They are"} listed below with how to put ${n === 1 ? "it" : "them"} back.`,
+    `**${n} ${n === 1 ? "copy was" : "copies were"} set aside when the same thing changed in two places at once.**`,
+    `Nothing here is lost. ${n === 1 ? "It is" : "They are"} listed below, each saying which side it holds.`,
     "",
-    "This happens when the same file changed in two places at once. Plinth keeps",
-    "the cloud version in your mirror and puts your version aside rather than",
-    "choosing between them."
+    ...localSide > 0 ? [
+      "For most files Plinth keeps the cloud version in your mirror and puts your",
+      "version aside rather than choosing between them."
+    ] : [],
+    ...localSide > 0 && cloudSide > 0 ? [""] : [],
+    ...cloudSide > 0 ? [
+      "Some records are merged field by field instead: your writing wins and the",
+      "cloud's other fields win. There the copy set aside is the CLOUD's, which",
+      "your version replaced. Each of those says so in its own section."
+    ] : []
   ].join(`
 `);
   return `${head}
@@ -38882,7 +39150,7 @@ async function applyFileRow(args) {
     try {
       const localBytes = readFileSync22(abs);
       if (sha256Bytes(localBytes) !== existing.content_hash) {
-        const stashPath = stashFileConflict({ workspaceSlug, relPath, timestamp: now(), bytes: localBytes });
+        const stashPath = stashFileConflict({ workspaceSlug, relPath, timestamp: now(), bytes: localBytes, side: "local" });
         output?.warn(`Conflict on files/${relPath} → stashed local edit to ${stashPath} (cloud-wins on boot).`);
       }
     } catch {}
@@ -38988,6 +39256,203 @@ function textIsCurrent(existing, row, workspaceSlug, relPath) {
   return extractedTextHash(onDisk) === existing.text_hash;
 }
 
+// src/lib/files/rejection-sync.ts
+import { readFileSync as readFileSync23, statSync as statSync15 } from "node:fs";
+
+// src/lib/files/rejections-api.ts
+var RejectionsFeedSchema = exports_external.object({
+  rejections: exports_external.array(TeamFileRejectionSchema)
+});
+
+class RejectionFeedShapeError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "RejectionFeedShapeError";
+  }
+}
+var WithdrawResponseSchema = exports_external.object({
+  cleared: exports_external.number().int().nonnegative()
+});
+function headers(pat) {
+  return {
+    authorization: `Bearer ${pat}`,
+    "content-type": "application/json"
+  };
+}
+function endpoint(baseUrl) {
+  return `${baseUrl.replace(/\/$/, "")}/api/sync/files/rejections`;
+}
+async function listFileRejections(args) {
+  const doFetch = args.fetchImpl ?? fetch;
+  const res = await doFetch(endpoint(args.baseUrl), {
+    method: "GET",
+    headers: headers(args.pat)
+  });
+  if (!res.ok) {
+    throw new ApiError(res.status, `file-rejections feed failed with HTTP ${res.status}`);
+  }
+  const parsed = RejectionsFeedSchema.safeParse(await res.json());
+  if (!parsed.success) {
+    throw new RejectionFeedShapeError("file-rejections feed did not match the expected shape");
+  }
+  return parsed.data.rejections;
+}
+async function postFileRejection(args) {
+  const doFetch = args.fetchImpl ?? fetch;
+  const res = await doFetch(endpoint(args.baseUrl), {
+    method: "POST",
+    headers: headers(args.pat),
+    body: JSON.stringify({
+      path: args.path,
+      reason: args.reason,
+      detail: args.detail ?? null,
+      size_bytes: args.sizeBytes ?? null,
+      max_bytes: args.maxBytes ?? null
+    })
+  });
+  if (!res.ok) {
+    throw new ApiError(res.status, `recording the file rejection failed with HTTP ${res.status}`);
+  }
+}
+async function deleteFileRejection(args) {
+  const doFetch = args.fetchImpl ?? fetch;
+  const url2 = `${endpoint(args.baseUrl)}?path=${encodeURIComponent(args.path)}`;
+  const res = await doFetch(url2, {
+    method: "DELETE",
+    headers: headers(args.pat)
+  });
+  if (!res.ok) {
+    throw new ApiError(res.status, `withdrawing the file rejection failed with HTTP ${res.status}`);
+  }
+  const parsed = WithdrawResponseSchema.safeParse(await res.json());
+  return parsed.success ? parsed.data.cleared : 0;
+}
+
+// src/lib/files/rejection-sync.ts
+var TEAM_VISIBLE_REJECT_REASONS = new Set([
+  "over_cap",
+  "bad_request",
+  "invalid_frontmatter"
+]);
+async function drainFileRejectionReports(args) {
+  let state = args.state;
+  const pending = listRejected(state).filter((r) => r.target === "file" && !r.reported_at && TEAM_VISIBLE_REJECT_REASONS.has(r.reason));
+  for (const r of pending) {
+    try {
+      await postFileRejection({
+        baseUrl: args.baseUrl,
+        pat: args.pat,
+        path: r.path,
+        reason: r.reason,
+        detail: r.detail ?? r.message ?? null,
+        sizeBytes: r.size_bytes ?? null,
+        maxBytes: r.max_bytes ?? null,
+        fetchImpl: args.fetchImpl
+      });
+      const next = markRejectedReported(state, r.path, args.now().toISOString());
+      if (next.changed)
+        state = commitState(state, next.state);
+    } catch (err) {
+      args.onError?.(r.path, err);
+    }
+  }
+  return state;
+}
+async function fetchTeamRejections(args) {
+  const rows = await listFileRejections({
+    baseUrl: args.baseUrl,
+    pat: args.pat,
+    fetchImpl: args.fetchImpl
+  });
+  const next = setTeamRejected(args.state, rows, args.now().toISOString());
+  return next.changed ? commitState(args.state, next.state) : args.state;
+}
+function settledDisposition(args) {
+  const entry2 = getFileEntry(args.state, args.relPath);
+  let absolute2;
+  try {
+    absolute2 = filesSubtreePath(args.workspaceSlug, args.relPath);
+  } catch {
+    return null;
+  }
+  let size = null;
+  try {
+    const st = statSync15(absolute2);
+    size = st.isFile() ? st.size : null;
+  } catch {
+    size = null;
+  }
+  if (size === null)
+    return entry2 === undefined ? "gone" : null;
+  if (entry2 === undefined)
+    return null;
+  if (size !== entry2.size_bytes)
+    return null;
+  let bytes;
+  try {
+    bytes = readFileSync23(absolute2);
+  } catch {
+    return null;
+  }
+  return sha256Bytes(bytes) === entry2.content_hash ? "synced" : null;
+}
+async function withdrawSettledRejections(args) {
+  let state = args.state;
+  const live = new Set(listTeamRejected(state).map((r) => r.path));
+  const owned = listRejected(state).filter((r) => r.target === "file" && r.reported_at !== undefined);
+  const withdrawn = new Set;
+  for (const record2 of owned) {
+    if (!live.has(record2.path))
+      continue;
+    const disposition = settledDisposition({
+      state,
+      workspaceSlug: args.workspaceSlug,
+      relPath: record2.path
+    });
+    if (disposition === null)
+      continue;
+    try {
+      await deleteFileRejection({
+        baseUrl: args.baseUrl,
+        pat: args.pat,
+        path: record2.path,
+        fetchImpl: args.fetchImpl
+      });
+      withdrawn.add(record2.path);
+      const cleared = removeRejected(state, "file", record2.path);
+      if (cleared.changed)
+        state = commitState(state, cleared.state);
+      args.onWithdrawn?.(record2.path, disposition);
+    } catch (err) {
+      args.onError?.(record2.path, err);
+    }
+  }
+  if (withdrawn.size > 0) {
+    const fetchedAt = state.team_rejected?.fetched_at;
+    if (fetchedAt) {
+      const kept = listTeamRejected(state).filter((r) => !withdrawn.has(r.path));
+      const pruned = setTeamRejected(state, kept, fetchedAt);
+      if (pruned.changed)
+        state = commitState(state, pruned.state);
+    }
+  }
+  return state;
+}
+function rearmMissingReports(state) {
+  const live = new Set(listTeamRejected(state).map((r) => r.path));
+  let next = state;
+  for (const r of listRejected(state)) {
+    if (r.reported_at === undefined)
+      continue;
+    if (live.has(r.path))
+      continue;
+    const cleared = clearRejectedReported(next, r.path);
+    if (cleared.changed)
+      next = commitState(next, cleared.state);
+  }
+  return next;
+}
+
 // src/commands/sync.ts
 init_output();
 var memberRefreshFailedAt = new Map;
@@ -39041,7 +39506,7 @@ function unlinkIfProvablyOurs(workspaceSlug, strategy, entry2, suppressor) {
   }
   let raw;
   try {
-    raw = readFileSync23(target, "utf8");
+    raw = readFileSync24(target, "utf8");
   } catch (err) {
     if (err?.code === "ENOENT") {
       return { didUnlink: false };
@@ -39115,6 +39580,66 @@ async function runSync(workspaceSlug, deps = {}) {
     }));
     out.warn(`Conflict list could not be written to ${CONFLICTS_VIEW_REL_PATH}: ${res.failed}`);
   };
+  const syncFileRejections = async () => {
+    const logFailure = (verb) => (path5, err) => {
+      if (err instanceof RejectionFeedShapeError) {
+        out.log(fileRejectionSyncFailedLine({ verb, path: path5, reason: "shape" }));
+        return;
+      }
+      const cat = categorizeError(err);
+      out.log(fileRejectionSyncFailedLine({
+        verb,
+        path: path5,
+        reason: cat.reason,
+        status: cat.status
+      }));
+    };
+    let feedRead = false;
+    try {
+      await fetchTeamRejections({
+        state: loadState(slug),
+        baseUrl: entry2.api_base_url,
+        pat,
+        now,
+        fetchImpl
+      });
+      feedRead = true;
+    } catch (err) {
+      logFailure("feed")(undefined, err);
+    }
+    if (feedRead) {
+      try {
+        rearmMissingReports(loadState(slug));
+      } catch (err) {
+        logFailure("report")(undefined, err);
+      }
+    }
+    try {
+      await drainFileRejectionReports({
+        state: loadState(slug),
+        baseUrl: entry2.api_base_url,
+        pat,
+        now,
+        fetchImpl,
+        onError: (path5, err) => logFailure("report")(path5, err)
+      });
+    } catch (err) {
+      logFailure("report")(undefined, err);
+    }
+    try {
+      await withdrawSettledRejections({
+        state: loadState(slug),
+        workspaceSlug: slug,
+        baseUrl: entry2.api_base_url,
+        pat,
+        fetchImpl,
+        onError: (path5, err) => logFailure("withdraw")(path5, err),
+        onWithdrawn: (path5, disposition) => out.log(fileRejectionWithdrawnLine({ path: path5, disposition }))
+      });
+    } catch (err) {
+      logFailure("withdraw")(undefined, err);
+    }
+  };
   refreshBanner();
   out.info(`Syncing ${slug}…`);
   const startedAt = now();
@@ -39349,6 +39874,7 @@ async function runSync(workspaceSlug, deps = {}) {
     out.warn(`Per-artist context generation skipped: ${msg}`);
   }
   refreshBanner();
+  await syncFileRejections();
   const totalWritten = Object.values(counters).reduce((sum, c) => sum + c.written, 0);
   const totalDeleted = Object.values(counters).reduce((sum, c) => sum + c.deleted, 0);
   if (totalWritten === 0 && totalDeleted === 0) {
@@ -39446,7 +39972,7 @@ function applyRow(workspaceSlug, strategy, row, state, out, suppressor, now = ()
   if (!suppressor && existingEntry && existingEntry.updated_at !== live.updated_at) {
     let localRaw = null;
     try {
-      localRaw = readFileSync23(entityFilePath(workspaceSlug, strategy.type, live.slug), "utf8");
+      localRaw = readFileSync24(entityFilePath(workspaceSlug, strategy.type, live.slug), "utf8");
     } catch {
       localRaw = null;
     }
@@ -39459,7 +39985,8 @@ function applyRow(workspaceSlug, strategy, row, state, out, suppressor, now = ()
           entityType: strategy.type,
           entitySlug: live.slug,
           timestamp: now(),
-          contents: localRaw
+          contents: localRaw,
+          side: "local"
         });
         out.warn(`Conflict on ${strategy.type}/${live.slug} → stashed local edit to ${stashPath} (cloud-wins on boot).`);
       }
@@ -39469,7 +39996,7 @@ function applyRow(workspaceSlug, strategy, row, state, out, suppressor, now = ()
   const hashes = computeMirrorHashes(strategy, content);
   let inode;
   try {
-    inode = statSync15(entityFilePath(workspaceSlug, strategy.type, live.slug)).ino;
+    inode = statSync16(entityFilePath(workspaceSlug, strategy.type, live.slug)).ino;
   } catch {
     inode = undefined;
   }
@@ -39562,7 +40089,7 @@ var syncCommand = defineCommand({
 // src/commands/start.ts
 var SHUTDOWN_DRAIN_TIMEOUT_MS = 5000;
 var PULL_HEARTBEAT_MS = 900000;
-function backfillStateInodes(workspaceSlug, state, statFn = (p) => statSync16(p)) {
+function backfillStateInodes(workspaceSlug, state, statFn = (p) => statSync17(p)) {
   let changed = false;
   const nextEntries = {};
   for (const [entityType, bucket] of Object.entries(state.entries)) {
@@ -39595,7 +40122,7 @@ function backfillStateInodes(workspaceSlug, state, statFn = (p) => statSync16(p)
     return { state, changed: false };
   return { state: { ...state, entries: nextEntries }, changed: true };
 }
-function backfillBodyLengths(workspaceSlug, state, readFn = (p) => readFileSync24(p, "utf8")) {
+function backfillBodyLengths(workspaceSlug, state, readFn = (p) => readFileSync25(p, "utf8")) {
   let changed = false;
   const nextEntries = {};
   for (const [entityType, bucket] of Object.entries(state.entries)) {
@@ -39682,14 +40209,14 @@ function makeWatchHandler(deps) {
             state: getState(),
             deps: { fetchImpl, now, output, suppressor }
           });
-          setState(clearFileRejected(result.state, relPath));
+          setState(clearReportedSafeFileRejected(result.state, relPath));
           reportFileOutcome(spinner, workspaceSlug, getState(), result.outcome);
         });
         return;
       }
       let st;
       try {
-        st = statSync16(absolutePath);
+        st = statSync17(absolutePath);
       } catch (err) {
         if (err?.code === "ENOENT")
           return;
@@ -39720,7 +40247,7 @@ function makeWatchHandler(deps) {
         spinner.update(`Watching ${workspaceSlug} · ${watchingSummary(getState())}`);
         return;
       }
-      const bytes = readFileSync24(absolutePath);
+      const bytes = readFileSync25(absolutePath);
       const hash2 = sha256Bytes(bytes);
       if (suppressor?.shouldSuppressUpsert(absolutePath, {
         bodyHash: hash2,
@@ -39778,7 +40305,7 @@ function makeWatchHandler(deps) {
     if (suppressor) {
       let raw = null;
       try {
-        raw = readFileSync24(absolutePath, "utf8");
+        raw = readFileSync25(absolutePath, "utf8");
       } catch {
         raw = null;
       }
@@ -39816,7 +40343,7 @@ function makeWatchHandler(deps) {
     if (suppressor) {
       let raw = null;
       try {
-        raw = readFileSync24(absolutePath, "utf8");
+        raw = readFileSync25(absolutePath, "utf8");
       } catch {
         raw = null;
       }
@@ -39854,7 +40381,7 @@ function makeWatchHandler(deps) {
     if (suppressor) {
       let raw = null;
       try {
-        raw = readFileSync24(absolutePath, "utf8");
+        raw = readFileSync25(absolutePath, "utf8");
       } catch {
         raw = null;
       }
@@ -39892,7 +40419,7 @@ function makeWatchHandler(deps) {
     if (suppressor) {
       let raw = null;
       try {
-        raw = readFileSync24(absolutePath, "utf8");
+        raw = readFileSync25(absolutePath, "utf8");
       } catch {
         raw = null;
       }
@@ -39930,7 +40457,7 @@ function makeWatchHandler(deps) {
     if (suppressor) {
       let raw = null;
       try {
-        raw = readFileSync24(absolutePath, "utf8");
+        raw = readFileSync25(absolutePath, "utf8");
       } catch {
         raw = null;
       }
@@ -40045,7 +40572,7 @@ function makeWatchHandler(deps) {
           if (strategy) {
             let raw = null;
             try {
-              raw = readFileSync24(absolutePath, "utf8");
+              raw = readFileSync25(absolutePath, "utf8");
             } catch {
               raw = null;
             }
@@ -40305,21 +40832,9 @@ async function runStart(workspaceSlug, deps = {}) {
   if (backfillWorthReporting(idBackfill)) {
     daemonLog.log(frontmatterIdBackfillLine(idBackfill));
   }
-  if (recon.diverged > 0 || recon.quarantined > 0) {
-    const parts = [];
-    if (recon.pushed > 0)
-      parts.push(`${recon.pushed} pushed`);
-    if (recon.conflicts > 0)
-      parts.push(`${recon.conflicts} stashed to ~/.plinth/_conflicts/`);
-    if (recon.syncErrors > 0)
-      parts.push(`${recon.syncErrors} with sync errors (see # sync-error in the file)`);
-    if (recon.quarantined > 0)
-      parts.push(`${recon.quarantined} held for \`plinth confirm\``);
-    if (recon.failed > 0)
-      parts.push(`${recon.failed} deferred`);
-    const acted = recon.diverged + recon.quarantined;
-    out.info(`Reconciled ${acted} offline edit${acted === 1 ? "" : "s"}${parts.length ? `: ${parts.join(", ")}` : ""}.`);
-  }
+  const reconLine = reconcileSummaryLine(recon);
+  if (reconLine !== null)
+    out.info(reconLine);
   const disc = recon.discovery;
   if (disc.created > 0 || disc.renamed > 0 || disc.collisions > 0 || disc.renameConflicts > 0) {
     const parts = [];
@@ -40987,11 +41502,34 @@ function watchingSummary(state) {
   const parts = types.map((t) => `${counts[t] ?? 0} ${t}`);
   return parts.join(" · ");
 }
+function reconcileSummaryLine(recon) {
+  if (recon.diverged === 0 && recon.quarantined === 0)
+    return null;
+  const parts = [];
+  if (recon.pushed > 0)
+    parts.push(`${recon.pushed} pushed`);
+  if (recon.merged > 0)
+    parts.push(`${recon.merged} merged field by field (the cloud's description stashed to ~/.plinth/_conflicts/)`);
+  if (recon.conflicts > 0)
+    parts.push(`${recon.conflicts} stashed to ~/.plinth/_conflicts/`);
+  if (recon.syncErrors > 0)
+    parts.push(`${recon.syncErrors} with sync errors (see # sync-error in the file)`);
+  if (recon.quarantined > 0)
+    parts.push(`${recon.quarantined} held for \`plinth confirm\``);
+  if (recon.failed > 0)
+    parts.push(`${recon.failed} deferred`);
+  const acted = recon.diverged + recon.quarantined;
+  return `Reconciled ${acted} offline edit${acted === 1 ? "" : "s"}${parts.length ? `: ${parts.join(", ")}` : ""}.`;
+}
 function reportOutcome(spinner, slug, state, outcome) {
   const summary = watchingSummary(state);
   switch (outcome.kind) {
     case "pushed":
-      spinner.success(`Pushed ${outcome.entityType}/${outcome.entitySlug}`);
+      if (outcome.stashPath) {
+        spinner.warn(`Merged ${outcome.entityType}/${outcome.entitySlug} field by field → the cloud's copy is at ${outcome.stashPath}`);
+      } else {
+        spinner.success(`Pushed ${outcome.entityType}/${outcome.entitySlug}`);
+      }
       spinner.update(`Watching ${slug} · ${summary}`);
       return;
     case "created":
@@ -41186,7 +41724,7 @@ var startCommand = defineCommand({
 });
 
 // src/commands/status.ts
-import { statSync as statSync18 } from "node:fs";
+import { statSync as statSync19 } from "node:fs";
 
 // src/lib/context/memory-bars.ts
 var RULE_FILE_BAR_BYTES = 6000;
@@ -41280,7 +41818,7 @@ function assessMemoryBars(workspaceSlug, deps = {}) {
 
 // src/lib/build-stamp.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { existsSync as existsSync9, mkdirSync as mkdirSync11, readFileSync as readFileSync25, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync11, readFileSync as readFileSync26, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname10, join as join17 } from "node:path";
 import { fileURLToPath } from "node:url";
 var BUILD_STAMP_FILENAME = "build-stamp.json";
@@ -41304,7 +41842,7 @@ function readHead(repoDir) {
 }
 function readBuildStamp(distDir) {
   try {
-    const parsed = JSON.parse(readFileSync25(stampPath(distDir), "utf8"));
+    const parsed = JSON.parse(readFileSync26(stampPath(distDir), "utf8"));
     if (parsed && typeof parsed.sha === "string" && parsed.sha.length > 0 && typeof parsed.dirty === "boolean" && typeof parsed.built_at === "string") {
       return { sha: parsed.sha, dirty: parsed.dirty, built_at: parsed.built_at };
     }
@@ -41365,12 +41903,12 @@ function checkBuildStaleness(deps = {}) {
 }
 
 // src/lib/memory-links.ts
-import { readFileSync as readFileSync26 } from "node:fs";
+import { readFileSync as readFileSync27 } from "node:fs";
 import { relative as relative13, sep as sep5 } from "node:path";
 var MEMORY_FILE_RE = /^(workspace-memory\.md|artists\/[^/]+\/memory\.md)$/i;
 function scanMemoryLinks(deps) {
   const listFiles = deps.listFiles ?? ((r) => walkSubtreeFiles(r, isVcsInternal));
-  const readFile = deps.readFile ?? ((p) => readFileSync26(p, "utf8"));
+  const readFile = deps.readFile ?? ((p) => readFileSync27(p, "utf8"));
   let root;
   let absPaths;
   try {
@@ -41414,7 +41952,7 @@ function scanMemoryLinks(deps) {
 init_output();
 
 // src/lib/pending-writes.ts
-import { readFileSync as readFileSync27, statSync as statSync17 } from "node:fs";
+import { readFileSync as readFileSync28, statSync as statSync18 } from "node:fs";
 import { relative as relative14 } from "node:path";
 var import_gray_matter14 = __toESM(require_gray_matter(), 1);
 var EMPTY2 = { writes: [], count: 0 };
@@ -41454,7 +41992,7 @@ function scanPendingWrites(args) {
       const entry3 = getFileEntry(state, fileMatch.relPath);
       let size;
       try {
-        size = statSync17(absolutePath).size;
+        size = statSync18(absolutePath).size;
       } catch {
         continue;
       }
@@ -41462,7 +42000,7 @@ function scanPendingWrites(args) {
         continue;
       let hash2;
       try {
-        hash2 = sha256Bytes(readFileSync27(absolutePath));
+        hash2 = sha256Bytes(readFileSync28(absolutePath));
       } catch {
         continue;
       }
@@ -41483,7 +42021,7 @@ function scanPendingWrites(args) {
       continue;
     let liveInode;
     try {
-      liveInode = statSync17(absolutePath).ino;
+      liveInode = statSync18(absolutePath).ino;
     } catch {
       liveInode = undefined;
     }
@@ -41493,7 +42031,7 @@ function scanPendingWrites(args) {
       continue;
     let content;
     try {
-      content = readFileSync27(absolutePath, "utf8");
+      content = readFileSync28(absolutePath, "utf8");
     } catch {
       continue;
     }
@@ -41635,6 +42173,40 @@ function row(label, value) {
 function cont(value) {
   return `${" ".repeat(LABEL_WIDTH)}  ${value}`;
 }
+function teamRejectedHeadline(count, state) {
+  const noun = count === 1 ? "file is" : "files are";
+  const at = teamRejectedFetchedAt(state);
+  const when = at ? readStamp(at) : undefined;
+  const freshness = when ? `read from Plinth at the last sync, ${when}` : `read from Plinth at an unrecorded time`;
+  return `${count} more ${noun} also rejected on other machines (${freshness} — start the daemon for a fresher list):`;
+}
+function teamRejectedDetail(r) {
+  const why = r.detail ? firstSentence(r.detail) : r.reason;
+  const who = r.reported_by_name ?? "another machine";
+  const since = r.first_seen_at ? shortDate(r.first_seen_at) : undefined;
+  return since ? `${why} — ${who}, first seen ${since}` : `${why} — ${who}`;
+}
+function firstSentence(text) {
+  const end = text.indexOf(". ");
+  return end === -1 ? text : text.slice(0, end + 1);
+}
+function readStamp(iso, today = new Date) {
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime()))
+    return;
+  const hhmm = `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
+  const day = shortDate(iso);
+  return day === localDate(today) ? hhmm : `${day} ${hhmm}`;
+}
+function shortDate(iso) {
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime()))
+    return;
+  return localDate(d);
+}
+function localDate(d) {
+  return `${d.getFullYear()}-` + `${String(d.getMonth() + 1).padStart(2, "0")}-` + `${String(d.getDate()).padStart(2, "0")}`;
+}
 function uncheckedLines(items) {
   const n = items.length;
   const head = `${n} generated command file${n === 1 ? "" : "s"} could not be checked, ` + `so ${n === 1 ? "its block was" : "their blocks were"} not compared.`;
@@ -41692,7 +42264,7 @@ function renderBuild(out, staleness) {
 }
 function lastActivity(now) {
   try {
-    const mtimeMs = statSync18(daemonLogPath()).mtimeMs;
+    const mtimeMs = statSync19(daemonLogPath()).mtimeMs;
     return formatRelative(now.getTime() - mtimeMs);
   } catch {
     return null;
@@ -41802,13 +42374,13 @@ async function runStatus(args, deps = {}) {
     const heldArtists = pending.writes.filter((w) => w.held === "artist");
     const heldCloudRows = pending.writes.filter((w) => w.held === "cloud-row");
     const heldRenames = pending.writes.filter((w) => w.held === "rename-taken");
-    const MAX_SHOWN = 10;
+    const MAX_SHOWN2 = 10;
     const listPaths = (writes) => {
-      for (const w of writes.slice(0, MAX_SHOWN)) {
+      for (const w of writes.slice(0, MAX_SHOWN2)) {
         out.info(cont(`${w.path} (${w.kind})`));
       }
-      if (writes.length > MAX_SHOWN) {
-        out.info(cont(`…and ${writes.length - MAX_SHOWN} more.`));
+      if (writes.length > MAX_SHOWN2) {
+        out.info(cont(`…and ${writes.length - MAX_SHOWN2} more.`));
       }
     };
     let labelled = false;
@@ -41849,11 +42421,16 @@ async function runStatus(args, deps = {}) {
   }
   out.info("");
   const rejected = listRejected(localState);
-  if (rejected.length === 0) {
+  const localRejectedPaths = new Set(rejected.filter((r) => r.target === "file").map((r) => r.path));
+  const teamRejected = listTeamRejected(localState).filter((r) => !localRejectedPaths.has(r.path));
+  const MAX_SHOWN = 10;
+  if (rejected.length === 0 && teamRejected.length === 0) {
     out.info(row("Rejected", "No writes rejected."));
+  } else if (rejected.length === 0) {
+    out.info(row("Rejected", "No writes rejected on this machine."));
   } else {
-    out.info(row("Rejected", `${rejected.length} write${rejected.length === 1 ? "" : "s"} rejected and not retried. Each line says what to do.`));
-    const MAX_SHOWN = 10;
+    const scope = teamRejected.length > 0 ? " on this machine" : "";
+    out.info(row("Rejected", `${rejected.length} write${rejected.length === 1 ? "" : "s"} rejected${scope} and not retried. Each line says what to do.`));
     for (const r of rejected.slice(0, MAX_SHOWN)) {
       const why = r.detail ?? r.message ?? r.reason;
       out.info(cont(`${r.path} — ${why}`));
@@ -41862,16 +42439,34 @@ async function runStatus(args, deps = {}) {
       out.info(cont(`…and ${rejected.length - MAX_SHOWN} more (see ~/.plinth/daemon.log).`));
     }
   }
+  if (teamRejected.length > 0) {
+    out.info(cont(""));
+    out.info(cont(teamRejectedHeadline(teamRejected.length, localState)));
+    for (const r of teamRejected.slice(0, MAX_SHOWN)) {
+      out.info(cont(`${r.path} — ${teamRejectedDetail(r)}`));
+    }
+    if (teamRejected.length > MAX_SHOWN) {
+      out.info(cont(`…and ${teamRejected.length - MAX_SHOWN} more.`));
+    }
+  }
   out.info("");
   const stashes = listConflictStashes(slug);
   if (stashes.length === 0) {
     out.info(row("Conflicts", "No conflict stashes."));
   } else {
-    out.info(row("Conflicts", `${stashes.length} stashed local cop${stashes.length === 1 ? "y" : "ies"} in ${conflictsRoot(slug)}`));
+    const cloudSide = stashes.filter((s) => s.side === "cloud");
+    const localSide = stashes.filter((s) => s.side !== "cloud");
+    out.info(row("Conflicts", `${stashes.length} stashed cop${stashes.length === 1 ? "y" : "ies"} in ${conflictsRoot(slug)}`));
     const newest = stashes[0];
     const when = newest.stashedAt ? `${formatAbsolute(newest.stashedAt)} (${formatRelative(now.getTime() - newest.stashedAt.getTime())})` : "time unknown";
     out.info(cont(`Newest: ${newest.label} — ${when}`));
-    out.info(cont("Each is your version of a file that was replaced by the cloud copy. Compare it with the file in your mirror, re-apply anything you still want, then delete the stash."));
+    const lead = (n) => n === stashes.length ? "Each is" : n === 1 ? "1 is" : `${n} are`;
+    if (localSide.length > 0) {
+      out.info(cont(`${lead(localSide.length)} your version of a file that was replaced by the cloud copy. Compare it with the file in your mirror, re-apply anything you still want, then delete the stash.`));
+    }
+    if (cloudSide.length > 0) {
+      out.info(cont(`${lead(cloudSide.length)} the cloud's copy from a merge that went field by field: your writing won and is in your file, the cloud's other fields won, and the stash is what your writing replaced. Read it, fold in anything you still want, then delete the stash.`));
+    }
     out.info(cont(`Full list with restore commands: ${CONFLICTS_VIEW_REL_PATH} (written by the sync, so this line is the fresher of the two)`));
   }
   out.info("");
@@ -42076,7 +42671,7 @@ async function runStatus(args, deps = {}) {
 var statusCommand = defineCommand({
   meta: {
     name: "status",
-    description: "Print local sync state: daemon liveness, last sync + per-type counts, held destructive batches, and the voice profile's status"
+    description: "Print local sync state: daemon liveness, last sync + per-type counts, held destructive batches, the voice profile's status, and files rejected anywhere in the workspace (rejections are grouped by the member who reported them; two machines signed in as the same person cannot be told apart)"
   },
   args: {
     workspace: {
@@ -42110,7 +42705,7 @@ var versionCommand = defineCommand({
 });
 
 // src/commands/voice-gate.ts
-import { readFileSync as readFileSync30 } from "node:fs";
+import { readFileSync as readFileSync31 } from "node:fs";
 
 // src/lib/voice-gate/api.ts
 var VoiceGateSurfaces = [
@@ -42215,7 +42810,7 @@ async function callVoiceGate(req) {
 import { createHash as createHash4 } from "node:crypto";
 import {
   mkdirSync as mkdirSync12,
-  readFileSync as readFileSync28,
+  readFileSync as readFileSync29,
   renameSync as renameSync8,
   unlinkSync as unlinkSync9,
   writeFileSync as writeFileSync9
@@ -42246,7 +42841,7 @@ function emptyFile() {
 }
 function load2(workspaceSlug) {
   try {
-    const raw = readFileSync28(attemptsPath(workspaceSlug), "utf8");
+    const raw = readFileSync29(attemptsPath(workspaceSlug), "utf8");
     const parsed = AttemptsFileSchema.safeParse(JSON.parse(raw));
     return parsed.success ? parsed.data : emptyFile();
   } catch {
@@ -42409,7 +43004,7 @@ function denyUngated(detail) {
 }
 
 // src/lib/voice-gate/payload.ts
-import { readFileSync as readFileSync29, statSync as statSync19 } from "node:fs";
+import { readFileSync as readFileSync30, statSync as statSync20 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { isAbsolute as isAbsolute3, resolve as resolve4 } from "node:path";
 var MAX_BODY_BYTES = 256 * 1024;
@@ -42566,11 +43161,11 @@ function isHelperInvocation(tokens) {
   return helperIndex === start + 1 && /(^|\/)python[0-9.]*$/.test(prev);
 }
 function defaultReadBodyFile(path5) {
-  const stat4 = statSync19(path5);
+  const stat4 = statSync20(path5);
   if (stat4.size > MAX_BODY_BYTES) {
     throw new Error(`draft body is ${stat4.size} bytes, over the ${MAX_BODY_BYTES}-byte gate limit`);
   }
-  return readFileSync29(path5, "utf8");
+  return readFileSync30(path5, "utf8");
 }
 function parseRecipients(...raw) {
   const all = raw.filter((v) => typeof v === "string").flatMap((v) => v.split(",")).map((v) => v.trim().toLowerCase()).filter((v) => v.length > 0);
@@ -42930,7 +43525,7 @@ async function runVoiceGateDirect(args, deps = {}) {
   let text;
   if (args.file) {
     try {
-      text = readFileSync30(args.file, "utf8");
+      text = readFileSync31(args.file, "utf8");
     } catch (err) {
       const msg = err instanceof Error ? err.message : "unknown error";
       out.error(`Could not read ${args.file}: ${msg}`);