primitive-admin 1.2.0-alpha.1 → 1.2.0-alpha.11

package/dist/src/lib/sync-selectors.js

@@ -201,8 +201,12 @@ export function trackedSelectorKeys(syncState, options) {
  * retire one tracked key — the operator had to restore the TOML, which prune
  * would then decline to consider, or drop `--only` and push the whole tree.
  * Callers that pass no `tracked` keep the local-files-only meaning.
+ *
+ * `varsOverridePath` is the selected machine-local environment's
+ * `vars.<name>.override.toml` (#4485): a key either file declares is matched,
+ * and either file existing is "the file exists" for a tracked key.
  */
-export function unmatchedSelectors(selection, configDir, tracked) {
+export function unmatchedSelectors(selection, configDir, tracked, varsOverridePath) {
     const missing = [];
     for (const [label, keys] of selection.entityKeys) {
         const descriptor = getConfigObjectDescriptor(label);
@@ -228,24 +232,30 @@ export function unmatchedSelectors(selection, configDir, tracked) {
         missing.push("app");
     }
     if (selection.varKeys.size > 0) {
-        const varsPath = join(configDir, "vars.toml");
-        // The tracked-var fallback below needs the file to exist, even though the
-        // key it matches is one the file no longer declares: push plans var writes
-        // from a PARSED `vars.toml` only (`preflightParsedVars` → `planVarsPush`),
+        const varsFiles = [join(configDir, "vars.toml"), ...(varsOverridePath ? [varsOverridePath] : [])];
+        // The tracked-var fallback below needs a var file to exist, even though the
+        // key it matches is one no file declares any more: push plans var writes
+        // from a PARSED var table only (`preflightParsedVars` → `planVarsPush`),
         // so with no file at all the deletion that would justify the selector is
-        // never planned and the push applies nothing. A missing `vars.toml` is
-        // still this check's to refuse.
-        const varsFileExists = existsSync(varsPath);
+        // never planned and the push applies nothing. No var file at all is still
+        // this check's to refuse.
+        let varsFileExists = false;
         let declared = new Set();
-        if (varsFileExists) {
+        for (const varsPath of varsFiles) {
+            if (!existsSync(varsPath))
+                continue;
+            varsFileExists = true;
             try {
-                // `vars.toml` is a FLAT root table — `API_BASE_URL = "…"`, no section.
-                declared = new Set(Object.keys(parseConfigToml(readFileSync(varsPath, "utf-8"))));
+                // A var file is a FLAT root table — `API_BASE_URL = "…"`, no section.
+                for (const key of Object.keys(parseConfigToml(readFileSync(varsPath, "utf-8")))) {
+                    declared.add(key);
+                }
             }
             catch {
-                // A malformed vars.toml is the push preflight's error to report, not
+                // A malformed var file is the push preflight's error to report, not
                 // this check's — treat it as "cannot tell" and stay quiet.
-                declared = selection.varKeys;
+                declared = new Set(selection.varKeys);
+                break;
             }
         }
         for (const key of selection.varKeys) {

package/dist/src/lib/sync-selectors.js.map

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

package/dist/src/lib/test-case-file-names.d.ts

@@ -2,11 +2,9 @@
  * What a test case's sidecar file is called (#2896).
  *
  * `config pull` writes these names, `config push` pairs files back to live
- * cases by them, `config diff` reports them, and `scripts tests` reads them to
- * tell an authored case file apart from one the server already knows (#3061).
- * They live here, in `lib/`, so all four read the SAME rule: a verb that named
- * a case's file differently from pull would either miss a file that never runs
- * or accuse one that does.
+ * cases by them, and `config diff` reports them. They live here, in `lib/`, so
+ * all three read the SAME rule: a verb that named a case's file differently
+ * from pull would either miss a file that never runs or accuse one that does.
  */
 export declare function slugifyTestCaseName(name: string): string;
 /**

package/dist/src/lib/test-case-file-names.js

@@ -2,11 +2,9 @@
  * What a test case's sidecar file is called (#2896).
  *
  * `config pull` writes these names, `config push` pairs files back to live
- * cases by them, `config diff` reports them, and `scripts tests` reads them to
- * tell an authored case file apart from one the server already knows (#3061).
- * They live here, in `lib/`, so all four read the SAME rule: a verb that named
- * a case's file differently from pull would either miss a file that never runs
- * or accuse one that does.
+ * cases by them, and `config diff` reports them. They live here, in `lib/`, so
+ * all three read the SAME rule: a verb that named a case's file differently
+ * from pull would either miss a file that never runs or accuse one that does.
  */
 import { normalizeTestCaseKey, testCaseKeyError } from "./test-case-keys.js";
 // Test case helpers (exported for unit testing)

package/dist/src/lib/test-case-file-names.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-case-file-names.js","sourceRoot":"","sources":["../../../src/lib/test-case-file-names.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,gDAAgD;AAChD,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAI;SACR,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;WACrB,MAAM,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAY,EACZ,SAAsB,EACtB,SAAmC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;IAEjD,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACjB,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,KAAK,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;IACtC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAAgB,EAChB,aAAmD,EACnD,UAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAe,CAAC;IACrC,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,OAAO,IAAI,EAAE,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,sEAAsE;QACtE,0EAA0E;QAC1E,iCAAiC;QACjC,MAAM,MAAM,GACV,gBAAgB,CAAC,GAAG,CAAC;YACrB,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC7B,CAAC,CAAC,kBAAkB,GAAG,gCAAgC;gBACvD,CAAC,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,MAAM,EAAE,CAAC;YACX,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,KAAK,CAAC,GAAG,CACP,IAAI,EACJ,qBAAqB,CACnB,mBAAmB,CAAC,IAAI,EAAE,IAAI,IAAI,SAAS,CAAC,EAC5C,IAAI,EACJ,MAAM,CACP,CACF,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"test-case-file-names.js","sourceRoot":"","sources":["../../../src/lib/test-case-file-names.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,gDAAgD;AAChD,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAI;SACR,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;WACrB,MAAM,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAY,EACZ,SAAsB,EACtB,SAAmC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;IAEjD,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACjB,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,KAAK,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;IACtC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAAgB,EAChB,aAAmD,EACnD,UAAsC;IAEtC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAe,CAAC;IACrC,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,OAAO,IAAI,EAAE,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,sEAAsE;QACtE,0EAA0E;QAC1E,iCAAiC;QACjC,MAAM,MAAM,GACV,gBAAgB,CAAC,GAAG,CAAC;YACrB,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC7B,CAAC,CAAC,kBAAkB,GAAG,gCAAgC;gBACvD,CAAC,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,MAAM,EAAE,CAAC;YACX,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,KAAK,CAAC,GAAG,CACP,IAAI,EACJ,qBAAqB,CACnB,mBAAmB,CAAC,IAAI,EAAE,IAAI,IAAI,SAAS,CAAC,EAC5C,IAAI,EACJ,MAAM,CACP,CACF,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/src/lib/toml-database-config.d.ts

@@ -1,84 +1,24 @@
 /**
- * Helpers for emitting `DatabaseTypeOperation` configs as native TOML.
+ * The database type config file's TOML builder, and the readers of the
+ * `[[operations]]` / `[[subscriptions]]` row shapes the database codegen still
+ * renders.
  *
- * Background (issue #752): historically `config pull` serialized
- * `definition` and `params` as JSON strings stuffed into a single TOML
- * field, which produced unreviewable 800-char one-liners. This module
- * lets us emit them as nested TOML tables when they're representable,
- * while preserving the existing file's shape so we don't generate
- * surprise diffs.
- *
- * Three responsibilities:
- *   1. `detectExistingOperationForms()` — read the raw TOML source and
- *      decide, per operation name, whether the file uses JSON-string
- *      form ("legacy") or nested-table form ("native") for each of
- *      `definition` and `params`. This drives form preservation on
- *      `config pull`.
- *   2. `canEmitNative()` — recursively check whether a JS value can be
- *      represented in TOML **without data loss**. Returns a reason string
- *      if not. Catches `null`/`undefined` (and arrays containing `null`),
- *      which every TOML serializer silently drops on write. Heterogeneous
- *      arrays are fine — the config round-trip uses `smol-toml` (TOML 1.0),
- *      which emits and re-parses them faithfully (issue #1450).
- *   3. `buildDatabaseTypeTomlData()` — builds the JS object that we
- *      hand to `stringifyConfigToml`. Per operation, decides JSON-string vs
- *      native based on (existing form, can-emit, override mode).
- */
-import { type FieldForm } from "./toml-native-form.js";
-export { type FieldForm, classifyInlineFieldForm, canEmitNative, } from "./toml-native-form.js";
-export interface OperationFormHints {
-    /** Map of op name → existing form for `definition`. Missing op = "default". */
-    definition: Map<string, FieldForm>;
-    /** Map of op name → existing form for `params`. Missing op = "default". */
-    params: Map<string, FieldForm>;
-}
-/**
- * Inspect the raw TOML source for a database-type file and decide which
- * form each operation's `definition`/`params` currently use.
- *
- * Detection is intentionally simple: we walk `[[operations]]` blocks in
- * source order and, for each one, look for either a `definition = '...'`
- * line (legacy) or an `[operations.definition]` / `[operations.definition.X]`
- * sub-header (native).
- */
-export declare function detectExistingOperationForms(rawToml: string): OperationFormHints;
-/**
- * Normalize a `params` value into a sorted array of
- * `{ name, type, required, ... }` rows, suitable for emitting as
- * `[[operations.params]]`. Accepts both shapes the wire/parser supports:
- *   - object form: `{ projectId: { type: "string", required: true } }`
- *   - array form:  `[{ name: "projectId", type: "string", required: true }]`
+ * #3189 — `config push`, `pull` and `diff` no longer read or write
+ * `[[operations]]` or `[[subscriptions]]`: both retired with database
+ * operations and type-scoped subscriptions, and a file carrying either is
+ * refused by name. `normalizeOperationFromToml` and
+ * `normalizeSubscriptionFromToml` stay only for the database IR
+ * (`db-codegen/dbTypeIR.ts`), which still reads a stale file's tables when it
+ * resolves its records.
  */
-export declare function normalizeParamsToArray(params: any): any[] | null;
-export interface BuildOptions {
-    /** Per-op form hints derived from `detectExistingOperationForms`. */
-    hints?: OperationFormHints;
-    /**
-     * Override the default form for ops with no hint. Used by `config pull`
-     * to keep behavior backwards-compatible if we ever flip the default,
-     * and by `config migrate-toml` to force native everywhere.
-     */
-    defaultForm?: FieldForm;
-    /** Sink for human-readable fallback messages. */
-    logger?: (message: string) => void;
-    /**
-     * Server `DatabaseTypeSubscription` rows to emit as `[[subscriptions]]`
-     * blocks (issue #803). Already sanitized by the controller's
-     * `sanitizeSubscription` (so `select`/`emit` are arrays and `params` is an
-     * object). Omitted on the `migrate-toml` path (no subscriptions to merge).
-     */
-    subscriptions?: any[];
-}
+import { DATABASE_TYPE_TABLE } from "./config-surface.js";
 /**
  * Build the JS object to pass to `stringifyConfigToml` for a database-type
- * config file. Per operation:
- *   - If the chosen form is "native" AND `definition` is TOML-emittable,
- *     emit `[operations.definition]` (nested table).
- *   - Else emit `definition = '<json string>'` and log a message.
- *   - Same logic independently for `params`, but the native form for
- *     params is `[[operations.params]]` (array-of-tables).
+ * config file: the `[type]` table, `[triggers]`, the `[models.*]` blocks and
+ * the declared-access manifest. #3189 — `[[operations]]` and
+ * `[[subscriptions]]` are retired and never written.
  */
-export declare function buildDatabaseTypeTomlData(typeConfig: any, operations: any[], ruleSetIdToName: Map<string, string>, options?: BuildOptions): any;
+export declare function buildDatabaseTypeTomlData(typeConfig: any, ruleSetIdToName: Map<string, string>, table?: typeof DATABASE_TYPE_TABLE): any;
 /**
  * Thrown when a `[[subscriptions]]` block declares both `accessRule` and
  * `access` with different values. We never silently drop the field

package/dist/src/lib/toml-database-config.js

@@ -1,180 +1,29 @@
 /**
- * Helpers for emitting `DatabaseTypeOperation` configs as native TOML.
+ * The database type config file's TOML builder, and the readers of the
+ * `[[operations]]` / `[[subscriptions]]` row shapes the database codegen still
+ * renders.
  *
- * Background (issue #752): historically `config pull` serialized
- * `definition` and `params` as JSON strings stuffed into a single TOML
- * field, which produced unreviewable 800-char one-liners. This module
- * lets us emit them as nested TOML tables when they're representable,
- * while preserving the existing file's shape so we don't generate
- * surprise diffs.
- *
- * Three responsibilities:
- *   1. `detectExistingOperationForms()` — read the raw TOML source and
- *      decide, per operation name, whether the file uses JSON-string
- *      form ("legacy") or nested-table form ("native") for each of
- *      `definition` and `params`. This drives form preservation on
- *      `config pull`.
- *   2. `canEmitNative()` — recursively check whether a JS value can be
- *      represented in TOML **without data loss**. Returns a reason string
- *      if not. Catches `null`/`undefined` (and arrays containing `null`),
- *      which every TOML serializer silently drops on write. Heterogeneous
- *      arrays are fine — the config round-trip uses `smol-toml` (TOML 1.0),
- *      which emits and re-parses them faithfully (issue #1450).
- *   3. `buildDatabaseTypeTomlData()` — builds the JS object that we
- *      hand to `stringifyConfigToml`. Per operation, decides JSON-string vs
- *      native based on (existing form, can-emit, override mode).
+ * #3189 — `config push`, `pull` and `diff` no longer read or write
+ * `[[operations]]` or `[[subscriptions]]`: both retired with database
+ * operations and type-scoped subscriptions, and a file carrying either is
+ * refused by name. `normalizeOperationFromToml` and
+ * `normalizeSubscriptionFromToml` stay only for the database IR
+ * (`db-codegen/dbTypeIR.ts`), which still reads a stale file's tables when it
+ * resolves its records.
  */
 import { parseConfigToml } from "./config-toml.js";
 import { serializeDeclaredAccessManifest } from "./toml-metadata-config.js";
 import { DATABASE_TYPE_TABLE } from "./config-surface.js";
 import { projectRecordToToml } from "./config-payload.js";
-import { classifyInlineFieldForm, canEmitNative, } from "./toml-native-form.js";
-// `FieldForm`, `classifyInlineFieldForm`, and `canEmitNative` moved to the
-// neutral `toml-native-form.ts` module (issue #1446) so workflow-schema
-// serialization can share them without importing a database-specific module.
-// Re-exported here so existing importers keep working.
-export { classifyInlineFieldForm, canEmitNative, } from "./toml-native-form.js";
-/**
- * Inspect the raw TOML source for a database-type file and decide which
- * form each operation's `definition`/`params` currently use.
- *
- * Detection is intentionally simple: we walk `[[operations]]` blocks in
- * source order and, for each one, look for either a `definition = '...'`
- * line (legacy) or an `[operations.definition]` / `[operations.definition.X]`
- * sub-header (native).
- */
-export function detectExistingOperationForms(rawToml) {
-    const lines = rawToml.split(/\r?\n/);
-    const operations = [];
-    let current = null;
-    // `inSubTable` flips to true the moment we descend into a sub-table of
-    // the current operation (e.g. `[operations.definition]` or
-    // `[[operations.params]]`). Once true, subsequent `name = "..."` /
-    // `definition = "..."` / `params = "..."` lines belong to the sub-table,
-    // not to the operation itself, so we must not let them overwrite the
-    // op-level fields (review feedback r3246634568).
-    let inSubTable = false;
-    for (const rawLine of lines) {
-        const line = rawLine.trim();
-        if (line === "[[operations]]") {
-            if (current)
-                operations.push(current);
-            current = { name: null, definition: null, params: null };
-            inSubTable = false;
-            continue;
-        }
-        if (!current)
-            continue;
-        // Sub-header for this op's definition or params.
-        if (/^\[operations\.definition(\..+)?\]/.test(line) || /^\[\[operations\.definition\..+\]\]/.test(line)) {
-            if (current.definition === null)
-                current.definition = "native";
-            inSubTable = true;
-            continue;
-        }
-        if (/^\[\[operations\.params\]\]/.test(line) || /^\[operations\.params(\..+)?\]/.test(line)) {
-            if (current.params === null)
-                current.params = "native";
-            inSubTable = true;
-            continue;
-        }
-        // A new top-level array-of-tables block ends the operation's scope
-        // for our purposes. We don't fully parse TOML here; we just stop
-        // ascribing later lines to this op.
-        if (/^\[\[/.test(line) && !line.startsWith("[[operations.")) {
-            operations.push(current);
-            current = null;
-            inSubTable = false;
-            continue;
-        }
-        if (/^\[/.test(line) && !line.startsWith("[operations.")) {
-            operations.push(current);
-            current = null;
-            inSubTable = false;
-            continue;
-        }
-        // Op-level fields. Skip if we've already descended into a sub-table —
-        // a `name = "id"` inside `[[operations.params]]` belongs to the param,
-        // not to the operation. Same for any other key we recognize here.
-        if (inSubTable)
-            continue;
-        const m = line.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/);
-        if (!m)
-            continue;
-        const key = m[1];
-        const value = m[2];
-        if (key === "name") {
-            const nameMatch = value.match(/^["'](.+)["']\s*$/);
-            if (nameMatch)
-                current.name = nameMatch[1];
-        }
-        else if (key === "definition" && current.definition === null) {
-            // Distinguish the inline-table form (`definition = { ... }`) from the
-            // legacy JSON-string form (`definition = '...'`) so an inline author
-            // round-trips through native emission, not back to a JSON string
-            // (issue #1255).
-            current.definition = classifyInlineFieldForm(value);
-        }
-        else if (key === "params" && current.params === null) {
-            current.params = classifyInlineFieldForm(value);
-        }
-    }
-    if (current)
-        operations.push(current);
-    const definition = new Map();
-    const params = new Map();
-    for (const op of operations) {
-        if (!op.name)
-            continue;
-        if (op.definition)
-            definition.set(op.name, op.definition);
-        if (op.params)
-            params.set(op.name, op.params);
-    }
-    return { definition, params };
-}
-/**
- * Normalize a `params` value into a sorted array of
- * `{ name, type, required, ... }` rows, suitable for emitting as
- * `[[operations.params]]`. Accepts both shapes the wire/parser supports:
- *   - object form: `{ projectId: { type: "string", required: true } }`
- *   - array form:  `[{ name: "projectId", type: "string", required: true }]`
- */
-export function normalizeParamsToArray(params) {
-    if (params == null)
-        return null;
-    if (Array.isArray(params)) {
-        return params
-            .map((p) => ({ ...p }))
-            .filter((p) => p && typeof p === "object");
-    }
-    if (typeof params === "object") {
-        return Object.entries(params).map(([name, spec]) => ({
-            name,
-            ...(spec && typeof spec === "object" ? spec : {}),
-        }));
-    }
-    return null;
-}
-/**
- * Default form for a new operation (no existing form hint): native.
- * That matches the issue's "new file from server → native by default"
- * requirement.
- */
-const DEFAULT_FORM = "native";
 /**
  * Build the JS object to pass to `stringifyConfigToml` for a database-type
- * config file. Per operation:
- *   - If the chosen form is "native" AND `definition` is TOML-emittable,
- *     emit `[operations.definition]` (nested table).
- *   - Else emit `definition = '<json string>'` and log a message.
- *   - Same logic independently for `params`, but the native form for
- *     params is `[[operations.params]]` (array-of-tables).
+ * config file: the `[type]` table, `[triggers]`, the `[models.*]` blocks and
+ * the declared-access manifest. #3189 — `[[operations]]` and
+ * `[[subscriptions]]` are retired and never written.
  */
-export function buildDatabaseTypeTomlData(typeConfig, operations, ruleSetIdToName, options = {}) {
-    const hints = options.hints;
-    const defaultForm = options.defaultForm ?? DEFAULT_FORM;
-    const log = options.logger ?? (() => { });
+export function buildDatabaseTypeTomlData(typeConfig, ruleSetIdToName, 
+// #4802 — a db3 type file's `[type]` table names the type `name`.
+table = DATABASE_TYPE_TABLE) {
     // #2644 — the `[type]` key set comes from the vendored definition, so a
     // scalar added there is written with no edit here. Only the two keys whose
     // emitted VALUE is their own carry a producer:
@@ -190,7 +39,7 @@ export function buildDatabaseTypeTomlData(typeConfig, operations, ruleSetIdToNam
     //     the parsed `{ create?, update?, models? }` object, which serializes 1:1
     //     so a pull → push cycle is idempotent.
     const data = {
-        type: projectRecordToToml(DATABASE_TYPE_TABLE, typeConfig, {
+        type: projectRecordToToml(table, typeConfig, {
             ruleSetId: (record) => {
                 if (record?._ruleSetName)
                     return record._ruleSetName;
@@ -221,147 +70,9 @@ export function buildDatabaseTypeTomlData(typeConfig, operations, ruleSetIdToNam
     }
     // Declared-access manifest (issue #1304, P-C): merge the top-level
     // `[metadata]` + `secrets` fragments so a pull→push→pull cycle round-trips.
-    // Emitted before the operations-only early return so a type with a manifest
-    // but no operations still writes it.
     Object.assign(data, serializeDeclaredAccessManifest(typeConfig.metadataManifest));
-    // Subscriptions (issue #803) — emitted as `[[subscriptions]]` array-of-
-    // tables, independent of operations. Built before the operations-only
-    // early return so a type with subscriptions but no operations still emits
-    // them.
-    const subscriptionRows = buildSubscriptionRows(options.subscriptions, log);
-    if (operations.length === 0) {
-        if (subscriptionRows.length > 0) {
-            data.subscriptions = subscriptionRows;
-        }
-        return data;
-    }
-    data.operations = operations.map((op) => {
-        const opRow = {
-            name: op.name,
-            type: op.type,
-            modelName: op.modelName,
-        };
-        if (op.access) {
-            opRow.access = op.access;
-        }
-        // ---- definition ----
-        const defForm = hints?.definition.get(op.name) ?? defaultForm;
-        const defValue = typeof op.definition === "string"
-            ? safeParseJson(op.definition)
-            : op.definition;
-        let definitionEmitted = false;
-        if (defForm === "native" && defValue && typeof defValue === "object") {
-            const reason = canEmitNative(defValue);
-            if (reason) {
-                log(`Operation '${op.name}': cannot emit \`definition\` as native TOML (${reason}); falling back to JSON string for this field.`);
-            }
-            else {
-                opRow.definition = defValue;
-                definitionEmitted = true;
-            }
-        }
-        if (!definitionEmitted) {
-            opRow.definition = typeof op.definition === "object"
-                ? JSON.stringify(op.definition)
-                : op.definition;
-        }
-        // ---- params ----
-        if (op.params != null) {
-            const paramsForm = hints?.params.get(op.name) ?? defaultForm;
-            let paramsEmitted = false;
-            if (paramsForm === "native") {
-                const paramsParsed = typeof op.params === "string"
-                    ? safeParseJson(op.params)
-                    : op.params;
-                const paramsArray = normalizeParamsToArray(paramsParsed);
-                if (paramsArray && paramsArray.length > 0) {
-                    const reason = canEmitNative(paramsArray);
-                    if (reason) {
-                        log(`Operation '${op.name}': cannot emit \`params\` as native TOML (${reason}); falling back to JSON string for this field.`);
-                    }
-                    else {
-                        opRow.params = paramsArray;
-                        paramsEmitted = true;
-                    }
-                }
-                else if (paramsArray && paramsArray.length === 0) {
-                    // Empty params: skip entirely rather than emitting an empty table.
-                    paramsEmitted = true;
-                }
-            }
-            if (!paramsEmitted) {
-                opRow.params = typeof op.params === "object"
-                    ? JSON.stringify(op.params)
-                    : op.params;
-            }
-        }
-        return opRow;
-    });
-    if (subscriptionRows.length > 0) {
-        data.subscriptions = subscriptionRows;
-    }
     return data;
 }
-/**
- * Build the `[[subscriptions]]` rows for a database-type TOML file from the
- * server's sanitized subscription list (issue #803).
- *
- * Emits the canonical TOML key order and uses the wire key `access` (we read
- * both `access` and `accessRule` on parse, but always emit `access` so a
- * pull → push round-trip is stable). `select` / `emit` are plain string
- * arrays; `params` is an inline object. Falls back to a JSON string for any
- * field that TOML can't represent natively (mirrors operations'
- * `definition` / `params` fallback), so an exotic `params` shape never
- * breaks serialization.
- */
-function buildSubscriptionRows(subscriptions, log) {
-    if (!Array.isArray(subscriptions) || subscriptions.length === 0)
-        return [];
-    return subscriptions.map((sub) => {
-        const row = {
-            subscriptionKey: sub.subscriptionKey,
-            displayName: sub.displayName,
-            modelName: sub.modelName,
-        };
-        if (sub.description != null && sub.description !== "") {
-            row.description = sub.description;
-        }
-        if (sub.filter != null) {
-            row.filter = sub.filter;
-        }
-        if (sub.access != null) {
-            row.access = sub.access;
-        }
-        // `select` / `emit`: server sanitizes to arrays (or null). Emit when a
-        // non-empty array is present.
-        if (Array.isArray(sub.select) && sub.select.length > 0) {
-            row.select = sub.select;
-        }
-        if (Array.isArray(sub.emit) && sub.emit.length > 0) {
-            row.emit = sub.emit;
-        }
-        // `params`: server sanitizes to an object (or {}). Emit when non-empty.
-        if (sub.params &&
-            typeof sub.params === "object" &&
-            !Array.isArray(sub.params) &&
-            Object.keys(sub.params).length > 0) {
-            const reason = canEmitNative(sub.params);
-            if (reason) {
-                log(`Subscription '${sub.subscriptionKey}': cannot emit \`params\` as native TOML (${reason}); falling back to JSON string.`);
-                row.params = JSON.stringify(sub.params);
-            }
-            else {
-                row.params = sub.params;
-            }
-        }
-        // `status`: only emit when not the default "active" so round-tripped
-        // files stay clean.
-        if (sub.status && sub.status !== "active") {
-            row.status = sub.status;
-        }
-        return row;
-    });
-}
 function safeParseJson(s) {
     try {
         return JSON.parse(s);