primitive-admin 1.1.0-alpha.3 → 1.1.0-alpha.31

package/dist/src/lib/version-check.js

@@ -0,0 +1,172 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+import chalk from "chalk";
+const CONFIG_DIR = process.env.PRIMITIVE_CONFIG_DIR || join(homedir(), ".primitive");
+const VERSION_CHECK_FILE = join(CONFIG_DIR, "version-check.json");
+// Cache the result for 4 hours — short enough that users see new
+// releases the same day they drop, long enough that chatty commands
+// (sync push, tests in loops, etc.) don't hammer the npm registry.
+const CHECK_INTERVAL_MS = 4 * 60 * 60 * 1000;
+const NPM_PACKAGE_NAME = "primitive-admin";
+const FETCH_TIMEOUT_MS = 3000;
+function ensureConfigDir() {
+    if (!existsSync(CONFIG_DIR)) {
+        mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+    }
+}
+function loadCache() {
+    try {
+        if (!existsSync(VERSION_CHECK_FILE))
+            return {};
+        return JSON.parse(readFileSync(VERSION_CHECK_FILE, "utf-8"));
+    }
+    catch {
+        return {};
+    }
+}
+function saveCache(cache) {
+    try {
+        ensureConfigDir();
+        writeFileSync(VERSION_CHECK_FILE, JSON.stringify(cache, null, 2));
+    }
+    catch {
+        // Ignore write errors
+    }
+}
+/**
+ * Extracts the prerelease channel from a version string.
+ * "1.0.23-alpha.3" → "alpha"
+ * "1.0.23-beta.1"  → "beta"
+ * "1.0.23"         → null
+ */
+function getPrereleaseChannel(version) {
+    const match = version.match(/^[^-]+-([a-zA-Z]+)/);
+    return match ? match[1] : null;
+}
+/**
+ * Compares two semver version strings, including prerelease handling.
+ * Returns -1 if a < b, 0 if equal, 1 if a > b.
+ *
+ * Prerelease versions are only compared against their own channel.
+ * Within the same channel, prerelease segments are compared numerically.
+ */
+function compareVersions(a, b) {
+    const clean = (v) => v.replace(/^v/, "");
+    const cleanA = clean(a);
+    const cleanB = clean(b);
+    // Split into core and prerelease
+    const [coreA, preA] = cleanA.split("-", 2);
+    const [coreB, preB] = cleanB.split("-", 2);
+    // Compare core version (major.minor.patch)
+    const partsA = coreA.split(".").map(Number);
+    const partsB = coreB.split(".").map(Number);
+    for (let i = 0; i < 3; i++) {
+        const ca = partsA[i] || 0;
+        const cb = partsB[i] || 0;
+        if (ca < cb)
+            return -1;
+        if (ca > cb)
+            return 1;
+    }
+    // Core versions are equal — compare prerelease
+    // No prerelease on either → equal
+    if (!preA && !preB)
+        return 0;
+    // A prerelease version is always less than the release version
+    if (preA && !preB)
+        return -1;
+    if (!preA && preB)
+        return 1;
+    // Both have prerelease — compare segments (e.g. "alpha.3" vs "alpha.5")
+    const segsA = preA.split(".");
+    const segsB = preB.split(".");
+    const len = Math.max(segsA.length, segsB.length);
+    for (let i = 0; i < len; i++) {
+        const sa = segsA[i];
+        const sb = segsB[i];
+        if (sa === undefined)
+            return -1;
+        if (sb === undefined)
+            return 1;
+        const na = Number(sa);
+        const nb = Number(sb);
+        const aIsNum = !isNaN(na);
+        const bIsNum = !isNaN(nb);
+        if (aIsNum && bIsNum) {
+            if (na < nb)
+                return -1;
+            if (na > nb)
+                return 1;
+        }
+        else {
+            // Lexicographic comparison for non-numeric segments
+            if (sa < sb)
+                return -1;
+            if (sa > sb)
+                return 1;
+        }
+    }
+    return 0;
+}
+async function fetchLatestVersion(distTag) {
+    try {
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+        const response = await fetch(`https://registry.npmjs.org/${NPM_PACKAGE_NAME}/${distTag}`, { signal: controller.signal });
+        clearTimeout(timeout);
+        if (!response.ok)
+            return null;
+        const data = await response.json();
+        return data.version;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Checks if a newer version of the CLI is available on npm.
+ *
+ * - Stable versions (e.g. "1.0.22") check the "latest" dist-tag
+ * - Prerelease versions (e.g. "1.0.23-alpha.3") check their channel's
+ *   dist-tag (e.g. "alpha"), falling back to "latest" if that tag doesn't exist
+ *
+ * Caches results per dist-tag for 4 hours. Fails silently on any error.
+ */
+export async function checkForUpdate(currentVersion) {
+    try {
+        const channel = getPrereleaseChannel(currentVersion);
+        const distTag = channel || "latest";
+        const cache = loadCache();
+        const now = Date.now();
+        let latestVersion = null;
+        const cached = cache[distTag];
+        if (cached && (now - cached.lastCheck) < CHECK_INTERVAL_MS) {
+            latestVersion = cached.latestVersion;
+        }
+        else {
+            latestVersion = await fetchLatestVersion(distTag);
+            // If the prerelease dist-tag doesn't exist on npm, fall back to "latest"
+            // so alpha users still hear about new stable releases
+            if (!latestVersion && channel) {
+                latestVersion = await fetchLatestVersion("latest");
+            }
+            if (latestVersion) {
+                cache[distTag] = { lastCheck: now, latestVersion };
+                saveCache(cache);
+            }
+        }
+        if (latestVersion && compareVersions(currentVersion, latestVersion) < 0) {
+            const installCmd = channel
+                ? `npm i -g ${NPM_PACKAGE_NAME}@${channel}`
+                : `npm i -g ${NPM_PACKAGE_NAME}`;
+            console.error();
+            console.error(chalk.yellow(`Update available: ${chalk.dim(currentVersion)} -> ${chalk.green.bold(latestVersion)}`));
+            console.error(chalk.yellow(`Run ${chalk.cyan.bold(installCmd)} to update`));
+        }
+    }
+    catch {
+        // Never let version check errors affect CLI operation
+    }
+}
+//# sourceMappingURL=version-check.js.map

package/dist/src/lib/version-check.js.map

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

package/dist/src/lib/workflow-fragments.js

@@ -0,0 +1,121 @@
+/**
+ * CLI-only workflow fragment expansion.
+ *
+ * Workflows may declare `include = ["fragment-name", ...]` at the top of
+ * their TOML. The CLI expands those references into a fully-flattened
+ * `[[steps]]` list before push — the server never sees fragments and
+ * stores only the canonical, expanded JSON.
+ *
+ * Pinned decisions (#744):
+ *   - CLI-only. No server-side WorkflowFragment model.
+ *   - Fragments live at <workflowDir>/../workflow-fragments/<name>.toml.
+ *   - Fragment files are `[[steps]]` lists only — no `[workflow]` block.
+ *   - No recursive includes in v1 (fragments cannot themselves `include`).
+ *   - Unique step ids validated post-expansion; collisions name both
+ *     locations in the error message.
+ *
+ * Wiring: `parseTomlFile()` in `cli/src/commands/sync.ts` calls
+ * `expandWorkflowTomlData()` after parsing. All 24 push parse sites in
+ * sync.ts route through that single seam, so the expansion is uniform.
+ * The standalone `expandWorkflow(filePath)` helper backs the
+ * `primitive workflows expand` subcommand for debugging.
+ */
+import { existsSync, readFileSync } from "fs";
+import { dirname, join, basename } from "path";
+import * as TOML from "@iarna/toml";
+/**
+ * Read and expand a workflow TOML file from disk. Returns the parsed
+ * TOML with all `include` fragments spliced in. If the file has no
+ * `include` key, the parsed TOML is returned unchanged.
+ */
+export function expandWorkflow(workflowPath) {
+    const content = readFileSync(workflowPath, "utf-8");
+    const parsed = TOML.parse(content);
+    return expandWorkflowTomlData(parsed, workflowPath);
+}
+/**
+ * Expand the `include` key of an already-parsed TOML object. Resolves
+ * fragment files relative to `<workflowPath>/../../workflow-fragments/`.
+ * Use this when the TOML has already been parsed elsewhere (e.g. inside
+ * `parseTomlFile()`).
+ */
+export function expandWorkflowTomlData(parsed, workflowPath) {
+    // Fast path: nothing to expand. Preserve the original shape exactly —
+    // including the absence of a `steps` field, since not every TOML file
+    // routed through `parseTomlFile()` represents a workflow.
+    if (!("include" in parsed)) {
+        return parsed;
+    }
+    const includeList = parsed.include;
+    if (!Array.isArray(includeList)) {
+        throw new Error(`Workflow '${workflowPath}' has an 'include' key but it is not an array. Use \`include = ["fragment-name"]\`.`);
+    }
+    // Resolve fragments directory: sibling of workflow's parent directory.
+    // E.g. workflow at  config/workflows/foo.toml
+    //      fragments at config/workflow-fragments/<name>.toml
+    const fragmentsDir = join(dirname(workflowPath), "..", "workflow-fragments");
+    const workflowOwnSteps = Array.isArray(parsed.steps)
+        ? parsed.steps
+        : [];
+    const allOriginated = [];
+    for (const fragmentName of includeList) {
+        if (typeof fragmentName !== "string" || fragmentName.length === 0) {
+            throw new Error(`Workflow '${workflowPath}' has an invalid include entry: ${JSON.stringify(fragmentName)}. Each entry must be a fragment name string.`);
+        }
+        const fragmentPath = join(fragmentsDir, `${fragmentName}.toml`);
+        const fragment = readFragmentSafely(fragmentPath, workflowPath, fragmentName);
+        for (const step of fragment.steps) {
+            allOriginated.push({ step, origin: `fragment '${fragmentName}'` });
+        }
+    }
+    for (const step of workflowOwnSteps) {
+        allOriginated.push({ step, origin: `workflow '${basename(workflowPath)}'` });
+    }
+    assertUniqueStepIds(allOriginated, workflowPath);
+    // Build the expanded object: drop `include`, replace `steps` with the
+    // concatenated list. Preserve all other top-level keys (workflow,
+    // triggers, configs, etc.) exactly as parsed.
+    const result = { ...parsed };
+    delete result.include;
+    result.steps = allOriginated.map((o) => o.step);
+    return result;
+}
+function readFragmentSafely(fragmentPath, workflowPath, fragmentName) {
+    if (!existsSync(fragmentPath)) {
+        throw new Error(`Workflow '${workflowPath}' includes fragment '${fragmentName}' but the file does not exist at '${fragmentPath}'.`);
+    }
+    let parsed;
+    try {
+        const content = readFileSync(fragmentPath, "utf-8");
+        parsed = TOML.parse(content);
+    }
+    catch (err) {
+        throw new Error(`Failed to parse fragment '${fragmentName}' at '${fragmentPath}': ${err?.message ?? err}`);
+    }
+    if ("include" in parsed) {
+        throw new Error(`Fragment '${fragmentName}' at '${fragmentPath}' contains its own 'include' key — recursive includes are not supported in v1. Inline the steps directly into this fragment.`);
+    }
+    if ("workflow" in parsed) {
+        throw new Error(`Fragment '${fragmentName}' at '${fragmentPath}' contains a [workflow] block. Fragment files must be [[steps]] lists only.`);
+    }
+    const steps = Array.isArray(parsed.steps)
+        ? parsed.steps
+        : [];
+    return { steps };
+}
+function assertUniqueStepIds(originated, workflowPath) {
+    const seen = new Map();
+    for (const { step, origin } of originated) {
+        const id = step?.id;
+        if (id === undefined || id === null)
+            continue; // let downstream code complain about missing ids
+        if (typeof id !== "string")
+            continue;
+        if (seen.has(id)) {
+            const firstOrigin = seen.get(id);
+            throw new Error(`Step id '${id}' appears twice when expanding workflow '${workflowPath}': first in ${firstOrigin}, then in ${origin}.`);
+        }
+        seen.set(id, origin);
+    }
+}
+//# sourceMappingURL=workflow-fragments.js.map

package/dist/src/lib/workflow-fragments.js.map

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

package/dist/src/lib/workflow-toml-validator.js

@@ -0,0 +1,328 @@
+/**
+ * Push-time validator for workflow TOML files (issue #685).
+ *
+ * Detects the common footgun where a user writes `[steps.<id>.<field>]` under
+ * an open `[[steps]]` array. TOML parses that as a sub-table on the
+ * most-recent step keyed by the step's id (e.g. `steps[0]["refresh-each"]`),
+ * not as the intended `steps[0].request`. The result is a step with an
+ * unrecognized top-level field — the runtime silently ignores it, and the
+ * step then runs with an empty `request` block.
+ *
+ * The validator walks every step in `tomlData.steps[]` and reports any
+ * top-level field not in the universal-and-consumed allowlist. The allowlist
+ * is the union of:
+ *  - Universal step fields declared on `BaseStepDefinition` in
+ *    `src/workflows/runner/types.ts`
+ *  - The top-level fields each step runner in `src/workflows/steps/`
+ *    actually reads
+ *
+ * The list is universal-only (not per-kind) by design: the CLI doesn't know
+ * which step kinds exist on a given server version, and a per-kind list
+ * would couple the CLI tightly to the runtime. A universal allowlist
+ * catches the misnested-header footgun cleanly while staying tolerant of
+ * future step kinds that consume top-level fields already in the union.
+ *
+ * Maintenance: when a new step kind starts reading a new top-level field,
+ * add the field name to `ALLOWLISTED_FIELDS` below. See `cli/README.md`
+ * for the maintenance note.
+ */
+/**
+ * Universal-only allowlist of top-level fields permitted on a step.
+ *
+ * Membership combines:
+ *  1) Universal fields on `BaseStepDefinition` in
+ *     `src/workflows/runner/types.ts` and the runner engine's reads of
+ *     `stepDef.*`.
+ *  2) The union of top-level fields actually consumed by step runners in
+ *     `src/workflows/steps/` (audited 2026-05-15).
+ *
+ * Keep this sorted to make diffs reviewable.
+ */
+const ALLOWLISTED_FIELDS = new Set([
+    // Universal (BaseStepDefinition + engine).
+    "as",
+    "concurrency",
+    "continueOnError",
+    "description",
+    "forEach",
+    "id",
+    "kind",
+    "maxItems",
+    "name",
+    "runIf",
+    "saveAs",
+    "selector",
+    "strict",
+    "successWhen",
+    "timeout",
+    // Per-kind, union across runners.
+    "_testSteps", // workflow.call test-mode override
+    "action",
+    "appId",
+    "asBase64",
+    "attachments",
+    "blobId",
+    "bodyMode",
+    "bucketId",
+    "bucketKey",
+    "cacheTtlSeconds",
+    "configId",
+    "content",
+    "contentBase64",
+    "contentType",
+    "context",
+    "cursor",
+    "cursorField",
+    "databaseId",
+    "direction",
+    "dryRun",
+    "durationMs",
+    "email",
+    "events",
+    "expiresInSeconds",
+    "feature",
+    "filename",
+    "filters",
+    "groupBy",
+    "groupId",
+    "groupType",
+    "htmlBody",
+    "includeUserDetails",
+    "input",
+    "integrationKey",
+    "itemsField",
+    "limit",
+    "maxPages",
+    "message",
+    "messages",
+    "metrics",
+    "model",
+    "modelOverride",
+    "ms",
+    "multipartFields",
+    "onPartialFailure",
+    "operationName",
+    "output",
+    "page",
+    "params",
+    "payload",
+    "plugins",
+    "prompt",
+    "promptKey",
+    "query",
+    "queryType",
+    "request",
+    "route",
+    "runs",
+    "sort",
+    "step", // collect: nested inner step definition
+    "subject",
+    "tags",
+    "temperature",
+    "templateType",
+    "textBody",
+    "thinkingLevel",
+    "to",
+    "tools",
+    "tool_choice",
+    "top_p",
+    "toUserId",
+    "type",
+    "user",
+    "userId",
+    "userUlid",
+    "variables",
+    "windowDays",
+    "workflowKey",
+]);
+/**
+ * Walk a parsed workflow TOML document and return all unknown-field errors.
+ *
+ * @param tomlData The output of `TOML.parse()` for a workflow TOML file.
+ * @returns An array of error objects, one per offending field. Empty if no
+ *   errors were found.
+ */
+export function validateWorkflowToml(tomlData) {
+    const errors = [];
+    if (tomlData === null || tomlData === undefined) {
+        return errors;
+    }
+    const steps = tomlData.steps;
+    // No steps section at all → nothing to validate. This is fine for
+    // partial TOML files (some commands accept a metadata-only file).
+    if (steps === undefined || steps === null) {
+        return errors;
+    }
+    // `steps` is a table instead of an array. This typically means the user
+    // wrote `[steps.foo]` with no preceding `[[steps]]` array marker, so
+    // TOML resolved `steps` to a table. The runtime expects an array — flag
+    // it with a clear shape diagnostic.
+    if (!Array.isArray(steps)) {
+        if (typeof steps === "object") {
+            errors.push({
+                stepIndex: -1,
+                stepId: null,
+                field: "__steps_shape__",
+                hint: 'The `steps` section is a table, not an array. Workflow TOML expects `[[steps]]` array markers — add `[[steps]]` before any `[steps.<field>]` blocks.',
+            });
+        }
+        else {
+            errors.push({
+                stepIndex: -1,
+                stepId: null,
+                field: "__steps_shape__",
+                hint: `The \`steps\` section must be an array of step tables (received: ${typeof steps}).`,
+            });
+        }
+        return errors;
+    }
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        // Defensive: array entry isn't an object. Should be near-impossible with
+        // valid `[[steps]]` syntax, but possible if the user writes `steps =
+        // ["a", "b"]`. Surface it so the user gets a diagnostic instead of a
+        // silent skip.
+        if (step === null || typeof step !== "object" || Array.isArray(step)) {
+            errors.push({
+                stepIndex: i,
+                stepId: null,
+                field: "__step_shape__",
+                hint: `Each entry in \`steps[]\` must be a table. Got: ${step === null ? "null" : Array.isArray(step) ? "array" : typeof step}.`,
+            });
+            continue;
+        }
+        validateStepObject(step, i, /* parentStepId */ null, errors);
+        // Codex finding 2 (PR #762, 2026-05-15): a `collect` step's nested
+        // `step` field is itself a step definition that the collect runner
+        // executes. The outer-step allowlist accepts `step` as a top-level
+        // field, but that's a structural pass-through — we need to recurse
+        // into the inner step's keys to catch the same misnested-header
+        // footgun (e.g. `[steps.step.call.request]` parses as `step.step =
+        // { call: { request: {...} } }`, with `call` as an unknown inner
+        // field; without the recursion this slips through). We only recurse
+        // for `kind === "collect"` — other kinds with a `step`-named field
+        // (none today) would need their own audit.
+        if (step.kind === "collect" &&
+            step.step !== null &&
+            typeof step.step === "object" &&
+            !Array.isArray(step.step)) {
+            const outerStepId = typeof step.id === "string" ? step.id : null;
+            validateStepObject(step.step, i, outerStepId, errors);
+        }
+    }
+    return errors;
+}
+/**
+ * Validate a single step object's top-level keys against the allowlist and
+ * push any errors found onto `errors`. Used for both the top-level
+ * `steps[]` walk and the recursive `collect.step` walk.
+ *
+ * When `parentStepId` is set, the step being validated is the inner step
+ * of a `collect`. Errors carry the outer-step context so the rendered
+ * diagnostic can point operators at the right slot in the TOML.
+ */
+function validateStepObject(step, stepIndex, parentStepId, errors) {
+    const stepId = typeof step.id === "string" ? step.id : null;
+    for (const key of Object.keys(step)) {
+        const value = step[key];
+        // Codex finding 1 (PR #762, 2026-05-15): self-id misnesting must be
+        // checked BEFORE the allowlist skip. When the step's `id` happens to
+        // match an allowlisted field name (e.g. `id = "query"`,
+        // `id = "request"`, `id = "input"`, `id = "output"`), TOML's
+        // `[steps.<id>.<sub-field>]` misnest produces a sub-table on the step
+        // keyed by the id — the same shape the validator was meant to catch.
+        // The allowlist would otherwise skip it as "expected per-kind field".
+        // Heuristic: when `step[step.id]` is a non-array table, this is
+        // (effectively always) the misnest pattern. Scalars are fine (the
+        // user really did mean to set the scalar field).
+        const isSelfIdMisnest = stepId !== null &&
+            key === stepId &&
+            value !== null &&
+            typeof value === "object" &&
+            !Array.isArray(value);
+        if (!isSelfIdMisnest && ALLOWLISTED_FIELDS.has(key))
+            continue;
+        // Two failure modes are common enough to call out specifically in
+        // the hint:
+        //
+        // 1) `[steps.<id>.<field>]` under `[[steps]]` — TOML places the
+        //    sub-table under `steps[N][<id>]`. We detect this when the
+        //    unknown field name equals the step's own id (including the
+        //    self-id-allowlist-collision case above). We use the first
+        //    sub-key of the offending value (e.g. `request`) to build a
+        //    concrete corrected-form example so the user sees exactly what
+        //    to rewrite, not just an abstract `<field>`.
+        //
+        // 2) Any other unknown top-level field — covered by the generic hint.
+        let hint;
+        if (stepId !== null && key === stepId) {
+            const subKey = value && typeof value === "object" && !Array.isArray(value)
+                ? Object.keys(value)[0]
+                : null;
+            const exampleSub = subKey ?? "request";
+            hint =
+                `This is usually caused by writing [steps.${stepId}.${exampleSub}] instead of [steps.${exampleSub}]. ` +
+                    `TOML can't address an array element by id — use [steps.${exampleSub}] (refers to the most recent step).`;
+        }
+        else {
+            hint =
+                `\`${key}\` is not a recognized step field. ` +
+                    `If you meant to write a nested config block on this step, use [steps.${key}] (which refers to the most recent step) instead of [steps.<id>.${key}].`;
+        }
+        errors.push({
+            stepIndex,
+            stepId,
+            field: key,
+            hint,
+            parentStepId,
+        });
+    }
+}
+/**
+ * Render a multi-line diagnostic for a list of errors. Designed for the
+ * shape called out in the issue:
+ *
+ *   Error in workflows/refresh.toml:
+ *     steps[0] (id="refresh-each") has unknown field "refresh-each".
+ *     This is usually caused by writing [steps.refresh-each.request] instead of [steps.request].
+ *     TOML can't address an array element by id — use [steps.request] (refers to the most recent step).
+ *
+ * @param filePath The TOML file path (or display name) to include in the
+ *   header.
+ * @param errors The error list from `validateWorkflowToml`.
+ * @returns A multi-line string ready to print to stderr.
+ */
+export function formatWorkflowTomlErrors(filePath, errors) {
+    if (errors.length === 0)
+        return "";
+    const lines = [`Error in ${filePath}:`];
+    for (const err of errors) {
+        if (err.field === "__steps_shape__") {
+            lines.push(`  ${err.hint}`);
+            continue;
+        }
+        if (err.field === "__step_shape__") {
+            lines.push(`  steps[${err.stepIndex}] is malformed: ${err.hint}`);
+            continue;
+        }
+        // For errors inside a `collect` step's nested inner step (codex review,
+        // 2026-05-15), use a `steps[N].step` slot prefix so operators see that
+        // the offending field is on the inner step, not the outer collect.
+        // The outer step's id (if any) is also included in the prefix so the
+        // diagnostic can be cross-referenced against the parent's TOML header.
+        const isInnerStep = err.parentStepId !== undefined;
+        const slot = isInnerStep
+            ? `steps[${err.stepIndex}].step`
+            : `steps[${err.stepIndex}]`;
+        const idPart = err.stepId ? ` (id="${err.stepId}")` : "";
+        const parentPart = isInnerStep && err.parentStepId
+            ? ` (inside collect step id="${err.parentStepId}")`
+            : isInnerStep
+                ? ` (inside collect step)`
+                : "";
+        lines.push(`  ${slot}${idPart}${parentPart} has unknown field "${err.field}".`);
+        lines.push(`  ${err.hint}`);
+    }
+    return lines.join("\n");
+}
+//# sourceMappingURL=workflow-toml-validator.js.map

package/dist/src/lib/workflow-toml-validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-toml-validator.js","sourceRoot":"","sources":["../../../src/lib/workflow-toml-validator.ts"],"names":[],"mappings":"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"}