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

package/dist/src/commands/sync-app-settings.js

@@ -24,13 +24,15 @@
  * diffs and shows like any other setting. The secrets' values live only in the
  * app secret store (`primitive secrets set`).
  */
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
+import { existsSync, readFileSync, mkdirSync } from "fs";
 import { join } from "path";
 import { createHash } from "crypto";
 import { parseConfigToml, stringifyConfigToml } from "../lib/config-toml.js";
 import { APP_SETTINGS_DESCRIPTOR, APP_SETTINGS_SECTIONS, buildAppSettingsPayload, projectAppSettingsForComparison, serializeAppSettingsToToml, } from "../lib/app-settings-descriptor.js";
 import { canonicalJsonStringify } from "../lib/canonical-json.js";
-import { syncStateReadPath } from "../lib/sync-paths.js";
+import { writePulledFile } from "../lib/pull-write.js";
+import { resolveSyncStateReadPath } from "../lib/sync-paths.js";
+import { requireCurrentEnvironment } from "../lib/env-resolver.js";
 import { success, error, info, json, result as printResult, divider, } from "../lib/output.js";
 /** The app-settings file name inside a sync directory. */
 export const APP_TOML_FILENAME = "app.toml";
@@ -53,16 +55,6 @@ function ensureDir(dirPath) {
     if (!existsSync(dirPath))
         mkdirSync(dirPath, { recursive: true });
 }
-/**
- * Write `app.toml` from server settings and return its content hash. Shared by
- * `config pull` (whole-tree and `--only app`), so the file and the hash have one
- * producer.
- */
-export function writeAppSettingsToml(configDir, settings) {
-    const path = appTomlPath(configDir);
-    writeFileSync(path, serializeAppSettings(settings));
-    return contentHashOfFile(path);
-}
 /**
  * Validate a parsed `app.toml` for push and return the fatal errors (a type
  * mismatch, an unrecognized or retired key, a missing required key). An empty
@@ -81,8 +73,8 @@ export function collectAppSettingsPushErrors(tomlData, options = {}) {
 // `sync` maintains, touching only `entities.app` and preserving every other
 // entity. Kept as small local load/save helpers (rather than importing
 // `sync.ts`) to avoid an import cycle — `sync.ts` imports the serializer above.
-function loadSyncState(configDir) {
-    const p = syncStateReadPath(configDir);
+function loadSyncState() {
+    const p = resolveSyncStateReadPath();
     if (!existsSync(p))
         return null;
     try {
@@ -153,12 +145,76 @@ export function renderAppSettings(settings) {
  * nothing, so there is no longer a class of value the pull has to warn about
  * being absent (#2307's warning went with the withholding layer). `config pull`
  * calls this for `app.toml`, whether the pull is whole-tree or `--only app`.
+ *
+ * A file that already states the same settings is left as it is (#4160): the
+ * comparison is the payload `config diff` and `config push` build from the
+ * file, so its comments, key order and explicit defaults survive the pull.
+ * `written` says which happened.
  */
 export function writePulledAppSettings(configDir, settings, options = {}) {
     ensureDir(configDir);
-    const contentHash = writeAppSettingsToml(configDir, settings);
-    options.log?.(`Wrote ${appTomlPath(configDir)}`);
-    return { path: appTomlPath(configDir), contentHash };
+    const path = appTomlPath(configDir);
+    const statedName = options.keepStatedName ? readStatedAppName(path) : undefined;
+    let content;
+    if (!options.keepStatedName) {
+        content = serializeAppSettings(settings);
+    }
+    else {
+        const data = serializeAppSettingsToToml(settings);
+        if (data.app) {
+            if (statedName !== undefined)
+                data.app.name = statedName;
+            else
+                delete data.app.name;
+        }
+        content = stringifyConfigToml(data);
+    }
+    const written = writePulledFile(path, content, options.tally, sameAppSettingsAs(content, { nameOptional: options.keepStatedName }));
+    if (written)
+        options.log?.(`Wrote ${path}`);
+    return {
+        path,
+        contentHash: contentHashOfFile(path),
+        written,
+        ...(options.keepStatedName && statedName === undefined
+            ? {
+                note: `${APP_TOML_FILENAME} carries no [app].name: a pull on a machine-local environment never ` +
+                    `writes the child's name; add the parent's name before merging back.`,
+            }
+            : {}),
+    };
+}
+/**
+ * Whether an `app.toml`'s text states the same settings as `serverContent`
+ * (#4160) — the payload push builds from each, hashed the way `config diff`
+ * compares it. A file push would refuse never matches, so pull rewrites it.
+ */
+function sameAppSettingsAs(serverContent, options) {
+    const payloadOf = (content) => buildAppSettingsPayload(parseConfigToml(content), {
+        nameOptional: options.nameOptional,
+    });
+    return (localContent) => {
+        const local = payloadOf(localContent);
+        const server = payloadOf(serverContent);
+        if (local.errors.length > 0 || server.errors.length > 0)
+            return false;
+        return (hashAppSettingsForDiff(local.settings) === hashAppSettingsForDiff(server.settings));
+    };
+}
+/**
+ * The `[app].name` an `app.toml` states, as TOML stated it, or undefined when
+ * the file is absent, unparseable or names nothing.
+ */
+function readStatedAppName(path) {
+    if (!existsSync(path))
+        return undefined;
+    try {
+        const parsed = parseConfigToml(readFileSync(path, "utf-8"));
+        return parsed?.app?.name;
+    }
+    catch {
+        return undefined;
+    }
 }
 /**
  * Whether `[app].name` is out of BOTH the comparison and the payload right now
@@ -180,6 +236,8 @@ export function writePulledAppSettings(configDir, settings, options = {}) {
  * `name` re-enters, so every post-cross-app rename would report `both-changed`.
  */
 export function appSettingsNameExcluded(input) {
+    if (input.localEnvironment)
+        return true;
     if (input.isCrossAppPush)
         return true;
     if (input.recordedExcludedName === undefined)
@@ -210,8 +268,9 @@ function sameStatedName(fileName, recorded) {
     return false;
 }
 /** `appSettingsNameExcluded` for a caller holding the loaded state (diff). */
-export function appSettingsNameExcludedForState(state, appId, tomlData) {
+export function appSettingsNameExcludedForState(state, appId, tomlData, localEnvironment = false) {
     return appSettingsNameExcluded({
+        localEnvironment,
         isCrossAppPush: !!(state && state.appId !== appId),
         recordedExcludedName: state?.entities?.app?.excludedName,
         fileName: tomlData?.app?.name,
@@ -285,12 +344,14 @@ export async function diffAppSettings(client, appId, configDir, options = {}) {
         // out too — otherwise a malformed local `name` would abort diff on a file
         // push would accept and ignore, and the target's own name would report as a
         // difference push has no intention of applying.
-        const state = loadSyncState(configDir);
-        const excludeName = appSettingsNameExcludedForState(state, appId, tomlData);
+        const state = loadSyncState();
+        const localEnvironment = requireCurrentEnvironment().local;
+        const excludeName = appSettingsNameExcludedForState(state, appId, tomlData, localEnvironment);
         // ONE validator with push (#2880 criterion 1): whole-truth payload, so a
         // missing required key is an error here exactly as it is there.
         const { settings: local, errors } = buildAppSettingsPayload(tomlData, {
             excludeName,
+            nameOptional: localEnvironment,
         });
         // A file with validation errors is unpushable, so diff must not present its
         // surviving values as clean (or as a partial diff) — that would advertise

package/dist/src/commands/sync-app-settings.js.map

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

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

@@ -2,6 +2,7 @@ import { Command } from "commander";
 import { ApiClient } from "../lib/api-client.js";
 import { type OperationFormHints } from "../lib/toml-database-config.js";
 import { type FieldForm } from "../lib/toml-native-form.js";
+import { type PullWriteTally } from "../lib/pull-write.js";
 import { type PushMode } from "../lib/config-payload.js";
 import { type ConfigObjectSurface, type ConfigTable } from "../lib/generated-config-surfaces.js";
 import { type PromptKind } from "../lib/generated-config-surfaces.js";
@@ -177,6 +178,17 @@ export declare function hashWorkflowTomlForDiff(parsed: any, resolvedKey?: strin
 export declare function hashRemoteWorkflowForDiff(workflow: any, draft: any, configs: any[], logger?: (message: string) => void, options?: {
     compareActivation?: boolean;
 }): string;
+/**
+ * Whether a workflow file already describes the workflow `remoteToml`
+ * serializes (#4160), by `config diff`'s comparison: the normalized hash, with
+ * activation compared only when the file names a configuration.
+ *
+ * Three shapes never match, because pull has work to do on them: a file with
+ * `[[include]]` fragments (`reconcileWorkflowIncludes` owns those), one still
+ * carrying the retired inline `[[configs]]` list, and any other file push
+ * refuses (`pullMustRewrite`).
+ */
+export declare function sameWorkflowAs(workflowKey: string, remoteToml: string): (localContent: string) => boolean;
 export interface ParsedAuthSettings {
     settings: Record<string, any>;
     warnings: string[];
@@ -670,14 +682,34 @@ export declare function serializeCronTrigger(trigger: any, logger?: (message: st
 export declare function buildCronTriggerPushPayload(key: string, tomlData: any, { mode }?: {
     mode?: PushMode;
 }): Record<string, any>;
-export declare function serializeBlobBucket(bucket: any, logger?: (message: string) => void): string;
+export declare function serializeBlobBucket(bucket: any, ruleSetIdToName?: Map<string, string>, logger?: (message: string) => void): string;
+/**
+ * The entity a `blob-buckets/<key>.toml` describes (#4116) — the parse
+ * `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.
+ *
+ * An omitted `name` stays omitted: the update leaves the server's name alone,
+ * and only the create body falls back to the key.
+ */
+export declare function parseBlobBucketToml(doc: any): any;
+/**
+ * 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 declare function blobBucketDeprecatedKeyWarning(filePath: string, tomlData: any): string | null;
+/** A bucket file's own refusals, decided from the file alone (#4116). */
+export declare function blobBucketFileErrors(filePath: string, tomlData: any): string[];
 /**
  * Build the PATCH payload for a blob-bucket update from local TOML.
  *
  * EXACT extraction of the inline builder shared by the existing-update and
  * 409-adopt branches — do NOT "clean up" the truthiness checks on the access
- * model. The server treats `preset` and `accessPolicy` as mutually exclusive,
- * only clears `ruleSetId` when a preset/accessPolicy is also present, and
+ * model. The server treats `preset` and `ruleSetId` as mutually exclusive,
+ * only clears `ruleSetId` when a preset is also present, and
  * refuses to leave a bucket with no access model or a blank name — so those
  * fields are not clearable. `bucketKey` and `ttlTier` are immutable and never
  * sent. Both call sites must go through this helper so their field sets never
@@ -726,7 +758,8 @@ export declare function promptConfigPayload(tomlConfig: any, options?: {
     create?: boolean;
 }): Record<string, any>;
 /**
- * Build the POST body for a blob-bucket create from local TOML.
+ * Build the POST body for a blob-bucket create from the parsed entity
+ * (`parseBlobBucketToml`, its rule set resolved).
  *
  * `ttlTier` is here and absent from the update body because the definition says
  * so (`writableOn: ["create"]`) — the retention tier is fixed at creation.
@@ -926,6 +959,11 @@ export declare function runConfigPushPreflight(input: {
     syncState: SyncState | null;
     force: boolean;
     isCrossAppPush: boolean;
+    /**
+     * The environment is machine-local (#4117): `[app].name` is the shared
+     * tree's, never this app's, so it is out of the validated body.
+     */
+    localEnvironment?: boolean;
     client: Pick<ApiClient, "listIntegrations" | "listFunctions">;
 }): Promise<{
     parsedVars: Record<string, unknown> | null;
@@ -1013,13 +1051,23 @@ export declare function promptKindImmutableOutcome(storedKind: PromptKind | unde
     action: "immutable";
 }> | null;
 /**
- * The one deprecation notice a prompt file using the FLAT chat spelling earns
- * — #3626 §4, beside the `celContextAccess` notice's precedent.
+ * The file-decidable refusals `config push` gives one config file — the
+ * per-file body of `collectConfigFileValidationErrors`, shared with `config
+ * pull` (#4160), which never keeps a local file push would refuse.
  *
- * Advisory: the push continues and the keys are applied. `null` when the file
- * is already written in the grouped spelling, so a migrated tree is silent.
+ * `tables` are the tables whose unrecognized keys are checked here (none for a
+ * workflow, whose own validator owns that message); declared types run over
+ * every table of the surface.
+ */
+export declare function configFileValidationMessages(filePath: string, tomlData: any, surface: ConfigObjectSurface, tables: readonly ConfigTable[]): string[];
+/**
+ * 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.
  */
-export declare function promptFlatChatKeyWarning(filePath: string, tomlData: any): string | null;
+export declare function pullMustRewrite(label: string, tomlData: any): boolean;
 export declare function collectConfigFileValidationErrors(configDir: string): ConfigFileValidationError[];
 /**
  * Every `functions/<key>.toml` whose file-decidable errors `config push` would
@@ -1524,6 +1572,21 @@ export declare function projectConfigPair(spec: ConfigDiffSpec, localParsed: any
     local: Record<string, any>;
     remote: Record<string, any>;
 };
+/**
+ * One `config diff` row's verdict once both sides exist (#4116, DSO-4116-003).
+ *
+ * A type whose files name a rule set cannot be compared without the app's
+ * rule-set listing: an unresolvable reference would read as a difference that
+ * is not there. So when the listing failed the row says so rather than
+ * comparing; otherwise `compare` decides.
+ */
+export declare function configDiffRowVerdict(parsed: any, remote: any, compare: (parsed: any, remote: any) => {
+    status: string;
+    hint?: string;
+}, contentComparable: boolean): {
+    status: string;
+    hint?: string;
+};
 /**
  * One `config diff` row's content verdict for a registered type (#2880).
  *
@@ -1986,6 +2049,33 @@ export declare function countAppliedChanges(input: {
  * than taking the command down.
  */
 export declare function configSemanticHash(label: string, filePath: string, maps: ConfigDiffMaps): string | undefined;
+/**
+ * Whether a local config file says what the file `config pull` would write
+ * says (#4160) — the definition-projected field set `config diff` compares, so
+ * a file diff calls Synced keeps its comments, key order and explicit defaults
+ * through a pull.
+ *
+ * Both sides go through the same projection with the same context, so
+ * `extra` is the context a reference is read through (a test case's lookups),
+ * never server-only rows. As in diff, the file is paired by the identity it
+ * states (or `filePath`'s name), and the fields it leaves unmanaged take the
+ * server's values — so a kept file's baseline is the server's projection
+ * (`pulledSemanticHash`), never the file's own.
+ */
+export declare function sameConfigAs(label: string, serverContent: string, filePath: string, maps: ConfigDiffMaps, extra?: any): (localContent: string) => boolean;
+/**
+ * The semantic baseline `config pull` stamps for a config file (#4160): the
+ * projection of what the server serializes, whether the file was written or
+ * kept. A kept file can leave unmanaged fields or its identity to the server,
+ * so hashing it would record a baseline the server never had.
+ */
+export declare function pulledSemanticHash(label: string, serverContent: string, maps: ConfigDiffMaps): string | undefined;
+/**
+ * Whether a local TOML file parses to the same document as `serverContent`
+ * (#4160): the comparison for `vars.toml`, which has no field definition
+ * behind it, so only comments, key order and spelling are free.
+ */
+export declare function sameTomlAs(serverContent: string): (localContent: string) => boolean;
 /**
  * The sync state `config push` writes into (#2731 B6, closing #2374).
  *
@@ -2101,11 +2191,40 @@ export interface TestCaseLookupMaps {
     configIdToName: Map<string, string>;
     promptIdToKey: Map<string, string>;
 }
+/**
+ * A test-case reference the id→name lookups could not name (#3998): the TOML
+ * key it is authored under, the wire field it is stored in, and the raw id.
+ */
+export interface TestCaseUnresolvedReference {
+    tomlKey: "configName" | "evaluatorPromptKey" | "evaluatorConfigName";
+    field: "configId" | "evaluatorPromptId" | "evaluatorConfigId";
+    id: string;
+}
+/**
+ * The sidecar `config pull` writes for one server record. It never emits an id
+ * key (#3998): a reference the lookups cannot name is written as an empty name
+ * and reported through `onUnresolved`, and `pullTestCasesForBlock` declines to
+ * write such a case rather than unpin it on disk.
+ */
 export declare function serializeTestCase(testCase: any, lookupMaps?: TestCaseLookupMaps, options?: {
     /** The sidecar path the warning names, e.g. `prompts/greet.tests/a.toml`. */
     file?: string;
     logger?: (message: string) => void;
+    /** Called with the references the lookups could not name, when any. */
+    onUnresolved?: (references: TestCaseUnresolvedReference[]) => void;
 }): string;
+/**
+ * The rendering of a server record that the comparison parses (#3998) — never
+ * written to disk.
+ *
+ * It differs from the file pull writes in one place: a reference the lookups
+ * cannot name carries its raw id in the NAME slot. A live case pinned to a
+ * deleted or unlistable configuration must stay a difference against an
+ * unpinned file; projecting it as "no reference" would read the pair as Synced,
+ * and the next content edit would push `configId: null` and clear the pin in
+ * silence.
+ */
+export declare function serializeTestCaseForComparison(testCase: any, lookupMaps?: TestCaseLookupMaps): string;
 export declare function parseTestCaseToml(tomlData: any): any;
 /**
  * Pull server-side `Script` rows into `transforms/*.rhai` and record
@@ -2143,7 +2262,9 @@ export declare function pullScripts(client: ApiClient, appId: string, configDir:
  * `config pull --only` (issue #2645): which transform names this pull may
  * write. Defaults to every one the server lists.
  */
-selects?: (name: string) => boolean): Promise<{
+selects?: (name: string) => boolean, 
+/** Counts each transform as written or left unchanged (#4160). */
+writes?: PullWriteTally): Promise<{
     scriptEntities: Record<string, {
         id: string;
         modifiedAt: string;
@@ -2232,7 +2353,9 @@ export declare function pushedFunctionBaseline(input: {
  * normalizes outside the tree, and the refusals are reported rather than
  * swallowed.
  */
-export declare function pullFunctions(client: ApiClient, appId: string, configDir: string, logger?: (msg: string) => void, selects?: (key: string) => boolean): Promise<{
+export declare function pullFunctions(client: ApiClient, appId: string, configDir: string, logger?: (msg: string) => void, selects?: (key: string) => boolean, 
+/** Counts each function file as written or left unchanged (#4160). */
+writes?: PullWriteTally): Promise<{
     functionEntities: Record<string, {
         id: string;
         modifiedAt: string;
@@ -2255,12 +2378,55 @@ export declare function pullFunctions(client: ApiClient, appId: string, configDi
      */
     items: any[];
 }>;
+/**
+ * A listed test case `config pull` did NOT write, because a reference could not
+ * be named (#3998). Its existing sidecar files (`preservedSlugs`, those still
+ * on disk) and its prior sync-state records were kept as they were.
+ */
+export interface TestCaseUnwritten {
+    blockType: TestBlockType;
+    blockKey: string;
+    /** The file name the case would be written to now. */
+    slug: string;
+    name: string;
+    testCaseId: string;
+    references: TestCaseUnresolvedReference[];
+    preservedSlugs: string[];
+}
+/**
+ * The id→name lookups `config pull` writes test-case references through
+ * (#3998).
+ *
+ * The prompt half is built from EVERY prompt's detail — the pull fetches them
+ * all before `--only` filters the list — so a judge prompt outside the
+ * selection still names. Configurations come from the pulled blocks (a case
+ * pins one of its own block's) and from every prompt (a judge's config is the
+ * judge prompt's). An entry without both an id and a name is skipped.
+ */
+export declare function testCaseLookupMapsForPull(input: {
+    prompts: ReadonlyArray<{
+        promptId?: string;
+        promptKey?: string;
+        configs?: ReadonlyArray<{
+            configId?: string;
+            configName?: string;
+        }> | null;
+    }>;
+    configs: ReadonlyArray<{
+        configId?: string;
+        configName?: string;
+    }>;
+}): TestCaseLookupMaps;
 /** The outcome of one block's test-case pull (#2769). */
 export type TestCasePullOutcome = 
-/** The listing succeeded; `count` cases were written and stale files removed. */
+/**
+ * The listing succeeded; `count` cases were written and stale files removed.
+ * `unwritten` are the listed cases skipped for an unresolvable reference.
+ */
 {
     ok: true;
     count: number;
+    unwritten: TestCaseUnwritten[];
 }
 /** The listing failed: nothing was written, and the caller preserves state. */
  | {
@@ -2311,6 +2477,8 @@ export declare function pullTestCasesForBlock(params: {
     priorTestCaseEntities?: Record<string, any>;
     lookupMaps?: TestCaseLookupMaps;
     logger?: (message: string) => void;
+    /** Counts each case file as written or left unchanged (#4160). */
+    writes?: PullWriteTally;
 }): Promise<TestCasePullOutcome>;
 /**
  * One pull leg: every block of a type the pull selected (#2769).
@@ -2333,9 +2501,12 @@ export declare function pullTestCasesForBlocks(params: {
     priorTestCaseEntities?: Record<string, any>;
     lookupMaps?: TestCaseLookupMaps;
     logger?: (message: string) => void;
+    /** Counts each case file as written or left unchanged (#4160). */
+    writes?: PullWriteTally;
 }): Promise<{
     count: number;
     skippedBlocks: string[];
+    unwritten: TestCaseUnwritten[];
 }>;
 interface PushResolutionMaps {
     promptKeyToId: Map<string, string>;