@revoengine/cli 1.0.23 → 1.0.24
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 +2 -2
- package/dist/src/cli.js +1 -1
- package/dist/src/client.d.ts +4 -2
- package/dist/src/client.js +13 -3
- package/dist/src/commands/component.js +37 -2
- package/dist/src/commands/migrate.js +5 -1
- package/dist/src/migration.d.ts +2 -0
- package/dist/src/migration.js +12 -1
- package/dist/src/reviewed-plan.d.ts +2 -0
- package/dist/src/reviewed-plan.js +25 -0
- package/dist/src/types.d.ts +6 -0
- package/dist/src/workspace-prune.d.ts +8 -0
- package/dist/src/workspace-prune.js +12 -2
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -331,9 +331,9 @@ The planner lists exact target IDs, names and Stable Keys in deletion order. Dup
|
|
|
331
331
|
|
|
332
332
|
All other deletions run after upserts and their readback verification, allowing a retained Job Template or Endpoint to move to a replacement Component. Pruning removes obsolete consumers before dependencies. API errors or failed readback stop further deletes; a failed early delete prevents upserts, and a failed upsert prevents the remaining prune. Early deletions can remain applied if a later write fails, so review both deletion phases before approval. The owning APIs retain their existing permission and reference guards and soft-delete semantics, including the table subtree lifecycle and view automation deactivation. Root deletion is blocked by any retained or unmanaged partition. No arbitrary implicit consumer cleanup is performed.
|
|
333
333
|
|
|
334
|
-
`plan --out <file>` saves the plan without mutation or lock changes. `deploy --reviewed-plan <file>` requires `--prune` and
|
|
334
|
+
`plan --out <file>` saves the plan without mutation or lock changes. `deploy --reviewed-plan <file>` requires `--prune` and fences the whole reviewed deployment: desired and target definition hashes for every tracked family (including noops), managed target identities, versions and activation, authenticated instance, policy, tracked scope, and the deletion list with its timing (`beforeUpserts: true` where required). Drift or an older artifact without `reviewedPlanVersion: 1` blocks all writes and requires a fresh reviewed plan. The same comparison runs again after confirmation. Component writes retain the reviewed target identity, hash and version through execution: metadata and element saves obtain API mutation reviews and send their tokens in `x-revo-mutation-review`. A later version change, unavailable review route, or malformed review stops the deployment instead of refreshing the expected version or forcing the write. Regenerate reviewed plans saved by older CLI versions for replacements that now require early deletion. Each early deletion rechecks the remaining Job Template/Event/Schedule graph. Upserts are followed by another live comparison of the remaining prune plan. Each deletion rechecks identity and definition, verifies disappearance from the active catalog and clears only the selected target baseline; verified partition deletion retains its lock tombstone. Cascading table/view operations additionally recheck the remaining dependency graph. Deployment remains a sequence of API operations, not one server-side transaction: concurrent edits can cause a guarded rejection after earlier verified writes. Metadata and elements are separate guarded writes; the elements expect only the version increment made by this deployment. Readback verifies the accepted result but never authorizes overwriting newer target changes. A fresh plan is required after target drift or a failed partial deployment.
|
|
335
335
|
|
|
336
|
-
`deploy` always shows the plan before interactive confirmation; `--yes` supplies noninteractive approval. Ordinary resource rows, field names, dependency hints and metadata use one line per item. Field/value diffs, list changes and code/SQL diffs retain multiline Git-style formatting. `revo version --json` advertises `workspacePrune` and `
|
|
336
|
+
`deploy` always shows the plan before interactive confirmation; `--yes` supplies noninteractive approval. Ordinary resource rows, field names, dependency hints and metadata use one line per item. Field/value diffs, list changes and code/SQL diffs retain multiline Git-style formatting. `revo version --json` advertises `workspacePrune`, `reviewedPrunePlan`, `reviewedDeploymentPlan` and `componentMutationReview` so CI can reject older releases that ignore unknown flags. Without `--prune`, repository deployment remains upsert-only.
|
|
337
337
|
|
|
338
338
|
Component-only reconciliation remains available through `revo component plan --all --prune` and `revo component push --all --prune --yes`; interactive confirmation is also supported. This matches the configured identity, rechecks local reappearance and live target drift, verifies deletion and clears only the selected environment baseline. `--force` is not required for explicit Component pruning. Named `migrate` and legacy `env apply` retain their existing scope and confirmation rules; `migrate --prune` is rejected.
|
|
339
339
|
|
package/dist/src/cli.js
CHANGED
|
@@ -198,7 +198,7 @@ async function runMain(args, argv) {
|
|
|
198
198
|
const command = args._[0];
|
|
199
199
|
const noPositionals = args._.length === 0;
|
|
200
200
|
if (command === 'version' || ((args.version !== undefined || args.V !== undefined) && noPositionals)) {
|
|
201
|
-
print(args.json ? { version: packageVersion, capabilities: { workspacePrune: true, reviewedPrunePlan: true } } : packageVersion);
|
|
201
|
+
print(args.json ? { version: packageVersion, capabilities: { workspacePrune: true, reviewedPrunePlan: true, reviewedDeploymentPlan: true, componentMutationReview: true } } : packageVersion);
|
|
202
202
|
return;
|
|
203
203
|
}
|
|
204
204
|
if (command === 'info' || ((args.i === true || args.info === true) && noPositionals)) {
|
package/dist/src/client.d.ts
CHANGED
|
@@ -445,7 +445,8 @@ export declare class RevoClient {
|
|
|
445
445
|
}>;
|
|
446
446
|
getComponent(componentId: string, options?: Pick<RequestOptions, 'timeoutMs'>): Promise<unknown>;
|
|
447
447
|
createComponent(body: unknown): Promise<unknown>;
|
|
448
|
-
|
|
448
|
+
reviewComponent(componentId: string, body: unknown): Promise<unknown>;
|
|
449
|
+
updateComponent(componentId: string, body: unknown, expectedToken?: string): Promise<unknown>;
|
|
449
450
|
deleteComponent(componentId: string): Promise<ApiResponse<unknown>>;
|
|
450
451
|
deleteWorkspaceResource(resource: TrackableResourceType, id: string): Promise<unknown>;
|
|
451
452
|
private accountForSync;
|
|
@@ -522,7 +523,8 @@ export declare class RevoClient {
|
|
|
522
523
|
deleteRoleGroup(roleGroupId: string): Promise<ApiResponse<unknown>>;
|
|
523
524
|
listSystemRoles(): Promise<unknown>;
|
|
524
525
|
listAllSystemRoles(): Promise<SystemRoleRecord[]>;
|
|
525
|
-
|
|
526
|
+
reviewComponentElements(componentId: string, body: unknown): Promise<unknown>;
|
|
527
|
+
saveComponentElements(componentId: string, body: unknown, expectedToken?: string): Promise<ApiResponse<unknown>>;
|
|
526
528
|
}
|
|
527
529
|
export { COMPONENT_LIST_PAGE_SIZE };
|
|
528
530
|
export { buildUrl, normalizeToken };
|
package/dist/src/client.js
CHANGED
|
@@ -1175,9 +1175,13 @@ export class RevoClient {
|
|
|
1175
1175
|
spinnerLabel: 'Creating component',
|
|
1176
1176
|
});
|
|
1177
1177
|
}
|
|
1178
|
-
async
|
|
1178
|
+
async reviewComponent(componentId, body) {
|
|
1179
|
+
return this.requestData('POST', `/api/v1/component/${componentId}/review`, { body });
|
|
1180
|
+
}
|
|
1181
|
+
async updateComponent(componentId, body, expectedToken) {
|
|
1179
1182
|
return this.requestData('PUT', `/api/v1/component/${componentId}`, {
|
|
1180
1183
|
body,
|
|
1184
|
+
...(expectedToken ? { headers: { 'x-revo-mutation-review': expectedToken } } : {}),
|
|
1181
1185
|
spinnerLabel: 'Updating component',
|
|
1182
1186
|
});
|
|
1183
1187
|
}
|
|
@@ -1654,8 +1658,14 @@ export class RevoClient {
|
|
|
1654
1658
|
async listAllSystemRoles() {
|
|
1655
1659
|
return unwrapList(await this.listSystemRoles()).filter(isRecord);
|
|
1656
1660
|
}
|
|
1657
|
-
async
|
|
1658
|
-
return this.
|
|
1661
|
+
async reviewComponentElements(componentId, body) {
|
|
1662
|
+
return this.requestData('POST', `/api/v1/component/${componentId}/save/review`, { body });
|
|
1663
|
+
}
|
|
1664
|
+
async saveComponentElements(componentId, body, expectedToken) {
|
|
1665
|
+
return this.request('POST', `/api/v1/component/${componentId}/save`, {
|
|
1666
|
+
body,
|
|
1667
|
+
...(expectedToken ? { headers: { 'x-revo-mutation-review': expectedToken } } : {}),
|
|
1668
|
+
});
|
|
1659
1669
|
}
|
|
1660
1670
|
}
|
|
1661
1671
|
export { COMPONENT_LIST_PAGE_SIZE };
|
|
@@ -438,6 +438,16 @@ function componentSourceHash(component, identity) {
|
|
|
438
438
|
? hashPortableComponentSource(component)
|
|
439
439
|
: hashComponentSource(component);
|
|
440
440
|
}
|
|
441
|
+
function componentReviewToken(response, componentId, expectedVersion, targetPath) {
|
|
442
|
+
const review = isRecord(response) && isRecord(response.data) ? response.data : response;
|
|
443
|
+
if (!isRecord(review) || review.kind !== 'mutation_review' || review.schemaVersion !== 1
|
|
444
|
+
|| !isRecord(review.target) || review.target.refId !== componentId || review.target.refType !== 'COMPONENTS'
|
|
445
|
+
|| !Number.isSafeInteger(expectedVersion) || review.baseVersion !== expectedVersion
|
|
446
|
+
|| typeof review.token !== 'string' || !review.token) {
|
|
447
|
+
throw new Error(`Cannot push ${targetPath}: target changed since the reviewed version or the API lacks mutation review support; run plan again.`);
|
|
448
|
+
}
|
|
449
|
+
return review.token;
|
|
450
|
+
}
|
|
441
451
|
function writeComponentPushVerificationLog(input) {
|
|
442
452
|
const outputDir = path.join(input.cwd, '.revoengine', 'logs', 'component-push');
|
|
443
453
|
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
|
@@ -1165,6 +1175,15 @@ async function pushSingleComponent(context, manifestPath, remoteCatalog) {
|
|
|
1165
1175
|
}
|
|
1166
1176
|
try {
|
|
1167
1177
|
const remote = await resolveRemoteComponentForLocal(context, component, identity, resolvedRemoteCatalog);
|
|
1178
|
+
if (context.componentReview) {
|
|
1179
|
+
const reviewed = context.componentReview.get(identityKey);
|
|
1180
|
+
if (!reviewed || componentSourceHash(component, identity) !== reviewed.localHash
|
|
1181
|
+
|| (remote ? componentSourceHash(remote, identity) : null) !== reviewed.remoteHash
|
|
1182
|
+
|| (remote ? componentIdOf(remote) : undefined) !== reviewed.remoteComponentId
|
|
1183
|
+
|| (remote ? componentVersion(remote) : null) !== reviewed.remoteVersion) {
|
|
1184
|
+
throw new Error(`Cannot push ${targetPath}: component changed after the deployment plan was reviewed; run plan again.`);
|
|
1185
|
+
}
|
|
1186
|
+
}
|
|
1168
1187
|
if (!remote) {
|
|
1169
1188
|
if (identity.mode === 'stableKey') {
|
|
1170
1189
|
const created = unwrapComponent(await client.createComponent(buildComponentCreatePayload(component, identity)));
|
|
@@ -1294,12 +1313,22 @@ async function pushSingleComponent(context, manifestPath, remoteCatalog) {
|
|
|
1294
1313
|
return result;
|
|
1295
1314
|
}
|
|
1296
1315
|
let configurationChanged = false;
|
|
1316
|
+
let expectedSaveVersion = componentVersion(remote);
|
|
1297
1317
|
const operations = {};
|
|
1298
1318
|
let errorOperationId;
|
|
1299
1319
|
if (portableDiff.configurationFields.length > 0) {
|
|
1300
1320
|
try {
|
|
1301
|
-
|
|
1321
|
+
const body = buildPortableComponentUpdatePayload(component, remote, portableDiff.configurationFields);
|
|
1322
|
+
if (context.componentReview) {
|
|
1323
|
+
const token = componentReviewToken(await client.reviewComponent(remoteComponentId, body), remoteComponentId, expectedSaveVersion, targetPath);
|
|
1324
|
+
await client.updateComponent(remoteComponentId, body, token);
|
|
1325
|
+
}
|
|
1326
|
+
else {
|
|
1327
|
+
await client.updateComponent(remoteComponentId, body);
|
|
1328
|
+
}
|
|
1302
1329
|
configurationChanged = true;
|
|
1330
|
+
if (expectedSaveVersion !== null)
|
|
1331
|
+
expectedSaveVersion += 1;
|
|
1303
1332
|
operations.configurationUpdate = { outcome: 'accepted' };
|
|
1304
1333
|
}
|
|
1305
1334
|
catch (error) {
|
|
@@ -1326,7 +1355,13 @@ async function pushSingleComponent(context, manifestPath, remoteCatalog) {
|
|
|
1326
1355
|
if (portableDiff.elementsChanged) {
|
|
1327
1356
|
try {
|
|
1328
1357
|
const elements = buildPushElements(component, remote, identity);
|
|
1329
|
-
|
|
1358
|
+
let expectedToken;
|
|
1359
|
+
if (context.componentReview) {
|
|
1360
|
+
expectedToken = componentReviewToken(await client.reviewComponentElements(remoteComponentId, elements), remoteComponentId, expectedSaveVersion, targetPath);
|
|
1361
|
+
}
|
|
1362
|
+
const response = expectedToken
|
|
1363
|
+
? await client.saveComponentElements(remoteComponentId, elements, expectedToken)
|
|
1364
|
+
: await client.saveComponentElements(remoteComponentId, elements);
|
|
1330
1365
|
elementsChanged = response.status !== 304;
|
|
1331
1366
|
const operationId = readRevoOperationId(response.headers);
|
|
1332
1367
|
errorOperationId = operationId || errorOperationId;
|
|
@@ -2,6 +2,7 @@ import fs from 'node:fs';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { normalizeStableKeyValue } from "../resource-metadata.js";
|
|
4
4
|
import { samePrunePlan } from "../workspace-prune.js";
|
|
5
|
+
import { sameReviewedPlan } from "../reviewed-plan.js";
|
|
5
6
|
import { schemaItemAction, viewItemAction, componentItemAction, jobTemplateItemAction, endpointItemAction, scheduleItemAction, eventItemAction, groupItemAction, roleGroupItemAction, } from "../migration-actions.js";
|
|
6
7
|
import { DEFAULT_ENV_NAME } from "../config.js";
|
|
7
8
|
import { buildMigrationPlan, pullResourcesToWorkspace, runMigration, } from "../migration.js";
|
|
@@ -568,6 +569,9 @@ export async function handleDeployCommand(context) {
|
|
|
568
569
|
|| !samePrunePlan(reviewed.prune, preview.prune)) {
|
|
569
570
|
throw new Error('Reviewed deletion plan does not match this instance, resource scope or live target; run plan again.');
|
|
570
571
|
}
|
|
572
|
+
if (!sameReviewedPlan(reviewed, preview)) {
|
|
573
|
+
throw new Error('Reviewed deployment plan does not match the workspace or live target; run plan again and review it before deploying.');
|
|
574
|
+
}
|
|
571
575
|
}
|
|
572
576
|
// Interactive confirmation must always expose the plan, including JSON mode.
|
|
573
577
|
if (!readBoolFlag(context.args, ['json']))
|
|
@@ -578,7 +582,7 @@ export async function handleDeployCommand(context) {
|
|
|
578
582
|
throw new Error(`Deployment plan is blocked by ${preview.blockers.length} issue(s).`);
|
|
579
583
|
await confirmDeploy(context);
|
|
580
584
|
const startedAt = Date.now();
|
|
581
|
-
const result = await runMigration({ ...input, reviewedPrune: preview.prune });
|
|
585
|
+
const result = await runMigration({ ...input, reviewedPrune: preview.prune, reviewedPlan: preview });
|
|
582
586
|
if (readBoolFlag(context.args, ['json'])) {
|
|
583
587
|
context.print({ ...result, command: 'deploy' });
|
|
584
588
|
}
|
package/dist/src/migration.d.ts
CHANGED
|
@@ -41,6 +41,7 @@ export type MigrationSourcePullSummary = {
|
|
|
41
41
|
};
|
|
42
42
|
export type MigrationPlan = {
|
|
43
43
|
schemaVersion: 2;
|
|
44
|
+
reviewedPlanVersion?: 1;
|
|
44
45
|
command: 'plan';
|
|
45
46
|
from: string;
|
|
46
47
|
to: string;
|
|
@@ -114,6 +115,7 @@ type MigrationInputBase = {
|
|
|
114
115
|
detailedDiff?: boolean;
|
|
115
116
|
prune?: boolean;
|
|
116
117
|
reviewedPrune?: WorkspacePrunePlan;
|
|
118
|
+
reviewedPlan?: MigrationPlan;
|
|
117
119
|
};
|
|
118
120
|
export type MigrationInput = MigrationInputBase & ({
|
|
119
121
|
sourceMode: 'workspace';
|
package/dist/src/migration.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AGENT_LAYOUT, buildAgentsPlan, pullAgentsToWorkspace, pushAgents } from "./resource-syncs/agent-sync.js";
|
|
2
2
|
import { projectRepositoryItems, migrationItemOperation, BLOCKING_SCHEMA_STATUSES, schemaItemAction, viewItemIsBlocked, viewItemAction, componentItemAction, jobTemplateItemAction, endpointItemAction, scheduleItemAction, eventItemAction, groupItemAction, roleGroupItemAction, serviceAccountItemAction, } from "./migration-actions.js";
|
|
3
3
|
import fs from 'node:fs';
|
|
4
|
+
import { sameReviewedPlan } from "./reviewed-plan.js";
|
|
4
5
|
import { applyWorkspacePrune, buildWorkspacePrunePlan, samePrunePlan } from "./workspace-prune.js";
|
|
5
6
|
import { planIdentityMigration } from "./resource-syncs/identity-migration.js";
|
|
6
7
|
import { SERVICE_ACCOUNTS_DIRECTORY, buildServiceAccountsPlan, pullServiceAccountsToWorkspace, pushServiceAccounts } from "./resource-syncs/service-account-sync.js";
|
|
@@ -821,6 +822,9 @@ function componentCommandContext(input) {
|
|
|
821
822
|
client: input.client,
|
|
822
823
|
componentEnvironment: input.envName,
|
|
823
824
|
componentIdentity: migrationComponentIdentity(input.cwd),
|
|
825
|
+
...(input.reviewedComponents ? { componentReview: new Map(input.reviewedComponents.map(item => [item.identityKey || item.stableKey || item.componentId, { ...item,
|
|
826
|
+
remoteComponentId: item.remoteHash === null ? undefined : item.remoteComponentId,
|
|
827
|
+
remoteVersion: item.remoteHash === null ? null : item.remoteVersion }])) } : {}),
|
|
824
828
|
cwd: input.cwd,
|
|
825
829
|
packageVersion: 'migration',
|
|
826
830
|
print: () => undefined,
|
|
@@ -1082,7 +1086,7 @@ async function planWorkspace(input) {
|
|
|
1082
1086
|
const identities = await planIdentityMigration({ client, cwd: input.cwd, stableKeyName, resources });
|
|
1083
1087
|
if (input.prune && input.sourceMode !== 'workspace')
|
|
1084
1088
|
throw new Error('Prune requires repository plan/deploy; named migration remains upsert-only.');
|
|
1085
|
-
const prune = input.prune ? await buildWorkspacePrunePlan({ cwd: input.cwd, client, resources }) : undefined;
|
|
1089
|
+
const prune = input.prune ? await buildWorkspacePrunePlan({ cwd: input.cwd, client, resources, captureTargets: true }) : undefined;
|
|
1086
1090
|
const serviceAccounts = resources.includes('service-account')
|
|
1087
1091
|
? await runMigrationStage('target plan', 'service-account', environmentLabel, () => buildServiceAccountsPlan({ client, cwd: input.cwd, envName: environmentKey, stableKeyName,
|
|
1088
1092
|
projectedIdentities: identities?.projection })) : undefined;
|
|
@@ -1182,6 +1186,7 @@ async function planWorkspace(input) {
|
|
|
1182
1186
|
agentPlugins,
|
|
1183
1187
|
agents,
|
|
1184
1188
|
});
|
|
1189
|
+
combined.reviewedPlanVersion = 1;
|
|
1185
1190
|
if (identities) {
|
|
1186
1191
|
combined.identityOrder = identities.ordered.map(({ resource, stableKey }) => ({ resource, stableKey }));
|
|
1187
1192
|
}
|
|
@@ -1273,6 +1278,11 @@ export async function runMigration(input) {
|
|
|
1273
1278
|
initialPlan.readyToMigrate = false;
|
|
1274
1279
|
initialPlan.verdict = 'blocked';
|
|
1275
1280
|
}
|
|
1281
|
+
if (input.reviewedPlan && !sameReviewedPlan(input.reviewedPlan, initialPlan)) {
|
|
1282
|
+
initialPlan.blockers.push('Deployment state changed after confirmation; run plan again before deploying.');
|
|
1283
|
+
initialPlan.readyToMigrate = false;
|
|
1284
|
+
initialPlan.verdict = 'blocked';
|
|
1285
|
+
}
|
|
1276
1286
|
const base = {
|
|
1277
1287
|
schemaVersion: 2,
|
|
1278
1288
|
command: 'run',
|
|
@@ -1393,6 +1403,7 @@ export async function runMigration(input) {
|
|
|
1393
1403
|
envName: componentTargetEnvironment(input),
|
|
1394
1404
|
client: targetClient,
|
|
1395
1405
|
operation: 'push',
|
|
1406
|
+
...(input.reviewedPlan ? { reviewedComponents: initialPlan.components?.items } : {}),
|
|
1396
1407
|
}), { force: true, yes: true });
|
|
1397
1408
|
phaseResults.component = componentResults;
|
|
1398
1409
|
results.push(...componentResults);
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { hashStable } from "./component-lock.js";
|
|
2
|
+
const families = ['databaseSchemas', 'databaseViews', 'components', 'jobTemplates', 'endpoints',
|
|
3
|
+
'schedules', 'events', 'groups', 'roleGroups', 'serviceAccounts', 'agentPlugins', 'agents'];
|
|
4
|
+
// Compare authoring state and intended writes, independent of paths, timestamps,
|
|
5
|
+
// presentation diffs and lock adoption bookkeeping in separate CI checkouts.
|
|
6
|
+
function reviewState(plan) {
|
|
7
|
+
return {
|
|
8
|
+
target: plan.pruneTargetKey,
|
|
9
|
+
resources: plan.resources,
|
|
10
|
+
policy: plan.policy,
|
|
11
|
+
identityOrder: plan.identityOrder,
|
|
12
|
+
targets: plan.prune?.targetState,
|
|
13
|
+
families: families.map(family => ({ family, items: (plan[family]?.items || []).map(item => {
|
|
14
|
+
const value = item;
|
|
15
|
+
return Object.fromEntries(['stableKey', 'identityKey', 'componentId', 'remoteComponentId', 'remoteVersion',
|
|
16
|
+
'desiredHash', 'localHash', 'currentHash', 'remoteHash', 'operation', 'desiredActive', 'currentActive',
|
|
17
|
+
'targetRevisionHash', 'componentDesiredHash'].filter(key => value[key] !== undefined).map(key => [key, value[key]]));
|
|
18
|
+
}).sort((left, right) => hashStable(left).localeCompare(hashStable(right))) })),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export function sameReviewedPlan(reviewed, live) {
|
|
22
|
+
return reviewed.reviewedPlanVersion === 1 && live.reviewedPlanVersion === 1
|
|
23
|
+
&& reviewed.readyToMigrate && live.readyToMigrate
|
|
24
|
+
&& hashStable(reviewState(reviewed)) === hashStable(reviewState(live));
|
|
25
|
+
}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -9,6 +9,12 @@ export type CommandContext = {
|
|
|
9
9
|
client: RevoClient;
|
|
10
10
|
componentEnvironment?: string;
|
|
11
11
|
componentIdentity?: ComponentIdentityConfig;
|
|
12
|
+
componentReview?: Map<string, {
|
|
13
|
+
localHash: string | null;
|
|
14
|
+
remoteHash: string | null;
|
|
15
|
+
remoteComponentId?: string;
|
|
16
|
+
remoteVersion: number | null;
|
|
17
|
+
}>;
|
|
12
18
|
cwd: string;
|
|
13
19
|
packageVersion: string;
|
|
14
20
|
print: (value: unknown) => void;
|
|
@@ -14,6 +14,13 @@ export type WorkspacePruneItem = {
|
|
|
14
14
|
export type WorkspacePrunePlan = {
|
|
15
15
|
items: WorkspacePruneItem[];
|
|
16
16
|
blockers: string[];
|
|
17
|
+
targetState?: Array<{
|
|
18
|
+
resource: TrackableResourceType;
|
|
19
|
+
stableKey: string;
|
|
20
|
+
targetId: string;
|
|
21
|
+
version: number | null;
|
|
22
|
+
active: unknown;
|
|
23
|
+
}>;
|
|
17
24
|
};
|
|
18
25
|
type Inventory = Partial<Record<TrackableResourceType, ResourceRecord[]>>;
|
|
19
26
|
type LocalManifests = Partial<Record<TrackableResourceType, Map<string, Record<string, unknown>>>>;
|
|
@@ -29,6 +36,7 @@ export declare function buildWorkspacePrunePlan(input: {
|
|
|
29
36
|
cwd: string;
|
|
30
37
|
client: RevoClient;
|
|
31
38
|
resources: readonly TrackableResourceType[];
|
|
39
|
+
captureTargets?: boolean;
|
|
32
40
|
}): Promise<WorkspacePrunePlan>;
|
|
33
41
|
export declare function samePrunePlan(left: WorkspacePrunePlan, right: WorkspacePrunePlan): boolean;
|
|
34
42
|
export declare function applyWorkspacePrune(input: {
|
|
@@ -390,10 +390,20 @@ export async function buildWorkspacePrunePlan(input) {
|
|
|
390
390
|
const profile = isRecord(me) && isRecord(me.data) ? me.data : me;
|
|
391
391
|
const actorId = isRecord(profile) && isRecord(profile.user) ? String(profile.user.userId || '')
|
|
392
392
|
: isRecord(profile) ? String(profile.userId || '') : undefined;
|
|
393
|
-
|
|
393
|
+
const stableKeyName = readProjectStableKeyName(input.cwd);
|
|
394
|
+
const plan = planWorkspacePrune({ resources: input.resources, local, inventory, stableKeyName, actorId });
|
|
395
|
+
if (input.captureTargets) {
|
|
396
|
+
plan.targetState = input.resources.flatMap(resource => (inventory[resource] || []).filter(active).flatMap(record => {
|
|
397
|
+
const stableKey = readConfiguredResourceMetadataStableKey(record, stableKeyName);
|
|
398
|
+
return stableKey ? [{ resource, stableKey: normalizeStableKeyValue(stableKey), targetId: resourceIdOf(record),
|
|
399
|
+
version: typeof record.version === 'number' ? record.version : null, active: record.active ?? null }] : [];
|
|
400
|
+
})).sort((left, right) => key(left.resource, left.stableKey).localeCompare(key(right.resource, right.stableKey))
|
|
401
|
+
|| left.targetId.localeCompare(right.targetId));
|
|
402
|
+
}
|
|
403
|
+
return plan;
|
|
394
404
|
}
|
|
395
405
|
export function samePrunePlan(left, right) {
|
|
396
|
-
return hashStable(left) === hashStable(right);
|
|
406
|
+
return hashStable({ items: left.items, blockers: left.blockers }) === hashStable({ items: right.items, blockers: right.blockers });
|
|
397
407
|
}
|
|
398
408
|
function clearPruneBaseline(cwd, envName, item) {
|
|
399
409
|
const { projectRoot } = requireProjectLayout(cwd, 'Workspace prune');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@revoengine/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.24",
|
|
4
4
|
"description": "CLI package for the RevoEngine Platform API",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"scripts": {
|
|
12
12
|
"build": "npm run clean && tsc -p tsconfig.build.json",
|
|
13
13
|
"clean": "node --input-type=module -e \"import fs from 'node:fs'; fs.rmSync('dist', { recursive: true, force: true });\"",
|
|
14
|
-
"check": "node --input-type=module -e \"await import('./src/config.ts'); await import('./src/legacy.ts'); await import('./src/http-trace.ts'); await import('./src/request-queue.ts'); await import('./src/client.ts'); await import('./src/component-lock.ts'); await import('./src/component-contract.ts'); await import('./src/database-indexes.ts'); await import('./src/diff-details.ts'); await import('./src/resource-metadata.ts'); await import('./src/tracked-resources.ts'); await import('./src/resource-inventory.ts'); await import('./src/metadata-backfill.ts'); await import('./src/workspace-component.ts'); await import('./src/workspace-resource.ts'); await import('./src/database-table-artifacts.ts'); await import('./src/project.ts'); await import('./src/prompt.ts'); await import('./src/runtime-view.ts'); await import('./src/spinner.ts'); await import('./src/types.ts'); await import('./src/utils.ts'); await import('./src/resource-syncs/util.ts'); await import('./src/resource-syncs/agent-sync.ts'); await import('./src/resource-syncs/database-table-sync.ts'); await import('./src/resource-syncs/database-view-sync.ts'); await import('./src/resource-syncs/endpoint-sync.ts'); await import('./src/resource-syncs/group-sync.ts'); await import('./src/resource-syncs/role-group-sync.ts'); await import('./src/resource-syncs/job-template-sync.ts'); await import('./src/resource-syncs/schedule-sync.ts'); await import('./src/resource-syncs/event-sync.ts'); await import('./src/resource-syncs/account-principal.ts'); await import('./src/resource-syncs/identity-migration.ts'); await import('./src/resource-syncs/service-account-sync.ts'); await import('./src/commands/service-accounts.ts'); await import('./src/commands/agents.ts'); await import('./src/migration-actions.ts'); await import('./src/migration.ts'); await import('./src/workspace-diff.ts'); await import('./src/workspace-prune.ts'); await import('./src/sync-output.ts'); await import('./src/ui.ts'); await import('./src/update-notifier.ts'); await import('./src/env-sync.ts'); await import('./src/commands/auth.ts'); await import('./src/commands/component.ts'); await import('./src/commands/database-tables.ts'); await import('./src/commands/database-views.ts'); await import('./src/commands/endpoints.ts'); await import('./src/commands/env.ts'); await import('./src/commands/events.ts'); await import('./src/commands/groups.ts'); await import('./src/commands/info.ts'); await import('./src/commands/job-templates.ts'); await import('./src/commands/metadata.ts'); await import('./src/commands/migrate.ts'); await import('./src/commands/request.ts'); await import('./src/commands/role-groups.ts'); await import('./src/commands/search.ts'); await import('./src/commands/schedules.ts'); await import('./src/commands/terminal-service.ts'); await import('./src/commands/terminal-browser.ts'); await import('./src/commands/terminal-image.ts'); await import('./src/commands/terminal-sandbox.ts'); await import('./src/commands/terminal-patch.ts'); await import('./src/commands/terminal-patch-worker.ts'); await import('./src/commands/terminal.ts'); await import('./src/cli.ts'); await import('./src/index.ts'); await import('./bin/revo.ts'); await import('./scripts/dev.ts')\"",
|
|
14
|
+
"check": "node --input-type=module -e \"await import('./src/config.ts'); await import('./src/legacy.ts'); await import('./src/http-trace.ts'); await import('./src/request-queue.ts'); await import('./src/client.ts'); await import('./src/component-lock.ts'); await import('./src/component-contract.ts'); await import('./src/database-indexes.ts'); await import('./src/diff-details.ts'); await import('./src/resource-metadata.ts'); await import('./src/tracked-resources.ts'); await import('./src/resource-inventory.ts'); await import('./src/metadata-backfill.ts'); await import('./src/workspace-component.ts'); await import('./src/workspace-resource.ts'); await import('./src/database-table-artifacts.ts'); await import('./src/project.ts'); await import('./src/prompt.ts'); await import('./src/runtime-view.ts'); await import('./src/spinner.ts'); await import('./src/types.ts'); await import('./src/utils.ts'); await import('./src/resource-syncs/util.ts'); await import('./src/resource-syncs/agent-sync.ts'); await import('./src/resource-syncs/database-table-sync.ts'); await import('./src/resource-syncs/database-view-sync.ts'); await import('./src/resource-syncs/endpoint-sync.ts'); await import('./src/resource-syncs/group-sync.ts'); await import('./src/resource-syncs/role-group-sync.ts'); await import('./src/resource-syncs/job-template-sync.ts'); await import('./src/resource-syncs/schedule-sync.ts'); await import('./src/resource-syncs/event-sync.ts'); await import('./src/resource-syncs/account-principal.ts'); await import('./src/resource-syncs/identity-migration.ts'); await import('./src/resource-syncs/service-account-sync.ts'); await import('./src/commands/service-accounts.ts'); await import('./src/commands/agents.ts'); await import('./src/migration-actions.ts'); await import('./src/reviewed-plan.ts'); await import('./src/migration.ts'); await import('./src/workspace-diff.ts'); await import('./src/workspace-prune.ts'); await import('./src/sync-output.ts'); await import('./src/ui.ts'); await import('./src/update-notifier.ts'); await import('./src/env-sync.ts'); await import('./src/commands/auth.ts'); await import('./src/commands/component.ts'); await import('./src/commands/database-tables.ts'); await import('./src/commands/database-views.ts'); await import('./src/commands/endpoints.ts'); await import('./src/commands/env.ts'); await import('./src/commands/events.ts'); await import('./src/commands/groups.ts'); await import('./src/commands/info.ts'); await import('./src/commands/job-templates.ts'); await import('./src/commands/metadata.ts'); await import('./src/commands/migrate.ts'); await import('./src/commands/request.ts'); await import('./src/commands/role-groups.ts'); await import('./src/commands/search.ts'); await import('./src/commands/schedules.ts'); await import('./src/commands/terminal-service.ts'); await import('./src/commands/terminal-browser.ts'); await import('./src/commands/terminal-image.ts'); await import('./src/commands/terminal-sandbox.ts'); await import('./src/commands/terminal-patch.ts'); await import('./src/commands/terminal-patch-worker.ts'); await import('./src/commands/terminal.ts'); await import('./src/cli.ts'); await import('./src/index.ts'); await import('./bin/revo.ts'); await import('./scripts/dev.ts')\"",
|
|
15
15
|
"dev": "node ./scripts/dev.ts",
|
|
16
16
|
"prepack": "npm run build",
|
|
17
17
|
"test": "node --test ./test/*.test.ts",
|