@frankzhang2026/opencode-android-orchestrator 0.2.0 → 0.3.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 +18 -1
- package/README.md +50 -39
- package/THIRD_PARTY_NOTICES.md +1 -1
- package/dist/cli.js +127 -10
- package/dist/cli.js.map +1 -1
- package/dist/doctor/installation.d.ts.map +1 -1
- package/dist/doctor/installation.js +29 -4
- package/dist/doctor/installation.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 +25 -3
- package/dist/installer/adaptive-templates.d.ts.map +1 -1
- package/dist/installer/adaptive-templates.js +75 -9
- package/dist/installer/adaptive-templates.js.map +1 -1
- package/dist/installer/index.d.ts +2 -2
- package/dist/installer/index.d.ts.map +1 -1
- package/dist/installer/index.js +2 -2
- package/dist/installer/index.js.map +1 -1
- package/dist/installer/init.d.ts +2 -1
- package/dist/installer/init.d.ts.map +1 -1
- package/dist/installer/init.js +10 -1
- package/dist/installer/init.js.map +1 -1
- package/dist/installer/opencode-config.d.ts +4 -3
- package/dist/installer/opencode-config.d.ts.map +1 -1
- package/dist/installer/opencode-config.js +10 -4
- package/dist/installer/opencode-config.js.map +1 -1
- package/dist/installer/upgrade.d.ts +5 -0
- package/dist/installer/upgrade.d.ts.map +1 -1
- package/dist/installer/upgrade.js +44 -10
- package/dist/installer/upgrade.js.map +1 -1
- package/docs/MIGRATION.md +23 -12
- package/docs/SECURITY.md +11 -4
- package/docs/TROUBLESHOOTING.md +5 -6
- package/package.json +1 -1
- package/templates/README.md +5 -2
- package/templates/automation/config.json +17 -0
- package/templates/automation/config.schema.json +31 -0
- package/templates/automation/task-contract.schema.json +22 -1
- package/templates/automation/tasks/TASK-TEMPLATE.json.example +4 -1
- package/templates/scripts/automation/claim-task.sh +6 -6
- package/templates/scripts/automation/lib.sh +118 -0
- package/templates/scripts/automation/preflight.sh +1 -1
- package/templates/scripts/automation/record-red.sh +7 -9
- package/templates/scripts/automation/show-acceptance-review.sh +1 -1
- package/templates/scripts/automation/tests/run-tests.sh +26 -9
- package/templates/scripts/automation/validate-contract.sh +16 -5
- package/templates/scripts/automation/verify-integration.sh +12 -11
- package/templates/scripts/automation/verify-task.sh +13 -28
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,23 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
-
## 0.
|
|
3
|
+
## 0.3.0 - 2026-08-28
|
|
4
|
+
|
|
5
|
+
- Add `all` and `primary` module scopes and make all-module task contracts the
|
|
6
|
+
default for new installations. Multi-application projects no longer require
|
|
7
|
+
a primary selection; upgrades from configurations without the scope field
|
|
8
|
+
remain in `primary` mode unless explicitly widened.
|
|
9
|
+
- Add configurable Gradle verification task matrices to `init` and `upgrade`,
|
|
10
|
+
and bind focused-test contract entries to both an allowed Gradle task and a
|
|
11
|
+
test filter.
|
|
12
|
+
- Harden task-contract validation, source-scope enforcement, RED evidence,
|
|
13
|
+
verification output, and integration checks while preserving protected
|
|
14
|
+
Gradle and orchestration files.
|
|
15
|
+
- Retry OpenCode configuration discovery only for its known transient SQLite
|
|
16
|
+
checkpoint failure.
|
|
17
|
+
- Expand multi-module, lifecycle, CLI, schema, migration, and compatibility
|
|
18
|
+
coverage to 124 Node tests and the audited 38-case Shell suite.
|
|
19
|
+
|
|
20
|
+
## 0.2.0 - 2026-08-26
|
|
4
21
|
|
|
5
22
|
- Add the complete MIT license, packaged third-party notices, public repository
|
|
6
23
|
metadata, draft release notes, and a fail-closed `0.2.0` authorization record.
|
package/README.md
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
Reusable OpenCode orchestration for macOS Android projects.
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
Version `0.2.0` is the first published lifecycle release. Version `0.3.0` adds
|
|
6
|
+
default all-module orchestration, configurable Gradle verification tasks, and
|
|
7
|
+
stricter contract/evidence validation while retaining the same certified
|
|
8
|
+
OpenCode compatibility range.
|
|
9
9
|
|
|
10
10
|
## Documentation
|
|
11
11
|
|
|
@@ -33,22 +33,29 @@ Run lifecycle commands from the project root or a directory below it. Use a
|
|
|
33
33
|
clean branch and preserve an independent backup before the first installation,
|
|
34
34
|
even though the installer maintains its own verified recovery data.
|
|
35
35
|
|
|
36
|
-
## Quick start
|
|
36
|
+
## Quick start
|
|
37
37
|
|
|
38
38
|
```sh
|
|
39
|
-
npx @frankzhang2026/opencode-android-orchestrator@0.
|
|
40
|
-
npx @frankzhang2026/opencode-android-orchestrator@0.
|
|
39
|
+
npx @frankzhang2026/opencode-android-orchestrator@0.3.0 init .
|
|
40
|
+
npx @frankzhang2026/opencode-android-orchestrator@0.3.0 doctor .
|
|
41
41
|
opencode --agent scheduled-planner .
|
|
42
42
|
```
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
New installations use all-module scope by default. Every detected Android
|
|
45
|
+
module's `src/main`, `src/test`, and `src/androidTest` trees can be included in
|
|
46
|
+
a task contract without selecting a primary module. To intentionally restrict
|
|
47
|
+
generated contracts to one module, opt into primary-module scope:
|
|
46
48
|
|
|
47
49
|
```sh
|
|
48
|
-
npx @frankzhang2026/opencode-android-orchestrator@0.
|
|
50
|
+
npx @frankzhang2026/opencode-android-orchestrator@0.3.0 init . \
|
|
51
|
+
--module-scope primary \
|
|
49
52
|
--primary-module :mobile
|
|
50
53
|
```
|
|
51
54
|
|
|
55
|
+
In all-module scope, `--primary-module` is optional and only chooses the
|
|
56
|
+
default module used by the focused-test placeholder; it does not narrow which
|
|
57
|
+
detected modules may be modified.
|
|
58
|
+
|
|
52
59
|
The install transaction manages 45 project-local paths:
|
|
53
60
|
|
|
54
61
|
| Resource group | Count | Installation behavior |
|
|
@@ -67,9 +74,9 @@ does not register Scheduler or launchd jobs.
|
|
|
67
74
|
|
|
68
75
|
## Status
|
|
69
76
|
|
|
70
|
-
Version `0.1.0` was
|
|
71
|
-
|
|
72
|
-
|
|
77
|
+
Version `0.1.0` was an early scaffold without a working installer. Version
|
|
78
|
+
`0.2.0` introduced the complete managed lifecycle; version `0.3.0` builds on
|
|
79
|
+
that release with all-module defaults and stronger verification contracts.
|
|
73
80
|
|
|
74
81
|
The cross-version plugin entry, OpenCode version doctor, Android/Gradle project
|
|
75
82
|
discovery, audited V3 resources, and all deterministic V3 Shell transactions
|
|
@@ -86,8 +93,7 @@ only unchanged managed resources, carries original pre-install backups
|
|
|
86
93
|
forward, and restores the complete previous installation if verification
|
|
87
94
|
fails. The `uninstall` command now restores unchanged original files, removes
|
|
88
95
|
unchanged plugin-created files, and retains any content, permission, or
|
|
89
|
-
deletion drift for manual review.
|
|
90
|
-
not passed the release gates.
|
|
96
|
+
deletion drift for manual review.
|
|
91
97
|
|
|
92
98
|
Implemented checks include:
|
|
93
99
|
|
|
@@ -106,9 +112,10 @@ Implemented checks include:
|
|
|
106
112
|
gates consume detected source-set paths instead of a fixed module name
|
|
107
113
|
- a portable automation configuration source, both Schemas, contract example,
|
|
108
114
|
plan guide, and bounded AGENTS managed block
|
|
109
|
-
- adaptive configuration for every detected Android module,
|
|
110
|
-
|
|
111
|
-
|
|
115
|
+
- adaptive configuration for every detected Android module, default
|
|
116
|
+
all-module task paths, opt-in primary-module restriction, exact protected
|
|
117
|
+
build files, production/test source sets, and a namespace-aware focused-test
|
|
118
|
+
placeholder
|
|
112
119
|
- removal of the legacy Scheduler dependency and all local absolute paths from
|
|
113
120
|
shipped templates
|
|
114
121
|
- read-only `opencode.json`/`opencode.jsonc` merge planning that preserves
|
|
@@ -146,9 +153,10 @@ Implemented checks include:
|
|
|
146
153
|
evidence, and automatically restores the installed state on pre-commit
|
|
147
154
|
failure
|
|
148
155
|
|
|
149
|
-
The planners deliberately avoid filesystem writes. The adaptive planner
|
|
150
|
-
|
|
151
|
-
roots that the current root-relative
|
|
156
|
+
The planners deliberately avoid filesystem writes. The adaptive planner blocks
|
|
157
|
+
ambiguous primary-module selections only in `primary` scope, as well as paths
|
|
158
|
+
outside the Git root and nested Gradle roots that the current root-relative
|
|
159
|
+
transaction scripts cannot safely run.
|
|
152
160
|
The transaction layer writes only installer control state and recovery
|
|
153
161
|
evidence until `init`, `upgrade`, or `uninstall` explicitly applies a validated
|
|
154
162
|
plan.
|
|
@@ -161,7 +169,8 @@ import {
|
|
|
161
169
|
} from "@frankzhang2026/opencode-android-orchestrator";
|
|
162
170
|
|
|
163
171
|
const plan = planAdaptiveProjectTemplates("/path/to/android-project", {
|
|
164
|
-
|
|
172
|
+
moduleScope: "all", // optional; this is the default
|
|
173
|
+
primaryModule: ":mobile", // optional focused-test default in all mode
|
|
165
174
|
});
|
|
166
175
|
|
|
167
176
|
console.log(plan.automationConfigContent);
|
|
@@ -204,14 +213,18 @@ preparation alone as resource installation;
|
|
|
204
213
|
## Init
|
|
205
214
|
|
|
206
215
|
```sh
|
|
207
|
-
npx @frankzhang2026/opencode-android-orchestrator@0.
|
|
216
|
+
npx @frankzhang2026/opencode-android-orchestrator@0.3.0 init .
|
|
208
217
|
opencode --agent scheduled-planner .
|
|
209
218
|
```
|
|
210
219
|
|
|
211
|
-
|
|
220
|
+
All detected modules are enabled by default, including multi-application
|
|
221
|
+
projects. Use the restrictive mode only when a task contract must stay within
|
|
222
|
+
one module:
|
|
212
223
|
|
|
213
224
|
```sh
|
|
214
|
-
opencode-android-orchestrator init .
|
|
225
|
+
opencode-android-orchestrator init . \
|
|
226
|
+
--module-scope primary \
|
|
227
|
+
--primary-module :mobile
|
|
215
228
|
```
|
|
216
229
|
|
|
217
230
|
Before writing, `init` requires a compatible OpenCode version, a Git-backed
|
|
@@ -230,9 +243,8 @@ Verification failure automatically restores originals and records rollback
|
|
|
230
243
|
history; recovery backups remain below `.automation-plugin/backups/`. Repeating
|
|
231
244
|
`init` on an unchanged, healthy installation performs no managed-file writes.
|
|
232
245
|
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
project now.
|
|
246
|
+
Pin the exact package version in long-lived repositories and review the
|
|
247
|
+
generated installation diff before starting the scheduled planner.
|
|
236
248
|
|
|
237
249
|
## Doctor
|
|
238
250
|
|
|
@@ -287,7 +299,8 @@ preflight verifies both resolved permissions and tool discovery.
|
|
|
287
299
|
|
|
288
300
|
### Phase 2 mutating-tool decision
|
|
289
301
|
|
|
290
|
-
The 2026-08-25 evaluation
|
|
302
|
+
The 2026-08-25 evaluation remains **NO-GO for mutating custom tools in
|
|
303
|
+
`0.3.0`**.
|
|
291
304
|
The fixed Shell allowlist remains the only entry point for state transitions,
|
|
292
305
|
Git mutations, and agent launches. OpenCode custom tools provide typed arguments
|
|
293
306
|
and workspace context, but a normal permission prompt is not the workflow's
|
|
@@ -323,14 +336,19 @@ than public tools.
|
|
|
323
336
|
|
|
324
337
|
```sh
|
|
325
338
|
opencode-android-orchestrator upgrade /path/to/android-project
|
|
326
|
-
opencode-android-orchestrator upgrade . --
|
|
339
|
+
opencode-android-orchestrator upgrade . --module-scope all --json
|
|
327
340
|
```
|
|
328
341
|
|
|
329
342
|
`upgrade` accepts either the Git root or a directory below it. It first validates
|
|
330
343
|
the installed manifest, every managed file, and every original-file backup. It
|
|
331
344
|
refuses downgrades, user-modified managed resources, damaged backups, ambiguous
|
|
332
|
-
Android modules, same-version resource rewrites,
|
|
333
|
-
marker before creating recovery state.
|
|
345
|
+
Android modules in restrictive `primary` scope, same-version resource rewrites,
|
|
346
|
+
and an unfinished upgrade marker before creating recovery state.
|
|
347
|
+
|
|
348
|
+
Upgrade preserves the installed module scope. Installations created before the
|
|
349
|
+
scope field existed are interpreted as `primary` so an upgrade cannot silently
|
|
350
|
+
widen write access; pass `--module-scope all` during a real version upgrade to
|
|
351
|
+
opt in explicitly.
|
|
334
352
|
|
|
335
353
|
For an older healthy installation, the command:
|
|
336
354
|
|
|
@@ -352,9 +370,6 @@ the command again on the current, unchanged version is byte-idempotent: it
|
|
|
352
370
|
rechecks prerequisites and post-install verification without creating upgrade
|
|
353
371
|
history or recovery state.
|
|
354
372
|
|
|
355
|
-
Version `0.2.0` has not been published. These commands document the intended
|
|
356
|
-
post-release lifecycle and are not instructions to upgrade a live project yet.
|
|
357
|
-
|
|
358
373
|
## Uninstall
|
|
359
374
|
|
|
360
375
|
```sh
|
|
@@ -384,10 +399,6 @@ installation backups and uninstall evidence are intentionally retained for
|
|
|
384
399
|
audit and manual recovery; user-created or pre-existing empty directories are
|
|
385
400
|
never guessed at or recursively removed.
|
|
386
401
|
|
|
387
|
-
Version `0.2.0` has not been published. This command documents the intended
|
|
388
|
-
post-release lifecycle and is not an instruction to uninstall a live project
|
|
389
|
-
through the unpublished package.
|
|
390
|
-
|
|
391
402
|
## Development
|
|
392
403
|
|
|
393
404
|
The package root exports only the default OpenCode plugin factory because the
|
package/THIRD_PARTY_NOTICES.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Third-Party Notices
|
|
2
2
|
|
|
3
|
-
Last reviewed for `0.
|
|
3
|
+
Last reviewed for `0.3.0` on 2026-08-28.
|
|
4
4
|
|
|
5
5
|
The published package does not vendor `node_modules`, third-party binaries, or
|
|
6
6
|
third-party Skill source. Its compiled JavaScript imports the direct runtime
|
package/dist/cli.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { readFileSync } from "node:fs";
|
|
3
|
+
import { resolve } from "node:path";
|
|
2
4
|
import process from "node:process";
|
|
3
5
|
import { INSTALLER_COMMANDS } from "./commands/index.js";
|
|
4
6
|
import { formatDoctorReport, runDoctor } from "./doctor/index.js";
|
|
5
7
|
import { formatProjectInitializationResult, runProjectInitialization, } from "./installer/init.js";
|
|
8
|
+
import { isModuleScope, } from "./installer/adaptive-templates.js";
|
|
6
9
|
import { formatProjectUpgradeResult, runProjectUpgrade, } from "./installer/upgrade.js";
|
|
7
10
|
import { formatProjectUninstallResult, runProjectUninstall, } from "./installer/uninstall.js";
|
|
8
11
|
function printHelp() {
|
|
@@ -18,7 +21,8 @@ function printHelp() {
|
|
|
18
21
|
function printInitHelp() {
|
|
19
22
|
process.stdout.write(`OpenCode Android Orchestrator init\n\n`);
|
|
20
23
|
process.stdout.write(`Usage:\n`);
|
|
21
|
-
process.stdout.write(` opencode-android-orchestrator init [directory] [--primary-module <gradle-path>] [--json]\n`);
|
|
24
|
+
process.stdout.write(` opencode-android-orchestrator init [directory] [--module-scope <all|primary>] [--primary-module <gradle-path>] [--gradle-verification-config <json-path>] [--json]\n`);
|
|
25
|
+
process.stdout.write(`\nDefault module scope: all\n`);
|
|
22
26
|
}
|
|
23
27
|
function printDoctorHelp() {
|
|
24
28
|
process.stdout.write(`OpenCode Android Orchestrator doctor\n\n`);
|
|
@@ -28,7 +32,8 @@ function printDoctorHelp() {
|
|
|
28
32
|
function printUpgradeHelp() {
|
|
29
33
|
process.stdout.write(`OpenCode Android Orchestrator upgrade\n\n`);
|
|
30
34
|
process.stdout.write(`Usage:\n`);
|
|
31
|
-
process.stdout.write(` opencode-android-orchestrator upgrade [directory] [--primary-module <gradle-path>] [--json]\n`);
|
|
35
|
+
process.stdout.write(` opencode-android-orchestrator upgrade [directory] [--module-scope <all|primary>] [--primary-module <gradle-path>] [--gradle-verification-config <json-path>] [--json]\n`);
|
|
36
|
+
process.stdout.write(`\nPreserves the installed module scope; legacy installations default to primary.\n`);
|
|
32
37
|
}
|
|
33
38
|
function printUninstallHelp() {
|
|
34
39
|
process.stdout.write(`OpenCode Android Orchestrator uninstall\n\n`);
|
|
@@ -58,6 +63,16 @@ function printCommandError(error) {
|
|
|
58
63
|
process.stderr.write(` ${detail}\n`);
|
|
59
64
|
}
|
|
60
65
|
}
|
|
66
|
+
function readGradleVerificationConfiguration(path) {
|
|
67
|
+
const absolutePath = resolve(path);
|
|
68
|
+
try {
|
|
69
|
+
return JSON.parse(readFileSync(absolutePath, "utf8"));
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
73
|
+
throw new Error(`Unable to read Gradle verification configuration ${absolutePath}: ${detail}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
61
76
|
const [command, ...commandArguments] = process.argv.slice(2);
|
|
62
77
|
if (command === undefined || command === "--help" || command === "-h") {
|
|
63
78
|
printHelp();
|
|
@@ -69,7 +84,9 @@ else if (command === "init") {
|
|
|
69
84
|
}
|
|
70
85
|
else {
|
|
71
86
|
let targetDirectory;
|
|
87
|
+
let moduleScope;
|
|
72
88
|
let primaryModule;
|
|
89
|
+
let gradleVerificationConfigPath;
|
|
73
90
|
let json = false;
|
|
74
91
|
const unexpected = [];
|
|
75
92
|
for (let index = 0; index < commandArguments.length; index += 1) {
|
|
@@ -77,6 +94,30 @@ else if (command === "init") {
|
|
|
77
94
|
if (argument === "--json") {
|
|
78
95
|
json = true;
|
|
79
96
|
}
|
|
97
|
+
else if (argument === "--module-scope") {
|
|
98
|
+
const value = commandArguments[index + 1];
|
|
99
|
+
if (value === undefined || value.startsWith("-")) {
|
|
100
|
+
unexpected.push(argument);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
if (isModuleScope(value)) {
|
|
104
|
+
moduleScope = value;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
unexpected.push(`${argument} ${value}`);
|
|
108
|
+
}
|
|
109
|
+
index += 1;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
else if (argument.startsWith("--module-scope=")) {
|
|
113
|
+
const value = argument.slice("--module-scope=".length);
|
|
114
|
+
if (isModuleScope(value)) {
|
|
115
|
+
moduleScope = value;
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
unexpected.push(argument);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
80
121
|
else if (argument === "--primary-module") {
|
|
81
122
|
const value = commandArguments[index + 1];
|
|
82
123
|
if (value === undefined || value.startsWith("-")) {
|
|
@@ -96,6 +137,25 @@ else if (command === "init") {
|
|
|
96
137
|
primaryModule = value;
|
|
97
138
|
}
|
|
98
139
|
}
|
|
140
|
+
else if (argument === "--gradle-verification-config") {
|
|
141
|
+
const value = commandArguments[index + 1];
|
|
142
|
+
if (value === undefined || value.startsWith("-")) {
|
|
143
|
+
unexpected.push(argument);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
gradleVerificationConfigPath = value;
|
|
147
|
+
index += 1;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
else if (argument.startsWith("--gradle-verification-config=")) {
|
|
151
|
+
const value = argument.slice("--gradle-verification-config=".length);
|
|
152
|
+
if (value.length === 0) {
|
|
153
|
+
unexpected.push(argument);
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
gradleVerificationConfigPath = value;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
99
159
|
else if (argument.startsWith("-")) {
|
|
100
160
|
unexpected.push(argument);
|
|
101
161
|
}
|
|
@@ -111,11 +171,17 @@ else if (command === "init") {
|
|
|
111
171
|
process.exitCode = 2;
|
|
112
172
|
}
|
|
113
173
|
else {
|
|
114
|
-
const options = {};
|
|
115
|
-
if (primaryModule !== undefined) {
|
|
116
|
-
options.primaryModule = primaryModule;
|
|
117
|
-
}
|
|
118
174
|
try {
|
|
175
|
+
const options = {};
|
|
176
|
+
if (moduleScope !== undefined) {
|
|
177
|
+
options.moduleScope = moduleScope;
|
|
178
|
+
}
|
|
179
|
+
if (primaryModule !== undefined) {
|
|
180
|
+
options.primaryModule = primaryModule;
|
|
181
|
+
}
|
|
182
|
+
if (gradleVerificationConfigPath !== undefined) {
|
|
183
|
+
options.gradleVerification = readGradleVerificationConfiguration(gradleVerificationConfigPath);
|
|
184
|
+
}
|
|
119
185
|
const result = runProjectInitialization(targetDirectory ?? process.cwd(), options);
|
|
120
186
|
process.stdout.write(json
|
|
121
187
|
? `${JSON.stringify(result, null, 2)}\n`
|
|
@@ -136,7 +202,9 @@ else if (command === "upgrade") {
|
|
|
136
202
|
}
|
|
137
203
|
else {
|
|
138
204
|
let targetDirectory;
|
|
205
|
+
let moduleScope;
|
|
139
206
|
let primaryModule;
|
|
207
|
+
let gradleVerificationConfigPath;
|
|
140
208
|
let json = false;
|
|
141
209
|
const unexpected = [];
|
|
142
210
|
for (let index = 0; index < commandArguments.length; index += 1) {
|
|
@@ -144,6 +212,30 @@ else if (command === "upgrade") {
|
|
|
144
212
|
if (argument === "--json") {
|
|
145
213
|
json = true;
|
|
146
214
|
}
|
|
215
|
+
else if (argument === "--module-scope") {
|
|
216
|
+
const value = commandArguments[index + 1];
|
|
217
|
+
if (value === undefined || value.startsWith("-")) {
|
|
218
|
+
unexpected.push(argument);
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
if (isModuleScope(value)) {
|
|
222
|
+
moduleScope = value;
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
unexpected.push(`${argument} ${value}`);
|
|
226
|
+
}
|
|
227
|
+
index += 1;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
else if (argument.startsWith("--module-scope=")) {
|
|
231
|
+
const value = argument.slice("--module-scope=".length);
|
|
232
|
+
if (isModuleScope(value)) {
|
|
233
|
+
moduleScope = value;
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
unexpected.push(argument);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
147
239
|
else if (argument === "--primary-module") {
|
|
148
240
|
const value = commandArguments[index + 1];
|
|
149
241
|
if (value === undefined || value.startsWith("-")) {
|
|
@@ -163,6 +255,25 @@ else if (command === "upgrade") {
|
|
|
163
255
|
primaryModule = value;
|
|
164
256
|
}
|
|
165
257
|
}
|
|
258
|
+
else if (argument === "--gradle-verification-config") {
|
|
259
|
+
const value = commandArguments[index + 1];
|
|
260
|
+
if (value === undefined || value.startsWith("-")) {
|
|
261
|
+
unexpected.push(argument);
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
gradleVerificationConfigPath = value;
|
|
265
|
+
index += 1;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
else if (argument.startsWith("--gradle-verification-config=")) {
|
|
269
|
+
const value = argument.slice("--gradle-verification-config=".length);
|
|
270
|
+
if (value.length === 0) {
|
|
271
|
+
unexpected.push(argument);
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
gradleVerificationConfigPath = value;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
166
277
|
else if (argument.startsWith("-")) {
|
|
167
278
|
unexpected.push(argument);
|
|
168
279
|
}
|
|
@@ -178,11 +289,17 @@ else if (command === "upgrade") {
|
|
|
178
289
|
process.exitCode = 2;
|
|
179
290
|
}
|
|
180
291
|
else {
|
|
181
|
-
const options = {};
|
|
182
|
-
if (primaryModule !== undefined) {
|
|
183
|
-
options.primaryModule = primaryModule;
|
|
184
|
-
}
|
|
185
292
|
try {
|
|
293
|
+
const options = {};
|
|
294
|
+
if (moduleScope !== undefined) {
|
|
295
|
+
options.moduleScope = moduleScope;
|
|
296
|
+
}
|
|
297
|
+
if (primaryModule !== undefined) {
|
|
298
|
+
options.primaryModule = primaryModule;
|
|
299
|
+
}
|
|
300
|
+
if (gradleVerificationConfigPath !== undefined) {
|
|
301
|
+
options.gradleVerification = readGradleVerificationConfiguration(gradleVerificationConfigPath);
|
|
302
|
+
}
|
|
186
303
|
const result = runProjectUpgrade(targetDirectory ?? process.cwd(), options);
|
|
187
304
|
process.stdout.write(json
|
|
188
305
|
? `${JSON.stringify(result, null, 2)}\n`
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EACL,iCAAiC,EACjC,wBAAwB,GAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,aAAa,GAGd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,GAElB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAElC,SAAS,SAAS;IAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;IACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,aAAa;IACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC/D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,wKAAwK,CACzK,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,+DAA+D,CAChE,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,2KAA2K,CAC5K,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oFAAoF,CACrF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kEAAkE,CACnE,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IACE,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAC5B,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,EAC3D,CAAC;QACD,OAAO,KAAK,CAAC,OAA4B,CAAC;IAC5C,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,MAAM,IAAI,GACR,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC5B,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG;QACpB,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC;IACnD,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,IAAI,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAS,mCAAmC,CAC1C,IAAY;IAEZ,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CACf,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CACA,CAAC;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,MAAM,IAAI,KAAK,CACb,oDAAoD,YAAY,KAAK,MAAM,EAAE,CAC9E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAE7D,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;IACtE,SAAS,EAAE,CAAC;AACd,CAAC;KAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;IAC9B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,aAAa,EAAE,CAAC;QAChB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,IAAI,eAAmC,CAAC;QACxC,IAAI,WAAoC,CAAC;QACzC,IAAI,aAAiC,CAAC;QACtC,IAAI,4BAAgD,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;YAChE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBAAM,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,WAAW,GAAG,KAAK,CAAC;oBACtB,CAAC;yBAAM,CAAC;wBACN,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;oBAC1C,CAAC;oBACD,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACvD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,WAAW,GAAG,KAAK,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;gBAC3C,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,KAAK,CAAC;oBACtB,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,KAAK,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,KAAK,8BAA8B,EAAE,CAAC;gBACvD,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,4BAA4B,GAAG,KAAK,CAAC;oBACrC,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC,EAAE,CAAC;gBAChE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;gBACrE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,4BAA4B,GAAG,KAAK,CAAC;gBACvC,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBACzC,eAAe,GAAG,QAAQ,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gCAAgC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC1D,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,OAAO,GAAiC,EAAE,CAAC;gBACjD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;gBACpC,CAAC;gBACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;oBAChC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;gBACxC,CAAC;gBACD,IAAI,4BAA4B,KAAK,SAAS,EAAE,CAAC;oBAC/C,OAAO,CAAC,kBAAkB,GAAG,mCAAmC,CAC9D,4BAA4B,CAC7B,CAAC;gBACJ,CAAC;gBACD,MAAM,MAAM,GAAG,wBAAwB,CACrC,eAAe,IAAI,OAAO,CAAC,GAAG,EAAE,EAChC,OAAO,CACR,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,IAAI;oBACF,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;oBACxC,CAAC,CAAC,iCAAiC,CAAC,MAAM,CAAC,CAC9C,CAAC;gBACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;KAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;IACjC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,gBAAgB,EAAE,CAAC;QACnB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,IAAI,eAAmC,CAAC;QACxC,IAAI,WAAoC,CAAC;QACzC,IAAI,aAAiC,CAAC;QACtC,IAAI,4BAAgD,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;YAChE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBAAM,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,WAAW,GAAG,KAAK,CAAC;oBACtB,CAAC;yBAAM,CAAC;wBACN,UAAU,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;oBAC1C,CAAC;oBACD,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACvD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,WAAW,GAAG,KAAK,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;gBAC3C,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,KAAK,CAAC;oBACtB,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,KAAK,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,KAAK,8BAA8B,EAAE,CAAC;gBACvD,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,4BAA4B,GAAG,KAAK,CAAC;oBACrC,KAAK,IAAI,CAAC,CAAC;gBACb,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC,EAAE,CAAC;gBAChE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;gBACrE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,4BAA4B,GAAG,KAAK,CAAC;gBACvC,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBACzC,eAAe,GAAG,QAAQ,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mCAAmC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC7D,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,OAAO,GAA0B,EAAE,CAAC;gBAC1C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;gBACpC,CAAC;gBACD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;oBAChC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;gBACxC,CAAC;gBACD,IAAI,4BAA4B,KAAK,SAAS,EAAE,CAAC;oBAC/C,OAAO,CAAC,kBAAkB,GAAG,mCAAmC,CAC9D,4BAA4B,CAC7B,CAAC;gBACJ,CAAC;gBACD,MAAM,MAAM,GAAG,iBAAiB,CAC9B,eAAe,IAAI,OAAO,CAAC,GAAG,EAAE,EAChC,OAAO,CACR,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,IAAI;oBACF,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;oBACxC,CAAC,CAAC,0BAA0B,CAAC,MAAM,CAAC,CACvC,CAAC;gBACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;KAAM,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;IACnC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,kBAAkB,EAAE,CAAC;QACrB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG,gBAAgB,CAAC,MAAM,CAC5C,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,KAAK,QAAQ,CAChE,CAAC;QACF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,MAAM,CAC/C,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CACxC,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qCAAqC;gBACnC,GAAG,cAAc;gBACjB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CACjB,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,mBAAmB,CAChC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CACtC,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACjC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;oBACxC,CAAC,CAAC,4BAA4B,CAAC,MAAM,CAAC,CACzC,CAAC;gBACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;KAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;IAChC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG,gBAAgB,CAAC,MAAM,CAC5C,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,KAAK,QAAQ,CAChE,CAAC;QACF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,MAAM,CAC/C,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CACxC,CAAC;QACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kCAAkC;gBAChC,GAAG,cAAc;gBACjB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CACjB,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,SAAS,CAAC;gBACvB,iBAAiB,EAAE,IAAI;gBACvB,iBAAiB,EAAE,IAAI;gBACvB,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE;aACvD,CAAC,CAAC;YACH,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;AACH,CAAC;KAAM,IAAK,kBAAwC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY,OAAO,4CAA4C,CAChE,CAAC;IACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC;KAAM,CAAC;IACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,MAAM,CAAC,CAAC;IACxD,SAAS,EAAE,CAAC;IACZ,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.d.ts","sourceRoot":"","sources":["../../src/doctor/installation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installation.d.ts","sourceRoot":"","sources":["../../src/doctor/installation.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAgkB9C,wBAAgB,wBAAwB,CACtC,eAAe,EAAE,MAAM,GACtB,SAAS,WAAW,EAAE,CA4DxB"}
|
|
@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
|
|
|
2
2
|
import { lstatSync, readFileSync, } from "node:fs";
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
|
-
import { planAdaptiveProjectTemplates, } from "../installer/adaptive-templates.js";
|
|
5
|
+
import { isModuleScope, planAdaptiveProjectTemplates, } from "../installer/adaptive-templates.js";
|
|
6
6
|
import { planAgentsConfigMerge } from "../installer/agents-config.js";
|
|
7
7
|
import { INSTALLATION_MANIFEST_RELATIVE_PATH, readInstallationManifest, verifyInstallationIntegrity, } from "../installer/install-manifest.js";
|
|
8
8
|
import { ORCHESTRATOR_PACKAGE_NAME, ORCHESTRATOR_PACKAGE_VERSION, mergeOpenCodeConfigText, } from "../installer/opencode-config.js";
|
|
@@ -393,18 +393,43 @@ function managedConfigurationCheck(targetDirectory, manifest, inspections) {
|
|
|
393
393
|
if (typeof primaryModule !== "string") {
|
|
394
394
|
throw new Error("androidProject.primaryModule must be a string");
|
|
395
395
|
}
|
|
396
|
+
const configuredModuleScope = automationConfig.androidProject.moduleScope;
|
|
397
|
+
let moduleScope;
|
|
398
|
+
let comparableAutomationConfig = automationConfig;
|
|
399
|
+
if (configuredModuleScope === undefined) {
|
|
400
|
+
moduleScope = "primary";
|
|
401
|
+
comparableAutomationConfig = {
|
|
402
|
+
...automationConfig,
|
|
403
|
+
androidProject: {
|
|
404
|
+
...automationConfig.androidProject,
|
|
405
|
+
moduleScope,
|
|
406
|
+
},
|
|
407
|
+
};
|
|
408
|
+
}
|
|
409
|
+
else if (isModuleScope(configuredModuleScope)) {
|
|
410
|
+
moduleScope = configuredModuleScope;
|
|
411
|
+
}
|
|
412
|
+
else {
|
|
413
|
+
throw new Error("androidProject.moduleScope must be either all or primary");
|
|
414
|
+
}
|
|
415
|
+
if (!isRecord(automationConfig.gradleVerification)) {
|
|
416
|
+
throw new Error("automation config must contain a gradleVerification object");
|
|
417
|
+
}
|
|
396
418
|
const expected = planAdaptiveProjectTemplates(targetDirectory, {
|
|
419
|
+
moduleScope,
|
|
397
420
|
primaryModule,
|
|
421
|
+
gradleVerification: automationConfig.gradleVerification,
|
|
398
422
|
});
|
|
399
|
-
if (!jsonMatches(
|
|
423
|
+
if (!jsonMatches(comparableAutomationConfig, expected.automationConfig)) {
|
|
400
424
|
failures.push("automation/config.json: configuration no longer matches the detected Android project and packaged safe defaults.");
|
|
401
425
|
}
|
|
402
426
|
else {
|
|
403
|
-
details.push(`Automation
|
|
427
|
+
details.push(`Automation module scope: ${moduleScope}`);
|
|
428
|
+
details.push(`Automation default module: ${primaryModule}`);
|
|
404
429
|
}
|
|
405
430
|
const taskExample = JSON.parse(inspectedText("automation/tasks/TASK-TEMPLATE.json.example", inspections));
|
|
406
431
|
if (!jsonMatches(taskExample, expected.taskContractExample)) {
|
|
407
|
-
failures.push("automation/tasks/TASK-TEMPLATE.json.example: example no longer matches the detected
|
|
432
|
+
failures.push("automation/tasks/TASK-TEMPLATE.json.example: example no longer matches the detected module scope.");
|
|
408
433
|
}
|
|
409
434
|
}
|
|
410
435
|
catch (error) {
|