loom-spec 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loom-spec",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Node-based architecture spec that lives in your repo. AI-readable, AI-writable, git-diffable.",
   "type": "module",
   "author": "René Jesser",

package/templates/.claude/skills/loom-spec/SKILL.md

@@ -99,8 +99,6 @@ If a `loom-spec` MCP server is registered with the host (e.g. via
 - `loom_list_diagrams`, `loom_read_diagram`, `loom_read_node_types`
 - `loom_add_node`, `loom_update_node`, `loom_mark_stale`, `loom_delete_node`
 - `loom_add_edge`, `loom_delete_edge`
-- `loom_list_timelines`, `loom_read_timeline`
-- `loom_add_event`, `loom_update_event`, `loom_delete_event`
 - `loom_validate` (schema + code-ref drift across every diagram)
 
 They validate against the schema before writing, so invalid edits fail fast
@@ -115,10 +113,10 @@ docs sites, GitHub Pages, embed-in-Notion, etc.), use the CLI:
 
 - `loom-spec export-html` (full export)
 - `loom-spec export-html <bundle-name>` (from `.loom/exports.json`)
-- `loom-spec export-html --include-tag public --no-timelines --out manual.html`
+- `loom-spec export-html --include-tag public --out manual.html`
   (ad-hoc filter)
 
-See Example 7 for the full workflow.
+See Example 6 for the full workflow.
 
 ---
 
@@ -294,93 +292,7 @@ loom_add_node({
 })
 ```
 
-### 6. User wants to document a sequence as a timeline
-
-> User: "Document the checkout flow on a timeline so I can see the latency
-> breakdown."
-
-A timeline is a horizontal time-axis overlay on a specific diagram. Each
-event references a node in that diagram and a `[start_ms, duration_ms]`
-interval. The view plays the events back like a DAW edit, lighting up the
-referenced nodes in a mini graph beside the timeline.
-
-```
-# Step 1: Pick the diagram this sequence belongs to.
-loom_list_diagrams()
-loom_read_diagram("overview")
-
-# Step 2: Create the timeline file. There's no MCP tool for creating one
-# from scratch — write the empty shell directly:
-#
-# .loom/timelines/checkout.timeline.json
-{
-  "version": "1",
-  "id": "checkout",
-  "title": "Checkout — happy path",
-  "description": "Click 'pay' → Stripe charge → confirmation render.",
-  "diagram": "overview",
-  "tracks": [
-    { "id": "client", "label": "Browser",   "color": "#dbeafe" },
-    { "id": "server", "label": "API",       "color": "#dcfce7" },
-    { "id": "data",   "label": "Postgres",  "color": "#ede9fe" }
-  ],
-  "events": []
-}
-
-# Step 3: Append events with the MCP tool — it validates that each `node`
-# actually exists in the referenced diagram, so typos fail fast.
-loom_add_event({
-  timeline: "checkout",
-  node: "checkout-page",
-  track: "client",
-  start_ms: 0,
-  duration_ms: 8,
-  kind: "compute",
-  label: "click pay",
-  code_refs: [{ path: "src/views/Checkout.tsx", symbol: "handlePay" }],
-  tags: ["critical-path", "user-input"]
-})
-# → { ok: true, id: "ev1" }
-
-loom_add_event({
-  timeline: "checkout",
-  node: "payments-api",
-  track: "server",
-  start_ms: 12,
-  duration_ms: 320,
-  kind: "io",
-  label: "POST /checkout (Stripe)",
-  triggered_by: "ev1",      # explicit causation arrow
-  tags: ["critical-path", "external-io"]
-})
-# → { ok: true, id: "ev2" }
-
-# Step 4: Adjust if you got something wrong.
-loom_update_event({
-  timeline: "checkout",
-  id: "ev2",
-  patch: { duration_ms: 280 }
-})
-
-# Step 5: Validate.
-loom_validate()
-```
-
-**When to reach for a timeline rather than extra diagram detail:**
-
-- The *order* and *latency* matter (perf review, race conditions, end-to-end
-  flow). The diagram alone shows topology, not sequencing.
-- You want one node referenced multiple times because it does different
-  things at different moments (e.g. an auth-service that validates *then
-  later* re-issues a JWT). Use `code_refs` on each event for function-level
-  granularity inside the same node.
-- The user describes a *trace*, a *user journey*, or a *failure case* that
-  has a clock.
-
-**Don't create a timeline for static structure** — that's what diagrams are
-for. A timeline of "the app boots, then runs forever" adds noise.
-
-### 7. User wants to publish architecture docs to a manual
+### 6. User wants to publish architecture docs to a manual
 
 > User: "We need to ship the checkout flow as an interactive diagram in
 > our public user manual. Don't expose anything internal."
@@ -414,7 +326,6 @@ loom_update_node({ diagram: "overview", id: "payments-service",
     "user-manual": {
       "include-tags": ["public"],
       "exclude-tags": ["wip"],
-      "no-timelines": true,
       "out": "docs/architecture.html"
     }
   }
@@ -430,13 +341,6 @@ $ loom-spec export-html user-manual
 # standalone visualisation.
 ```
 
-**When to use timelines vs not in an export:**
-
-- Static manual / API reference → `--no-timelines` (the topology is the
-  story). Smaller file, less to digest.
-- Onboarding / "how does the checkout actually run" → keep timelines so
-  the reader can hit Play.
-
 **Don't auto-publish** — the export is intentional. A `git add` of the
 generated `.html` belongs in the change that updates the architecture,
 not in an automated commit triggered by every `.loom/` edit.

package/templates/.loom/README.md

@@ -6,7 +6,7 @@ This directory contains the node-based architecture spec for the project. It is
 
 - `node-types.json` — defines the available node types for this project. Customize freely; add types specific to your domain.
 - `diagrams/*.flow.json` — one file per subsystem. Each is a self-contained graph.
-- `timelines/*.timeline.json` — (future) time-axis views for sequenced behavior.
+- `exports.json` — (optional) named export bundles for `loom-spec export-html` (e.g. a `user-manual` bundle that filters to `tags: ["public"]`).
 
 ## Viewing and editing
 

package/dist/cli/importTrace.d.ts

@@ -1,15 +0,0 @@
-export interface ImportTraceArgs {
-    /** Path to the OTLP JSON trace file. */
-    trace: string;
-    /** Timeline id to create or append into. */
-    asId: string;
-    /** Diagram id the new timeline overlays. */
-    diagramId: string;
-    /** Optional path to a mapping file (see MappingFile shape below). */
-    map?: string;
-    /** Append to an existing timeline instead of overwriting. */
-    append: boolean;
-    /** Working directory root (walked up to find .loom/). */
-    root: string;
-}
-export declare function runImportTrace(args: ImportTraceArgs): Promise<void>;

package/dist/cli/importTrace.js

@@ -1,188 +0,0 @@
-import { readFile } from "node:fs/promises";
-import { resolve } from "node:path";
-import { findLoomRoot } from "../server/findLoomRoot.js";
-import { readDiagram, readTimeline, writeTimeline } from "../server/fileOps.js";
-import { parseOtlpJson } from "../server/otel.js";
-import { validateTimeline } from "../validate.js";
-const KIND_TO_EVENT_KIND = {
-    internal: "compute",
-    server: "io",
-    client: "io",
-    producer: "io",
-    consumer: "io",
-    unknown: undefined,
-};
-async function loadMapping(path) {
-    const raw = await readFile(path, "utf8");
-    const parsed = JSON.parse(raw);
-    return {
-        serviceMap: new Map(Object.entries(parsed.services ?? {})),
-        spanMap: new Map(Object.entries(parsed.spans ?? {})),
-    };
-}
-/**
- * Decide which node a span belongs to.
- * Precedence: explicit span map > explicit service map > heuristic match.
- */
-function resolveNode(span, mapping, nodes) {
-    if (mapping) {
-        const direct = mapping.spanMap.get(span.name);
-        if (direct)
-            return direct;
-        if (span.serviceName) {
-            const svc = mapping.serviceMap.get(span.serviceName);
-            if (svc)
-                return svc;
-        }
-    }
-    // Heuristic: try matching span.name first (it's most specific — for
-    // CLIENT/PRODUCER spans it names the *downstream* target, which is the
-    // node we want), then fall back to service.name.
-    const candidates = [];
-    candidates.push(span.name.toLowerCase());
-    if (span.serviceName)
-        candidates.push(span.serviceName.toLowerCase());
-    for (const c of candidates) {
-        // 1. exact id match
-        const idHit = nodes.find((n) => n.id.toLowerCase() === c);
-        if (idHit)
-            return idHit.id;
-        // 2. node id appears as a token inside the candidate
-        //    (e.g. "todo-store update" → finds id "todo-store")
-        const idInCandidate = nodes.find((n) => c.includes(n.id.toLowerCase()));
-        if (idInCandidate)
-            return idInCandidate.id;
-        // 3. candidate appears in a node label
-        //    (e.g. "todo-api" → finds label "Todo API")
-        const labelHit = nodes.find((n) => n.label.toLowerCase().includes(c));
-        if (labelHit)
-            return labelHit.id;
-        // 4. code-ref path includes the candidate
-        const refHit = nodes.find((n) => (n.code_refs ?? []).some((r) => r.path.toLowerCase().includes(c)));
-        if (refHit)
-            return refHit.id;
-    }
-    return null;
-}
-function eventIdFor(spanId, existingIds) {
-    // Stable: take the first 8 hex chars of the span id, prefix with "ev".
-    // Fall back to a sequence if collision (shouldn't happen in practice).
-    const base = `ev-${spanId.slice(0, 8) || "span"}`.toLowerCase();
-    if (!existingIds.has(base))
-        return base;
-    let i = 2;
-    while (existingIds.has(`${base}-${i}`))
-        i++;
-    return `${base}-${i}`;
-}
-export async function runImportTrace(args) {
-    // 1. Locate the .loom/ root and load the diagram we're overlaying.
-    const loomRoot = await findLoomRoot(args.root);
-    const diagram = await readDiagram(loomRoot.loomPath, args.diagramId);
-    // 2. Load and parse the trace.
-    const traceRaw = await readFile(resolve(args.trace), "utf8");
-    const traceJson = JSON.parse(traceRaw);
-    const spans = parseOtlpJson(traceJson);
-    if (spans.length === 0) {
-        console.error("Trace contained 0 spans — nothing to import.");
-        process.exit(1);
-    }
-    // 3. Optional mapping file.
-    const mapping = args.map ? await loadMapping(resolve(args.map)) : null;
-    // 4. Compute t=0 (earliest span start) so the timeline is repo-portable.
-    const minStartNs = spans.reduce((m, s) => (s.startNs < m ? s.startNs : m), spans[0].startNs);
-    // 5. If appending, load existing timeline; otherwise start fresh.
-    let existing = null;
-    if (args.append) {
-        try {
-            existing = await readTimeline(loomRoot.loomPath, args.asId);
-            if (existing.diagram !== args.diagramId) {
-                console.error(`Refusing to append: existing timeline '${args.asId}' references diagram ` +
-                    `'${existing.diagram}', not '${args.diagramId}'.`);
-                process.exit(1);
-            }
-        }
-        catch (e) {
-            if (e.code !== "ENOENT")
-                throw e;
-            // Fall through: --append on a missing file behaves like create.
-        }
-    }
-    const existingIds = new Set(existing?.events.map((e) => e.id) ?? []);
-    const spanIdToEventId = new Map();
-    const events = [];
-    const skipped = [];
-    // 6. First pass: pick node + event id for each span.
-    for (const s of spans) {
-        const node = resolveNode(s, mapping, diagram.nodes);
-        if (!node) {
-            skipped.push({ span: s, reason: "no matching node" });
-            continue;
-        }
-        const id = eventIdFor(s.spanId, existingIds);
-        existingIds.add(id);
-        spanIdToEventId.set(s.spanId, id);
-        const start_ms = Number((s.startNs - minStartNs) / 1000000n);
-        const duration_ms = Number((s.endNs - s.startNs) / 1000000n);
-        events.push({
-            id,
-            node,
-            start_ms: Math.max(0, start_ms),
-            duration_ms: Math.max(0, duration_ms),
-            label: s.name.length > 60 ? s.name.slice(0, 57) + "…" : s.name,
-            kind: KIND_TO_EVENT_KIND[s.kind] ?? "compute",
-            track: s.serviceName ?? undefined,
-            tags: [`otel-import`, `kind:${s.kind}`],
-        });
-    }
-    // 7. Second pass: wire triggered_by from span parent.
-    for (let i = 0; i < spans.length; i++) {
-        const s = spans[i];
-        const ev = events.find((e) => e.id === spanIdToEventId.get(s.spanId));
-        if (!ev)
-            continue;
-        if (s.parentSpanId) {
-            const parentEventId = spanIdToEventId.get(s.parentSpanId);
-            if (parentEventId)
-                ev.triggered_by = parentEventId;
-        }
-    }
-    // 8. Build the timeline. Auto-derive tracks from distinct services.
-    const trackIds = new Set((existing?.tracks?.map((t) => t.id) ?? []).concat(events.map((e) => e.track).filter((t) => !!t)));
-    const tracks = Array.from(trackIds).map((id) => ({ id, label: id }));
-    const timeline = {
-        version: "1",
-        id: args.asId,
-        title: existing?.title ?? `Imported: ${args.asId}`,
-        description: existing?.description ??
-            `Generated by 'loom-spec import-trace' from ${args.trace}.`,
-        diagram: args.diagramId,
-        events: existing ? [...existing.events, ...events] : events,
-        tracks,
-    };
-    // 9. Validate before writing.
-    const v = await validateTimeline(timeline);
-    if (!v.ok) {
-        console.error("Generated timeline failed schema validation:");
-        for (const e of v.errors)
-            console.error(`  - ${e}`);
-        process.exit(1);
-    }
-    await writeTimeline(loomRoot.loomPath, args.asId, timeline);
-    // 10. Report.
-    console.log(`Wrote ${events.length} event${events.length === 1 ? "" : "s"} to ` +
-        `${loomRoot.loomPath}/timelines/${args.asId}.timeline.json` +
-        (existing ? ` (appended; total ${timeline.events.length})` : ""));
-    if (skipped.length > 0) {
-        console.log(`Skipped ${skipped.length} span${skipped.length === 1 ? "" : "s"} ` +
-            `with no matching node. Pass --map mapping.json to override.`);
-        const sample = skipped.slice(0, 5);
-        for (const { span, reason } of sample) {
-            console.log(`  • ${span.name}  (service=${span.serviceName ?? "—"})  ${reason}`);
-        }
-        if (skipped.length > sample.length) {
-            console.log(`  … and ${skipped.length - sample.length} more.`);
-        }
-    }
-}
-//# sourceMappingURL=importTrace.js.map

package/dist/cli/importTrace.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"importTrace.js","sourceRoot":"","sources":["../../src/cli/importTrace.ts"],"names":[],"mappings":"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"}

package/dist/server/otel.d.ts

@@ -1,32 +0,0 @@
-/**
- * Minimal OTLP JSON parser. Reads the standard OpenTelemetry resource/scope/
- * spans shape (`resourceSpans[].scopeSpans[].spans[]`) and projects it down
- * to a flat list of normalized spans suitable for translating into a
- * loom-spec timeline.
- *
- * Scope: just enough of the OTLP JSON shape for the import-trace CLI.
- * Does NOT validate exhaustively, does NOT handle protobuf binary, does NOT
- * walk Jaeger or Zipkin formats — those can be follow-ons.
- */
-export interface ParsedSpan {
-    spanId: string;
-    parentSpanId: string | null;
-    /** Service that emitted the span (from resource attribute). */
-    serviceName: string | null;
-    /** Span name (often the operation or route). */
-    name: string;
-    /** "server" | "client" | "internal" | "producer" | "consumer" | "unknown". */
-    kind: SpanKind;
-    /** Start time in nanoseconds since UNIX epoch. */
-    startNs: bigint;
-    /** End time in nanoseconds since UNIX epoch. */
-    endNs: bigint;
-    /** Flattened key→value of attributes (resource + span merged; span wins). */
-    attributes: Record<string, string | number | boolean>;
-}
-export type SpanKind = "internal" | "server" | "client" | "producer" | "consumer" | "unknown";
-/**
- * Parse an OTLP JSON object (already JSON.parsed) into normalized spans.
- * Throws if `resourceSpans` is missing — we don't try to recover or guess.
- */
-export declare function parseOtlpJson(raw: unknown): ParsedSpan[];

package/dist/server/otel.js

@@ -1,98 +0,0 @@
-/**
- * Minimal OTLP JSON parser. Reads the standard OpenTelemetry resource/scope/
- * spans shape (`resourceSpans[].scopeSpans[].spans[]`) and projects it down
- * to a flat list of normalized spans suitable for translating into a
- * loom-spec timeline.
- *
- * Scope: just enough of the OTLP JSON shape for the import-trace CLI.
- * Does NOT validate exhaustively, does NOT handle protobuf binary, does NOT
- * walk Jaeger or Zipkin formats — those can be follow-ons.
- */
-const KIND_MAP = {
-    0: "unknown",
-    1: "internal",
-    2: "server",
-    3: "client",
-    4: "producer",
-    5: "consumer",
-};
-function attrValue(a) {
-    const v = a.value;
-    if (!v)
-        return undefined;
-    if (v.stringValue !== undefined)
-        return v.stringValue;
-    if (v.boolValue !== undefined)
-        return v.boolValue;
-    if (v.intValue !== undefined)
-        return Number(v.intValue);
-    if (v.doubleValue !== undefined)
-        return v.doubleValue;
-    return undefined;
-}
-function flattenAttrs(attrs) {
-    const out = {};
-    for (const a of attrs ?? []) {
-        const v = attrValue(a);
-        if (v !== undefined)
-            out[a.key] = v;
-    }
-    return out;
-}
-function toBigInt(t) {
-    if (t === undefined)
-        return 0n;
-    if (typeof t === "number")
-        return BigInt(t);
-    return BigInt(t);
-}
-function normalizeKind(k) {
-    if (typeof k === "number")
-        return KIND_MAP[k] ?? "unknown";
-    if (typeof k === "string") {
-        // OTLP exporters sometimes emit "SPAN_KIND_SERVER" etc.
-        const lower = k.replace(/^SPAN_KIND_/i, "").toLowerCase();
-        if (lower in { internal: 1, server: 1, client: 1, producer: 1, consumer: 1 }) {
-            return lower;
-        }
-        return "unknown";
-    }
-    return "unknown";
-}
-/**
- * Parse an OTLP JSON object (already JSON.parsed) into normalized spans.
- * Throws if `resourceSpans` is missing — we don't try to recover or guess.
- */
-export function parseOtlpJson(raw) {
-    if (!raw || typeof raw !== "object") {
-        throw new Error("Trace file is not a JSON object");
-    }
-    const root = raw;
-    if (!Array.isArray(root.resourceSpans)) {
-        throw new Error("Not an OTLP JSON trace — expected top-level 'resourceSpans' array. " +
-            "Jaeger/Zipkin formats are not yet supported.");
-    }
-    const out = [];
-    for (const rs of root.resourceSpans) {
-        const resourceAttrs = flattenAttrs(rs.resource?.attributes);
-        const serviceName = resourceAttrs["service.name"] ?? null;
-        for (const ss of rs.scopeSpans ?? []) {
-            for (const s of ss.spans ?? []) {
-                const spanAttrs = flattenAttrs(s.attributes);
-                const attributes = { ...resourceAttrs, ...spanAttrs };
-                out.push({
-                    spanId: s.spanId ?? "",
-                    parentSpanId: s.parentSpanId && s.parentSpanId.length > 0 ? s.parentSpanId : null,
-                    serviceName,
-                    name: s.name ?? "(unnamed)",
-                    kind: normalizeKind(s.kind),
-                    startNs: toBigInt(s.startTimeUnixNano),
-                    endNs: toBigInt(s.endTimeUnixNano),
-                    attributes,
-                });
-            }
-        }
-    }
-    return out;
-}
-//# sourceMappingURL=otel.js.map

package/dist/server/otel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../src/server/otel.ts"],"names":[],"mappings":"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"}

package/dist/types/timeline.d.ts

@@ -1,97 +0,0 @@
-/**
- * AUTOGENERATED — do not edit.
- * Source: schema/timeline.schema.json
- */
-/**
- * A time-axis overlay describing when events happen on the nodes of a diagram. Same node universe, different render.
- */
-export interface LoomTimeline {
-    $schema?: string;
-    version: "1";
-    /**
-     * Timeline identifier. Should match the filename without extension.
-     */
-    id: string;
-    title: string;
-    description?: string;
-    /**
-     * Id of the diagram whose nodes this timeline overlays.
-     */
-    diagram: string;
-    events: TimelineEvent[];
-    /**
-     * Optional explicit track definitions (label, color). If omitted, tracks are inferred from events[].track values.
-     */
-    tracks?: TimelineTrack[];
-}
-export interface TimelineEvent {
-    /**
-     * Unique within this timeline.
-     */
-    id: string;
-    /**
-     * Node id from the referenced diagram.
-     */
-    node: string;
-    /**
-     * Track label. Events on the same track are interpreted as sequential; events on different tracks at overlapping times are concurrent. If omitted, the renderer auto-assigns one track per node.
-     */
-    track?: string;
-    /**
-     * Start time in milliseconds from t=0.
-     */
-    start_ms: number;
-    /**
-     * Duration in milliseconds. May be 0 for instantaneous events.
-     */
-    duration_ms: number;
-    /**
-     * Short text rendered inside the clip.
-     */
-    label?: string;
-    description?: string;
-    /**
-     * Optional category for clip styling. Distinct from edge.kind in the diagram — this describes what the node is doing during this clip, not what flows between nodes.
-     */
-    kind?: "compute" | "io" | "wait" | "error";
-    /**
-     * Optional anchors to the specific function(s) running during this clip. Like node-level code_refs but scoped to a moment in time. Drift detection checks these too. Use for function-level granularity inside a node (e.g. 'validate' vs. 'issue jwt' both happen on the auth-service node).
-     */
-    code_refs?: CodeRef[];
-    /**
-     * Optional id of another event that caused this one. Used for explicit causation chains and to preserve OTel span.parent_id when importing traces. The renderer can draw a connecting arrow between the two clips.
-     */
-    triggered_by?: string;
-    /**
-     * Free-form labels for filtering or grouping clips. Examples: 'critical-path', 'billable-time', 'background'.
-     */
-    tags?: string[];
-}
-/**
- * Same shape as the CodeRef in diagram.schema.json. Inlined here to keep the schema self-contained — no cross-file $ref required to validate.
- */
-export interface CodeRef {
-    /**
-     * Repo-relative file path.
-     */
-    path: string;
-    /**
-     * Function, class, or component name. Preferred over lines because it survives refactors.
-     */
-    symbol?: string;
-    /**
-     * Line range(s) like '1-80' or '12,45-50'. Use only when no symbol applies.
-     */
-    lines?: string;
-}
-export interface TimelineTrack {
-    /**
-     * Track id, matches event.track values.
-     */
-    id: string;
-    label: string;
-    /**
-     * Optional background tint for the track lane.
-     */
-    color?: string;
-}

package/dist/types/timeline.js

@@ -1,7 +0,0 @@
-/* eslint-disable */
-/**
- * AUTOGENERATED — do not edit.
- * Source: schema/timeline.schema.json
- */
-export {};
-//# sourceMappingURL=timeline.js.map

package/dist/types/timeline.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeline.js","sourceRoot":"","sources":["../../src/types/timeline.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB;;;GAGG"}