@marver-design/marver 0.30.1 → 0.32.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.
- package/CHANGELOG.md +70 -0
- package/README.md +12 -8
- package/dist/{anchor-check-Bv4o-R2T.mjs → anchor-check-DZtX13ly.mjs} +1 -1
- package/dist/{board-tree-BXR8dw4b.mjs → board-tree-DGj0HhEE.mjs} +6 -2
- package/dist/{boards-EH2onUXM.mjs → boards-Cim1GTKc.mjs} +32 -2
- package/dist/{boards-BeWtjGUM.mjs → boards-jHmEPLV7.mjs} +7 -7
- package/dist/{build-zWGXSzly.mjs → build-D2dHEWX-.mjs} +14 -17
- package/dist/{capture-DEtM4qm5.mjs → capture-HaS-1or8.mjs} +1 -1
- package/dist/cli.mjs +38 -20
- package/dist/{collab-BEAcXrBb.mjs → collab-D2NcrOB8.mjs} +53 -14
- package/dist/comment-actions-Bxf9Ld4g.mjs +351 -0
- package/dist/{comments-XNhMmSSu.mjs → comments-ocvsnt2j.mjs} +85 -10
- package/dist/config-B0YcFtqS.mjs +510 -0
- package/dist/{context-BUnFiyA3.mjs → context-Cj2TcC0H.mjs} +3 -3
- package/dist/{daemon-CChgWJNq.mjs → daemon-D6TrdgMi.mjs} +268 -28
- package/dist/deep-link-DYtuT740.mjs +163 -0
- package/dist/{dev-DOgIITpT.mjs → dev-DMQYbw-2.mjs} +23 -16
- package/dist/devices-uJZ2inMq.mjs +155 -0
- package/dist/{events-CLH4ijKP.mjs → events-Dieo1482.mjs} +49 -4
- package/dist/{init-CYlFaRzG.mjs → init-BgusplYn.mjs} +40 -10
- package/dist/{jam-Cj5gBvwD.mjs → jam-CkuLL8A8.mjs} +1 -1
- package/dist/{link-BFFRgrMt.mjs → link-aZq5cExV.mjs} +54 -7
- package/dist/{logo-CXY-1yrn.mjs → logo-C9s7-Cy9.mjs} +89 -66
- package/dist/{ls-NqmePKOf.mjs → ls-DGVIW-Io.mjs} +1 -1
- package/dist/{manifest-DPZ3WNg_.mjs → manifest-CK8Qh4Nq.mjs} +255 -13
- package/dist/{marks-BnNANic9.mjs → marks-C8oX8kbE.mjs} +3 -3
- package/dist/{marks-DBp3h1Mc.mjs → marks-Dt-5JXCp.mjs} +18 -5
- package/dist/{marver-id-gate-vBLb_Icb.mjs → marver-id-gate-BAeuMeaU.mjs} +11 -7
- package/dist/md-B9_13Q0R.mjs +105 -0
- package/dist/notes-CRAX4wgk.mjs +148 -0
- package/dist/own-C8Mq0Hnf.mjs +128 -0
- package/dist/pdf-Cf9GIoIM.mjs +2299 -0
- package/dist/pdf-HB0prF75.mjs +117 -0
- package/dist/{perf-6MOTHxay.mjs → perf-9ZEF5KLO.mjs} +5 -5
- package/dist/{perf-BCxAo0IS.mjs → perf-BA_NDarr.mjs} +2 -1
- package/dist/{plugin-CFWBcAba.mjs → plugin-DesQP9L5.mjs} +565 -107
- package/dist/{poster-DPPpQiva.mjs → poster-Bb6WraCA.mjs} +1 -1
- package/dist/{profile-B1FKOM1e.mjs → profile-cdmSer1k.mjs} +1 -1
- package/dist/{publish-bakes-_Zx8crP3.mjs → publish-bakes-EjMmukJB.mjs} +3 -3
- package/dist/{queue-DeSQm24g.mjs → queue-BLLfdlDw.mjs} +156 -11
- package/dist/{recover-mDUVsnPd.mjs → recover-B3dmatx4.mjs} +2 -2
- package/dist/{serve-DQv3Ti6X.mjs → serve-kcF6-H8V.mjs} +4 -4
- package/dist/{session-VDJfXEEm.mjs → session-DBF-nQvq.mjs} +29 -3
- package/dist/{share-Bu_kuOKL.mjs → share-CS2mg27O.mjs} +1 -1
- package/dist/{shot-d4h_hJi9.mjs → shot-Bjt2MQe3.mjs} +4 -4
- package/dist/{shot-DBWN8hPP.mjs → shot-BuUCG46-.mjs} +1 -1
- package/dist/show-DhmiUu01.mjs +101 -0
- package/dist/{sizes-wjXDev3b.mjs → sizes-BckcL4Zz.mjs} +1 -1
- package/dist/{slots-Dn4Onb0V.mjs → slots-BOcfIqxy.mjs} +15 -3
- package/dist/{summary-Y8MY1Wuc.mjs → summary-cPmRDGpX.mjs} +1 -1
- package/dist/{sync-CMozOwZ0.mjs → sync-BNWwh8OF.mjs} +205 -7
- package/dist/{work-DJxH7cCX.mjs → work-B4tydWnf.mjs} +38 -2
- package/dist/{work-BYWD_1Zf.mjs → work-CzIXp7n1.mjs} +3 -3
- package/docs/app.md +143 -6
- package/docs/boards-and-folders.md +41 -7
- package/docs/jam-session.md +5 -0
- package/docs/live-jam.md +9 -0
- package/docs/pdf.md +108 -0
- package/docs/publish.md +9 -9
- package/docs/sharing.md +11 -0
- package/docs/slides.md +11 -1
- package/package.json +3 -1
- package/src/client/content/index.tsx +4 -2
- package/src/client/frame-host/main.tsx +3 -0
- package/src/client/shell/App.tsx +71 -24
- package/src/client/shell/BoardList.tsx +16 -7
- package/src/client/shell/Comments.tsx +77 -16
- package/src/client/shell/Play.tsx +104 -27
- package/src/client/shell/Toolbar.tsx +4 -3
- package/src/client/shell/app-bridge.ts +40 -5
- package/src/client/shell/canvas/Canvas.tsx +30 -8
- package/src/client/shell/canvas/FrameNode.tsx +3 -1
- package/src/client/shell/canvas/ctl.ts +16 -0
- package/src/client/shell/commands.ts +20 -0
- package/src/client/shell/comments-store.ts +81 -2
- package/src/client/shell/devices.tsx +42 -0
- package/src/client/shell/goto.ts +56 -9
- package/src/client/shell/icons.tsx +11 -4
- package/src/client/shell/immersive.ts +123 -0
- package/src/client/shell/inset.ts +29 -3
- package/src/client/shell/jam-lines.ts +5 -3
- package/src/client/shell/jam-panel.tsx +17 -5
- package/src/client/shell/marks-ui.tsx +54 -0
- package/src/client/shell/notes.ts +21 -0
- package/src/client/shell/pdf-export.tsx +154 -0
- package/src/client/shell/pdf-notes.ts +20 -0
- package/src/client/shell/recorder-signals.ts +5 -2
- package/src/client/shell/show.ts +250 -0
- package/src/client/shell/store.ts +23 -38
- package/src/client/shell/styles.css +68 -6
- package/src/shared/app-api.ts +90 -4
- package/src/shared/auto-place.ts +32 -0
- package/src/shared/board-tree.ts +3 -0
- package/src/shared/board-types.ts +6 -2
- package/src/shared/deep-link.ts +212 -0
- package/src/shared/devices.ts +89 -0
- package/src/shared/events.ts +48 -5
- package/src/shared/export-plan.ts +98 -0
- package/src/shared/immersive.ts +13 -0
- package/src/shared/perf-records.ts +1 -1
- package/templates/AGENTS-embedded.md +76 -12
- package/templates/AGENTS-studio.md +76 -12
- package/templates/instructions/boards.md +6 -5
- package/templates/instructions/configure.md +32 -2
- package/templates/instructions/iterate.md +8 -0
- package/templates/instructions/jam.md +9 -0
- package/templates/instructions/publish.md +14 -4
- package/templates/instructions/review.md +4 -0
- package/templates/instructions/slides.md +67 -1
- package/templates/instructions/welcome.md +9 -5
- package/templates/playbooks/publish-canvas/PLAYBOOK.md +1 -1
- package/dist/config-BezZTiov.mjs +0 -182
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
|
|
2
|
-
import {
|
|
2
|
+
import { i as marverHome } from "./slots-BOcfIqxy.mjs";
|
|
3
|
+
import { n as deletedMessages, r as diffEvents } from "./events-Dieo1482.mjs";
|
|
3
4
|
import { a as readLog, i as listBoards, t as appendEvents } from "./comments-0BSbb04K.mjs";
|
|
4
5
|
import { t as CLI_TOKEN_CHARS } from "./auth-Dix8wrXV.mjs";
|
|
5
|
-
import {
|
|
6
|
-
import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, unlinkSync, writeSync } from "node:fs";
|
|
6
|
+
import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
|
|
7
7
|
import { join } from "node:path";
|
|
8
8
|
import { createHash, randomBytes } from "node:crypto";
|
|
9
9
|
//#region src/server/sync.ts
|
|
@@ -23,13 +23,20 @@ import { createHash, randomBytes } from "node:crypto";
|
|
|
23
23
|
* which is traded for one and then forgotten.
|
|
24
24
|
*/
|
|
25
25
|
var sync_exports = /* @__PURE__ */ __exportAll({
|
|
26
|
+
admitted: () => admitted,
|
|
27
|
+
bindIdentity: () => bindIdentity,
|
|
26
28
|
connect: () => connect,
|
|
27
29
|
connectClaim: () => connectClaim,
|
|
28
30
|
connectToken: () => connectToken,
|
|
31
|
+
heldWords: () => heldWords,
|
|
32
|
+
identityBindings: () => identityBindings,
|
|
29
33
|
loadCollab: () => loadCollab,
|
|
30
34
|
localOnlyThreads: () => localOnlyThreads,
|
|
35
|
+
readHeld: () => readHeld,
|
|
31
36
|
saveCollab: () => saveCollab,
|
|
32
|
-
|
|
37
|
+
serverCapabilities: () => serverCapabilities,
|
|
38
|
+
syncOnce: () => syncOnce,
|
|
39
|
+
unauthorized: () => unauthorized
|
|
33
40
|
});
|
|
34
41
|
/**
|
|
35
42
|
* The credential does not live in the repository.
|
|
@@ -137,6 +144,10 @@ async function syncOnce(root, collab) {
|
|
|
137
144
|
if (bres.status === 401) throw new Error("the connect token was rejected - run `comments connect` again");
|
|
138
145
|
if (!bres.ok) throw new Error(`published canvas answered ${bres.status} - is it up?`);
|
|
139
146
|
const { rights, legacy } = await bres.json();
|
|
147
|
+
const myId = await fetch(`${base}/__mv/api/me`, { headers: auth }).then(async (r) => r.ok ? (await r.json()).id : void 0, () => void 0);
|
|
148
|
+
if (myId && collab.email) bindIdentity(root, base, collab.email, myId);
|
|
149
|
+
const bindings = identityBindings(root, base);
|
|
150
|
+
const caps = await serverCapabilities(base, auth);
|
|
140
151
|
const boards = [.../* @__PURE__ */ new Set([
|
|
141
152
|
...Object.keys(rights),
|
|
142
153
|
...listBoards(dir),
|
|
@@ -144,6 +155,7 @@ async function syncOnce(root, collab) {
|
|
|
144
155
|
])];
|
|
145
156
|
const out = {};
|
|
146
157
|
const failures = [];
|
|
158
|
+
const held = {};
|
|
147
159
|
for (const board of boards) {
|
|
148
160
|
const old = legacy?.board === board;
|
|
149
161
|
if (!(board in rights) && !old) continue;
|
|
@@ -153,13 +165,21 @@ async function syncOnce(root, collab) {
|
|
|
153
165
|
continue;
|
|
154
166
|
}
|
|
155
167
|
const { events: remote } = await res.json();
|
|
156
|
-
const pulled = appendEvents(dir, board, remote).length;
|
|
168
|
+
const pulled = appendEvents(dir, board, admitted(readLog(dir, board), remote, bindings)).length;
|
|
157
169
|
let pushed = 0;
|
|
158
170
|
if (rights[board] === "comment" || old) {
|
|
159
171
|
const local = readLog(dir, board);
|
|
160
172
|
const marverThreads = localOnlyThreads(local);
|
|
161
173
|
const shipped = old ? threadIds(local, (e) => legacy.frames.includes(e.frame ?? "")) : null;
|
|
162
|
-
const
|
|
174
|
+
const gone = deletedMessages([...local, ...remote]);
|
|
175
|
+
const candidates = diffEvents(local, remote.map((e) => e.id)).filter((e) => !e.agent && !marverThreads.has(threadOf(e)) && (!shipped || shipped.has(threadOf(e))) && (caps.delete || e.type !== "delete") && !(e.type === "edit" && gone.has(e.commentId ?? "")));
|
|
176
|
+
const keptHere = unauthorized(candidates, [...local, ...remote], {
|
|
177
|
+
email: collab.email,
|
|
178
|
+
id: myId
|
|
179
|
+
});
|
|
180
|
+
if (keptHere.length) held[board] = keptHere;
|
|
181
|
+
const keep = new Set(keptHere.map((h) => h.id));
|
|
182
|
+
const missing = candidates.filter((e) => !keep.has(e.id));
|
|
163
183
|
for (let i = 0; i < missing.length; i += 100) {
|
|
164
184
|
const r = await fetch(`${base}/__mv/api/comments/${board}`, {
|
|
165
185
|
method: "POST",
|
|
@@ -175,12 +195,190 @@ async function syncOnce(root, collab) {
|
|
|
175
195
|
}
|
|
176
196
|
out[board] = {
|
|
177
197
|
pulled,
|
|
178
|
-
pushed
|
|
198
|
+
pushed,
|
|
199
|
+
...held[board]?.length ? { held: held[board].length } : {}
|
|
179
200
|
};
|
|
180
201
|
}
|
|
202
|
+
saveHeld(root, held);
|
|
181
203
|
if (failures.length) throw new Error(`sync incomplete - ${failures.join(" · ")}`);
|
|
182
204
|
return out;
|
|
183
205
|
}
|
|
206
|
+
function unauthorized(events, log, account) {
|
|
207
|
+
const acct = typeof account === "string" ? { email: account } : account ?? {};
|
|
208
|
+
const myEmail = (acct.email ?? "").toLowerCase(), myId = acct.id ?? "";
|
|
209
|
+
if (!myEmail && !myId) return [];
|
|
210
|
+
const mine = (a) => a?.email ? myEmail ? a.email.toLowerCase() === myEmail : null : a?.id ? myId ? a.id === myId : null : false;
|
|
211
|
+
const authorOf = /* @__PURE__ */ new Map();
|
|
212
|
+
const rootOf = /* @__PURE__ */ new Map();
|
|
213
|
+
for (const e of [...log, ...events]) {
|
|
214
|
+
if ((e.type === "create" || e.type === "reply") && e.commentId && !authorOf.has(e.commentId)) authorOf.set(e.commentId, e.author);
|
|
215
|
+
if (e.type === "reply" && e.commentId && e.parentId) rootOf.set(e.commentId, e.parentId);
|
|
216
|
+
if (e.type === "create" && e.commentId) rootOf.set(e.commentId, e.commentId);
|
|
217
|
+
}
|
|
218
|
+
const byAuthor = /* @__PURE__ */ new Set([
|
|
219
|
+
"create",
|
|
220
|
+
"reply",
|
|
221
|
+
"react",
|
|
222
|
+
"edit",
|
|
223
|
+
"reanchor",
|
|
224
|
+
"profile",
|
|
225
|
+
"delete"
|
|
226
|
+
]);
|
|
227
|
+
const held = /* @__PURE__ */ new Map();
|
|
228
|
+
for (const e of events) {
|
|
229
|
+
let why = null;
|
|
230
|
+
if (byAuthor.has(e.type) && mine(e.author) === false) why = "another-account";
|
|
231
|
+
else if ((e.type === "edit" || e.type === "delete" || e.type === "reanchor") && mine(authorOf.get(e.commentId ?? "")) === false) why = "message-of-another-account";
|
|
232
|
+
if (why) held.set(e.id, {
|
|
233
|
+
id: e.id,
|
|
234
|
+
type: e.type,
|
|
235
|
+
why
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
for (let grew = true; grew;) {
|
|
239
|
+
grew = false;
|
|
240
|
+
const keptMsgs = new Set(events.filter((e) => held.has(e.id) && (e.type === "create" || e.type === "reply") && e.commentId).map((e) => e.commentId));
|
|
241
|
+
const keptThreads = new Set([...keptMsgs].map((m) => rootOf.get(m) ?? m).filter((m) => keptMsgs.has(m)));
|
|
242
|
+
for (const e of events) {
|
|
243
|
+
if (held.has(e.id)) continue;
|
|
244
|
+
const target = e.type === "reply" ? e.parentId : e.commentId;
|
|
245
|
+
const root = target ? rootOf.get(target) ?? target : "";
|
|
246
|
+
if (target && keptMsgs.has(target) || root && keptThreads.has(root)) {
|
|
247
|
+
held.set(e.id, {
|
|
248
|
+
id: e.id,
|
|
249
|
+
type: e.type,
|
|
250
|
+
why: "thread-kept-here"
|
|
251
|
+
});
|
|
252
|
+
grew = true;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
return events.filter((e) => held.has(e.id)).map((e) => held.get(e.id));
|
|
257
|
+
}
|
|
258
|
+
/**
|
|
259
|
+
* Identity bindings (Codex r9): an address and the opaque id a published canvas gives it, learned only from that canvas's
|
|
260
|
+
* own `/me`, signed in as that address - never from an event, whose ids anyone may choose. Per canvas origin, kept in
|
|
261
|
+
* `design/.local/identity-bindings.json` (never synced) so a reconnect under another address still recognises the first
|
|
262
|
+
* one's messages as the server projects them.
|
|
263
|
+
*/
|
|
264
|
+
const bindingsFile = (root) => join(root, "design", ".local", "identity-bindings.json");
|
|
265
|
+
const readBindings = (root) => {
|
|
266
|
+
try {
|
|
267
|
+
const v = JSON.parse(readFileSync(bindingsFile(root), "utf8"));
|
|
268
|
+
return v && typeof v === "object" && !Array.isArray(v) ? v : {};
|
|
269
|
+
} catch {
|
|
270
|
+
return {};
|
|
271
|
+
}
|
|
272
|
+
};
|
|
273
|
+
const originOf = (base) => {
|
|
274
|
+
try {
|
|
275
|
+
return new URL(base).origin;
|
|
276
|
+
} catch {
|
|
277
|
+
return base.replace(/\/+$/, "");
|
|
278
|
+
}
|
|
279
|
+
};
|
|
280
|
+
function identityBindings(root, base) {
|
|
281
|
+
const all = readBindings(root);
|
|
282
|
+
const here = Object.hasOwn(all, originOf(base)) ? all[originOf(base)] : {};
|
|
283
|
+
const out = Object.create(null);
|
|
284
|
+
for (const [email, id] of Object.entries(here ?? {})) if (typeof id === "string" && /^[0-9a-f]{24}$/.test(id)) out[email.toLowerCase()] = id;
|
|
285
|
+
return out;
|
|
286
|
+
}
|
|
287
|
+
function bindIdentity(root, base, email, id) {
|
|
288
|
+
if (!/^[0-9a-f]{24}$/.test(id) || !email) return;
|
|
289
|
+
const all = readBindings(root);
|
|
290
|
+
const o = originOf(base);
|
|
291
|
+
const here = Object.assign(Object.create(null), Object.hasOwn(all, o) ? all[o] : {});
|
|
292
|
+
if (here[email.toLowerCase()] === id) return;
|
|
293
|
+
here[email.toLowerCase()] = id;
|
|
294
|
+
try {
|
|
295
|
+
mkdirSync(join(root, "design", ".local"), { recursive: true });
|
|
296
|
+
writeFileSync(bindingsFile(root), JSON.stringify({
|
|
297
|
+
...all,
|
|
298
|
+
[o]: here
|
|
299
|
+
}, null, 1) + "\n", { mode: 384 });
|
|
300
|
+
} catch {}
|
|
301
|
+
}
|
|
302
|
+
const heldFile = (root) => join(root, "design", ".local", "sync-held.json");
|
|
303
|
+
/** The last exchange's kept events, per board - what `marver comments sync` says, and what stays until you change it. */
|
|
304
|
+
function saveHeld(root, held) {
|
|
305
|
+
try {
|
|
306
|
+
if (!Object.keys(held).length) {
|
|
307
|
+
if (existsSync(heldFile(root))) unlinkSync(heldFile(root));
|
|
308
|
+
return;
|
|
309
|
+
}
|
|
310
|
+
mkdirSync(join(root, "design", ".local"), { recursive: true });
|
|
311
|
+
writeFileSync(heldFile(root), JSON.stringify({
|
|
312
|
+
at: Date.now(),
|
|
313
|
+
boards: held
|
|
314
|
+
}, null, 1) + "\n");
|
|
315
|
+
} catch {}
|
|
316
|
+
}
|
|
317
|
+
/** "1 edit kept local: written under another account" - one line per board and reason. */
|
|
318
|
+
function heldWords(held) {
|
|
319
|
+
const by = /* @__PURE__ */ new Map();
|
|
320
|
+
for (const h of held) by.set(h.why, [...by.get(h.why) ?? [], h]);
|
|
321
|
+
const what = (hs) => {
|
|
322
|
+
const types = [...new Set(hs.map((h) => h.type))];
|
|
323
|
+
const n = hs.length;
|
|
324
|
+
return types.length === 1 ? `${n} ${types[0]}${n === 1 ? "" : "s"}` : `${n} events`;
|
|
325
|
+
};
|
|
326
|
+
const words = {
|
|
327
|
+
"another-account": "written under another account",
|
|
328
|
+
"message-of-another-account": "its comment was written under another account",
|
|
329
|
+
"thread-kept-here": "its thread is kept local"
|
|
330
|
+
};
|
|
331
|
+
return [...by].map(([why, hs]) => `${what(hs)} kept local: ${words[why]}`);
|
|
332
|
+
}
|
|
333
|
+
function readHeld(root) {
|
|
334
|
+
try {
|
|
335
|
+
return JSON.parse(readFileSync(heldFile(root), "utf8")).boards ?? {};
|
|
336
|
+
} catch {
|
|
337
|
+
return {};
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
/** What a server's comment API takes (`GET /__mv/api/capabilities`, 0.31): anything but a JSON answer that says so
|
|
341
|
+
* (an older server's 404, its gate page) is an older server - nothing new is sent to it. */
|
|
342
|
+
async function serverCapabilities(base, headers = {}) {
|
|
343
|
+
try {
|
|
344
|
+
const r = await fetch(`${base.replace(/\/+$/, "")}/__mv/api/capabilities`, { headers });
|
|
345
|
+
if (!r.ok || !(r.headers.get("content-type") ?? "").includes("application/json")) return { delete: false };
|
|
346
|
+
return { delete: (await r.json())?.delete === true };
|
|
347
|
+
} catch {
|
|
348
|
+
return { delete: false };
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
/** What of a pull may join the local log (spec 31, Codex r4): the server validated each event against ITS log, which
|
|
352
|
+
* never held this machine's own messages (Marver's notes, captures - never pushed). So a message id already here is
|
|
353
|
+
* one message's: another event claiming it as a new message is refused, and an edit or a delete of it must come from
|
|
354
|
+
* its original author - never touching Marver's or a local-only message at all. */
|
|
355
|
+
function admitted(local, remote, bindings = {}) {
|
|
356
|
+
const msgs = /* @__PURE__ */ new Map();
|
|
357
|
+
for (const e of local) if ((e.type === "create" || e.type === "reply") && e.commentId && !msgs.has(e.commentId)) msgs.set(e.commentId, e);
|
|
358
|
+
const theirs = /* @__PURE__ */ new Map();
|
|
359
|
+
for (const e of remote) if (e && (e.type === "create" || e.type === "reply") && e.commentId && !theirs.has(e.commentId)) theirs.set(e.commentId, e);
|
|
360
|
+
const key = (a) => (a?.email ?? a?.id ?? "").toLowerCase();
|
|
361
|
+
const localIds = new Set(local.map((e) => e.id));
|
|
362
|
+
const offLimits = localOnlyThreads(local);
|
|
363
|
+
const out = [];
|
|
364
|
+
for (const e of remote) {
|
|
365
|
+
if (!e || typeof e.id !== "string" || localIds.has(e.id)) {
|
|
366
|
+
out.push(e);
|
|
367
|
+
continue;
|
|
368
|
+
}
|
|
369
|
+
if ((e.type === "create" || e.type === "reply") && e.commentId) {
|
|
370
|
+
if (msgs.has(e.commentId)) continue;
|
|
371
|
+
msgs.set(e.commentId, e);
|
|
372
|
+
} else if ((e.type === "edit" || e.type === "delete") && e.commentId) {
|
|
373
|
+
const orig = msgs.get(e.commentId), there = theirs.get(e.commentId);
|
|
374
|
+
if (!orig || !there || there.id !== orig.id || orig.agent || offLimits.has(e.commentId)) continue;
|
|
375
|
+
if (!(orig.author?.email && there.author?.email ? key(orig.author) === key(there.author) : orig.author?.id && there.author?.id ? orig.author.id === there.author.id : !!orig.author?.email && !!there.author?.id ? Object.hasOwn(bindings, key(orig.author)) && bindings[key(orig.author)] === there.author.id : !!orig.author?.id && !!there.author?.email && Object.hasOwn(bindings, key(there.author)) && bindings[key(there.author)] === orig.author.id)) continue;
|
|
376
|
+
if (!key(e.author) || key(e.author) !== key(there.author)) continue;
|
|
377
|
+
}
|
|
378
|
+
out.push(e);
|
|
379
|
+
}
|
|
380
|
+
return out;
|
|
381
|
+
}
|
|
184
382
|
/** The account endpoints live BEHIND the canvas gate (the outer READ boundary), so
|
|
185
383
|
* connecting passes the gate first when a canvas password is set. */
|
|
186
384
|
async function gateCookie(base, canvasPassword) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
|
|
2
|
-
import {
|
|
2
|
+
import { l as listBoardFiles } from "./boards-Cim1GTKc.mjs";
|
|
3
3
|
import { r as pidRuns } from "./exclusive-B1RtpeeP.mjs";
|
|
4
4
|
import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
5
5
|
import { join } from "node:path";
|
|
@@ -83,15 +83,42 @@ var work_exports = /* @__PURE__ */ __exportAll({
|
|
|
83
83
|
activityClock: () => activityClock,
|
|
84
84
|
boardsChanged: () => boardsChanged,
|
|
85
85
|
boardsShowing: () => boardsShowing,
|
|
86
|
+
createWorkClock: () => createWorkClock,
|
|
86
87
|
nextActivitySeq: () => nextActivitySeq,
|
|
87
88
|
onBoardsChanged: () => onBoardsChanged,
|
|
89
|
+
pinningBoards: () => pinningBoards,
|
|
88
90
|
readDevInfo: () => readDevInfo,
|
|
89
91
|
removeDevInfo: () => removeDevInfo,
|
|
90
92
|
workActivity: () => workActivity,
|
|
93
|
+
workClock: () => workClock,
|
|
91
94
|
writeDevInfo: () => writeDevInfo
|
|
92
95
|
});
|
|
93
96
|
/** One per process - the dev server, the jam daemon, and the API all share it. */
|
|
94
97
|
const workActivity = createActivity();
|
|
98
|
+
function createWorkClock(a, now = Date.now) {
|
|
99
|
+
let since;
|
|
100
|
+
let until = 0;
|
|
101
|
+
const read = () => {
|
|
102
|
+
const leases = a.leases("cli");
|
|
103
|
+
const t = now();
|
|
104
|
+
if (!leases.length) {
|
|
105
|
+
since = void 0;
|
|
106
|
+
until = 0;
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
if (since === void 0 || until <= t) since = t;
|
|
110
|
+
until = Math.max(...leases.map(([, u]) => u));
|
|
111
|
+
};
|
|
112
|
+
const stop = a.onChange(read);
|
|
113
|
+
read();
|
|
114
|
+
return {
|
|
115
|
+
since: () => since !== void 0 && until > now() ? since : void 0,
|
|
116
|
+
stop
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
/** The process's clock over `workActivity`, subscribed once at module load: a Vite restart, a hub made again or a client
|
|
120
|
+
* that reconnects keeps it; a new `marver dev` process starts again. */
|
|
121
|
+
const workClock = createWorkClock(workActivity);
|
|
95
122
|
/** The order of what the shell is told about activity: each broadcast takes the next number, and the
|
|
96
123
|
* snapshot a page asks for carries the latest - so a slow snapshot never undoes a newer broadcast.
|
|
97
124
|
* Time-based, so a restarted server never counts backwards past a page that outlived it. */
|
|
@@ -179,6 +206,15 @@ function onBoardsChanged(fn) {
|
|
|
179
206
|
boardListeners.delete(fn);
|
|
180
207
|
};
|
|
181
208
|
}
|
|
209
|
+
/** The boards that pin any of these frames, by name - never the auto boards, which hold every frame (spec 32 F2: the
|
|
210
|
+
* board a `marver work` hold is named by, its first). */
|
|
211
|
+
function pinningBoards(root, frames) {
|
|
212
|
+
if (!frames.length) return [];
|
|
213
|
+
const ix = indexOf(root);
|
|
214
|
+
const out = /* @__PURE__ */ new Set();
|
|
215
|
+
for (const f of frames) for (const b of ix.byFrame.get(f) ?? []) if (!ix.auto.includes(b)) out.add(b);
|
|
216
|
+
return [...out].sort();
|
|
217
|
+
}
|
|
182
218
|
/** The boards that show any of these frames - what the sidebar lights while an agent works (the
|
|
183
219
|
* board's type icon shimmers): every board pinning one, and every auto board, which holds every
|
|
184
220
|
* frame. Sorted, so an unchanged answer compares equal. */
|
|
@@ -190,4 +226,4 @@ function boardsShowing(root, frames) {
|
|
|
190
226
|
return [...out].sort();
|
|
191
227
|
}
|
|
192
228
|
//#endregion
|
|
193
|
-
export {
|
|
229
|
+
export { readDevInfo as a, work_exports as c, pinningBoards as i, WORK_TTL_MAX as n, workActivity as o, boardsChanged as r, workClock as s, WORK_TTL_DEFAULT as t };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { r as NAME } from "./cli.mjs";
|
|
2
|
-
import {
|
|
3
|
-
import { unreachable } from "./link-
|
|
2
|
+
import { a as readDevInfo, n as WORK_TTL_MAX, t as WORK_TTL_DEFAULT } from "./work-B4tydWnf.mjs";
|
|
3
|
+
import { unreachable } from "./link-aZq5cExV.mjs";
|
|
4
4
|
//#region src/cli/work.ts
|
|
5
5
|
/**
|
|
6
6
|
* `marver work` - the coding agent's hand on the canvas working state.
|
|
@@ -68,7 +68,7 @@ async function workCommand(root, action, frames, opts) {
|
|
|
68
68
|
});
|
|
69
69
|
console.log(active.length ? `still working: ${active.join(", ")}` : "nothing working - all clear");
|
|
70
70
|
const done = before.filter((f) => !active.includes(f));
|
|
71
|
-
const { links, hints } = done.length ? await (await import("./link-
|
|
71
|
+
const { links, hints } = done.length ? await (await import("./link-aZq5cExV.mjs")).handBack(root, done) : {
|
|
72
72
|
links: [],
|
|
73
73
|
hints: []
|
|
74
74
|
};
|
package/docs/app.md
CHANGED
|
@@ -17,6 +17,8 @@ what changed, are in [TNEP4/marver-app](https://github.com/TNEP4/marver-app/rele
|
|
|
17
17
|
- **Canvases on Marver 0.27 or later.** They show in the app, a tab each, and closing, reloading or quitting asks
|
|
18
18
|
before losing their unsaved work. Marks, notices and live pictures need **0.29 or later**, the version to use with
|
|
19
19
|
the app. A canvas on 0.26 or older does not appear: update it with `npm i -D @marver-design/marver@latest`.
|
|
20
|
+
- **Marver 0.32 or later, with app 1.2,** for Home to name the board an agent works on and for how long, and for Hide
|
|
21
|
+
UI to take the whole window in play ([Hide UI in play](#hide-ui-in-play)).
|
|
20
22
|
|
|
21
23
|
## Install
|
|
22
24
|
|
|
@@ -67,10 +69,135 @@ Your settings and tabs stay: every version keeps them in the same folders ([Unin
|
|
|
67
69
|
|
|
68
70
|
## First launch
|
|
69
71
|
|
|
70
|
-
Marver opens on Home. With no canvas
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
Marver opens on Home. With no canvas yet, Home is the welcome: "No canvas running yet", and three ways in. In a repo
|
|
73
|
+
with Marver, run `npx marver dev`. In a repo without Marver yet, run `npm i -D @marver-design/marver && npx marver
|
|
74
|
+
init` first. Each command has a Copy button. For a canvas someone shared with you, paste its link in the field there
|
|
75
|
+
and press Return. A canvas you start appears a second later, on Home and in its own tab. The ? button in the corner
|
|
76
|
+
is How Marver runs ([Help](#help-how-marver-runs)).
|
|
77
|
+
|
|
78
|
+
A canvas's tab and Home card wear its name and its logo: `name` in its `design/config.ts` (else `share.name`, else
|
|
79
|
+
the folder's name) and `logo` (else `share.logo`, else the first of `design/logo.svg|png`, `public/logo.svg|png`,
|
|
80
|
+
`public/favicon.svg|png|ico`, else Marver's mark). A canvas still on its folder's name or Marver's mark looks like
|
|
81
|
+
every other one in the strip, so `marver dev` says so on its boot line.
|
|
82
|
+
|
|
83
|
+
## Links into the app
|
|
84
|
+
|
|
85
|
+
When Marver is open with a canvas in a tab, `npx marver link` prints a `marver://` link for that canvas instead of its
|
|
86
|
+
localhost one, and an agent hands you that. Click it anywhere - the terminal, a chat, a note - and Marver comes forward
|
|
87
|
+
on that board, the frames selected and in view:
|
|
88
|
+
|
|
89
|
+
- **The canvas's tab is already open:** Marver never reloads it. The tab moves to the place the link names, as
|
|
90
|
+
`marver show` does - and if you were typing a comment or a Jam edit there, it stays put and says "Your agent wants
|
|
91
|
+
to show you <the frame> · Go" instead, so nothing you typed is lost.
|
|
92
|
+
- **It has no tab yet:** a tab opens on that place.
|
|
93
|
+
- **The canvas is not running:** Home opens with its card first under Not running, highlighted, and its menu open on
|
|
94
|
+
Copy start command. When that canvas's tab is still open but stopped, its tab's card is the one.
|
|
95
|
+
|
|
96
|
+
A link names its canvas by its folder, and only a canvas running from that same folder opens it - never another canvas
|
|
97
|
+
that took the same port later. A link that names no place Marver understands opens the canvas on its board.
|
|
98
|
+
`marver link` gives the `marver://` link only while Marver is in use (it keeps `~/.marver/state/app-live.json` fresh
|
|
99
|
+
every 30 seconds) with that canvas open in a tab; otherwise, and with `--web`, the localhost link. Home's field opens a
|
|
100
|
+
`marver://` link too ([The link field](#the-link-field)).
|
|
101
|
+
|
|
102
|
+
## Home
|
|
103
|
+
|
|
104
|
+
Home shows your canvases as cards. **View** (the sliders button at the top) switches between two views, and Home
|
|
105
|
+
keeps your choice; it starts on Board.
|
|
106
|
+
|
|
107
|
+
- **Board**: a column per state - Needs you, Agent working, Ready to review, Running, Not running - and the shared
|
|
108
|
+
canvases as chips along the foot, under Shared with you. A full column scrolls.
|
|
109
|
+
- **Grid**: three sections, Running, Not running and Shared with you, four cards a row. Running holds the cards of the
|
|
110
|
+
board's first four columns, in that order. A section with no card is left out.
|
|
111
|
+
|
|
112
|
+
Each canvas has a card (one per tab, so a canvas open twice has two), in the first column that fits, in that order. Each card's line says what is going on:
|
|
113
|
+
|
|
114
|
+
| Column | The line |
|
|
115
|
+
|---|---|
|
|
116
|
+
| Needs you | "2 questions on Checkout", "Agent run failed on Checkout", "Agent stalled on Checkout", "Agent run to review on Checkout" (the board is named when all of them are on one board), or "Stopped unexpectedly": its process ended while you were not looking at it |
|
|
117
|
+
| Agent working | "Agent working on Checkout · 4 min", from an hour "2 h". The board and the minutes need a canvas on Marver 0.32 or later; an older one reads "Agent working" |
|
|
118
|
+
| Ready to review | "3 new frames to look at" |
|
|
119
|
+
| Running | "Running", "Starting…", "Not responding", "Can't reach", "Crashed" or "Unloaded", then " · tab closed" when its tab is closed and it still runs. A port that does not answer as a Marver canvas reads "Not a Marver canvas", named by its host |
|
|
120
|
+
| Not running | "Stopped" while its tab is open, "Ran 2 hours ago" ("Ran Oct 27" after two weeks), or "Not running" for a canvas a link named that never ran here |
|
|
121
|
+
| Shared with you | "Open" (or "Opening…", "Can't reach", "Crashed") for a shared canvas in a tab, "Opened 3 days ago" for one opened before |
|
|
122
|
+
|
|
123
|
+
"Agent working" counts from when the agent began: a `marver work start` hold, or a Jam run once it has started, never
|
|
124
|
+
while it waits for its turn, a session or a free slot. Not running lists the canvases that ran before, not those in a
|
|
125
|
+
temporary folder (`/tmp`, `/private/tmp`, `/var/folders`), which are tests and scratch copies. A shared canvas shows its
|
|
126
|
+
name and logo once Marver has opened it once (read from the canvas's own `meta.json`, through that tab's sign-in).
|
|
127
|
+
|
|
128
|
+
**Clicking a card.** A running or shared card opens its tab; Return or Space does the same from the keyboard. A card
|
|
129
|
+
that is not running opens its menu.
|
|
130
|
+
|
|
131
|
+
**A card's menu.** Right-click a card, or press its more button (it shows on hover), for its menu. A shared chip on the
|
|
132
|
+
board has the same menu on a right-click.
|
|
133
|
+
|
|
134
|
+
| Card | Its menu |
|
|
135
|
+
|---|---|
|
|
136
|
+
| running | Open; Update to 0.32.0, in blue, when its Marver has a newer release; Copy link (its localhost link); Copy path; Reveal in Finder |
|
|
137
|
+
| not running | Copy start command; Copy link (its `marver://` link); Copy path; Reveal in Finder |
|
|
138
|
+
| shared | Open; Copy link |
|
|
139
|
+
| not a Marver canvas | Open |
|
|
140
|
+
|
|
141
|
+
Update to copies the command that updates that canvas, in its own folder; nothing is updated in the app. Copy start
|
|
142
|
+
command copies the command that starts it in its folder. A copy row says "Copied" for a moment, then the menu closes.
|
|
143
|
+
|
|
144
|
+
### The link field
|
|
145
|
+
|
|
146
|
+
The field at the top of Home opens a canvas link: a local canvas's, a shared canvas's https link, or a `marver://`
|
|
147
|
+
link. ⌘L (File > Open Link…) takes you there from any tab. Before you press Return, the line under it says where the
|
|
148
|
+
link goes ("↩ opens in Checkout's tab"), or why it can't ("Nothing is running on localhost:5173"). Escape takes you
|
|
149
|
+
back to the tab you came from.
|
|
150
|
+
|
|
151
|
+
### Help: How Marver runs
|
|
152
|
+
|
|
153
|
+
The ? button opens How Marver runs: how to open a canvas (`npx marver dev` in its repo), add Marver to a repo (`npm i
|
|
154
|
+
-D @marver-design/marver && npx marver init`) and update a canvas (`npm i -D @marver-design/marver@latest`), each with
|
|
155
|
+
a Copy button. Its foot shows where Marver keeps its settings and agent notes (`~/.marver/`), with Show the files. A
|
|
156
|
+
click outside it, or Escape, closes it.
|
|
157
|
+
|
|
158
|
+
## The tab strip
|
|
159
|
+
|
|
160
|
+
Each canvas you run has a tab, with its round logo and its name. The tabs share the strip's width, and the open one
|
|
161
|
+
stands out in glass. On a narrow window, or with many tabs, a tab shrinks to its logo and its badge, and » at the end
|
|
162
|
+
lists the tabs that do not fit, with a word for any that is not running as it should ("stopped", "can't reach"). Pick
|
|
163
|
+
one to open it. Home has its own button, at the left (⌘T). Hover a tab to see its key: ⌘1 to ⌘8, and ⌘9 for the last
|
|
164
|
+
canvas.
|
|
165
|
+
|
|
166
|
+
**Its badge.** Each canvas's tab shows an orange count of what needs you (Marver's questions, captures to review, runs
|
|
167
|
+
that failed or stalled), else a blue dot when frames are new since you looked, else a shimmer while an agent works,
|
|
168
|
+
and a teal dot while a Jam session runs. While Home is open the tabs drop their counts, dots and shimmer: Home already
|
|
169
|
+
shows them. [What the marks mean](boards-and-folders.md#what-is-new-what-needs-you).
|
|
170
|
+
|
|
171
|
+
**Its menu.** Right-click a tab for its Marver menu, with icons like the sidebar's:
|
|
172
|
+
|
|
173
|
+
- a canvas on this Mac: Open in browser, Reveal in Finder, Copy local link, Mark all as seen and, with Marver 0.31 or
|
|
174
|
+
later, Resolve all comments (every open conversation on that canvas, never what Jam is working on, with Undo);
|
|
175
|
+
- a shared canvas: Open in browser, Copy link, Reload, Force reload;
|
|
176
|
+
- every tab: Close tab.
|
|
177
|
+
|
|
178
|
+
The ContextMenu key or ⇧F10 opens it from the keyboard. » opens the same kind of menu, one row per hidden tab.
|
|
179
|
+
|
|
180
|
+
**Moving the window.** Drag the strip where it is empty. However many tabs you have, the strip keeps at least 40 px
|
|
181
|
+
empty before its right end, or before a message showing there, so there is always somewhere to grab: the tabs shrink
|
|
182
|
+
and move behind » a little sooner instead.
|
|
183
|
+
|
|
184
|
+
The strip and Home follow Reduce Transparency and Increase Contrast, and show a clear focus ring when you use the
|
|
185
|
+
keyboard.
|
|
186
|
+
|
|
187
|
+
## Hide UI in play
|
|
188
|
+
|
|
189
|
+
In play, prototype, slides or focus mode, `h` (Hide UI) takes the whole window: the tab strip and the window's buttons
|
|
190
|
+
go with Marver's own controls, and the stage grows into the room they leave. A thin band along the top, 16 px and
|
|
191
|
+
invisible, still drags the window. Everything comes back with:
|
|
192
|
+
|
|
193
|
+
- `h` again;
|
|
194
|
+
- Escape, which leaves play (it first cancels a comment you are writing or the laser);
|
|
195
|
+
- leaving play any other way: the strip comes back, and the canvas keeps its controls hidden until you press `h`;
|
|
196
|
+
- switching tabs (⌘1 to ⌘9, say): coming back, everything shows.
|
|
197
|
+
|
|
198
|
+
On a board locked to play, Escape shows everything again. On the canvas, Hide UI hides Marver's controls and keeps the
|
|
199
|
+
strip, which is how you move between canvases; a shared canvas's tab keeps the strip too. This needs app 1.2 and a
|
|
200
|
+
canvas on Marver 0.32 or later. In a browser, or with an older app or canvas, Hide UI works as before: the strip stays.
|
|
74
201
|
|
|
75
202
|
## What it asks, and when
|
|
76
203
|
|
|
@@ -101,7 +228,7 @@ of what changed), and the Marver menu reads Restart to Install Update. Two ways
|
|
|
101
228
|
|
|
102
229
|
**After an update, Marver opens as it does after a quit.** With Settings' "Reopen tabs at launch" on (the default),
|
|
103
230
|
each running canvas gets its tab back on the board it showed, and Settings if it was open; with it off, Marver starts
|
|
104
|
-
on Home and every running canvas still gets its tab. Shared canvases do not come back in tabs (Home's Shared
|
|
231
|
+
on Home and every running canvas still gets its tab. Shared canvases do not come back in tabs (Home's Shared with you
|
|
105
232
|
reopens them), and a canvas that is not running gets no tab. What a page held only in memory, such as an open panel or
|
|
106
233
|
a scroll position, does not come back. The first launch after says "Updated to 1.0.1", once.
|
|
107
234
|
|
|
@@ -126,6 +253,16 @@ Check for Updates…:
|
|
|
126
253
|
[the disk image](https://github.com/TNEP4/marver-app/releases/latest/download/Marver-arm64.dmg) again, open it,
|
|
127
254
|
drag Marver into Applications and choose Replace. Your settings and tabs stay.
|
|
128
255
|
|
|
256
|
+
## Exporting a PDF
|
|
257
|
+
|
|
258
|
+
**File > Export PDF…** (app 1.1, a canvas on Marver 0.31 or later) prints the open board as a PDF - one page per slide
|
|
259
|
+
([Deck PDFs](pdf.md)) - and, when it is ready, opens a save panel on `~/Downloads/<board>.pdf`. The canvas's own Export
|
|
260
|
+
PDF (a board's menu, slides and present mode's toolbar) saves the same way in the app. The canvas sends the app only
|
|
261
|
+
the finished job's id: the app fetches the file itself from that canvas, checks it is a PDF of 200 MB at most, checks
|
|
262
|
+
again that the tab still shows the same canvas page after you chose where to save, and writes it whole.
|
|
263
|
+
In app 1.0.1 (no File > Export PDF…), the canvas's Export PDF ends on a notice with **Download**: 1.0.1 cancels a
|
|
264
|
+
download its window did not start while in front, so the file waits for that click rather than for the last page.
|
|
265
|
+
|
|
129
266
|
## The performance report
|
|
130
267
|
|
|
131
268
|
When Marver is slow, crashes or flashes, a report helps find out why. **Help > Export Performance Report…** (also on a
|
|
@@ -162,7 +299,7 @@ and roughly when, and attach the file.
|
|
|
162
299
|
Marver keeps its settings and its state in `~/.marver/`, beside the files `marver dev` keeps there. At every launch
|
|
163
300
|
the app writes a `README.md` in it, for you and your coding agent: every file, every setting, and the rules for
|
|
164
301
|
changing them (edits to the README itself are lost). Settings (Marver > Settings…) writes `config.json` and
|
|
165
|
-
`theme.json`. Home's
|
|
302
|
+
`theme.json`. Show the files, in Home's How Marver runs (the ? button), opens the folder; Help > Show Performance Files opens the app's performance records.
|
|
166
303
|
|
|
167
304
|
## Uninstalling
|
|
168
305
|
|
|
@@ -78,8 +78,9 @@ The sidebar shows where to look.
|
|
|
78
78
|
- **One slot per row.** Every row keeps the one item at its right edge it has today, and what matters
|
|
79
79
|
most takes it: the bubble first, then the row's own count or status, then a frame's dot. A board
|
|
80
80
|
you are not on turns blue when its frames hold something new, and the bubble takes its status
|
|
81
|
-
glyph's place until answered. A closed folder
|
|
82
|
-
something inside is new,
|
|
81
|
+
glyph's place until answered. A closed folder shows the bubble when something inside waits on you,
|
|
82
|
+
else a blue dot when something inside is new, else nothing - never a number for new: it is not a
|
|
83
|
+
to-do count (0.31). An open folder shows how many boards it holds. A folded scene keeps its frame count, blue when something inside is new.
|
|
83
84
|
- **`U`** goes to the next frame that asks you something, then the next one waiting on you, then the
|
|
84
85
|
next new one.
|
|
85
86
|
|
|
@@ -94,15 +95,33 @@ a scene, board or folder - for the version on screen: a change still loading (or
|
|
|
94
95
|
focus or play) stays new until its new version shows, and a look you made while it loaded counts as
|
|
95
96
|
soon as it does.
|
|
96
97
|
|
|
98
|
+
**Resolve all comments** sits beside every **Mark all as seen** - a board's, a folder's, a scene's,
|
|
99
|
+
and the Mac app's tab menu - for when the bubbles are noise (0.31). It resolves what that row shows,
|
|
100
|
+
never a log: a board's every open thread on the frames it shows, a folder's over all its boards and
|
|
101
|
+
sub-folders, a scene's on its frames, the tab's every open thread on the canvas. It is the same as
|
|
102
|
+
resolving each one by hand - Jam's questions, reviews and failed runs on them are finished - except
|
|
103
|
+
live work: a thread Jam is queued or working on is left open and counted ("2 left open: work in
|
|
104
|
+
progress"). The notice says how many, with **Undo**: it reopens each thread nothing happened in since - no
|
|
105
|
+
reply, edit, reaction, resolve or reopen ("1 changed since - left as is"); what Jam finished stays finished. From the terminal: `npx marver
|
|
106
|
+
comments resolve --all --board <b>` (`--folder`, `--scene`, `--canvas`, `--dry-run`), then `--undo <op>`
|
|
107
|
+
with the op it prints. Missed the notice's Undo (it shows for 10 seconds)? Every run is kept as
|
|
108
|
+
`design/.local/comment-ops/<op>.json` (its `scope` and `at` say which), and `npx marver comments resolve --undo <op>`
|
|
109
|
+
undoes it. On the board you have open, it saves your latest edits first; while they are not saved it resolves nothing
|
|
110
|
+
and says so ("this board's latest changes are not saved yet"). A published canvas has no Resolve all of its own: run it
|
|
111
|
+
here, and each thread it resolves reaches the published canvas with the next sync.
|
|
112
|
+
|
|
97
113
|
The marks start when `marver dev` starts, so whatever your agent makes before you open the canvas is
|
|
98
114
|
new when you do; everything already there the first time counts as seen. They live in
|
|
99
115
|
`design/.local/`, on this machine only, and a published canvas shows none. `npx marver marks` prints
|
|
100
|
-
them - for you, or for your agent at the start of a session.
|
|
116
|
+
them, and the open conversations per board - for you, or for your agent at the start of a session.
|
|
101
117
|
|
|
102
118
|
**In the Mac app** (0.3, with Marver 0.29), each canvas's tab sums this up, even while it is hidden: an
|
|
103
119
|
orange count of what needs you - Marver's questions, captures to review, runs that failed or stalled -
|
|
104
|
-
else a blue
|
|
105
|
-
|
|
120
|
+
else a blue dot for new frames (no number, from app 1.1), else a shimmer while an agent works, and a teal
|
|
121
|
+
dot while a Jam session runs; while Home is open the tabs drop them: Home shows them. Its right-click menu holds
|
|
122
|
+
**Resolve all comments** beside **Mark all as seen** for a canvas on Marver 0.31 or later. Home's card says the same
|
|
123
|
+
in words ("2 questions on Checkout", "3 new frames to look at"), and with Marver 0.32 (app 1.2) which board an agent
|
|
124
|
+
works on and for how long ([Home](app.md#home)). Turn notices on and a canvas you are not looking at sends one when something new needs you, and the
|
|
106
125
|
Dock counts them all. Clicking a notice opens what it names where you can see it, on its board: a question
|
|
107
126
|
in its thread on the frame (Play left and hidden pins shown for it), or in a panel with a field to answer
|
|
108
127
|
when no frame on the board holds it; a review in its review; a failed run with Retry in view, a stalled
|
|
@@ -239,7 +258,8 @@ confirmed.
|
|
|
239
258
|
**An agent at work.** While an agent works on a board's frames (`marver work start`, or a Live Jam
|
|
240
259
|
job), that board's icon in the sidebar turns accent blue with a highlight sweeping across it - the
|
|
241
260
|
frames' working shimmer, in miniature - and so does a closed folder holding it. It lasts exactly as
|
|
242
|
-
long as the work, so nobody sets it.
|
|
261
|
+
long as the work, so nobody sets it. In the Mac app (1.2, with Marver 0.32), the canvas's Home card reads "Agent
|
|
262
|
+
working on <board> · N min", counted from when the work began: a Jam run waiting for its turn does not count.
|
|
243
263
|
|
|
244
264
|
## Starting points
|
|
245
265
|
|
|
@@ -274,7 +294,21 @@ last); frames that sit on several boards get one link per board, and a frame on
|
|
|
274
294
|
instead of a link. `--board` picks one. The link reads `#/b/<board>?f=<scene/frame>,...` (or
|
|
275
295
|
`?s=<scene>` for a whole scene), and a link naming a frame its board does not show follows the
|
|
276
296
|
frame to where it lives. `npx marver work done` prints the same links for the frames it clears, so an
|
|
277
|
-
agent's reply ends with them.
|
|
297
|
+
agent's reply ends with them. When the Mac app has this canvas open in a tab, each of them is a `marver://` link that
|
|
298
|
+
opens it there ([Links into the app](app.md#links-into-the-app)); `--web` prints the localhost link anyway.
|
|
299
|
+
|
|
300
|
+
## Showing you a place
|
|
301
|
+
|
|
302
|
+
`npx marver show <scene/frame | scene ... | board>` (needs `marver dev`) moves every tab where this canvas is open to
|
|
303
|
+
that place - its board, selected, the camera fitted, even when it is already there - and in the Mac app brings that tab
|
|
304
|
+
and the window forward. A name alone is a board, fitted whole, when no frame or scene has that name. `--thread <id>`
|
|
305
|
+
opens a comment thread there too; frames on two boards are refused (show one board at a time). A tab where you are
|
|
306
|
+
typing (a comment, a Jam edit) or recording a capture does not move: it says "Your agent wants to show you <title> ·
|
|
307
|
+
Go", and Go takes you. Click, pan or press a key while it is on its way and yours wins: it stops. The command waits 3
|
|
308
|
+
seconds and says "shown in 2 tabs" (or "not shown - no open tab took it" when no tab answered), then prints the link. Agents run it only
|
|
309
|
+
when you ask to be shown; otherwise they give the link.
|
|
310
|
+
|
|
311
|
+
A focus link (`#/f/<frame>`) opened on your dev canvas now has its way
|
|
278
312
|
back to the canvas (the grid button, or Esc); on a published canvas a focus link stays a page of
|
|
279
313
|
its own.
|
|
280
314
|
|
package/docs/jam-session.md
CHANGED
|
@@ -229,6 +229,11 @@ Threads live in `design/comments/<board>.jsonl`, which is committed with the res
|
|
|
229
229
|
comment would. They never reach a published canvas: `marver build` and `marver comments sync`
|
|
230
230
|
leave capture threads (and Marver's notes and replies) on your machine. The session
|
|
231
231
|
**record** your agent writes goes to `context/sessions/`, also meant to be committed.
|
|
232
|
+
|
|
233
|
+
In its thread, a capture's own comment can be deleted but not edited (0.31): Jam keeps the words it took, so an edit
|
|
234
|
+
would change what you see and never what your agent gets. Deleting it withdraws a capture your agent has not been
|
|
235
|
+
handed yet, as deleting a tagged comment does ([A deleted comment](live-jam.md#a-deleted-comment-031)); its tile reads
|
|
236
|
+
"Withdrawn capture".
|
|
232
237
|
Published canvases carry none of Jam: no captures, no queue, no microphone.
|
|
233
238
|
|
|
234
239
|
## A capture left on an old address
|