@imenam/mcp-design 1.0.13 → 1.0.15

package/dist/src/core/feedback-model.js

@@ -0,0 +1,211 @@
+import { defaultRoundTitle, elementsInArea, nodeTarget, orderRemarks, roundBox, } from "../../shared/feedback.js";
+import { FeedbackFileSchema, migrateFeedbackFile } from "../../shared/schemas/feedback.schema.js";
+import { DesignError } from "./node-factory.js";
+/**
+ * Règles des remarques et des retours, indépendantes de leur stockage. Chaque
+ * opération modifie un brouillon du fichier des remarques ; l'appelant le
+ * valide puis l'enregistre — dans `remarks.json` pour le serveur, dans le
+ * projet en mémoire pour la version autonome de la GUI.
+ */
+/** Marge autour d'un élément capturé, comme `screenshot_design`. */
+export const NODE_CAPTURE_PADDING = 16;
+export function emptyFeedbackFile() {
+    return { version: 2, remarks: [], rounds: [], lastNumbers: {} };
+}
+function issuesOf(error) {
+    return error.issues.map((issue) => `${issue.path.map(String).join(".")} ${issue.message}`).join("; ");
+}
+/** Lit un fichier des remarques brut, après mise à niveau de son format. */
+export function parseFeedbackFile(raw, label) {
+    const parsed = FeedbackFileSchema.safeParse(migrateFeedbackFile(raw, defaultRoundTitle) ?? raw);
+    if (!parsed.success)
+        throw new DesignError(`${label} does not match the expected schema: ${issuesOf(parsed.error)}`);
+    return parsed.data;
+}
+/** Valide un brouillon modifié avant son enregistrement. */
+export function validatedFeedbackFile(draft) {
+    const parsed = FeedbackFileSchema.safeParse(draft);
+    if (!parsed.success)
+        throw new DesignError(`Resulting remarks file is invalid: ${issuesOf(parsed.error)}`);
+    return parsed.data;
+}
+export function requireRemarkText(text) {
+    const value = typeof text === "string" ? text.trim() : "";
+    if (value === "")
+        throw new DesignError("A remark needs some text.");
+    return value;
+}
+function requireTitle(title) {
+    const value = typeof title === "string" ? title.trim() : "";
+    if (value === "")
+        throw new DesignError("A feedback round needs a name.");
+    return value;
+}
+/** Complète la cible d'après l'état courant du design. */
+export function resolveRemarkTarget(design, input) {
+    if (input.kind === "page")
+        return { kind: "page" };
+    if (input.kind === "node") {
+        if (!design.nodes.some((node) => node.id === input.nodeId)) {
+            throw new DesignError(`Node "${input.nodeId}" not found in design "${design.name}" (${design.id}).`);
+        }
+        return nodeTarget(design.nodes, input.nodeId);
+    }
+    const box = roundBox(input.box);
+    if (!(box.width >= 1 && box.height >= 1))
+        throw new DesignError("A remark area must be at least 1 px wide and high.");
+    if (box.x < 0 || box.y < 0 || box.x + box.width > design.width || box.y + box.height > design.height) {
+        throw new DesignError(`A remark area must lie within the ${design.width}x${design.height} artboard.`);
+    }
+    const hits = new Map(elementsInArea(design.nodes, box).map((hit) => [hit.id, hit]));
+    const elements = input.elementIds.map((id) => {
+        const hit = hits.get(id);
+        if (!hit)
+            throw new DesignError(`Node "${id}" is not inside the remark area.`);
+        return { id: hit.id, name: hit.name, type: hit.type };
+    });
+    return { kind: "area", box, elements };
+}
+/** Ajoute un brouillon ; `capture` est le nom du fichier de capture, ou null. */
+export function addRemark(draft, input) {
+    if (input.target.kind === "page" &&
+        draft.remarks.some((remark) => remark.designId === input.designId && remark.status === "draft" && remark.target.kind === "page")) {
+        throw new DesignError("This page already has a remark on the whole page: edit it instead of adding another one.");
+    }
+    let number = null;
+    if (input.target.kind !== "page") {
+        number = (draft.lastNumbers[input.designId] ?? 0) + 1;
+        draft.lastNumbers[input.designId] = number;
+    }
+    const now = new Date().toISOString();
+    const remark = {
+        id: input.id,
+        designId: input.designId,
+        number,
+        target: input.target,
+        text: requireRemarkText(input.text),
+        capture: input.capture,
+        status: "draft",
+        round: null,
+        createdAt: now,
+        updatedAt: now,
+    };
+    draft.remarks.push(remark);
+    return remark;
+}
+function draftOf(file, id) {
+    const remark = file.remarks.find((candidate) => candidate.id === id);
+    if (!remark)
+        throw new DesignError(`Remark "${id}" not found.`);
+    if (remark.status !== "draft") {
+        throw new DesignError(`Remark "${id}" was sent with feedback round ${remark.round}: it can no longer be edited.`);
+    }
+    return remark;
+}
+export function updateRemarkText(draft, id, text) {
+    const value = requireRemarkText(text);
+    const remark = draftOf(draft, id);
+    remark.text = value;
+    remark.updatedAt = new Date().toISOString();
+    return remark;
+}
+/** Retire une remarque de la liste et la renvoie. */
+export function deleteRemark(draft, id) {
+    const remark = draft.remarks.find((candidate) => candidate.id === id);
+    if (!remark)
+        throw new DesignError(`Remark "${id}" not found.`);
+    draft.remarks = draft.remarks.filter((candidate) => candidate.id !== id);
+    return remark;
+}
+/** Retire les remarques d'un design supprimé et les renvoie. */
+export function deleteDesignRemarks(draft, designId) {
+    const gone = draft.remarks.filter((remark) => remark.designId === designId);
+    draft.remarks = draft.remarks.filter((remark) => remark.designId !== designId);
+    delete draft.lastNumbers[designId];
+    return gone;
+}
+/**
+ * Fige les brouillons choisis dans un nouveau retour nommé, et les marque
+ * transmis. `names` donne le nom de chaque design existant.
+ */
+export function submitRound(draft, remarkIds, title, names) {
+    if (remarkIds.length === 0)
+        throw new DesignError("Select at least one remark to send.");
+    const name = requireTitle(title);
+    const number = draft.rounds.length + 1;
+    const submittedAt = new Date().toISOString();
+    const selected = new Set(remarkIds);
+    const remarks = orderRemarks(draft.remarks.filter((remark) => selected.has(remark.id)));
+    for (const id of selected)
+        draftOf(draft, id);
+    const round = {
+        number,
+        title: name,
+        submittedAt,
+        remarks: remarks.map((remark) => {
+            const designName = names.get(remark.designId);
+            if (designName === undefined)
+                throw new DesignError(`Design "${remark.designId}" of remark "${remark.id}" no longer exists.`);
+            return {
+                id: remark.id,
+                designId: remark.designId,
+                designName,
+                number: remark.number,
+                target: remark.target,
+                text: remark.text,
+                capture: remark.capture,
+                processed: null,
+            };
+        }),
+    };
+    for (const remark of remarks) {
+        remark.status = "sent";
+        remark.round = number;
+        remark.updatedAt = submittedAt;
+    }
+    draft.rounds.push(round);
+    return round;
+}
+function roundOf(file, number) {
+    const round = file.rounds.find((candidate) => candidate.number === number);
+    if (!round)
+        throw new DesignError(`Feedback round ${number} not found. Rounds 1 to ${file.rounds.length} exist.`);
+    return round;
+}
+export function renameRound(draft, number, title) {
+    const name = requireTitle(title);
+    const round = roundOf(draft, number);
+    round.title = name;
+    return round;
+}
+/**
+ * Déclare des remarques d'un retour traitées, ou les rouvre. Une remarque
+ * déjà traitée reste inchangée ; une nouvelle note remplace l'ancienne et
+ * son auteur, en gardant la date d'origine.
+ */
+export function setRemarksProcessed(draft, input) {
+    const note = typeof input.note === "string" && input.note.trim() !== "" ? input.note.trim() : null;
+    const round = roundOf(draft, input.round);
+    const ids = input.remarkIds ?? round.remarks.map((remark) => remark.id);
+    if (ids.length === 0)
+        throw new DesignError("Name at least one remark of the round.");
+    const targets = ids.map((id) => {
+        const remark = round.remarks.find((candidate) => candidate.id === id);
+        if (!remark)
+            throw new DesignError(`Remark "${id}" is not part of feedback round ${round.number}.`);
+        return remark;
+    });
+    const at = new Date().toISOString();
+    for (const remark of targets) {
+        if (!input.processed) {
+            remark.processed = null;
+            continue;
+        }
+        // Une remarque déjà traitée le reste telle quelle, sauf nouvelle note :
+        // tout marquer d'un coup ne réattribue pas le travail de l'agent.
+        if (remark.processed && note === null)
+            continue;
+        remark.processed = { at: remark.processed?.at ?? at, by: input.by, note };
+    }
+    return round;
+}

package/dist/src/core/feedback-store.d.ts

@@ -1,18 +1,8 @@
-import { type FeedbackRound, type Remark } from "../../shared/feedback.js";
-import { type FeedbackFile } from "../../shared/schemas/feedback.schema.js";
-import type { Box } from "../../shared/tree.js";
+import type { FeedbackRound, Remark } from "../../shared/feedback.js";
+import type { FeedbackFile } from "../../shared/schemas/feedback.schema.js";
 import type { DesignStore } from "./design-store.js";
-/** Cible demandée par la GUI ; le serveur la complète d'après le design. */
-export type RemarkTargetInput = {
-    kind: "page";
-} | {
-    kind: "node";
-    nodeId: string;
-} | {
-    kind: "area";
-    box: Box;
-    elementIds: string[];
-};
+import { type RemarkTargetInput, type SetProcessedInput } from "./feedback-model.js";
+export type { RemarkTargetInput, SetProcessedInput };
 export interface AddRemarkInput {
     designId: string;
     target: RemarkTargetInput;
@@ -20,14 +10,6 @@ export interface AddRemarkInput {
     /** Joindre une capture de l'élément ou de la zone. Sans effet sur une remarque de page. */
     capture: boolean;
 }
-export interface SetProcessedInput {
-    round: number;
-    /** Remarques visées ; toutes celles du retour quand omis. */
-    remarkIds?: string[];
-    processed: boolean;
-    by: "agent" | "user";
-    note?: string | null;
-}
 /**
  * Remarques de l'utilisateur et retours transmis à l'agent, dans
  * `<dataDir>/feedback/remarks.json`, captures dans `<dataDir>/feedback/captures`.
@@ -47,11 +29,8 @@ export declare class FeedbackStore {
     rounds(): FeedbackRound[];
     capturePath(name: string): string;
     readCapture(name: string): Buffer;
-    /** Complète la cible d'après l'état courant du design. */
-    private resolveTarget;
     private renderCapture;
     add(input: AddRemarkInput): Remark;
-    private draftOf;
     updateText(id: string, text: string): Remark;
     /**
      * Retire une remarque de la liste. La capture d'un brouillon part avec lui ;
@@ -62,12 +41,6 @@ export declare class FeedbackStore {
     deleteDesign(designId: string): void;
     /** Fige les brouillons choisis dans un nouveau retour nommé, et les marque transmis. */
     submit(remarkIds: string[], title: string): FeedbackRound;
-    private roundOf;
     rename(number: number, title: string): FeedbackRound;
-    /**
-     * Déclare des remarques d'un retour traitées, ou les rouvre. Une remarque
-     * déjà traitée reste inchangée ; une nouvelle note remplace l'ancienne et
-     * son auteur, en gardant la date d'origine.
-     */
     setProcessed(input: SetProcessedInput): FeedbackRound;
 }

package/dist/src/core/feedback-store.js

@@ -1,28 +1,10 @@
 import fs from "fs";
 import path from "path";
-import { defaultRoundTitle, elementsInArea, nodeTarget, orderRemarks, roundBox, } from "../../shared/feedback.js";
-import { FeedbackFileSchema, migrateFeedbackFile } from "../../shared/schemas/feedback.schema.js";
 import { withFileLock } from "./file-lock.js";
 import { shortId } from "./ids.js";
 import { DesignError } from "./node-factory.js";
 import { screenshotDesign } from "./screenshot.js";
-/** Marge autour d'un élément capturé, comme `screenshot_design`. */
-const NODE_CAPTURE_PADDING = 16;
-function emptyFile() {
-    return { version: 2, remarks: [], rounds: [], lastNumbers: {} };
-}
-function requireText(text) {
-    const value = typeof text === "string" ? text.trim() : "";
-    if (value === "")
-        throw new DesignError("A remark needs some text.");
-    return value;
-}
-function requireTitle(title) {
-    const value = typeof title === "string" ? title.trim() : "";
-    if (value === "")
-        throw new DesignError("A feedback round needs a name.");
-    return value;
-}
+import { NODE_CAPTURE_PADDING, addRemark, deleteDesignRemarks, deleteRemark, emptyFeedbackFile, parseFeedbackFile, renameRound, requireRemarkText, resolveRemarkTarget, setRemarksProcessed, submitRound, updateRemarkText, validatedFeedbackFile, } from "./feedback-model.js";
 /**
  * Remarques de l'utilisateur et retours transmis à l'agent, dans
  * `<dataDir>/feedback/remarks.json`, captures dans `<dataDir>/feedback/captures`.
@@ -46,7 +28,7 @@ export class FeedbackStore {
     }
     read() {
         if (!fs.existsSync(this.file))
-            return emptyFile();
+            return emptyFeedbackFile();
         let raw;
         try {
             raw = JSON.parse(fs.readFileSync(this.file, "utf-8"));
@@ -56,26 +38,15 @@ export class FeedbackStore {
         }
         // Un fichier d'une version antérieure est lu au format courant ; il n'est
         // réécrit qu'à la prochaine modification.
-        const parsed = FeedbackFileSchema.safeParse(migrateFeedbackFile(raw, defaultRoundTitle) ?? raw);
-        if (!parsed.success) {
-            throw new DesignError(`The remarks file ${this.file} does not match the expected schema: ${parsed.error.issues
-                .map((issue) => `${issue.path.join(".")} ${issue.message}`)
-                .join("; ")}`);
-        }
-        return parsed.data;
+        return parseFeedbackFile(raw, `The remarks file ${this.file}`);
     }
     mutate(fn) {
         return withFileLock(`${this.file}.lock`, "The remarks file", () => {
             const draft = structuredClone(this.read());
             const result = fn(draft);
-            const parsed = FeedbackFileSchema.safeParse(draft);
-            if (!parsed.success) {
-                throw new DesignError(`Resulting remarks file is invalid: ${parsed.error.issues
-                    .map((issue) => `${issue.path.join(".")} ${issue.message}`)
-                    .join("; ")}`);
-            }
+            const validated = validatedFeedbackFile(draft);
             const tmp = `${this.file}.tmp`;
-            fs.writeFileSync(tmp, JSON.stringify(parsed.data, null, 2), "utf-8");
+            fs.writeFileSync(tmp, JSON.stringify(validated, null, 2), "utf-8");
             fs.renameSync(tmp, this.file);
             return result;
         });
@@ -98,32 +69,6 @@ export class FeedbackStore {
             throw new DesignError(`Capture "${name}" not found in ${this.capturesDir}.`);
         return fs.readFileSync(file);
     }
-    /** Complète la cible d'après l'état courant du design. */
-    resolveTarget(designId, input) {
-        const design = this.designs.get(designId);
-        if (input.kind === "page")
-            return { kind: "page" };
-        if (input.kind === "node") {
-            if (!design.nodes.some((node) => node.id === input.nodeId)) {
-                throw new DesignError(`Node "${input.nodeId}" not found in design "${design.name}" (${design.id}).`);
-            }
-            return nodeTarget(design.nodes, input.nodeId);
-        }
-        const box = roundBox(input.box);
-        if (!(box.width >= 1 && box.height >= 1))
-            throw new DesignError("A remark area must be at least 1 px wide and high.");
-        if (box.x < 0 || box.y < 0 || box.x + box.width > design.width || box.y + box.height > design.height) {
-            throw new DesignError(`A remark area must lie within the ${design.width}x${design.height} artboard.`);
-        }
-        const hits = new Map(elementsInArea(design.nodes, box).map((hit) => [hit.id, hit]));
-        const elements = input.elementIds.map((id) => {
-            const hit = hits.get(id);
-            if (!hit)
-                throw new DesignError(`Node "${id}" is not inside the remark area.`);
-            return { id: hit.id, name: hit.name, type: hit.type };
-        });
-        return { kind: "area", box, elements };
-    }
     renderCapture(designId, target) {
         const design = this.designs.get(designId);
         if (target.kind === "node") {
@@ -134,83 +79,35 @@ export class FeedbackStore {
         throw new DesignError("A page remark has no capture.");
     }
     add(input) {
-        const text = requireText(input.text);
-        const target = this.resolveTarget(input.designId, input.target);
+        const text = requireRemarkText(input.text);
+        const target = resolveRemarkTarget(this.designs.get(input.designId), input.target);
         const id = shortId("rm");
         const capture = input.capture && target.kind !== "page" ? `${id}.png` : null;
         // Rendue hors verrou : la capture ne dépend que du design, et resvg peut
         // prendre plus de temps qu'un autre écrivain n'en accepte d'attendre.
         const png = capture ? this.renderCapture(input.designId, target) : null;
         return this.mutate((draft) => {
-            if (target.kind === "page" &&
-                draft.remarks.some((remark) => remark.designId === input.designId && remark.status === "draft" && remark.target.kind === "page")) {
-                throw new DesignError("This page already has a remark on the whole page: edit it instead of adding another one.");
-            }
-            let number = null;
-            if (target.kind !== "page") {
-                number = (draft.lastNumbers[input.designId] ?? 0) + 1;
-                draft.lastNumbers[input.designId] = number;
-            }
+            const remark = addRemark(draft, { id, designId: input.designId, target, text, capture });
             if (capture && png)
                 fs.writeFileSync(this.capturePath(capture), png);
-            const now = new Date().toISOString();
-            const remark = {
-                id,
-                designId: input.designId,
-                number,
-                target,
-                text,
-                capture,
-                status: "draft",
-                round: null,
-                createdAt: now,
-                updatedAt: now,
-            };
-            draft.remarks.push(remark);
             return remark;
         });
     }
-    draftOf(file, id) {
-        const remark = file.remarks.find((candidate) => candidate.id === id);
-        if (!remark)
-            throw new DesignError(`Remark "${id}" not found.`);
-        if (remark.status !== "draft") {
-            throw new DesignError(`Remark "${id}" was sent with feedback round ${remark.round}: it can no longer be edited.`);
-        }
-        return remark;
-    }
     updateText(id, text) {
-        const value = requireText(text);
-        return this.mutate((draft) => {
-            const remark = this.draftOf(draft, id);
-            remark.text = value;
-            remark.updatedAt = new Date().toISOString();
-            return remark;
-        });
+        return this.mutate((draft) => updateRemarkText(draft, id, text));
     }
     /**
      * Retire une remarque de la liste. La capture d'un brouillon part avec lui ;
      * celle d'une remarque transmise reste, le retour qui la contient la cite.
      */
     delete(id) {
-        const removed = this.mutate((draft) => {
-            const remark = draft.remarks.find((candidate) => candidate.id === id);
-            if (!remark)
-                throw new DesignError(`Remark "${id}" not found.`);
-            draft.remarks = draft.remarks.filter((candidate) => candidate.id !== id);
-            return remark;
-        });
+        const removed = this.mutate((draft) => deleteRemark(draft, id));
         if (removed.status === "draft" && removed.capture)
             fs.rmSync(this.capturePath(removed.capture), { force: true });
     }
     /** Retire les remarques d'un design supprimé, selon la même règle que `delete`. */
     deleteDesign(designId) {
-        const removed = this.mutate((draft) => {
-            const gone = draft.remarks.filter((remark) => remark.designId === designId);
-            draft.remarks = draft.remarks.filter((remark) => remark.designId !== designId);
-            delete draft.lastNumbers[designId];
-            return gone;
-        });
+        const removed = this.mutate((draft) => deleteDesignRemarks(draft, designId));
         for (const remark of removed) {
             if (remark.status === "draft" && remark.capture)
                 fs.rmSync(this.capturePath(remark.capture), { force: true });
@@ -218,91 +115,13 @@ export class FeedbackStore {
     }
     /** Fige les brouillons choisis dans un nouveau retour nommé, et les marque transmis. */
     submit(remarkIds, title) {
-        if (remarkIds.length === 0)
-            throw new DesignError("Select at least one remark to send.");
-        const name = requireTitle(title);
         const names = new Map(this.designs.list().map((design) => [design.id, design.name]));
-        return this.mutate((draft) => {
-            const number = draft.rounds.length + 1;
-            const submittedAt = new Date().toISOString();
-            const selected = new Set(remarkIds);
-            const remarks = orderRemarks(draft.remarks.filter((remark) => selected.has(remark.id)));
-            for (const id of selected)
-                this.draftOf(draft, id);
-            const round = {
-                number,
-                title: name,
-                submittedAt,
-                remarks: remarks.map((remark) => {
-                    const designName = names.get(remark.designId);
-                    if (designName === undefined)
-                        throw new DesignError(`Design "${remark.designId}" of remark "${remark.id}" no longer exists.`);
-                    return {
-                        id: remark.id,
-                        designId: remark.designId,
-                        designName,
-                        number: remark.number,
-                        target: remark.target,
-                        text: remark.text,
-                        capture: remark.capture,
-                        processed: null,
-                    };
-                }),
-            };
-            for (const remark of remarks) {
-                remark.status = "sent";
-                remark.round = number;
-                remark.updatedAt = submittedAt;
-            }
-            draft.rounds.push(round);
-            return round;
-        });
-    }
-    roundOf(file, number) {
-        const round = file.rounds.find((candidate) => candidate.number === number);
-        if (!round)
-            throw new DesignError(`Feedback round ${number} not found. Rounds 1 to ${file.rounds.length} exist.`);
-        return round;
+        return this.mutate((draft) => submitRound(draft, remarkIds, title, names));
     }
     rename(number, title) {
-        const name = requireTitle(title);
-        return this.mutate((draft) => {
-            const round = this.roundOf(draft, number);
-            round.title = name;
-            return round;
-        });
+        return this.mutate((draft) => renameRound(draft, number, title));
     }
-    /**
-     * Déclare des remarques d'un retour traitées, ou les rouvre. Une remarque
-     * déjà traitée reste inchangée ; une nouvelle note remplace l'ancienne et
-     * son auteur, en gardant la date d'origine.
-     */
     setProcessed(input) {
-        const note = typeof input.note === "string" && input.note.trim() !== "" ? input.note.trim() : null;
-        return this.mutate((draft) => {
-            const round = this.roundOf(draft, input.round);
-            const ids = input.remarkIds ?? round.remarks.map((remark) => remark.id);
-            if (ids.length === 0)
-                throw new DesignError("Name at least one remark of the round.");
-            const targets = ids.map((id) => {
-                const remark = round.remarks.find((candidate) => candidate.id === id);
-                if (!remark)
-                    throw new DesignError(`Remark "${id}" is not part of feedback round ${round.number}.`);
-                return remark;
-            });
-            const at = new Date().toISOString();
-            for (const remark of targets) {
-                if (!input.processed) {
-                    remark.processed = null;
-                    continue;
-                }
-                // Une remarque déjà traitée le reste telle quelle, sauf nouvelle note :
-                // tout marquer d'un coup ne réattribue pas le travail de l'agent.
-                if (remark.processed && note === null)
-                    continue;
-                remark.processed = { at: remark.processed?.at ?? at, by: input.by, note };
-            }
-            return round;
-        });
+        return this.mutate((draft) => setRemarksProcessed(draft, input));
     }
 }

package/dist/src/core/ids.js

@@ -1,8 +1,7 @@
-import crypto from "crypto";
 const ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789";
 /** Identifiant court, lisible dans un JSON lu par un agent. */
 export function shortId(prefix, length = 8) {
-    const bytes = crypto.randomBytes(length);
+    const bytes = globalThis.crypto.getRandomValues(new Uint8Array(length));
     let out = "";
     for (const byte of bytes)
         out += ALPHABET[byte % ALPHABET.length];