primitive-admin 1.2.0-alpha.2 → 1.2.0-alpha.4

package/dist/src/commands/sync.js

@@ -42,7 +42,10 @@ import { CONFIG_SURFACES, isEmptyForEmit, tomlGroupsOf, } from "../lib/generated
 // preflight refuses exactly what the admin routes refuse.
 import { promptKindOf, resolvePromptKind, } from "../lib/generated-config-surfaces.js";
 // #3798 — the `[prompt.agent]` declaration rule, vendored the same way.
-import { agentDeclarationFunctionKeys, agentTestCaseRefusal, resolveAgentDeclaration, } from "../lib/generated-config-surfaces.js";
+import { agentDeclarationFunctionKeys, resolveAgentDeclaration, } from "../lib/generated-config-surfaces.js";
+// #4262 — the agent test case's shape rule (`[test.agent]`), vendored the same
+// way, so the preflight refuses exactly the sidecars the admin routes refuse.
+import { AGENT_TEST_CASE_FIELDS, resolveAgentTestCase, } from "../lib/generated-config-surfaces.js";
 // #3799 — the meaning-preserving schema translation, vendored the same way, so
 // the preflight refuses exactly the schemas the admin routes refuse.
 import { agentSchemaTranslationRefusals } from "../lib/generated-config-surfaces.js";
@@ -51,7 +54,7 @@ import { agentSchemaTranslationRefusals } from "../lib/generated-config-surfaces
 import { resolvePromptStrictOutput } from "../lib/generated-config-surfaces.js";
 // #3179 — the function's two halves: the header payloads and the envelope
 // `config push` sends, and the bytes `config pull` writes back.
-import { applyFunctionPull, buildFunctionConfigPush, createDocumentSchemaDropWarner, documentSchemaRetentionFailure, buildFunctionCreatePayload, buildFunctionUpdatePayload, functionDiffEntity, functionTomlIgnoredKeyWarnings, functionTomlPreflightErrors, planDocumentSchemaPull, planFunctionPull, serializeFunction, } from "../lib/function-sync.js";
+import { applyFunctionPull, buildFunctionConfigPush, createDocumentSchemaDropWarner, documentSchemaRetentionFailure, buildFunctionCreatePayload, buildFunctionUpdatePayload, functionDiffEntity, functionTomlPreflightErrors, planDocumentSchemaPull, planFunctionPull, serializeFunction, } from "../lib/function-sync.js";
 import { newerVersionLine, pullNewerVersionLine, rollbackDiffHint, } from "../lib/function-versions.js";
 import { FunctionBuildError } from "../lib/function-bundle.js";
 // #3182 — the local half of capability validation. The grammar is the vendored
@@ -1672,9 +1675,9 @@ export function serializeBlobBucket(bucket, ruleSetIdToName = new Map(), logger)
  * `config push` builds its bodies from and `config diff` compares.
  *
  * Read in CREATE mode, so the immutable `ttlTier` stays nameable. The rule set
- * is left as `_ruleSetName` for `resolveRuleSetReference`; the deprecated
- * `ruleSetId` spelling is forwarded as the id it already is. A file carrying
- * both is refused by the preflight (`blobBucketFileErrors`) before this runs.
+ * is left as `_ruleSetName` for `resolveRuleSetReference`. The id spelling
+ * `ruleSetId` is a retired key (#4283): the preflight refuses a file carrying
+ * it, and this parse never reads it.
  *
  * An omitted `name` stays omitted: the update leaves the server's name alone,
  * and only the create body falls back to the key.
@@ -1697,43 +1700,8 @@ export function parseBlobBucketToml(doc) {
         // Trimmed, as `applyRuleSetReference` does for the type configs.
         entity._ruleSetName = section.ruleSetName.trim();
     }
-    else if (typeof section.ruleSetId === "string" && section.ruleSetId !== "") {
-        entity.ruleSetId = section.ruleSetId;
-    }
     return entity;
 }
-/**
- * The advisory `config push` prints for a bucket file still naming its rule set
- * by id (#4116). The key is deprecated, not retired: the file pushes.
- */
-export function blobBucketDeprecatedKeyWarning(filePath, tomlData) {
-    const bucket = tomlData?.bucket;
-    if (!bucket || bucket.ruleSetId === undefined)
-        return null;
-    // Beside `ruleSetName` it is a refusal instead (`blobBucketFileErrors`).
-    if (bucket.ruleSetName !== undefined)
-        return null;
-    return (`${filePath}: bucket.ruleSetId is deprecated — a rule-set id belongs to one app, ` +
-        `so a copied tree cannot resolve it; write ruleSetName = "<name>" ` +
-        "(config pull rewrites the file). Retiring the key is a later change.");
-}
-/** A bucket file's own refusals, decided from the file alone (#4116). */
-export function blobBucketFileErrors(filePath, tomlData) {
-    const bucket = tomlData?.bucket;
-    if (bucket && bucket.ruleSetId !== undefined && bucket.ruleSetName !== undefined) {
-        return [`${filePath}: bucket.ruleSetId is set beside bucket.ruleSetName; keep ruleSetName`];
-    }
-    // The deprecated spelling is a TOML-only key, so the declared-type check
-    // reads only `ruleSetName`; the old key keeps the field's type under its
-    // own name, or a mistyped id would be dropped from the body unreported.
-    const field = BLOB_BUCKET_TABLE.fields.find((f) => f.field === "ruleSetId");
-    if (!field)
-        return [];
-    return configDeclaredTypeErrors(filePath, tomlData, {
-        ...BLOB_BUCKET_TABLE,
-        fields: [{ ...field, tomlKey: "ruleSetId" }],
-    });
-}
 /**
  * Build the PATCH payload for a blob-bucket update from local TOML.
  *
@@ -2648,24 +2616,6 @@ export async function runConfigPushPreflight(input) {
             }
         }
     }
-    // #4116 — the deprecated `ruleSetId` spelling in a bucket file. Advisory
-    // only: the file pushes. Bounded by `--only`, like the notice above.
-    const preflightBucketsDir = join(configDir, "blob-buckets");
-    if (existsSync(preflightBucketsDir)) {
-        for (const file of selectFiles("blob-bucket", preflightBucketsDir, readdirSync(preflightBucketsDir).filter((f) => f.endsWith(".toml")))) {
-            let tomlData;
-            try {
-                tomlData = parseTomlFile(join(preflightBucketsDir, file));
-            }
-            catch {
-                // A file that does not parse is reported by the collector below.
-                continue;
-            }
-            const advice = blobBucketDeprecatedKeyWarning(`blob-buckets/${file}`, tomlData);
-            if (advice)
-                warn(`  ${advice}`);
-        }
-    }
     // Validate app.toml settings up-front (issue #1033). A mistyped value
     // is a hard error that must abort BEFORE any mutation — same
     // fail-before-mutate contract as the vars preflight below. The apply
@@ -2781,7 +2731,7 @@ export async function runConfigPushPreflight(input) {
                     preflightValidationErrors.push(`  ${message}`);
                 }
                 // #3320 — and everything else the file decides on its own: the
-                // `entry`, the mode the two spellings resolve to, the trigger
+                // `entry`, the retired runtime keys it refuses (#3188), the trigger
                 // rules, and a webhook trigger's signing-secret requirement and
                 // reference shape. These used to be raised inside the apply loop,
                 // after webhooks, integrations, vars and database types had
@@ -2796,19 +2746,6 @@ export async function runConfigPushPreflight(input) {
                 })) {
                     preflightValidationErrors.push(`  ${filePath}: ${message}`);
                 }
-                // #3482 — the retired runtime keys. NOT refusals through phase 4:
-                // the file pushes with every other key applied, and the author
-                // hears which line to delete before phase 5 refuses it. On
-                // stderr, like every other advisory, so a scripted push reading
-                // stdout is unaffected. Inside this loop rather than over the
-                // whole tree, so `--only` bounds the advice as it bounds the
-                // refusals (#2645).
-                for (const message of functionTomlIgnoredKeyWarnings({
-                    functionKey,
-                    tomlData,
-                })) {
-                    warn(`  ${message}`);
-                }
             }
         }
     }
@@ -2868,8 +2805,10 @@ export async function runConfigPushPreflight(input) {
             }
         }
     }
-    // #3798 — a test case on an agent is refused by the admin routes; say so
-    // here, before any other file is applied.
+    // #3798, #4262 — a prompt's sidecar against its prompt's kind: an agent's
+    // case is checked by the agent test case's shape rule, and `[test.agent]`
+    // on a chat or decisions prompt's case is refused, before any file is
+    // applied.
     for (const message of promptAgentSidecarErrors(configDir)) {
         preflightValidationErrors.push(`  ${message}`);
     }
@@ -3239,10 +3178,39 @@ export function partitionPromptFilesForPush(promptsDir, files) {
     return { beforeFunctions, afterFunctions };
 }
 /**
- * Every `prompts/<key>.tests/*.toml` sidecar whose prompt is an agent — #3798
- * (§D1: prompt test cases are refused for the kind in v1). The admin test-case
- * routes refuse the same case with `AGENT_TEST_CASE_NOT_SUPPORTED`; this says
- * so before anything is applied.
+ * The kind of the prompt a `prompts/<key>.tests/` sidecar belongs to, read
+ * from the prompt's own file — `undefined` for another block type, or when the
+ * file is absent or does not parse (the prompt leg reports that).
+ */
+function testCaseOwnerPromptKind(configDir, blockType, blockKey) {
+    if (blockType !== "prompt")
+        return undefined;
+    const owner = join(configDir, "prompts", `${blockKey}.toml`);
+    if (!existsSync(owner))
+        return undefined;
+    try {
+        return promptKindOf(parseTomlFile(owner)?.prompt);
+    }
+    catch {
+        return undefined;
+    }
+}
+/** A sidecar's agent block and `expectedJsonSubset`, in wire spelling. */
+function agentTestCaseWireFields(payload) {
+    const fields = {};
+    for (const key of AGENT_TEST_CASE_FIELDS)
+        fields[key] = payload?.[key];
+    fields.expectedJsonSubset = payload?.expectedJsonSubset;
+    return fields;
+}
+/**
+ * Every `prompts/<key>.tests/*.toml` sidecar the agent test case's rule
+ * refuses — #4262 (#3798 refused every sidecar on an agent). An agent's case
+ * is checked by the vendored shape rule (`resolveAgentTestCase`), which the
+ * admin routes run too; a `[test.agent]` block on a chat or decisions
+ * prompt's case is refused by name. One line per file, naming it. What needs
+ * the app (the input, context and event schemas, the declared names) is the
+ * routes' to decide at apply.
  */
 export function promptAgentSidecarErrors(configDir) {
     const promptsDir = join(configDir, "prompts");
@@ -3252,21 +3220,25 @@ export function promptAgentSidecarErrors(configDir) {
         if (!filePath.startsWith(promptsDir) || !parent.endsWith(".tests"))
             continue;
         const key = parent.slice(0, -".tests".length);
-        const owner = join(promptsDir, `${key}.toml`);
-        if (!existsSync(owner))
+        const kind = testCaseOwnerPromptKind(configDir, "prompt", key);
+        if (kind === undefined)
             continue;
-        let tomlData;
+        let sidecar;
         try {
-            tomlData = parseTomlFile(owner);
+            sidecar = parseTomlFile(filePath);
         }
         catch {
+            // The test-case collector reports a file that does not parse.
             continue;
         }
-        if (promptKindOf(tomlData?.prompt) !== "agent")
+        const resolved = resolveAgentTestCase({
+            kind,
+            fields: agentTestCaseWireFields(parseTestCaseToml(sidecar)),
+        });
+        if (!("refusals" in resolved))
             continue;
-        const promptKey = tomlData?.prompt?.key || key;
         errors.push(`${filePath.slice(configDir.length + 1)}: ` +
-            agentTestCaseRefusal(promptKey, "subject").message);
+            resolved.refusals.map((refusal) => refusal.message).join("; "));
     }
     return errors;
 }
@@ -3339,18 +3311,12 @@ export function configFileValidationMessages(filePath, tomlData, surface, tables
     if (surface.label === "prompt") {
         messages.push(...promptKindFileErrors(filePath, tomlData));
     }
-    // #4116 — a bucket naming its rule set both ways.
-    if (surface.label === "blob-bucket") {
-        messages.push(...blobBucketFileErrors(filePath, tomlData));
-    }
     return messages;
 }
 /**
  * Whether `config pull` must rewrite a local file whatever it says (#4160):
- * `config push` would refuse it, or it spells something in a deprecated form
- * pull exists to migrate (a bucket naming its rule set by id). Keeping such a
- * file because its VALUES match would leave the tree unpushable, or the
- * deprecation unresolved, after a pull that reported success.
+ * `config push` would refuse it. Keeping such a file because its VALUES match
+ * would leave the tree unpushable after a pull that reported success.
  */
 export function pullMustRewrite(label, tomlData) {
     // A test-case sidecar is not one of the preflight's per-directory targets;
@@ -3365,7 +3331,7 @@ export function pullMustRewrite(label, tomlData) {
             return true;
         }
     }
-    return (label === "blob-bucket" && blobBucketDeprecatedKeyWarning("", tomlData) !== null);
+    return false;
 }
 export function collectConfigFileValidationErrors(configDir) {
     const found = [];
@@ -3443,35 +3409,6 @@ export function collectFunctionTomlValidationErrors(configDir) {
     }
     return found;
 }
-/**
- * The retired runtime keys every `functions/*.toml` in the tree still carries
- * — #3482, the warning half of the collector above.
- *
- * Separate from the errors because it IS separate: a file carrying one of
- * these pushes, with every other key applied, so it is not a row `config diff`
- * calls invalid. It is a line an author reads on stderr from both commands, so
- * the two keep reading identically (the #2880 symmetry the errors collector
- * exists for, applied to advice rather than refusals).
- */
-export function collectFunctionTomlIgnoredKeyWarnings(configDir) {
-    const found = [];
-    const functionsDir = join(configDir, "functions");
-    if (!existsSync(functionsDir))
-        return found;
-    for (const file of readdirSync(functionsDir).filter(isFunctionDeclarationFile)) {
-        const filePath = join(functionsDir, file);
-        let tomlData;
-        try {
-            tomlData = parseTomlFile(filePath);
-        }
-        catch {
-            continue;
-        }
-        const key = tomlData?.function?.key || basename(file, ".toml");
-        found.push(...functionTomlIgnoredKeyWarnings({ functionKey: key, tomlData }));
-    }
-    return found;
-}
 /**
  * The collectors' rows, one per diff row (#2880 symmetry, #3320).
  *
@@ -5001,12 +4938,11 @@ const CONFIG_DIFF_SPECS = {
                 keys.push("name");
             if (!bucket.preset)
                 keys.push("preset");
-            // Either spelling manages the rule set (#4116) — read as the parse reads
-            // it, so a blank name is no reference rather than a difference the
-            // update cannot carry.
+            // A name manages the rule set (#4116) — read as the parse reads it, so a
+            // blank name is no reference rather than a difference the update cannot
+            // carry. The retired id spelling (#4283) manages nothing.
             const named = typeof bucket.ruleSetName === "string" && bucket.ruleSetName.trim() !== "";
-            const legacy = typeof bucket.ruleSetId === "string" && bucket.ruleSetId !== "";
-            if (!named && !legacy)
+            if (!named)
                 keys.push("ruleSetId");
             return keys;
         },
@@ -5974,6 +5910,17 @@ function testCaseSidecarTable(testCase, lookupMaps, unresolvedSpelling) {
         expectedOutputPattern: (record) => record.expectedOutputPattern || "",
         expectedOutputContains: (record) => jsonFieldText(record.expectedOutputContains, "[]"),
         expectedJsonSubset: (record) => jsonFieldText(record.expectedJsonSubset, "{}"),
+        // #4262 — `[test.agent]`, written only when a key is set, so a chat case's
+        // sidecar is the one it always was. The history is the text the author
+        // pushed; the two JSON fields come back parsed and are written as text.
+        agentHistory: (record) => agentJsonText(record.agentHistory),
+        agentContext: (record) => agentJsonText(record.agentContext),
+        agentTimezone: (record) => record.agentTimezone || undefined,
+        agentLocale: (record) => record.agentLocale || undefined,
+        agentExpectedToolCall: (record) => agentJsonText(record.agentExpectedToolCall),
+        agentExpectedNoToolCall: (record) => typeof record.agentExpectedNoToolCall === "boolean"
+            ? record.agentExpectedNoToolCall
+            : undefined,
     });
     return { test, unresolved };
 }
@@ -6028,6 +5975,38 @@ function jsonFieldText(value, empty) {
         return empty;
     }
 }
+/**
+ * #4262 — an agent block field as the sidecar's JSON text, or `undefined`
+ * (omitted) when unset: `[test.agent]` has no empty spellings.
+ */
+function agentJsonText(value) {
+    if (value === undefined || value === null)
+        return undefined;
+    if (typeof value === "string")
+        return value === "" ? undefined : value;
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * #4262 — an agent block JSON field on the wire: parsed when the text parses,
+ * the text itself otherwise (the shape rule names it), `undefined` when unset.
+ */
+function agentJsonWireValue(value) {
+    if (value === undefined || value === null || value === "")
+        return undefined;
+    if (typeof value !== "string")
+        return value;
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return value;
+    }
+}
 export function parseTestCaseToml(tomlData) {
     const test = tomlData.test || {};
     /** A JSON-string TOML value, or `undefined` when it is absent/the default. */
@@ -6068,6 +6047,15 @@ export function parseTestCaseToml(tomlData) {
             expectedOutputPattern: (value) => (value ? value : undefined),
             expectedOutputContains: (value) => parseJsonText(value, ["[]"]),
             expectedJsonSubset: (value) => parseJsonText(value, ["{}"]),
+            // #4262 — `[test.agent]`. The history travels as the JSON text it is
+            // authored as; context and expectedToolCall travel parsed; `false` is a
+            // value, not an absence.
+            agentHistory: (value) => (value === "" ? undefined : value),
+            agentContext: (value) => agentJsonWireValue(value),
+            agentTimezone: (value) => (value === "" ? undefined : value),
+            agentLocale: (value) => (value === "" ? undefined : value),
+            agentExpectedToolCall: (value) => agentJsonWireValue(value),
+            agentExpectedNoToolCall: (value) => value,
         },
     });
     // An omitted field must be absent from the body, not present-and-undefined:
@@ -7293,6 +7281,15 @@ export async function pushTestCasesForBlock(params) {
                 evaluatorPromptId: testPayload.evaluatorPromptId ?? null,
                 evaluatorConfigId: testPayload.evaluatorConfigId ?? null,
             };
+            // #4262 — an agent prompt's case carries its `[test.agent]` block as
+            // full state too: a key the file no longer sets goes as `null`, so
+            // removing an assertion clears it. A chat or decisions prompt's case
+            // sends none, so its body is the one it always was.
+            if (testCaseOwnerPromptKind(configDir, blockType, blockKey) === "agent") {
+                for (const key of AGENT_TEST_CASE_FIELDS) {
+                    updatePayload[key] = testPayload[key] ?? null;
+                }
+            }
             // #2896 — the identity travels with the content: this is the lazy
             // migration of a legacy case and the second half of a rename.
             if (pendingKey !== undefined)
@@ -17467,18 +17464,11 @@ What a push guarantees (two stages):
             // verbatim, so the two commands read identically — replaces whatever
             // the comparison had to say about the file.
             // #3320 — the function checks join them. Same posture, same messages:
-            // a function file whose `entry`, mode, triggers or webhook
-            // signing-secret the push preflight refuses is not a row this command
-            // calls Synced, Modified or "local only — new".
+            // a function file whose `entry`, retired runtime keys (#3188),
+            // triggers or webhook signing-secret the push preflight refuses is not
+            // a row this command calls Synced, Modified or "local only — new".
             // Merged first: a file both collectors reject keeps every message push
             // prints, rather than one collector's hint overwriting the other's.
-            // #3482 — the same advisory `config push` prints, so an author sees
-            // the retired key before they push rather than only during it. Not a
-            // row status: the file is pushable, and saying otherwise would make
-            // `config diff` disagree with the push it predicts.
-            for (const message of collectFunctionTomlIgnoredKeyWarnings(configDir)) {
-                warn(`  ${message}`);
-            }
             for (const rejected of mergeConfigFileValidationErrors([
                 ...collectConfigFileValidationErrors(configDir),
                 ...collectFunctionTomlValidationErrors(configDir),