@frankzhang2026/opencode-android-orchestrator 0.8.0 → 0.9.0
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/CHANGELOG.md +31 -0
- package/README.md +48 -15
- package/dist/cli.js +9 -1
- package/dist/cli.js.map +1 -1
- package/dist/doctor/index.d.ts +2 -0
- package/dist/doctor/index.d.ts.map +1 -1
- package/dist/doctor/index.js +2 -1
- package/dist/doctor/index.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/installer/adaptive-templates.d.ts +2 -0
- package/dist/installer/adaptive-templates.d.ts.map +1 -1
- package/dist/installer/adaptive-templates.js +1 -1
- package/dist/installer/adaptive-templates.js.map +1 -1
- package/dist/installer/agents-config.d.ts +5 -0
- package/dist/installer/agents-config.d.ts.map +1 -1
- package/dist/installer/agents-config.js +44 -8
- package/dist/installer/agents-config.js.map +1 -1
- package/dist/installer/gradle-verification.d.ts +10 -1
- package/dist/installer/gradle-verification.d.ts.map +1 -1
- package/dist/installer/gradle-verification.js +192 -27
- package/dist/installer/gradle-verification.js.map +1 -1
- package/dist/installer/index.d.ts +1 -1
- package/dist/installer/index.d.ts.map +1 -1
- package/dist/installer/index.js +1 -1
- package/dist/installer/index.js.map +1 -1
- package/dist/installer/init.d.ts.map +1 -1
- package/dist/installer/init.js +13 -5
- package/dist/installer/init.js.map +1 -1
- package/dist/installer/opencode-config.d.ts +3 -3
- package/dist/installer/opencode-config.js +1 -1
- package/dist/installer/upgrade.d.ts +8 -1
- package/dist/installer/upgrade.d.ts.map +1 -1
- package/dist/installer/upgrade.js +163 -51
- package/dist/installer/upgrade.js.map +1 -1
- package/docs/MIGRATION.md +54 -25
- package/docs/SECURITY.md +18 -9
- package/docs/TROUBLESHOOTING.md +40 -9
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/installer/init.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/installer/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const ORCHESTRATOR_PACKAGE_NAME = "@frankzhang2026/opencode-android-orchestrator";
|
|
2
|
-
export declare const ORCHESTRATOR_PACKAGE_VERSION = "0.
|
|
3
|
-
export declare const ORCHESTRATOR_PLUGIN_REFERENCE = "@frankzhang2026/opencode-android-orchestrator@0.
|
|
2
|
+
export declare const ORCHESTRATOR_PACKAGE_VERSION = "0.9.0";
|
|
3
|
+
export declare const ORCHESTRATOR_PLUGIN_REFERENCE = "@frankzhang2026/opencode-android-orchestrator@0.9.0";
|
|
4
4
|
export declare const OPENCODE_CONFIG_SCHEMA_URL = "https://opencode.ai/config.json";
|
|
5
|
-
export declare const REQUIRED_PLUGIN_REFERENCES: readonly ["@frankzhang2026/opencode-android-orchestrator@0.
|
|
5
|
+
export declare const REQUIRED_PLUGIN_REFERENCES: readonly ["@frankzhang2026/opencode-android-orchestrator@0.9.0"];
|
|
6
6
|
export type OpenCodeConfigMergeErrorCode = "AMBIGUOUS_CONFIG" | "CONFIG_NOT_FILE" | "CONFIG_READ_FAILED" | "CONFIG_SYMLINK" | "DUPLICATE_PLUGIN" | "DUPLICATE_PROPERTY" | "INVALID_JSONC" | "INVALID_PLUGIN_ENTRY" | "PLUGIN_NOT_ARRAY" | "PLUGIN_VERSION_CONFLICT" | "ROOT_NOT_OBJECT" | "TARGET_NOT_DIRECTORY";
|
|
7
7
|
export declare class OpenCodeConfigMergeError extends Error {
|
|
8
8
|
readonly code: OpenCodeConfigMergeErrorCode;
|
|
@@ -2,7 +2,7 @@ import { lstatSync, readFileSync, statSync } from "node:fs";
|
|
|
2
2
|
import { join, resolve } from "node:path";
|
|
3
3
|
import { applyEdits, findNodeAtLocation, getNodeValue, modify, parseTree, printParseErrorCode, } from "jsonc-parser";
|
|
4
4
|
export const ORCHESTRATOR_PACKAGE_NAME = "@frankzhang2026/opencode-android-orchestrator";
|
|
5
|
-
export const ORCHESTRATOR_PACKAGE_VERSION = "0.
|
|
5
|
+
export const ORCHESTRATOR_PACKAGE_VERSION = "0.9.0";
|
|
6
6
|
export const ORCHESTRATOR_PLUGIN_REFERENCE = `${ORCHESTRATOR_PACKAGE_NAME}@${ORCHESTRATOR_PACKAGE_VERSION}`;
|
|
7
7
|
export const OPENCODE_CONFIG_SCHEMA_URL = "https://opencode.ai/config.json";
|
|
8
8
|
export const REQUIRED_PLUGIN_REFERENCES = [
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { type DoctorReport } from "../doctor/index.js";
|
|
2
|
+
import { type AndroidProjectDetection } from "./android-project.js";
|
|
2
3
|
import { type InstallationFileStrategy, type InstallationManifest, type PreviousInstallationFile } from "./install-manifest.js";
|
|
3
4
|
import { type InitProcessRunner, type InitVerificationReport } from "./init.js";
|
|
4
5
|
import { type GradleVerificationConfiguration, type ModuleScope } from "./adaptive-templates.js";
|
|
5
6
|
export declare const UPGRADE_MARKER_RELATIVE_PATH = ".automation-plugin/upgrade.json";
|
|
6
7
|
export declare const UPGRADE_RECOVERY_DIRECTORY = ".automation-plugin/upgrades";
|
|
7
|
-
export type ProjectUpgradeErrorCode = "DOCTOR_FAILED" | "INSTALLED_FILES_MODIFIED" | "INSTALLATION_INVALID" | "PACKAGE_MISMATCH" | "PLAN_STALE" | "POST_UPGRADE_VERIFICATION_FAILED" | "UPGRADE_CONFLICT" | "UPGRADE_IN_PROGRESS" | "UPGRADE_NOT_REQUIRED" | "UPGRADE_ROLLBACK_FAILED" | "UPGRADE_WRITE_FAILED" | "VERSION_DOWNGRADE_REFUSED" | "VERSION_INVALID";
|
|
8
|
+
export type ProjectUpgradeErrorCode = "DOCTOR_FAILED" | "GRADLE_DISCOVERY_FAILED" | "INSTALLED_FILES_MODIFIED" | "INSTALLATION_INVALID" | "PACKAGE_MISMATCH" | "PLAN_STALE" | "POST_UPGRADE_VERIFICATION_FAILED" | "UPGRADE_CONFLICT" | "UPGRADE_IN_PROGRESS" | "UPGRADE_NOT_REQUIRED" | "UPGRADE_ROLLBACK_FAILED" | "UPGRADE_WRITE_FAILED" | "VERSION_DOWNGRADE_REFUSED" | "VERSION_INVALID";
|
|
8
9
|
export declare class ProjectUpgradeError extends Error {
|
|
9
10
|
readonly code: ProjectUpgradeErrorCode;
|
|
10
11
|
readonly details: readonly string[];
|
|
@@ -20,6 +21,9 @@ export interface ProjectUpgradeOptions {
|
|
|
20
21
|
preparedAt?: string;
|
|
21
22
|
primaryModule?: string;
|
|
22
23
|
processRunner?: InitProcessRunner;
|
|
24
|
+
/** Precomputed runtime model used to make transactional replanning deterministic. */
|
|
25
|
+
projectDetection?: AndroidProjectDetection;
|
|
26
|
+
refreshGradleDiscovery?: boolean;
|
|
23
27
|
upgradeId?: string;
|
|
24
28
|
}
|
|
25
29
|
export interface UpgradeFileSnapshot {
|
|
@@ -51,6 +55,9 @@ export interface ProjectUpgradePlan {
|
|
|
51
55
|
targetDirectory: string;
|
|
52
56
|
moduleScope: ModuleScope;
|
|
53
57
|
primaryModule: string;
|
|
58
|
+
projectDetection: AndroidProjectDetection | null;
|
|
59
|
+
gradleVerification: GradleVerificationConfiguration;
|
|
60
|
+
longCommandTimeoutMs: number | undefined;
|
|
54
61
|
fromVersion: string;
|
|
55
62
|
toVersion: string;
|
|
56
63
|
upgradeId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/installer/upgrade.ts"],"names":[],"mappings":"AA4BA,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/installer/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,18 @@ import { dirname, join, posix, resolve, } from "node:path";
|
|
|
4
4
|
import { compareSemanticVersions, parseOpenCodeVersion, } from "../compatibility/versions.js";
|
|
5
5
|
import { AUTOMATION_CONFIG_RELATIVE_PATH, matchesManifestModuloVerificationPolicy, } from "../config/verification-policy.js";
|
|
6
6
|
import { formatDoctorReport, runDoctor, } from "../doctor/index.js";
|
|
7
|
-
import {
|
|
8
|
-
import { detectAndroidProject } from "./android-project.js";
|
|
9
|
-
import {
|
|
7
|
+
import { mergeAgentsConfigForUpgradeText } from "./agents-config.js";
|
|
8
|
+
import { detectAndroidProject, } from "./android-project.js";
|
|
9
|
+
import { GradleVerificationDiscoveryError, discoverGradleProjectConfiguration, } from "./gradle-verification.js";
|
|
10
|
+
import { INSTALLATION_BACKUPS_DIRECTORY, INSTALLATION_CONTROL_DIRECTORY, INSTALLATION_HISTORY_DIRECTORY, INSTALLATION_MANIFEST_RELATIVE_PATH, readInstallationManifest, } from "./install-manifest.js";
|
|
10
11
|
import { planProjectResourceInputs, runInitProcess, verifyInitializedProject, } from "./init.js";
|
|
11
12
|
import { ORCHESTRATOR_PACKAGE_NAME, ORCHESTRATOR_PACKAGE_VERSION, mergeOpenCodeConfigText, } from "./opencode-config.js";
|
|
12
13
|
import { isModuleScope, } from "./adaptive-templates.js";
|
|
13
14
|
export const UPGRADE_MARKER_RELATIVE_PATH = `${INSTALLATION_CONTROL_DIRECTORY}/upgrade.json`;
|
|
14
15
|
export const UPGRADE_RECOVERY_DIRECTORY = `${INSTALLATION_CONTROL_DIRECTORY}/upgrades`;
|
|
15
16
|
const UNINSTALL_MARKER_RELATIVE_PATH = `${INSTALLATION_CONTROL_DIRECTORY}/uninstall.json`;
|
|
17
|
+
const AGENTS_MERGE_SOURCE = "generated/agents-managed-block-merge";
|
|
18
|
+
const OPENCODE_CONFIG_MERGE_SOURCE = "generated/opencode-config-merge";
|
|
16
19
|
export class ProjectUpgradeError extends Error {
|
|
17
20
|
code;
|
|
18
21
|
details;
|
|
@@ -170,6 +173,11 @@ function snapshotsMatch(left, right) {
|
|
|
170
173
|
left.size === right.size &&
|
|
171
174
|
left.mode === right.mode);
|
|
172
175
|
}
|
|
176
|
+
function snapshotContentMatches(left, right) {
|
|
177
|
+
return (left.existed === right.existed &&
|
|
178
|
+
left.sha256 === right.sha256 &&
|
|
179
|
+
left.size === right.size);
|
|
180
|
+
}
|
|
173
181
|
function snapshotMatchesDesired(snapshot, file) {
|
|
174
182
|
return (snapshot.existed &&
|
|
175
183
|
snapshot.sha256 === file.sha256 &&
|
|
@@ -190,16 +198,15 @@ function originalSnapshot(targetDirectory, file) {
|
|
|
190
198
|
throw new ProjectUpgradeError("INSTALLATION_INVALID", `Original backup metadata is incomplete: ${file.path}`);
|
|
191
199
|
}
|
|
192
200
|
const snapshot = snapshotFile(targetDirectory, file.previous.backupPath, true);
|
|
193
|
-
if (!
|
|
194
|
-
throw new ProjectUpgradeError("INSTALLATION_INVALID", `Original backup failed integrity verification: ${file.path}`);
|
|
201
|
+
if (!snapshotContentMatches(snapshot, file.previous)) {
|
|
202
|
+
throw new ProjectUpgradeError("INSTALLATION_INVALID", `Original backup failed content integrity verification: ${file.path}`);
|
|
195
203
|
}
|
|
196
204
|
return snapshot;
|
|
197
205
|
}
|
|
198
206
|
function manifestFileMatchesSnapshot(file, snapshot) {
|
|
199
207
|
return (snapshot.existed &&
|
|
200
208
|
snapshot.sha256 === file.sha256 &&
|
|
201
|
-
snapshot.size === file.size
|
|
202
|
-
snapshot.mode === file.mode);
|
|
209
|
+
snapshot.size === file.size);
|
|
203
210
|
}
|
|
204
211
|
function managedFileAcceptsSnapshot(file, snapshot) {
|
|
205
212
|
if (manifestFileMatchesSnapshot(file, snapshot)) {
|
|
@@ -208,7 +215,6 @@ function managedFileAcceptsSnapshot(file, snapshot) {
|
|
|
208
215
|
return (file.path === AUTOMATION_CONFIG_RELATIVE_PATH &&
|
|
209
216
|
snapshot.existed &&
|
|
210
217
|
snapshot.content !== null &&
|
|
211
|
-
snapshot.mode === file.mode &&
|
|
212
218
|
matchesManifestModuloVerificationPolicy(snapshot.content, {
|
|
213
219
|
sha256: file.sha256,
|
|
214
220
|
size: file.size,
|
|
@@ -220,9 +226,6 @@ function readStableManifest(targetDirectory) {
|
|
|
220
226
|
manifestSnapshotBefore.content === null) {
|
|
221
227
|
throw new ProjectUpgradeError("INSTALLATION_INVALID", "An installed manifest is required before upgrade.", ["Run init for a project that has never installed the orchestrator."]);
|
|
222
228
|
}
|
|
223
|
-
if (manifestSnapshotBefore.mode !== 0o600) {
|
|
224
|
-
throw new ProjectUpgradeError("INSTALLATION_INVALID", "The active installation manifest must have mode 0600.");
|
|
225
|
-
}
|
|
226
229
|
const content = Buffer.from(manifestSnapshotBefore.content).toString("utf8");
|
|
227
230
|
const manifest = readInstallationManifest(targetDirectory);
|
|
228
231
|
const manifestSnapshotAfter = snapshotFile(targetDirectory, INSTALLATION_MANIFEST_RELATIVE_PATH, true);
|
|
@@ -266,18 +269,47 @@ function assertInstalledIntegrity(targetDirectory, manifest, expectedManifestSha
|
|
|
266
269
|
if (manifest.package.name !== ORCHESTRATOR_PACKAGE_NAME) {
|
|
267
270
|
throw new ProjectUpgradeError("PACKAGE_MISMATCH", "The installed manifest belongs to a different package.", [manifest.package.name, ORCHESTRATOR_PACKAGE_NAME]);
|
|
268
271
|
}
|
|
269
|
-
const
|
|
272
|
+
const failures = [];
|
|
273
|
+
for (const file of manifest.files) {
|
|
274
|
+
let installed = "match";
|
|
275
|
+
try {
|
|
276
|
+
const snapshot = snapshotFile(targetDirectory, file.path);
|
|
277
|
+
const accepted = file.source === AGENTS_MERGE_SOURCE
|
|
278
|
+
? snapshot.existed && snapshot.content !== null
|
|
279
|
+
: managedFileAcceptsSnapshot(file, snapshot);
|
|
280
|
+
installed = !snapshot.existed
|
|
281
|
+
? "missing"
|
|
282
|
+
: accepted
|
|
283
|
+
? "match"
|
|
284
|
+
: "mismatch";
|
|
285
|
+
}
|
|
286
|
+
catch {
|
|
287
|
+
installed = "mismatch";
|
|
288
|
+
}
|
|
289
|
+
let backup = "not-required";
|
|
290
|
+
if (file.previous.existed && file.previous.backupPath !== null) {
|
|
291
|
+
try {
|
|
292
|
+
const snapshot = snapshotFile(targetDirectory, file.previous.backupPath, true);
|
|
293
|
+
backup = !snapshot.existed
|
|
294
|
+
? "missing"
|
|
295
|
+
: snapshotContentMatches(snapshot, file.previous)
|
|
296
|
+
? "match"
|
|
297
|
+
: "mismatch";
|
|
298
|
+
}
|
|
299
|
+
catch {
|
|
300
|
+
backup = "mismatch";
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
if (installed !== "match" || (backup !== "match" && backup !== "not-required")) {
|
|
304
|
+
failures.push(`${file.path}: installed=${installed}, backup=${backup}`);
|
|
305
|
+
}
|
|
306
|
+
}
|
|
270
307
|
const changedManifest = snapshotFile(targetDirectory, INSTALLATION_MANIFEST_RELATIVE_PATH, true);
|
|
271
308
|
if (changedManifest.sha256 !== expectedManifestSha256) {
|
|
272
309
|
throw new ProjectUpgradeError("PLAN_STALE", "The installation manifest changed during integrity verification.");
|
|
273
310
|
}
|
|
274
|
-
if (
|
|
275
|
-
throw new ProjectUpgradeError("INSTALLED_FILES_MODIFIED", "Upgrade refused because managed
|
|
276
|
-
.filter((check) => check.installed === "missing" ||
|
|
277
|
-
check.installed === "mismatch" ||
|
|
278
|
-
check.backup === "missing" ||
|
|
279
|
-
check.backup === "mismatch")
|
|
280
|
-
.map((check) => `${check.path}: installed=${check.installed}, backup=${check.backup}`));
|
|
311
|
+
if (failures.length > 0) {
|
|
312
|
+
throw new ProjectUpgradeError("INSTALLED_FILES_MODIFIED", "Upgrade refused because managed content or original backup content no longer matches the installed manifest.", failures);
|
|
281
313
|
}
|
|
282
314
|
}
|
|
283
315
|
function uniqueManifestFileBySource(manifest, source) {
|
|
@@ -344,25 +376,62 @@ function configuredAdaptiveOptions(targetDirectory, manifest) {
|
|
|
344
376
|
}
|
|
345
377
|
return configured;
|
|
346
378
|
}
|
|
347
|
-
function
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
379
|
+
function snapshotFromOptionalText(content, mode) {
|
|
380
|
+
if (content === null) {
|
|
381
|
+
return {
|
|
382
|
+
existed: false,
|
|
383
|
+
content: null,
|
|
384
|
+
sha256: null,
|
|
385
|
+
size: null,
|
|
386
|
+
mode: null,
|
|
387
|
+
};
|
|
388
|
+
}
|
|
389
|
+
const value = bytes(content);
|
|
390
|
+
return {
|
|
391
|
+
existed: true,
|
|
392
|
+
content: value,
|
|
393
|
+
sha256: sha256(value),
|
|
394
|
+
size: value.byteLength,
|
|
395
|
+
mode,
|
|
396
|
+
};
|
|
397
|
+
}
|
|
398
|
+
function desiredMergePlan(targetDirectory, manifest) {
|
|
399
|
+
const agents = uniqueManifestFileBySource(manifest, AGENTS_MERGE_SOURCE);
|
|
400
|
+
const openCode = uniqueManifestFileBySource(manifest, OPENCODE_CONFIG_MERGE_SOURCE);
|
|
401
|
+
const currentAgents = snapshotFile(targetDirectory, agents.path);
|
|
402
|
+
if (!currentAgents.existed ||
|
|
403
|
+
currentAgents.content === null ||
|
|
404
|
+
currentAgents.mode === null) {
|
|
405
|
+
throw new ProjectUpgradeError("INSTALLED_FILES_MODIFIED", "AGENTS.md must remain a readable regular file before upgrade.");
|
|
406
|
+
}
|
|
407
|
+
const originalAgents = originalSnapshot(targetDirectory, agents);
|
|
408
|
+
const mergedAgents = mergeAgentsConfigForUpgradeText(Buffer.from(currentAgents.content).toString("utf8"), originalAgents.content === null
|
|
409
|
+
? null
|
|
410
|
+
: Buffer.from(originalAgents.content).toString("utf8"));
|
|
411
|
+
return {
|
|
412
|
+
inputs: [
|
|
413
|
+
{
|
|
414
|
+
path: agents.path,
|
|
415
|
+
source: agents.source,
|
|
416
|
+
strategy: "merge",
|
|
417
|
+
content: mergedAgents.content,
|
|
418
|
+
mode: currentAgents.mode,
|
|
419
|
+
},
|
|
420
|
+
{
|
|
421
|
+
path: openCode.path,
|
|
422
|
+
source: openCode.source,
|
|
423
|
+
strategy: "merge",
|
|
424
|
+
content: mergeOpenCodeConfigText(textFromOriginal(targetDirectory, openCode, "{}\n")).content,
|
|
425
|
+
mode: openCode.mode,
|
|
426
|
+
},
|
|
427
|
+
],
|
|
428
|
+
originalOverrides: new Map([
|
|
429
|
+
[
|
|
430
|
+
agents.path,
|
|
431
|
+
snapshotFromOptionalText(mergedAgents.previousContent, currentAgents.mode),
|
|
432
|
+
],
|
|
433
|
+
]),
|
|
434
|
+
};
|
|
366
435
|
}
|
|
367
436
|
function previousMetadata(upgradeId, path, original) {
|
|
368
437
|
return original.existed
|
|
@@ -381,7 +450,7 @@ function previousMetadata(upgradeId, path, original) {
|
|
|
381
450
|
backupPath: null,
|
|
382
451
|
};
|
|
383
452
|
}
|
|
384
|
-
function planDesiredFiles(targetDirectory, currentManifest, inputs, upgradeId) {
|
|
453
|
+
function planDesiredFiles(targetDirectory, currentManifest, inputs, upgradeId, originalOverrides = new Map()) {
|
|
385
454
|
const currentByPath = new Map(currentManifest.files.map((file) => [file.path, file]));
|
|
386
455
|
const seen = new Set();
|
|
387
456
|
return inputs
|
|
@@ -394,7 +463,9 @@ function planDesiredFiles(targetDirectory, currentManifest, inputs, upgradeId) {
|
|
|
394
463
|
const content = bytes(input.content);
|
|
395
464
|
const before = snapshotFile(targetDirectory, path);
|
|
396
465
|
const current = currentByPath.get(path);
|
|
397
|
-
if (current !== undefined &&
|
|
466
|
+
if (current !== undefined &&
|
|
467
|
+
current.source !== AGENTS_MERGE_SOURCE &&
|
|
468
|
+
!managedFileAcceptsSnapshot(current, before)) {
|
|
398
469
|
throw new ProjectUpgradeError("INSTALLED_FILES_MODIFIED", `Managed file changed before upgrade planning: ${path}`);
|
|
399
470
|
}
|
|
400
471
|
const mode = input.mode ?? current?.mode ?? before.mode ?? 0o644;
|
|
@@ -410,9 +481,10 @@ function planDesiredFiles(targetDirectory, currentManifest, inputs, upgradeId) {
|
|
|
410
481
|
before.mode === mode)) {
|
|
411
482
|
throw new ProjectUpgradeError("UPGRADE_CONFLICT", `A newly managed path already contains different user content: ${path}`);
|
|
412
483
|
}
|
|
413
|
-
const original =
|
|
414
|
-
|
|
415
|
-
|
|
484
|
+
const original = originalOverrides.get(path) ??
|
|
485
|
+
(current === undefined
|
|
486
|
+
? before
|
|
487
|
+
: originalSnapshot(targetDirectory, current));
|
|
416
488
|
return {
|
|
417
489
|
path,
|
|
418
490
|
source: input.source,
|
|
@@ -522,7 +594,27 @@ export function planProjectUpgrade(directory, options = {}) {
|
|
|
522
594
|
if (primaryModule !== undefined) {
|
|
523
595
|
adaptiveOptions.primaryModule = primaryModule;
|
|
524
596
|
}
|
|
525
|
-
|
|
597
|
+
let runtimeProjectDetection = options.projectDetection;
|
|
598
|
+
let refreshedGradle;
|
|
599
|
+
if (options.refreshGradleDiscovery === true &&
|
|
600
|
+
runtimeProjectDetection === undefined) {
|
|
601
|
+
try {
|
|
602
|
+
refreshedGradle = discoverGradleProjectConfiguration(requestedTarget, options.processRunner ?? runInitProcess, primaryModule === undefined ? {} : { primaryModule });
|
|
603
|
+
runtimeProjectDetection = refreshedGradle.detection;
|
|
604
|
+
}
|
|
605
|
+
catch (error) {
|
|
606
|
+
if (error instanceof GradleVerificationDiscoveryError) {
|
|
607
|
+
throw new ProjectUpgradeError("GRADLE_DISCOVERY_FAILED", error.message, error.details);
|
|
608
|
+
}
|
|
609
|
+
throw error;
|
|
610
|
+
}
|
|
611
|
+
}
|
|
612
|
+
if (runtimeProjectDetection !== undefined) {
|
|
613
|
+
adaptiveOptions.projectDetection = runtimeProjectDetection;
|
|
614
|
+
}
|
|
615
|
+
const gradleVerification = options.gradleVerification ??
|
|
616
|
+
refreshedGradle?.gradleVerification ??
|
|
617
|
+
configured.gradleVerification;
|
|
526
618
|
if (gradleVerification !== undefined) {
|
|
527
619
|
adaptiveOptions.gradleVerification = gradleVerification;
|
|
528
620
|
}
|
|
@@ -543,25 +635,31 @@ export function planProjectUpgrade(directory, options = {}) {
|
|
|
543
635
|
const preparedAt = validateTimestamp(options.preparedAt ?? new Date().toISOString());
|
|
544
636
|
const installedAt = validateTimestamp(options.installedAt ?? preparedAt);
|
|
545
637
|
const upgradeId = validateUpgradeId(options.upgradeId ?? defaultUpgradeId(preparedAt));
|
|
638
|
+
const merges = desiredMergePlan(requestedTarget, stable.manifest);
|
|
546
639
|
const desiredFiles = planDesiredFiles(requestedTarget, stable.manifest, [
|
|
547
640
|
...resources.inputs,
|
|
548
|
-
...
|
|
549
|
-
], upgradeId);
|
|
641
|
+
...merges.inputs,
|
|
642
|
+
], upgradeId, merges.originalOverrides);
|
|
550
643
|
const removedFiles = planRemovedFiles(requestedTarget, stable.manifest, desiredFiles);
|
|
551
644
|
const manifest = desiredManifest(upgradeId, preparedAt, installedAt, desiredFiles);
|
|
552
645
|
const paths = upgradeControlPaths(requestedTarget, upgradeId);
|
|
553
646
|
const sameVersion = relation === 0;
|
|
554
647
|
const resourcesMatch = desiredFilesMatchCurrent(stable.manifest, manifest);
|
|
555
|
-
if (sameVersion &&
|
|
648
|
+
if (sameVersion &&
|
|
649
|
+
!resourcesMatch &&
|
|
650
|
+
runtimeProjectDetection === undefined) {
|
|
556
651
|
throw new ProjectUpgradeError("UPGRADE_NOT_REQUIRED", "The installed package has the same version but different managed resources.", [
|
|
557
652
|
"Package versions are immutable; install a newer package version before upgrading.",
|
|
558
653
|
]);
|
|
559
654
|
}
|
|
560
655
|
return {
|
|
561
|
-
status: sameVersion ? "already-current" : "upgrade",
|
|
656
|
+
status: sameVersion && resourcesMatch ? "already-current" : "upgrade",
|
|
562
657
|
targetDirectory: requestedTarget,
|
|
563
658
|
moduleScope: resources.adaptiveTemplates.moduleScope,
|
|
564
659
|
primaryModule: resources.adaptiveTemplates.primaryModule.gradlePath,
|
|
660
|
+
projectDetection: runtimeProjectDetection ?? null,
|
|
661
|
+
gradleVerification: resources.adaptiveTemplates.automationConfig.gradleVerification,
|
|
662
|
+
longCommandTimeoutMs,
|
|
565
663
|
fromVersion: stable.manifest.package.version,
|
|
566
664
|
toVersion: ORCHESTRATOR_PACKAGE_VERSION,
|
|
567
665
|
upgradeId,
|
|
@@ -586,6 +684,9 @@ function planFingerprint(plan) {
|
|
|
586
684
|
targetDirectory: plan.targetDirectory,
|
|
587
685
|
moduleScope: plan.moduleScope,
|
|
588
686
|
primaryModule: plan.primaryModule,
|
|
687
|
+
projectDetection: plan.projectDetection,
|
|
688
|
+
gradleVerification: plan.gradleVerification,
|
|
689
|
+
longCommandTimeoutMs: plan.longCommandTimeoutMs,
|
|
589
690
|
fromVersion: plan.fromVersion,
|
|
590
691
|
toVersion: plan.toVersion,
|
|
591
692
|
upgradeId: plan.upgradeId,
|
|
@@ -623,6 +724,13 @@ function assertPlanConsistent(plan) {
|
|
|
623
724
|
const replanned = planProjectUpgrade(plan.targetDirectory, {
|
|
624
725
|
moduleScope: plan.moduleScope,
|
|
625
726
|
primaryModule: plan.primaryModule,
|
|
727
|
+
...(plan.projectDetection === null
|
|
728
|
+
? {}
|
|
729
|
+
: { projectDetection: plan.projectDetection }),
|
|
730
|
+
gradleVerification: plan.gradleVerification,
|
|
731
|
+
...(plan.longCommandTimeoutMs === undefined
|
|
732
|
+
? {}
|
|
733
|
+
: { longCommandTimeoutMs: plan.longCommandTimeoutMs }),
|
|
626
734
|
upgradeId: plan.upgradeId,
|
|
627
735
|
preparedAt: plan.preparedAt,
|
|
628
736
|
installedAt: plan.installedAt,
|
|
@@ -872,8 +980,7 @@ function prepareUpgrade(plan) {
|
|
|
872
980
|
function assertManifestUnchanged(plan) {
|
|
873
981
|
const current = snapshotFile(plan.targetDirectory, INSTALLATION_MANIFEST_RELATIVE_PATH, true);
|
|
874
982
|
if (!current.existed ||
|
|
875
|
-
current.sha256 !== plan.currentManifestSha256
|
|
876
|
-
current.mode !== 0o600) {
|
|
983
|
+
current.sha256 !== plan.currentManifestSha256) {
|
|
877
984
|
throw new ProjectUpgradeError("PLAN_STALE", "The active installation manifest changed during upgrade.");
|
|
878
985
|
}
|
|
879
986
|
}
|
|
@@ -1064,6 +1171,9 @@ export function applyProjectUpgrade(plan, verify) {
|
|
|
1064
1171
|
}
|
|
1065
1172
|
function doctorForUpgrade(directory, options, runner) {
|
|
1066
1173
|
const report = runDoctor({
|
|
1174
|
+
...(options.projectDetection === undefined
|
|
1175
|
+
? {}
|
|
1176
|
+
: { androidProjectDetection: options.projectDetection }),
|
|
1067
1177
|
...(options.androidSdkDirectory === undefined
|
|
1068
1178
|
? {}
|
|
1069
1179
|
: { androidSdkDirectory: options.androidSdkDirectory }),
|
|
@@ -1090,8 +1200,10 @@ function assertVerificationPassed(report) {
|
|
|
1090
1200
|
}
|
|
1091
1201
|
export function runProjectUpgrade(directory, options = {}) {
|
|
1092
1202
|
const runner = options.processRunner ?? runInitProcess;
|
|
1093
|
-
const doctor = doctorForUpgrade(directory, options, runner);
|
|
1094
1203
|
const plan = planProjectUpgrade(directory, options);
|
|
1204
|
+
const doctor = doctorForUpgrade(directory, plan.projectDetection === null
|
|
1205
|
+
? options
|
|
1206
|
+
: { ...options, projectDetection: plan.projectDetection }, runner);
|
|
1095
1207
|
if (plan.status === "already-current") {
|
|
1096
1208
|
const verification = verifyInitializedProject(plan.targetDirectory, runner);
|
|
1097
1209
|
assertVerificationPassed(verification);
|