primitive-admin 1.2.0-alpha.6 → 1.2.0-alpha.7
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/README.md +1 -1
- package/dist/src/commands/apps-children.d.ts +1 -1
- package/dist/src/commands/apps-children.js +170 -28
- package/dist/src/commands/apps-children.js.map +1 -1
- package/dist/src/commands/auth.js +41 -6
- package/dist/src/commands/auth.js.map +1 -1
- package/dist/src/commands/config.js +43 -4
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/database-types.js +313 -13
- package/dist/src/commands/database-types.js.map +1 -1
- package/dist/src/commands/databases.js +130 -53
- package/dist/src/commands/databases.js.map +1 -1
- package/dist/src/commands/init.d.ts +7 -0
- package/dist/src/commands/init.js +9 -1
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/llm.js +6 -9
- package/dist/src/commands/llm.js.map +1 -1
- package/dist/src/commands/settings.d.ts +9 -12
- package/dist/src/commands/settings.js +79 -31
- package/dist/src/commands/settings.js.map +1 -1
- package/dist/src/commands/sync.d.ts +118 -6
- package/dist/src/commands/sync.js +594 -55
- package/dist/src/commands/sync.js.map +1 -1
- package/dist/src/lib/child-apps-local.d.ts +45 -21
- package/dist/src/lib/child-apps-local.js +68 -30
- package/dist/src/lib/child-apps-local.js.map +1 -1
- package/dist/src/lib/credentials-store.d.ts +38 -3
- package/dist/src/lib/credentials-store.js +175 -9
- package/dist/src/lib/credentials-store.js.map +1 -1
- package/dist/src/lib/function-collect.d.ts +1 -1
- package/dist/src/lib/function-collect.js +4 -0
- package/dist/src/lib/function-collect.js.map +1 -1
- package/dist/src/lib/function-triggers.d.ts +3 -15
- package/dist/src/lib/function-triggers.js +10 -72
- package/dist/src/lib/function-triggers.js.map +1 -1
- package/dist/src/lib/generated-config-surfaces.d.ts +148 -0
- package/dist/src/lib/generated-config-surfaces.js +208 -25
- 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/lib/local-state.d.ts +21 -6
- package/dist/src/lib/local-state.js +78 -34
- package/dist/src/lib/local-state.js.map +1 -1
- package/dist/src/lib/push-failure-report.d.ts +45 -0
- package/dist/src/lib/push-failure-report.js +57 -0
- package/dist/src/lib/push-failure-report.js.map +1 -0
- package/dist/src/lib/sync-selectors.d.ts +5 -1
- package/dist/src/lib/sync-selectors.js +23 -13
- package/dist/src/lib/sync-selectors.js.map +1 -1
- package/dist/src/lib/transient-retry.d.ts +9 -0
- package/dist/src/lib/transient-retry.js +37 -0
- package/dist/src/lib/transient-retry.js.map +1 -1
- package/dist/src/lib/vars-override.d.ts +105 -0
- package/dist/src/lib/vars-override.js +143 -0
- package/dist/src/lib/vars-override.js.map +1 -0
- package/package.json +2 -2
- package/dist/src/lib/generated-workflow-model-fields.d.ts +0 -20
- package/dist/src/lib/generated-workflow-model-fields.js +0 -53
- package/dist/src/lib/generated-workflow-model-fields.js.map +0 -1
- package/dist/src/lib/workflow-field-descriptor.d.ts +0 -91
- package/dist/src/lib/workflow-field-descriptor.js +0 -153
- package/dist/src/lib/workflow-field-descriptor.js.map +0 -1
package/README.md
CHANGED
|
@@ -441,7 +441,7 @@ primitive databases export [app-id] <database-id> --output <dir> # Export r
|
|
|
441
441
|
primitive databases import [app-id] <path> --overwrite --dry-run # Import from export directory
|
|
442
442
|
```
|
|
443
443
|
|
|
444
|
-
Export creates a directory with `metadata.json`, `records.jsonl`, `indexes.json`, and `constraints.json`. Import restores records and
|
|
444
|
+
Export creates a directory with `metadata.json`, `records.jsonl`, `indexes.json`, and `constraints.json`. Import restores records, indexes, and constraints into a new or existing database; it reads every file first, so a malformed export fails without creating a database. Database type config (operations, triggers, access rules) is managed separately via `primitive config` — run `config push` on the target app before importing.
|
|
445
445
|
|
|
446
446
|
### Documents
|
|
447
447
|
|
|
@@ -47,7 +47,7 @@ export declare function removeLocalStateAfterDelete(configPath: string | null, a
|
|
|
47
47
|
* is neither a committed environment nor a local entry. Lists the parent's
|
|
48
48
|
* children, refuses an unknown slug and a child whose app is already
|
|
49
49
|
* registered here under another name, then registers it as `apps children
|
|
50
|
-
* create` does (baseline,
|
|
50
|
+
* create` does (baseline, entry). Exits on any refusal, writing nothing.
|
|
51
51
|
*/
|
|
52
52
|
export declare function attachChildEnvironment(slug: string): Promise<void>;
|
|
53
53
|
/** Registers `apps children` and its verbs under the `apps` group. */
|
|
@@ -19,21 +19,78 @@
|
|
|
19
19
|
* Local state is related to server children by app id, never by name — see
|
|
20
20
|
* `lib/child-apps-local.ts`.
|
|
21
21
|
*/
|
|
22
|
-
import { existsSync } from "fs";
|
|
23
|
-
import { join } from "path";
|
|
22
|
+
import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "fs";
|
|
23
|
+
import { dirname, join, resolve } from "path";
|
|
24
24
|
import { ApiClient } from "../lib/api-client.js";
|
|
25
|
-
import {
|
|
26
|
-
import { ChildRegistrationError, currentGitBranch, drainChildren, findChildBySlug, findStaleLocalEntries, gitBranchExists, isGitRepository, readLocalEnvironmentRefs, registerChildEnvironment, removeLocalStateForApp, resolveParentEnvironment, runFirstPush, } from "../lib/child-apps-local.js";
|
|
25
|
+
import { ChildRegistrationError, currentGitBranch, drainChildren, findChildBySlug, findStaleLocalEntries, gitBranchExists, isGitRepository, readLocalEnvironmentRefs, registerChildEnvironment, removeLocalStateForApp, resolveParentEnvironment, runFirstPushWithRetry, } from "../lib/child-apps-local.js";
|
|
27
26
|
import { confirmPrompt } from "../lib/confirm-prompt.js";
|
|
28
27
|
import { PROJECT_CONFIG_DISPLAY_NAME, PROJECT_TREE_DIR, isCommittedEnvironment, localStatePathForConfigPath, readLocalState, } from "../lib/env-resolver-core.js";
|
|
29
28
|
import { getProjectConfig, resetEnvResolver } from "../lib/env-resolver.js";
|
|
30
|
-
import { ensureLocalStateIgnored, writeLocalSelection } from "../lib/local-state.js";
|
|
29
|
+
import { ensureFileIgnored, ensureLocalStateIgnored, writeLocalSelection } from "../lib/local-state.js";
|
|
30
|
+
import { parseConfigToml } from "../lib/config-toml.js";
|
|
31
|
+
import { VARS_OVERRIDE_GITIGNORE_PATTERN, varsOverrideFileName } from "../lib/vars-override.js";
|
|
32
|
+
import { validateVarsFile } from "./sync.js";
|
|
31
33
|
import { pageCursorOption, pageLimitOption, parsePageLimit, printEmptyPage, printPageHint, } from "../lib/list-options.js";
|
|
32
|
-
import { error, formatDate, formatTable, info, json, keyValue, result as printResult, success, warn, } from "../lib/output.js";
|
|
34
|
+
import { error, flushOutput, formatDate, formatTable, info, json, keyValue, result as printResult, success, warn, } from "../lib/output.js";
|
|
33
35
|
import { normalizeCliListEnvelope } from "../lib/paginate.js";
|
|
34
36
|
const LOCAL_STATE_LABEL = ".primitive/local.json";
|
|
35
|
-
/**
|
|
36
|
-
|
|
37
|
+
/**
|
|
38
|
+
* `apps children create`'s exit code when the server created the child but the
|
|
39
|
+
* command did not finish — the child is not registered here, or its first push
|
|
40
|
+
* did not complete. 1 means no child was created (#4491).
|
|
41
|
+
*/
|
|
42
|
+
const EXIT_CHILD_CREATED_INCOMPLETE = 2;
|
|
43
|
+
/**
|
|
44
|
+
* The vars override of the local environment `name` in the tree `tree`
|
|
45
|
+
* (#4485), or null when there is no such file.
|
|
46
|
+
*/
|
|
47
|
+
function varsOverrideReport(projectRoot, tree, name) {
|
|
48
|
+
const file = varsOverrideFileName(name);
|
|
49
|
+
const path = join(projectRoot, PROJECT_TREE_DIR, tree, file);
|
|
50
|
+
if (!existsSync(path))
|
|
51
|
+
return null;
|
|
52
|
+
let vars = null;
|
|
53
|
+
try {
|
|
54
|
+
vars = Object.keys(parseConfigToml(readFileSync(path, "utf-8"))).length;
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
vars = null;
|
|
58
|
+
}
|
|
59
|
+
return { path: `${PROJECT_TREE_DIR}/${tree}/${file}`, vars };
|
|
60
|
+
}
|
|
61
|
+
function describeVarsOverride(report) {
|
|
62
|
+
return `${report.path} (${report.vars === null ? "unparseable" : `${report.vars} var${report.vars === 1 ? "" : "s"}`})`;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Reads and validates `create --vars-file`: a flat `KEY = "value"` table under
|
|
66
|
+
* the `vars.toml` rules. Exits 1 naming the path and the problem, before
|
|
67
|
+
* anything is sent to the server.
|
|
68
|
+
*/
|
|
69
|
+
function readVarsFileOrExit(given) {
|
|
70
|
+
const source = resolve(process.cwd(), given);
|
|
71
|
+
if (!existsSync(source)) {
|
|
72
|
+
error(`--vars-file ${source}: no such file.`);
|
|
73
|
+
process.exit(1);
|
|
74
|
+
}
|
|
75
|
+
let text;
|
|
76
|
+
let parsed;
|
|
77
|
+
try {
|
|
78
|
+
text = readFileSync(source, "utf-8");
|
|
79
|
+
parsed = parseConfigToml(text);
|
|
80
|
+
}
|
|
81
|
+
catch (err) {
|
|
82
|
+
error(`--vars-file ${source} could not be read as TOML: ${err?.message || String(err)}`);
|
|
83
|
+
process.exit(1);
|
|
84
|
+
}
|
|
85
|
+
const problems = validateVarsFile(parsed, { fileName: source });
|
|
86
|
+
if (problems.length > 0) {
|
|
87
|
+
error(`--vars-file ${source} is not a flat table of config vars:`);
|
|
88
|
+
for (const problem of problems)
|
|
89
|
+
error(` ${problem}`);
|
|
90
|
+
process.exit(1);
|
|
91
|
+
}
|
|
92
|
+
return { source, text, count: Object.keys(parsed).length };
|
|
93
|
+
}
|
|
37
94
|
function parentOrExit() {
|
|
38
95
|
try {
|
|
39
96
|
return resolveParentEnvironment();
|
|
@@ -91,6 +148,7 @@ export function reportLocalStateRemoval(removed) {
|
|
|
91
148
|
...(r.loginRemoved ? ["login"] : []),
|
|
92
149
|
...(r.baselineRemoved ? ["baseline"] : []),
|
|
93
150
|
...(r.backupsRemoved ? ["backups"] : []),
|
|
151
|
+
...(r.overrideRemoved ? ["vars override"] : []),
|
|
94
152
|
];
|
|
95
153
|
success(`Removed the local environment "${r.name}" (${parts.join(", ")}).`);
|
|
96
154
|
if (r.selectionCleared) {
|
|
@@ -138,7 +196,7 @@ function localFields(child, refs, selection) {
|
|
|
138
196
|
* is neither a committed environment nor a local entry. Lists the parent's
|
|
139
197
|
* children, refuses an unknown slug and a child whose app is already
|
|
140
198
|
* registered here under another name, then registers it as `apps children
|
|
141
|
-
* create` does (baseline,
|
|
199
|
+
* create` does (baseline, entry). Exits on any refusal, writing nothing.
|
|
142
200
|
*/
|
|
143
201
|
export async function attachChildEnvironment(slug) {
|
|
144
202
|
let parent;
|
|
@@ -171,9 +229,8 @@ export async function attachChildEnvironment(slug) {
|
|
|
171
229
|
error(`Child app "${slug}" (${child.appId}) is already registered on this machine as "${name}". Run 'primitive env use ${name}' to select it.`);
|
|
172
230
|
process.exit(1);
|
|
173
231
|
}
|
|
174
|
-
let loginCopied = true;
|
|
175
232
|
try {
|
|
176
|
-
|
|
233
|
+
registerChildEnvironment({
|
|
177
234
|
configPath: parent.configPath,
|
|
178
235
|
name: slug,
|
|
179
236
|
tree: parent.parentName,
|
|
@@ -181,8 +238,7 @@ export async function attachChildEnvironment(slug) {
|
|
|
181
238
|
appId: child.appId,
|
|
182
239
|
appName: child.name,
|
|
183
240
|
parentAppId: parent.parentAppId,
|
|
184
|
-
|
|
185
|
-
}));
|
|
241
|
+
});
|
|
186
242
|
}
|
|
187
243
|
catch (err) {
|
|
188
244
|
error(err.message || String(err));
|
|
@@ -191,8 +247,6 @@ export async function attachChildEnvironment(slug) {
|
|
|
191
247
|
writeLocalSelection(parent.configPath, slug);
|
|
192
248
|
resetEnvResolver();
|
|
193
249
|
success(`Attached child app "${child.name}" as "${slug}" and selected it on this machine.`);
|
|
194
|
-
if (!loginCopied)
|
|
195
|
-
info(NO_LOGIN_COPIED);
|
|
196
250
|
keyValue("App ID", child.appId);
|
|
197
251
|
keyValue("Parent", `${parent.parentName} (${parent.parentAppId})`);
|
|
198
252
|
keyValue("Tree", `${parent.parentName} (machine-local, ${LOCAL_STATE_LABEL})`);
|
|
@@ -260,9 +314,12 @@ A child app is a copy of the parent app (its settings and, unless --no-secrets,
|
|
|
260
314
|
its secrets), owned by you and deleted when idle. On this machine it is a
|
|
261
315
|
machine-local environment named by its slug that shares the parent's
|
|
262
316
|
primitive/<env>/ tree. With a child selected, these verbs act on its parent.
|
|
317
|
+
Its own config var values go in primitive/<env>/vars.<slug>.override.toml
|
|
318
|
+
(git-ignored), layered over vars.toml whenever the child is selected.
|
|
263
319
|
|
|
264
320
|
Examples:
|
|
265
321
|
$ primitive apps children create feature-x # create, register, select, push the tree
|
|
322
|
+
$ primitive apps children create feature-x --vars-file feature-x.vars.toml
|
|
266
323
|
$ primitive apps children list
|
|
267
324
|
$ primitive apps children get feature-x
|
|
268
325
|
$ primitive apps children delete feature-x --yes
|
|
@@ -276,9 +333,23 @@ Examples:
|
|
|
276
333
|
.option("--idle-days <n>", "Days without activity before the child is deleted (7-30, default 30)")
|
|
277
334
|
.option("--no-secrets", "Do not copy the parent's secrets")
|
|
278
335
|
.option("--no-use", "Do not select the child on this machine")
|
|
336
|
+
.option("--vars-file <path>", "The child's own config var values (a flat TOML table), written to primitive/<env>/vars.<slug>.override.toml before the first push")
|
|
279
337
|
.option("--json", "Output as JSON")
|
|
338
|
+
.addHelpText("after", `
|
|
339
|
+
A network failure or temporary server error in the first push is retried.
|
|
340
|
+
|
|
341
|
+
Exit codes:
|
|
342
|
+
0 the child is created, registered and pushed
|
|
343
|
+
1 no child was created
|
|
344
|
+
2 the child was created, but its first push or its registration did not
|
|
345
|
+
finish; run the command the output names
|
|
346
|
+
`)
|
|
280
347
|
.action(async (slug, options) => {
|
|
281
348
|
const parent = parentOrExit();
|
|
349
|
+
// The first push is decided by the tree as it was when the command
|
|
350
|
+
// started: writing the override below may create the directory.
|
|
351
|
+
const treeDir = join(parent.projectRoot, PROJECT_TREE_DIR, parent.parentName);
|
|
352
|
+
const treeExisted = existsSync(treeDir);
|
|
282
353
|
const project = getProjectConfig();
|
|
283
354
|
if (isCommittedEnvironment(project, slug)) {
|
|
284
355
|
error(`"${slug}" is a committed environment in ${PROJECT_CONFIG_DISPLAY_NAME}; a child app's slug is also its local environment name, so it needs one of its own.`);
|
|
@@ -301,6 +372,31 @@ Examples:
|
|
|
301
372
|
idleDays = Number(options.idleDays);
|
|
302
373
|
}
|
|
303
374
|
ensureLocalStateIgnoredOrExit(parent.configPath, `primitive apps children create ${slug}`);
|
|
375
|
+
// #4485 — the child's own var values: read, validated and their
|
|
376
|
+
// destination's ignore coverage confirmed before the server is called.
|
|
377
|
+
let overridePath;
|
|
378
|
+
try {
|
|
379
|
+
overridePath = join(treeDir, varsOverrideFileName(slug));
|
|
380
|
+
}
|
|
381
|
+
catch (err) {
|
|
382
|
+
error(err.message || String(err));
|
|
383
|
+
process.exit(1);
|
|
384
|
+
}
|
|
385
|
+
const varsFile = options.varsFile !== undefined ? readVarsFileOrExit(options.varsFile) : null;
|
|
386
|
+
if (varsFile) {
|
|
387
|
+
const rerun = `primitive apps children create ${slug} --vars-file ${options.varsFile}`;
|
|
388
|
+
const coverage = ensureFileIgnored(overridePath, { reason: `primitive apps children create ${slug}` });
|
|
389
|
+
if (coverage.status === "excluded") {
|
|
390
|
+
info(`Added "${coverage.pattern}" to ${coverage.excludePath} so the child's vars stay out of git.`);
|
|
391
|
+
info(`Consider committing "${VARS_OVERRIDE_GITIGNORE_PATTERN}" to .gitignore so the whole team is covered.`);
|
|
392
|
+
}
|
|
393
|
+
else if (coverage.status === "failed") {
|
|
394
|
+
error(`Could not confirm ${varsOverrideFileName(slug)} is git-ignored: ${coverage.detail}`);
|
|
395
|
+
error(`Make "${PROJECT_TREE_DIR}/${parent.parentName}/${varsOverrideFileName(slug)}" ignored (add "${VARS_OVERRIDE_GITIGNORE_PATTERN}" to your .gitignore, ` +
|
|
396
|
+
`and 'git rm --cached' it if it is tracked), then run '${rerun}' again — the child's values are per-machine and must never be committable.`);
|
|
397
|
+
process.exit(1);
|
|
398
|
+
}
|
|
399
|
+
}
|
|
304
400
|
const branch = options.branch ?? currentGitBranch(parent.projectRoot) ?? undefined;
|
|
305
401
|
const client = new ApiClient();
|
|
306
402
|
let app;
|
|
@@ -317,9 +413,8 @@ Examples:
|
|
|
317
413
|
error(err.message || String(err));
|
|
318
414
|
process.exit(1);
|
|
319
415
|
}
|
|
320
|
-
let loginCopied = true;
|
|
321
416
|
try {
|
|
322
|
-
|
|
417
|
+
registerChildEnvironment({
|
|
323
418
|
configPath: parent.configPath,
|
|
324
419
|
name: slug,
|
|
325
420
|
tree: parent.parentName,
|
|
@@ -327,43 +422,84 @@ Examples:
|
|
|
327
422
|
appId: app.appId,
|
|
328
423
|
appName: app.name,
|
|
329
424
|
parentAppId: parent.parentAppId,
|
|
330
|
-
|
|
331
|
-
}));
|
|
332
|
-
if (!loginCopied)
|
|
333
|
-
info(NO_LOGIN_COPIED);
|
|
425
|
+
});
|
|
334
426
|
}
|
|
335
427
|
catch (err) {
|
|
336
428
|
error(err instanceof ChildRegistrationError ? err.message : String(err?.message || err));
|
|
337
429
|
error(`Child app ${app.appId} ("${app.name}") was created on the server but is not registered on this machine. Run 'primitive env use ${slug}' to register it.`);
|
|
338
|
-
|
|
430
|
+
if (options.json) {
|
|
431
|
+
json({
|
|
432
|
+
app,
|
|
433
|
+
environment: { name: slug, tree: parent.parentName, registered: false, selected: false },
|
|
434
|
+
push: { ran: false, exitCode: null, attempts: 0 },
|
|
435
|
+
varsOverride: null,
|
|
436
|
+
});
|
|
437
|
+
}
|
|
438
|
+
await flushOutput();
|
|
439
|
+
process.exit(EXIT_CHILD_CREATED_INCOMPLETE);
|
|
339
440
|
}
|
|
340
441
|
const selected = options.use !== false;
|
|
341
442
|
if (selected) {
|
|
342
443
|
writeLocalSelection(parent.configPath, slug);
|
|
343
444
|
resetEnvResolver();
|
|
344
445
|
}
|
|
446
|
+
if (varsFile) {
|
|
447
|
+
const samePath = existsSync(overridePath) && realpathSync(overridePath) === realpathSync(varsFile.source);
|
|
448
|
+
if (!samePath) {
|
|
449
|
+
mkdirSync(dirname(overridePath), { recursive: true });
|
|
450
|
+
writeFileSync(overridePath, varsFile.text);
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
const varsOverride = varsOverrideReport(parent.projectRoot, parent.parentName, slug);
|
|
345
454
|
if (!options.json) {
|
|
346
455
|
success(`Created child app "${app.name}".`);
|
|
347
456
|
keyValue("App ID", app.appId);
|
|
348
457
|
keyValue("Parent", `${parent.parentName} (${parent.parentAppId})`);
|
|
349
458
|
keyValue("Environment", `${slug} (machine-local, tree ${parent.parentName})`);
|
|
350
459
|
keyValue("Selected", selected);
|
|
460
|
+
if (varsOverride)
|
|
461
|
+
keyValue("Vars override", describeVarsOverride(varsOverride));
|
|
351
462
|
}
|
|
352
|
-
const push = {
|
|
353
|
-
|
|
463
|
+
const push = {
|
|
464
|
+
ran: false,
|
|
465
|
+
exitCode: null,
|
|
466
|
+
attempts: 0,
|
|
467
|
+
};
|
|
468
|
+
if (!treeExisted) {
|
|
354
469
|
info(`There is no primitive/${parent.parentName}/ tree yet, so nothing was pushed. Run 'primitive --env ${parent.parentName} config pull', then 'primitive --env ${slug} config push'.`);
|
|
355
470
|
}
|
|
356
471
|
else {
|
|
472
|
+
if (varsOverride) {
|
|
473
|
+
info(`The first push uses ${varsOverride.path}: the child's own values, layered over vars.toml.`);
|
|
474
|
+
}
|
|
357
475
|
info(`Pushing primitive/${parent.parentName}/ into the child: primitive --env ${slug} config push --yes`);
|
|
358
476
|
push.ran = true;
|
|
359
|
-
|
|
477
|
+
// The child exists from here on: a push that could not even be
|
|
478
|
+
// started is an incomplete create (exit 2), never "no child" (#4491).
|
|
479
|
+
try {
|
|
480
|
+
const outcome = await runFirstPushWithRetry(slug, {
|
|
481
|
+
json: Boolean(options.json),
|
|
482
|
+
onRetry: (delayMs, attempt) => warn(`The first push into "${slug}" hit a transient failure; pushing again in ${delayMs / 1000}s (attempt ${attempt}). Only what did not land is pushed.`),
|
|
483
|
+
});
|
|
484
|
+
push.exitCode = outcome.exitCode;
|
|
485
|
+
push.attempts = outcome.attempts;
|
|
486
|
+
}
|
|
487
|
+
catch (err) {
|
|
488
|
+
error(`Could not run the first push into "${slug}": ${err?.message || String(err)}`);
|
|
489
|
+
}
|
|
360
490
|
}
|
|
361
491
|
if (options.json) {
|
|
362
|
-
json({
|
|
492
|
+
json({
|
|
493
|
+
app,
|
|
494
|
+
environment: { name: slug, tree: parent.parentName, registered: true, selected },
|
|
495
|
+
push,
|
|
496
|
+
varsOverride,
|
|
497
|
+
});
|
|
363
498
|
}
|
|
364
499
|
if (push.ran && push.exitCode !== 0) {
|
|
365
500
|
error(`The first push into "${slug}" failed. The child is created and registered; fix the problem above and run 'primitive --env ${slug} config push'.`);
|
|
366
|
-
|
|
501
|
+
await flushOutput();
|
|
502
|
+
process.exit(EXIT_CHILD_CREATED_INCOMPLETE);
|
|
367
503
|
}
|
|
368
504
|
if (!options.json && !selected) {
|
|
369
505
|
info(`Run 'primitive env use ${slug}' to select it.`);
|
|
@@ -468,8 +604,12 @@ Examples:
|
|
|
468
604
|
const conflict = !fields.local && named
|
|
469
605
|
? { name: named.name, appId: named.entry.appId, tree: named.entry.tree }
|
|
470
606
|
: null;
|
|
607
|
+
const holder = refs.find((ref) => ref.entry.appId === child.appId);
|
|
608
|
+
const varsOverride = holder
|
|
609
|
+
? varsOverrideReport(parent.projectRoot, holder.entry.tree, holder.name)
|
|
610
|
+
: null;
|
|
471
611
|
if (options.json) {
|
|
472
|
-
json({ ...child, ...fields, localConflict: conflict });
|
|
612
|
+
json({ ...child, ...fields, localConflict: conflict, varsOverride });
|
|
473
613
|
return;
|
|
474
614
|
}
|
|
475
615
|
const inRepo = isGitRepository(parent.projectRoot);
|
|
@@ -496,6 +636,8 @@ Examples:
|
|
|
496
636
|
else {
|
|
497
637
|
printResult("Local", `not registered — run 'primitive env use ${slug}' to attach it`);
|
|
498
638
|
}
|
|
639
|
+
if (varsOverride)
|
|
640
|
+
printResult("Vars override", describeVarsOverride(varsOverride));
|
|
499
641
|
}
|
|
500
642
|
catch (err) {
|
|
501
643
|
error(err.message || String(err));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apps-children.js","sourceRoot":"","sources":["../../../src/commands/apps-children.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apps-children.js","sourceRoot":"","sources":["../../../src/commands/apps-children.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { loadCredentials, saveCredentials, clearCredentials, isTokenExpired, getCurrentApp, getConfiguredServerUrl, } from "../lib/config.js";
|
|
2
|
-
import { allowGlobalCredentials, environmentToken } from "../lib/credentials-store.js";
|
|
2
|
+
import { allowGlobalCredentials, clearLeftoverChildLogins, environmentToken, leftoverChildLogins, loginEnvironments, } from "../lib/credentials-store.js";
|
|
3
3
|
import { isCiToken } from "../lib/session-id.js";
|
|
4
4
|
import { browserLogin } from "../lib/auth-flow.js";
|
|
5
5
|
import { getCurrentEnvironment } from "../lib/env-resolver.js";
|
|
@@ -47,6 +47,23 @@ function storedLogin(serverUrl) {
|
|
|
47
47
|
return null;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* The environments a login here signs in or out, when it is more than one
|
|
52
|
+
* (#4511): "dev and its child environments: feat, feat-two". Null when the
|
|
53
|
+
* login is the current environment's alone.
|
|
54
|
+
*/
|
|
55
|
+
function sharedLoginEnvironments() {
|
|
56
|
+
let tree;
|
|
57
|
+
try {
|
|
58
|
+
tree = loginEnvironments();
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
return tree && tree.children.length > 0
|
|
64
|
+
? `${tree.parent} and its child environments: ${tree.children.join(", ")}`
|
|
65
|
+
: null;
|
|
66
|
+
}
|
|
50
67
|
/** The session id (`sid`) a stored access token carries. */
|
|
51
68
|
function sessionIdOf(credentials) {
|
|
52
69
|
const sid = credentials ? parseJwt(credentials.accessToken).sid : undefined;
|
|
@@ -206,6 +223,9 @@ export function registerAuthCommands(program) {
|
|
|
206
223
|
};
|
|
207
224
|
saveCredentials(credentials);
|
|
208
225
|
success(`Logged in as ${credentials.email}`);
|
|
226
|
+
const shared = sharedLoginEnvironments();
|
|
227
|
+
if (shared)
|
|
228
|
+
info(`Signed in to ${shared}.`);
|
|
209
229
|
if (credentials.role === "super-admin") {
|
|
210
230
|
info("You have super-admin privileges.");
|
|
211
231
|
}
|
|
@@ -263,6 +283,9 @@ export function registerAuthCommands(program) {
|
|
|
263
283
|
...(existing?.stepUp ? { stepUp: existing.stepUp } : {}),
|
|
264
284
|
});
|
|
265
285
|
success(`Logged in as ${result.credentials.email}`);
|
|
286
|
+
const shared = sharedLoginEnvironments();
|
|
287
|
+
if (shared)
|
|
288
|
+
info(`Signed in to ${shared}.`);
|
|
266
289
|
// #3891 — a plain login holds the default scope; say so, and how to
|
|
267
290
|
// step up for what it cannot do.
|
|
268
291
|
for (const line of loginScopeLines(result.exchange))
|
|
@@ -323,6 +346,10 @@ export function registerAuthCommands(program) {
|
|
|
323
346
|
// command fails: re-running it retries the revocation. A 401 means the
|
|
324
347
|
// stored token was already refused — nothing is left to revoke, so the
|
|
325
348
|
// credentials are cleared.
|
|
349
|
+
//
|
|
350
|
+
// #4511: a child environment uses its parent's login, so logout in any
|
|
351
|
+
// environment of the tree signs out all of them, and says which. A session
|
|
352
|
+
// a child slot kept from before is revoked too.
|
|
326
353
|
program
|
|
327
354
|
.command("logout")
|
|
328
355
|
.description("Revoke this login's admin session on the server and clear stored credentials")
|
|
@@ -338,13 +365,17 @@ export function registerAuthCommands(program) {
|
|
|
338
365
|
process.exit(1);
|
|
339
366
|
}
|
|
340
367
|
const credentials = loadCredentials();
|
|
341
|
-
|
|
368
|
+
const leftovers = leftoverChildLogins();
|
|
369
|
+
if (!credentials && leftovers.length === 0) {
|
|
342
370
|
info("Not logged in.");
|
|
343
371
|
return;
|
|
344
372
|
}
|
|
345
|
-
let outcome;
|
|
373
|
+
let outcome = null;
|
|
346
374
|
try {
|
|
347
|
-
|
|
375
|
+
if (credentials)
|
|
376
|
+
outcome = await logoutAdminSession(credentials);
|
|
377
|
+
for (const leftover of leftovers)
|
|
378
|
+
await logoutAdminSession(leftover);
|
|
348
379
|
}
|
|
349
380
|
catch (err) {
|
|
350
381
|
error(`${err?.message || "Logout failed."} The session was NOT revoked, and ` +
|
|
@@ -352,15 +383,19 @@ export function registerAuthCommands(program) {
|
|
|
352
383
|
process.exit(1);
|
|
353
384
|
}
|
|
354
385
|
clearCredentials();
|
|
355
|
-
|
|
386
|
+
clearLeftoverChildLogins();
|
|
387
|
+
if (outcome?.kind === "already-invalid") {
|
|
356
388
|
success("Logged out. The stored session was already invalid on the server; local credentials cleared.");
|
|
357
389
|
}
|
|
358
|
-
else if (outcome.revoked.length > 0) {
|
|
390
|
+
else if (outcome && outcome.revoked.length > 0) {
|
|
359
391
|
success(`Logged out. Revoked session ${outcome.revoked.join(", ")}.`);
|
|
360
392
|
}
|
|
361
393
|
else {
|
|
362
394
|
success("Logged out successfully.");
|
|
363
395
|
}
|
|
396
|
+
const shared = sharedLoginEnvironments();
|
|
397
|
+
if (shared)
|
|
398
|
+
success(`Signed out of ${shared}.`);
|
|
364
399
|
});
|
|
365
400
|
// Whoami command
|
|
366
401
|
//
|