primitive-admin 1.1.0-alpha.41 → 1.1.0-alpha.42

package/dist/src/commands/sync.d.ts

@@ -37,9 +37,9 @@ export declare function computeExpandedContentHash(parsed: any): string;
  */
 export declare function shouldPushExpandedFile(parsed: any, storedHash: string | undefined): boolean;
 /**
- * Normalize a parsed workflow TOML object so that any of the five
- * serializer-emitted fields the *local* file omits are filled in with the
- * model default. Used by `diff` so a hand-authored workflow that omits e.g.
+ * Normalize a parsed workflow TOML object so that any of the
+ * serializer-emitted default fields the *local* file omits are filled in with
+ * the model default. Used by `diff` so a hand-authored workflow that omits e.g.
  * `perUserMaxRunning` compares equal to a server that defaulted it to 4
  * (the #1175 false-positive guard) — while a server value that was
  * *explicitly set* to a non-default (e.g. 8) still shows as Modified.
@@ -113,11 +113,6 @@ export declare function fetchAll<T>(listFn: (params: {
     items: T[];
     nextCursor?: string | null;
 }>, pageSize?: number, maxPages?: number): Promise<T[]>;
-/**
- * Safely parse a JSON field that may be a string or already an object.
- * TOML can parse inline tables as objects, so we need to handle both.
- */
-export declare function safeJsonParse(value: any): any;
 /**
  * Resolve a key-based rule set name reference to an ID.
  * Throws if the name cannot be resolved and throwOnMissing is true.

package/dist/src/commands/sync.js

@@ -13,6 +13,7 @@ import { createSnapshot, listSnapshots, resolveSnapshot, restoreSnapshot, pruneS
 import { validateWorkflowToml, formatWorkflowTomlErrors, } from "../lib/workflow-toml-validator.js";
 import { expandWorkflowTomlData } from "../lib/workflow-fragments.js";
 import { applyWorkflowBody } from "../lib/workflow-apply.js";
+import { buildWorkflowPayloadFromToml } from "../lib/workflow-payload.js";
 import { detectLayout, migrateLegacyToV2 } from "../lib/block-layout.js";
 import { success, error, printApiError, info, warn, keyValue, json, divider, } from "../lib/output.js";
 import { confirmPrompt } from "../lib/confirm-prompt.js";
@@ -135,30 +136,43 @@ export function shouldPushExpandedFile(parsed, storedHash) {
     return computeExpandedContentHash(parsed) !== storedHash;
 }
 /**
- * Model defaults for the *exact five* workflow-level fields that
- * `serializeWorkflow` emits unconditionally (`sync.ts` workflow serializer:
- * `perUserMaxRunning`, `perUserMaxQueued`, `dequeueOrder`,
- * `requiresClientApply`, `syncCallable`). These mirror `models.yaml`
- * (`WorkflowDefinition`): `perUserMaxRunning=4`, `perUserMaxQueued=100`,
- * `dequeueOrder="fifo"`, `requiresClientApply=true`, `syncCallable=false`.
+ * Model defaults for the workflow-level fields that `serializeWorkflow` emits
+ * with a concrete server default the *local* file may omit (`sync.ts` workflow
+ * serializer): `perUserMaxRunning`, `perUserMaxQueued`, `perAppMaxRunning`,
+ * `perAppMaxQueued`, `queueTtlSeconds`, `dequeueOrder`, `requiresClientApply`,
+ * `syncCallable`. These mirror `models.yaml` (`WorkflowDefinition`):
+ * `perUserMaxRunning=4`, `perUserMaxQueued=100`, `perAppMaxRunning=25`,
+ * `perAppMaxQueued=10000`, `queueTtlSeconds=43200`, `dequeueOrder="fifo"`,
+ * `requiresClientApply=true`, `syncCallable=false`.
+ *
+ * `perAppMax*` / `queueTtlSeconds` were added here for #1177: once the pull
+ * serializer began emitting them (they carry a non-null model default, so a GET
+ * always returns them), an unchanged workflow using the server defaults hashed
+ * unequal to a local TOML that omits them — a false `modified` diff that made
+ * `sync pull` rewrite the file just to inject defaults. Normalizing both sides
+ * to the model default here closes that gap the same way the per-user limits do.
  *
  * This is deliberately NOT a generic models.yaml default importer — the model
- * carries many defaults the serializer never writes (`perAppMax*`,
- * `queueTtlSeconds`, …). Only the serializer-emitted surface matters for a
- * content comparison, because the remote side is hashed via `serializeWorkflow`
- * and therefore only ever contains these five.
+ * carries defaults the serializer never writes. Only the serializer-emitted
+ * surface with a concrete default matters for a content comparison, because the
+ * remote side is hashed via `serializeWorkflow`. Emit-when-set fields whose GET
+ * value is null/empty when unset (`accessRule`, `runAs`, `capabilities`) are
+ * omitted on both sides and so need no normalization here.
  */
 const WORKFLOW_SERIALIZER_DEFAULTS = {
     perUserMaxRunning: 4,
     perUserMaxQueued: 100,
+    perAppMaxRunning: 25,
+    perAppMaxQueued: 10000,
+    queueTtlSeconds: 43200,
     dequeueOrder: "fifo",
     requiresClientApply: true,
     syncCallable: false,
 };
 /**
- * Normalize a parsed workflow TOML object so that any of the five
- * serializer-emitted fields the *local* file omits are filled in with the
- * model default. Used by `diff` so a hand-authored workflow that omits e.g.
+ * Normalize a parsed workflow TOML object so that any of the
+ * serializer-emitted default fields the *local* file omits are filled in with
+ * the model default. Used by `diff` so a hand-authored workflow that omits e.g.
  * `perUserMaxRunning` compares equal to a server that defaulted it to 4
  * (the #1175 false-positive guard) — while a server value that was
  * *explicitly set* to a non-default (e.g. 8) still shows as Modified.
@@ -488,6 +502,13 @@ export function serializeWorkflow(workflow, draft, configs) {
                 : undefined,
             perUserMaxRunning: workflow.perUserMaxRunning,
             perUserMaxQueued: workflow.perUserMaxQueued,
+            // #1177 — app-level queue limits + queue TTL. Emit only when set so a
+            // fresh pull → push round-trips them without writing noisy zero/empty
+            // keys. The shared payload builder forwards these on create AND update,
+            // so the pull serializer must surface them for the round-trip to close.
+            perAppMaxRunning: workflow.perAppMaxRunning ?? undefined,
+            perAppMaxQueued: workflow.perAppMaxQueued ?? undefined,
+            queueTtlSeconds: workflow.queueTtlSeconds ?? undefined,
             dequeueOrder: workflow.dequeueOrder,
             // Sync-callable flags (#807): always emit both so a fresh pull → push
             // cycle round-trips them. The GET response normalizes these to booleans
@@ -768,17 +789,6 @@ export async function fetchAll(listFn, pageSize = 100, maxPages = 100) {
     } while (cursor);
     return all;
 }
-/**
- * Safely parse a JSON field that may be a string or already an object.
- * TOML can parse inline tables as objects, so we need to handle both.
- */
-export function safeJsonParse(value) {
-    if (value === undefined || value === null)
-        return undefined;
-    if (typeof value === "string")
-        return JSON.parse(value);
-    return value; // Already an object (TOML parsed it as a table)
-}
 /**
  * Resolve a key-based rule set name reference to an ID.
  * Throws if the name cannot be resolved and throwOnMissing is true.
@@ -3085,25 +3095,19 @@ Directory Structure:
                         changes.push({ type: "workflow", action: "create", key });
                         if (!options.dryRun) {
                             try {
+                                // #1177: build the `[workflow]`-derived fields through the
+                                // shared builder so `sync push` create can't drift from
+                                // `create --from-file` / the update path (this branch used to
+                                // drop `status`, `capabilities`, `perAppMax*`, `queueTtlSeconds`).
+                                // Structural fields (`workflowKey`, `steps`, `metadataManifest`)
+                                // and the manifest-key `name` fallback are attached here; the
+                                // `name` override follows the spread so it wins over the
+                                // builder's bare `name`.
                                 const created = await client.createWorkflow(resolvedAppId, {
                                     workflowKey: key,
-                                    name: workflow.name || key,
-                                    description: workflow.description,
                                     steps,
-                                    inputSchema: workflow.inputSchema ? safeJsonParse(workflow.inputSchema) : undefined,
-                                    outputSchema: workflow.outputSchema ? safeJsonParse(workflow.outputSchema) : undefined,
-                                    accessRule: workflow.accessRule || undefined,
-                                    // #1081 — workflow principal mode (absent → server default).
-                                    runAs: workflow.runAs || undefined,
-                                    perUserMaxRunning: workflow.perUserMaxRunning,
-                                    perUserMaxQueued: workflow.perUserMaxQueued,
-                                    dequeueOrder: workflow.dequeueOrder,
-                                    // Sync-callable flags (#807): pass through as-is. An absent
-                                    // TOML key is `undefined` (dropped by JSON.stringify), so the
-                                    // server applies its defaults (requiresClientApply=true,
-                                    // syncCallable=false); an explicit value is honored.
-                                    requiresClientApply: workflow.requiresClientApply,
-                                    syncCallable: workflow.syncCallable,
+                                    ...buildWorkflowPayloadFromToml(workflow, { mode: "create" }),
+                                    name: workflow.name || key,
                                     // #1304 (P-C): declared-access manifest (absent → undefined,
                                     // server default null).
                                     metadataManifest: workflow.metadataManifest ?? undefined,