@plainconceptsplatform/workflows 0.4.3 → 0.4.5

package/dist/catalog-installation.js

@@ -43,6 +43,7 @@ export async function installCatalog(repositoryPath, options = {}) {
         processedContents = injectStackIntoWorkers(processedContents, defaults);
         processedContents = transformOpencodeFiles(processedContents, options.inspection);
     }
+    processedContents = await preserveConsumerWorkerEnv(repositoryPath, processedContents);
     const updates = [...processedContents.entries()]
         .filter(([target]) => filtered.find((file) => file.target === target)?.managed ?? true)
         .map(([target, content]) => ({ target, content }));
@@ -62,6 +63,37 @@ function injectStackIntoWorkers(files, defaults) {
     }
     return result;
 }
+async function preserveConsumerWorkerEnv(repositoryPath, files) {
+    const result = new Map(files);
+    for (const [target, content] of result) {
+        if (!target.startsWith(".github/workflows/agent-") || !target.endsWith(".md"))
+            continue;
+        const existingPath = join(repositoryPath, target);
+        if (!await exists(existingPath))
+            continue;
+        result.set(target, mergeWorkerEnv(content, await readFile(existingPath, "utf8")));
+    }
+    return result;
+}
+function mergeWorkerEnv(packageContent, consumerContent) {
+    const consumerEnv = workerEnvValues(consumerContent);
+    if (consumerEnv.size === 0)
+        return packageContent;
+    return packageContent.replace(/^  ([A-Z][A-Z0-9_]*): .+$/gm, (line, key) => consumerEnv.has(key) ? `  ${key}: ${consumerEnv.get(key)}` : line);
+}
+function workerEnvValues(content) {
+    const frontmatter = /^---\r?\n([\s\S]*?)\r?\n---/m.exec(content)?.[1];
+    const envBlock = frontmatter === undefined ? undefined : /^env:\r?\n((?:  .*\r?\n?)*)/m.exec(frontmatter)?.[1];
+    const values = new Map();
+    if (envBlock === undefined)
+        return values;
+    for (const line of envBlock.split(/\r?\n/)) {
+        const match = /^  ([A-Z][A-Z0-9_]*): (.+)$/.exec(line);
+        if (match !== null)
+            values.set(match[1], match[2]);
+    }
+    return values;
+}
 function transformOpencodeFiles(files, inspection) {
     const result = new Map(files);
     for (const [key, content] of result) {
@@ -154,6 +186,7 @@ async function validateStagedCatalog(repositoryPath, updates, compileOverride) {
     try {
         await copyCompilationInputs(repositoryPath, stagingPath);
         await writeUpdates(stagingPath, updates);
+        await initializeStagingRepository(stagingPath);
         const compiler = compileOverride ?? await packageCompiler(stagingPath);
         if (compiler === undefined)
             return [];
@@ -169,6 +202,9 @@ async function copyCompilationInputs(repositoryPath, stagingPath) {
     if (await exists(githubPath))
         await cp(githubPath, join(stagingPath, ".github"), { recursive: true });
 }
+async function initializeStagingRepository(stagingPath) {
+    await execFileAsync("git", ["init", "--quiet"], { cwd: stagingPath, windowsHide: true });
+}
 async function packageCompiler(repositoryPath) {
     const scriptPath = join(repositoryPath, "scripts", "compile-agent-workflows.mjs");
     if (!await exists(scriptPath))

package/dist/catalog-installation.test.js

@@ -1,4 +1,5 @@
-import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { access, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { constants } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
@@ -285,6 +286,19 @@ describe("catalog installation", () => {
             .resolves.toBe("consumer compiler\n");
         await expect(readFile(join(repositoryPath, ".husky", "pre-commit"), "utf8")).rejects.toThrow();
     });
+    it("preserves consumer-specific worker environment values during a forced update", async () => {
+        const sourcePath = await createDirectory({
+            "actions/check/action.yml": "name: Check\n",
+            "workflows/agent-check.md": "---\nenv:\n  VERIFY_COMMANDS: \"package verify\"\n  REPO_RULES: \"package rules\"\n  OPENAI_BASE_URL: https://forge.plainconcepts.com/v1\n---\n",
+            "scripts/compile-agent-workflows.mjs": "compile\n",
+            "templates/opencode/opencode.ci.json": "{}\n",
+        });
+        const repositoryPath = await createDirectory({
+            ".github/workflows/agent-check.md": "---\nenv:\n  VERIFY_COMMANDS: \"consumer verify\"\n  REPO_RULES: \"consumer rules\"\n  OPENAI_BASE_URL: https://consumer.example/v1\n---\n",
+        });
+        await installCatalog(repositoryPath, { force: true, sourcePath });
+        await expect(readFile(join(repositoryPath, ".github/workflows/agent-check.md"), "utf8")).resolves.toContain("  REPO_RULES: \"consumer rules\"\n  OPENAI_BASE_URL: https://consumer.example/v1\n");
+    });
     it("applies staged generated locks with managed sources", async () => {
         const sourcePath = await createDirectory({
             "actions/check/action.yml": "package action\n",
@@ -296,6 +310,7 @@ describe("catalog installation", () => {
         await installCatalog(repositoryPath, {
             sourcePath,
             compile: async (stagingPath) => {
+                await expect(access(join(stagingPath, ".git"), constants.F_OK)).resolves.toBeUndefined();
                 await writeFile(join(stagingPath, ".github", "workflows", "agent-check.lock.yml"), "opencode run --log-level ERROR\n", "utf8");
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plainconceptsplatform/workflows",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Install and update Platform GitHub agentic workflows.",
   "keywords": [
     "github-actions",