@womp/spark-agent 7.0.0 → 9.0.0

package/CHANGELOG.md

@@ -4,6 +4,73 @@ Notable changes to `@womp/spark-agent`, newest first. Versions follow
 [Semantic Versioning](https://semver.org/). Add an entry with each version bump; describe what
 changed for hosts and users, and how to migrate across breaking changes.
 
+## 9.0.0 — 2026-10-12
+
+The scene operation journal is gone: every SDK scene adapter applies each edit directly to the
+scene and saves it, as the browser has since it moved to scene events. The journal only deduped an
+edit whose tool call ran again with the same operation id and settled uncertain edits that turned
+out to change nothing; no host re-runs a tool call within a live run, and a restart ends the run.
+
+### Removed
+
+- `SceneOperationStore`, `recoverSceneOperation` and the `operations` option of
+  `SdkSceneEditorOptions` (and so of `createSdkSceneEditor` and `createSdkSceneHost`).
+- `SdkSceneEditor.getOperation`.
+- `SceneOperation.revision`, which only versioned journal records.
+- `executeSceneOperation`'s `store` option and the `reused` flag on its result.
+- The standalone SQLite store's `scene_operations` table. Opening an older database drops it and
+  sets the schema version to 5.
+
+### Changed
+
+- Every edit that fails after it began throws `SceneOperationError`, whose `operation` reports
+  whether it was committed, rolled back or left uncertain. Before, hosts that supplied
+  `operations` got the original error unwrapped; it is now the error's `cause`.
+- Receipts no longer carry `details.synchronized`; `details.synchronizationError` still reports
+  a failed `onCommitted`.
+
+### Migrating
+
+Stop passing `operations` and delete any `SceneOperationStore` implementation. A custom
+`SdkSceneEditor` drops `getOperation`. Code that read an edit's outcome from the journal after a
+failure reads `error.operation` from the `SceneOperationError` instead.
+
+## 8.0.0 — 2026-10-12
+
+Geometry Nodes moves to FlowIR 0.5.0. The dialect is FlowIR's strict, flat format, the
+`geometry-nodes-reference` skill is the prompt FlowIR renders from it, and the names the agent
+writes come back when it reads the graph, so a follow-up edit can refer to them.
+
+### Changed
+
+- `@womp/flowir` is 0.5.0. The geometry dialect declares its types, enum ports, casts and the
+  `Geometry` program output. `param` and `const` declare Int, Float and Vec3; other types are
+  rejected instead of being dropped when the graph is written.
+- A write stores each statement's name in `graphExt.nodes[id].flowirSymbol`, and a read returns
+  those names. Graphs written without stored names read back as before.
+- Compiler diagnostics are formatted by FlowIR, within the existing count and size bounds.
+- `geometry-nodes` (skill version 6) and `geometry-nodes-reference` (version 3) are rewritten
+  for the new dialect.
+
+### Added
+
+- `GeometryTarget.transform` and `GeometryTarget.bounds`: the target's position, rotation and
+  size relative to its parent, and its world-space extent, in project units. Both are `null`
+  where they do not apply.
+- An applied `GeometryWriteResult` also carries the committed `source`, `transform` and
+  `bounds`, read back from the scene.
+
+### Removed
+
+- `loadGeoNodesDialect` from `@womp/spark-agent/geometry`.
+
+### Migration
+
+- `geometryReference()` returns a string instead of `{ rules, catalog }`, and
+  `createGeometryCapability` takes that string. Pass `geometryReference()` through unchanged.
+- A host that builds `GeometryTarget` values itself, rather than through
+  `createSdkGeometryHost`, must set `transform` and `bounds` (`null` when unknown).
+
 ## 7.0.0 — 2026-10-12
 
 Compaction is now the only thing that takes messages out of what the model reads, and it can run

package/README.md

@@ -59,8 +59,9 @@ locks. The run stays active with `requires_action` progress and resumes the same
 input; the wait is excluded from the execution budget. Abort settles the wait and late answers
 cannot revive it. Custom executors must honor the optional host-owned `userWait` argument to `execute`.
 
-Shared SDK scene adapters may omit `operations` to edit and save directly. Supplying `operations`
-adds a durable operation journal and recovery of uncertain edits.
+Shared SDK scene adapters apply each edit directly to the scene and save it; nothing is journaled
+or replayed. An edit that fails after it began throws `SceneOperationError`, whose `operation`
+reports whether the edit was committed, rolled back or left uncertain.
 
 ### Persistence and run lifecycle
 

package/dist/capabilities/geometry.d.ts

@@ -1,9 +1,19 @@
 import type { SparkCapability, SparkInvocationContext } from "../capabilities.js";
-export type GeometryParamValue = number | {
+export type GeometryVector = {
     x: number;
     y: number;
     z: number;
 };
+export type GeometryParamValue = number | GeometryVector;
+export type GeometryTransform = {
+    position: GeometryVector;
+    rotation: GeometryVector;
+    size: GeometryVector;
+};
+export type GeometryBounds = {
+    min: GeometryVector;
+    max: GeometryVector;
+};
 export type GeometryInstance = {
     instanceId: number;
     objectIds: number[];
@@ -16,6 +26,8 @@ export type GeometryTarget = {
     graphId?: number;
     instanceId?: number;
     source: string | null;
+    transform: GeometryTransform | null;
+    bounds: GeometryBounds | null;
     instances: GeometryInstance[];
     diagnostics: string[];
 };
@@ -28,6 +40,9 @@ export type GeometryWriteResult = {
     objectId: number;
     graphId?: number;
     instanceId?: number;
+    source?: string;
+    transform?: GeometryTransform | null;
+    bounds?: GeometryBounds | null;
     affectedObjectIds: number[];
     diagnostics: string[];
 };
@@ -39,7 +54,4 @@ export interface GeometryHost {
     read(objectId: number, context: SparkInvocationContext): Promise<GeometryTarget>;
     write(options: GeometryWrite, context: SparkInvocationContext): Promise<GeometryWriteResult>;
 }
-export declare function createGeometryCapability(host: GeometryHost, reference: {
-    rules: string;
-    catalog: string;
-}): SparkCapability<WompGeometryApi>;
+export declare function createGeometryCapability(host: GeometryHost, reference: string): SparkCapability<WompGeometryApi>;

package/dist/capabilities/geometry.js

@@ -12,23 +12,22 @@ export function createGeometryCapability(host, reference) {
         skills: [
             {
                 name: "geometry-nodes",
-                version: "5",
+                version: "6",
                 description: "Create and edit visual Geometry Nodes graphs with adjustable parameters and animation.",
                 instructions: `Use womp.geometry for requested Geometry Nodes, parametric organic/procedural geometry, or animation.
 Keep follow-up edits to an existing Geometry Nodes object in its graph, preserving its adjustable parameters and instances.
-Read the target after any scene edit this build needs. read(0) reads the scene root as a creation container.
+An Area is a scene object that holds one Geometry Nodes graph; a Group is a container. read(0) reads the scene root as a creation container.
+read returns the target's FlowIR source, its instances with their parameter overrides (in FlowIR units), its transform and its bounds. transform is position, rotation and size relative to the parent, in project units as the scene API reports them; an Area's size is a dimensionless scale, and the scene root's transform is null. bounds is the world-space extent in project units, null unless the target is a top-level Area whose graph renders geometry. Read the target again after another scene edit changes it.
+If source is null and diagnostics is non-empty, the existing graph cannot be edited without loss. Explain the limitation; never treat it as empty or create a replacement to bypass the refusal.
+Read geometry-nodes-reference before writing source. source is the complete FlowIR text for the target; JavaScript calls execute JavaScript, and source is a FlowIR string, not JavaScript or JSON.
 write updates an existing shared graph, attaches a new graph to an Area without one, or creates a new Area beneath the root/Group target. Use the returned objectId for follow-up edits.
-Read geometry-nodes-reference before writing source. Supply the complete FlowIR text after inspecting the target. JavaScript calls execute JavaScript; source is a FlowIR string, not JavaScript or JSON.
-Inspect the current target before replacing its graph; preserve unrelated geometry and parameter overrides.
-If source is null and diagnostics are present, the existing graph cannot be edited without loss. Explain the limitation; never treat it as empty or create a replacement to bypass the refusal.
-Preserve unrelated statements, parameter names, and FlowIR node IDs from the read. Shared graph edits affect all listed instances; report the affected objects. Valid overrides migrate by parameter name and type. Removed or type-changed parameters return to graph defaults and are reported.
+Preserve unrelated statements, parameter names, FlowIR node IDs and parameter overrides from the read. Shared graph edits affect all listed instances; report the affected objects. Valid overrides migrate by parameter name and type. Removed or type-changed parameters return to graph defaults and are reported.
 Use min/max/step for naturally bounded parameters and omit ranges for free-form positions/rotations. Meaningful parameter names become editor labels. Do not invent label fields.
 SetMaterial assigns one scene material to every primitive it receives. Its Material input is a scene material ID, not a color; 0 selects the scene default material.
-Obtain that ID from the scene-editing skill inside one scene.access, where those lookups live: materialList with materialGetName and materialGetColor to reuse an existing material, materialCreate with materialSetColor and materialSetName for a new one, or listSuperMaterials with materialImport for a library material. Prefer reusing a material that already matches the request over creating another, and do not recolor a shared material unless every object using it should change.
-Create or import the material inside scene.access before writing the geometry target, all within one JavaScript call. Each call has a fresh scope and cannot read an earlier call's variables.
-Positions and sizes are millimetres; Boolean Blend uses the conversion in geometry-nodes-reference. Coordinates are right-handed, +X right, +Y up, +Z forward. Rotations are degrees, intrinsic X-Z-Y.
+Obtain that ID from the scene-editing skill inside womp.scene.access, in the same JavaScript call as the write and before it: materialList with materialGetName and materialGetColor to reuse an existing material, materialCreate with materialSetColor and materialSetName for a new one, or listSuperMaterials with materialImport for a library material. Prefer reusing a material that already matches the request over creating another, and do not recolor a shared material unless every object using it should change.
+FlowIR positions and sizes are millimetres; Boolean Blend uses the conversion in geometry-nodes-reference. Coordinates are right-handed, +X right, +Y up, +Z forward. Rotations are degrees, intrinsic X-Z-Y.
 On compiler errors, repair the source in this same conversation and retry with a fresh read. A rejected write made no change. Committed/unknown effects remain in execution receipts even if a later call fails; inspect before retrying.
-After applying, read the returned object and use the scene screenshot API with emitImage to inspect the applied result.`,
+When status is "applied", the write result also holds the committed target read back from the scene: source, transform and bounds. Print it; it verifies the graph, so do not read the target again to check it. When the target's latest source is already printed in this conversation, make its next edit in a single call: read, replace and write. Use the scene screenshot API with emitImage to inspect the applied result.`,
                 declarations: WOMP_GEOMETRY_DECLARATIONS,
                 examples: [
                     "const target = await womp.geometry.read(objectId); print(target);",
@@ -38,9 +37,9 @@ After applying, read the returned object and use the scene screenshot API with e
             },
             {
                 name: "geometry-nodes-reference",
-                version: "2",
+                version: "3",
                 description: "FlowIR syntax, types, enums, and supported Geometry Nodes catalog; read before writing a graph.",
-                instructions: `${reference.rules}\n${reference.catalog}`,
+                instructions: reference,
                 declarations: "",
                 examples: [],
             },

package/dist/generated/geometry-declarations.d.ts

@@ -1 +1 @@
-export declare const WOMP_GEOMETRY_DECLARATIONS = "declare const womp: { geometry: {\n\"read\": ((objectId: number) => Promise<{\n\"kind\": \"container\" | \"graph\";\n\"objectId\": number;\n\"title\": string;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\": null | string;\n\"instances\": Array<{\n\"instanceId\": number;\n\"objectIds\": Array<number>;\n\"params\": {\n[key: string]: number | {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n}>;\n\"diagnostics\": Array<string>;\n}>);\n\"write\": ((options: {\n\"objectId\": number;\n\"source\": string;\n}) => Promise<{\n\"status\": \"applied\" | \"rejected\";\n\"objectId\": number;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"affectedObjectIds\": Array<number>;\n\"diagnostics\": Array<string>;\n}>);\n} };\ndeclare function print(...values: unknown[]): void;\ndeclare function emitImage(ref: { id: string; mediaType: string; name?: string }, options?: { inspect?: boolean }): Promise<void>;\ndeclare function emitFile(ref: { id: string; mediaType: string; name?: string }): Promise<void>;\n";
+export declare const WOMP_GEOMETRY_DECLARATIONS = "declare const womp: { geometry: {\n\"read\": ((objectId: number) => Promise<{\n\"kind\": \"container\" | \"graph\";\n\"objectId\": number;\n\"title\": string;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\": null | string;\n\"transform\": null | {\n\"position\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"rotation\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"size\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"bounds\": null | {\n\"min\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"max\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"instances\": Array<{\n\"instanceId\": number;\n\"objectIds\": Array<number>;\n\"params\": {\n[key: string]: number | {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n}>;\n\"diagnostics\": Array<string>;\n}>);\n\"write\": ((options: {\n\"objectId\": number;\n\"source\": string;\n}) => Promise<{\n\"status\": \"applied\" | \"rejected\";\n\"objectId\": number;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\"?: undefined | string;\n\"transform\"?: undefined | null | {\n\"position\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"rotation\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"size\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"bounds\"?: undefined | null | {\n\"min\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"max\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"affectedObjectIds\": Array<number>;\n\"diagnostics\": Array<string>;\n}>);\n} };\ndeclare function print(...values: unknown[]): void;\ndeclare function emitImage(ref: { id: string; mediaType: string; name?: string }, options?: { inspect?: boolean }): Promise<void>;\ndeclare function emitFile(ref: { id: string; mediaType: string; name?: string }): Promise<void>;\n";

package/dist/generated/geometry-declarations.js

@@ -1,3 +1,3 @@
 // Generated by scripts/generate-skill-declarations.mjs.
 // prettier-ignore
-export const WOMP_GEOMETRY_DECLARATIONS = "declare const womp: { geometry: {\n\"read\": ((objectId: number) => Promise<{\n\"kind\": \"container\" | \"graph\";\n\"objectId\": number;\n\"title\": string;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\": null | string;\n\"instances\": Array<{\n\"instanceId\": number;\n\"objectIds\": Array<number>;\n\"params\": {\n[key: string]: number | {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n}>;\n\"diagnostics\": Array<string>;\n}>);\n\"write\": ((options: {\n\"objectId\": number;\n\"source\": string;\n}) => Promise<{\n\"status\": \"applied\" | \"rejected\";\n\"objectId\": number;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"affectedObjectIds\": Array<number>;\n\"diagnostics\": Array<string>;\n}>);\n} };\ndeclare function print(...values: unknown[]): void;\ndeclare function emitImage(ref: { id: string; mediaType: string; name?: string }, options?: { inspect?: boolean }): Promise<void>;\ndeclare function emitFile(ref: { id: string; mediaType: string; name?: string }): Promise<void>;\n";
+export const WOMP_GEOMETRY_DECLARATIONS = "declare const womp: { geometry: {\n\"read\": ((objectId: number) => Promise<{\n\"kind\": \"container\" | \"graph\";\n\"objectId\": number;\n\"title\": string;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\": null | string;\n\"transform\": null | {\n\"position\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"rotation\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"size\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"bounds\": null | {\n\"min\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"max\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"instances\": Array<{\n\"instanceId\": number;\n\"objectIds\": Array<number>;\n\"params\": {\n[key: string]: number | {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n}>;\n\"diagnostics\": Array<string>;\n}>);\n\"write\": ((options: {\n\"objectId\": number;\n\"source\": string;\n}) => Promise<{\n\"status\": \"applied\" | \"rejected\";\n\"objectId\": number;\n\"graphId\"?: undefined | number;\n\"instanceId\"?: undefined | number;\n\"source\"?: undefined | string;\n\"transform\"?: undefined | null | {\n\"position\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"rotation\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"size\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"bounds\"?: undefined | null | {\n\"min\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n\"max\": {\n\"x\": number;\n\"y\": number;\n\"z\": number;\n};\n};\n\"affectedObjectIds\": Array<number>;\n\"diagnostics\": Array<string>;\n}>);\n} };\ndeclare function print(...values: unknown[]): void;\ndeclare function emitImage(ref: { id: string; mediaType: string; name?: string }, options?: { inspect?: boolean }): Promise<void>;\ndeclare function emitFile(ref: { id: string; mediaType: string; name?: string }): Promise<void>;\n";

package/dist/geometry/backendRegistry.d.ts

@@ -31,6 +31,7 @@ export type GraphExt = {
     nodes: Record<string, {
         name?: string;
         position?: number[];
+        flowirSymbol?: string;
         [key: string]: unknown;
     }>;
     [key: string]: unknown;

package/dist/geometry/common.d.ts

@@ -1,4 +1,5 @@
-import type { BackendPort, BackendRegistry, BackendValue } from "./backendRegistry.js";
+import type * as flowir from "@womp/flowir";
+import type { BackendPort, BackendRegistry, BackendValue, GraphExt } from "./backendRegistry.js";
 /** Scalar backend storage is zero-initialized. Empty arrays have node-specific semantics. */
 export declare function defaultScalar(port: BackendPort): BackendValue | null;
 export type Edge = {
@@ -14,11 +15,13 @@ export type Edge = {
 export declare const VALUE_BACKEND_NAMES: Record<string, string>;
 /** FlowIR scalar type → backend node name (inverse of VALUE_BACKEND_NAMES). */
 export declare function valueBackendName(typeName: string): string | undefined;
-export declare function titleToAstName(title: string): string;
 export declare function astNameToTitle(s: string): string;
+export declare function storedSymbol(graphExt: GraphExt, bid: string): string | undefined;
+export declare function paramName(graphExt: GraphExt, valueBid: string, inputBid: string): string | undefined;
 export declare function isArrayPortType(type: string): boolean;
 export declare function parseConnection(key: string): Edge | null;
 export declare function buildIncomingMap(connections: Record<string, 0>): Map<string, Edge[]>;
+export declare function backendTypeId(flowirRegistry: flowir.Registry, name: string): number;
 /** Resolve the GIP and value-node type IDs from the backend registry. */
 export declare function resolveParamTypeIds(backendRegistry: BackendRegistry): {
     gipTypeId: number | null;

package/dist/geometry/common.js

@@ -4,7 +4,7 @@ export function defaultScalar(port) {
         return 0;
     if (port.type === "Bool")
         return false;
-    if (port.type === "Vec" || port.type === "Vec3")
+    if (port.type === "Vec")
         return { x: 0, y: 0, z: 0 };
     return null;
 }
@@ -25,7 +25,7 @@ export function valueBackendName(typeName) {
     }
     return undefined;
 }
-export function titleToAstName(title) {
+function titleToAstName(title) {
     return title
         .trim()
         .replace(/\s+(.)/g, (_, c) => "_" + c.toLowerCase())
@@ -36,8 +36,15 @@ export function astNameToTitle(s) {
         .replace(/_./g, (m) => " " + m[1].toUpperCase())
         .replace(/^./, (m) => m.toUpperCase());
 }
+export function storedSymbol(graphExt, bid) {
+    return graphExt.nodes?.[bid]?.flowirSymbol;
+}
+export function paramName(graphExt, valueBid, inputBid) {
+    const label = graphExt.nodes?.[inputBid]?.name;
+    return storedSymbol(graphExt, valueBid) ?? (label ? titleToAstName(label) : undefined);
+}
 export function isArrayPortType(type) {
-    return type.endsWith("[]") || type.endsWith("Array");
+    return type.endsWith("Array");
 }
 export function parseConnection(key) {
     const m = key.match(/^(\d+):(\d+)-(\d+):(\d+)$/);
@@ -65,6 +72,14 @@ export function buildIncomingMap(connections) {
     }
     return incoming;
 }
+export function backendTypeId(flowirRegistry, name) {
+    const node = flowirRegistry.getNode(name);
+    if (!node)
+        throw new Error(`Unknown dialect node ${name}.`);
+    if (!/^\d+$/.test(node.type))
+        throw new Error(`Dialect node ${name} has type ${JSON.stringify(node.type)}; the geometry backend needs a decimal type id.`);
+    return Number(node.type);
+}
 /** Resolve the GIP and value-node type IDs from the backend registry. */
 export function resolveParamTypeIds(backendRegistry) {
     const gipTypeId = backendRegistry.getSchemaByName("GroupInputParam")?.typeId ?? null;

package/dist/geometry/compiler.js

@@ -16,9 +16,9 @@ export function compileGeometry(source) {
     // of the text, not by whoever forwards it.
     if (!parsed.ok)
         throw new Error(formatBoundedDiagnostics(source, parsed.diagnostics));
-    const result = flowir.compileFromProgram(parsed.program, source, flowirRegistry);
+    const result = flowir.compileFromProgram(parsed.program, flowirRegistry);
     if (!result.ok)
-        throw new Error(formatBoundedDiagnostics(result.source, result.diagnostics));
+        throw new Error(formatBoundedDiagnostics(source, result.diagnostics));
     const compiled = lower(parsed.program, flowirRegistry, backendRegistry);
     for (const statement of parsed.program.statements) {
         const name = statement.kind === "node"

package/dist/geometry/diagnostics.d.ts

@@ -1,11 +1,7 @@
-import type { Diagnostic } from "@womp/flowir";
+import * as flowir from "@womp/flowir";
 export declare const MAX_REPORTED_DIAGNOSTICS = 5;
 export declare const MAX_DIAGNOSTIC_BYTES: number;
-type DiagnosticLike = Pick<Diagnostic, "code" | "message" | "line" | "column" | "hint">;
-export declare function formatBoundedDiagnostics(source: string, diagnostics: readonly DiagnosticLike[], limits?: {
-    count?: number;
-    bytes?: number;
-}): string;
+export declare function formatBoundedDiagnostics(source: string, diagnostics: readonly flowir.Diagnostic[]): string;
 /**
  * A host-assembled diagnostic list, bounded the same way: each entry to
  * `MAX_DIAGNOSTIC_BYTES`, the list to `MAX_REPORTED_DIAGNOSTICS` entries, with
@@ -15,4 +11,3 @@ export declare function boundedDiagnostics(diagnostics: readonly string[], limit
     count?: number;
     bytes?: number;
 }): string[];
-export {};

package/dist/geometry/diagnostics.js

@@ -1,57 +1,9 @@
+import * as flowir from "@womp/flowir";
 import { boundedText } from "../bounded-output.js";
-// WHY THIS FILE EXISTS. `@womp/flowir`'s own `formatDiagnostics` emits one
-// four-line block per diagnostic -- header, source line, caret, hint -- and
-// joins them, so a compiler that reports the same one-character mistake five
-// times repeats the offending source line five times and its hint five times.
-// That string is what `compileGeometry` throws and what a rejected
-// `geometry.write` hands the model as a diagnostic; on staging one bad enum
-// value cost a whole turn. The compiler holds the structured diagnostics
-// already, so the bound belongs here rather than behind a package this one
-// only consumes.
-//
-// What is kept: every diagnostic's header (code, line, column, message), the
-// source line once per distinct line, its caret, and each distinct hint once.
-// What is dropped is only repetition and the tail past the limits, and the
-// message says so.
 export const MAX_REPORTED_DIAGNOSTICS = 5;
 export const MAX_DIAGNOSTIC_BYTES = 4 * 1024;
-export function formatBoundedDiagnostics(source, diagnostics, limits = {}) {
-    const count = limits.count ?? MAX_REPORTED_DIAGNOSTICS;
-    const bytes = limits.bytes ?? MAX_DIAGNOSTIC_BYTES;
-    if (diagnostics.length === 0)
-        return "";
-    const lines = source.replace(/\r\n?/gu, "\n").split("\n");
-    const gutterWidth = String(lines.length || 1).length;
-    const pointerPrefix = `${" ".repeat(gutterWidth)} | `;
-    const shownLines = new Set();
-    const shownCarets = new Set();
-    const shownHints = new Set();
-    const out = [];
-    for (const diagnostic of diagnostics.slice(0, count)) {
-        out.push(`error[${diagnostic.code}] L${diagnostic.line}:${diagnostic.column} ${diagnostic.message}`);
-        const sourceLine = lines[diagnostic.line - 1];
-        if (sourceLine !== undefined) {
-            // A line already quoted is not quoted again -- that repetition is the
-            // defect this bounds. Its caret still is, once per column, so every
-            // diagnostic keeps a marker against the quoted line above it.
-            if (shownLines.has(diagnostic.line) === false) {
-                shownLines.add(diagnostic.line);
-                out.push(`${String(diagnostic.line).padStart(gutterWidth, " ")} | ${sourceLine}`);
-            }
-            const caret = `${pointerPrefix}${" ".repeat(Math.max(diagnostic.column - 1, 0))}^`;
-            if (shownCarets.has(`${diagnostic.line}:${caret}`) === false) {
-                shownCarets.add(`${diagnostic.line}:${caret}`);
-                out.push(caret);
-            }
-        }
-        if (shownHints.has(diagnostic.hint) === false) {
-            shownHints.add(diagnostic.hint);
-            out.push(`${pointerPrefix}hint: ${diagnostic.hint}`);
-        }
-    }
-    if (diagnostics.length > count)
-        out.push(`${diagnostics.length - count} more diagnostics were omitted (${count} of ${diagnostics.length} shown). Fix these, then compile again.`);
-    return boundedText(out.join("\n"), bytes, "Diagnostics");
+export function formatBoundedDiagnostics(source, diagnostics) {
+    return boundedText(flowir.formatDiagnostics(source, diagnostics, MAX_REPORTED_DIAGNOSTICS), MAX_DIAGNOSTIC_BYTES, "Diagnostics");
 }
 /**
  * A host-assembled diagnostic list, bounded the same way: each entry to

package/dist/geometry/graph.d.ts

@@ -31,9 +31,9 @@ export declare const graphExtSchema: z.ZodObject<{
     nodes: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         name: z.ZodOptional<z.ZodString>;
         position: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+        flowirSymbol: z.ZodOptional<z.ZodString>;
     }, z.core.$catchall<z.ZodJSONSchema>>>>;
 }, z.core.$catchall<z.ZodJSONSchema>>;
 export type GeometryGraph = z.infer<typeof geometryGraphSchema>;
 export type GraphData = z.infer<typeof graphDataSchema>;
-/** FlowIR statement roles map to backend IDs only for the current conversion. */
 export type StatementNodes = Record<string, string>;

package/dist/geometry/graph.js

@@ -25,6 +25,7 @@ export const graphExtSchema = z
         .object({
         name: z.string().optional(),
         position: z.array(z.number()).length(2).optional(),
+        flowirSymbol: z.string().optional(),
     })
         .catchall(z.json()))
         .default({}),

package/dist/geometry/index.d.ts

@@ -5,5 +5,4 @@ export { lower } from "./lower.js";
 export type { LowerResult } from "./lower.js";
 export { lift } from "./lift.js";
 export { writeParamData } from "./writeParamData.js";
-export declare function loadGeoNodesDialect(): flowir.DialectSchema;
 export declare function createGeoNodesRegistry(): flowir.Registry;

package/dist/geometry/index.js

@@ -4,9 +4,6 @@ export { BackendRegistry } from "./backendRegistry.js";
 export { lower } from "./lower.js";
 export { lift } from "./lift.js";
 export { writeParamData } from "./writeParamData.js";
-export function loadGeoNodesDialect() {
-    return dialectJson;
-}
 export function createGeoNodesRegistry() {
     return flowir.Registry.fromJsonObject(dialectJson);
 }