@marver-design/marver 0.32.0 → 0.33.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 +9 -0
- package/dist/{anchor-check-DZtX13ly.mjs → anchor-check-KCe6WeRA.mjs} +1 -1
- package/dist/{build-D2dHEWX-.mjs → build-4-k2XhhX.mjs} +3 -3
- package/dist/cli.mjs +4 -4
- package/dist/{comment-actions-Bxf9Ld4g.mjs → comment-actions-BCBcd-Wq.mjs} +12 -5
- package/dist/{comments-ocvsnt2j.mjs → comments-C2SN1QdM.mjs} +2 -2
- package/dist/{daemon-D6TrdgMi.mjs → daemon-CCDgagw2.mjs} +1 -1
- package/dist/{dev-DMQYbw-2.mjs → dev-CJf5upVK.mjs} +7 -7
- package/dist/{pdf-Cf9GIoIM.mjs → pdf-GGya_nI6.mjs} +2 -2
- package/dist/{plugin-DesQP9L5.mjs → plugin-Cm74UDfp.mjs} +11 -11
- package/dist/{poster-Bb6WraCA.mjs → poster-BnuT9UyW.mjs} +1 -1
- package/dist/{publish-bakes-EjMmukJB.mjs → publish-bakes-zHmPEOB5.mjs} +2 -2
- package/dist/{recover-B3dmatx4.mjs → recover-BpRQxBA7.mjs} +1 -1
- package/dist/{shot-Bjt2MQe3.mjs → shot-HZtclbOT.mjs} +2 -2
- package/docs/app.md +12 -1
- package/docs/boards-and-folders.md +4 -2
- package/package.json +1 -1
- package/src/client/shell/App.tsx +5 -1
- package/src/client/shell/marks-ui.tsx +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
Notable changes to `@marver-design/marver`. Format follows [Keep a Changelog](https://keepachangelog.com); versions follow semver.
|
|
4
4
|
|
|
5
|
+
## 0.33.0 - 2026-11-13
|
|
6
|
+
|
|
7
|
+
### Highlights
|
|
8
|
+
|
|
9
|
+
- **Mark as seen and Resolve comments on one frame.** Right-click a frame in the sidebar: next to Copy path, **Mark as
|
|
10
|
+
seen** clears its blue dot, and **Resolve comments** resolves every open conversation on it, with Undo (never what Jam
|
|
11
|
+
is working on). Each shows only when there is something to do. They were only on a scene, a board or a folder before.
|
|
12
|
+
[Boards and folders](docs/boards-and-folders.md)
|
|
13
|
+
|
|
5
14
|
## 0.32.0 - 2026-11-11
|
|
6
15
|
|
|
7
16
|
### Highlights
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { a as frameUrl, d as withBrowser, n as MOUNTED, o as manifestFrame, s as planShot } from "./shot-
|
|
1
|
+
import { a as frameUrl, d as withBrowser, n as MOUNTED, o as manifestFrame, s as planShot } from "./shot-HZtclbOT.mjs";
|
|
2
2
|
//#region src/server/anchor-check.ts
|
|
3
3
|
/**
|
|
4
4
|
* The anchor check (spec 26, Part 6): `comments new --on|--at`, `comments move` and a Live Jam re-pin
|
|
@@ -6,7 +6,7 @@ import { a as readLog, o as shareable, r as legacyExposure, t as appendEvents }
|
|
|
6
6
|
import { t as detectHost } from "./detect-C0wpaePX.mjs";
|
|
7
7
|
import { a as publishLogo, r as logoIcons } from "./logo-C9s7-Cy9.mjs";
|
|
8
8
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
9
|
-
import { d as canvasIdentity, n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-
|
|
9
|
+
import { d as canvasIdentity, n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-Cm74UDfp.mjs";
|
|
10
10
|
import { i as measuringFrames, n as autoWidthOf, o as readSizes, r as keptSizes } from "./sizes-BckcL4Zz.mjs";
|
|
11
11
|
import { cpSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
12
12
|
import { dirname, join, sep } from "node:path";
|
|
@@ -790,7 +790,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
|
|
|
790
790
|
const realAssets = existsSync(assetsDir) ? realpathSync(assetsDir) : null;
|
|
791
791
|
for (const r of refs) {
|
|
792
792
|
if (!isLocalAssetRef(r) || !r.endsWith(".poster.png") || existsSync(join(assetsDir, r))) continue;
|
|
793
|
-
const { ensurePoster } = await import("./poster-
|
|
793
|
+
const { ensurePoster } = await import("./poster-BnuT9UyW.mjs");
|
|
794
794
|
const g = await ensurePoster(assetsDir, r.slice(0, -11));
|
|
795
795
|
if (!g.ok) throw new Error(`design/assets/${r}: ${g.error}`);
|
|
796
796
|
console.log(` poster: rendered design/assets/${r} (${g.width}×${g.height})`);
|
|
@@ -849,7 +849,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
|
|
|
849
849
|
}));
|
|
850
850
|
let textureLine = " textures: skipped (--no-textures)";
|
|
851
851
|
if (textures && bakeGen) {
|
|
852
|
-
const { bakePublished } = await import("./publish-bakes-
|
|
852
|
+
const { bakePublished } = await import("./publish-bakes-zHmPEOB5.mjs");
|
|
853
853
|
const pubFrameFile = new Map(pubFrames.map((f) => [f.id, f]));
|
|
854
854
|
const r = await bakePublished({
|
|
855
855
|
root,
|
package/dist/cli.mjs
CHANGED
|
@@ -90,7 +90,7 @@ cli.command("init", "Scaffold design/ in this repo").option("--mode <mode>", "st
|
|
|
90
90
|
});
|
|
91
91
|
});
|
|
92
92
|
for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot reload, comments, Live Jam)"], ["canvas", "Start the local canvas - same as dev"]]) cli.command(name, desc).option("--root <dir>", "Host repo root", { default: "." }).option("--port <port>", "A port of its own (default: a free slot, localhost:4805-4824 - usually the same one next time; a port in that range takes exactly that slot)").option("--recover [n]", "Run on an address this canvas had before, where an unsent Jam capture waits: alone it lists them; with a number it starts on that one; --recover --port <p>: the port 0.26 used").action(async (opts) => {
|
|
93
|
-
const { dev, DevStartError, DevLockError } = await import("./dev-
|
|
93
|
+
const { dev, DevStartError, DevLockError } = await import("./dev-CJf5upVK.mjs");
|
|
94
94
|
let port;
|
|
95
95
|
if (opts.port !== void 0) {
|
|
96
96
|
const n = Number(opts.port);
|
|
@@ -102,7 +102,7 @@ for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot
|
|
|
102
102
|
process.exit(1);
|
|
103
103
|
};
|
|
104
104
|
try {
|
|
105
|
-
if (opts.recover !== void 0 && opts.recover !== false) await (await import("./recover-
|
|
105
|
+
if (opts.recover !== void 0 && opts.recover !== false) await (await import("./recover-BpRQxBA7.mjs")).recoverCommand(resolve$1(opts.root), opts.recover, port, { onFail });
|
|
106
106
|
else await dev(resolve$1(opts.root), {
|
|
107
107
|
port,
|
|
108
108
|
onFail
|
|
@@ -118,7 +118,7 @@ cli.command("ls", "The canvases running on this Mac: slot, link, name, version,
|
|
|
118
118
|
(await import("./ls-DGVIW-Io.mjs")).lsCommand({ json: opts.json === true });
|
|
119
119
|
});
|
|
120
120
|
cli.command("build", "Static export → design/.dist (what ships comes from design/publish.json - publishing is default-closed)").option("--boards <names>", "Publish only these boards (comma-separated); overrides the publish policy").option("--all-boards", "Publish every board - the loud override for the default-closed policy").option("--embed-seeds", "Copy comment history INTO the web root (identifying - every event carries its author's email)").option("--no-textures", "Skip compiling the glass textures the published frames rest under (needs Chrome; a CI without one skips on its own)").option("--root <dir>", "Host repo root", { default: "." }).action(async (opts) => {
|
|
121
|
-
const { buildSite } = await import("./build-
|
|
121
|
+
const { buildSite } = await import("./build-4-k2XhhX.mjs");
|
|
122
122
|
try {
|
|
123
123
|
const boards = opts.boards === void 0 ? void 0 : typeof opts.boards === "string" ? opts.boards : "";
|
|
124
124
|
await buildSite(resolve$1(opts.root), boards, opts.allBoards === true, opts.embedSeeds === true, opts.textures !== false && !process.env.MARVER_NO_TEXTURES);
|
|
@@ -137,7 +137,7 @@ cli.command("serve", "Serve design/.dist (set MARVER_PASSWORD to gate it)").opti
|
|
|
137
137
|
serve(resolve$1(opts.root), port);
|
|
138
138
|
});
|
|
139
139
|
cli.command("comments <action> [value]", "Comment collaboration: connect <url> · sync · list · new <scene/frame> · reply <thread> · move <thread> · resolve <thread> | --all · invite <email> · revoke <email>. Nothing here edits or deletes a message: people do their own on the canvas, and Marver's have no Edit or Delete - correct a wrong note in its thread").option("--root <dir>", "Host repo root", { default: "." }).option("--token <token>", "connect: the canvas's MARVER_CLI_TOKEN (default $MARVER_CLI_TOKEN) - the identity-mode path").option("--invite <token>", "connect: claim this invite instead of signing in").option("--canvas-password <password>", "connect: the canvas gate password (default $MARVER_PASSWORD or prompt)").option("--email <email>", "connect: account email (skips the prompt)").option("--password <password>", "connect: account password (skips the prompt - mind your shell history)").option("--name <name>", "connect --invite: display name for the new account").option("--open", "list: only unresolved threads").option("--json", "list: machine-readable output").option("--board <board>", "list: scope to one board · new: the board to pin on (default: the one its link opens) · resolve --all: the threads on frames this board shows").option("--body <text>", "new / reply: the text").option("--on <text>", "new / move: pin on the element showing these words").option("--at <selector>", "new / move: pin on the element this data-testid or CSS selector names (an element without words, like an icon)").option("--nth <n>", "new / move: which of several matching elements (1 = the first)").option("--viewport <name>", "new / move: check the frame at this viewport (default: its own)").option("--theme <name>", "new / move: check the frame in this theme (default: light)").option("--thread <id>", "new: add the note to this open thread instead of pinning a new one").option("--fyi", "new: the note asks nothing (default: it asks - it comes first for the human)").option("--ask", "reply: the reply asks the human something").option("--addressed-in <frame>", "resolve: the variant frame that answered the feedback").option("--all", "resolve: every open thread in a scope - with --board, --folder, --scene or --canvas (ask the human first)").option("--folder <folder>", "resolve --all: the threads on every board in this folder, sub-folders included").option("--scene <scene>", "resolve --all: the threads on this scene's frames").option("--canvas", "resolve --all: every open thread on the canvas").option("--dry-run", "resolve --all: count what it would resolve, write nothing").option("--undo <op>", "resolve: undo a resolve --all by the op id it printed").action(async (action, value, opts) => {
|
|
140
|
-
const { commentsCommand } = await import("./comments-
|
|
140
|
+
const { commentsCommand } = await import("./comments-C2SN1QdM.mjs");
|
|
141
141
|
try {
|
|
142
142
|
await commentsCommand(resolve$1(opts.root), action, value, opts);
|
|
143
143
|
} catch (err) {
|
|
@@ -12,7 +12,8 @@ import { createHash } from "node:crypto";
|
|
|
12
12
|
* Resolve all comments, and its Undo (spec 31 B.1-B.5) - one core for the dev server's routes and the CLI.
|
|
13
13
|
*
|
|
14
14
|
* Scope is what you see, never a log: a board = the open threads on frames that board shows; a folder = the union
|
|
15
|
-
* over its boards, sub-folders included; a scene = the threads on that scene's frames;
|
|
15
|
+
* over its boards, sub-folders included; a scene = the threads on that scene's frames; a frame = its own threads (the
|
|
16
|
+
* sidebar's frame row, 0.33); the canvas = every open
|
|
16
17
|
* thread. Each resolve is written to its thread's own log, so it is the same as resolving each by hand - Jam's
|
|
17
18
|
* `asks`, `review` and `failed` items on it complete when the queue ingests it - except live work: a thread whose
|
|
18
19
|
* Jam card is queued or working (or whose tag is written and not yet queued) is skipped and counted. The check and
|
|
@@ -27,19 +28,24 @@ import { createHash } from "node:crypto";
|
|
|
27
28
|
*/
|
|
28
29
|
const OP_RE = /^[\w-]{8,64}$/;
|
|
29
30
|
const SCENE_RE = /^[A-Za-z0-9_][\w.-]*$/;
|
|
31
|
+
/** A frame id: its path under design/scenes/, without the extension (`website-v2/7-urls`). Only its shape is checked
|
|
32
|
+
* here - any name the manifest scans (`demo/-draft`, `demo/café`) - since scopeFrames takes exactly the manifest's ids:
|
|
33
|
+
* slash-separated, no empty, `.` or `..` segment, no backslash or NUL. */
|
|
34
|
+
const isFrameId = (v) => typeof v === "string" && v.length > 0 && v.length <= 300 && !/[\\\0]/.test(v) && v.split("/").every((p) => p !== "" && p !== "." && p !== "..");
|
|
30
35
|
/** Exactly one scope, every name on its grammar - else what is wrong. An empty or malformed one is refused,
|
|
31
36
|
* never read as the whole canvas. */
|
|
32
37
|
function parseScope(raw) {
|
|
33
|
-
if (!raw || typeof raw !== "object" || Array.isArray(raw)) return "expected a scope: {board} | {folder} | {scene} | {canvas: true}";
|
|
34
|
-
if (Object.keys(raw).length !== 1) return "name exactly one scope: board, folder, scene or canvas";
|
|
38
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw)) return "expected a scope: {board} | {folder} | {scene} | {frame} | {canvas: true}";
|
|
39
|
+
if (Object.keys(raw).length !== 1) return "name exactly one scope: board, folder, scene, frame or canvas";
|
|
35
40
|
const o = raw;
|
|
36
41
|
if ("board" in o) return isBoardName(o.board) ? { board: o.board } : "invalid board name";
|
|
37
42
|
if ("folder" in o) return isBoardName(o.folder) ? { folder: o.folder } : "invalid folder name";
|
|
38
43
|
if ("scene" in o) return typeof o.scene === "string" && o.scene.length <= 120 && (o.scene === "" || SCENE_RE.test(o.scene)) ? { scene: o.scene } : "invalid scene name";
|
|
44
|
+
if ("frame" in o) return isFrameId(o.frame) ? { frame: o.frame } : "invalid frame id";
|
|
39
45
|
if ("canvas" in o) return o.canvas === true ? { canvas: true } : "canvas scope is {canvas: true}";
|
|
40
|
-
return "unknown scope - board, folder, scene or canvas";
|
|
46
|
+
return "unknown scope - board, folder, scene, frame or canvas";
|
|
41
47
|
}
|
|
42
|
-
const scopeLabel = (s) => "board" in s ? `board ${s.board}` : "folder" in s ? `folder ${s.folder}` : "scene" in s ? s.scene ? `scene ${s.scene}` : "the root scene" : "the canvas";
|
|
48
|
+
const scopeLabel = (s) => "board" in s ? `board ${s.board}` : "folder" in s ? `folder ${s.folder}` : "scene" in s ? s.scene ? `scene ${s.scene}` : "the root scene" : "frame" in s ? `frame ${s.frame}` : "the canvas";
|
|
43
49
|
/** The frames a scope covers (null = the whole canvas), or why it names nothing. */
|
|
44
50
|
function scopeFrames(root, scope) {
|
|
45
51
|
if ("canvas" in scope) return { frames: null };
|
|
@@ -49,6 +55,7 @@ function scopeFrames(root, scope) {
|
|
|
49
55
|
const ids = manifest.filter((f) => f.scene === scope.scene).map((f) => f.id);
|
|
50
56
|
return ids.length ? { frames: new Set(ids) } : { error: scope.scene ? `no scene "${scope.scene}"` : "no frames in the root scene" };
|
|
51
57
|
}
|
|
58
|
+
if ("frame" in scope) return live.includes(scope.frame) ? { frames: /* @__PURE__ */ new Set([scope.frame]) } : { error: `no frame "${scope.frame}"` };
|
|
52
59
|
const dir = join(root, "design", "boards");
|
|
53
60
|
const files = checkBoardsDir(root, dir) ? [] : listBoardFiles(dir).boards;
|
|
54
61
|
const framesOf = (names) => new Set(names.flatMap((n) => framesOn(files.find((b) => b.name === n)?.json, live)));
|
|
@@ -237,7 +237,7 @@ async function commentsCommand(root, action, value, opts) {
|
|
|
237
237
|
* an agent alone: the guide says to ask, with the counts \`--dry-run\` prints. */
|
|
238
238
|
const resolveAllCli = async (root, value, opts) => {
|
|
239
239
|
if (value) throw new Error(`resolve --all takes no thread id - name a scope: --board, --folder, --scene or --canvas`);
|
|
240
|
-
const ca = await import("./comment-actions-
|
|
240
|
+
const ca = await import("./comment-actions-BCBcd-Wq.mjs");
|
|
241
241
|
const named = [
|
|
242
242
|
opts.board !== void 0 && { board: String(opts.board) },
|
|
243
243
|
opts.folder !== void 0 && { folder: String(opts.folder) },
|
|
@@ -294,7 +294,7 @@ const viaDev = async (root, action, body) => {
|
|
|
294
294
|
throw new Error(`\`${NAME} dev\` is running but did not answer (${last}) - run it again (what it already did stays done)`);
|
|
295
295
|
};
|
|
296
296
|
const resolveUndo = async (root, op) => {
|
|
297
|
-
const ca = await import("./comment-actions-
|
|
297
|
+
const ca = await import("./comment-actions-BCBcd-Wq.mjs");
|
|
298
298
|
const u = readDevInfo(root) ? await viaDev(root, "undo", { op }) : ca.undoResolveAll(root, op);
|
|
299
299
|
if ("error" in u) throw new Error(u.error);
|
|
300
300
|
console.log(` ${ca.undoSummary(u)}`);
|
|
@@ -13,7 +13,7 @@ import { C as refusedAsk, S as parseMembers, T as sharedWhy, _ as wordsUntil, a
|
|
|
13
13
|
import { a as recordFile, c as storeWrapup, i as readWrapup, l as wrapupWithoutDeleted, n as buildWrapup, o as recordPathProblem, r as moreOf, t as SESSION_ID } from "./session-DBF-nQvq.mjs";
|
|
14
14
|
import { act, addCapture, addWrapup, answeredSince, beginStep, captureComment, captureIntact, conflictStep, createQueue, ctxFor, deletedEvents, dropDeleted, endSession, endStep, fail, failCard, form, joinAlone, liveThreads, looksGood, moreWrapup, ownerOnly, payloadKey, pending, prune, r as releaseLock, redelivering, requeue, runsAlone, sameComment, settle, startSession, stillOwned, t as acquireLock, textOf, tombstonesOf, undelivered, withdrawnCaptures, wrapupIntact, wrapupOf } from "./queue-BLLfdlDw.mjs";
|
|
15
15
|
import { d as logJam } from "./perf-BA_NDarr.mjs";
|
|
16
|
-
import { i as jamLive } from "./plugin-
|
|
16
|
+
import { i as jamLive } from "./plugin-Cm74UDfp.mjs";
|
|
17
17
|
import { t as PROTECTED_GLOBS } from "./permit-DDa6wqOs.mjs";
|
|
18
18
|
import { jamReservations, restoreHolds } from "./reserve-BURNQ2Y3.mjs";
|
|
19
19
|
import { recordOwn } from "./own-C8Mq0Hnf.mjs";
|
|
@@ -2,7 +2,7 @@ import { i as PKG, r as NAME } from "./cli.mjs";
|
|
|
2
2
|
import { _ as runIdentity, a as notePrefer, c as ranDevBefore, f as startedWhere, i as marverHome, o as originOf, p as stopPrefer, s as place, t as forgetDevTraces } from "./slots-BOcfIqxy.mjs";
|
|
3
3
|
import { t as detectHost } from "./detect-C0wpaePX.mjs";
|
|
4
4
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
5
|
-
import { c as installedVersion, d as canvasIdentity, f as identityNudge, n as tailwind3Css, o as liveChanged, r as tailwind4Plugin, t as marverPlugin } from "./plugin-
|
|
5
|
+
import { c as installedVersion, d as canvasIdentity, f as identityNudge, n as tailwind3Css, o as liveChanged, r as tailwind4Plugin, t as marverPlugin } from "./plugin-Cm74UDfp.mjs";
|
|
6
6
|
import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, watch, writeSync } from "node:fs";
|
|
7
7
|
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
8
8
|
import { fileURLToPath } from "node:url";
|
|
@@ -1021,7 +1021,7 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1021
1021
|
if (fromConfig !== void 0 && !placed.fellBackFrom) console.log(` this canvas keeps its own port (${fromConfig} in design/config.ts); remove it to use the slots\n`);
|
|
1022
1022
|
setTimeout(async () => {
|
|
1023
1023
|
try {
|
|
1024
|
-
await (await import("./shot-
|
|
1024
|
+
await (await import("./shot-HZtclbOT.mjs").then((n) => n.u)).sweepGhosts((m) => console.log(` ${m}`));
|
|
1025
1025
|
} catch {}
|
|
1026
1026
|
}, 0);
|
|
1027
1027
|
try {
|
|
@@ -1108,8 +1108,8 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1108
1108
|
console.log(` comments: could not record who wrote what here - ${err.message}`);
|
|
1109
1109
|
}
|
|
1110
1110
|
if (config.jam) {
|
|
1111
|
-
const { startJam } = await import("./daemon-
|
|
1112
|
-
const { checkAnchor } = await import("./anchor-check-
|
|
1111
|
+
const { startJam } = await import("./daemon-CCDgagw2.mjs");
|
|
1112
|
+
const { checkAnchor } = await import("./anchor-check-KCe6WeRA.mjs");
|
|
1113
1113
|
const jam = startJam(root, config.jam, (m) => console.log(m), (board) => {
|
|
1114
1114
|
server.ws.send("sh:jam-comment", { board });
|
|
1115
1115
|
liveChanged();
|
|
@@ -1126,13 +1126,13 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1126
1126
|
return () => {
|
|
1127
1127
|
due ??= setTimeout(async () => {
|
|
1128
1128
|
due = null;
|
|
1129
|
-
const { jamLive } = await import("./plugin-
|
|
1129
|
+
const { jamLive } = await import("./plugin-Cm74UDfp.mjs").then((n) => n.a);
|
|
1130
1130
|
server.ws.send("sh:jam-queue", jamLive.view?.() ?? { cards: [] });
|
|
1131
1131
|
liveChanged();
|
|
1132
1132
|
}, 60);
|
|
1133
1133
|
};
|
|
1134
1134
|
})(), async (frameId, theme, entry, size) => {
|
|
1135
|
-
const { shootFrame } = await import("./shot-
|
|
1135
|
+
const { shootFrame } = await import("./shot-HZtclbOT.mjs").then((n) => n.u);
|
|
1136
1136
|
const r = await shootFrame({
|
|
1137
1137
|
root,
|
|
1138
1138
|
viewports: config.viewports,
|
|
@@ -1153,7 +1153,7 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1153
1153
|
t.defer(() => jam.stop());
|
|
1154
1154
|
if (config.jam.session !== false) try {
|
|
1155
1155
|
const { ensureConnectors, connectorLine } = await import("./connectors-DekQvKt9.mjs");
|
|
1156
|
-
const { jamLive } = await import("./plugin-
|
|
1156
|
+
const { jamLive } = await import("./plugin-Cm74UDfp.mjs").then((n) => n.a);
|
|
1157
1157
|
const results = ensureConnectors(root);
|
|
1158
1158
|
jamLive.connectors = results;
|
|
1159
1159
|
const line = connectorLine(results);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { a as ROUTE, o as slideSize } from "./cli.mjs";
|
|
2
2
|
import { s as checkRealDirs } from "./boards-Cim1GTKc.mjs";
|
|
3
3
|
import { n as BOARD_NAME } from "./board-tree-DGj0HhEE.mjs";
|
|
4
|
-
import { s as onPdfReset } from "./plugin-
|
|
5
|
-
import { c as pool, f as staleSurface, p as Browser } from "./shot-
|
|
4
|
+
import { s as onPdfReset } from "./plugin-Cm74UDfp.mjs";
|
|
5
|
+
import { c as pool, f as staleSurface, p as Browser } from "./shot-HZtclbOT.mjs";
|
|
6
6
|
import { existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
7
7
|
import { join, sep } from "node:path";
|
|
8
8
|
import { randomBytes } from "node:crypto";
|
|
@@ -14,7 +14,7 @@ import { C as WRITE_MATCH_MS, S as WRITER_HEADERS, _ as ID12, b as RELOAD_BOUNDS
|
|
|
14
14
|
import { c as proofHeaders, i as logoRoute, s as appProofOk, t as findLogo } from "./logo-C9s7-Cy9.mjs";
|
|
15
15
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
16
16
|
import { a as mergeSizes, c as serializeSizes, i as measuringFrames, l as sizesPath, n as autoWidthOf, o as readSizes, r as keptSizes, s as readSizesFile } from "./sizes-BckcL4Zz.mjs";
|
|
17
|
-
import { c as pool, d as withBrowser, h as launchFlags, l as shotConcurrency, p as Browser, r as SURFACE, t as AREA } from "./shot-
|
|
17
|
+
import { c as pool, d as withBrowser, h as launchFlags, l as shotConcurrency, p as Browser, r as SURFACE, t as AREA } from "./shot-HZtclbOT.mjs";
|
|
18
18
|
import { closeSync, copyFileSync, existsSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, utimesSync, watch, writeFileSync } from "node:fs";
|
|
19
19
|
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
20
20
|
import { fileURLToPath } from "node:url";
|
|
@@ -3810,7 +3810,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3810
3810
|
};
|
|
3811
3811
|
const asPng = url.searchParams.get("format") === "png";
|
|
3812
3812
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
3813
|
-
const { shootFrame } = await import("./shot-
|
|
3813
|
+
const { shootFrame } = await import("./shot-HZtclbOT.mjs").then((n) => n.u);
|
|
3814
3814
|
const r = await shootFrame({
|
|
3815
3815
|
root,
|
|
3816
3816
|
viewports: opts.viewports ?? {},
|
|
@@ -3848,7 +3848,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3848
3848
|
const { readDevInfo } = await import("./work-B4tydWnf.mjs").then((n) => n.c);
|
|
3849
3849
|
const token = readDevInfo(root)?.token;
|
|
3850
3850
|
if (!ownerGated(req) && !(token && req.headers["x-mv-work"] === token)) return json(res, 403, { error: "forbidden" });
|
|
3851
|
-
const pdf = await import("./pdf-
|
|
3851
|
+
const pdf = await import("./pdf-GGya_nI6.mjs");
|
|
3852
3852
|
if (pdfRoute[1] === void 0) {
|
|
3853
3853
|
if (req.method !== "POST") return json(res, 405, { error: "POST to start a PDF" });
|
|
3854
3854
|
const raw = await readBody(req);
|
|
@@ -3954,7 +3954,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3954
3954
|
if (typeof theme !== "string" || !/^[a-z0-9-]+$/i.test(theme)) return json(res, 400, { error: "invalid theme" });
|
|
3955
3955
|
const scale = body.scale === void 0 ? void 0 : body.scale;
|
|
3956
3956
|
if (scale !== void 0 && !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) return json(res, 400, { error: "invalid scale" });
|
|
3957
|
-
const { resolveFrames, shootBatch } = await import("./shot-
|
|
3957
|
+
const { resolveFrames, shootBatch } = await import("./shot-HZtclbOT.mjs").then((n) => n.u);
|
|
3958
3958
|
const sel = resolveFrames(root, body);
|
|
3959
3959
|
if (!sel.ok) return json(res, sel.status, { error: sel.error });
|
|
3960
3960
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
@@ -3988,7 +3988,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3988
3988
|
if (typeof target === "string") return json(res, 400, { error: target });
|
|
3989
3989
|
const others = Array.isArray(b.others) ? b.others.filter((o) => typeof o?.key === "string").slice(0, 200) : [];
|
|
3990
3990
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
3991
|
-
const { checkAnchor, CheckInputError } = await import("./anchor-check-
|
|
3991
|
+
const { checkAnchor, CheckInputError } = await import("./anchor-check-KCe6WeRA.mjs");
|
|
3992
3992
|
try {
|
|
3993
3993
|
return json(res, 200, await checkAnchor({
|
|
3994
3994
|
root,
|
|
@@ -4096,8 +4096,8 @@ function apiMiddleware(root, opts = {}) {
|
|
|
4096
4096
|
return json(res, 400, { error: "malformed JSON" });
|
|
4097
4097
|
}
|
|
4098
4098
|
const src = typeof b?.src === "string" ? b.src : "";
|
|
4099
|
-
const { ensurePoster, isLocalClip } = await import("./poster-
|
|
4100
|
-
const { isLocalAssetRef } = await import("./build-
|
|
4099
|
+
const { ensurePoster, isLocalClip } = await import("./poster-BnuT9UyW.mjs");
|
|
4100
|
+
const { isLocalAssetRef } = await import("./build-4-k2XhhX.mjs");
|
|
4101
4101
|
if (!isLocalAssetRef(src) || !isLocalClip(src)) return json(res, 400, { error: "src must be a clip under design/assets/" });
|
|
4102
4102
|
const r = await ensurePoster(join(root, "design", "assets"), src);
|
|
4103
4103
|
if (!r.ok) return json(res, r.error.includes("does not exist") ? 404 : 503, { error: r.error });
|
|
@@ -4553,7 +4553,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
4553
4553
|
if (!b || typeof b.capture !== "string" || !CAPTURE_ID.test(b.capture) || typeof b.frame !== "string") return json(res, 400, { error: "expected { capture, frame, theme?, viewport? }" });
|
|
4554
4554
|
if (readCapture(root, b.capture)) return json(res, 409, { error: "that capture is sealed" });
|
|
4555
4555
|
const theme = typeof b.theme === "string" && /^[a-z0-9-]+$/i.test(b.theme) ? b.theme : "light";
|
|
4556
|
-
const { shootFrame } = await import("./shot-
|
|
4556
|
+
const { shootFrame } = await import("./shot-HZtclbOT.mjs").then((n) => n.u);
|
|
4557
4557
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
4558
4558
|
const vp = typeof b.viewport === "string" ? opts.viewports?.[b.viewport] : void 0;
|
|
4559
4559
|
const dim = (v) => typeof v === "number" && Number.isFinite(v) ? Math.round(v) : void 0;
|
|
@@ -4641,7 +4641,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
4641
4641
|
} catch {
|
|
4642
4642
|
return json(res, 400, { error: "malformed JSON" });
|
|
4643
4643
|
}
|
|
4644
|
-
const ca = await import("./comment-actions-
|
|
4644
|
+
const ca = await import("./comment-actions-BCBcd-Wq.mjs");
|
|
4645
4645
|
const { jamLive } = await Promise.resolve().then(() => live_exports);
|
|
4646
4646
|
if (typeof b?.op !== "string" || !ca.OP_RE.test(b.op)) return json(res, 400, { error: "expected { op: <8-64 char token>, ... }" });
|
|
4647
4647
|
if (path === "comment-actions/undo") {
|
|
@@ -5682,7 +5682,7 @@ function marverPlugin(ctx) {
|
|
|
5682
5682
|
server.httpServer?.once("close", () => resetPdf(root));
|
|
5683
5683
|
server.middlewares.use((req, res, next) => {
|
|
5684
5684
|
if (!(req.url ?? "").startsWith(`/__mv/handout/`)) return next();
|
|
5685
|
-
import("./pdf-
|
|
5685
|
+
import("./pdf-GGya_nI6.mjs").then((m) => m.handoutMiddleware()(req, res, next), next);
|
|
5686
5686
|
});
|
|
5687
5687
|
server.middlewares.use(apiMiddleware(root, {
|
|
5688
5688
|
viewports: config.viewports,
|
|
@@ -5968,7 +5968,7 @@ function marverPlugin(ctx) {
|
|
|
5968
5968
|
});
|
|
5969
5969
|
return;
|
|
5970
5970
|
}
|
|
5971
|
-
const { shootFrame, shootBatch, resolveFrames } = await import("./shot-
|
|
5971
|
+
const { shootFrame, shootBatch, resolveFrames } = await import("./shot-HZtclbOT.mjs").then((n) => n.u);
|
|
5972
5972
|
if (ways[0] === "frame") {
|
|
5973
5973
|
if (typeof spec.frame !== "string") {
|
|
5974
5974
|
write({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { i as capture, m as findChrome } from "./shot-
|
|
1
|
+
import { i as capture, m as findChrome } from "./shot-HZtclbOT.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,6 +1,6 @@
|
|
|
1
1
|
import { o as slideSize } from "./cli.mjs";
|
|
2
|
-
import { l as ASK_MAX, u as bakeBatch } from "./plugin-
|
|
3
|
-
import { m as findChrome, s as planShot } from "./shot-
|
|
2
|
+
import { l as ASK_MAX, u as bakeBatch } from "./plugin-Cm74UDfp.mjs";
|
|
3
|
+
import { m as findChrome, s as planShot } from "./shot-HZtclbOT.mjs";
|
|
4
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";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { r as NAME } from "./cli.mjs";
|
|
2
2
|
import { d as recoverTarget, r as legacyEntry, u as recoverEntries, v as workspaceId } from "./slots-BOcfIqxy.mjs";
|
|
3
|
-
import { DevStartError, dev } from "./dev-
|
|
3
|
+
import { DevStartError, dev } from "./dev-CJf5upVK.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
|
|
@@ -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-
|
|
528
|
-
const { ensurePoster } = await import("./poster-
|
|
527
|
+
const { scanAssetRefs } = await import("./build-4-k2XhhX.mjs");
|
|
528
|
+
const { ensurePoster } = await import("./poster-BnuT9UyW.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 {}
|
package/docs/app.md
CHANGED
|
@@ -109,6 +109,9 @@ keeps your choice; it starts on Board.
|
|
|
109
109
|
- **Grid**: three sections, Running, Not running and Shared with you, four cards a row. Running holds the cards of the
|
|
110
110
|
board's first four columns, in that order. A section with no card is left out.
|
|
111
111
|
|
|
112
|
+
**D** switches Home, Settings and the strip over them between light and dark, the opposite of what shows (not while
|
|
113
|
+
you type in the link field or a menu is open). Canvases keep their own theme.
|
|
114
|
+
|
|
112
115
|
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
116
|
|
|
114
117
|
| Column | The line |
|
|
@@ -215,6 +218,12 @@ Updates…** checks now and answers in the strip: "Marver 1.0.0 is up to date",
|
|
|
215
218
|
offline" or "Couldn't check for updates · Try again later". While it works, the item reads Checking for Updates… or
|
|
216
219
|
Downloading Update….
|
|
217
220
|
|
|
221
|
+
**Settings shows it too** (Marver > Settings…, its Updates group): Marver and its version, whether it is up to date and
|
|
222
|
+
when it last checked, with Check for updates; "Checking for updates…" and "Downloading the update…" while it works
|
|
223
|
+
(Marver's updater gives no sizes); once one is ready, "What's new in 1.2.1" with its highlights, Release notes and
|
|
224
|
+
Restart to update. **Download updates automatically** (on by default; `autoUpdate` in `config.json`) turned off,
|
|
225
|
+
Marver checks only when you ask.
|
|
226
|
+
|
|
218
227
|
**When an update is ready**, the strip says "1.0.1 is ready" with **Restart to Update** (its tooltip is the first line
|
|
219
228
|
of what changed), and the Marver menu reads Restart to Install Update. Two ways to install it:
|
|
220
229
|
|
|
@@ -299,7 +308,9 @@ and roughly when, and attach the file.
|
|
|
299
308
|
Marver keeps its settings and its state in `~/.marver/`, beside the files `marver dev` keeps there. At every launch
|
|
300
309
|
the app writes a `README.md` in it, for you and your coding agent: every file, every setting, and the rules for
|
|
301
310
|
changing them (edits to the README itself are lost). Settings (Marver > Settings…) writes `config.json` and
|
|
302
|
-
`theme.json
|
|
311
|
+
`theme.json`: Updates, Appearance (System, Light or Dark; D switches light and dark there and on Home), Tabs, Notices
|
|
312
|
+
and Performance, each row with its key's name. A file that does not apply shows at the top of Settings, with what is
|
|
313
|
+
wrong and the file's text; the app keeps the last good one meanwhile. Show the files, in Home's How Marver runs (the ? button), opens the folder; Help > Show Performance Files opens the app's performance records.
|
|
303
314
|
|
|
304
315
|
## Uninstalling
|
|
305
316
|
|
|
@@ -91,14 +91,16 @@ every frame reads lights every frame; **Mark all as seen** on the board clears t
|
|
|
91
91
|
|
|
92
92
|
"Looked at" means you selected it, opened it from the sidebar or a link, opened it in focus or play,
|
|
93
93
|
kept it on screen at a readable zoom (50 % or more) for two seconds, or chose **Mark all as seen** on
|
|
94
|
-
a scene, board or folder - for the version on screen: a change still loading (or behind **Update** in
|
|
94
|
+
a scene, board or folder (**Mark as seen** on one frame's row, 0.33) - for the version on screen: a change still loading (or behind **Update** in
|
|
95
95
|
focus or play) stays new until its new version shows, and a look you made while it loaded counts as
|
|
96
96
|
soon as it does.
|
|
97
97
|
|
|
98
98
|
**Resolve all comments** sits beside every **Mark all as seen** - a board's, a folder's, a scene's,
|
|
99
99
|
and the Mac app's tab menu - for when the bubbles are noise (0.31). It resolves what that row shows,
|
|
100
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.
|
|
101
|
+
sub-folders, a scene's on its frames, the tab's every open thread on the canvas. A frame's own row in
|
|
102
|
+
the sidebar has the pair too (0.33), each only when there is something to do: **Mark as seen** while it
|
|
103
|
+
is new, **Resolve comments** while a conversation on it is open. It is the same as
|
|
102
104
|
resolving each one by hand - Jam's questions, reviews and failed runs on them are finished - except
|
|
103
105
|
live work: a thread Jam is queued or working on is left open and counted ("2 left open: work in
|
|
104
106
|
progress"). The notice says how many, with **Undo**: it reopens each thread nothing happened in since - no
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@marver-design/marver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.33.0",
|
|
4
4
|
"description": "The agent-native design canvas. A design/ folder, one command, a canvas of live frames built from your repo's real components - comment @marver and your own coding agent does the work. The tool ships no AI.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"private": false,
|
package/src/client/shell/App.tsx
CHANGED
|
@@ -37,7 +37,7 @@ import { bootSettled, dismissShow, goNow, showTarget, useShowNotice } from './sh
|
|
|
37
37
|
import { newerVersion } from '../../shared/deep-link.ts'
|
|
38
38
|
import { useNotes } from './notes.ts'
|
|
39
39
|
import { contentOnly } from '../../shared/frames.ts'
|
|
40
|
-
import { nextToLook } from '../../shared/marks.ts'
|
|
40
|
+
import { isNew, nextToLook } from '../../shared/marks.ts'
|
|
41
41
|
import { asksNow, Bubble, MarkedRow, markSeenFrom, resolveAllFrom, useRollup, useSeenOnScreen } from './marks-ui.tsx'
|
|
42
42
|
import { CommentButton, DevicePicker, HideUIButton, LaserButton, Popover, ThemePicker, toggleHideUI, usePopover } from './Toolbar.tsx'
|
|
43
43
|
|
|
@@ -1104,6 +1104,10 @@ export function App() {
|
|
|
1104
1104
|
{ label: 'Copy path', icon: <SignpostIcon size={15} />, onClick: () => { recordCopy('path', fr.id); copyToClipboard(framePath(useStore.getState().board, fr), 'path copied', cmd('copy-path', { via: 'context', in: 'shell', frame: fr.id })) } },
|
|
1105
1105
|
// the Not on a board view (spec 26): put the frame where it belongs
|
|
1106
1106
|
...(useStore.getState().board === UNPLACED ? [{ label: 'Add to board…', icon: <PlusIcon size={15} />, panel: (close: () => void) => <AddToBoard frame={fr.id} close={close} /> }] : []),
|
|
1107
|
+
// the scene row's two, for one frame (0.33) - shown only when there is something to do: its blue dot,
|
|
1108
|
+
// or an open thread on it (one whose first comment was deleted counts: replay keeps it only while replies survive)
|
|
1109
|
+
...(!PUBLISHED && isNew(useStore.getState().marks, fr.id) ? [{ label: 'Mark as seen', icon: <CheckIcon size={15} />, onClick: () => markSeenFrom({ via: 'context', in: 'shell', frame: fr.id }, [fr.id]) }] : []),
|
|
1110
|
+
...(!PUBLISHED && useComments.getState().threads.some((t) => t.frame === fr.id && !t.resolved) ? [{ label: 'Resolve comments', icon: <CheckSquareOffsetIcon size={15} />, onClick: () => void resolveAllFrom({ via: 'context', in: 'shell', frame: fr.id }, { frame: fr.id }) }] : []),
|
|
1107
1111
|
]
|
|
1108
1112
|
const seen = new Set<string>()
|
|
1109
1113
|
const rows: ReactNode[] = []
|
|
@@ -22,8 +22,8 @@ export function markSeenFrom(how: CmdOpts, frames: string[]): void {
|
|
|
22
22
|
s.markSeen(frames)
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
/** A resolve-all scope (spec 31 B.1): what you see - a board, a folder, a scene, or the whole canvas (the app's tab). */
|
|
26
|
-
export type ResolveScope = { board: string } | { folder: string } | { scene: string } | { canvas: true }
|
|
25
|
+
/** A resolve-all scope (spec 31 B.1): what you see - a board, a folder, a scene, one frame (0.33), or the whole canvas (the app's tab). */
|
|
26
|
+
export type ResolveScope = { board: string } | { folder: string } | { scene: string } | { frame: string } | { canvas: true }
|
|
27
27
|
|
|
28
28
|
/** One POST to the dev server's comment actions, tried once more with the same op on no answer (a retry returns the
|
|
29
29
|
* same receipt). */
|