@slopus/beer 0.1.1 → 0.1.2

package/dist/modules/ai/generate.js

@@ -1,12 +1,17 @@
-import { providerPriorityList } from "@/modules/providers/providerPriorityList.js";
+import { readFile } from "node:fs/promises";
+import { beerLogLine } from "@text";
+import { providerGenerate } from "@/modules/ai/providerGenerate.js";
 import { providerModelSelect } from "@/modules/providers/providerModelSelect.js";
+import { providerPriorityList } from "@/modules/providers/providerPriorityList.js";
 import { sandboxInferenceGet } from "@/modules/sandbox/sandboxInferenceGet.js";
-import { providerGenerate } from "@/modules/ai/providerGenerate.js";
 function inferMessage(message, options) {
     options?.onMessage?.(`[beer][infer] ${message}`);
 }
+function inferEvent(event, options) {
+    options?.onEvent?.(event);
+}
 function inferOutputMessage(providerId, stream, chunk, options) {
-    if (!options?.onMessage) {
+    if (!options?.onMessage && !options?.onEvent) {
         return;
     }
     const lines = chunk
@@ -14,15 +19,49 @@ function inferOutputMessage(providerId, stream, chunk, options) {
         .map((line) => line.trim())
         .filter((line) => line.length > 0);
     for (const line of lines) {
-        options.onMessage(`[beer][infer] ${providerId}:${stream} ${line}`);
+        options.onMessage?.(`[beer][infer] ${providerId}:${stream} ${line}`);
+        if (stream === "stderr") {
+            inferEvent({
+                type: "provider_stderr",
+                providerId,
+                text: line
+            }, options);
+        }
+    }
+}
+function inferProviderEvent(providerId, event, options) {
+    inferEvent({ providerId, ...event }, options);
+}
+function inferProviderStatusEvent(event, options) {
+    const detailParts = [];
+    if (event.model) {
+        detailParts.push(`model=${event.model}`);
+    }
+    if (event.sessionId) {
+        detailParts.push(`session=${event.sessionId}`);
+    }
+    if (typeof event.exitCode === "number") {
+        detailParts.push(`exit=${event.exitCode}`);
+    }
+    if (event.tokens) {
+        detailParts.push(`tokens=${event.tokens.total}`);
     }
+    const details = detailParts.length > 0 ? ` ${detailParts.join(" ")}` : "";
+    inferMessage(`provider=${event.providerId} ${event.status}${details}`, options);
+    inferEvent({
+        type: "provider_status",
+        ...event
+    }, options);
+}
+function inferFailureForEvent(failure) {
+    return {
+        providerId: failure.providerId,
+        exitCode: failure.exitCode,
+        stderr: failure.stderr
+    };
 }
 function inferPromptResolve(prompt, writePolicy, expectedOutput) {
-    return [
-        inferSandboxPrompt(writePolicy),
-        prompt,
-        inferExpectedOutputPrompt(expectedOutput)
-    ].join("\n\n");
+    return [inferSandboxPrompt(writePolicy), prompt, inferExpectedOutputPrompt(expectedOutput)].join("\n\n");
 }
 function inferSandboxPrompt(writePolicy) {
     if (writePolicy.mode === "read-only") {
@@ -34,12 +73,8 @@ function inferSandboxPrompt(writePolicy) {
             "- do not change files, run write operations, or apply edits"
         ].join("\n");
     }
-    const writablePaths = writePolicy.writablePaths
-        .map((entry) => entry.trim())
-        .filter((entry) => entry.length > 0);
-    const writableLine = writablePaths.length > 0
-        ? `- writable paths: ${writablePaths.join(", ")}`
-        : "- writable paths: none";
+    const writablePaths = writePolicy.writablePaths.map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+    const writableLine = writablePaths.length > 0 ? `- writable paths: ${writablePaths.join(", ")}` : "- writable paths: none";
     return [
         "Current sandbox parameters:",
         "- filesystem mode: write-whitelist",
@@ -72,11 +107,17 @@ export async function generate(context, prompt, permissions = {}) {
     const writePolicy = permissions.writePolicy ?? { mode: "read-only" };
     const expectedOutput = permissions.expectedOutput ?? { type: "text" };
     const onMessage = permissions.showProgress
-        ? (message) => { console.log(message); }
+        ? (message) => {
+            beerLogLine(message);
+        }
         : undefined;
-    const options = { onMessage };
+    const options = {
+        onMessage,
+        onEvent: permissions.onEvent
+    };
     const sandbox = await sandboxInferenceGet({
         writePolicy,
+        projectPath: context.projectPath,
         enableWeakerNetworkIsolation: permissions.enableWeakerNetworkIsolation
     });
     const promptResolved = inferPromptResolve(prompt, writePolicy, expectedOutput);
@@ -87,40 +128,66 @@ export async function generate(context, prompt, permissions = {}) {
         if (!provider.command) {
             continue;
         }
-        inferMessage(`provider=${provider.id} selected`, options);
-        inferMessage(`provider=${provider.id} started`, options);
+        inferProviderStatusEvent({
+            providerId: provider.id,
+            status: "selected"
+        }, options);
         const model = providerModelSelect({
             provider,
             modelPriority: permissions.modelPriority,
             mode: permissions.modelSelectionMode
         });
-        if (model) {
-            inferMessage(`provider=${provider.id} model=${model}`, options);
-        }
+        inferProviderStatusEvent({
+            providerId: provider.id,
+            status: "started",
+            model
+        }, options);
         const result = await providerGenerate({
             providerId: provider.id,
             command: provider.command,
             model,
             prompt: promptResolved,
+            sessionId: permissions.sessionId,
+            projectPath: context.projectPath,
             sandbox,
             writePolicy,
             requireOutputTags: expectedOutput.type === "text",
+            validateOutput: inferExpectedOutputVerifier(expectedOutput),
+            onEvent: (event) => inferProviderEvent(provider.id, event, options),
             onStdoutText: (chunk) => inferOutputMessage(provider.id, "stdout", chunk, options),
             onStderrText: (chunk) => inferOutputMessage(provider.id, "stderr", chunk, options)
         });
         if (result.output !== null) {
-            inferMessage(`provider=${provider.id} completed`, options);
-            return {
+            inferProviderStatusEvent({
+                providerId: provider.id,
+                status: "completed",
+                sessionId: result.sessionId,
+                tokens: result.tokenUsage
+            }, options);
+            const output = {
                 provider: provider.id,
                 text: result.output
             };
+            if (result.sessionId) {
+                output.sessionId = result.sessionId;
+            }
+            return output;
         }
         if (result.failure) {
-            inferMessage(`provider=${provider.id} exit=${result.failure.exitCode}`, options);
+            inferProviderStatusEvent({
+                providerId: provider.id,
+                status: "failed",
+                exitCode: result.failure.exitCode,
+                tokens: result.tokenUsage
+            }, options);
             failures.push(result.failure);
         }
     }
     inferMessage("all providers failed", options);
+    inferEvent({
+        type: "all_providers_failed",
+        failures: failures.map((entry) => inferFailureForEvent(entry))
+    }, options);
     const details = failures
         .map((entry) => {
         const suffix = entry.stderr ? `, stderr=${entry.stderr}` : "";
@@ -129,4 +196,25 @@ export async function generate(context, prompt, permissions = {}) {
         .join("; ");
     throw new Error(`Inference failed for all providers${details ? `: ${details}` : "."}`);
 }
+function inferExpectedOutputVerifier(expectedOutput) {
+    if (expectedOutput.type === "text") {
+        const verify = expectedOutput.verify;
+        if (!verify) {
+            return undefined;
+        }
+        return async (text) => verify({ text });
+    }
+    const verify = expectedOutput.verify;
+    if (!verify) {
+        return undefined;
+    }
+    return async (text) => {
+        const fileContent = await readFile(expectedOutput.filePath, "utf-8");
+        await verify({
+            text,
+            filePath: expectedOutput.filePath,
+            fileContent
+        });
+    };
+}
 //# sourceMappingURL=generate.js.map

package/dist/modules/ai/generate.js.map

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

package/dist/modules/ai/generate.spec.js

@@ -17,14 +17,7 @@ function errorTextResolve(error) {
 function contextForProvider(providerId, command) {
     return {
         projectPath: "/tmp/test-project",
-        providers: [{ id: providerId, available: true, command, priority: 1 }],
-        inferText: (input) => generate(contextForProvider(providerId, command), input.prompt, {
-            providerPriority: input.providerPriority,
-            modelPriority: input.modelPriority,
-            showProgress: input.showProgress,
-            writePolicy: input.writePolicy
-        }),
-        stageAndCommit: async () => false
+        providers: [{ id: providerId, available: true, command, priority: 1 }]
     };
 }
 async function runRealProviderInference(providerId, command) {

package/dist/modules/ai/generate.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.spec.js","sourceRoot":"","sources":["../../../sources/modules/ai/generate.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIpD,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,SAAS,aAAa,CAAC,OAAe;IACpC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,cAAc,OAAO,EAAE,CAAC,EAAE;QAChE,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB,EAAE,OAAe;IACjE,OAAO;QACL,WAAW,EAAE,mBAAmB;QAChC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACtE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,QAAQ,CACN,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,EACvC,KAAK,CAAC,MAAM,EACZ;YACE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CACF;QACH,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;KAClC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,UAAsB,EAAE,OAAe;IAC7E,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAExD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,qCAAqC,EAAE;YAC5E,gBAAgB,EAAE,CAAC,UAAU,CAAC;SAC/B,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAExC,uEAAuE;QACvE,2CAA2C;QAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CACA,8DAA8D,EAC9D,KAAK,IAAI,EAAE;QACT,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC,EACD,eAAe,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"generate.spec.js","sourceRoot":"","sources":["../../../sources/modules/ai/generate.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIpD,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,SAAS,aAAa,CAAC,OAAe;IAClC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,cAAc,OAAO,EAAE,CAAC,EAAE;QAC9D,QAAQ,EAAE,OAAO;KACpB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACpC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,OAAO,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAsB,EAAE,OAAe;IAC/D,OAAO;QACH,WAAW,EAAE,mBAAmB;QAChC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;KACnD,CAAC;AAC5B,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,UAAsB,EAAE,OAAe;IAC3E,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAExD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,qCAAqC,EAAE;YAC1E,gBAAgB,EAAE,CAAC,UAAU,CAAC;SACjC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAExC,uEAAuE;QACvE,2CAA2C;QAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAC9D,CAAC;AACL,CAAC;AAED,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACrC,EAAE,CACE,8DAA8D,EAC9D,KAAK,IAAI,EAAE;QACP,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC,EACD,eAAe,CAClB,CAAC;AACN,CAAC,CAAC,CAAC"}

package/dist/modules/ai/generate.unit.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generate.unit.spec.d.ts.map

package/dist/modules/ai/generate.unit.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.unit.spec.d.ts","sourceRoot":"","sources":["../../../sources/modules/ai/generate.unit.spec.ts"],"names":[],"mappings":""}

package/dist/modules/ai/generate.unit.spec.js

@@ -0,0 +1,185 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+const providerPriorityListMock = vi.hoisted(() => vi.fn());
+const providerModelSelectMock = vi.hoisted(() => vi.fn());
+const sandboxInferenceGetMock = vi.hoisted(() => vi.fn());
+const providerGenerateMock = vi.hoisted(() => vi.fn());
+vi.mock("@/modules/providers/providerPriorityList.js", () => ({
+    providerPriorityList: providerPriorityListMock
+}));
+vi.mock("@/modules/providers/providerModelSelect.js", () => ({
+    providerModelSelect: providerModelSelectMock
+}));
+vi.mock("@/modules/sandbox/sandboxInferenceGet.js", () => ({
+    sandboxInferenceGet: sandboxInferenceGetMock
+}));
+vi.mock("@/modules/ai/providerGenerate.js", () => ({
+    providerGenerate: providerGenerateMock
+}));
+import { generate } from "@/modules/ai/generate.js";
+describe("generate event parsing", () => {
+    beforeEach(() => {
+        providerPriorityListMock.mockReset();
+        providerModelSelectMock.mockReset();
+        sandboxInferenceGetMock.mockReset();
+        providerGenerateMock.mockReset();
+        providerPriorityListMock.mockReturnValue([{ id: "pi", command: "pi" }]);
+        providerModelSelectMock.mockReturnValue(undefined);
+        sandboxInferenceGetMock.mockResolvedValue({ wrapCommand: async (command) => command });
+    });
+    it("forwards provider session_started event", async () => {
+        providerGenerateMock.mockImplementation(async (input) => {
+            input.onEvent?.({ type: "session_started", sessionId: "session-1" });
+            return { output: "ok" };
+        });
+        const onEvent = vi.fn();
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { onEvent });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "session_started",
+            providerId: "pi",
+            sessionId: "session-1"
+        });
+    });
+    it("forwards provider full-state thinking events", async () => {
+        providerGenerateMock.mockImplementation(async (input) => {
+            input.onEvent?.({ type: "thinking", status: "started", text: "" });
+            input.onEvent?.({ type: "thinking", status: "updated", text: "analysis" });
+            input.onEvent?.({ type: "thinking", status: "stopped", text: "analysis done" });
+            return { output: "ok" };
+        });
+        const onEvent = vi.fn();
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { onEvent });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "thinking",
+            providerId: "pi",
+            status: "started",
+            text: ""
+        });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "thinking",
+            providerId: "pi",
+            status: "updated",
+            text: "analysis"
+        });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "thinking",
+            providerId: "pi",
+            status: "stopped",
+            text: "analysis done"
+        });
+    });
+    it("forwards provider full-state tool call events", async () => {
+        providerGenerateMock.mockImplementation(async (input) => {
+            input.onEvent?.({
+                type: "tool_call",
+                status: "started",
+                toolName: "read",
+                partialJson: '{"path"'
+            });
+            input.onEvent?.({
+                type: "tool_call",
+                status: "stopped",
+                toolName: "read",
+                arguments: { path: "README.md" },
+                partialJson: '{"path":"README.md"}'
+            });
+            return { output: "ok" };
+        });
+        const onEvent = vi.fn();
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { onEvent });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "tool_call",
+            providerId: "pi",
+            status: "started",
+            toolName: "read",
+            partialJson: '{"path"'
+        });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "tool_call",
+            providerId: "pi",
+            status: "stopped",
+            toolName: "read",
+            arguments: { path: "README.md" },
+            partialJson: '{"path":"README.md"}'
+        });
+    });
+    it("forwards provider full-state text events", async () => {
+        providerGenerateMock.mockImplementation(async (input) => {
+            input.onEvent?.({ type: "text", status: "started", text: "" });
+            input.onEvent?.({ type: "text", status: "updated", text: "hello" });
+            input.onEvent?.({ type: "text", status: "stopped", text: "hello world" });
+            return { output: "ok" };
+        });
+        const onEvent = vi.fn();
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { onEvent });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "text",
+            providerId: "pi",
+            status: "started",
+            text: ""
+        });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "text",
+            providerId: "pi",
+            status: "updated",
+            text: "hello"
+        });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "text",
+            providerId: "pi",
+            status: "stopped",
+            text: "hello world"
+        });
+    });
+    it("forwards token usage events", async () => {
+        providerGenerateMock.mockImplementation(async (input) => {
+            input.onEvent?.({
+                type: "usage",
+                tokens: {
+                    input: 10,
+                    output: 5,
+                    cacheRead: 2,
+                    cacheWrite: 0,
+                    total: 17
+                }
+            });
+            return { output: "ok", tokenUsage: { input: 10, output: 5, cacheRead: 2, cacheWrite: 0, total: 17 } };
+        });
+        const onEvent = vi.fn();
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { onEvent });
+        expect(onEvent).toHaveBeenCalledWith({
+            type: "usage",
+            providerId: "pi",
+            tokens: {
+                input: 10,
+                output: 5,
+                cacheRead: 2,
+                cacheWrite: 0,
+                total: 17
+            }
+        });
+    });
+    it("returns sessionId from providerGenerate result", async () => {
+        providerGenerateMock.mockResolvedValue({ output: "ok", sessionId: "session-1" });
+        const context = { projectPath: "/tmp/project", providers: [] };
+        const result = await generate(context, "hello");
+        expect(result).toEqual({
+            provider: "pi",
+            sessionId: "session-1",
+            text: "ok"
+        });
+    });
+    it("passes requested sessionId into providerGenerate", async () => {
+        providerGenerateMock.mockResolvedValue({ output: "ok", sessionId: "session-2" });
+        const context = { projectPath: "/tmp/project", providers: [] };
+        await generate(context, "hello", { sessionId: "session-2" });
+        expect(providerGenerateMock).toHaveBeenCalledWith(expect.objectContaining({
+            sessionId: "session-2"
+        }));
+    });
+});
+//# sourceMappingURL=generate.unit.spec.js.map

package/dist/modules/ai/generate.unit.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.unit.spec.js","sourceRoot":"","sources":["../../../sources/modules/ai/generate.unit.spec.ts"],"names":[],"mappings":"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"}

package/dist/modules/ai/generateEventTypes.d.ts

@@ -0,0 +1,26 @@
+import type { ProviderEvent, ProviderTokenUsage } from "@/modules/ai/providerEventTypes.js";
+import type { ProviderId } from "@/modules/providers/providerTypes.js";
+export interface GenerateProviderFailure {
+    providerId: ProviderId;
+    exitCode: number;
+    stderr: string;
+}
+export type GenerateEvent = {
+    type: "provider_status";
+    providerId: ProviderId;
+    status: "selected" | "started" | "completed" | "failed";
+    model?: string;
+    sessionId?: string;
+    exitCode?: number;
+    tokens?: ProviderTokenUsage;
+} | {
+    type: "provider_stderr";
+    providerId: ProviderId;
+    text: string;
+} | ({
+    providerId: ProviderId;
+} & ProviderEvent) | {
+    type: "all_providers_failed";
+    failures: readonly GenerateProviderFailure[];
+};
+//# sourceMappingURL=generateEventTypes.d.ts.map

package/dist/modules/ai/generateEventTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateEventTypes.d.ts","sourceRoot":"","sources":["../../../sources/modules/ai/generateEventTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC5F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAEvE,MAAM,WAAW,uBAAuB;IACpC,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,aAAa,GACnB;IACI,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC/B,GACD;IACI,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CAChB,GACD,CAAC;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,aAAa,CAAC,GAC5C;IACI,IAAI,EAAE,sBAAsB,CAAC;IAC7B,QAAQ,EAAE,SAAS,uBAAuB,EAAE,CAAC;CAChD,CAAC"}

package/dist/modules/ai/generateEventTypes.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generateEventTypes.js.map

package/dist/modules/ai/generateEventTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateEventTypes.js","sourceRoot":"","sources":["../../../sources/modules/ai/generateEventTypes.ts"],"names":[],"mappings":""}

package/dist/modules/ai/generateFile.d.ts

@@ -1,7 +1,10 @@
+import { type GenerateExpectedFileOutputVerify, type GeneratePermissions } from "@/modules/ai/generate.js";
 import type { Context } from "@/types";
-import { type GeneratePermissions } from "@/modules/ai/generate.js";
-export interface GenerateFilePermissions extends GeneratePermissions {
+export interface GenerateFilePermissions extends Omit<GeneratePermissions, "expectedOutput"> {
     retries?: number;
+    verify?: GenerateExpectedFileOutputVerify;
+    /** Extra template values to substitute in the prompt alongside the built-in ones. */
+    extraTemplateValues?: Record<string, string>;
 }
 /**
  * Generates content and asks the model to write it into a specific file path only.
@@ -9,6 +12,7 @@ export interface GenerateFilePermissions extends GeneratePermissions {
  */
 export declare function generateFile(context: Context, prompt: string, outputFilePath: string, permissions?: GenerateFilePermissions): Promise<{
     provider?: string;
+    sessionId?: string;
     text: string;
 }>;
 //# sourceMappingURL=generateFile.d.ts.map

package/dist/modules/ai/generateFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateFile.d.ts","sourceRoot":"","sources":["../../../sources/modules/ai/generateFile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAY,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE9E,MAAM,WAAW,uBAAwB,SAAQ,mBAAmB;IAClE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,WAAW,GAAE,uBAA4B,GACxC,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAmC9C"}
+{"version":3,"file":"generateFile.d.ts","sourceRoot":"","sources":["../../../sources/modules/ai/generateFile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gCAAgC,EAAE,KAAK,mBAAmB,EAAY,MAAM,0BAA0B,CAAC;AAErH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gCAAgC,CAAC;IAC1C,qFAAqF;IACrF,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,WAAW,GAAE,uBAA4B,GAC1C,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CA0ClE"}

package/dist/modules/ai/generateFile.js

@@ -1,24 +1,34 @@
-import { stat } from "node:fs/promises";
+import { mkdir, stat } from "node:fs/promises";
 import path from "node:path";
 import { generate } from "@/modules/ai/generate.js";
+import { beerOriginalPathResolve } from "@/modules/beer/beerOriginalPathResolve.js";
 /**
  * Generates content and asks the model to write it into a specific file path only.
  * Retries when inference succeeds but the target file does not appear on disk.
  */
 export async function generateFile(context, prompt, outputFilePath, permissions = {}) {
+    const { retries, verify, extraTemplateValues, ...permissionsBase } = permissions;
     const resolvedOutputPath = pathResolveInProject(context.projectPath, outputFilePath);
-    const maxRetries = Math.max(0, permissions.retries ?? 1);
+    await mkdir(path.dirname(resolvedOutputPath), { recursive: true });
+    const promptTemplateValues = {
+        originalCheckoutPath: beerOriginalPathResolve(context.projectPath),
+        outputPath: resolvedOutputPath,
+        sourceFullName: context.settings.sourceRepo?.fullName,
+        productName: context.settings.productName,
+        ...extraTemplateValues
+    };
+    const maxRetries = Math.max(0, retries ?? 1);
     const basePrompt = [
-        prompt,
+        promptFormat(prompt, promptTemplateValues),
         `Write the final result only to this file: ${resolvedOutputPath}.`,
         "Do not write to any other files."
     ].join("\n\n");
+    const expectedOutput = verify
+        ? { type: "file", filePath: resolvedOutputPath, verify }
+        : { type: "file", filePath: resolvedOutputPath };
     const permissionsResolved = {
-        ...permissions,
-        expectedOutput: {
-            type: "file",
-            filePath: resolvedOutputPath
-        },
+        ...permissionsBase,
+        expectedOutput,
         writePolicy: {
             mode: "write-whitelist",
             writablePaths: [resolvedOutputPath]
@@ -27,10 +37,7 @@ export async function generateFile(context, prompt, outputFilePath, permissions
     for (let attempt = 0; attempt <= maxRetries; attempt += 1) {
         const promptResolved = attempt === 0
             ? basePrompt
-            : [
-                basePrompt,
-                `Last time file did not appear at ${resolvedOutputPath} - create it now.`
-            ].join("\n\n");
+            : [basePrompt, `Last time file did not appear at ${resolvedOutputPath} - create it now.`].join("\n\n");
         const result = await generate(context, promptResolved, permissionsResolved);
         if (await fileExists(resolvedOutputPath)) {
             return result;
@@ -53,4 +60,10 @@ async function fileExists(filePath) {
         return false;
     }
 }
+function promptFormat(prompt, values) {
+    return prompt.replace(/\{(\w+)\}/g, (match, key) => {
+        const value = values[key];
+        return value === undefined ? match : value;
+    });
+}
 //# sourceMappingURL=generateFile.js.map

package/dist/modules/ai/generateFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateFile.js","sourceRoot":"","sources":["../../../sources/modules/ai/generateFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAA4B,MAAM,0BAA0B,CAAC;AAM9E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAgB,EAChB,MAAc,EACd,cAAsB,EACtB,cAAuC,EAAE;IAEzC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACrF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG;QACjB,MAAM;QACN,6CAA6C,kBAAkB,GAAG;QAClE,kCAAkC;KACnC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACf,MAAM,mBAAmB,GAAwB;QAC/C,GAAG,WAAW;QACd,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,kBAAkB;SAC7B;QACD,WAAW,EAAE;YACX,IAAI,EAAE,iBAAiB;YACvB,aAAa,EAAE,CAAC,kBAAkB,CAAC;SACpC;KACF,CAAC;IAEF,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,OAAO,KAAK,CAAC;YAClC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC;gBACE,UAAU;gBACV,oCAAoC,kBAAkB,mBAAmB;aAC1E,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,mBAAmB,CAAC,CAAC;QAE5E,IAAI,MAAM,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,2CAA2C,kBAAkB,EAAE,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB,EAAE,cAAsB;IACvE,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,QAAgB;IACxC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"generateFile.js","sourceRoot":"","sources":["../../../sources/modules/ai/generateFile.ts"],"names":[],"mappings":"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"}