agentera 3.0.0-dev.23 → 3.0.0-dev.25
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/bundle/CHANGELOG.md +13 -5
- package/bundle/README.md +9 -8
- package/bundle/UPGRADE.md +10 -24
- package/bundle/agents/openai.yaml +1 -1
- package/bundle/references/adapters/package-manifest-interface-model.yaml +2 -0
- package/bundle/references/adapters/package-registry.yaml +9 -0
- package/bundle/references/artifacts/state-storage-authority.yaml +733 -12
- package/bundle/references/cli/agent-ready-state-contract.yaml +3 -3
- package/bundle/references/cli/prime-consumer-compatibility.yaml +2 -2
- package/bundle/references/cli/update-channels.yaml +4 -2
- package/bundle/references/cli/vocabulary.md +4 -4
- package/bundle/skills/agentera/SKILL.md +28 -14
- package/bundle/skills/agentera/capabilities/audit/schemas/artifacts.yaml +12 -12
- package/bundle/skills/agentera/capabilities/audit/schemas/validation.yaml +2 -2
- package/bundle/skills/agentera/capabilities/build/schemas/artifacts.yaml +12 -12
- package/bundle/skills/agentera/capabilities/build/schemas/validation.yaml +8 -8
- package/bundle/skills/agentera/capabilities/design/schemas/artifacts.yaml +6 -6
- package/bundle/skills/agentera/capabilities/discuss/schemas/artifacts.yaml +7 -7
- package/bundle/skills/agentera/capabilities/document/schemas/artifacts.yaml +12 -12
- package/bundle/skills/agentera/capabilities/optimize/schemas/artifacts.yaml +9 -9
- package/bundle/skills/agentera/capabilities/orchestrate/schemas/artifacts.yaml +11 -11
- package/bundle/skills/agentera/capabilities/plan/schemas/artifacts.yaml +9 -9
- package/bundle/skills/agentera/capabilities/profile/schemas/artifacts.yaml +2 -2
- package/bundle/skills/agentera/capabilities/research/schemas/artifacts.yaml +3 -3
- package/bundle/skills/agentera/capabilities/status/schemas/artifacts.yaml +11 -11
- package/bundle/skills/agentera/capabilities/vision/schemas/artifacts.yaml +8 -8
- package/bundle/skills/agentera/schemas/artifacts/decisions.yaml +15 -2
- package/bundle/skills/agentera/schemas/artifacts/docs.yaml +4 -1
- package/bundle/skills/agentera/schemas/artifacts/experiments.yaml +21 -21
- package/bundle/skills/agentera/schemas/artifacts/health.yaml +15 -2
- package/bundle/skills/agentera/schemas/artifacts/plan.yaml +36 -15
- package/bundle/skills/agentera/schemas/artifacts/progress.yaml +15 -2
- package/bundle/skills/agentera/schemas/artifacts/todo.yaml +4 -4
- package/dist/capabilities/audit/instructions.js +13 -1
- package/dist/capabilities/audit/instructions.js.map +1 -1
- package/dist/capabilities/build/instructions.js +14 -1
- package/dist/capabilities/build/instructions.js.map +1 -1
- package/dist/capabilities/discuss/instructions.js +11 -1
- package/dist/capabilities/discuss/instructions.js.map +1 -1
- package/dist/capabilities/document/instructions.js +9 -1
- package/dist/capabilities/document/instructions.js.map +1 -1
- package/dist/capabilities/index.js +7 -7
- package/dist/capabilities/index.js.map +1 -1
- package/dist/capabilities/optimize/instructions.js +10 -1
- package/dist/capabilities/optimize/instructions.js.map +1 -1
- package/dist/capabilities/orchestrate/instructions.js +13 -2
- package/dist/capabilities/orchestrate/instructions.js.map +1 -1
- package/dist/capabilities/plan/instructions.js +10 -1
- package/dist/capabilities/plan/instructions.js.map +1 -1
- package/dist/cli/capabilityContext/contract.js +10 -15
- package/dist/cli/capabilityContext/contract.js.map +1 -1
- package/dist/cli/capabilityContext/evidence.js +3 -3
- package/dist/cli/capabilityContext/evidence.js.map +1 -1
- package/dist/cli/capabilityContext/planState.js +5 -5
- package/dist/cli/capabilityContext/planState.js.map +1 -1
- package/dist/cli/capabilityContext/progress.js +1 -1
- package/dist/cli/capabilityContext/progress.js.map +1 -1
- package/dist/cli/capabilityContext/shared.js +8 -2
- package/dist/cli/capabilityContext/shared.js.map +1 -1
- package/dist/cli/capabilityContext/slim.js +2 -1
- package/dist/cli/capabilityContext/slim.js.map +1 -1
- package/dist/cli/capabilityContext/startup.js +18 -7
- package/dist/cli/capabilityContext/startup.js.map +1 -1
- package/dist/cli/capabilityContext/types.js +4 -4
- package/dist/cli/capabilityContext/types.js.map +1 -1
- package/dist/cli/commands/backfill.js +39 -2
- package/dist/cli/commands/backfill.js.map +1 -1
- package/dist/cli/commands/durability.js +34 -1
- package/dist/cli/commands/durability.js.map +1 -1
- package/dist/cli/commands/entityMigrate.js +128 -0
- package/dist/cli/commands/entityMigrate.js.map +1 -0
- package/dist/cli/commands/migrate.js +4 -0
- package/dist/cli/commands/migrate.js.map +1 -1
- package/dist/cli/commands/prime/briefOrientation.js +5 -3
- package/dist/cli/commands/prime/briefOrientation.js.map +1 -1
- package/dist/cli/commands/prime/collectEntityOrientation.js +148 -0
- package/dist/cli/commands/prime/collectEntityOrientation.js.map +1 -0
- package/dist/cli/commands/prime/collectOrientationState.js +21 -27
- package/dist/cli/commands/prime/collectOrientationState.js.map +1 -1
- package/dist/cli/commands/prime/orientationOutput.js +1 -1
- package/dist/cli/commands/prime/orientationOutput.js.map +1 -1
- package/dist/cli/commands/prime.js +2 -0
- package/dist/cli/commands/prime.js.map +1 -1
- package/dist/cli/commands/query.js +41 -15
- package/dist/cli/commands/query.js.map +1 -1
- package/dist/cli/commands/schema.js +7 -5
- package/dist/cli/commands/schema.js.map +1 -1
- package/dist/cli/commands/state/decisions.js +13 -0
- package/dist/cli/commands/state/decisions.js.map +1 -1
- package/dist/cli/commands/state/docs.js +38 -0
- package/dist/cli/commands/state/docs.js.map +1 -1
- package/dist/cli/commands/state/experimentRecords.js +82 -0
- package/dist/cli/commands/state/experimentRecords.js.map +1 -1
- package/dist/cli/commands/state/experiments.js +13 -0
- package/dist/cli/commands/state/experiments.js.map +1 -1
- package/dist/cli/commands/state/get.js +69 -2
- package/dist/cli/commands/state/get.js.map +1 -1
- package/dist/cli/commands/state/health.js +13 -0
- package/dist/cli/commands/state/health.js.map +1 -1
- package/dist/cli/commands/state/index.js +9 -0
- package/dist/cli/commands/state/index.js.map +1 -1
- package/dist/cli/commands/state/list.js +40 -7
- package/dist/cli/commands/state/list.js.map +1 -1
- package/dist/cli/commands/state/objective.js +24 -0
- package/dist/cli/commands/state/objective.js.map +1 -1
- package/dist/cli/commands/state/plan.js +14 -0
- package/dist/cli/commands/state/plan.js.map +1 -1
- package/dist/cli/commands/state/planTasks.js +38 -25
- package/dist/cli/commands/state/planTasks.js.map +1 -1
- package/dist/cli/commands/state/plans.js +32 -16
- package/dist/cli/commands/state/plans.js.map +1 -1
- package/dist/cli/commands/state/progress.js +12 -0
- package/dist/cli/commands/state/progress.js.map +1 -1
- package/dist/cli/commands/state/shared.js.map +1 -1
- package/dist/cli/commands/state/todo.js +30 -0
- package/dist/cli/commands/state/todo.js.map +1 -1
- package/dist/cli/commands/state/write.js +79 -4
- package/dist/cli/commands/state/write.js.map +1 -1
- package/dist/cli/commands/upgrade.js +65 -31
- package/dist/cli/commands/upgrade.js.map +1 -1
- package/dist/cli/commands/upgradeVerify.js +46 -14
- package/dist/cli/commands/upgradeVerify.js.map +1 -1
- package/dist/cli/commands/validate.js +65 -0
- package/dist/cli/commands/validate.js.map +1 -1
- package/dist/cli/dispatch/check.js +8 -1
- package/dist/cli/dispatch/check.js.map +1 -1
- package/dist/cli/dispatch/index.js +6 -0
- package/dist/cli/dispatch/index.js.map +1 -1
- package/dist/cli/dispatch/lifecycle.js +2 -5
- package/dist/cli/dispatch/lifecycle.js.map +1 -1
- package/dist/cli/dispatch/prime.js +15 -0
- package/dist/cli/dispatch/prime.js.map +1 -1
- package/dist/cli/dispatch/state.js +7 -1
- package/dist/cli/dispatch/state.js.map +1 -1
- package/dist/cli/help.js +78 -20
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/migrationRequired.js +84 -0
- package/dist/cli/migrationRequired.js.map +1 -0
- package/dist/cli/orientation/attention.js +2 -2
- package/dist/cli/orientation/attention.js.map +1 -1
- package/dist/cli/orientation.js +10 -7
- package/dist/cli/orientation.js.map +1 -1
- package/dist/cli/planArtifacts.js +192 -42
- package/dist/cli/planArtifacts.js.map +1 -1
- package/dist/cli/prime-blob.js +5 -5
- package/dist/cli/prime-blob.js.map +1 -1
- package/dist/cli/stateQuery.js +5 -5
- package/dist/cli/stateQuery.js.map +1 -1
- package/dist/hooks/compaction/status.js +25 -1
- package/dist/hooks/compaction/status.js.map +1 -1
- package/dist/hooks/cursorSessionStart.js +6 -0
- package/dist/hooks/cursorSessionStart.js.map +1 -1
- package/dist/hooks/sessionStart.js +62 -0
- package/dist/hooks/sessionStart.js.map +1 -1
- package/dist/registries/artifactRegistry.js +23 -14
- package/dist/registries/artifactRegistry.js.map +1 -1
- package/dist/registries/packageRegistry.js +1 -1
- package/dist/registries/packageRegistry.js.map +1 -1
- package/dist/state/archivePublication.js +3 -2
- package/dist/state/archivePublication.js.map +1 -1
- package/dist/state/decisionEntities.js +279 -0
- package/dist/state/decisionEntities.js.map +1 -0
- package/dist/state/decisionOverlay.js +2 -2
- package/dist/state/decisionOverlay.js.map +1 -1
- package/dist/state/decisionRevision.js +44 -34
- package/dist/state/decisionRevision.js.map +1 -1
- package/dist/state/directRetrieval.js.map +1 -1
- package/dist/state/durability.js +92 -1
- package/dist/state/durability.js.map +1 -1
- package/dist/state/entityCutover.js +390 -0
- package/dist/state/entityCutover.js.map +1 -0
- package/dist/state/entityCutoverGit.js +128 -0
- package/dist/state/entityCutoverGit.js.map +1 -0
- package/dist/state/entityMigrationPreview.js +803 -0
- package/dist/state/entityMigrationPreview.js.map +1 -0
- package/dist/state/entityPublicationContext.js +612 -0
- package/dist/state/entityPublicationContext.js.map +1 -0
- package/dist/state/entityStorage.js +807 -0
- package/dist/state/entityStorage.js.map +1 -0
- package/dist/state/experimentIdentity.js +23 -11
- package/dist/state/experimentIdentity.js.map +1 -1
- package/dist/state/gitBackfill.js.map +1 -1
- package/dist/state/healthEntities.js +227 -0
- package/dist/state/healthEntities.js.map +1 -0
- package/dist/state/healthEntityValidation.js +6 -0
- package/dist/state/healthEntityValidation.js.map +1 -0
- package/dist/state/legacyEntityCutoverEvidence.js +66 -0
- package/dist/state/legacyEntityCutoverEvidence.js.map +1 -0
- package/dist/state/listRetrieval.js.map +1 -1
- package/dist/state/objectiveExperimentEntities.js +321 -0
- package/dist/state/objectiveExperimentEntities.js.map +1 -0
- package/dist/state/planEntities.js +358 -0
- package/dist/state/planEntities.js.map +1 -0
- package/dist/state/progressEntities.js +382 -0
- package/dist/state/progressEntities.js.map +1 -0
- package/dist/state/projectRoot.js +63 -0
- package/dist/state/projectRoot.js.map +1 -0
- package/dist/state/projectionRecovery.js +458 -0
- package/dist/state/projectionRecovery.js.map +1 -0
- package/dist/state/retrievalAuthority.js +13 -6
- package/dist/state/retrievalAuthority.js.map +1 -1
- package/dist/state/safeProjectFile.js +153 -0
- package/dist/state/safeProjectFile.js.map +1 -0
- package/dist/state/stateMode.js +76 -0
- package/dist/state/stateMode.js.map +1 -0
- package/dist/state/todoDocsEntities.js +223 -0
- package/dist/state/todoDocsEntities.js.map +1 -0
- package/dist/state/todoDocsEntityValidation.js +26 -0
- package/dist/state/todoDocsEntityValidation.js.map +1 -0
- package/dist/state/write/candidateMutation.js +5 -55
- package/dist/state/write/candidateMutation.js.map +1 -1
- package/dist/state/write/explain.js +127 -28
- package/dist/state/write/explain.js.map +1 -1
- package/dist/state/write/lock.js +794 -87
- package/dist/state/write/lock.js.map +1 -1
- package/dist/state/write/mutation.js +5 -2
- package/dist/state/write/mutation.js.map +1 -1
- package/dist/state/write/operations.js +52 -7
- package/dist/state/write/operations.js.map +1 -1
- package/dist/state/write/planEvaluation.js +107 -0
- package/dist/state/write/planEvaluation.js.map +1 -0
- package/dist/state/write/planPublication.js +11 -55
- package/dist/state/write/planPublication.js.map +1 -1
- package/dist/state/write/transaction.js +88 -1
- package/dist/state/write/transaction.js.map +1 -1
- package/dist/upgrade/compatibility.js +4 -4
- package/dist/upgrade/compatibility.js.map +1 -1
- package/dist/upgrade/migrateArtifactsV2ToV3.js +13 -14
- package/dist/upgrade/migrateArtifactsV2ToV3.js.map +1 -1
- package/dist/upgrade/upgradeOrchestrator.js +126 -23
- package/dist/upgrade/upgradeOrchestrator.js.map +1 -1
- package/dist/validate/crossCapability.js +2 -2
- package/dist/validate/crossCapability.js.map +1 -1
- package/package.json +3 -3
- package/dist/upgrade/upgradeSnapshot.js +0 -93
- package/dist/upgrade/upgradeSnapshot.js.map +0 -1
|
@@ -8,10 +8,12 @@ import { resolveInvokedUpdateChannel } from "./channels.js";
|
|
|
8
8
|
import { buildUpgradeCommands } from "./upgradeCommands.js";
|
|
9
9
|
import { pendingRuntimeMigrationItems } from "./projectIntegration.js";
|
|
10
10
|
import { planLegacyAgentCleanupItems, planLegacyCapabilityAgentCleanupItems, } from "./legacyAgentCleanup.js";
|
|
11
|
-
import { MIGRATION_STATUSES, applyMigrationPhases, detectV1ArtifactPairs, dryRunMigration, hasPendingPlanLifecycleMigration, } from "./migrateArtifactsV2ToV3.js";
|
|
11
|
+
import { MIGRATION_STATUSES, applyMigrationPhases, delegatePlanLifecycleToEntityCutover, detectV1ArtifactPairs, dryRunMigration, hasPendingPlanLifecycleMigration, } from "./migrateArtifactsV2ToV3.js";
|
|
12
12
|
import { runLifecycleUpgrade, } from "./lifecycleUpgrade.js";
|
|
13
13
|
import { acquireLifecycleOwnershipJournalLock, lifecycleOwnershipJournalPath, releaseLifecycleOwnershipJournalLock, } from "../runtime/lifecycleOwnershipJournal.js";
|
|
14
14
|
import { secureLifecycleRemovalAvailable } from "../runtime/lifecyclePublication.js";
|
|
15
|
+
import { applyPreparedEntityCutover, inspectEntityCutoverForUpgrade, prepareEntityCutoverForUpgrade, } from "../state/entityCutover.js";
|
|
16
|
+
import { detectStateMode } from "../state/stateMode.js";
|
|
15
17
|
const DEFAULT_PHASES = ["detect", "artifacts", "runtime", "cleanup"];
|
|
16
18
|
const MIGRATION_ONLY_PHASES = ["artifacts", "runtime", "cleanup"];
|
|
17
19
|
function emptySummary() {
|
|
@@ -123,6 +125,61 @@ function migrationPhaseToOrchestrator(phase) {
|
|
|
123
125
|
message: phase.message,
|
|
124
126
|
};
|
|
125
127
|
}
|
|
128
|
+
function entityReadinessPhase(project, sourceRoot, pendingV1Artifacts, selected, apply) {
|
|
129
|
+
try {
|
|
130
|
+
const cutover = inspectEntityCutoverForUpgrade(project, sourceRoot, apply && selected);
|
|
131
|
+
if (cutover.phase === "active") {
|
|
132
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
133
|
+
status: "noop",
|
|
134
|
+
action: "entity-state-active",
|
|
135
|
+
message: "validated entity authority is already active",
|
|
136
|
+
}]);
|
|
137
|
+
}
|
|
138
|
+
if (cutover.phase !== "ready") {
|
|
139
|
+
if (!selected) {
|
|
140
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
141
|
+
status: "blocked",
|
|
142
|
+
action: "entity-cutover-required",
|
|
143
|
+
message: "a forward entity cutover must complete inside one full upgrade before any filtered effects",
|
|
144
|
+
}]);
|
|
145
|
+
}
|
|
146
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
147
|
+
status: "pending",
|
|
148
|
+
action: "entity-cutover",
|
|
149
|
+
message: "validated forward entity publication is ready to complete without deleting canonical entities",
|
|
150
|
+
}]);
|
|
151
|
+
}
|
|
152
|
+
if (!selected) {
|
|
153
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
154
|
+
status: "blocked",
|
|
155
|
+
action: "entity-cutover-required",
|
|
156
|
+
message: "marker-absent projects require one full cross-major upgrade; filtered apply is unavailable",
|
|
157
|
+
}]);
|
|
158
|
+
}
|
|
159
|
+
if (pendingV1Artifacts) {
|
|
160
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
161
|
+
status: "blocked",
|
|
162
|
+
action: "resolve-v1-state",
|
|
163
|
+
message: "pending v1 Markdown conversion cannot be used as entity input without a prerequisite write; complete the deterministic v1 conversion, then retry the upgrade",
|
|
164
|
+
}]);
|
|
165
|
+
}
|
|
166
|
+
const empty = cutover.entityCount === 0;
|
|
167
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
168
|
+
status: "pending",
|
|
169
|
+
action: empty ? "initialize-entity-state" : "entity-cutover",
|
|
170
|
+
message: empty
|
|
171
|
+
? "empty legacy state is ready for safe entity initialization"
|
|
172
|
+
: `${cutover.entityCount} entity record(s) are ready for marker-last Git cutover`,
|
|
173
|
+
}]);
|
|
174
|
+
}
|
|
175
|
+
catch (error) {
|
|
176
|
+
return summarizeOrchestratorPhase("entities", [{
|
|
177
|
+
status: "blocked",
|
|
178
|
+
action: "validate-entity-state",
|
|
179
|
+
message: error.message,
|
|
180
|
+
}]);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
126
183
|
function previewLifecycleSelector(args, channel) {
|
|
127
184
|
if (args.runtime) {
|
|
128
185
|
return args.runtime;
|
|
@@ -248,7 +305,53 @@ export function buildUpgradePlan(args) {
|
|
|
248
305
|
phases.push(buildDetectPhase(install, crossMajorBoundary, upgradeOutcome, channel));
|
|
249
306
|
}
|
|
250
307
|
let migrationPreview = runMigration ? dryRunMigration(migrationCtx) : null;
|
|
251
|
-
|
|
308
|
+
const entityAuthorityActive = detectStateMode(project, sourceRoot) === "entities";
|
|
309
|
+
const filteredCrossMajor = crossMajorMigration && Boolean(args.only && args.only.length > 0);
|
|
310
|
+
const entitySelected = crossMajorMigration && (!filteredCrossMajor || (!args.yes && Boolean(args.only?.includes("artifacts"))));
|
|
311
|
+
const partialStateApply = filteredCrossMajor && !entitySelected;
|
|
312
|
+
let entityPhase = entitySelected || partialStateApply
|
|
313
|
+
? entityReadinessPhase(project, sourceRoot, pendingV1Artifacts, entitySelected, Boolean(args.yes))
|
|
314
|
+
: null;
|
|
315
|
+
const entityCutoverPending = entityPhase?.items.some(({ action }) => action === "entity-cutover") ?? false;
|
|
316
|
+
if (args.yes && (entityCutoverPending || entityAuthorityActive)) {
|
|
317
|
+
if (migrationPreview)
|
|
318
|
+
delegatePlanLifecycleToEntityCutover(migrationPreview.artifacts);
|
|
319
|
+
}
|
|
320
|
+
const lifecycleArgs = lifecycleSelector || args.legacyCleanup ? {
|
|
321
|
+
selector: lifecycleSelector,
|
|
322
|
+
home,
|
|
323
|
+
project,
|
|
324
|
+
sourceRoot,
|
|
325
|
+
appHome: installRoot,
|
|
326
|
+
env,
|
|
327
|
+
canonicalSkillTarget: path.join(installRoot, "skills", "agentera"),
|
|
328
|
+
apply: false,
|
|
329
|
+
retiredCleanup: args.legacyCleanup ?? null,
|
|
330
|
+
} : null;
|
|
331
|
+
let lifecycle = lifecycleArgs ? runLifecycleUpgrade(lifecycleArgs) : null;
|
|
332
|
+
const plannedPhases = [
|
|
333
|
+
...phases,
|
|
334
|
+
...(migrationPreview && phaseFilter.has("artifacts") ? [migrationPhaseToOrchestrator(migrationPreview.artifacts)] : []),
|
|
335
|
+
...(entityPhase ? [entityPhase] : []),
|
|
336
|
+
...(migrationPreview && phaseFilter.has("runtime") ? [migrationPhaseToOrchestrator(migrationPreview.runtime)] : []),
|
|
337
|
+
...(migrationPreview && phaseFilter.has("cleanup") ? [migrationPhaseToOrchestrator(migrationPreview.cleanup)] : []),
|
|
338
|
+
...(lifecycle ? [lifecyclePhase(lifecycle)] : []),
|
|
339
|
+
];
|
|
340
|
+
const preflight = aggregateSummary(plannedPhases.filter((phase) => phase.name !== "lifecycle"));
|
|
341
|
+
const preflightBlocked = preflight.blocked > 0 || preflight.failed > 0;
|
|
342
|
+
let preparedEntityMigration = null;
|
|
343
|
+
if (args.yes && entitySelected && entityPhase?.status === "pending" && !preflightBlocked) {
|
|
344
|
+
preparedEntityMigration = prepareEntityCutoverForUpgrade(project, sourceRoot);
|
|
345
|
+
}
|
|
346
|
+
if (preparedEntityMigration) {
|
|
347
|
+
const result = applyPreparedEntityCutover(preparedEntityMigration);
|
|
348
|
+
entityPhase = summarizeOrchestratorPhase("entities", [{
|
|
349
|
+
status: "applied",
|
|
350
|
+
action: "entity-cutover",
|
|
351
|
+
message: `${result.entity_count} entity record(s) published and validated; authority marker written last`,
|
|
352
|
+
}]);
|
|
353
|
+
}
|
|
354
|
+
if (args.yes && migrationPreview && !preflightBlocked) {
|
|
252
355
|
const applyPhases = (args.only ?? MIGRATION_ONLY_PHASES)
|
|
253
356
|
.filter((phase) => !(args.runtime && phase === "runtime"));
|
|
254
357
|
migrationPreview = applyMigrationPhases(migrationCtx, migrationPreview, applyPhases);
|
|
@@ -257,6 +360,8 @@ export function buildUpgradePlan(args) {
|
|
|
257
360
|
if (phaseFilter.has("artifacts")) {
|
|
258
361
|
phases.push(migrationPhaseToOrchestrator(migrationPreview.artifacts));
|
|
259
362
|
}
|
|
363
|
+
if (entityPhase)
|
|
364
|
+
phases.push(entityPhase);
|
|
260
365
|
if (phaseFilter.has("runtime")) {
|
|
261
366
|
phases.push(migrationPhaseToOrchestrator(migrationPreview.runtime));
|
|
262
367
|
}
|
|
@@ -264,40 +369,30 @@ export function buildUpgradePlan(args) {
|
|
|
264
369
|
phases.push(migrationPhaseToOrchestrator(migrationPreview.cleanup));
|
|
265
370
|
}
|
|
266
371
|
}
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
// observation. Lifecycle planning must see the refreshed desired content
|
|
273
|
-
// and the filesystem state that runtime writes will actually target.
|
|
274
|
-
const lifecycleArgs = {
|
|
275
|
-
selector: lifecycleSelector,
|
|
276
|
-
home,
|
|
277
|
-
project,
|
|
278
|
-
sourceRoot,
|
|
279
|
-
appHome: installRoot,
|
|
280
|
-
env,
|
|
281
|
-
canonicalSkillTarget: path.join(installRoot, "skills", "agentera"),
|
|
282
|
-
apply: Boolean(args.yes),
|
|
283
|
-
retiredCleanup: args.legacyCleanup ?? null,
|
|
284
|
-
};
|
|
285
|
-
if (args.yes && secureLifecycleRemovalAvailable()) {
|
|
372
|
+
if (!migrationPreview && entityPhase)
|
|
373
|
+
phases.push(entityPhase);
|
|
374
|
+
if (lifecycleArgs && args.yes && !preflightBlocked) {
|
|
375
|
+
const applyArgs = { ...lifecycleArgs, apply: true };
|
|
376
|
+
if (secureLifecycleRemovalAvailable()) {
|
|
286
377
|
const lifecycleLock = acquireLifecycleOwnershipJournalLock(lifecycleOwnershipJournalPath(installRoot));
|
|
287
378
|
try {
|
|
288
|
-
lifecycle = runLifecycleUpgrade(
|
|
379
|
+
lifecycle = runLifecycleUpgrade(applyArgs);
|
|
289
380
|
}
|
|
290
381
|
finally {
|
|
291
382
|
releaseLifecycleOwnershipJournalLock(lifecycleLock);
|
|
292
383
|
}
|
|
293
384
|
}
|
|
294
385
|
else {
|
|
295
|
-
lifecycle = runLifecycleUpgrade(
|
|
386
|
+
lifecycle = runLifecycleUpgrade(applyArgs);
|
|
296
387
|
}
|
|
388
|
+
}
|
|
389
|
+
if (lifecycle) {
|
|
297
390
|
phases.push(lifecyclePhase(lifecycle));
|
|
298
391
|
}
|
|
299
392
|
const summary = aggregateSummary(phases);
|
|
300
393
|
const status = workflowStatus(summary);
|
|
394
|
+
const appSummary = aggregateSummary(phases.filter((phase) => phase.name !== "lifecycle"));
|
|
395
|
+
const appApplyBlocked = appSummary.blocked > 0 || appSummary.failed > 0;
|
|
301
396
|
const mode = args.yes ? "apply" : "plan";
|
|
302
397
|
const lifecycleStatus = lifecycleStatusFromWorkflow(status, mode);
|
|
303
398
|
const hasPending = summary.pending > 0;
|
|
@@ -336,9 +431,17 @@ export function validateUpgradeApply(args, plan) {
|
|
|
336
431
|
if (!args.yes) {
|
|
337
432
|
return null;
|
|
338
433
|
}
|
|
434
|
+
if (plan.crossMajorBoundary && args.only && args.only.length > 0) {
|
|
435
|
+
return "cross-major v2→v3 apply must run as one full upgrade --yes; --only is preview-only at this boundary";
|
|
436
|
+
}
|
|
339
437
|
if (isBlockedUpgradeOutcome(plan.upgradeOutcome)) {
|
|
340
438
|
return plan.upgradeOutcome.message ?? "upgrade blocked";
|
|
341
439
|
}
|
|
440
|
+
const appPhases = plan.phases.filter((phase) => phase.name !== "lifecycle");
|
|
441
|
+
if (appPhases.some((phase) => phase.summary.blocked > 0 || phase.summary.failed > 0)) {
|
|
442
|
+
return appPhases.flatMap((phase) => phase.items).find((item) => item.status === "blocked" || item.status === "failed")?.message
|
|
443
|
+
?? "upgrade preflight is blocked; no changes were applied";
|
|
444
|
+
}
|
|
342
445
|
if (plan.crossMajorBoundary &&
|
|
343
446
|
!shouldIncludeCrossMajorPlanItems(plan.channel, plan.upgradeOutcome)) {
|
|
344
447
|
return ("cross-major v2→v3 migration requires the development channel while stable tracks 2.x; " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeOrchestrator.js","sourceRoot":"","sources":["../../src/upgrade/upgradeOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgradeOrchestrator.js","sourceRoot":"","sources":["../../src/upgrade/upgradeOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ export function loadCapabilityArtifacts(capabilitiesDir = capabilitiesDirDefault
|
|
|
47
47
|
continue;
|
|
48
48
|
}
|
|
49
49
|
const e = entry;
|
|
50
|
-
const artifactId = String(e.
|
|
50
|
+
const artifactId = String(e.artifact ?? "").trim();
|
|
51
51
|
const localRole = String(e.local_role ?? "").trim();
|
|
52
52
|
if (!artifactId) {
|
|
53
53
|
continue;
|
|
@@ -119,7 +119,7 @@ export function validateGraph(artifactSchemasDir = defaultArtifactSchemasDir(),
|
|
|
119
119
|
byArtifactId.get(record.artifactId).push(record);
|
|
120
120
|
const name = displayName(record, registry);
|
|
121
121
|
if (!canonical.has(record.artifactId)) {
|
|
122
|
-
errors.push(`${record.capability}: unknown
|
|
122
|
+
errors.push(`${record.capability}: unknown artifact '${record.artifactId}'`);
|
|
123
123
|
continue;
|
|
124
124
|
}
|
|
125
125
|
if (record.producers.size === 0 && record.consumers.size === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossCapability.js","sourceRoot":"","sources":["../../src/validate/crossCapability.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"crossCapability.js","sourceRoot":"","sources":["../../src/validate/crossCapability.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agentera",
|
|
3
|
-
"version": "3.0.0-dev.
|
|
3
|
+
"version": "3.0.0-dev.25",
|
|
4
4
|
"description": "One CLI, many capabilities: project state, artifact validation, and capability routing for AI coding agents",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"agentera",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"tag": "next"
|
|
30
30
|
},
|
|
31
31
|
"scripts": {
|
|
32
|
-
"build": "rm -rf dist && tsc -p tsconfig.json",
|
|
32
|
+
"build": "rm -rf dist && tsc -p tsconfig.json && node scripts/copy-bundle.mjs",
|
|
33
33
|
"prepack": "rm -rf dist && tsc -p tsconfig.json && node scripts/copy-bundle.mjs",
|
|
34
34
|
"test": "vp test run",
|
|
35
35
|
"test:watch": "vp test watch",
|
|
@@ -54,6 +54,6 @@
|
|
|
54
54
|
},
|
|
55
55
|
"agentera": {
|
|
56
56
|
"suiteVersion": "3.0.0",
|
|
57
|
-
"gitRef": "
|
|
57
|
+
"gitRef": "967fc2fd43ef255377d304d0951d4128968c9810"
|
|
58
58
|
}
|
|
59
59
|
}
|
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
import fs from "node:fs";
|
|
2
|
-
import path from "node:path";
|
|
3
|
-
import { pathExists } from "../core/paths.js";
|
|
4
|
-
import { writeFileAtomic } from "./atomicWriter.js";
|
|
5
|
-
const SNAPSHOT_PREFIX = "upgrade-snapshot-";
|
|
6
|
-
const MANIFEST_NAME = "upgrade-snapshot-latest.json";
|
|
7
|
-
export function snapshotDirectory(src, dest) {
|
|
8
|
-
if (!pathExists(src)) {
|
|
9
|
-
return;
|
|
10
|
-
}
|
|
11
|
-
fs.cpSync(src, dest, { recursive: true });
|
|
12
|
-
}
|
|
13
|
-
export function upgradeSnapshotManifestPath(appHome) {
|
|
14
|
-
return path.join(appHome, ".agentera", MANIFEST_NAME);
|
|
15
|
-
}
|
|
16
|
-
export function snapshotManagedApp(src, appHome) {
|
|
17
|
-
if (!pathExists(src)) {
|
|
18
|
-
return null;
|
|
19
|
-
}
|
|
20
|
-
const agenteraDir = path.join(appHome, ".agentera");
|
|
21
|
-
fs.mkdirSync(agenteraDir, { recursive: true });
|
|
22
|
-
const timestamp = Date.now();
|
|
23
|
-
const snapshotDir = path.join(agenteraDir, `${SNAPSHOT_PREFIX}${timestamp}`);
|
|
24
|
-
snapshotDirectory(src, snapshotDir);
|
|
25
|
-
const manifest = JSON.stringify({
|
|
26
|
-
path: snapshotDir,
|
|
27
|
-
created: new Date(timestamp).toISOString(),
|
|
28
|
-
source: src,
|
|
29
|
-
});
|
|
30
|
-
writeFileAtomic(upgradeSnapshotManifestPath(appHome), manifest);
|
|
31
|
-
return snapshotDir;
|
|
32
|
-
}
|
|
33
|
-
export function removeUpgradeSnapshot(appHome, snapshotDir) {
|
|
34
|
-
if (pathExists(snapshotDir)) {
|
|
35
|
-
fs.rmSync(snapshotDir, { recursive: true, force: true });
|
|
36
|
-
}
|
|
37
|
-
const manifestPath = upgradeSnapshotManifestPath(appHome);
|
|
38
|
-
if (pathExists(manifestPath)) {
|
|
39
|
-
fs.rmSync(manifestPath, { force: true });
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
function countFilesRecursive(root) {
|
|
43
|
-
let count = 0;
|
|
44
|
-
const visit = (dir) => {
|
|
45
|
-
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
46
|
-
const full = path.join(dir, entry.name);
|
|
47
|
-
if (entry.isDirectory())
|
|
48
|
-
visit(full);
|
|
49
|
-
else
|
|
50
|
-
count += 1;
|
|
51
|
-
}
|
|
52
|
-
};
|
|
53
|
-
visit(root);
|
|
54
|
-
return count;
|
|
55
|
-
}
|
|
56
|
-
function emptyRestore() {
|
|
57
|
-
return { restored: false, source: null, snapshotDir: null, created: null, fileCount: 0 };
|
|
58
|
-
}
|
|
59
|
-
export function restoreFromSnapshot(appHome) {
|
|
60
|
-
const manifestPath = upgradeSnapshotManifestPath(appHome);
|
|
61
|
-
if (!pathExists(manifestPath)) {
|
|
62
|
-
return emptyRestore();
|
|
63
|
-
}
|
|
64
|
-
let manifest;
|
|
65
|
-
try {
|
|
66
|
-
manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
|
|
67
|
-
}
|
|
68
|
-
catch {
|
|
69
|
-
return emptyRestore();
|
|
70
|
-
}
|
|
71
|
-
const snapshotDir = manifest.path ?? null;
|
|
72
|
-
const source = manifest.source ?? null;
|
|
73
|
-
const created = manifest.created ?? null;
|
|
74
|
-
if (!snapshotDir || !source) {
|
|
75
|
-
return { restored: false, source, snapshotDir, created, fileCount: 0 };
|
|
76
|
-
}
|
|
77
|
-
if (source === appHome || path.relative(appHome, source) === "") {
|
|
78
|
-
return { restored: false, source, snapshotDir, created, fileCount: 0 };
|
|
79
|
-
}
|
|
80
|
-
if (!pathExists(snapshotDir)) {
|
|
81
|
-
removeUpgradeSnapshot(appHome, snapshotDir);
|
|
82
|
-
return { restored: false, source, snapshotDir, created, fileCount: 0 };
|
|
83
|
-
}
|
|
84
|
-
if (pathExists(source)) {
|
|
85
|
-
fs.rmSync(source, { recursive: true, force: true });
|
|
86
|
-
}
|
|
87
|
-
fs.mkdirSync(path.dirname(source), { recursive: true });
|
|
88
|
-
fs.cpSync(snapshotDir, source, { recursive: true });
|
|
89
|
-
const fileCount = countFilesRecursive(source);
|
|
90
|
-
removeUpgradeSnapshot(appHome, snapshotDir);
|
|
91
|
-
return { restored: true, source, snapshotDir, created, fileCount };
|
|
92
|
-
}
|
|
93
|
-
//# sourceMappingURL=upgradeSnapshot.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeSnapshot.js","sourceRoot":"","sources":["../../src/upgrade/upgradeSnapshot.ts"],"names":[],"mappings":"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"}
|