@vibes.diy/call-ai-v2 2.2.1 → 2.2.2

package/README.md

@@ -179,6 +179,23 @@ Parses markdown structure from accumulated content, detecting code fences and im
 **Input:** `DeltaStreamMsg`
 **Messages:** `block.begin`, `block.toplevel.begin/line/end`, `block.code.begin/line/end`, `block.image`, `block.end`, `block.stats`
 
+`block.code.*` carries an optional `path` field, derived aider-style from the most-recent non-blank toplevel line preceding the fence (if it looks like a relative path with a recognized extension). Falls back to `App.jsx` otherwise.
+
+### fence-body-parser.ts
+
+Pure function that turns the lines inside a code fence into `Edit[]`. A body with no markers is a single `create`. A body with `<<<<<<< SEARCH` / `=======` / `>>>>>>> REPLACE` markers becomes one or more `replace` edits (multiple sections allowed in one fence).
+
+### apply-edits.ts
+
+Pure helpers `applyReplace` and `applyEdits`. `applyReplace` first tries an exact match; on failure it falls back to a trailing-whitespace-tolerant match. Result reports `matchKind` (`exact` | `trailing-ws`).
+
+### filesystem-stream.ts
+
+Aider-style virtual filesystem stage. Sits after `sections-stream`. Owns a `VirtualFS = Map<path, string>` for the life of one streamed turn, seeded from the caller-supplied `seed` (typically the saved `App.jsx`). Each `block.code.end` is parsed via `parseFenceBody`; the resulting edits are applied with `applyEdits`. On success, emits `fs.file.snapshot`. Failed sections (parse errors, missing or ambiguous SEARCH) emit `fs.apply.error` and leave the VFS unchanged. On `block.end`, emits `fs.turn.end` with the final files map.
+
+**Input:** `BlockStreamMsg`
+**Messages added:** `fs.file.snapshot`, `fs.apply.error`, `fs.turn.end`
+
 ## The Passthrough Pattern
 
 Streams use `passthrough()` to automatically forward all upstream messages while adding their own:
@@ -246,21 +263,41 @@ if (isDeltaStats(msg)) console.log("Delta stats:", msg.stats);
 if (isBlockStats(msg)) console.log("Block stats:", msg.stats);
 ```
 
-## Current Status
+## Filesystem stage usage
+
+```typescript
+import { createSectionsStream, createFileSystemStream, isFsFileSnapshot, isFsTurnEnd } from "call-ai/v2";
 
-Currently used by:
+const seed = new Map([["App.jsx", priorAppJsx]]);
+
+const pipeline = response.body
+  // …line/data/sse/delta stages…
+  .pipeThrough(createSectionsStream(streamId, createId))
+  .pipeThrough(createFileSystemStream({ streamId, createId, seed }));
+
+for await (const msg of pipeline) {
+  if (isFsFileSnapshot(msg)) {
+    // Update live preview with msg.content for msg.path
+  }
+  if (isFsTurnEnd(msg)) {
+    // Persist msg.files to the session doc
+  }
+}
+```
+
+## Current Status
 
-- CLI tool (`cli.ts`) for testing and debugging
-- Unit tests
+Production: this pipeline is the live streaming path for vibes.diy chat
+([`prompt-chat-section.ts`](../../vibes.diy/api/svc/public/prompt-chat-section.ts)
+pipes the LLM response body through line → data → sse → delta → sections, and
+the client reducer consumes the typed block messages directly).
 
-Integration plans (not part of this package):
+Also used by:
 
-- vibes.diy chat using advanced API
-- Auth for vibes iframe runtime
-- Generated vibes legacy callAI wrapper
+- CLI tool (`cli.ts`) for replay/debugging captured SSE files
+- Unit tests across the v2 modules
 
 ## TODO
 
 - [ ] **Chunked image decoding**: Add `createImageDecodeStream` that fetches image URLs, decodes to bytes, and emits `image.begin`/`image.fragment`/`image.end` with shared `imageId` for streaming large images in fixed-size chunks
 - [ ] **Production worker**: Deploy pipeline to Cloudflare Worker with events as network transport, client consumes typed events directly instead of raw SSE
-- [ ] **Migrate vibes.diy chat**: Replace `call-ai` v1 + `segment-parser.ts` with v2 pipeline, consuming typed `isCodeLine`/`isToplevelLine` events instead of regex parsing

package/apply-edits.d.ts

@@ -0,0 +1,39 @@
+export interface ApplyReplaceInput {
+    readonly source: string;
+    readonly search: string;
+    readonly replace: string;
+}
+export interface ApplyEditOk {
+    readonly ok: true;
+    readonly content: string;
+    readonly matchKind: "exact" | "trailing-ws";
+}
+export type ApplyEditErrReason = "no-match" | "multiple-match";
+export interface ApplyEditErr {
+    readonly ok: false;
+    readonly reason: ApplyEditErrReason;
+    readonly matchCount: number;
+}
+export type ApplyEditResult = ApplyEditOk | ApplyEditErr;
+export declare function applyReplace(input: ApplyReplaceInput): ApplyEditResult;
+export interface ReplaceEdit {
+    readonly op: "replace";
+    readonly search: string;
+    readonly replace: string;
+}
+export interface CreateEdit {
+    readonly op: "create";
+    readonly content: string;
+}
+export type Edit = ReplaceEdit | CreateEdit;
+export interface ApplyEditsError {
+    readonly index: number;
+    readonly reason: ApplyEditErrReason;
+    readonly matchCount: number;
+    readonly search: string;
+}
+export interface ApplyEditsResult {
+    readonly content: string;
+    readonly errors: readonly ApplyEditsError[];
+}
+export declare function applyEdits(seed: string, edits: readonly Edit[]): ApplyEditsResult;

package/apply-edits.js

@@ -0,0 +1,76 @@
+function rstripLines(s) {
+    return s
+        .split("\n")
+        .map((l) => l.replace(/[ \t]+$/, ""))
+        .join("\n");
+}
+function findAllOccurrences(haystack, needle) {
+    const hits = [];
+    if (needle.length === 0)
+        return hits;
+    let from = 0;
+    while (true) {
+        const idx = haystack.indexOf(needle, from);
+        if (idx === -1)
+            break;
+        hits.push(idx);
+        from = idx + needle.length;
+    }
+    return hits;
+}
+export function applyReplace(input) {
+    const { source, search, replace } = input;
+    if (search.length === 0) {
+        return { ok: false, reason: "no-match", matchCount: 0 };
+    }
+    const exact = findAllOccurrences(source, search);
+    if (exact.length === 1) {
+        const idx = exact[0];
+        return {
+            ok: true,
+            matchKind: "exact",
+            content: source.slice(0, idx) + replace + source.slice(idx + search.length),
+        };
+    }
+    if (exact.length > 1) {
+        return { ok: false, reason: "multiple-match", matchCount: exact.length };
+    }
+    const sourceTrimmed = rstripLines(source);
+    const searchTrimmed = rstripLines(search);
+    const tolerant = findAllOccurrences(sourceTrimmed, searchTrimmed);
+    if (tolerant.length === 1) {
+        const idx = tolerant[0];
+        return {
+            ok: true,
+            matchKind: "trailing-ws",
+            content: sourceTrimmed.slice(0, idx) + replace + sourceTrimmed.slice(idx + searchTrimmed.length),
+        };
+    }
+    if (tolerant.length > 1) {
+        return { ok: false, reason: "multiple-match", matchCount: tolerant.length };
+    }
+    return { ok: false, reason: "no-match", matchCount: 0 };
+}
+export function applyEdits(seed, edits) {
+    let content = seed;
+    const errors = [];
+    edits.forEach((edit, index) => {
+        if (edit.op === "create") {
+            content = edit.content;
+            return;
+        }
+        const r = applyReplace({ source: content, search: edit.search, replace: edit.replace });
+        if (r.ok) {
+            content = r.content;
+            return;
+        }
+        errors.push({
+            index,
+            reason: r.reason,
+            matchCount: r.matchCount,
+            search: edit.search,
+        });
+    });
+    return { content, errors };
+}
+//# sourceMappingURL=apply-edits.js.map

package/apply-edits.js.map

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

package/apply-edits.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apply-edits.test.js

@@ -0,0 +1,85 @@
+import { describe, expect, it } from "vitest";
+import { applyEdits, applyReplace } from "./apply-edits.js";
+describe("applyReplace", () => {
+    it("replaces a unique exact match", () => {
+        const r = applyReplace({ source: "hello world", search: "world", replace: "there" });
+        expect(r).toEqual({ ok: true, matchKind: "exact", content: "hello there" });
+    });
+    it("fails with no-match when search is absent", () => {
+        const r = applyReplace({ source: "hello world", search: "xyz", replace: "abc" });
+        expect(r).toEqual({ ok: false, reason: "no-match", matchCount: 0 });
+    });
+    it("fails with multiple-match when search appears twice", () => {
+        const r = applyReplace({ source: "ab ab", search: "ab", replace: "cd" });
+        expect(r.ok).toBe(false);
+        if (r.ok === false) {
+            expect(r.reason).toBe("multiple-match");
+            expect(r.matchCount).toBe(2);
+        }
+    });
+    it("treats empty search as no-match", () => {
+        const r = applyReplace({ source: "hello", search: "", replace: "x" });
+        expect(r).toEqual({ ok: false, reason: "no-match", matchCount: 0 });
+    });
+    it("preserves whitespace and indentation on exact match", () => {
+        const r = applyReplace({
+            source: "line1\n  line2\nline3",
+            search: "  line2",
+            replace: "  LINE2",
+        });
+        expect(r).toEqual({ ok: true, matchKind: "exact", content: "line1\n  LINE2\nline3" });
+    });
+    it("falls back to trailing-whitespace-tolerant match", () => {
+        const r = applyReplace({ source: "foo   \nbar\nbaz", search: "foo\nbar", replace: "FOO\nBAR" });
+        expect(r.ok).toBe(true);
+        if (r.ok === true) {
+            expect(r.matchKind).toBe("trailing-ws");
+            expect(r.content).toBe("FOO\nBAR\nbaz");
+        }
+    });
+    it("tolerant fallback still reports multiple-match", () => {
+        const r = applyReplace({ source: "foo  \nfoo\t\nend", search: "foo", replace: "X" });
+        expect(r.ok).toBe(false);
+        if (r.ok === false)
+            expect(r.reason).toBe("multiple-match");
+    });
+});
+describe("applyEdits", () => {
+    it("applies a create then a sequence of replaces", () => {
+        const edits = [
+            { op: "create", content: "const a = 1;\nconst b = 2;\n" },
+            { op: "replace", search: "const a = 1;", replace: "const a = 10;" },
+            { op: "replace", search: "const b = 2;", replace: "const b = 20;" },
+        ];
+        const r = applyEdits("", edits);
+        expect(r.content).toBe("const a = 10;\nconst b = 20;\n");
+        expect(r.errors).toEqual([]);
+    });
+    it("uses seed when first edit is a replace", () => {
+        const seed = "hello world";
+        const r = applyEdits(seed, [{ op: "replace", search: "world", replace: "there" }]);
+        expect(r.content).toBe("hello there");
+        expect(r.errors).toEqual([]);
+    });
+    it("collects failures and continues with unchanged source", () => {
+        const seed = "one two three";
+        const r = applyEdits(seed, [
+            { op: "replace", search: "missing", replace: "x" },
+            { op: "replace", search: "two", replace: "TWO" },
+            { op: "replace", search: "e", replace: "E" },
+        ]);
+        expect(r.content).toBe("one TWO three");
+        expect(r.errors).toHaveLength(2);
+        expect(r.errors[0]).toMatchObject({ index: 0, reason: "no-match" });
+        expect(r.errors[1]).toMatchObject({ index: 2, reason: "multiple-match" });
+    });
+    it("create after replaces resets content", () => {
+        const r = applyEdits("original", [
+            { op: "replace", search: "original", replace: "edited" },
+            { op: "create", content: "fresh" },
+        ]);
+        expect(r.content).toBe("fresh");
+        expect(r.errors).toEqual([]);
+    });
+});
+//# sourceMappingURL=apply-edits.test.js.map

package/apply-edits.test.js.map

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

package/block-stream-path.test.d.ts

@@ -0,0 +1 @@
+export {};

package/block-stream-path.test.js

@@ -0,0 +1,91 @@
+import { describe, it, expect } from "vitest";
+import { stream2array } from "@adviser/cement";
+import { createBlockStream, isCodeBegin, isCodeLine, isCodeEnd } from "./block-stream.js";
+const innerStreamId = "inner";
+const streamId = "test";
+function makeLineEvents(lines) {
+    const events = [{ type: "line.begin", streamId: innerStreamId, timestamp: new Date() }];
+    lines.forEach((content, i) => {
+        events.push({
+            type: "line.line",
+            streamId: innerStreamId,
+            content,
+            lineNr: i + 1,
+            timestamp: new Date(),
+        });
+    });
+    events.push({ type: "line.end", streamId: innerStreamId, totalLines: lines.length, timestamp: new Date() });
+    return events;
+}
+async function runBlockStream(lines) {
+    const events = makeLineEvents(lines);
+    const input = new ReadableStream({
+        start(controller) {
+            events.forEach((e) => controller.enqueue(e));
+            controller.close();
+        },
+    });
+    let idCounter = 0;
+    const createId = () => `id-${++idCounter}`;
+    return stream2array(input.pipeThrough(createBlockStream(streamId, innerStreamId, createId)));
+}
+describe("block-stream path-line tracking", () => {
+    it("attaches path 'App.jsx' (default) when no path line precedes the fence", async () => {
+        const chunks = await runBlockStream(["Some intro prose.", "```jsx", "const x = 1;", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        const end = chunks.find((c) => isCodeEnd(c));
+        expect(begin?.path).toBe("App.jsx");
+        expect(end?.path).toBe("App.jsx");
+    });
+    it("attaches the preceding path-line as the path", async () => {
+        const chunks = await runBlockStream(["Building a layout.", "App.jsx", "```jsx", "const x = 1;", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        const end = chunks.find((c) => isCodeEnd(c));
+        expect(begin?.path).toBe("App.jsx");
+        expect(end?.path).toBe("App.jsx");
+    });
+    it("recognizes nested-path filenames with allowed extensions", async () => {
+        const chunks = await runBlockStream(["src/components/Foo.tsx", "```tsx", "export const Foo = () => null;", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        expect(begin?.path).toBe("src/components/Foo.tsx");
+    });
+    it("ignores a non-path-looking preceding line", async () => {
+        const chunks = await runBlockStream(["Here is the code:", "```jsx", "const x = 1;", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        expect(begin?.path).toBe("App.jsx");
+    });
+    it("stamps path on every code.line within the block", async () => {
+        const chunks = await runBlockStream(["App.jsx", "```jsx", "const a = 1;", "const b = 2;", "```"]);
+        const lines = chunks.filter((c) => isCodeLine(c));
+        expect(lines).toHaveLength(2);
+        for (const l of lines)
+            expect(l.path).toBe("App.jsx");
+    });
+    it("uses the most recent non-blank toplevel line, not earlier ones", async () => {
+        const chunks = await runBlockStream(["First paragraph.", "App.jsx", "", "```jsx", "const x = 1;", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        expect(begin?.path).toBe("App.jsx");
+    });
+    it("does not carry a path-line forward across multiple blocks if the second has its own toplevel section", async () => {
+        const chunks = await runBlockStream([
+            "App.jsx",
+            "```jsx",
+            "const a = 1;",
+            "```",
+            "Now some more prose without a path line.",
+            "```jsx",
+            "const b = 2;",
+            "```",
+        ]);
+        const begins = chunks.filter((c) => isCodeBegin(c));
+        expect(begins).toHaveLength(2);
+        expect(begins[0].path).toBe("App.jsx");
+        expect(begins[1].path).toBe("App.jsx");
+    });
+    it("rejects a path line whose extension is not in the allowed set", async () => {
+        const chunks = await runBlockStream(["foo.exe", "```", "binary", "```"]);
+        const begin = chunks.find((c) => isCodeBegin(c));
+        expect(begin?.path).toBe("App.jsx");
+    });
+});
+//# sourceMappingURL=block-stream-path.test.js.map

package/block-stream-path.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-stream-path.test.js","sourceRoot":"","sources":["../jsr/block-stream-path.test.ts"],"names":[],"mappings":"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"}

package/block-stream.d.ts

@@ -180,6 +180,7 @@ export declare const CodeBeginMsg: import("arktype/internal/variants/object.ts")
     type: "block.code.begin";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const CodeLineMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -192,6 +193,7 @@ export declare const CodeLineMsg: import("arktype/internal/variants/object.ts").
     type: "block.code.line";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const CodeEndMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -207,6 +209,7 @@ export declare const CodeEndMsg: import("arktype/internal/variants/object.ts").O
     type: "block.code.end";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const BlockImageMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -299,6 +302,7 @@ export declare const CodeMsg: import("arktype/internal/variants/object.ts").Obje
     type: "block.code.begin";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -310,6 +314,7 @@ export declare const CodeMsg: import("arktype/internal/variants/object.ts").Obje
     type: "block.code.line";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -324,6 +329,7 @@ export declare const CodeMsg: import("arktype/internal/variants/object.ts").Obje
     type: "block.code.end";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const LineMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -346,6 +352,7 @@ export declare const LineMsg: import("arktype/internal/variants/object.ts").Obje
     type: "block.code.line";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const BeginMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -364,6 +371,7 @@ export declare const BeginMsg: import("arktype/internal/variants/object.ts").Obj
     type: "block.code.begin";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 }, {}>;
 export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts").ObjectType<{
     blockId: string;
@@ -459,6 +467,7 @@ export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts
     type: "block.code.begin";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -470,6 +479,7 @@ export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts
     type: "block.code.line";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -484,6 +494,7 @@ export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts
     type: "block.code.end";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -627,6 +638,7 @@ export declare const BlockMsgs: import("arktype/internal/variants/object.ts").Ob
     type: "block.code.begin";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -638,6 +650,7 @@ export declare const BlockMsgs: import("arktype/internal/variants/object.ts").Ob
     type: "block.code.line";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;
@@ -652,6 +665,7 @@ export declare const BlockMsgs: import("arktype/internal/variants/object.ts").Ob
     type: "block.code.end";
     sectionId: string;
     lang: string;
+    path?: string | undefined;
 } | {
     blockId: string;
     streamId: string;

package/block-stream.js

@@ -87,11 +87,13 @@ export const CodeBeginMsg = type({
     type: "'block.code.begin'",
     sectionId: "string",
     lang: "string",
+    "path?": "string",
 }).and(BlockBase);
 export const CodeLineMsg = type({
     type: "'block.code.line'",
     sectionId: "string",
     lang: "string",
+    "path?": "string",
 })
     .and(BlockBase)
     .and(BlockLine);
@@ -99,6 +101,7 @@ export const CodeEndMsg = type({
     type: "'block.code.end'",
     sectionId: "string",
     lang: "string",
+    "path?": "string",
 })
     .and(BlockBase)
     .and(BlockStatsBox);
@@ -138,6 +141,8 @@ export const isBlockImage = (msg, streamId) => !(BlockImageMsg(msg) instanceof t
 export const isBlockStreamMsg = (msg, streamId) => !(BlockStreamMsg(msg) instanceof type.errors) && (!streamId || msg.streamId === streamId);
 const CODE_FENCE_START = /^```(\w*)$/;
 const CODE_FENCE_END = /^```$/;
+const PATH_LINE = /^[\w\-./]+\.(?:jsx?|tsx?|mjs|cjs|md|json|html|css)$/;
+const DEFAULT_PATH = "App.jsx";
 function addStat(target, source) {
     target.lines += source.lines;
     target.bytes += source.bytes;
@@ -153,6 +158,8 @@ export function createBlockStream(streamId, innerStreamId, createId) {
     let sectionStarted = false;
     let currentLang = "";
     let currentSectionId = "";
+    let currentPath = DEFAULT_PATH;
+    let lastToplevelLine = "";
     const toplevelStat = { lines: 0, bytes: 0, cnt: 0 };
     const codeStat = { lines: 0, bytes: 0, cnt: 0 };
     const imageStat = { lines: 0, bytes: 0, cnt: 0 };
@@ -246,6 +253,9 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                         }
                         mode = "code";
                         currentLang = fenceStartMatch[1] || "";
+                        const trimmedPath = lastToplevelLine.trim();
+                        currentPath = PATH_LINE.test(trimmedPath) ? trimmedPath : DEFAULT_PATH;
+                        lastToplevelLine = "";
                         sectionStarted = true;
                         currentSectionId = createId();
                         blockStat = { lines: 0, bytes: 0, cnt: 0 };
@@ -253,6 +263,7 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                         controller.enqueue({
                             type: "block.code.begin",
                             lang: currentLang.toLowerCase(),
+                            path: currentPath,
                             timestamp: new Date(),
                             sectionId: currentSectionId,
                             blockId,
@@ -277,6 +288,8 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                             });
                         }
                         blockStat.bytes += content.length;
+                        if (content.trim().length > 0)
+                            lastToplevelLine = content;
                         controller.enqueue({
                             type: "block.toplevel.line",
                             timestamp: new Date(),
@@ -306,6 +319,7 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                             seq: seq++,
                             blockNr: blockNr++,
                             lang: currentLang.toLowerCase(),
+                            path: currentPath,
                             stats: blockStat,
                         });
                         mode = "toplevel";
@@ -316,6 +330,7 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                         controller.enqueue({
                             type: "block.code.line",
                             lang: currentLang.toLowerCase(),
+                            path: currentPath,
                             timestamp: new Date(),
                             sectionId: currentSectionId,
                             lineNr: blockStat.lines++,
@@ -359,6 +374,7 @@ export function createBlockStream(streamId, innerStreamId, createId) {
                             blockId,
                             streamId,
                             lang: currentLang.toLowerCase(),
+                            path: currentPath,
                             sectionId: currentSectionId,
                             seq: seq++,
                             blockNr: blockNr++,