@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.
Files changed (41) hide show
  1. package/CHANGELOG.md +31 -0
  2. package/README.md +48 -15
  3. package/dist/cli.js +9 -1
  4. package/dist/cli.js.map +1 -1
  5. package/dist/doctor/index.d.ts +2 -0
  6. package/dist/doctor/index.d.ts.map +1 -1
  7. package/dist/doctor/index.js +2 -1
  8. package/dist/doctor/index.js.map +1 -1
  9. package/dist/index.d.ts +2 -2
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/index.js +2 -2
  12. package/dist/index.js.map +1 -1
  13. package/dist/installer/adaptive-templates.d.ts +2 -0
  14. package/dist/installer/adaptive-templates.d.ts.map +1 -1
  15. package/dist/installer/adaptive-templates.js +1 -1
  16. package/dist/installer/adaptive-templates.js.map +1 -1
  17. package/dist/installer/agents-config.d.ts +5 -0
  18. package/dist/installer/agents-config.d.ts.map +1 -1
  19. package/dist/installer/agents-config.js +44 -8
  20. package/dist/installer/agents-config.js.map +1 -1
  21. package/dist/installer/gradle-verification.d.ts +10 -1
  22. package/dist/installer/gradle-verification.d.ts.map +1 -1
  23. package/dist/installer/gradle-verification.js +192 -27
  24. package/dist/installer/gradle-verification.js.map +1 -1
  25. package/dist/installer/index.d.ts +1 -1
  26. package/dist/installer/index.d.ts.map +1 -1
  27. package/dist/installer/index.js +1 -1
  28. package/dist/installer/index.js.map +1 -1
  29. package/dist/installer/init.d.ts.map +1 -1
  30. package/dist/installer/init.js +13 -5
  31. package/dist/installer/init.js.map +1 -1
  32. package/dist/installer/opencode-config.d.ts +3 -3
  33. package/dist/installer/opencode-config.js +1 -1
  34. package/dist/installer/upgrade.d.ts +8 -1
  35. package/dist/installer/upgrade.d.ts.map +1 -1
  36. package/dist/installer/upgrade.js +163 -51
  37. package/dist/installer/upgrade.js.map +1 -1
  38. package/docs/MIGRATION.md +54 -25
  39. package/docs/SECURITY.md +18 -9
  40. package/docs/TROUBLESHOOTING.md +40 -9
  41. package/package.json +1 -1
package/dist/installer/agents-config.js CHANGED
@@ -74,21 +74,31 @@ function appendManagedBlock(original, fragment) {
74
74
  : `${ending}${ending}`;
75
75
  return `${original}${separator}${convertedFragment}`;
76
76
  }
77
- function mergeAgentsContent(original, fragment) {
78
- const beginCount = markerCount(original, AGENTS_MANAGED_BLOCK_BEGIN);
79
- const endCount = markerCount(original, AGENTS_MANAGED_BLOCK_END);
77
+ function managedBlockRange(content) {
78
+ const beginCount = markerCount(content, AGENTS_MANAGED_BLOCK_BEGIN);
79
+ const endCount = markerCount(content, AGENTS_MANAGED_BLOCK_END);
80
80
  if (beginCount === 0 && endCount === 0) {
81
- return appendManagedBlock(original, fragment);
81
+ return null;
82
82
  }
83
83
  if (beginCount !== 1 || endCount !== 1) {
84
84
  throw new AgentsConfigMergeError("AGENTS_MARKERS_INVALID", "AGENTS.md contains partial or duplicate orchestrator markers.");
85
85
  }
86
- const begin = original.indexOf(AGENTS_MANAGED_BLOCK_BEGIN);
87
- const end = original.indexOf(AGENTS_MANAGED_BLOCK_END);
88
- if (begin < 0 || end < begin) {
86
+ const begin = content.indexOf(AGENTS_MANAGED_BLOCK_BEGIN);
87
+ const endMarker = content.indexOf(AGENTS_MANAGED_BLOCK_END);
88
+ if (begin < 0 || endMarker < begin) {
89
89
  throw new AgentsConfigMergeError("AGENTS_MARKERS_INVALID", "AGENTS.md orchestrator markers are out of order.");
90
90
  }
91
- const existingBlock = original.slice(begin, end + AGENTS_MANAGED_BLOCK_END.length);
91
+ return {
92
+ begin,
93
+ end: endMarker + AGENTS_MANAGED_BLOCK_END.length,
94
+ };
95
+ }
96
+ function mergeAgentsContent(original, fragment) {
97
+ const range = managedBlockRange(original);
98
+ if (range === null) {
99
+ return appendManagedBlock(original, fragment);
100
+ }
101
+ const existingBlock = original.slice(range.begin, range.end);
92
102
  const expectedBlock = convertLineEndings(fragment.trimEnd(), lineEnding(original));
93
103
  if (existingBlock !== expectedBlock) {
94
104
  throw new AgentsConfigMergeError("AGENTS_BLOCK_CONFLICT", "The existing orchestrator block in AGENTS.md differs from this package.", ["Refusing to overwrite a modified managed block."]);
@@ -98,6 +108,32 @@ function mergeAgentsContent(original, fragment) {
98
108
  export function mergeAgentsConfigText(source) {
99
109
  return mergeAgentsContent(source, packagedFragment());
100
110
  }
111
+ export function mergeAgentsConfigForUpgradeText(currentContent, originalContent) {
112
+ const range = managedBlockRange(currentContent);
113
+ if (range === null) {
114
+ return {
115
+ content: mergeAgentsConfigText(currentContent),
116
+ previousContent: currentContent,
117
+ };
118
+ }
119
+ const ending = lineEnding(currentContent);
120
+ const blockEnd = currentContent.startsWith(ending, range.end)
121
+ ? range.end + ending.length
122
+ : range.end;
123
+ const existingFragment = currentContent.slice(range.begin, blockEnd);
124
+ const original = originalContent ?? "";
125
+ if (currentContent === appendManagedBlock(original, existingFragment)) {
126
+ return {
127
+ content: mergeAgentsConfigText(original),
128
+ previousContent: originalContent,
129
+ };
130
+ }
131
+ const previousContent = currentContent.slice(0, range.begin) + currentContent.slice(blockEnd);
132
+ return {
133
+ content: mergeAgentsConfigText(previousContent),
134
+ previousContent,
135
+ };
136
+ }
101
137
  export function planAgentsConfigMerge(directory) {
102
138
  const targetDirectory = resolve(directory);
103
139
  try {
package/dist/installer/agents-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"agents-config.js","sourceRoot":"","sources":["../../src/installer/agents-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agents-config.js","sourceRoot":"","sources":["../../src/installer/agents-config.ts"],"names":[],"mappings":"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"}
package/dist/installer/gradle-verification.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { CommandResult } from "../doctor/index.js";
2
2
  import type { GradleVerificationConfiguration } from "./adaptive-templates.js";
3
- import { type AndroidProjectDetection } from "./android-project.js";
3
+ import { type AndroidModuleDetection, type AndroidProjectDetection } from "./android-project.js";
4
4
  export type GradleVerificationDiscoveryErrorCode = "GRADLE_PROJECT_INVALID" | "GRADLE_TASK_DISCOVERY_FAILED" | "GRADLE_TASK_MATRIX_INCOMPLETE";
5
5
  export declare class GradleVerificationDiscoveryError extends Error {
6
6
  readonly code: GradleVerificationDiscoveryErrorCode;
@@ -16,8 +16,17 @@ export interface GradleVerificationDiscoveryOptions {
16
16
  primaryModule?: string;
17
17
  timeoutMs?: number;
18
18
  }
19
+ export interface GradleProjectDiscovery {
20
+ detection: AndroidProjectDetection;
21
+ gradleVerification: GradleVerificationConfiguration;
22
+ taskPaths: readonly string[];
23
+ }
24
+ export declare const GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT: string;
25
+ /** @deprecated Use GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT. */
19
26
  export declare const GRADLE_TASK_DISCOVERY_INIT_SCRIPT: string;
20
27
  export declare function parseGradleTaskPaths(stdout: string): readonly string[];
28
+ export declare function parseGradleAndroidModules(stdout: string): readonly AndroidModuleDetection[];
21
29
  export declare function inferGradleVerificationConfiguration(detection: AndroidProjectDetection, taskPaths: readonly string[], requestedPrimaryModule?: string): GradleVerificationConfiguration;
30
+ export declare function discoverGradleProjectConfiguration(targetDirectory: string, runner: GradleVerificationProcessRunner, options?: GradleVerificationDiscoveryOptions): GradleProjectDiscovery;
22
31
  export declare function discoverGradleVerificationConfiguration(targetDirectory: string, runner: GradleVerificationProcessRunner, options?: GradleVerificationDiscoveryOptions): GradleVerificationConfiguration;
23
32
  //# sourceMappingURL=gradle-verification.d.ts.map
package/dist/installer/gradle-verification.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"gradle-verification.d.ts","sourceRoot":"","sources":["../../src/installer/gradle-verification.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,oCAAoC,GAC5C,wBAAwB,GACxB,8BAA8B,GAC9B,+BAA+B,CAAC;AAEpC,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;gBAGlC,IAAI,EAAE,oCAAoC,EAC1C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,SAAS,MAAM,EAAO;CAOlC;AAED,MAAM,WAAW,gCAAgC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,+BAA+B,GAAG,CAC5C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,gCAAgC,KACtC,aAAa,CAAC;AAEnB,MAAM,WAAW,kCAAkC;IACjD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAKD,eAAO,MAAM,iCAAiC,QAkBlC,CAAC;AAwBb,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAOtE;AA2JD,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,uBAAuB,EAClC,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,sBAAsB,CAAC,EAAE,MAAM,GAC9B,+BAA+B,CAwFjC;AAED,wBAAgB,uCAAuC,CACrD,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,+BAA+B,EACvC,OAAO,GAAE,kCAAuC,GAC/C,+BAA+B,CA0DjC"}
1
+ {"version":3,"file":"gradle-verification.d.ts","sourceRoot":"","sources":["../../src/installer/gradle-verification.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,oCAAoC,GAC5C,wBAAwB,GACxB,8BAA8B,GAC9B,+BAA+B,CAAC;AAEpC,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;gBAGlC,IAAI,EAAE,oCAAoC,EAC1C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,SAAS,MAAM,EAAO;CAOlC;AAED,MAAM,WAAW,gCAAgC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,+BAA+B,GAAG,CAC5C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,gCAAgC,KACtC,aAAa,CAAC;AAEnB,MAAM,WAAW,kCAAkC;IACjD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,uBAAuB,CAAC;IACnC,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9B;AAgBD,eAAO,MAAM,oCAAoC,QAgErC,CAAC;AAEb,4DAA4D;AAC5D,eAAO,MAAM,iCAAiC,QACR,CAAC;AAwBvC,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAStE;AAyBD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,GACb,SAAS,sBAAsB,EAAE,CA2CnC;AAiND,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,uBAAuB,EAClC,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,sBAAsB,CAAC,EAAE,MAAM,GAC9B,+BAA+B,CAwFjC;AAED,wBAAgB,kCAAkC,CAChD,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,+BAA+B,EACvC,OAAO,GAAE,kCAAuC,GAC/C,sBAAsB,CA2ExB;AAED,wBAAgB,uCAAuC,CACrD,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,+BAA+B,EACvC,OAAO,GAAE,kCAAuC,GAC/C,+BAA+B,CAMjC"}
package/dist/installer/gradle-verification.js CHANGED
@@ -12,27 +12,83 @@ export class GradleVerificationDiscoveryError extends Error {
12
12
  this.details = details;
13
13
  }
14
14
  }
15
- const DISCOVERY_MARKER = "OPENCODE_ANDROID_ORCHESTRATOR_TASK=";
15
+ const TASK_DISCOVERY_MARKER = "OPENCODE_ANDROID_ORCHESTRATOR_TASK=";
16
+ const MODULE_DISCOVERY_MARKER = "OPENCODE_ANDROID_ORCHESTRATOR_MODULE=";
16
17
  const DEFAULT_DISCOVERY_TIMEOUT_MS = 180_000;
17
- export const GRADLE_TASK_DISCOVERY_INIT_SCRIPT = [
18
+ const runtimeAndroidPluginTypes = {
19
+ "com.android.application": "application",
20
+ "com.android.library": "library",
21
+ "com.android.dynamic-feature": "dynamic-feature",
22
+ "com.android.test": "test",
23
+ "com.android.asset-pack": "asset-pack",
24
+ };
25
+ export const GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT = [
26
+ "def orchestratorAndroidPlugins = [",
27
+ ' "com.android.application",',
28
+ ' "com.android.library",',
29
+ ' "com.android.dynamic-feature",',
30
+ ' "com.android.test",',
31
+ ' "com.android.asset-pack",',
32
+ "]",
33
+ "def orchestratorEncode = { value ->",
34
+ ' def text = value == null ? "" : value.toString()',
35
+ ' java.util.Base64.encoder.encodeToString(text.getBytes("UTF-8"))',
36
+ "}",
37
+ "def orchestratorProperty = { owner, propertyName ->",
38
+ " try {",
39
+ " if (owner == null || owner.metaClass.hasProperty(owner, propertyName) == null) {",
40
+ " return null",
41
+ " }",
42
+ ' def value = owner."${propertyName}"',
43
+ ' if (value != null && value.metaClass.respondsTo(value, "getOrNull")) {',
44
+ " value = value.getOrNull()",
45
+ " }",
46
+ " return value",
47
+ " } catch (Exception ignored) {",
48
+ " return null",
49
+ " }",
50
+ "}",
18
51
  "gradle.projectsEvaluated {",
19
52
  " gradle.rootProject.allprojects.each { project ->",
20
- " project.tasks.each { task ->",
21
- " def name = task.name",
22
- " def relevant =",
23
- ' (name.startsWith("test") && name.endsWith("DebugUnitTest")) ||',
24
- ' name == "assembleDebug" ||',
25
- ' (name.startsWith("assemble") && name.endsWith("Debug")) ||',
26
- ' name == "lint" ||',
27
- ' (name.startsWith("connected") && name.endsWith("DebugAndroidTest"))',
28
- " if (relevant) {",
29
- ` println("${DISCOVERY_MARKER}" + task.path)`,
53
+ " def androidPluginId = orchestratorAndroidPlugins.find { pluginId ->",
54
+ " project.pluginManager.hasPlugin(pluginId)",
55
+ " }",
56
+ " if (androidPluginId != null) {",
57
+ ' def android = project.extensions.findByName("android")',
58
+ ' def namespace = orchestratorProperty(android, "namespace")',
59
+ ' def defaultConfig = orchestratorProperty(android, "defaultConfig")',
60
+ ' def applicationId = orchestratorProperty(defaultConfig, "applicationId")',
61
+ " def moduleFields = [",
62
+ " project.path,",
63
+ " project.projectDir.absolutePath,",
64
+ " project.buildFile.absolutePath,",
65
+ " androidPluginId,",
66
+ " namespace,",
67
+ " applicationId,",
68
+ " ]",
69
+ ` println("${MODULE_DISCOVERY_MARKER}" + moduleFields.collect(orchestratorEncode).join(","))`,
70
+ "",
71
+ // Reading TaskContainer.names avoids realizing every task, which is notably
72
+ // cheaper than `tasks --all` in large company repositories.
73
+ " project.tasks.names.each { name ->",
74
+ " def relevant =",
75
+ ' (name.startsWith("test") && name.endsWith("DebugUnitTest")) ||',
76
+ ' name == "assembleDebug" ||',
77
+ ' (name.startsWith("assemble") && name.endsWith("Debug")) ||',
78
+ ' name == "lint" ||',
79
+ ' (name.startsWith("connected") && name.endsWith("DebugAndroidTest"))',
80
+ " if (relevant) {",
81
+ ' def taskPath = project.path == ":" ? ":" + name : project.path + ":" + name',
82
+ ` println("${TASK_DISCOVERY_MARKER}" + taskPath)`,
83
+ " }",
30
84
  " }",
31
85
  " }",
32
86
  " }",
33
87
  "}",
34
88
  "",
35
89
  ].join("\n");
90
+ /** @deprecated Use GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT. */
91
+ export const GRADLE_TASK_DISCOVERY_INIT_SCRIPT = GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT;
36
92
  function compareStrings(left, right) {
37
93
  return left < right ? -1 : left > right ? 1 : 0;
38
94
  }
@@ -49,11 +105,107 @@ function normalizeTaskPath(value) {
49
105
  export function parseGradleTaskPaths(stdout) {
50
106
  const paths = stdout
51
107
  .split(/\r?\n/)
52
- .filter((line) => line.startsWith(DISCOVERY_MARKER))
53
- .map((line) => normalizeTaskPath(line.slice(DISCOVERY_MARKER.length)))
108
+ .filter((line) => line.startsWith(TASK_DISCOVERY_MARKER))
109
+ .map((line) => normalizeTaskPath(line.slice(TASK_DISCOVERY_MARKER.length)))
54
110
  .filter((path) => path !== null);
55
111
  return unique(paths).sort(compareStrings);
56
112
  }
113
+ function decodeDiscoveryField(value) {
114
+ try {
115
+ const decoded = Buffer.from(value, "base64");
116
+ if (decoded.toString("base64") !== value) {
117
+ return null;
118
+ }
119
+ const text = decoded.toString("utf8");
120
+ return text.includes("\0") ||
121
+ !Buffer.from(text, "utf8").equals(decoded)
122
+ ? null
123
+ : text;
124
+ }
125
+ catch {
126
+ return null;
127
+ }
128
+ }
129
+ function normalizeModulePath(value) {
130
+ return value === ":" ||
131
+ /^:[A-Za-z0-9_.-]+(?::[A-Za-z0-9_.-]+)*$/.test(value)
132
+ ? value
133
+ : null;
134
+ }
135
+ export function parseGradleAndroidModules(stdout) {
136
+ const modules = new Map();
137
+ for (const line of stdout.split(/\r?\n/)) {
138
+ if (!line.startsWith(MODULE_DISCOVERY_MARKER)) {
139
+ continue;
140
+ }
141
+ const encodedFields = line
142
+ .slice(MODULE_DISCOVERY_MARKER.length)
143
+ .split(",");
144
+ if (encodedFields.length !== 6) {
145
+ continue;
146
+ }
147
+ const fields = encodedFields.map(decodeDiscoveryField);
148
+ if (fields.some((field) => field === null)) {
149
+ continue;
150
+ }
151
+ const [rawGradlePath, directory, buildFile, rawPluginId, namespace, applicationId] = fields;
152
+ const gradlePath = normalizeModulePath(rawGradlePath ?? "");
153
+ const pluginId = rawPluginId;
154
+ if (gradlePath === null ||
155
+ (directory ?? "").length === 0 ||
156
+ (buildFile ?? "").length === 0 ||
157
+ !Object.hasOwn(runtimeAndroidPluginTypes, pluginId)) {
158
+ continue;
159
+ }
160
+ modules.set(gradlePath, {
161
+ gradlePath,
162
+ directory: directory,
163
+ buildFile: buildFile,
164
+ dsl: buildFile.endsWith(".kts") ? "kotlin" : "groovy",
165
+ type: runtimeAndroidPluginTypes[pluginId],
166
+ pluginIds: [pluginId],
167
+ namespace: namespace === "" ? null : namespace,
168
+ applicationId: applicationId === "" ? null : applicationId,
169
+ });
170
+ }
171
+ return [...modules.values()].sort((left, right) => compareStrings(left.gradlePath, right.gradlePath));
172
+ }
173
+ function detectedDsl(detection, modules) {
174
+ const dialects = new Set(modules.map((module) => module.dsl));
175
+ if (detection.settingsFile !== null) {
176
+ dialects.add(detection.settingsFile.endsWith(".kts") ? "kotlin" : "groovy");
177
+ }
178
+ if (dialects.size > 1) {
179
+ return "mixed";
180
+ }
181
+ return [...dialects][0] ?? "unknown";
182
+ }
183
+ function detectionWithRuntimeModules(detection, runtimeModules) {
184
+ if (runtimeModules.length === 0) {
185
+ return detection;
186
+ }
187
+ const staticModules = new Map(detection.modules.map((module) => [module.gradlePath, module]));
188
+ const modules = runtimeModules.map((module) => {
189
+ const staticModule = staticModules.get(module.gradlePath);
190
+ return {
191
+ ...module,
192
+ pluginIds: unique([
193
+ ...module.pluginIds,
194
+ ...(staticModule?.pluginIds ?? []),
195
+ ]),
196
+ namespace: module.namespace ?? staticModule?.namespace ?? null,
197
+ applicationId: module.applicationId ?? staticModule?.applicationId ?? null,
198
+ };
199
+ });
200
+ return {
201
+ ...detection,
202
+ dsl: detectedDsl(detection, modules),
203
+ modules,
204
+ isAndroidProject: detection.gitRoot !== null,
205
+ errors: detection.errors.filter((error) => error !==
206
+ "No included Gradle module applying a supported com.android plugin was found."),
207
+ };
208
+ }
57
209
  function taskRecord(path) {
58
210
  const separator = path.lastIndexOf(":");
59
211
  return separator < 0
@@ -192,23 +344,24 @@ export function inferGradleVerificationConfiguration(detection, taskPaths, reque
192
344
  }
193
345
  return configuration;
194
346
  }
195
- export function discoverGradleVerificationConfiguration(targetDirectory, runner, options = {}) {
196
- const detection = detectAndroidProject(targetDirectory);
197
- if (!detection.isAndroidProject ||
198
- detection.projectRoot === null ||
199
- detection.gradleWrapper === null ||
200
- !detection.gradleWrapper.complete) {
201
- throw new GradleVerificationDiscoveryError("GRADLE_PROJECT_INVALID", "A complete Android Gradle project is required for task discovery.", [...detection.errors, ...detection.warnings]);
347
+ export function discoverGradleProjectConfiguration(targetDirectory, runner, options = {}) {
348
+ const staticDetection = detectAndroidProject(targetDirectory);
349
+ if (staticDetection.gitRoot === null ||
350
+ staticDetection.projectRoot === null ||
351
+ staticDetection.settingsFile === null ||
352
+ staticDetection.gradleWrapper === null ||
353
+ !staticDetection.gradleWrapper.complete) {
354
+ throw new GradleVerificationDiscoveryError("GRADLE_PROJECT_INVALID", "A complete Android Gradle project is required for module/task discovery.", [...staticDetection.errors, ...staticDetection.warnings]);
202
355
  }
203
356
  const temporaryDirectory = mkdtempSync(join(tmpdir(), "opencode-android-orchestrator-gradle-"));
204
- const initScript = join(temporaryDirectory, "discover-tasks.init.gradle");
357
+ const initScript = join(temporaryDirectory, "discover-project.init.gradle");
205
358
  try {
206
- writeFileSync(initScript, GRADLE_TASK_DISCOVERY_INIT_SCRIPT, {
359
+ writeFileSync(initScript, GRADLE_PROJECT_DISCOVERY_INIT_SCRIPT, {
207
360
  encoding: "utf8",
208
361
  flag: "wx",
209
362
  mode: 0o600,
210
363
  });
211
- const result = runner(detection.gradleWrapper.script, [
364
+ const result = runner(staticDetection.gradleWrapper.script, [
212
365
  "help",
213
366
  // Task enumeration is a configuration-phase side effect. A cache hit
214
367
  // would skip the callback and make a valid Android project look empty.
@@ -218,17 +371,29 @@ export function discoverGradleVerificationConfiguration(targetDirectory, runner,
218
371
  "--console=plain",
219
372
  "--quiet",
220
373
  ], {
221
- cwd: detection.projectRoot,
374
+ cwd: staticDetection.projectRoot,
222
375
  timeoutMs: options.timeoutMs ?? DEFAULT_DISCOVERY_TIMEOUT_MS,
223
376
  });
224
377
  if (result.error !== null || result.status !== 0) {
225
- throw new GradleVerificationDiscoveryError("GRADLE_TASK_DISCOVERY_FAILED", "Gradle could not enumerate Android verification tasks.", commandDetails(result));
378
+ throw new GradleVerificationDiscoveryError("GRADLE_TASK_DISCOVERY_FAILED", "Gradle could not enumerate Android modules and verification tasks.", commandDetails(result));
379
+ }
380
+ const runtimeModules = parseGradleAndroidModules(result.stdout);
381
+ const detection = detectionWithRuntimeModules(staticDetection, runtimeModules);
382
+ if (!detection.isAndroidProject || detection.modules.length === 0) {
383
+ throw new GradleVerificationDiscoveryError("GRADLE_PROJECT_INVALID", "Gradle did not report any project applying a supported Android plugin.", [...detection.errors, ...detection.warnings]);
226
384
  }
227
385
  const taskPaths = parseGradleTaskPaths(result.stdout);
228
- return inferGradleVerificationConfiguration(detection, taskPaths, options.primaryModule);
386
+ return {
387
+ detection,
388
+ taskPaths,
389
+ gradleVerification: inferGradleVerificationConfiguration(detection, taskPaths, options.primaryModule),
390
+ };
229
391
  }
230
392
  finally {
231
393
  rmSync(temporaryDirectory, { recursive: true, force: true });
232
394
  }
233
395
  }
396
+ export function discoverGradleVerificationConfiguration(targetDirectory, runner, options = {}) {
397
+ return discoverGradleProjectConfiguration(targetDirectory, runner, options).gradleVerification;
398
+ }
234
399
  //# sourceMappingURL=gradle-verification.js.map
package/dist/installer/gradle-verification.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"gradle-verification.js","sourceRoot":"","sources":["../../src/installer/gradle-verification.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gradle-verification.js","sourceRoot":"","sources":["../../src/installer/gradle-verification.ts"],"names":[],"mappings":"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"}
package/dist/installer/index.d.ts CHANGED
@@ -3,7 +3,7 @@ export interface InstallerRequest {
3
3
  command: InstallerCommand;
4
4
  targetDirectory: string;
5
5
  }
6
- export { AGENTS_MANAGED_BLOCK_BEGIN, AGENTS_MANAGED_BLOCK_END, AgentsConfigMergeError, mergeAgentsConfigText, planAgentsConfigMerge, type AgentsConfigMergeErrorCode, type AgentsConfigMergePlan, } from "./agents-config.js";
6
+ export { AGENTS_MANAGED_BLOCK_BEGIN, AGENTS_MANAGED_BLOCK_END, AgentsConfigMergeError, mergeAgentsConfigForUpgradeText, mergeAgentsConfigText, planAgentsConfigMerge, type AgentsConfigMergeErrorCode, type AgentsConfigMergePlan, type AgentsConfigUpgradeMerge, } from "./agents-config.js";
7
7
  export { AdaptiveProjectTemplateError, DEFAULT_MODULE_SCOPE, isModuleScope, planAdaptiveProjectTemplates, type AdaptiveAndroidModuleConfiguration, type AdaptiveAndroidProjectConfiguration, type AdaptiveAutomationConfiguration, type AdaptiveProjectTemplateErrorCode, type AdaptiveProjectTemplateOptions, type AdaptiveProjectTemplatePlan, type AdaptiveTargetTest, type AdaptiveTaskContractExample, type GradleVerificationConfiguration, type ModuleScope, } from "./adaptive-templates.js";
8
8
  export { detectAndroidProject, type AndroidModuleDetection, type AndroidModuleType, type AndroidProjectDetection, type GradleDsl, type GradleWrapperDetection, } from "./android-project.js";
9
9
  export { INITIAL_WORKTREE_ALLOWLIST_CONTENT, ProjectInitializationError, WORKTREE_ALLOWLIST_RELATIVE_PATH, formatProjectInitializationResult, planProjectInitialization, planProjectResourceInputs, runInitProcess, runProjectInitialization, verifyInitializedProject, type InitProcessOptions, type InitProcessRunner, type InitVerificationCheck, type InitVerificationReport, type InitVerificationStatus, type ProjectInitializationErrorCode, type ProjectInitializationOptions, type ProjectInitializationPlan, type ProjectInitializationResult, type ProjectResourceInputPlan, type WorktreeAllowlistInitializationStatus, } from "./init.js";
package/dist/installer/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"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"}
package/dist/installer/index.js CHANGED
@@ -1,4 +1,4 @@
1
- export { AGENTS_MANAGED_BLOCK_BEGIN, AGENTS_MANAGED_BLOCK_END, AgentsConfigMergeError, mergeAgentsConfigText, planAgentsConfigMerge, } from "./agents-config.js";
1
+ export { AGENTS_MANAGED_BLOCK_BEGIN, AGENTS_MANAGED_BLOCK_END, AgentsConfigMergeError, mergeAgentsConfigForUpgradeText, mergeAgentsConfigText, planAgentsConfigMerge, } from "./agents-config.js";
2
2
  export { AdaptiveProjectTemplateError, DEFAULT_MODULE_SCOPE, isModuleScope, planAdaptiveProjectTemplates, } from "./adaptive-templates.js";
3
3
  export { detectAndroidProject, } from "./android-project.js";
4
4
  export { INITIAL_WORKTREE_ALLOWLIST_CONTENT, ProjectInitializationError, WORKTREE_ALLOWLIST_RELATIVE_PATH, formatProjectInitializationResult, planProjectInitialization, planProjectResourceInputs, runInitProcess, runProjectInitialization, verifyInitializedProject, } from "./init.js";
package/dist/installer/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,4BAA4B,EAC5B,oBAAoB,EACpB,aAAa,EACb,4BAA4B,GAW7B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,oBAAoB,GAMrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,kCAAkC,EAClC,0BAA0B,EAC1B,gCAAgC,EAChC,iCAAiC,EACjC,yBAAyB,EACzB,yBAAyB,EACzB,cAAc,EACd,wBAAwB,EACxB,wBAAwB,GAYzB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,8BAA8B,EAC9B,mCAAmC,EACnC,oCAAoC,EACpC,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,EAC3B,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,GAsB5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,EACnB,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,GASlB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,mBAAmB,GASpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,GAKtB,MAAM,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,EACtB,+BAA+B,EAC/B,qBAAqB,EACrB,qBAAqB,GAItB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,4BAA4B,EAC5B,oBAAoB,EACpB,aAAa,EACb,4BAA4B,GAW7B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,oBAAoB,GAMrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,kCAAkC,EAClC,0BAA0B,EAC1B,gCAAgC,EAChC,iCAAiC,EACjC,yBAAyB,EACzB,yBAAyB,EACzB,cAAc,EACd,wBAAwB,EACxB,wBAAwB,GAYzB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,8BAA8B,EAC9B,mCAAmC,EACnC,oCAAoC,EACpC,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,EAC3B,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,GAsB5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,EACnB,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,GASlB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,mBAAmB,GASpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,GAKtB,MAAM,sBAAsB,CAAC"}
package/dist/installer/init.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/installer/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/installer/init.ts"],"names":[],"mappings":"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"}
package/dist/installer/init.js CHANGED
@@ -4,7 +4,7 @@ import { isAbsolute, join, relative, resolve, sep, } from "node:path";
4
4
  import { fileURLToPath } from "node:url";
5
5
  import { formatDoctorReport, runDoctor, } from "../doctor/index.js";
6
6
  import { planAdaptiveProjectTemplates, } from "./adaptive-templates.js";
7
- import { GradleVerificationDiscoveryError, discoverGradleVerificationConfiguration, } from "./gradle-verification.js";
7
+ import { GradleVerificationDiscoveryError, discoverGradleProjectConfiguration, } from "./gradle-verification.js";
8
8
  import { planAgentsConfigMerge, } from "./agents-config.js";
9
9
  import { INSTALLATION_MANIFEST_RELATIVE_PATH, InstallationManifestError, applyInstallationPlan, planInstallationPreparation, readInstallationManifest, verifyInstallationIntegrity, } from "./install-manifest.js";
10
10
  import { ORCHESTRATOR_PACKAGE_NAME, ORCHESTRATOR_PACKAGE_VERSION, planOpenCodeConfigMerge, } from "./opencode-config.js";
@@ -262,6 +262,9 @@ export function planProjectInitialization(directory, options = {}) {
262
262
  if (options.gradleVerification !== undefined) {
263
263
  adaptiveOptions.gradleVerification = options.gradleVerification;
264
264
  }
265
+ if (options.projectDetection !== undefined) {
266
+ adaptiveOptions.projectDetection = options.projectDetection;
267
+ }
265
268
  if (options.longCommandTimeoutMs !== undefined) {
266
269
  adaptiveOptions.longCommandTimeoutMs = options.longCommandTimeoutMs;
267
270
  }
@@ -325,6 +328,9 @@ export function verifyInitializedProject(targetDirectory, runner = runInitProces
325
328
  }
326
329
  function doctorForInitialization(directory, options, runner) {
327
330
  const baseReport = runDoctor({
331
+ ...(options.projectDetection === undefined
332
+ ? {}
333
+ : { androidProjectDetection: options.projectDetection }),
328
334
  ...(options.androidSdkDirectory === undefined
329
335
  ? {}
330
336
  : { androidSdkDirectory: options.androidSdkDirectory }),
@@ -360,11 +366,13 @@ function optionsWithAutomaticGradleVerification(directory, options, runner) {
360
366
  return options;
361
367
  }
362
368
  try {
369
+ const discovery = discoverGradleProjectConfiguration(directory, runner, options.primaryModule === undefined
370
+ ? {}
371
+ : { primaryModule: options.primaryModule });
363
372
  return {
364
373
  ...options,
365
- gradleVerification: discoverGradleVerificationConfiguration(directory, runner, options.primaryModule === undefined
366
- ? {}
367
- : { primaryModule: options.primaryModule }),
374
+ projectDetection: discovery.detection,
375
+ gradleVerification: discovery.gradleVerification,
368
376
  };
369
377
  }
370
378
  catch (error) {
@@ -441,8 +449,8 @@ function resultFromApplied(plan, applied, doctor, verification, worktreeAllowlis
441
449
  }
442
450
  export function runProjectInitialization(directory, options = {}) {
443
451
  const runner = options.processRunner ?? runInitProcess;
444
- const doctor = doctorForInitialization(directory, options, runner);
445
452
  const resolvedOptions = optionsWithAutomaticGradleVerification(directory, options, runner);
453
+ const doctor = doctorForInitialization(directory, resolvedOptions, runner);
446
454
  const plan = planProjectInitialization(directory, resolvedOptions);
447
455
  const existing = existingManifest(plan.targetDirectory);
448
456
  if (existing !== null) {