@marver-design/marver 0.30.1 → 0.31.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (107) hide show
  1. package/CHANGELOG.md +58 -0
  2. package/README.md +11 -7
  3. package/dist/{anchor-check-Bv4o-R2T.mjs → anchor-check-B92s9tVv.mjs} +1 -1
  4. package/dist/{board-tree-BXR8dw4b.mjs → board-tree-DGj0HhEE.mjs} +6 -2
  5. package/dist/{boards-EH2onUXM.mjs → boards-Cim1GTKc.mjs} +32 -2
  6. package/dist/{boards-BeWtjGUM.mjs → boards-OlAhZ87x.mjs} +7 -7
  7. package/dist/{build-zWGXSzly.mjs → build-BNssmbqd.mjs} +14 -17
  8. package/dist/{capture-DEtM4qm5.mjs → capture-HaS-1or8.mjs} +1 -1
  9. package/dist/cli.mjs +38 -20
  10. package/dist/{collab-BEAcXrBb.mjs → collab-D2NcrOB8.mjs} +53 -14
  11. package/dist/comment-actions-Bxf9Ld4g.mjs +351 -0
  12. package/dist/{comments-XNhMmSSu.mjs → comments-BakJQwaf.mjs} +85 -10
  13. package/dist/config-B0YcFtqS.mjs +510 -0
  14. package/dist/{context-BUnFiyA3.mjs → context-Cj2TcC0H.mjs} +3 -3
  15. package/dist/{daemon-CChgWJNq.mjs → daemon-MxoEQajX.mjs} +222 -23
  16. package/dist/deep-link-DYtuT740.mjs +163 -0
  17. package/dist/{dev-DOgIITpT.mjs → dev-BBZe_brH.mjs} +23 -16
  18. package/dist/devices-uJZ2inMq.mjs +155 -0
  19. package/dist/{events-CLH4ijKP.mjs → events-Dieo1482.mjs} +49 -4
  20. package/dist/{init-CYlFaRzG.mjs → init-BgusplYn.mjs} +40 -10
  21. package/dist/{jam-Cj5gBvwD.mjs → jam-CkuLL8A8.mjs} +1 -1
  22. package/dist/{link-BFFRgrMt.mjs → link-Cmt9Xy4X.mjs} +54 -7
  23. package/dist/{logo-CXY-1yrn.mjs → logo-C9s7-Cy9.mjs} +89 -66
  24. package/dist/{ls-NqmePKOf.mjs → ls-DGVIW-Io.mjs} +1 -1
  25. package/dist/{manifest-DPZ3WNg_.mjs → manifest-CK8Qh4Nq.mjs} +255 -13
  26. package/dist/{marks-BnNANic9.mjs → marks-C8oX8kbE.mjs} +3 -3
  27. package/dist/{marks-DBp3h1Mc.mjs → marks-Dt-5JXCp.mjs} +18 -5
  28. package/dist/{marver-id-gate-vBLb_Icb.mjs → marver-id-gate-BAeuMeaU.mjs} +11 -7
  29. package/dist/md-B9_13Q0R.mjs +105 -0
  30. package/dist/notes-CRAX4wgk.mjs +148 -0
  31. package/dist/own-C8Mq0Hnf.mjs +128 -0
  32. package/dist/pdf-0m721FFn.mjs +117 -0
  33. package/dist/pdf-CZENT6t3.mjs +2299 -0
  34. package/dist/{perf-BCxAo0IS.mjs → perf-BB0XNt1M.mjs} +1 -1
  35. package/dist/{perf-6MOTHxay.mjs → perf-CIMijND6.mjs} +5 -5
  36. package/dist/{plugin-CFWBcAba.mjs → plugin-CL8_wL7a.mjs} +460 -83
  37. package/dist/{poster-DPPpQiva.mjs → poster-B7uSjlEP.mjs} +1 -1
  38. package/dist/{profile-B1FKOM1e.mjs → profile-cdmSer1k.mjs} +1 -1
  39. package/dist/{publish-bakes-_Zx8crP3.mjs → publish-bakes-BjgDNeyS.mjs} +3 -3
  40. package/dist/{queue-DeSQm24g.mjs → queue-BLLfdlDw.mjs} +156 -11
  41. package/dist/{recover-mDUVsnPd.mjs → recover-ByuFQOF9.mjs} +2 -2
  42. package/dist/{serve-DQv3Ti6X.mjs → serve-kcF6-H8V.mjs} +4 -4
  43. package/dist/{session-VDJfXEEm.mjs → session-DBF-nQvq.mjs} +29 -3
  44. package/dist/{share-Bu_kuOKL.mjs → share-CS2mg27O.mjs} +1 -1
  45. package/dist/{shot-d4h_hJi9.mjs → shot-BqwkdtKn.mjs} +4 -4
  46. package/dist/{shot-DBWN8hPP.mjs → shot-D2TQGo2V.mjs} +1 -1
  47. package/dist/show-B1u3DiJw.mjs +101 -0
  48. package/dist/{sizes-wjXDev3b.mjs → sizes-BckcL4Zz.mjs} +1 -1
  49. package/dist/{slots-Dn4Onb0V.mjs → slots-BOcfIqxy.mjs} +15 -3
  50. package/dist/{summary-Y8MY1Wuc.mjs → summary-cPmRDGpX.mjs} +1 -1
  51. package/dist/{sync-CMozOwZ0.mjs → sync-BNWwh8OF.mjs} +205 -7
  52. package/dist/{work-BYWD_1Zf.mjs → work-DRdzXPvg.mjs} +3 -3
  53. package/dist/{work-DJxH7cCX.mjs → work-Nv-n2_Un.mjs} +1 -1
  54. package/docs/app.md +49 -0
  55. package/docs/boards-and-folders.md +37 -6
  56. package/docs/jam-session.md +5 -0
  57. package/docs/live-jam.md +9 -0
  58. package/docs/pdf.md +108 -0
  59. package/docs/publish.md +9 -9
  60. package/docs/sharing.md +11 -0
  61. package/docs/slides.md +9 -0
  62. package/package.json +3 -1
  63. package/src/client/content/index.tsx +4 -2
  64. package/src/client/frame-host/main.tsx +3 -0
  65. package/src/client/shell/App.tsx +71 -24
  66. package/src/client/shell/BoardList.tsx +16 -7
  67. package/src/client/shell/Comments.tsx +77 -16
  68. package/src/client/shell/Play.tsx +24 -22
  69. package/src/client/shell/Toolbar.tsx +4 -3
  70. package/src/client/shell/app-bridge.ts +32 -5
  71. package/src/client/shell/canvas/Canvas.tsx +30 -8
  72. package/src/client/shell/canvas/FrameNode.tsx +3 -1
  73. package/src/client/shell/canvas/ctl.ts +16 -0
  74. package/src/client/shell/commands.ts +20 -0
  75. package/src/client/shell/comments-store.ts +81 -2
  76. package/src/client/shell/devices.tsx +42 -0
  77. package/src/client/shell/goto.ts +56 -9
  78. package/src/client/shell/icons.tsx +11 -4
  79. package/src/client/shell/jam-lines.ts +5 -3
  80. package/src/client/shell/jam-panel.tsx +17 -5
  81. package/src/client/shell/marks-ui.tsx +54 -0
  82. package/src/client/shell/notes.ts +21 -0
  83. package/src/client/shell/pdf-export.tsx +154 -0
  84. package/src/client/shell/pdf-notes.ts +20 -0
  85. package/src/client/shell/show.ts +250 -0
  86. package/src/client/shell/store.ts +23 -38
  87. package/src/client/shell/styles.css +43 -0
  88. package/src/shared/app-api.ts +49 -4
  89. package/src/shared/auto-place.ts +32 -0
  90. package/src/shared/board-tree.ts +3 -0
  91. package/src/shared/board-types.ts +6 -2
  92. package/src/shared/deep-link.ts +212 -0
  93. package/src/shared/devices.ts +89 -0
  94. package/src/shared/events.ts +48 -5
  95. package/src/shared/export-plan.ts +98 -0
  96. package/templates/AGENTS-embedded.md +76 -12
  97. package/templates/AGENTS-studio.md +76 -12
  98. package/templates/instructions/boards.md +6 -5
  99. package/templates/instructions/configure.md +32 -2
  100. package/templates/instructions/iterate.md +8 -0
  101. package/templates/instructions/jam.md +9 -0
  102. package/templates/instructions/publish.md +14 -4
  103. package/templates/instructions/review.md +4 -0
  104. package/templates/instructions/slides.md +67 -1
  105. package/templates/instructions/welcome.md +9 -5
  106. package/templates/playbooks/publish-canvas/PLAYBOOK.md +1 -1
  107. package/dist/config-BezZTiov.mjs +0 -182
@@ -1,4 +1,4 @@
1
- import { i as capture, p as findChrome } from "./shot-d4h_hJi9.mjs";
1
+ import { i as capture, m as findChrome } from "./shot-BqwkdtKn.mjs";
2
2
  import { constants, copyFileSync, existsSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
3
3
  import { basename, dirname, join, sep } from "node:path";
4
4
  import { pathToFileURL } from "node:url";
@@ -1,4 +1,4 @@
1
- import { i as loadCollab } from "./sync-CMozOwZ0.mjs";
1
+ import { i as loadCollab } from "./sync-BNWwh8OF.mjs";
2
2
  import { readFileSync } from "node:fs";
3
3
  import { join } from "node:path";
4
4
  //#region src/server/profile.ts
@@ -1,7 +1,7 @@
1
1
  import { o as slideSize } from "./cli.mjs";
2
- import { c as ASK_MAX, l as bakeBatch } from "./plugin-CFWBcAba.mjs";
3
- import { p as findChrome, s as planShot } from "./shot-d4h_hJi9.mjs";
4
- import { MIME } from "./serve-DQv3Ti6X.mjs";
2
+ import { l as ASK_MAX, u as bakeBatch } from "./plugin-CL8_wL7a.mjs";
3
+ import { m as findChrome, s as planShot } from "./shot-BqwkdtKn.mjs";
4
+ import { MIME } from "./serve-kcF6-H8V.mjs";
5
5
  import { copyFileSync, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
6
6
  import { extname, isAbsolute, join, relative, resolve } from "node:path";
7
7
  import { createServer } from "node:http";
@@ -1,10 +1,10 @@
1
1
  import { n as createExclusive, r as pidRuns } from "./exclusive-B1RtpeeP.mjs";
2
- import { r as replay } from "./events-CLH4ijKP.mjs";
2
+ import { a as replay, n as deletedMessages } from "./events-Dieo1482.mjs";
3
3
  import { a as readLog, i as listBoards } from "./comments-0BSbb04K.mjs";
4
- import { n as localProfile } from "./profile-B1FKOM1e.mjs";
4
+ import { n as localProfile } from "./profile-cdmSer1k.mjs";
5
5
  import { a as deviceId, r as owned } from "./ledger-D54iROST.mjs";
6
- import { E as threadId, b as packetPath, g as wordsSince, l as hashOf, m as requestWords, n as captureFrames, p as readCapture, s as factsOf, u as madeOf, v as buildPacket, w as sanitize } from "./capture-DEtM4qm5.mjs";
7
- import { i as readWrapup, o as recordPathProblem } from "./session-VDJfXEEm.mjs";
6
+ import { E as threadId, b as packetPath, g as wordsSince, l as hashOf, m as requestWords, n as captureFrames, p as readCapture, s as factsOf, u as madeOf, v as buildPacket, w as sanitize } from "./capture-HaS-1or8.mjs";
7
+ import { i as readWrapup, o as recordPathProblem } from "./session-DBF-nQvq.mjs";
8
8
  import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
9
9
  import { join } from "node:path";
10
10
  import { randomBytes, randomUUID } from "node:crypto";
@@ -233,6 +233,11 @@ function ingest(j, ctx, now = Date.now()) {
233
233
  changed = resolved(j, board, ev.commentId ?? "", now) || changed;
234
234
  continue;
235
235
  }
236
+ if (ev.type === "delete") {
237
+ seen.add(k);
238
+ changed = deleted(j, board, events, ev.commentId ?? "", now) || changed;
239
+ continue;
240
+ }
236
241
  if (ev.type !== "create" && ev.type !== "reply" && ev.type !== "edit") {
237
242
  seen.add(k);
238
243
  continue;
@@ -255,6 +260,20 @@ function ingest(j, ctx, now = Date.now()) {
255
260
  if (seen.size !== before) j.seen = [...seen];
256
261
  return changed;
257
262
  }
263
+ /** The threads Jam is at work on, as `board\tthread` (spec 31 B.2): a card queued or working there, or an owner's
264
+ * tag already in its log and not ingested yet - work about to be queued. Synchronous and read-only: resolve-all
265
+ * reads it and appends its resolves in the same step, so no ingest can slip a card in between. */
266
+ function liveThreads(j, ctx) {
267
+ const out = /* @__PURE__ */ new Set();
268
+ for (const c of j.cards) if ((c.state === "queued" || c.state === "working") && c.thread) out.add(`${c.board}\t${c.thread}`);
269
+ const seen = new Set(j.seen);
270
+ for (const board of listBoards(ctx.dir)) for (const ev of readLog(ctx.dir, board)) {
271
+ if (ev.agent || ev.type !== "create" && ev.type !== "reply" || seen.has(seenKey(board, ev.id)) || !isOwned(ctx, board, ev.id)) continue;
272
+ if (ev.capture || ev.id.startsWith("mw-") || ev.id.startsWith("cap-") || !MENTION.test(ev.body ?? "")) continue;
273
+ out.add(`${board}\t${threadId(ev)}`);
274
+ }
275
+ return out;
276
+ }
258
277
  /** An owner comment or reply that tags @marver. */
259
278
  function tagged(j, board, ev, frame, now) {
260
279
  const thread = threadId(ev);
@@ -322,6 +341,30 @@ function edited(j, board, events, ev, now) {
322
341
  }
323
342
  return changed;
324
343
  }
344
+ /** A message deleted (spec 31 C.5): a queued card lets go of it, and one with no request left is dropped. A working
345
+ * card is the run's to settle - before its hand-off the daemon takes the message out (daemon.ts), after it the
346
+ * agent has read it. */
347
+ function deleted(j, board, events, message, now) {
348
+ const ids = new Set(events.filter((e) => (e.type === "create" || e.type === "reply") && e.commentId === message).map((e) => e.id));
349
+ let changed = false;
350
+ for (const e of events) {
351
+ if (e.type !== "create" || e.commentId !== message || !e.capture) continue;
352
+ const cap = j.cards.find((c) => c.id === e.capture && c.kind === "capture" && c.board === board && c.thread === message);
353
+ if (cap && (cap.state === "draft" || cap.state === "confirming" || cap.state === "queued") && !cap.events.some((id) => !ids.has(id))) {
354
+ set(cap, "dropped", now, "deleted");
355
+ changed = true;
356
+ }
357
+ }
358
+ for (const c of j.cards) {
359
+ if (c.board !== board || c.state !== "queued" || !c.events.some((id) => ids.has(id))) continue;
360
+ c.events = c.events.filter((id) => !ids.has(id));
361
+ c.rev += 1;
362
+ c.at = now;
363
+ if (c.kind === "comment" && !c.events.length) set(c, "dropped", now, "deleted");
364
+ changed = true;
365
+ }
366
+ return changed;
367
+ }
325
368
  /** A thread resolved by hand: a queued card is dropped, a working one runs to its end (and goes to
326
369
  * done, not review), and one that asks, waits for review or failed is done. */
327
370
  function resolved(j, board, thread, now) {
@@ -523,6 +566,85 @@ function act(j, id, rev, action, now = Date.now(), body) {
523
566
  /** The text of one message as the owner wrote it: for an owner event, its body or its latest
524
567
  * LEDGERED edit (an edit that arrived by sync is never the owner's text); for anyone else, the
525
568
  * latest edit as replay shows it. */
569
+ /** The create and reply EVENTS (their ids - what a card and a brief name) whose message a tombstone names (spec 31
570
+ * C.5). Every place a request becomes agent input filters by it, per message. */
571
+ function deletedEvents(events) {
572
+ const gone = deletedMessages(events);
573
+ return gone.size ? new Set(events.filter((e) => (e.type === "create" || e.type === "reply") && !!e.commentId && gone.has(e.commentId)).map((e) => e.id)) : gone;
574
+ }
575
+ /** The captures whose own comment was deleted (spec 31 C.5): what they said - the record, your edit, its notes - is
576
+ * withdrawn with it, wherever a brief copied it. */
577
+ /** The captures withdrawn (spec 31 C.5): a capture card whose OWN comment - its thread's first message, on its own
578
+ * board - was deleted. By the card, never by a `capture` field anyone could write into a comment (Codex r6). */
579
+ function withdrawnCaptures(j, dir) {
580
+ const out = /* @__PURE__ */ new Set();
581
+ const logs = /* @__PURE__ */ new Map();
582
+ for (const c of j.cards) {
583
+ if (c.kind !== "capture" || !c.thread) continue;
584
+ let g = logs.get(c.board);
585
+ if (!g) logs.set(c.board, g = deletedMessages(readLog(dir, c.board)));
586
+ if (g.has(c.thread)) out.add(c.id);
587
+ }
588
+ return out;
589
+ }
590
+ /** Is this capture withdrawn - read from the files, whatever runs (Codex r9: `jam: false` serves its record too)? Its
591
+ * card in the journal on disk says which comment is its own; with no card, its own comment is the first one in its
592
+ * board's log that names it (this machine wrote it there before anything could be synced in). */
593
+ function captureWithdrawn(root, id, board) {
594
+ const dir = join(root, "design", "comments");
595
+ const card = readRaw(root).v2?.cards.find((c) => c.id === id && c.kind === "capture");
596
+ if (card?.thread) return deletedMessages(readLog(dir, card.board)).has(card.thread);
597
+ if (!board) return false;
598
+ const log = readLog(dir, board);
599
+ const own = log.find((e) => e.type === "create" && e.capture === id && !!e.commentId);
600
+ return !!own && deletedMessages(log).has(own.commentId);
601
+ }
602
+ /** A frozen brief with every deleted message taken out (spec 31 C.5) - its asks, its history, the asks it follows
603
+ * (all on `board`), the run a capture reviewed (on ITS board) - and every withdrawn capture left out, nested ones too.
604
+ * The same object when nothing was deleted. */
605
+ function dropDeleted(brief, board, t) {
606
+ if (!brief) return brief;
607
+ const here = t.gone(board);
608
+ const keep = (l, g = here) => l.filter((m) => !g.has(m.id));
609
+ const cap = brief.capture && !t.captures.has(brief.capture.record.id) ? brief.capture : void 0;
610
+ const rb = cap?.reviewed ? cap.reviewed.board ?? t.reviewedBoard?.(cap.record.id) : void 0;
611
+ const reviewed = cap?.reviewed ? {
612
+ ...cap.reviewed,
613
+ asks: rb ? keep(cap.reviewed.asks, t.gone(rb)) : []
614
+ } : void 0;
615
+ if (reviewed?.capture && t.captures.has(reviewed.capture.record.id)) delete reviewed.capture;
616
+ const { capture: _c, ...rest } = brief;
617
+ const out = {
618
+ ...rest,
619
+ asks: keep(brief.asks),
620
+ history: keep(brief.history),
621
+ ...brief.follows ? { follows: {
622
+ ...brief.follows,
623
+ asks: keep(brief.follows.asks)
624
+ } } : {},
625
+ ...cap ? { capture: reviewed ? {
626
+ ...cap,
627
+ reviewed
628
+ } : cap } : {}
629
+ };
630
+ return JSON.stringify(out) === JSON.stringify(brief) ? brief : out;
631
+ }
632
+ /** The tombstones of the logs under `dir`, read once per board as asked, and the journal's withdrawn captures. */
633
+ function tombstonesOf(j, dir) {
634
+ const seen = /* @__PURE__ */ new Map();
635
+ return {
636
+ gone: (b) => {
637
+ let g = seen.get(b);
638
+ if (!g) seen.set(b, g = deletedEvents(readLog(dir, b)));
639
+ return g;
640
+ },
641
+ captures: withdrawnCaptures(j, dir),
642
+ reviewedBoard: (capture) => {
643
+ const c = j.cards.find((x) => x.id === capture);
644
+ return (c?.reviewing ? j.cards.find((x) => x.id === c.reviewing.card) : void 0)?.board;
645
+ }
646
+ };
647
+ }
526
648
  function textOf(ctx, board, events, ev, owner) {
527
649
  let body = ev.body ?? "";
528
650
  let rev = ev.id;
@@ -559,7 +681,9 @@ const resultText = (j, batchId, card, fallback = "") => {
559
681
  /** Freeze a card's brief as text, from the logs as they stand at claim. Covers every owner event it
560
682
  * copies (the `covered` record that takes a plain reply off `marver marks`). */
561
683
  function freezeBrief(j, ctx, c, events, others = true) {
562
- const inThread = c.thread ? events.filter((e) => e.type === "create" && e.commentId === c.thread || e.type === "reply" && e.parentId === c.thread) : [];
684
+ const ts = tombstonesOf(j, ctx.dir);
685
+ const gone = deletedEvents(events);
686
+ const inThread = c.thread ? events.filter((e) => !gone.has(e.id) && (e.type === "create" && e.commentId === c.thread || e.type === "reply" && e.parentId === c.thread)) : [];
563
687
  const me = others ? void 0 : localProfile(ctx.root);
564
688
  const mine = (a) => !!me && (me.email ? a?.email === me.email : !a?.email && a?.name === me.name);
565
689
  const msgs = others ? inThread : inThread.filter((e) => c.events.includes(e.id) || !e.agent && isOwned(ctx, c.board, e.id) || !!e.agent && mine(e.author));
@@ -585,10 +709,10 @@ function freezeBrief(j, ctx, c, events, others = true) {
585
709
  };
586
710
  };
587
711
  const brief = {
588
- asks: c.events.map((id) => msgs.find((e) => e.id === id) ?? events.find((e) => e.id === id)).filter((e) => !!e).map(toMsg),
712
+ asks: c.events.filter((id) => !gone.has(id)).map((id) => msgs.find((e) => e.id === id) ?? events.find((e) => e.id === id)).filter((e) => !!e).map(toMsg),
589
713
  history: msgs.filter((e) => !asks.has(e.id)).map(toMsg)
590
714
  };
591
- if (c.capture) {
715
+ if (c.capture && !ts.captures.has(c.capture)) {
592
716
  const capCard = j.cards.find((x) => x.id === c.capture);
593
717
  const cap = readCapture(ctx.root, c.capture);
594
718
  if (cap && capCard?.payload) {
@@ -601,7 +725,16 @@ function freezeBrief(j, ctx, c, events, others = true) {
601
725
  ...capCard.payload.editedAt ? { editedAt: capCard.payload.editedAt } : {}
602
726
  } : {},
603
727
  ...capCard.payload.added?.length ? { added: capCard.payload.added } : {},
604
- ...capCard.payload.reviewed ? { reviewed: capCard.payload.reviewed } : {},
728
+ ...capCard.payload.reviewed ? { reviewed: (() => {
729
+ const rv = capCard.payload.reviewed;
730
+ const rb = rv.board ?? ts.reviewedBoard?.(capCard.id);
731
+ const r = {
732
+ ...rv,
733
+ asks: rb ? rv.asks.filter((a) => !ts.gone(rb).has(a.id)) : []
734
+ };
735
+ if (r.capture && ts.captures.has(r.capture.record.id)) delete r.capture;
736
+ return r;
737
+ })() } : {},
605
738
  ...note ? { note } : {}
606
739
  };
607
740
  }
@@ -615,7 +748,7 @@ function freezeBrief(j, ctx, c, events, others = true) {
615
748
  }
616
749
  const followed = c.follows ? j.cards.find((x) => x.id === c.follows) : void 0;
617
750
  const lastRun = (x) => x.batch ?? x.ran?.[x.ran.length - 1];
618
- const keep = (asks) => (asks ?? []).filter((a) => stillOwned(ctx, c.board, events, a));
751
+ const keep = (asks) => (asks ?? []).filter((a) => !gone.has(a.id) && stillOwned(ctx, c.board, events, a));
619
752
  if (followed && !c.ran?.length) {
620
753
  const b = lastRun(followed);
621
754
  brief.follows = {
@@ -677,6 +810,16 @@ function validate(ctx, c, events, now, j) {
677
810
  failCard(j, c, "the capture changed after it was confirmed - capture it again", now);
678
811
  return false;
679
812
  }
813
+ const gone = deletedEvents(events);
814
+ if (c.events.some((id) => gone.has(id))) {
815
+ c.events = c.events.filter((id) => !gone.has(id));
816
+ c.rev += 1;
817
+ c.at = now;
818
+ if (c.kind === "comment" && !c.events.length) {
819
+ set(c, "dropped", now, "deleted");
820
+ return false;
821
+ }
822
+ }
680
823
  if (c.kind === "capture") {
681
824
  const ok = c.events.every((id) => isOwned(ctx, c.board, id) && events.some((e) => e.id === id));
682
825
  if (!ok) failCard(j, c, "an ask on this capture is no longer the owner's", now);
@@ -1169,9 +1312,10 @@ function answers(root) {
1169
1312
  };
1170
1313
  for (const board of listBoards(ctx.dir)) {
1171
1314
  const events = readLog(ctx.dir, board);
1315
+ const gone = deletedEvents(events);
1172
1316
  for (const t of replay(events)) {
1173
1317
  if (t.resolved || !(t.agent || t.replies.some((r) => r.agent))) continue;
1174
- const msgs = events.filter((e) => e.type === "create" && e.commentId === t.id || e.type === "reply" && e.parentId === t.id);
1318
+ const msgs = events.filter((e) => !gone.has(e.id) && (e.type === "create" && e.commentId === t.id || e.type === "reply" && e.parentId === t.id));
1175
1319
  for (const ev of msgs) {
1176
1320
  if (ev.type !== "reply" || ev.agent || !isOwned(ctx, board, ev.id)) continue;
1177
1321
  const { body, rev } = textOf(ctx, board, events, ev, true);
@@ -1279,6 +1423,7 @@ function beginStep(j, c, op, event, now = Date.now(), end) {
1279
1423
  ...c.payload,
1280
1424
  reviewed: {
1281
1425
  asks: m.brief?.asks ?? [],
1426
+ board: m.board,
1282
1427
  result: resultText(j, r.batchId, m.card, r.note ?? ""),
1283
1428
  ...m.brief?.capture ? { capture: {
1284
1429
  record: m.brief.capture.record,
@@ -1470,4 +1615,4 @@ function createQueue(root, onUpgrade, alive = () => true) {
1470
1615
  };
1471
1616
  }
1472
1617
  //#endregion
1473
- export { ACTIONS, act, addCapture, addWrapup, answeredSince, answers, beginStep, captureComment, captureIntact, conflictStep, createQueue, ctxFor, endSession, endStep, fail, failCard, form, joinAlone, looksGood, moreWrapup, releaseLock as n, ownerOnly, payloadKey, pending, prune, redelivering, requeue, runsAlone, sameComment, settle, startSession, stillOwned, acquireLock as t, textOf, undelivered, wrapupIntact, wrapupOf };
1618
+ export { ACTIONS, act, addCapture, addWrapup, answeredSince, answers, beginStep, captureComment, captureIntact, captureWithdrawn, conflictStep, createQueue, ctxFor, deletedEvents, dropDeleted, endSession, endStep, fail, failCard, form, joinAlone, liveThreads, looksGood, moreWrapup, readRaw as n, ownerOnly, payloadKey, pending, prune, releaseLock as r, redelivering, requeue, runsAlone, sameComment, settle, startSession, stillOwned, acquireLock as t, textOf, tombstonesOf, undelivered, withdrawnCaptures, wrapupIntact, wrapupOf };
@@ -1,6 +1,6 @@
1
1
  import { r as NAME } from "./cli.mjs";
2
- import { d as recoverTarget, r as legacyEntry, u as recoverEntries, v as workspaceId } from "./slots-Dn4Onb0V.mjs";
3
- import { DevStartError, dev } from "./dev-DOgIITpT.mjs";
2
+ import { d as recoverTarget, r as legacyEntry, u as recoverEntries, v as workspaceId } from "./slots-BOcfIqxy.mjs";
3
+ import { DevStartError, dev } from "./dev-BBZe_brH.mjs";
4
4
  //#region src/cli/recover.ts
5
5
  /**
6
6
  * `marver dev --recover` (spec 28 A1.6). A Jam capture the page could not send waits in that browser's
@@ -1,5 +1,5 @@
1
1
  import { r as NAME } from "./cli.mjs";
2
- import { t as logoIconLink } from "./logo-CXY-1yrn.mjs";
2
+ import { n as logoIconLink } from "./logo-C9s7-Cy9.mjs";
3
3
  import { t as secureSuffix } from "./secure-cookie-_K1Hsx8H.mjs";
4
4
  import { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
5
5
  import { extname, isAbsolute, join, relative, resolve } from "node:path";
@@ -76,7 +76,7 @@ async function serve(root, portFlag) {
76
76
  * accounts get in. Null when there is no roster to consult. */
77
77
  let guestDoorOpen = null;
78
78
  if (process.env.MARVER_DATA_DIR) {
79
- const { collabHandler } = await import("./collab-BEAcXrBb.mjs");
79
+ const { collabHandler } = await import("./collab-D2NcrOB8.mjs");
80
80
  const { appendEvents, readLog } = await import("./comments-0BSbb04K.mjs").then((n) => n.n);
81
81
  const { dataDir } = await import("./comments-0BSbb04K.mjs").then((n) => n.n);
82
82
  const dir = dataDir();
@@ -148,11 +148,11 @@ async function serve(root, portFlag) {
148
148
  console.error(`[${NAME}] MARVER_ID_ISSUER is set but MARVER_PUBLIC_ORIGIN is not.\n Every assertion is bound to this canvas's exact origin, and it cannot be\n inferred from request headers - a proxy can make any request look local.\n Set it to the origin people actually reach this canvas on:\n MARVER_PUBLIC_ORIGIN=https://canvas.example.com\n MARVER_PUBLIC_ORIGIN=http://localhost:${portFlag ?? (Number(process.env.PORT) || 4199)} (development)`);
149
149
  process.exit(1);
150
150
  }
151
- const { marverIdHandler } = await import("./marver-id-gate-vBLb_Icb.mjs");
151
+ const { marverIdHandler } = await import("./marver-id-gate-BAeuMeaU.mjs");
152
152
  const { dataDir } = await import("./comments-0BSbb04K.mjs").then((n) => n.n);
153
153
  const canvasName = humanName(meta.name);
154
154
  const { ceilingsFromRights } = await import("./auth-Dix8wrXV.mjs").then((n) => n.R);
155
- idHandler = marverIdHandler(dataDir(), idIssuer, canvasName, meta.branding, ceilingsFromRights(meta.rights ?? {}));
155
+ idHandler = marverIdHandler(dataDir(), idIssuer, canvasName, meta.branding, ceilingsFromRights(meta.rights ?? {}), meta.logo);
156
156
  }
157
157
  if (idIssuer && process.env.MARVER_PASSWORD) console.log(` note: MARVER_ID_ISSUER and MARVER_PASSWORD are both set - the identity gate wins, the password is IGNORED`);
158
158
  const password = idIssuer ? "" : process.env.MARVER_PASSWORD ?? "";
@@ -1,5 +1,5 @@
1
1
  import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
2
- import { p as readCapture } from "./capture-DEtM4qm5.mjs";
2
+ import { p as readCapture } from "./capture-HaS-1or8.mjs";
3
3
  import { appendFileSync, closeSync, existsSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, writeSync } from "node:fs";
4
4
  import { dirname, join, relative, sep } from "node:path";
5
5
  import { createHash, randomBytes } from "node:crypto";
@@ -29,7 +29,8 @@ var session_exports = /* @__PURE__ */ __exportAll({
29
29
  recordFile: () => recordFile,
30
30
  recordPathProblem: () => recordPathProblem,
31
31
  storeWrapup: () => storeWrapup,
32
- talkMinutes: () => talkMinutes
32
+ talkMinutes: () => talkMinutes,
33
+ wrapupWithoutDeleted: () => wrapupWithoutDeleted
33
34
  });
34
35
  const SESSION_ID = /^ses-\d{10,16}-[a-z0-9]{4,12}$/;
35
36
  const WRAPUP_ID = /^wrap-\d{10,16}-[a-z0-9]{4,12}$/;
@@ -187,5 +188,30 @@ function readWrapup(root, id) {
187
188
  return null;
188
189
  }
189
190
  }
191
+ /** A sealed wrap-up's content as a run may read it (spec 31 C.5): each More work ask whose reply was deleted is left out
192
+ * (`gone`: a capture's board -> its deleted events; `words`: -> the words of its deleted More work replies, for a record
193
+ * sealed before 0.31, whose asks name no event). The sealed file is untouched - its hash still proves it. */
194
+ function wrapupWithoutDeleted(w, gone, words, caps) {
195
+ let changed = false;
196
+ const withdrawn = caps?.();
197
+ const kept = withdrawn ? w.captures.filter((c) => !withdrawn.has(c.id)) : w.captures;
198
+ if (kept.length !== w.captures.length) changed = true;
199
+ const captures = kept.map((c) => {
200
+ if (!c.more?.length) return c;
201
+ const g = gone(c.record.context.board);
202
+ const said = words?.(c.record.context.board);
203
+ const more = c.more.filter((m) => m.event ? !g.has(m.event) : !said?.has(m.ask.trim()));
204
+ if (more.length === c.more.length) return c;
205
+ changed = true;
206
+ return {
207
+ ...c,
208
+ ...more.length ? { more } : { more: void 0 }
209
+ };
210
+ });
211
+ return changed ? {
212
+ ...w,
213
+ captures
214
+ } : w;
215
+ }
190
216
  //#endregion
191
- export { recordFile as a, storeWrapup as c, readWrapup as i, buildWrapup as n, recordPathProblem as o, moreOf as r, session_exports as s, SESSION_ID as t };
217
+ export { recordFile as a, storeWrapup as c, readWrapup as i, wrapupWithoutDeleted as l, buildWrapup as n, recordPathProblem as o, moreOf as r, session_exports as s, SESSION_ID as t };
@@ -1,6 +1,6 @@
1
1
  import { r as NAME } from "./cli.mjs";
2
2
  import { M as resolveAccess } from "./auth-Dix8wrXV.mjs";
3
- import { i as loadCollab } from "./sync-CMozOwZ0.mjs";
3
+ import { i as loadCollab } from "./sync-BNWwh8OF.mjs";
4
4
  //#region src/cli/share.ts
5
5
  /**
6
6
  * `marver share <action>` - the roster from the terminal (01-sharing §9).
@@ -1,6 +1,6 @@
1
1
  import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
2
2
  import { a as ROUTE, o as slideSize } from "./cli.mjs";
3
- import { d as logJam } from "./perf-BCxAo0IS.mjs";
3
+ import { d as logJam } from "./perf-BB0XNt1M.mjs";
4
4
  import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
5
5
  import { join } from "node:path";
6
6
  import { randomBytes } from "node:crypto";
@@ -524,8 +524,8 @@ async function shootFrame(opts) {
524
524
  };
525
525
  const plan = planShot(frame, viewports, size);
526
526
  if (frame.kind !== "html") try {
527
- const { scanAssetRefs } = await import("./build-zWGXSzly.mjs");
528
- const { ensurePoster } = await import("./poster-DPPpQiva.mjs");
527
+ const { scanAssetRefs } = await import("./build-BNssmbqd.mjs");
528
+ const { ensurePoster } = await import("./poster-B7uSjlEP.mjs");
529
529
  const refs = scanAssetRefs(readFileSync(join(root, frame.file), "utf8"), frame.file);
530
530
  for (const r of refs) if (r.endsWith(".poster.png")) await ensurePoster(join(root, "design", "assets"), r.slice(0, -11));
531
531
  } catch {}
@@ -1289,4 +1289,4 @@ async function captureOnce({ url, width, height, out, fullHeight = false, timeou
1289
1289
  }
1290
1290
  }
1291
1291
  //#endregion
1292
- export { frameUrl as a, pool as c, withBrowser as d, Browser as f, capture as i, shotConcurrency as l, launchFlags as m, MOUNTED as n, manifestFrame as o, findChrome as p, SURFACE as r, planShot as s, AREA as t, shot_exports as u };
1292
+ export { frameUrl as a, pool as c, withBrowser as d, staleSurface as f, launchFlags as h, capture as i, shotConcurrency as l, findChrome as m, MOUNTED as n, manifestFrame as o, Browser as p, SURFACE as r, planShot as s, AREA as t, shot_exports as u };
@@ -1,5 +1,5 @@
1
1
  import { r as NAME } from "./cli.mjs";
2
- import { i as readDevInfo } from "./work-DJxH7cCX.mjs";
2
+ import { i as readDevInfo } from "./work-Nv-n2_Un.mjs";
3
3
  import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
4
4
  import { join } from "node:path";
5
5
  import { randomBytes } from "node:crypto";
@@ -0,0 +1,101 @@
1
+ import { l as listBoardFiles, o as checkBoardsDir } from "./boards-Cim1GTKc.mjs";
2
+ import { f as isBoardName } from "./board-tree-DGj0HhEE.mjs";
3
+ import { s as hashOfTarget } from "./deep-link-DYtuT740.mjs";
4
+ import { i as readDevInfo } from "./work-Nv-n2_Un.mjs";
5
+ import { NOT_RUNNING, findDev, linkFor, resolveLink, unreachable } from "./link-Cmt9Xy4X.mjs";
6
+ import { join } from "node:path";
7
+ //#region src/cli/show.ts
8
+ /**
9
+ * `marver show <scene/frame ... | board>` (spec 31 D3): put a place in front of the human, in every tab where the
10
+ * canvas is open - for when they ask to be shown. Otherwise an agent gives the link (`marver link`).
11
+ *
12
+ * The target resolves as `link` does, on one board: frames and scenes on the first board that shows them all (or
13
+ * `--board`), or a board name alone (the board, fitted). `--thread <id>` opens a comment thread there too. The dev
14
+ * server broadcasts the command; each open tab moves to it, refits even when it is already there, or - holding words
15
+ * not yet sent - puts up a notice and stays. The CLI waits up to 3 s for the tabs' answers and says what came of it,
16
+ * then prints the link (what `marver link` prints).
17
+ */
18
+ /** How long the CLI listens for the tabs' answers: all of it, every time. */
19
+ const SHOW_WAIT_MS = 3e3;
20
+ /** What to show (pure of the network): one board's target, or why not. */
21
+ function showPlan(root, targets, opts = {}) {
22
+ if (!targets.length) throw new Error(`name what to show: show <scene/frame | scene ... | board>${opts.board ? ` - a whole board is its name alone (show ${opts.board}); when a scene has that name too, name the scenes it shows with --board ${opts.board}` : ""}`);
23
+ if (opts.thread !== void 0 && !/^[\w-]{1,128}$/.test(opts.thread)) throw new Error(`"${opts.thread}" is not a thread id`);
24
+ const thread = opts.thread ? { c: opts.thread } : {};
25
+ if (targets.length === 1 && isBoardName(targets[0]) && !opts.board) {
26
+ let frameLike = true;
27
+ try {
28
+ resolveLink(root, targets);
29
+ } catch {
30
+ frameLike = false;
31
+ }
32
+ const dir = join(root, "design", "boards");
33
+ if (!frameLike && !checkBoardsDir(root, dir) && listBoardFiles(dir).boards.some((b) => b.name === targets[0])) return {
34
+ target: {
35
+ board: targets[0],
36
+ ...thread
37
+ },
38
+ hints: []
39
+ };
40
+ }
41
+ const r = resolveLink(root, targets, opts.board);
42
+ if (!r.links.length) throw new Error(r.hints.join("\n"));
43
+ if (r.links.length > 1) throw new Error(`these are on ${r.links.length} boards - show one board at a time (or pin them together):\n${r.links.map((l) => ` ${l.board}: ${l.hash}`).join("\n")}`);
44
+ return {
45
+ target: {
46
+ board: r.links[0].board,
47
+ ...r.frames.length ? { f: r.frames } : {},
48
+ ...r.scenes.length ? { s: r.scenes } : {},
49
+ ...thread
50
+ },
51
+ hints: r.hints
52
+ };
53
+ }
54
+ /** The words for the tabs' answers (pure). */
55
+ function showWords(a) {
56
+ if (!a || a.shown === 0 && a.notice === 0) return "not shown - no open tab took it (none is open, the person moved first, or the place is not on that board)";
57
+ const tabs = (n) => `${n} tab${n === 1 ? "" : "s"}`;
58
+ const parts = [];
59
+ if (a.shown) parts.push(`shown in ${tabs(a.shown)}`);
60
+ if (a.notice) parts.push(`${tabs(a.notice)} ${a.notice === 1 ? "holds" : "hold"} words not yet sent - ${a.notice === 1 ? "it shows" : "they show"} a notice to go there instead`);
61
+ return parts.join("; ");
62
+ }
63
+ async function showCommand(root, targets, opts) {
64
+ const { target, hints } = showPlan(root, targets, opts);
65
+ const found = await findDev(root);
66
+ if (!found) throw new Error(NOT_RUNNING);
67
+ const hash = hashOfTarget(target);
68
+ if ("unreachable" in found) {
69
+ console.log(`not shown: ${unreachable(found.unreachable.pid)}`);
70
+ console.log(linkFor(root, `http://localhost:${found.unreachable.port}/`, hash, { web: opts.web }));
71
+ return;
72
+ }
73
+ const headers = {
74
+ "content-type": "application/json",
75
+ "x-mv-work": readDevInfo(root)?.token ?? ""
76
+ };
77
+ const res = await fetch(`${found.origin}__mv/api/show`, {
78
+ method: "POST",
79
+ headers,
80
+ body: JSON.stringify(target),
81
+ signal: AbortSignal.timeout(5e3)
82
+ });
83
+ const body = await res.json().catch(() => null);
84
+ if (!res.ok || typeof body?.seq !== "number") throw new Error(`the canvas did not take it: ${body?.error ?? res.status}`);
85
+ const seq = body.seq;
86
+ const until = Date.now() + SHOW_WAIT_MS;
87
+ let last = null;
88
+ while (Date.now() < until) {
89
+ await new Promise((r) => setTimeout(r, 250));
90
+ const a = await fetch(`${found.origin}__mv/api/show/acks?seq=${seq}`, {
91
+ headers,
92
+ signal: AbortSignal.timeout(1e3)
93
+ }).then((r) => r.ok ? r.json() : null, () => null);
94
+ if (a) last = a;
95
+ }
96
+ console.log(showWords(last));
97
+ console.log(linkFor(root, found.origin, hash, { web: opts.web }));
98
+ for (const h of hints) console.error(` ${h}`);
99
+ }
100
+ //#endregion
101
+ export { showCommand };
@@ -1,5 +1,5 @@
1
1
  import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
2
- import { o as rendersDoc, r as layoutDocSource } from "./manifest-DPZ3WNg_.mjs";
2
+ import { o as rendersDoc, r as layoutDocSource } from "./manifest-CK8Qh4Nq.mjs";
3
3
  import { existsSync, readFileSync } from "node:fs";
4
4
  import { join } from "node:path";
5
5
  //#region src/server/sizes.ts
@@ -92,7 +92,15 @@ const FEATURE = {
92
92
  /** 0.29.0 (A4.6 #29, #30): the shell handles `mv:open` and answers `mv:opened` */
93
93
  open: "open",
94
94
  /** 0.29.0 (A4.6 #33-#37): the shell asks `mv:capture` for live pictures and the server takes `POST /api/jam/picture/live` */
95
- capture: "capture"
95
+ capture: "capture",
96
+ /** 0.31.0 (spec 31 D1, D3): the shell takes `mv:show` (a deep link's place, moved to or noticed over unsent words)
97
+ * and asks `mv:front` once it showed a `marver show` */
98
+ show: "show",
99
+ /** 0.31.0 (spec 31 B.1): the shell handles `mv:menu-click resolve-all-comments` - every open thread on the canvas resolved,
100
+ * but what Jam is at work on, with its Undo. The app offers the tab menu's Resolve All Comments only to a canvas that says so */
101
+ resolveAll: "resolve-all",
102
+ /** 0.31.0 (spec 31 Part A): the server makes deck PDFs (`/__mv/api/pdf`) and the shell asks `mv:export-pdf` to save one */
103
+ pdf: "pdf"
96
104
  };
97
105
  /**
98
106
  * The bounds both sides keep (A4.6 #11, #16): the server's selector and encoder write within them, and main checks
@@ -211,13 +219,17 @@ function asRecord(v) {
211
219
  * is a promise the app acts on (it opens a stream, sends `mv:open`, answers `mv:capture`), so each A4 stream adds its
212
220
  * own name here once its half works, never before: `live` (app-live.ts), `open` (the shell's open-item.ts) and
213
221
  * `capture` (the shell asks for live pictures in play and the server takes `POST /api/jam/picture/live`:
214
- * live-picture.ts, api.ts). */
222
+ * live-picture.ts, api.ts). 0.31 adds `show` (spec 31 D) and `resolve-all` (spec 31 B.1: the shell's runMenuItem, the dev server's
223
+ * comment-actions routes), and `pdf` (spec 31 A). */
215
224
  const FEATURES = [
216
225
  FEATURE.bridge,
217
226
  FEATURE.inset,
218
227
  FEATURE.live,
219
228
  FEATURE.open,
220
- FEATURE.capture
229
+ FEATURE.capture,
230
+ FEATURE.show,
231
+ FEATURE.resolveAll,
232
+ FEATURE.pdf
221
233
  ];
222
234
  /** Take one candidate: the file, then - holding it - the port check. */
223
235
  async function take(i, slot, port) {
@@ -1,4 +1,4 @@
1
- import { r as replay } from "./events-CLH4ijKP.mjs";
1
+ import { a as replay } from "./events-Dieo1482.mjs";
2
2
  import { x as withLock } from "./auth-Dix8wrXV.mjs";
3
3
  import { closeSync, fsyncSync, openSync, readFileSync, renameSync, writeSync } from "node:fs";
4
4
  import { join } from "node:path";