@plainconceptsplatform/workflows 0.19.2 → 0.20.0

package/dist/catalog-installation.js

@@ -151,11 +151,17 @@ export async function installCatalog(repositoryPath, options = {}) {
 // (the shared CI setup and the OpenCode config) get them on every run and stay stable. A worker
 // gets its VERIFY_COMMANDS default once, when it is first installed: after that the value is the
 // consumer's, and the env merge keeps it.
+//
+// Except when the consumer has no value. "First install only" meant a worker installed before
+// this injection existed kept `VERIFY_COMMANDS: ""` for good, and mergeWorkerEnv then preserved
+// the empty string as the consumer's deliberate choice. All four consuming repositories were in
+// that state, so every merge-gate repair pushed a fix with the verification block interpolating
+// to nothing. An empty value is the absence of a choice, so an update fills it.
 function applyStackDefaults(files, inspection, existing) {
     const defaults = generateStackDefaults(inspection);
     const result = new Map(files);
     for (const [target, content] of result) {
-        if (isWorker(target) && !existing.has(target)) {
+        if (isWorker(target) && (!existing.has(target) || hasEmptyVerifyCommands(existing.get(target)))) {
             result.set(target, injectStackEnv(content, defaults));
         }
         else if (target.endsWith("opencode-ci.md")) {
@@ -167,6 +173,11 @@ function applyStackDefaults(files, inspection, existing) {
     }
     return result;
 }
+// A worker whose VERIFY_COMMANDS is present but empty. Anything else, including a value the
+// consumer wrote, is left alone.
+function hasEmptyVerifyCommands(current) {
+    return typeof current === "string" && /^ {2}VERIFY_COMMANDS: *(""|'')? *$/m.test(current);
+}
 // Directories that belong wholly to the package. A file here that carries our ownership header
 // and is no longer in the package was deleted upstream, and without this it would sit in every
 // consumer forever: that is how `stale-recovery` and `update-changelog` outlived the code that

package/dist/stack-defaults.js

@@ -31,31 +31,31 @@ export function generateOpencodeCi(baseContent, inspection) {
     if (inspection.stackHints.solutionFiles.length > 0) {
         const solutionPath = inspection.stackHints.solutionFiles[0].replaceAll("\\", "/");
         if (!result.includes("name: Cache NuGet packages")) {
-            const nugetCache = `  - name: Cache NuGet packages
-    uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-    with:
-      path: ~/.nuget/packages
-      key: nuget-\${{ runner.os }}-\${{ hashFiles('**/*.slnx', '**/Directory.Packages.props') }}
-      restore-keys: nuget-\${{ runner.os }}-
-
+            const nugetCache = `  - name: Cache NuGet packages
+    uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+    with:
+      path: ~/.nuget/packages
+      key: nuget-\${{ runner.os }}-\${{ hashFiles('**/*.slnx', '**/Directory.Packages.props') }}
+      restore-keys: nuget-\${{ runner.os }}-
+
 `;
             result = insertBeforeMarker(result, nugetCache, "  - name: Install workspace dependencies");
         }
         if (!result.includes("name: Restore .NET dependencies")) {
-            const restore = `  - name: Restore .NET dependencies
-    run: dotnet restore ${solutionPath}
-
+            const restore = `  - name: Restore .NET dependencies
+    run: dotnet restore ${solutionPath}
+
 `;
             result = insertBeforeMarker(result, restore, "  - name: Install workspace dependencies");
         }
     }
     if (inspection.stackHints.openSpec && !result.includes("name: Install OpenSpec CLI")) {
-        const openspecStep = `  - name: Install OpenSpec CLI
-    run: |
-      set -euo pipefail
-      npm install -g "@fission-ai/openspec@1.8.0"
-      openspec --version
-
+        const openspecStep = `  - name: Install OpenSpec CLI
+    run: |
+      set -euo pipefail
+      npm install -g "@fission-ai/openspec@1.8.0"
+      openspec --version
+
 `;
         result = insertBeforeMarker(result, openspecStep, "  - name: Install workspace dependencies");
     }

package/dist/worker-env.js

@@ -74,6 +74,10 @@ export function entryValue(entry) {
     const first = entry.lines[0].replace(ENTRY, "$2").trim();
     return [first, ...entry.lines.slice(1).map((line) => line.trim())].join("\n").trim();
 }
+// A value that is present but says nothing: empty, or empty quotes.
+function isBlank(value) {
+    return value === "" || value === '""' || value === "''";
+}
 export function mergeWorkerEnv(packageContent, consumerContent, baselineContent, parse = parseWorkerEnv) {
     const report = { keptEnv: [], updatedDefaults: [], consumerOnlyEnv: [], droppedEnv: [] };
     const pkg = parse(packageContent);
@@ -91,6 +95,16 @@ export function mergeWorkerEnv(packageContent, consumerContent, baselineContent,
             merged.push(entry);
             continue;
         }
+        // An empty value is the absence of a choice, not a choice of nothing. Treating it as the
+        // consumer's is how `VERIFY_COMMANDS: ""` survived in all four consuming repositories with
+        // no baseline to compare against, leaving the merge gate pushing repairs it had verified
+        // with an empty command block. If the package has something and the consumer has nothing,
+        // the package wins.
+        if (isBlank(entryValue(mine)) && !isBlank(entryValue(entry))) {
+            merged.push(entry);
+            report.updatedDefaults.push(entry.key);
+            continue;
+        }
         const base = baselineByKey.get(entry.key);
         if (base !== undefined && entryValue(base) === entryValue(mine)) {
             // Still the previous default: the package changed it, the consumer never did.

package/loops/actions/add-issue-labels/action.yml

@@ -1,50 +1,50 @@
-# Managed by @plainconceptsplatform/workflows. Source: loops/actions/add-issue-labels/action.yml. Update with workflows update --force; consumer edits may be overwritten.
-name: Add issue labels
-description: Add one or more labels to an issue or pull request.
-inputs:
-  token:
-    description: GitHub token used by github-script.
-    required: true
-  issue-number:
-    description: Issue or pull request number.
-    required: true
-  labels:
-    description: Labels to add, one per line. A comma-separated list is accepted as well.
-    required: true
-runs:
-  using: composite
-  steps:
-    - name: Add labels
-      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-      env:
-        ISSUE_NUMBER: ${{ inputs.issue-number }}
-        LABELS: ${{ inputs.labels }}
-      with:
-        github-token: ${{ inputs.token }}
-        script: |
-          const labels = process.env.LABELS.split(/\r?\n|,/).map((label) => label.trim()).filter(Boolean);
-          if (labels.length === 0) {
-            core.notice('No labels to add.');
-            return;
-          }
-
-          // Create what does not exist yet, so shipping a new label in the package does not
-          // require a person to go and make it in every repository first. Its sibling
-          // remove-issue-labels has swallowed 404 for a long time; this one had no guard at all,
-          // so a label the package introduced would fail the step in every consumer until
-          // somebody created it by hand. 422 is "already exists", which is the happy path on
-          // every run after the first.
-          for (const name of labels) {
-            try {
-              await github.rest.issues.createLabel({ ...context.repo, name, color: 'ededed' });
-              core.notice(`Created the ${name} label.`);
-            } catch (error) {
-              if (error.status !== 422) throw error;
-            }
-          }
-
-          await github.rest.issues.addLabels({
-            ...context.repo,
-            issue_number: Number(process.env.ISSUE_NUMBER),
-            labels,
-          });
+# Managed by @plainconceptsplatform/workflows. Source: loops/actions/add-issue-labels/action.yml. Update with workflows update --force; consumer edits may be overwritten.
+name: Add issue labels
+description: Add one or more labels to an issue or pull request.
+inputs:
+  token:
+    description: GitHub token used by github-script.
+    required: true
+  issue-number:
+    description: Issue or pull request number.
+    required: true
+  labels:
+    description: Labels to add, one per line. A comma-separated list is accepted as well.
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Add labels
+      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+      env:
+        ISSUE_NUMBER: ${{ inputs.issue-number }}
+        LABELS: ${{ inputs.labels }}
+      with:
+        github-token: ${{ inputs.token }}
+        script: |
+          const labels = process.env.LABELS.split(/\r?\n|,/).map((label) => label.trim()).filter(Boolean);
+          if (labels.length === 0) {
+            core.notice('No labels to add.');
+            return;
+          }
+
+          // Create what does not exist yet, so shipping a new label in the package does not
+          // require a person to go and make it in every repository first. Its sibling
+          // remove-issue-labels has swallowed 404 for a long time; this one had no guard at all,
+          // so a label the package introduced would fail the step in every consumer until
+          // somebody created it by hand. 422 is "already exists", which is the happy path on
+          // every run after the first.
+          for (const name of labels) {
+            try {
+              await github.rest.issues.createLabel({ ...context.repo, name, color: 'ededed' });
+              core.notice(`Created the ${name} label.`);
+            } catch (error) {
+              if (error.status !== 422) throw error;
+            }
+          }
+
+          await github.rest.issues.addLabels({
+            ...context.repo,
+            issue_number: Number(process.env.ISSUE_NUMBER),
+            labels,
+          });

package/loops/actions/agent-output.cjs

@@ -1,17 +1,17 @@
-// Managed by @plainconceptsplatform/workflows. Source: loops/actions/agent-output.cjs. Update with `workflows update --force`; consumer edits may be overwritten.
-const fs = require('node:fs');
-
-// Every apply-agent-* action reads the same artifact the same way: a missing file means the
-// agent produced nothing, which is a normal outcome rather than a failure.
-function readAgentItems(outputFile, type) {
-  if (!outputFile || !fs.existsSync(outputFile)) {
-    return [];
-  }
-
-  const parsed = JSON.parse(fs.readFileSync(outputFile, 'utf8'));
-  const items = Array.isArray(parsed.items) ? parsed.items : [];
-
-  return type ? items.filter((item) => item.type === type) : items;
-}
-
-module.exports = { readAgentItems };
+// Managed by @plainconceptsplatform/workflows. Source: loops/actions/agent-output.cjs. Update with `workflows update --force`; consumer edits may be overwritten.
+const fs = require('node:fs');
+
+// Every apply-agent-* action reads the same artifact the same way: a missing file means the
+// agent produced nothing, which is a normal outcome rather than a failure.
+function readAgentItems(outputFile, type) {
+  if (!outputFile || !fs.existsSync(outputFile)) {
+    return [];
+  }
+
+  const parsed = JSON.parse(fs.readFileSync(outputFile, 'utf8'));
+  const items = Array.isArray(parsed.items) ? parsed.items : [];
+
+  return type ? items.filter((item) => item.type === type) : items;
+}
+
+module.exports = { readAgentItems };

package/loops/actions/apply-agent-bundle/action.yml

@@ -1,24 +1,24 @@
-# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-bundle/action.yml. Update with workflows update --force; consumer edits may be overwritten.
-name: Apply agent bundle
-description: Fast-forward an intended branch to the single commit exported by a verified git bundle.
-inputs:
-  bundle-file:
-    description: Path to the git bundle from the agent artifact.
-    required: true
-  target-branch:
-    description: Branch that must fast-forward to the bundle commit.
-    required: true
-  base-branch:
-    description: Existing branch used only when target-branch does not exist.
-    required: false
-    default: ''
-runs:
-  using: composite
-  steps:
-    - name: Fast-forward branch from bundle
-      shell: bash
-      env:
-        BUNDLE_FILE: ${{ inputs.bundle-file }}
-        TARGET_BRANCH: ${{ inputs.target-branch }}
-        BASE_BRANCH: ${{ inputs.base-branch }}
-      run: bash "$GITHUB_ACTION_PATH/apply-bundle.sh" "$BUNDLE_FILE" "$TARGET_BRANCH" "$BASE_BRANCH"
+# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-bundle/action.yml. Update with workflows update --force; consumer edits may be overwritten.
+name: Apply agent bundle
+description: Fast-forward an intended branch to the single commit exported by a verified git bundle.
+inputs:
+  bundle-file:
+    description: Path to the git bundle from the agent artifact.
+    required: true
+  target-branch:
+    description: Branch that must fast-forward to the bundle commit.
+    required: true
+  base-branch:
+    description: Existing branch used only when target-branch does not exist.
+    required: false
+    default: ''
+runs:
+  using: composite
+  steps:
+    - name: Fast-forward branch from bundle
+      shell: bash
+      env:
+        BUNDLE_FILE: ${{ inputs.bundle-file }}
+        TARGET_BRANCH: ${{ inputs.target-branch }}
+        BASE_BRANCH: ${{ inputs.base-branch }}
+      run: bash "$GITHUB_ACTION_PATH/apply-bundle.sh" "$BUNDLE_FILE" "$TARGET_BRANCH" "$BASE_BRANCH"

package/loops/actions/apply-agent-comments/action.yml

@@ -1,42 +1,42 @@
-# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-comments/action.yml. Update with workflows update --force; consumer edits may be overwritten.
-name: Apply agent comments
-description: Post every add_comment item from agent_output.json.
-inputs:
-  output-file:
-    description: Path to agent_output.json.
-    required: true
-  token:
-    description: GitHub token with issues:write and pull-requests:write.
-    required: true
-runs:
-  using: composite
-  steps:
-    - name: Post comments
-      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-      env:
-        AGENT_OUTPUT_LIB: ${{ github.action_path }}/../agent-output.cjs
-        OUTPUT_FILE: ${{ inputs.output-file }}
-      with:
-        github-token: ${{ inputs.token }}
-        script: |
-          const { readAgentItems } = require(process.env.AGENT_OUTPUT_LIB);
-          const items = readAgentItems(process.env.OUTPUT_FILE, 'add_comment');
-
-          let posted = 0;
-
-          for (const item of items) {
-            if (!item.item_number) {
-              core.warning(`add_comment item has no item_number, skipping: ${JSON.stringify(item)}`);
-              continue;
-            }
-
-            await github.rest.issues.createComment({
-              ...context.repo,
-              issue_number: Number(item.item_number),
-              body: item.body,
-            });
-
-            posted += 1;
-          }
-
-          core.info(`Posted ${posted} comment(s).`);
+# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-comments/action.yml. Update with workflows update --force; consumer edits may be overwritten.
+name: Apply agent comments
+description: Post every add_comment item from agent_output.json.
+inputs:
+  output-file:
+    description: Path to agent_output.json.
+    required: true
+  token:
+    description: GitHub token with issues:write and pull-requests:write.
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Post comments
+      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+      env:
+        AGENT_OUTPUT_LIB: ${{ github.action_path }}/../agent-output.cjs
+        OUTPUT_FILE: ${{ inputs.output-file }}
+      with:
+        github-token: ${{ inputs.token }}
+        script: |
+          const { readAgentItems } = require(process.env.AGENT_OUTPUT_LIB);
+          const items = readAgentItems(process.env.OUTPUT_FILE, 'add_comment');
+
+          let posted = 0;
+
+          for (const item of items) {
+            if (!item.item_number) {
+              core.warning(`add_comment item has no item_number, skipping: ${JSON.stringify(item)}`);
+              continue;
+            }
+
+            await github.rest.issues.createComment({
+              ...context.repo,
+              issue_number: Number(item.item_number),
+              body: item.body,
+            });
+
+            posted += 1;
+          }
+
+          core.info(`Posted ${posted} comment(s).`);

package/loops/actions/apply-agent-labels/action.yml

@@ -1,55 +1,55 @@
-# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-labels/action.yml. Update with workflows update --force; consumer edits may be overwritten.
-name: Apply agent labels
-description: Apply every add_labels and remove_labels item from agent_output.json.
-inputs:
-  output-file:
-    description: Path to agent_output.json.
-    required: true
-  token:
-    description: GitHub token with issues:write.
-    required: true
-runs:
-  using: composite
-  steps:
-    - name: Apply label changes
-      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-      env:
-        AGENT_OUTPUT_LIB: ${{ github.action_path }}/../agent-output.cjs
-        OUTPUT_FILE: ${{ inputs.output-file }}
-      with:
-        github-token: ${{ inputs.token }}
-        script: |
-          const { readAgentItems } = require(process.env.AGENT_OUTPUT_LIB);
-          const items = readAgentItems(process.env.OUTPUT_FILE)
-            .filter((item) => item.type === 'add_labels' || item.type === 'remove_labels');
-
-          let added = 0;
-          let removed = 0;
-
-          for (const item of items) {
-            const labels = (item.labels ?? []).map((label) => label.name).filter(Boolean);
-
-            if (!item.item_number || labels.length === 0) {
-              core.warning(`${item.type} item is not actionable, skipping: ${JSON.stringify(item)}`);
-              continue;
-            }
-
-            const issue_number = Number(item.item_number);
-
-            if (item.type === 'add_labels') {
-              await github.rest.issues.addLabels({ ...context.repo, issue_number, labels });
-              added += labels.length;
-              continue;
-            }
-
-            for (const name of labels) {
-              try {
-                await github.rest.issues.removeLabel({ ...context.repo, issue_number, name });
-                removed += 1;
-              } catch (error) {
-                if (error.status !== 404) throw error;
-              }
-            }
-          }
-
-          core.info(`Added ${added} label(s), removed ${removed}.`);
+# Managed by @plainconceptsplatform/workflows. Source: loops/actions/apply-agent-labels/action.yml. Update with workflows update --force; consumer edits may be overwritten.
+name: Apply agent labels
+description: Apply every add_labels and remove_labels item from agent_output.json.
+inputs:
+  output-file:
+    description: Path to agent_output.json.
+    required: true
+  token:
+    description: GitHub token with issues:write.
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Apply label changes
+      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+      env:
+        AGENT_OUTPUT_LIB: ${{ github.action_path }}/../agent-output.cjs
+        OUTPUT_FILE: ${{ inputs.output-file }}
+      with:
+        github-token: ${{ inputs.token }}
+        script: |
+          const { readAgentItems } = require(process.env.AGENT_OUTPUT_LIB);
+          const items = readAgentItems(process.env.OUTPUT_FILE)
+            .filter((item) => item.type === 'add_labels' || item.type === 'remove_labels');
+
+          let added = 0;
+          let removed = 0;
+
+          for (const item of items) {
+            const labels = (item.labels ?? []).map((label) => label.name).filter(Boolean);
+
+            if (!item.item_number || labels.length === 0) {
+              core.warning(`${item.type} item is not actionable, skipping: ${JSON.stringify(item)}`);
+              continue;
+            }
+
+            const issue_number = Number(item.item_number);
+
+            if (item.type === 'add_labels') {
+              await github.rest.issues.addLabels({ ...context.repo, issue_number, labels });
+              added += labels.length;
+              continue;
+            }
+
+            for (const name of labels) {
+              try {
+                await github.rest.issues.removeLabel({ ...context.repo, issue_number, name });
+                removed += 1;
+              } catch (error) {
+                if (error.status !== 404) throw error;
+              }
+            }
+          }
+
+          core.info(`Added ${added} label(s), removed ${removed}.`);