pandorga 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e883077823ea13efc6672caf40765fd68d30d10f5c28e7770a91a7859159511f
-  data.tar.gz: 9fca02e64c54d5d1d5ef27b8d57ca907c852d09e8197d4fdf5125a862db84aca
+  metadata.gz: a8ea9638b4cbf0679fd3eeb328969878e5c4e7080be6a338257ccfc831f66213
+  data.tar.gz: 865776c26a7094cdf151ff21c6ecf492dd9e91171a6608bb23567323ff6ef8a2
 SHA512:
-  metadata.gz: f3c860025a9557c736cbc3157a195d0e3c1fa0036d6eb944d99699326fb5f88f87ebe7891841a2fd870d56057a978dc00bb0b05b07f420bf0d9a3229874b675e
-  data.tar.gz: 6778385016612559491561009245a8f248a037b77ce0ddadbf7702b159c729e128f87b896be49151973a177d9829910d8f7254e61319cd365ed6a3d4dd501e1b
+  metadata.gz: f14807c5d0798c3dd75253faa2571fd142ee5f9e69017486a89cf65eead3c45707b683ab044bd45c3be03fe177287732a0cb95dfc1a57597917ea9a6e2b272b4
+  data.tar.gz: 86216efa57c77d99e3f1369d467edd57580f3046e558325b425ad1ecc85c5b0c9dacb162407840229c50f87de9233f8e668ef3abaa5cd2b34714b76644697042

data/CHANGELOG.md

@@ -1,18 +1,41 @@
 # Changelog
 
+## [1.4.6] — 2026-10-07
+
+### Fixed
+
+- Pipeline config resolution no longer swallows `_config.yml` read failures as
+  a silent “unconfigured”; returns a clear message when
+  `pandorga.content.workflow` is missing
+- Studio chip surfaces pipeline-status API errors on boot, not only after Save
+
+### Added
+
+- Gate `test-studio-pipeline-config.mjs` for `parseContentWorkflowFromConfig`
+
+## [1.4.5] — 2026-10-07
+
+### Changed
+
+- Studio pipeline chip is always visible (between Theme and Revert); toolbar
+  Delete control removed
+- Pipeline workflow name comes from `_config.yml` → `pandorga.content.workflow`
+  (not a Pages secret); env override remains optional
+- Pipeline status without `sha` returns the latest run on the branch
+
 ## [1.4.4] — 2026-10-07
 
 ### Added
 
 - Studio content-pipeline status: after Save in production, poll GitHub Actions
-  for `STUDIO_CONTENT_WORKFLOW` on the commit SHA (Waiting / Exporting / Live /
+  for the content workflow on the commit SHA (Waiting / Exporting / Live /
   Failed). Local Export keeps a real reexport button with the same sync colors.
 - `GET /api/studio/pipeline-status?sha=` on the Studio Function
 
 ### Changed
 
-- Studio docs: document `STUDIO_CONTENT_WORKFLOW`, Actions read on the PAT, and
-  the toolbar indicator states
+- Studio docs: document the pipeline indicator, Actions read on the PAT, and
+  toolbar states
 
 ## [1.4.3] — 2026-10-07
 

data/functions/api/studio/_lib/github.js

@@ -219,10 +219,10 @@ export async function listDir(env, dirPath) {
 /**
  * Map a GitHub Actions workflow run to Studio pipeline UI state.
  * @param {{ status?: string, conclusion?: string|null }|null} run
- * @returns {"awaiting_run"|"running"|"ok"|"error"}
+ * @returns {"awaiting_run"|"running"|"ok"|"error"|"idle"}
  */
 export function mapWorkflowRunState(run) {
-  if (!run) return "awaiting_run";
+  if (!run) return "idle";
   const status = String(run.status || "");
   if (status === "completed") {
     return run.conclusion === "success" ? "ok" : "error";
@@ -231,23 +231,130 @@ export function mapWorkflowRunState(run) {
 }
 
 /**
- * Look up the content-pipeline workflow run for a commit SHA.
+ * Read pandorga.content.workflow(+ workflow_ref) from site `_config.yml`.
+ * Tiny indent-aware peek — no YAML dependency in the Function.
+ */
+export function parseContentWorkflowFromConfig(yamlText) {
+  const lines = String(yamlText || "").split(/\r?\n/);
+  let inPandorga = false;
+  let pandorgaIndent = 0;
+  let inContent = false;
+  let contentIndent = 0;
+  let workflow = null;
+  let workflowRef = null;
+
+  for (const line of lines) {
+    if (!line.trim() || /^\s*#/.test(line)) continue;
+    const m = line.match(/^(\s*)([A-Za-z0-9_]+):\s*(.*?)\s*$/);
+    if (!m) continue;
+    const indent = m[1].length;
+    const key = m[2];
+    let val = m[3];
+    if (
+      (val.startsWith('"') && val.endsWith('"')) ||
+      (val.startsWith("'") && val.endsWith("'"))
+    ) {
+      val = val.slice(1, -1);
+    }
+
+    if (!inPandorga) {
+      if (key === "pandorga" && indent === 0) {
+        inPandorga = true;
+        pandorgaIndent = indent;
+      }
+      continue;
+    }
+
+    if (indent <= pandorgaIndent && key !== "pandorga") break;
+
+    if (key === "content" && indent > pandorgaIndent) {
+      inContent = true;
+      contentIndent = indent;
+      continue;
+    }
+
+    if (inContent) {
+      if (indent <= contentIndent) {
+        inContent = false;
+        if (key === "content" && indent > pandorgaIndent) {
+          inContent = true;
+          contentIndent = indent;
+        }
+        continue;
+      }
+      if (key === "workflow" && val) workflow = val;
+      if (key === "workflow_ref" && val) workflowRef = val;
+    }
+  }
+
+  return { workflow, workflowRef };
+}
+
+/**
+ * Workflow file + branch: optional env override, else `_config.yml`
+ * (`pandorga.content.workflow`).
+ */
+export async function resolveContentWorkflowConfig(env) {
+  const envWorkflow = String(env.STUDIO_CONTENT_WORKFLOW || "").trim();
+  const envRef = String(env.STUDIO_CONTENT_WORKFLOW_REF || "").trim();
+  if (envWorkflow) {
+    return {
+      workflow: envWorkflow,
+      ref: envRef || "main",
+      source: "env",
+    };
+  }
+
+  try {
+    const file = await getFile(env, "_config.yml");
+    if (!file?.content) {
+      return {
+        workflow: null,
+        ref: envRef || "main",
+        source: null,
+        error: "config_missing",
+        message: "_config.yml was not found on main.",
+      };
+    }
+    const parsed = parseContentWorkflowFromConfig(file.content);
+    if (parsed.workflow) {
+      return {
+        workflow: parsed.workflow,
+        ref: parsed.workflowRef || envRef || "main",
+        source: "config",
+      };
+    }
+    return {
+      workflow: null,
+      ref: envRef || "main",
+      source: null,
+      error: "workflow_unset",
+      message:
+        "Set pandorga.content.workflow in _config.yml (e.g. content-pipeline.yml).",
+    };
+  } catch (err) {
+    return {
+      workflow: null,
+      ref: envRef || "main",
+      source: null,
+      error: err.code || "config_read_failed",
+      message: String(err.message || err),
+    };
+  }
+}
+
+/**
+ * Look up the content-pipeline workflow run for a commit SHA, or the latest
+ * run on the branch when `sha` is omitted.
  * Requires the PAT to have Actions read (fine-grained: Actions → Read).
  *
  * @param {object} env
- * @param {string} sha
- * @returns {Promise<{
- *   mode: "production",
- *   workflow: string|null,
- *   sha: string,
- *   state: "awaiting_run"|"running"|"ok"|"error"|"unconfigured",
- *   run: object|null,
- *   error: string|null
- * }>}
+ * @param {string} [sha]
  */
 export async function getContentPipelineStatus(env, sha) {
-  const workflowFile = String(env.STUDIO_CONTENT_WORKFLOW || "").trim();
-  const ref = String(env.STUDIO_CONTENT_WORKFLOW_REF || "main").trim() || "main";
+  const resolved = await resolveContentWorkflowConfig(env);
+  const workflowFile = resolved.workflow;
+  const ref = resolved.ref || "main";
   const commitSha = String(sha || "").trim().toLowerCase();
 
   if (!workflowFile) {
@@ -257,11 +364,15 @@ export async function getContentPipelineStatus(env, sha) {
       sha: commitSha,
       state: "unconfigured",
       run: null,
-      error: null,
+      error: resolved.error || "workflow_unset",
+      source: resolved.source,
+      message:
+        resolved.message ||
+        "Set pandorga.content.workflow in _config.yml (e.g. content-pipeline.yml).",
     };
   }
-  if (!/^[0-9a-f]{7,40}$/.test(commitSha)) {
-    const err = new Error("sha required (7–40 hex chars)");
+  if (commitSha && !/^[0-9a-f]{7,40}$/.test(commitSha)) {
+    const err = new Error("sha must be 7–40 hex chars when provided");
     err.status = 400;
     err.code = "invalid_sha";
     throw err;
@@ -279,6 +390,7 @@ export async function getContentPipelineStatus(env, sha) {
       state: "unconfigured",
       run: null,
       error: "workflow_not_found",
+      source: resolved.source,
     };
   }
   if (wfRes.status === 401 || wfRes.status === 403) {
@@ -299,11 +411,13 @@ export async function getContentPipelineStatus(env, sha) {
   }
 
   const workflow = await wfRes.json();
-  const runsPath =
+  let runsPath =
     `/actions/workflows/${workflow.id}/runs` +
     `?branch=${encodeURIComponent(ref)}` +
-    `&head_sha=${encodeURIComponent(commitSha)}` +
     `&per_page=5`;
+  if (commitSha) {
+    runsPath += `&head_sha=${encodeURIComponent(commitSha)}`;
+  }
   const runsRes = await gh(env, runsPath);
   if (runsRes.status === 401 || runsRes.status === 403) {
     const text = await runsRes.text();
@@ -325,12 +439,14 @@ export async function getContentPipelineStatus(env, sha) {
   const payload = await runsRes.json();
   const runs = Array.isArray(payload.workflow_runs) ? payload.workflow_runs : [];
   const run = runs[0] || null;
-  const state = mapWorkflowRunState(run);
+  let state = mapWorkflowRunState(run);
+  // Watching a specific SHA with no run yet → waiting for the push trigger.
+  if (commitSha && !run) state = "awaiting_run";
 
   return {
     mode: "production",
     workflow: workflowFile,
-    sha: commitSha,
+    sha: commitSha || (run?.head_sha ? String(run.head_sha).toLowerCase() : ""),
     state,
     run: run
       ? {
@@ -342,6 +458,7 @@ export async function getContentPipelineStatus(env, sha) {
         }
       : null,
     error: null,
+    source: resolved.source,
   };
 }
 

data/lib/pandorga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pandorga
-  VERSION = "1.4.4"
+  VERSION = "1.4.6"
 end

data/scripts/test/test-studio-api-contract.rb

@@ -33,14 +33,20 @@ end
 
 check!(gh_src.include?("getContentPipelineStatus"),
        "github helper must expose getContentPipelineStatus")
-check!(gh_src.include?("STUDIO_CONTENT_WORKFLOW") || api_src.include?("STUDIO_CONTENT_WORKFLOW"),
-       "pipeline status must read STUDIO_CONTENT_WORKFLOW")
+check!(gh_src.include?("parseContentWorkflowFromConfig"),
+       "pipeline status must read pandorga.content.workflow from _config.yml")
+check!(gh_src.include?("resolveContentWorkflowConfig"),
+       "pipeline status must resolve workflow from config (env optional override)")
 check!(gh_src.include?("mapWorkflowRunState"),
        "pipeline status must map Actions run status to UI state")
 check!(REPO_ROOT.join("studio-app/src/api/client.js").read.include?("pipelineStatus"),
        "SPA client must call pipeline-status")
 check!(REPO_ROOT.join("studio-app/src/main.js").read.include?("armPipelineWatch"),
        "SPA must watch the content pipeline after save")
+check!(REPO_ROOT.join("studio-app/src/main.js").read.include?("refreshPipelineStatus"),
+       "SPA must hydrate pipeline status on boot")
+check!(!REPO_ROOT.join("studio-app/src/main.js").read.match?(/action:\s*"delete"/),
+       "toolbar must not include a Delete action")
 
 check!(api_src.include?("media/folder") || api_src.include?('"folder"'),
        "API router should expose media folder create")

data/scripts/test/test-studio-pipeline-config.mjs

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+/**
+ * parseContentWorkflowFromConfig — reads pandorga.content.workflow from _config.yml.
+ */
+import assert from "node:assert/strict";
+import { parseContentWorkflowFromConfig } from "../../functions/api/studio/_lib/github.js";
+
+const sample = `# site
+title: Example
+
+pandorga:
+  # comment above content
+  content:
+    backend: r2
+    base_url: https://example.invalid
+    # Actions workflow Studio watches after Save
+    workflow: content-pipeline.yml
+    workflow_ref: main
+  identity:
+    name: Example
+`;
+
+const parsed = parseContentWorkflowFromConfig(sample);
+assert.equal(parsed.workflow, "content-pipeline.yml");
+assert.equal(parsed.workflowRef, "main");
+
+const missing = parseContentWorkflowFromConfig("pandorga:\n  identity:\n    name: x\n");
+assert.equal(missing.workflow, null);
+
+const quoted = parseContentWorkflowFromConfig(
+  "pandorga:\n  content:\n    workflow: \"my-workflow.yml\"\n"
+);
+assert.equal(quoted.workflow, "my-workflow.yml");
+
+console.log("All Studio pipeline config parse checks passed.");

data/scripts/validate.sh

@@ -68,6 +68,11 @@ for test in "${TESTS[@]}"; do
   fi
 done
 
+echo "-- scripts/test/test-studio-pipeline-config.mjs"
+if ! node scripts/test/test-studio-pipeline-config.mjs; then
+  failed=1
+fi
+
 if [[ "$failed" -ne 0 ]]; then
   echo "VALIDATE FAILED"
   exit 1