primitive-admin 1.3.0-alpha.1 → 1.3.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/commands/admins.js +91 -0
- package/dist/src/commands/admins.js.map +1 -1
- package/dist/src/commands/auth-passkeys.d.ts +7 -0
- package/dist/src/commands/auth-passkeys.js +99 -0
- package/dist/src/commands/auth-passkeys.js.map +1 -0
- package/dist/src/commands/auth-sessions.js +7 -28
- package/dist/src/commands/auth-sessions.js.map +1 -1
- package/dist/src/commands/sync-app-settings.d.ts +88 -1
- package/dist/src/commands/sync-app-settings.js +224 -8
- package/dist/src/commands/sync-app-settings.js.map +1 -1
- package/dist/src/commands/sync.d.ts +0 -13
- package/dist/src/commands/sync.js +144 -4
- package/dist/src/commands/sync.js.map +1 -1
- package/dist/src/lib/admin-login-tables.d.ts +31 -0
- package/dist/src/lib/admin-login-tables.js +75 -0
- package/dist/src/lib/admin-login-tables.js.map +1 -0
- package/dist/src/lib/api-client.d.ts +76 -0
- package/dist/src/lib/api-client.js +69 -0
- package/dist/src/lib/api-client.js.map +1 -1
- package/dist/src/lib/app-settings-descriptor.d.ts +29 -2
- package/dist/src/lib/app-settings-descriptor.js +68 -3
- package/dist/src/lib/app-settings-descriptor.js.map +1 -1
- package/dist/src/lib/function-authorize-check.js +5 -0
- package/dist/src/lib/function-authorize-check.js.map +1 -1
- package/dist/src/lib/function-authorize-view.js +5 -4
- package/dist/src/lib/function-authorize-view.js.map +1 -1
- package/dist/src/lib/function-collect.d.ts +6 -0
- package/dist/src/lib/function-collect.js +10 -2
- package/dist/src/lib/function-collect.js.map +1 -1
- package/dist/src/lib/function-sync.d.ts +62 -0
- package/dist/src/lib/function-sync.js +68 -1
- package/dist/src/lib/function-sync.js.map +1 -1
- package/dist/src/lib/generated-command-status.js +5 -0
- package/dist/src/lib/generated-command-status.js.map +1 -1
- package/dist/src/lib/generated-config-surfaces.d.ts +79 -4
- package/dist/src/lib/generated-config-surfaces.js +226 -8
- package/dist/src/lib/generated-config-surfaces.js.map +1 -1
- package/dist/src/lib/generated-sdk-types.d.ts +1 -1
- package/dist/src/lib/generated-sdk-types.js +1 -1
- package/dist/src/lib/generated-sdk-types.js.map +1 -1
- package/dist/src/types/index.d.ts +9 -0
- package/package.json +2 -2
|
@@ -28,7 +28,7 @@ import { existsSync, readFileSync, mkdirSync } from "fs";
|
|
|
28
28
|
import { join } from "path";
|
|
29
29
|
import { createHash } from "crypto";
|
|
30
30
|
import { parseConfigToml, stringifyConfigToml } from "../lib/config-toml.js";
|
|
31
|
-
import { APP_SETTINGS_DESCRIPTOR, APP_SETTINGS_SECTIONS, LEGACY_PROTECTED_KEY, appSettingLabel, buildAppSettingsPayload, projectAppSettingsForComparison, requestedProtectionLevel, serializeAppSettingsToToml, settingsProtectionLevel, } from "../lib/app-settings-descriptor.js";
|
|
31
|
+
import { APP_SETTINGS_DESCRIPTOR, APP_SETTINGS_SECTIONS, LEGACY_PROTECTED_KEY, appSettingLabel, buildAppSettingsPayload, projectAppSettingsForComparison, statedBackendOverrides, requestedProtectionLevel, serializeAppSettingsToToml, settingsProtectionLevel, } from "../lib/app-settings-descriptor.js";
|
|
32
32
|
import { canonicalJsonStringify } from "../lib/canonical-json.js";
|
|
33
33
|
import { loweredClientMinimums, } from "../lib/generated-config-surfaces.js";
|
|
34
34
|
import { ConfirmPromptError } from "../lib/confirm-prompt.js";
|
|
@@ -166,6 +166,146 @@ export async function confirmClientVersionLowering(input) {
|
|
|
166
166
|
}
|
|
167
167
|
return { proceed: true };
|
|
168
168
|
}
|
|
169
|
+
/**
|
|
170
|
+
* Whether this push or pull leaves the tree's backend overrides alone
|
|
171
|
+
* (#6183, intent criterion 11): a push sends none and a pull keeps the
|
|
172
|
+
* file's. True for a machine-local environment (a child app shares its
|
|
173
|
+
* parent's tree), for a push whose sync state belongs to another app, and
|
|
174
|
+
* for a sync state carrying the mark an earlier such push or pull wrote.
|
|
175
|
+
*
|
|
176
|
+
* Unlike the `[app].name` rule, nothing in the file is read: no edit to
|
|
177
|
+
* `app.toml` ends the exclusion, because an override copied into another
|
|
178
|
+
* app would make that app the home of every build made against it.
|
|
179
|
+
*/
|
|
180
|
+
export function appSettingsBackendOverridesExcluded(input) {
|
|
181
|
+
if (input.localEnvironment)
|
|
182
|
+
return { excluded: true, reason: "machine-local" };
|
|
183
|
+
if (input.isCrossAppPush || input.recorded)
|
|
184
|
+
return { excluded: true, reason: "other-app" };
|
|
185
|
+
return { excluded: false, reason: null };
|
|
186
|
+
}
|
|
187
|
+
/** `appSettingsBackendOverridesExcluded` for a caller holding the loaded state (diff). */
|
|
188
|
+
export function appSettingsBackendOverridesExcludedForState(state, appId, localEnvironment = false) {
|
|
189
|
+
return appSettingsBackendOverridesExcluded({
|
|
190
|
+
localEnvironment,
|
|
191
|
+
isCrossAppPush: !!(state && state.appId !== appId),
|
|
192
|
+
recorded: state?.backendOverridesExcluded === true,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
/** How many backend overrides a `[clients]` table states. */
|
|
196
|
+
export function countBackendOverrides(clients) {
|
|
197
|
+
let count = 0;
|
|
198
|
+
for (const list of Object.values(statedBackendOverrides(clients))) {
|
|
199
|
+
count += Array.isArray(list) ? list.length : 1;
|
|
200
|
+
}
|
|
201
|
+
return count;
|
|
202
|
+
}
|
|
203
|
+
/** The one line an excluded push prints about the overrides it did not send. */
|
|
204
|
+
export function backendOverridesNotSentLine(count, reason, environmentName) {
|
|
205
|
+
const because = reason === "machine-local"
|
|
206
|
+
? `"${environmentName}" is a machine-local environment, whose app is not the tree's own`
|
|
207
|
+
: `the sync state records that environment "${environmentName}" was pointed at ` +
|
|
208
|
+
`another app than the tree's own`;
|
|
209
|
+
return (`${count} backend override(s) in ${APP_TOML_FILENAME} not sent: ${because}, ` +
|
|
210
|
+
`and a push to such an app never sends backend overrides.`);
|
|
211
|
+
}
|
|
212
|
+
/**
|
|
213
|
+
* The confirmation a push needs before it stores a backend override whose
|
|
214
|
+
* `from` is at or below its platform's `latest` (#6183, intent criterion
|
|
215
|
+
* 12): copies already released would switch backend on their next launch.
|
|
216
|
+
*
|
|
217
|
+
* The same contract as `confirmClientVersionLowering`: one line per
|
|
218
|
+
* override naming the platform and both versions; `--yes` proceeds,
|
|
219
|
+
* `--dry-run` lists and proceeds; otherwise the developer is asked, and a
|
|
220
|
+
* decline or no terminal leaves `app.toml` unsent with a failure the push
|
|
221
|
+
* reports. Judged from the file alone, so it needs no live read.
|
|
222
|
+
*/
|
|
223
|
+
export async function confirmReleasedBackendOverrides(input) {
|
|
224
|
+
if (input.released.length === 0)
|
|
225
|
+
return { proceed: true };
|
|
226
|
+
input.print(` ${APP_TOML_FILENAME} has ${input.released.length} backend override(s) for ` +
|
|
227
|
+
`versions already released:`);
|
|
228
|
+
for (const item of input.released) {
|
|
229
|
+
input.print(` [clients.${item.platform}] backend override from ${item.from} is at or ` +
|
|
230
|
+
`below latest ${item.latest}`);
|
|
231
|
+
}
|
|
232
|
+
if (input.dryRun || input.yes)
|
|
233
|
+
return { proceed: true };
|
|
234
|
+
let proceed = false;
|
|
235
|
+
try {
|
|
236
|
+
proceed = await input.confirm("Store backend overrides for versions already released?");
|
|
237
|
+
}
|
|
238
|
+
catch (err) {
|
|
239
|
+
const reason = err instanceof ConfirmPromptError
|
|
240
|
+
? err.message
|
|
241
|
+
: err?.message ?? String(err);
|
|
242
|
+
return {
|
|
243
|
+
proceed: false,
|
|
244
|
+
failure: `${APP_TOML_FILENAME} was not applied: a backend override for a released ` +
|
|
245
|
+
`version needs confirmation. ${reason}`,
|
|
246
|
+
};
|
|
247
|
+
}
|
|
248
|
+
if (!proceed) {
|
|
249
|
+
return {
|
|
250
|
+
proceed: false,
|
|
251
|
+
failure: `${APP_TOML_FILENAME} was not applied: the backend overrides for released ` +
|
|
252
|
+
"versions were not confirmed.",
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
return { proceed: true };
|
|
256
|
+
}
|
|
257
|
+
/** A URL as compared for a target: origin and path, trailing slashes removed. */
|
|
258
|
+
function comparableTargetUrl(value) {
|
|
259
|
+
try {
|
|
260
|
+
const url = new URL(value);
|
|
261
|
+
return `${url.origin}${url.pathname}`.replace(/\/+$/, "");
|
|
262
|
+
}
|
|
263
|
+
catch {
|
|
264
|
+
return value.replace(/\/+$/, "");
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* One line per backend override a push would send (#6183, intent criterion
|
|
269
|
+
* 13): the platform, the `from`, and the committed environment in
|
|
270
|
+
* `primitive/config.json` whose app id and API URL both equal the
|
|
271
|
+
* override's target — an override with no `apiUrl` targets the server of
|
|
272
|
+
* the environment being pushed. A target no environment matches is a
|
|
273
|
+
* warning naming the app id and URL; the push goes ahead either way.
|
|
274
|
+
*/
|
|
275
|
+
export function backendOverrideTargetLines(input) {
|
|
276
|
+
const lines = [];
|
|
277
|
+
for (const [platform, list] of Object.entries(statedBackendOverrides(input.clients))) {
|
|
278
|
+
if (!Array.isArray(list))
|
|
279
|
+
continue;
|
|
280
|
+
for (const override of list) {
|
|
281
|
+
if (!override || typeof override !== "object")
|
|
282
|
+
continue;
|
|
283
|
+
const { from, appId, apiUrl } = override;
|
|
284
|
+
const targetUrl = typeof apiUrl === "string" ? apiUrl : input.currentApiUrl;
|
|
285
|
+
const wanted = comparableTargetUrl(targetUrl);
|
|
286
|
+
const matches = Object.entries(input.environments)
|
|
287
|
+
.filter(([, env]) => env?.appId === appId &&
|
|
288
|
+
typeof env.apiUrl === "string" &&
|
|
289
|
+
comparableTargetUrl(env.apiUrl) === wanted)
|
|
290
|
+
.map(([name]) => `"${name}"`);
|
|
291
|
+
const head = `[clients.${platform}] from ${String(from)}`;
|
|
292
|
+
if (matches.length > 0) {
|
|
293
|
+
lines.push({
|
|
294
|
+
level: "info",
|
|
295
|
+
text: `${head} -> environment${matches.length > 1 ? "s" : ""} ${matches.join(", ")}`,
|
|
296
|
+
});
|
|
297
|
+
}
|
|
298
|
+
else {
|
|
299
|
+
lines.push({
|
|
300
|
+
level: "warn",
|
|
301
|
+
text: `${head} -> app ${String(appId)} at ${wanted} matches no environment ` +
|
|
302
|
+
`in primitive/config.json`,
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
return lines;
|
|
308
|
+
}
|
|
169
309
|
// --- Shared single sync-state entry (entities.app) -------------------------
|
|
170
310
|
// These read and write the SAME sync-state baseline that
|
|
171
311
|
// `sync` maintains, touching only `entities.app` and preserving every other
|
|
@@ -183,17 +323,26 @@ function loadSyncState() {
|
|
|
183
323
|
}
|
|
184
324
|
}
|
|
185
325
|
// --- Display helpers -------------------------------------------------------
|
|
186
|
-
|
|
326
|
+
/**
|
|
327
|
+
* One setting's value as `apps get` and `config diff` print it. A list of
|
|
328
|
+
* tables, such as `backendOverrides` (#6183), prints each table as JSON.
|
|
329
|
+
*/
|
|
330
|
+
export function formatAppSettingValue(value) {
|
|
187
331
|
if (value === undefined)
|
|
188
332
|
return "(not set)";
|
|
189
333
|
if (value === null)
|
|
190
334
|
return "(null)";
|
|
191
|
-
if (Array.isArray(value))
|
|
192
|
-
|
|
335
|
+
if (Array.isArray(value)) {
|
|
336
|
+
if (value.length === 0)
|
|
337
|
+
return "[]";
|
|
338
|
+
const items = value.map((item) => item !== null && typeof item === "object" ? JSON.stringify(item) : String(item));
|
|
339
|
+
return `[${items.join(", ")}]`;
|
|
340
|
+
}
|
|
193
341
|
if (typeof value === "object")
|
|
194
342
|
return JSON.stringify(value);
|
|
195
343
|
return String(value);
|
|
196
344
|
}
|
|
345
|
+
const formatValue = formatAppSettingValue;
|
|
197
346
|
/**
|
|
198
347
|
* Deep equality for one setting's comparable value.
|
|
199
348
|
*
|
|
@@ -242,7 +391,15 @@ export function renderAppSettings(settings) {
|
|
|
242
391
|
if (!entry || typeof entry !== "object")
|
|
243
392
|
continue;
|
|
244
393
|
for (const key of Object.keys(entry)) {
|
|
245
|
-
|
|
394
|
+
const value = entry[key];
|
|
395
|
+
// A list of tables, `backendOverrides` (#6183): one line per table.
|
|
396
|
+
if (Array.isArray(value) &&
|
|
397
|
+
value.length > 0 &&
|
|
398
|
+
value.every((item) => item !== null && typeof item === "object")) {
|
|
399
|
+
value.forEach((item, i) => printResult(` ${key}[${i + 1}]`, JSON.stringify(item)));
|
|
400
|
+
continue;
|
|
401
|
+
}
|
|
402
|
+
printResult(` ${key}`, formatValue(value));
|
|
246
403
|
}
|
|
247
404
|
}
|
|
248
405
|
continue;
|
|
@@ -275,12 +432,12 @@ export function writePulledAppSettings(configDir, settings, options = {}) {
|
|
|
275
432
|
const stated = readStatedApp(path);
|
|
276
433
|
const statedName = options.keepStatedName ? stated?.name : undefined;
|
|
277
434
|
let content;
|
|
278
|
-
if (!options.keepStatedName) {
|
|
435
|
+
if (!options.keepStatedName && !options.keepStatedBackendOverrides) {
|
|
279
436
|
content = serializeAppSettings(settings);
|
|
280
437
|
}
|
|
281
438
|
else {
|
|
282
|
-
|
|
283
|
-
if (data.app) {
|
|
439
|
+
let data = serializeAppSettingsToToml(settings);
|
|
440
|
+
if (options.keepStatedName && data.app) {
|
|
284
441
|
if (statedName !== undefined)
|
|
285
442
|
data.app.name = statedName;
|
|
286
443
|
else
|
|
@@ -291,6 +448,9 @@ export function writePulledAppSettings(configDir, settings, options = {}) {
|
|
|
291
448
|
else
|
|
292
449
|
delete data.app.protection;
|
|
293
450
|
}
|
|
451
|
+
if (options.keepStatedBackendOverrides) {
|
|
452
|
+
data = withStatedBackendOverrides(data, readStatedClients(path));
|
|
453
|
+
}
|
|
294
454
|
content = stringifyConfigToml(data);
|
|
295
455
|
}
|
|
296
456
|
const carriesLegacyKey = !!stated && LEGACY_PROTECTED_KEY in stated;
|
|
@@ -314,6 +474,58 @@ export function writePulledAppSettings(configDir, settings, options = {}) {
|
|
|
314
474
|
: {}),
|
|
315
475
|
};
|
|
316
476
|
}
|
|
477
|
+
/**
|
|
478
|
+
* `data` (a pulled `app.toml`) with the server's backend overrides replaced
|
|
479
|
+
* by the ones `statedClients` carries (#6183). A platform the server
|
|
480
|
+
* returned only overrides for is dropped; a platform only the file has
|
|
481
|
+
* overrides for gets a table holding them. Section order is kept.
|
|
482
|
+
*/
|
|
483
|
+
function withStatedBackendOverrides(data, statedClients) {
|
|
484
|
+
const clients = {};
|
|
485
|
+
const served = data.clients && typeof data.clients === "object" ? data.clients : {};
|
|
486
|
+
for (const platform of Object.keys(served)) {
|
|
487
|
+
const entry = served[platform];
|
|
488
|
+
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
|
|
489
|
+
clients[platform] = entry;
|
|
490
|
+
continue;
|
|
491
|
+
}
|
|
492
|
+
const rest = {};
|
|
493
|
+
for (const key of Object.keys(entry)) {
|
|
494
|
+
if (key !== "backendOverrides")
|
|
495
|
+
rest[key] = entry[key];
|
|
496
|
+
}
|
|
497
|
+
if (Object.keys(rest).length > 0)
|
|
498
|
+
clients[platform] = rest;
|
|
499
|
+
}
|
|
500
|
+
for (const [platform, list] of Object.entries(statedBackendOverrides(statedClients))) {
|
|
501
|
+
clients[platform] = { ...(clients[platform] ?? {}), backendOverrides: list };
|
|
502
|
+
}
|
|
503
|
+
const out = {};
|
|
504
|
+
for (const section of APP_SETTINGS_SECTIONS) {
|
|
505
|
+
if (section === "clients") {
|
|
506
|
+
if (Object.keys(clients).length > 0)
|
|
507
|
+
out.clients = clients;
|
|
508
|
+
continue;
|
|
509
|
+
}
|
|
510
|
+
if (data[section] !== undefined)
|
|
511
|
+
out[section] = data[section];
|
|
512
|
+
}
|
|
513
|
+
return out;
|
|
514
|
+
}
|
|
515
|
+
/**
|
|
516
|
+
* The `[clients]` table an `app.toml` states, or undefined when the file is
|
|
517
|
+
* absent, unparseable or has none.
|
|
518
|
+
*/
|
|
519
|
+
function readStatedClients(path) {
|
|
520
|
+
if (!existsSync(path))
|
|
521
|
+
return undefined;
|
|
522
|
+
try {
|
|
523
|
+
return parseConfigToml(readFileSync(path, "utf-8"))?.clients;
|
|
524
|
+
}
|
|
525
|
+
catch {
|
|
526
|
+
return undefined;
|
|
527
|
+
}
|
|
528
|
+
}
|
|
317
529
|
/**
|
|
318
530
|
* Whether an `app.toml`'s text states the same settings as `serverContent`
|
|
319
531
|
* (#4160) — the payload push builds from each, hashed the way `config diff`
|
|
@@ -491,6 +703,10 @@ export async function diffAppSettings(client, appId, configDir, options = {}) {
|
|
|
491
703
|
excludeName,
|
|
492
704
|
nameOptional: localEnvironment,
|
|
493
705
|
excludeProtection: localEnvironment,
|
|
706
|
+
// #6183 — the backend overrides push would leave out, and the app an
|
|
707
|
+
// override may not name, as push reads them.
|
|
708
|
+
excludeBackendOverrides: appSettingsBackendOverridesExcludedForState(state, appId, localEnvironment).excluded,
|
|
709
|
+
ownAppId: appId,
|
|
494
710
|
});
|
|
495
711
|
// A file with validation errors is unpushable, so diff must not present its
|
|
496
712
|
// surviving values as clean (or as a partial diff) — that would advertise
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-app-settings.js","sourceRoot":"","sources":["../../../src/commands/sync-app-settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sync-app-settings.js","sourceRoot":"","sources":["../../../src/commands/sync-app-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -2201,19 +2201,6 @@ export declare function pulledSemanticHash(label: string, serverContent: string,
|
|
|
2201
2201
|
* behind it, so only comments, key order and spelling are free.
|
|
2202
2202
|
*/
|
|
2203
2203
|
export declare function sameTomlAs(serverContent: string): (localContent: string) => boolean;
|
|
2204
|
-
/**
|
|
2205
|
-
* The sync state `config push` writes into (#2731 B6, closing #2374).
|
|
2206
|
-
*
|
|
2207
|
-
* `loadSyncState` answers `null` for an absent sync-state baseline, and
|
|
2208
|
-
* every per-entity state write in the push loops is guarded by `if (syncState)`
|
|
2209
|
-
* — so a first push created every resource and recorded none of them. The next
|
|
2210
|
-
* push then re-entered the create path for everything and depended on 409
|
|
2211
|
-
* adoption to recover, which for database types hard-failed on operations.
|
|
2212
|
-
*
|
|
2213
|
-
* Building the state up front (the same shape the cross-app-push branch
|
|
2214
|
-
* already builds) makes those guards hold from the first run, so the
|
|
2215
|
-
* end-of-push and catch-path saves persist what the push actually did.
|
|
2216
|
-
*/
|
|
2217
2204
|
export declare function ensurePushSyncState(existing: SyncState | null, appId: string, serverUrl: string): SyncState;
|
|
2218
2205
|
/**
|
|
2219
2206
|
* `parseTomlFile`, or null for a file whose field table does not compile
|
|
@@ -13,7 +13,7 @@ import { serializeJsonField } from "../lib/config-json-field.js";
|
|
|
13
13
|
import { parseMetadataCategoryToml, validateMetadataCategoryConfig, serializeMetadataCategoryConfig, parseDeclaredAccessManifestToml, validateDeclaredAccessManifest, } from "../lib/toml-metadata-config.js";
|
|
14
14
|
import { getCurrentAppId, getServerUrl, loadCredentials } from "../lib/config.js";
|
|
15
15
|
import { sessionHoldsScope, tokenReachesScope, } from "../lib/session-scope.js";
|
|
16
|
-
import { requireCurrentEnvironment } from "../lib/env-resolver.js";
|
|
16
|
+
import { getProjectConfig, requireCurrentEnvironment } from "../lib/env-resolver.js";
|
|
17
17
|
import { ensureFileIgnored } from "../lib/local-state.js";
|
|
18
18
|
import { PROJECT_TREE_DIR } from "../lib/env-resolver-core.js";
|
|
19
19
|
import { cachedVarsNote, layerVars, planVarsOverridePull, varsOverridePath as resolveVarsOverridePath, varsOverrideSummaryLine, VARS_OVERRIDE_GITIGNORE_PATTERN, } from "../lib/vars-override.js";
|
|
@@ -27,7 +27,8 @@ import { canonicalizeServerTextFields } from "../lib/server-text-normalization.j
|
|
|
27
27
|
import { canonicalJsonStringify } from "../lib/canonical-json.js";
|
|
28
28
|
import { newPullWriteTally, writePulledFile, } from "../lib/pull-write.js";
|
|
29
29
|
import { serializeSection, parseTomlToAppSettings, buildAppSettingsPayload, settingsProtectionLevel, } from "../lib/app-settings-descriptor.js";
|
|
30
|
-
import { collectAppSettingsPushErrors, writePulledAppSettings, diffAppSettings, appSettingsFieldDiffs, appSettingsNameExcluded, appSettingsNameExcludedForState, hashAppSettingsForDiff, appSettingsLoweredMinimums, appSettingsWriteBody, clientVersionsWriteFailure, confirmClientVersionLowering, } from "./sync-app-settings.js";
|
|
30
|
+
import { collectAppSettingsPushErrors, writePulledAppSettings, diffAppSettings, appSettingsFieldDiffs, appSettingsNameExcluded, appSettingsNameExcludedForState, hashAppSettingsForDiff, appSettingsLoweredMinimums, appSettingsWriteBody, clientVersionsWriteFailure, confirmClientVersionLowering, appSettingsBackendOverridesExcluded, appSettingsBackendOverridesExcludedForState, backendOverridesNotSentLine, backendOverrideTargetLines, confirmReleasedBackendOverrides, countBackendOverrides, } from "./sync-app-settings.js";
|
|
31
|
+
import { releasedBackendOverrides } from "../lib/generated-config-surfaces.js";
|
|
31
32
|
// #2644 — the one definition per configuration object, vendored from the server.
|
|
32
33
|
import { BLOB_BUCKET_TABLE, DATABASE_TYPE_TABLE, DB3_TYPE_TABLE, EMAIL_TEMPLATE_TABLE, INTEGRATION_TABLE, METADATA_CATEGORY_CONFIG_TABLE, PROMPT_CONFIG_TABLE, PROMPT_TABLE, RULE_SET_TABLE, SERVER_FUNCTION_TABLE, TEST_CASE_SURFACE, TEST_CASE_TABLE, configDeclaredTypeErrors, deprecatedConfigKey, fieldServerDefault, findMisshapenTables, findUnknownDocumentKeys, findUnknownGroupedTomlKeys, findUnknownTomlKeys, misshapenTableMessage, retiredTomlKey, retiredDocumentKey, spellsDecimalNumber, unrecognizedPushKeysMessage, unrecognizedPushTablesMessage, warnUnrecognizedServerKeys, } from "../lib/config-surface.js";
|
|
33
34
|
import { buildPayloadFromToml, projectEntityToPayload, projectRecordToToml, tomlOwned, } from "../lib/config-payload.js";
|
|
@@ -54,7 +55,7 @@ import { agentFunctionChangeRefusals, agentFunctionUses, } from "../lib/generate
|
|
|
54
55
|
import { resolvePromptStrictOutput } from "../lib/generated-config-surfaces.js";
|
|
55
56
|
// #3179 — the function's two halves: the header payloads and the envelope
|
|
56
57
|
// `config push` sends, and the bytes `config pull` writes back.
|
|
57
|
-
import { applyFunctionPull, buildFunctionConfigPush, buildFunctionConfigPushDetailed, createDocumentSchemaDropWarner, documentSchemaRetentionFailure, buildFunctionCreatePayload, buildFunctionUpdatePayload, functionDiffEntity, functionTomlPreflightErrors, functionVersionPushWarnings, functionPushPreRefusal, functionVersionRefusalMessage, unchangedAccessWarning, planDocumentSchemaPull, planFunctionPull, serializeFunction, } from "../lib/function-sync.js";
|
|
58
|
+
import { applyFunctionPull, buildFunctionConfigPush, buildFunctionConfigPushDetailed, createDocumentSchemaDropWarner, documentSchemaRetentionFailure, buildFunctionCreatePayload, buildFunctionUpdatePayload, functionDiffEntity, functionTomlPreflightErrors, functionVersionPushWarnings, functionPushPreRefusal, functionVersionRefusalMessage, recheckUnchangedFunctionVersion, unchangedAccessWarning, unchangedVersionNeedsInputRecheck, planDocumentSchemaPull, planFunctionPull, serializeFunction, } from "../lib/function-sync.js";
|
|
58
59
|
import { compileFunctionToml, functionFileLabel } from "../lib/function-schema-refs.js";
|
|
59
60
|
import { compilePromptToml, promptSchemaCycleError, promptSchemaKeywordRefusals, preparePromptSchemaRefs, promptConfigSchemaPayload, promptDependenciesOf, promptPlacementErrors, promptPushDependencies, promptSchemaPayload, withSchemaPayload, } from "../lib/prompt-schema-refs.js";
|
|
60
61
|
import { promptFamilyIndexLoader, rememberRemoteFunctions, rememberRemotePrompts } from "../lib/schema-family-index.js";
|
|
@@ -2119,6 +2120,15 @@ export async function runConfigPushPreflight(input) {
|
|
|
2119
2120
|
// #4564 — the protection level follows the name on a machine-local
|
|
2120
2121
|
// environment: out of the body, so out of what is validated.
|
|
2121
2122
|
excludeProtection: localEnvironment,
|
|
2123
|
+
// #6183 — a push to an app other than the tree's own sends no
|
|
2124
|
+
// backend overrides, so none is validated; the app being written is
|
|
2125
|
+
// the one an override may not name.
|
|
2126
|
+
excludeBackendOverrides: appSettingsBackendOverridesExcluded({
|
|
2127
|
+
localEnvironment,
|
|
2128
|
+
isCrossAppPush: !!isCrossAppPush,
|
|
2129
|
+
recorded: syncState?.backendOverridesExcluded === true,
|
|
2130
|
+
}).excluded,
|
|
2131
|
+
ownAppId: resolvedAppId,
|
|
2122
2132
|
});
|
|
2123
2133
|
for (const e of appErrors) {
|
|
2124
2134
|
preflightValidationErrors.push(` app.toml: ${e}`);
|
|
@@ -6188,6 +6198,19 @@ export function sameTomlAs(serverContent) {
|
|
|
6188
6198
|
* already builds) makes those guards hold from the first run, so the
|
|
6189
6199
|
* end-of-push and catch-path saves persist what the push actually did.
|
|
6190
6200
|
*/
|
|
6201
|
+
/**
|
|
6202
|
+
* The committed environments of `primitive/config.json` (#6183), which a
|
|
6203
|
+
* push's backend-override summary matches each override's target against.
|
|
6204
|
+
* Empty when the project has no config.
|
|
6205
|
+
*/
|
|
6206
|
+
function committedEnvironmentsForSummary() {
|
|
6207
|
+
try {
|
|
6208
|
+
return getProjectConfig()?.environments ?? {};
|
|
6209
|
+
}
|
|
6210
|
+
catch {
|
|
6211
|
+
return {};
|
|
6212
|
+
}
|
|
6213
|
+
}
|
|
6191
6214
|
export function ensurePushSyncState(existing, appId, serverUrl) {
|
|
6192
6215
|
if (existing)
|
|
6193
6216
|
return existing;
|
|
@@ -8553,10 +8576,19 @@ export function registerConfigSyncCommands(sync, options = {}) {
|
|
|
8553
8576
|
ensureDir(join(configDir, "metadata-category-configs"));
|
|
8554
8577
|
}
|
|
8555
8578
|
ensureDir(join(configDir, "email-templates"));
|
|
8579
|
+
// #6183 — an environment whose sync state named another app, or
|
|
8580
|
+
// recorded that it did, keeps leaving the tree's backend overrides
|
|
8581
|
+
// alone after a re-init.
|
|
8582
|
+
const priorInitState = loadSyncState();
|
|
8583
|
+
const keepsOverridesExcluded = !requireCurrentEnvironment().local &&
|
|
8584
|
+
!!priorInitState &&
|
|
8585
|
+
(priorInitState.appId !== resolvedAppId ||
|
|
8586
|
+
priorInitState.backendOverridesExcluded === true);
|
|
8556
8587
|
const state = {
|
|
8557
8588
|
appId: resolvedAppId,
|
|
8558
8589
|
serverUrl: getServerUrl(),
|
|
8559
8590
|
lastSyncedAt: new Date().toISOString(),
|
|
8591
|
+
...(keepsOverridesExcluded ? { backendOverridesExcluded: true } : {}),
|
|
8560
8592
|
entities: {},
|
|
8561
8593
|
};
|
|
8562
8594
|
saveSyncState(state);
|
|
@@ -8769,6 +8801,14 @@ export function registerConfigSyncCommands(sync, options = {}) {
|
|
|
8769
8801
|
// files themselves are about to be rewritten.
|
|
8770
8802
|
const priorState = loadSyncState();
|
|
8771
8803
|
const priorEntities = priorState?.entities ?? {};
|
|
8804
|
+
// #6183 — the backend-override rule, as push reads it: a
|
|
8805
|
+
// machine-local environment, a sync state naming another app, or one
|
|
8806
|
+
// that recorded such a push or pull.
|
|
8807
|
+
const pullExcludesBackendOverrides = appSettingsBackendOverridesExcluded({
|
|
8808
|
+
localEnvironment: pullsLocalEnvironment,
|
|
8809
|
+
isCrossAppPush: !!(priorState && priorState.appId !== resolvedAppId),
|
|
8810
|
+
recorded: priorState?.backendOverridesExcluded === true,
|
|
8811
|
+
}).excluded;
|
|
8772
8812
|
// #3190 — the slots of the retired object types (workflows, scripts,
|
|
8773
8813
|
// webhooks, cron triggers) are not carried into the state this pull
|
|
8774
8814
|
// writes; say so once, so the shrinking file is not a surprise.
|
|
@@ -8806,6 +8846,9 @@ export function registerConfigSyncCommands(sync, options = {}) {
|
|
|
8806
8846
|
// tree's, and a pull never writes the child's over it (#4117).
|
|
8807
8847
|
const written = writePulledAppSettings(configDir, settings, {
|
|
8808
8848
|
keepStatedName: pullsLocalEnvironment,
|
|
8849
|
+
// #6183 — a pull from an app other than the tree's own keeps the
|
|
8850
|
+
// backend overrides the file states and writes none of that app's.
|
|
8851
|
+
keepStatedBackendOverrides: pullExcludesBackendOverrides,
|
|
8809
8852
|
tally: pullWrites,
|
|
8810
8853
|
});
|
|
8811
8854
|
if (written.written)
|
|
@@ -9567,6 +9610,11 @@ export function registerConfigSyncCommands(sync, options = {}) {
|
|
|
9567
9610
|
appId: resolvedAppId,
|
|
9568
9611
|
serverUrl: getServerUrl(),
|
|
9569
9612
|
lastSyncedAt: new Date().toISOString(),
|
|
9613
|
+
// #6183 — carried, never ended: a committed environment once
|
|
9614
|
+
// pointed at another app keeps leaving the tree's overrides alone.
|
|
9615
|
+
...(pullExcludesBackendOverrides && !pullsLocalEnvironment
|
|
9616
|
+
? { backendOverridesExcluded: true }
|
|
9617
|
+
: {}),
|
|
9570
9618
|
entities: {
|
|
9571
9619
|
app: settings && pullsApp
|
|
9572
9620
|
? {
|
|
@@ -9753,6 +9801,13 @@ What a push guarantees (two stages):
|
|
|
9753
9801
|
serverUrl: syncState.serverUrl,
|
|
9754
9802
|
lastSyncedAt: new Date().toISOString(),
|
|
9755
9803
|
entities: {},
|
|
9804
|
+
// #6183 — this committed environment now names an app other than
|
|
9805
|
+
// the tree's own: from here on its pushes send no backend overrides
|
|
9806
|
+
// and its pulls keep the file's. Recorded whatever `app.toml` holds
|
|
9807
|
+
// and whatever `--only` selects, and never removed, so no later edit
|
|
9808
|
+
// or branch switch sends the tree's overrides to this app. A
|
|
9809
|
+
// machine-local environment needs no record: it is always excluded.
|
|
9810
|
+
...(localEnvironment ? {} : { backendOverridesExcluded: true }),
|
|
9756
9811
|
};
|
|
9757
9812
|
}
|
|
9758
9813
|
// A `--only` selector that would apply nothing is refused before push
|
|
@@ -10470,16 +10525,47 @@ What a push guarantees (two stages):
|
|
|
10470
10525
|
// The whole-truth body. Errors (an unrecognized or retired key, a
|
|
10471
10526
|
// type mismatch, a missing required key) already aborted the push in
|
|
10472
10527
|
// the preflight pass above, so only warnings remain here.
|
|
10528
|
+
// #6183 — a push to an app other than the tree's own (a
|
|
10529
|
+
// machine-local environment, a cross-app push, or a sync state
|
|
10530
|
+
// that recorded one) sends no backend overrides.
|
|
10531
|
+
const overridesExclusion = appSettingsBackendOverridesExcluded({
|
|
10532
|
+
localEnvironment,
|
|
10533
|
+
isCrossAppPush: !!isCrossAppPush,
|
|
10534
|
+
recorded: syncState?.backendOverridesExcluded === true,
|
|
10535
|
+
});
|
|
10473
10536
|
const { settings: appPayload, warnings: appWarnings } = buildAppSettingsPayload(tomlData, {
|
|
10474
10537
|
excludeName: payloadExcludesName,
|
|
10475
10538
|
nameOptional: localEnvironment,
|
|
10476
10539
|
// #4564 — on a machine-local environment the level is the
|
|
10477
10540
|
// shared tree's, like the name, and never this child's.
|
|
10478
10541
|
excludeProtection: localEnvironment,
|
|
10542
|
+
excludeBackendOverrides: overridesExclusion.excluded,
|
|
10543
|
+
ownAppId: resolvedAppId,
|
|
10479
10544
|
});
|
|
10480
10545
|
for (const w of appWarnings) {
|
|
10481
10546
|
warn(` ${w}`);
|
|
10482
10547
|
}
|
|
10548
|
+
// Said before the comparison, so an unchanged push says it too:
|
|
10549
|
+
// the overrides left out, or where each one sent points.
|
|
10550
|
+
if (overridesExclusion.excluded) {
|
|
10551
|
+
const notSent = countBackendOverrides(tomlData?.clients);
|
|
10552
|
+
if (notSent > 0) {
|
|
10553
|
+
info(` ${backendOverridesNotSentLine(notSent, overridesExclusion.reason, requireCurrentEnvironment().name)}`);
|
|
10554
|
+
}
|
|
10555
|
+
}
|
|
10556
|
+
else {
|
|
10557
|
+
const targetLines = backendOverrideTargetLines({
|
|
10558
|
+
clients: appPayload.clientVersions,
|
|
10559
|
+
environments: committedEnvironmentsForSummary(),
|
|
10560
|
+
currentApiUrl: requireCurrentEnvironment().config.apiUrl,
|
|
10561
|
+
});
|
|
10562
|
+
for (const line of targetLines) {
|
|
10563
|
+
if (line.level === "warn")
|
|
10564
|
+
warn(` ${line.text}`);
|
|
10565
|
+
else
|
|
10566
|
+
info(` ${line.text}`);
|
|
10567
|
+
}
|
|
10568
|
+
}
|
|
10483
10569
|
let appLiveOk = true;
|
|
10484
10570
|
let liveSettings;
|
|
10485
10571
|
try {
|
|
@@ -10629,6 +10715,27 @@ What a push guarantees (two stages):
|
|
|
10629
10715
|
applyAppSettings = false;
|
|
10630
10716
|
}
|
|
10631
10717
|
}
|
|
10718
|
+
// #6183 — a backend override at or below its platform's `latest`
|
|
10719
|
+
// moves copies already released: named, and stored only on a yes.
|
|
10720
|
+
// Judged from the file alone, so asked whether or not the live
|
|
10721
|
+
// settings could be read.
|
|
10722
|
+
if (applyAppSettings) {
|
|
10723
|
+
const released = await confirmReleasedBackendOverrides({
|
|
10724
|
+
released: releasedBackendOverrides(appPayload.clientVersions ?? null),
|
|
10725
|
+
dryRun: !!options.dryRun,
|
|
10726
|
+
yes: !!options.yes,
|
|
10727
|
+
confirm: (message) => confirmPrompt(message),
|
|
10728
|
+
print: (line) => warn(line),
|
|
10729
|
+
});
|
|
10730
|
+
if (released.proceed === false) {
|
|
10731
|
+
applyFailures.push({
|
|
10732
|
+
type: "app-settings",
|
|
10733
|
+
key: "app.toml",
|
|
10734
|
+
message: released.failure,
|
|
10735
|
+
});
|
|
10736
|
+
applyAppSettings = false;
|
|
10737
|
+
}
|
|
10738
|
+
}
|
|
10632
10739
|
if (applyAppSettings) {
|
|
10633
10740
|
let updated;
|
|
10634
10741
|
let appWriteRefused = false;
|
|
@@ -13618,7 +13725,36 @@ What a push guarantees (two stages):
|
|
|
13618
13725
|
if (codeUnchanged && localAuthorize && tomlCarriesAccess) {
|
|
13619
13726
|
warn(` ${unchangedAccessWarning(key)}`);
|
|
13620
13727
|
}
|
|
13621
|
-
|
|
13728
|
+
// #6170 — an unchanged function whose active version runs
|
|
13729
|
+
// `authorize` with no recorded input list is sent anyway (never on
|
|
13730
|
+
// a dry run): the server records a list the source declares, or
|
|
13731
|
+
// answers its warning or refusal again. It still counts as
|
|
13732
|
+
// unchanged, unless the server made a new version after all.
|
|
13733
|
+
let recheckedCreated = false;
|
|
13734
|
+
if (headerAction === "skip" &&
|
|
13735
|
+
codeUnchanged &&
|
|
13736
|
+
!options.dryRun &&
|
|
13737
|
+
liveFunction?.functionId &&
|
|
13738
|
+
unchangedVersionNeedsInputRecheck({ localAuthorize, activeVersion })) {
|
|
13739
|
+
const recheck = await recheckUnchangedFunctionVersion({
|
|
13740
|
+
client,
|
|
13741
|
+
appId: resolvedAppId,
|
|
13742
|
+
functionId: String(liveFunction.functionId),
|
|
13743
|
+
functionKey: key,
|
|
13744
|
+
push,
|
|
13745
|
+
});
|
|
13746
|
+
if (recheck.kind === "refused") {
|
|
13747
|
+
applyFailures.push({ type: "function", key, message: recheck.message });
|
|
13748
|
+
markUnapplied();
|
|
13749
|
+
continue;
|
|
13750
|
+
}
|
|
13751
|
+
for (const line of recheck.warnings)
|
|
13752
|
+
warn(` ${line}`);
|
|
13753
|
+
recheckedCreated = recheck.created;
|
|
13754
|
+
if (!recheckedCreated)
|
|
13755
|
+
info(` Function ${key}: code unchanged (no new version)`);
|
|
13756
|
+
}
|
|
13757
|
+
if (headerAction === "skip" && codeUnchanged && !recheckedCreated) {
|
|
13622
13758
|
skippedCount++;
|
|
13623
13759
|
if (syncState && liveFunction?.functionId) {
|
|
13624
13760
|
if (!syncState.entities.functions)
|
|
@@ -15608,6 +15744,10 @@ What a push guarantees (two stages):
|
|
|
15608
15744
|
excludeName,
|
|
15609
15745
|
nameOptional: diffsLocalEnvironment,
|
|
15610
15746
|
excludeProtection: diffsLocalEnvironment,
|
|
15747
|
+
// #6183 — the overrides push would leave out, and the app an
|
|
15748
|
+
// override may not name, exactly as push reads them.
|
|
15749
|
+
excludeBackendOverrides: appSettingsBackendOverridesExcludedForState(syncState, resolvedAppId, diffsLocalEnvironment).excluded,
|
|
15750
|
+
ownAppId: resolvedAppId,
|
|
15611
15751
|
});
|
|
15612
15752
|
if (appErrors.length > 0) {
|
|
15613
15753
|
appRow(VALIDATION_ERROR, appErrors.join("; "));
|