fix: move accept license after

Author: test2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "1.15.2",
+  "version": "1.15.3-beta.1",
   "description": "Default plugin for Codify - provides 50+ declarative resources for managing development tools and system configuration across macOS and Linux",
   "main": "dist/index.js",
   "scripts": {

src/resources/xcodes/xcode-versions-parameter.ts

@@ -1,4 +1,4 @@
-import { ArrayStatefulParameter, Plan, getPty } from '@codifycli/plugin-core';
+import { ArrayStatefulParameter, Plan, SpawnStatus, getPty } from '@codifycli/plugin-core';
 
 import { XcodesConfig } from './xcodes-resource.js';
 
@@ -11,7 +11,7 @@ export class XcodeVersionsParameter extends ArrayStatefulParameter<XcodesConfig,
 
   override async addItem(version: string, plan: Plan<XcodesConfig>): Promise<void> {
     const $ = getPty();
-    const { appleId, appleIdPassword } = plan.desiredConfig ?? {};
+    const { appleId, appleIdPassword, acceptLicense } = plan.desiredConfig ?? {};
 
     const env: Record<string, string> = {};
     if (appleId) env['XCODES_USERNAME'] = appleId;
@@ -22,6 +22,25 @@ export class XcodeVersionsParameter extends ArrayStatefulParameter<XcodesConfig,
       stdin: true,
       ...(Object.keys(env).length > 0 ? { env } : {}),
     });
+
+    if (acceptLicense !== false) {
+      await this.acceptLicenseIfNeeded(version);
+    }
+  }
+
+  private async acceptLicenseIfNeeded(version: string): Promise<void> {
+    const $ = getPty();
+
+    // xcodebuild resolves against whatever xcode-select currently points at. If it's
+    // still pointing at a CommandLineTools-only instance (e.g. installed before xcodes
+    // ran), `xcodebuild -license accept` fails with "requires Xcode" even though a full
+    // Xcode was just installed above. Explicitly select the version we just installed
+    // first so xcode-select points at the full Xcode.
+    await $.spawn(`xcodes select "${version}"`, { interactive: true, stdin: true });
+
+    const { status } = await $.spawnSafe('xcodebuild -license status');
+    if (status === SpawnStatus.SUCCESS) return;
+    await $.spawn('xcodebuild -license accept', { requiresRoot: true });
   }
 
   override async removeItem(version: string): Promise<void> {

src/resources/xcodes/xcodes-resource.ts

@@ -1,5 +1,4 @@
 import {
-  CreatePlan,
   ExampleConfig,
   Resource,
   ResourceSettings,
@@ -105,21 +104,11 @@ export class XcodesResource extends Resource<XcodesConfig> {
     return status === SpawnStatus.SUCCESS ? {} : null;
   }
 
-  override async create(plan: CreatePlan<XcodesConfig>): Promise<void> {
+  override async create(): Promise<void> {
     await Utils.installViaPkgMgr('xcodes', undefined, PackageManager.BREW);
-    if (plan.desiredConfig.acceptLicense !== false) {
-      await this.acceptLicenseIfNeeded();
-    }
   }
 
   override async destroy(): Promise<void> {
     await Utils.uninstallViaPkgMgr('xcodes', undefined, PackageManager.BREW);
   }
-
-  private async acceptLicenseIfNeeded(): Promise<void> {
-    const $ = getPty();
-    const { status } = await $.spawnSafe('xcodebuild -license status');
-    if (status === SpawnStatus.SUCCESS) return;
-    await $.spawn('xcodebuild -license accept', { requiresRoot: true });
-  }
 }