callman-mcp 0.2.0 → 0.3.0

package/dist-cjs/domain/diagram/patch.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyDiagramPatch = exports.diagramPatchOpSchema = void 0;
 const callman_core_1 = require("callman-core");
 const zod_1 = require("zod");
-const errors_js_1 = require("../../client/errors.js");
-const ids_js_1 = require("../../lib/ids.js");
 const strict_js_1 = require("../../lib/strict.js");
 const build_js_1 = require("./build.js");
 const style_js_1 = require("./style.js");
 // Incremental edits to a stored diagram — the model sends operations, not a
-// 200-node document. Removing a node drops the edges attached to it.
+// 200-node document. The vocabulary is callman-core's authoring ops (the
+// same list the desktop's AI edits use and callman://docs/diagram-schema
+// documents); this module only adds the strict zod contract and maps the
+// result. Removing a node drops the edges attached to it and lifts its
+// children out; moving a node drops the saved routes of its edges.
 const nodeShape = build_js_1.diagramNodeInputSchema.shape;
 const edgeShape = build_js_1.diagramEdgeInputSchema.shape;
 const nodeChangesSchema = (0, strict_js_1.strictObject)({
@@ -22,6 +24,7 @@ const nodeChangesSchema = (0, strict_js_1.strictObject)({
     rotation: nodeShape.rotation.unwrap().nullable().optional().describe("Degrees, clockwise; null resets"),
     locked: nodeShape.locked,
     hidden: nodeShape.hidden,
+    collapsed: nodeShape.collapsed,
     data: zod_1.z.record(zod_1.z.unknown()).nullable().optional().describe("MERGED shallowly into the node's data; a key set to null is removed, data: null clears it"),
 }, "field", "updateNode changes");
 const edgeChangesSchema = (0, strict_js_1.strictObject)({
@@ -33,7 +36,12 @@ const edgeChangesSchema = (0, strict_js_1.strictObject)({
     routing: edgeShape.routing,
     markerEnd: edgeShape.markerEnd,
     markerStart: edgeShape.markerStart,
+    sourceSide: zod_1.z.enum(build_js_1.SIDES).nullable().optional().describe("Fixed side at the source; null = floating"),
+    targetSide: zod_1.z.enum(build_js_1.SIDES).nullable().optional().describe("Fixed side at the target; null = floating"),
+    data: zod_1.z.record(zod_1.z.unknown()).nullable().optional().describe("MERGED shallowly into the edge's data (BPMN: { bpmn: { conditionExpression, isDefault } }); a key set to null is removed, data: null clears it"),
 }, "field", "updateEdge changes");
+const pointSchema = zod_1.z.object({ x: zod_1.z.number(), y: zod_1.z.number() }).strict();
+const directionSchema = zod_1.z.enum(["DOWN", "RIGHT", "UP", "LEFT"]);
 // Every op is strict: a field at the wrong level ({ op: "updateNode", id, label })
 // is an error, not a silent no-op that still counts as "applied".
 exports.diagramPatchOpSchema = zod_1.z.discriminatedUnion("op", [
@@ -44,276 +52,55 @@ exports.diagramPatchOpSchema = zod_1.z.discriminatedUnion("op", [
     (0, strict_js_1.strictObject)({ op: zod_1.z.literal("updateEdge"), id: zod_1.z.string().min(1), changes: edgeChangesSchema }, "field", "updateEdge ops"),
     (0, strict_js_1.strictObject)({ op: zod_1.z.literal("removeEdge"), id: zod_1.z.string().min(1) }, "field", "removeEdge ops"),
     (0, strict_js_1.strictObject)({ op: zod_1.z.literal("setTitle"), title: zod_1.z.string().min(1).max(200) }, "field", "setTitle ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("moveNode"), id: zod_1.z.string().min(1), position: pointSchema.describe("Parent-relative top-left") }, "field", "moveNode ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("reparent"), id: zod_1.z.string().min(1), parent: zod_1.z.string().max(64).nullable().describe("Container id, or null for the top level"), position: pointSchema.optional().describe("Position in the new parent; omitted keeps the canvas spot") }, "field", "reparent ops"),
+    (0, strict_js_1.strictObject)({
+        op: zod_1.z.literal("setEdgeRoute"),
+        id: zod_1.z.string().min(1),
+        routing: zod_1.z.enum(build_js_1.ROUTINGS).nullable().optional().describe("null = the canvas default"),
+        sourceSide: zod_1.z.enum(build_js_1.SIDES).nullable().optional(),
+        targetSide: zod_1.z.enum(build_js_1.SIDES).nullable().optional(),
+        waypoints: zod_1.z.array(pointSchema).max(50).nullable().optional().describe("Manual bends (absolute); null clears. With nothing else set, the op resets the route"),
+    }, "field", "setEdgeRoute ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("reorder"), id: zod_1.z.string().min(1), index: zod_1.z.union([zod_1.z.number().int().nonnegative(), zod_1.z.literal("front"), zod_1.z.literal("back")]).describe("Stacking order among siblings") }, "field", "reorder ops"),
+    (0, strict_js_1.strictObject)({
+        op: zod_1.z.literal("setCanvas"),
+        canvas: zod_1.z
+            .object({
+            background: zod_1.z.enum(["grid", "dots", "blank"]).nullable().optional(),
+            gridSize: zod_1.z.number().int().positive().nullable().optional(),
+            defaultRouting: zod_1.z.enum(build_js_1.ROUTINGS).nullable().optional(),
+        })
+            .strict(),
+    }, "field", "setCanvas ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("group"), ids: zod_1.z.array(zod_1.z.string().min(1)).min(1).max(200), type: zod_1.z.string().max(80).optional().describe("frame (default), pool.horizontal or pool.vertical"), label: zod_1.z.string().max(200).optional(), id: zod_1.z.string().max(64).optional() }, "field", "group ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("ungroup"), id: zod_1.z.string().min(1) }, "field", "ungroup ops"),
+    (0, strict_js_1.strictObject)({ op: zod_1.z.literal("relayout"), scope: zod_1.z.enum(["new", "all"]), direction: directionSchema.optional() }, "field", "relayout ops"),
 ]);
 const applyDiagramPatch = (doc, ops, options = {}) => {
-    const strict = options.strictTypes !== false;
-    const nodes = new Map(doc.nodes.map((node) => [node.id, { ...node }]));
-    const edges = new Map(doc.edges.map((edge) => [edge.id, { ...edge }]));
-    let title = doc.meta.title;
-    const addedNodeIds = [];
-    const removedNodeIds = [];
-    const removedEdgeIds = [];
-    const warnings = [];
-    const moved = new Set();
-    const nextNodeId = (0, ids_js_1.sequentialIds)("n", nodes.keys());
-    const nextEdgeId = (0, ids_js_1.sequentialIds)("e", edges.keys());
-    const resolveType = (type, id) => {
-        if ((0, callman_core_1.getDiagramComponent)(type)) {
-            (0, build_js_1.assertNotConnector)(type, id);
-            return type;
-        }
-        const suggestions = (0, build_js_1.suggestComponentTypes)(type);
-        if (strict) {
-            throw new errors_js_1.ToolInputError("DIAGRAM_UNKNOWN_COMPONENT_TYPE", `Unknown component type "${type}" on ${id}.`, {
-                unknownTypes: [{ type, suggestions }],
-            });
-        }
-        warnings.push(`Unknown component type "${type}" on ${id} → rect (suggestions: ${suggestions.join(", ") || "none"})`);
-        return "rect";
-    };
-    for (const op of ops) {
-        switch (op.op) {
-            case "setTitle":
-                title = op.title.trim();
-                break;
-            case "addNode": {
-                const id = op.node.id ?? nextNodeId();
-                if (nodes.has(id))
-                    throw new errors_js_1.ToolInputError("DIAGRAM_DUPLICATE_NODE_ID", `A node with id "${id}" already exists.`);
-                if (op.node.parent && !nodes.has(op.node.parent)) {
-                    throw new errors_js_1.ToolInputError("DIAGRAM_PARENT_NOT_FOUND", `Parent "${op.node.parent}" does not exist.`);
-                }
-                const type = resolveType(op.node.type, id);
-                const def = (0, callman_core_1.getDiagramComponent)(type);
-                nodes.set(id, {
-                    id,
-                    type,
-                    position: op.node.position ?? { x: 0, y: 0 },
-                    size: op.node.size ?? def?.defaultSize ?? { width: 140, height: 60 },
-                    label: op.node.label ?? (type === "rect" && op.node.type !== "rect" ? op.node.type : def?.defaultLabel),
-                    ...(op.node.parent ? { parentId: op.node.parent } : {}),
-                    ...(op.node.style ? { style: (0, style_js_1.applyStyleInput)(undefined, op.node.style) } : {}),
-                    ...(op.node.rotation ? { rotation: op.node.rotation } : {}),
-                    ...(op.node.locked ? { locked: true } : {}),
-                    ...(op.node.hidden ? { hidden: true } : {}),
-                    ...(op.node.data ? { data: op.node.data } : {}),
-                });
-                if (op.node.parent) {
-                    const warning = (0, build_js_1.parentWarning)(id, op.node.parent, nodes.get(op.node.parent)?.type);
-                    if (warning)
-                        warnings.push(warning);
-                }
-                if (!op.node.position)
-                    addedNodeIds.push(id);
-                break;
-            }
-            case "updateNode": {
-                const node = nodes.get(op.id);
-                if (!node)
-                    throw new errors_js_1.ToolInputError("DIAGRAM_NODE_NOT_FOUND", `Node "${op.id}" does not exist.`);
-                const changes = op.changes;
-                if (changes.parent && !nodes.has(changes.parent)) {
-                    throw new errors_js_1.ToolInputError("DIAGRAM_PARENT_NOT_FOUND", `Parent "${changes.parent}" does not exist.`);
-                }
-                if (changes.parent && changes.parent === op.id)
-                    throw new errors_js_1.ToolInputError("DIAGRAM_PARENT_CYCLE", `Node "${op.id}" cannot contain itself.`);
-                const next = { ...node };
-                if (changes.type !== undefined)
-                    next.type = resolveType(changes.type, op.id);
-                if (changes.label !== undefined)
-                    next.label = changes.label;
-                if (changes.position !== undefined)
-                    next.position = changes.position;
-                if (changes.size !== undefined)
-                    next.size = changes.size;
-                if (changes.parent !== undefined) {
-                    if (changes.parent)
-                        next.parentId = changes.parent;
-                    else
-                        delete next.parentId;
-                }
-                if (changes.style !== undefined) {
-                    const style = changes.style === null ? undefined : (0, style_js_1.applyStyleInput)(node.style, changes.style);
-                    if (style)
-                        next.style = style;
-                    else
-                        delete next.style;
-                }
-                if (changes.rotation !== undefined) {
-                    if (changes.rotation)
-                        next.rotation = changes.rotation;
-                    else
-                        delete next.rotation;
-                }
-                if (changes.locked !== undefined) {
-                    if (changes.locked)
-                        next.locked = true;
-                    else
-                        delete next.locked;
-                }
-                if (changes.hidden !== undefined) {
-                    if (changes.hidden)
-                        next.hidden = true;
-                    else
-                        delete next.hidden;
-                }
-                if (changes.data !== undefined) {
-                    const data = changes.data === null ? {} : { ...(node.data ?? {}) };
-                    for (const [key, value] of Object.entries(changes.data ?? {})) {
-                        if (value === null)
-                            delete data[key];
-                        else
-                            data[key] = value;
-                    }
-                    if (Object.keys(data).length > 0)
-                        next.data = data;
-                    else
-                        delete next.data;
-                }
-                if (changes.position !== undefined || changes.size !== undefined || changes.parent !== undefined)
-                    moved.add(op.id);
-                if (changes.parent) {
-                    const warning = (0, build_js_1.parentWarning)(op.id, changes.parent, nodes.get(changes.parent)?.type);
-                    if (warning)
-                        warnings.push(warning);
-                }
-                nodes.set(op.id, next);
-                break;
-            }
-            case "removeNode": {
-                if (!nodes.delete(op.id))
-                    throw new errors_js_1.ToolInputError("DIAGRAM_NODE_NOT_FOUND", `Node "${op.id}" does not exist.`);
-                removedNodeIds.push(op.id);
-                for (const [edgeId, edge] of [...edges]) {
-                    if (edge.source === op.id || edge.target === op.id) {
-                        edges.delete(edgeId);
-                        removedEdgeIds.push(edgeId);
-                    }
-                }
-                // Children of a removed container become top-level.
-                for (const node of nodes.values())
-                    if (node.parentId === op.id)
-                        delete node.parentId;
-                break;
-            }
-            case "addEdge": {
-                const id = op.edge.id ?? nextEdgeId();
-                if (edges.has(id))
-                    throw new errors_js_1.ToolInputError("DIAGRAM_DUPLICATE_EDGE_ID", `An edge with id "${id}" already exists.`);
-                for (const endpoint of [op.edge.source, op.edge.target]) {
-                    if (!nodes.has(endpoint) && !edges.has(endpoint)) {
-                        throw new errors_js_1.ToolInputError("DIAGRAM_EDGE_ENDPOINT_NOT_FOUND", `Edge endpoint "${endpoint}" does not exist.`);
-                    }
-                }
-                const semantic = op.edge.semantic ??
-                    ((0, callman_core_1.isBusComponentType)(nodes.get(op.edge.source)?.type) || (0, callman_core_1.isBusComponentType)(nodes.get(op.edge.target)?.type) ? "bus" : undefined);
-                edges.set(id, {
-                    id,
-                    source: op.edge.source,
-                    target: op.edge.target,
-                    ...(op.edge.label ? { label: op.edge.label } : {}),
-                    routing: op.edge.routing ?? "orthogonal",
-                    markerEnd: op.edge.markerEnd ?? "classicThin",
-                    ...(op.edge.markerStart && op.edge.markerStart !== "none" ? { markerStart: op.edge.markerStart } : {}),
-                    ...(semantic || op.edge.color ? { style: (0, build_js_1.edgeStyleFor)(semantic, op.edge.color) } : {}),
-                });
-                break;
-            }
-            case "updateEdge": {
-                const edge = edges.get(op.id);
-                if (!edge)
-                    throw new errors_js_1.ToolInputError("DIAGRAM_EDGE_NOT_FOUND", `Edge "${op.id}" does not exist.`);
-                const changes = op.changes;
-                const next = { ...edge };
-                if (changes.source !== undefined)
-                    next.source = changes.source;
-                if (changes.target !== undefined)
-                    next.target = changes.target;
-                if (changes.label !== undefined) {
-                    if (changes.label)
-                        next.label = changes.label;
-                    else
-                        delete next.label;
-                }
-                if (changes.routing !== undefined)
-                    next.routing = changes.routing;
-                if (changes.markerEnd !== undefined)
-                    next.markerEnd = changes.markerEnd;
-                if (changes.markerStart !== undefined) {
-                    if (changes.markerStart === "none")
-                        delete next.markerStart;
-                    else
-                        next.markerStart = changes.markerStart;
-                }
-                // The semantic owns the line tuple (dash + width); the color is kept
-                // unless it is changed explicitly.
-                if (changes.semantic !== undefined || changes.color !== undefined) {
-                    const stroke = changes.color === null ? undefined : changes.color !== undefined ? (0, style_js_1.toTokenRef)(changes.color) : edge.style?.stroke;
-                    const line = changes.semantic !== undefined ? (0, callman_core_1.semanticStyle)(changes.semantic) : { ...(edge.style ?? {}) };
-                    delete line.stroke;
-                    const style = { ...line, ...(stroke ? { stroke } : {}) };
-                    if (Object.keys(style).length > 0)
-                        next.style = style;
-                    else
-                        delete next.style;
-                }
-                for (const endpoint of [next.source, next.target]) {
-                    if (endpoint && !nodes.has(endpoint) && !edges.has(endpoint)) {
-                        throw new errors_js_1.ToolInputError("DIAGRAM_EDGE_ENDPOINT_NOT_FOUND", `Edge endpoint "${endpoint}" does not exist.`);
-                    }
-                }
-                if (changes.source !== undefined || changes.target !== undefined)
-                    clearRoute(next);
-                edges.set(op.id, next);
-                break;
-            }
-            case "removeEdge": {
-                if (!edges.delete(op.id))
-                    throw new errors_js_1.ToolInputError("DIAGRAM_EDGE_NOT_FOUND", `Edge "${op.id}" does not exist.`);
-                removedEdgeIds.push(op.id);
-                break;
-            }
-        }
+    const taken = [...doc.nodes.map((node) => node.id), ...doc.edges.map((edge) => edge.id)];
+    try {
+        const lowered = (0, callman_core_1.lowerPatchOps)(doc, ops, {
+            strictTypes: options.strictTypes !== false,
+            genNodeId: (0, callman_core_1.slugIdFactory)(taken, "n"),
+            genEdgeId: (0, callman_core_1.slugIdFactory)(taken, "e"),
+        });
+        // MCP keeps today's rule: a moved node loses the manual bends of every
+        // edge leaving it (the desktop keeps them — a person is watching there).
+        const applied = (0, callman_core_1.applyDiagramOps)(doc, lowered.ops, { moveClearsWaypoints: true, now: new Date().toISOString() });
+        return {
+            document: applied.doc,
+            addedNodeIds: lowered.unpositionedNodeIds,
+            removedNodeIds: applied.removed.nodes,
+            removedEdgeIds: applied.removed.edges,
+            reroutedEdgeIds: applied.rerouted,
+            warnings: [...lowered.warnings, ...applied.warnings],
+            ...(lowered.relayout ? { relayout: lowered.relayout } : {}),
+            idMap: lowered.idMap,
+        };
     }
-    const reroutedEdgeIds = [];
-    if (moved.size > 0) {
-        // A moved container carries its children: their edges are stale too.
-        const affected = new Set(moved);
-        let grew = true;
-        while (grew) {
-            grew = false;
-            for (const node of nodes.values()) {
-                if (node.parentId && affected.has(node.parentId) && !affected.has(node.id)) {
-                    affected.add(node.id);
-                    grew = true;
-                }
-            }
-        }
-        for (const edge of edges.values()) {
-            const touches = (edge.source && affected.has(edge.source)) || (edge.target && affected.has(edge.target));
-            if (touches && (edge.waypoints || edge.sourceAnchor || edge.targetAnchor || edge.routing === "straight")) {
-                clearRoute(edge);
-                reroutedEdgeIds.push(edge.id);
-            }
-        }
+    catch (error) {
+        return (0, build_js_1.toToolError)(error);
     }
-    const document = (0, callman_core_1.normalizeDiagramStyles)({
-        ...doc,
-        meta: { ...doc.meta, title, updatedAt: new Date().toISOString() },
-        nodes: [...nodes.values()],
-        edges: [...edges.values()],
-    });
-    const parsed = (0, callman_core_1.safeParseDiagramDocument)(document);
-    if (!parsed.ok) {
-        throw new errors_js_1.ToolInputError("DIAGRAM_DOCUMENT_INVALID", `The patched document is invalid: ${parsed.errors.join("; ")}`, { errors: parsed.errors });
-    }
-    return { document: parsed.document, addedNodeIds, removedNodeIds, removedEdgeIds, reroutedEdgeIds, warnings };
 };
 exports.applyDiagramPatch = applyDiagramPatch;
-// Drop a saved route so the studio re-routes the edge orthogonally.
-const clearRoute = (edge) => {
-    delete edge.waypoints;
-    delete edge.sourceAnchor;
-    delete edge.targetAnchor;
-    edge.routing = "orthogonal";
-};

package/dist-cjs/domain/diagram/style.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.styleView = exports.applyStyleInput = exports.fromTokenRef = exports.toTokenRef = exports.nodeStylePatchSchema = exports.nodeStyleInputSchema = exports.STYLE_KEYS = exports.colorInputSchema = void 0;
+exports.applyStyleInput = exports.toTokenRef = exports.styleView = exports.fromTokenRef = exports.nodeStylePatchSchema = exports.nodeStyleInputSchema = exports.CORE_STYLE_KEYS = exports.STYLE_KEYS = exports.colorInputSchema = void 0;
+const callman_core_1 = require("callman-core");
+Object.defineProperty(exports, "fromTokenRef", { enumerable: true, get: function () { return callman_core_1.fromTokenRef; } });
+Object.defineProperty(exports, "styleView", { enumerable: true, get: function () { return callman_core_1.styleView; } });
+Object.defineProperty(exports, "toTokenRef", { enumerable: true, get: function () { return callman_core_1.toTokenRef; } });
 const zod_1 = require("zod");
 const strict_js_1 = require("../../lib/strict.js");
 // The visual style a model may set on a node — exactly the DiagramStyle
@@ -8,7 +12,9 @@ const strict_js_1 = require("../../lib/strict.js");
 // ("strokeColor", "borderColor", "fontWeight") is REJECTED with the list of
 // valid keys instead of being dropped by core's normalizer while the tool
 // reports success. Colors are plain CSS strings on the way in and on the way
-// out; the stored form is core's TokenRef (`{ raw: "#3B82F6" }`).
+// out; the stored form is core's TokenRef (`{ raw: "#3B82F6" }`). The
+// conversion itself lives in callman-core (styleInput.ts) — shared with the
+// desktop's AI edits — so the two never disagree.
 exports.colorInputSchema = zod_1.z
     .union([
     zod_1.z.string().trim().min(1).max(64),
@@ -16,9 +22,6 @@ exports.colorInputSchema = zod_1.z
     zod_1.z.object({ token: zod_1.z.string().trim().min(1).max(64) }).strict(),
 ])
     .describe('CSS color: "#3B82F6", "rgb(59,130,246)", "rgba(59,130,246,0.08)" or a name like "tomato"');
-const FONT_BOLD = 1;
-const FONT_ITALIC = 2;
-const FONT_UNDERLINE = 4;
 const styleFields = {
     fill: exports.colorInputSchema.describe('Background CSS color, e.g. "#EFF6FF". A translucent "rgba(59,130,246,0.08)" tints a container without hiding its children'),
     stroke: exports.colorInputSchema.describe('Border CSS color, e.g. "#3B82F6"'),
@@ -39,92 +42,12 @@ const styleFields = {
     opacity: zod_1.z.number().min(0).max(100).describe("0 (invisible) – 100 (opaque)"),
 };
 exports.STYLE_KEYS = Object.keys(styleFields);
+// The schema and core must agree on the key list; a drift is a test failure.
+exports.CORE_STYLE_KEYS = callman_core_1.STYLE_INPUT_KEYS;
 exports.nodeStyleInputSchema = (0, strict_js_1.strictObject)(Object.fromEntries(Object.entries(styleFields).map(([key, schema]) => [key, schema.optional()])), "style key").describe(`Visual style. Keys: ${exports.STYLE_KEYS.join(", ")}. Colors are CSS strings.`);
 // On updateNode a key set to null removes it; `style: null` clears the style.
 exports.nodeStylePatchSchema = (0, strict_js_1.strictObject)(Object.fromEntries(Object.entries(styleFields).map(([key, schema]) => [key, schema.nullable().optional()])), "style key")
     .nullable()
     .describe(`Style changes, MERGED into the node's current style: only the keys you pass change, a key set to null is removed, style: null clears it. Keys: ${exports.STYLE_KEYS.join(", ")}.`);
-const toTokenRef = (color) => (typeof color === "string" ? { raw: color.trim() } : color);
-exports.toTokenRef = toTokenRef;
-const fromTokenRef = (ref) => {
-    if (!ref)
-        return undefined;
-    return "raw" in ref ? ref.raw : { token: ref.token };
-};
-exports.fromTokenRef = fromTokenRef;
-// Input (plain colors, bold/italic/underline flags) → stored DiagramStyle.
-// `base` is the node's current style for a merge; null values delete.
-const applyStyleInput = (base, input) => {
-    const out = { ...(base ?? {}) };
-    const assign = (key, value) => {
-        if (value === undefined)
-            return;
-        if (value === null)
-            delete out[key];
-        else
-            out[key] = value;
-    };
-    for (const key of ["fill", "stroke", "textColor"]) {
-        const value = input[key];
-        assign(key, value === undefined || value === null ? value : (0, exports.toTokenRef)(value));
-    }
-    assign("strokeWidth", input.strokeWidth);
-    assign("dashed", input.dashed);
-    assign("dashPattern", input.dashPattern);
-    assign("radius", input.radius);
-    assign("rounded", input.rounded);
-    assign("fontSize", input.fontSize);
-    assign("fontFamily", input.fontFamily);
-    assign("align", input.align);
-    assign("verticalAlign", input.verticalAlign);
-    assign("shadow", input.shadow);
-    assign("opacity", input.opacity);
-    // The studio stores bold/italic/underline as ONE maxGraph bitmask.
-    const flags = [
-        [input.bold, FONT_BOLD],
-        [input.italic, FONT_ITALIC],
-        [input.underline, FONT_UNDERLINE],
-    ];
-    if (flags.some(([value]) => value !== undefined)) {
-        let mask = out.fontStyle ?? 0;
-        for (const [value, bit] of flags) {
-            if (value === true)
-                mask |= bit;
-            else if (value === false || value === null)
-                mask &= ~bit;
-        }
-        if (mask === 0)
-            delete out.fontStyle;
-        else
-            out.fontStyle = mask;
-    }
-    // fontWeight is not rendered by the studio (bold lives in fontStyle).
-    delete out.fontWeight;
-    return Object.keys(out).length > 0 ? out : undefined;
-};
+const applyStyleInput = (base, input) => (0, callman_core_1.applyStyleInput)(base, input);
 exports.applyStyleInput = applyStyleInput;
-// Stored DiagramStyle → the same compact shape a model writes, so what
-// get_diagram returns can be sent straight back in a patch.
-const styleView = (style) => {
-    if (!style)
-        return undefined;
-    const out = {};
-    for (const key of ["fill", "stroke", "textColor"]) {
-        const value = (0, exports.fromTokenRef)(style[key]);
-        if (value !== undefined)
-            out[key] = value;
-    }
-    for (const key of ["strokeWidth", "dashed", "dashPattern", "radius", "rounded", "fontSize", "fontFamily", "align", "verticalAlign", "shadow", "opacity"]) {
-        if (style[key] !== undefined)
-            out[key] = style[key];
-    }
-    const mask = style.fontStyle ?? 0;
-    if (mask & FONT_BOLD)
-        out.bold = true;
-    if (mask & FONT_ITALIC)
-        out.italic = true;
-    if (mask & FONT_UNDERLINE)
-        out.underline = true;
-    return Object.keys(out).length > 0 ? out : undefined;
-};
-exports.styleView = styleView;

package/dist-cjs/domain/diagram/summarize.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagramFullView = exports.diagramGraphView = exports.diagramListView = void 0;
+exports.diagramFullView = exports.diagramSourceView = exports.diagramMermaidView = exports.diagramGraphView = exports.diagramListView = void 0;
 const callman_core_1 = require("callman-core");
 const truncate_js_1 = require("../../lib/truncate.js");
-const style_js_1 = require("./style.js");
 // Compact views of a stored diagram: the list row, the graph (what is
-// connected to what, with the edge meaning read back from its style) and
+// connected to what, with the edge meaning read back from its style), the
+// Mermaid rendering, the Mermaid source a source-backed diagram keeps, and
 // the full document behind a size gate.
 const diagramListView = (diagram) => {
     const parsed = (0, callman_core_1.safeParseDiagramDocument)(diagram.document);
+    const doc = parsed.ok ? parsed.document : null;
     return {
         id: diagram.id,
         name: diagram.name,
@@ -16,43 +17,29 @@ const diagramListView = (diagram) => {
         owner: diagram.owner?.email ?? diagram.owner?.displayName ?? null,
         sharedWorkspaceIds: diagram.sharedWorkspaceIds ?? [],
         editorCount: (diagram.editorIds ?? []).length,
-        nodeCount: parsed.ok ? parsed.document.nodes.length : null,
-        edgeCount: parsed.ok ? parsed.document.edges.length : null,
+        nodeCount: doc ? doc.nodes.length : null,
+        edgeCount: doc ? doc.edges.length : null,
+        ...(doc?.source ? { source: { format: doc.source.format, diagramType: doc.source.diagramType, valid: doc.source.valid !== false } } : {}),
+        ...(typeof doc?.meta.revision === "number" ? { revision: doc.meta.revision } : {}),
         updatedAt: diagram.updatedAt ?? null,
     };
 };
 exports.diagramListView = diagramListView;
-// Style and flags come back in the same compact shape the tools accept, so a
-// model can read a node's look and send a patch without the full document.
-const diagramGraphView = (doc) => ({
-    title: doc.meta.title,
-    nodes: doc.nodes.map((node) => {
-        const style = (0, style_js_1.styleView)(node.style);
-        return {
-            id: node.id,
-            type: node.type,
-            label: node.label ?? null,
-            ...(node.parentId ? { parent: node.parentId } : {}),
-            ...(style ? { style } : {}),
-            ...(node.rotation ? { rotation: node.rotation } : {}),
-            ...(node.locked ? { locked: true } : {}),
-            ...(node.hidden ? { hidden: true } : {}),
-        };
-    }),
-    edges: doc.edges.map((edge) => {
-        const color = (0, style_js_1.fromTokenRef)(edge.style?.stroke);
-        return {
-            id: edge.id,
-            source: edge.source ?? null,
-            target: edge.target ?? null,
-            label: edge.label ?? null,
-            semantic: (0, callman_core_1.semanticFromStyle)(edge.style),
-            ...(color ? { color } : {}),
-            ...(edge.markerStart ? { markerStart: edge.markerStart } : {}),
-        };
-    }),
-});
+// Style, flags, sides and routing come back in the same compact shape the
+// tools accept, so a model can read a node's look and send a patch without
+// the full document. The view itself is core's (shared with the AI prompt).
+const diagramGraphView = (doc) => (0, callman_core_1.diagramGraphView)(doc);
 exports.diagramGraphView = diagramGraphView;
+// Mermaid flowchart text rendered from the model (presentation is not part
+// of it — Mermaid lays out by itself).
+const diagramMermaidView = (doc) => ({ format: "mermaid", text: (0, callman_core_1.exportMermaid)(doc) });
+exports.diagramMermaidView = diagramMermaidView;
+// The Mermaid source a source-backed diagram keeps (structure truth), or the
+// rendering when the diagram has none.
+const diagramSourceView = (doc) => doc.source
+    ? { format: doc.source.format, diagramType: doc.source.diagramType, valid: doc.source.valid !== false, text: doc.source.text, stored: true }
+    : { ...(0, exports.diagramMermaidView)(doc), diagramType: "flowchart", valid: true, stored: false, note: "This diagram keeps no Mermaid source; the text is rendered from its model." };
+exports.diagramSourceView = diagramSourceView;
 const diagramFullView = (doc) => {
     const size = (0, truncate_js_1.byteLength)(doc);
     if (size <= truncate_js_1.LIMITS.DIAGRAM_FULL)