feat: add latest parameter for xcodes and moved accept license check after

Author: test2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "1.15.3-beta.3",
+  "version": "1.15.3-beta.6",
   "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/selected-parameter.ts

@@ -1,6 +1,7 @@
-import { getPty, ParameterSetting, SpawnStatus, StatefulParameter } from '@codifycli/plugin-core';
+import { getPty, ParameterSetting, Plan, SpawnStatus, StatefulParameter } from '@codifycli/plugin-core';
 
 import { XcodesConfig } from './xcodes-resource.js';
+import { LATEST_VERSION_KEYWORD, resolveInstalledVersion } from './xcodes-utils.js';
 
 export class XcodesSelectedParameter extends StatefulParameter<XcodesConfig, string> {
   getSettings(): ParameterSetting {
@@ -9,27 +10,56 @@ export class XcodesSelectedParameter extends StatefulParameter<XcodesConfig, str
     };
   }
 
-  override async refresh(): Promise<string | null> {
+  override async refresh(desired: string | null): Promise<string | null> {
     const $ = getPty();
     const { data, status } = await $.spawnSafe('xcodes installed');
     if (status === SpawnStatus.ERROR) return null;
-    return parseSelectedVersion(data);
+    const selected = parseSelectedVersion(data);
+
+    // "latest" isn't a real xcode-select target — normalize the currently selected
+    // version back to the literal "latest" when it's also the newest installed
+    // version, so a desired value of "latest" converges instead of diffing forever.
+    if (desired === LATEST_VERSION_KEYWORD && selected) {
+      const newestInstalled = await resolveInstalledVersion(LATEST_VERSION_KEYWORD);
+      if (selected === newestInstalled) return LATEST_VERSION_KEYWORD;
+    }
+
+    return selected;
   }
 
-  override async add(version: string): Promise<void> {
+  override async add(version: string, plan: Plan<XcodesConfig>): Promise<void> {
     const $ = getPty();
-    await $.spawn(`xcodes select "${version}"`, { interactive: true, stdin: true });
+    const resolved = await resolveInstalledVersion(version);
+    if (!resolved) throw new Error(`Unable to resolve xcode version "${version}" to select. Ensure it is listed in xcodeVersions.`);
+    await $.spawn(`xcodes select "${resolved}"`, { interactive: true, stdin: true });
+    await this.acceptLicenseIfNeeded(plan);
   }
 
-  override async modify(newVersion: string): Promise<void> {
+  override async modify(newVersion: string, _previousVersion: string, plan: Plan<XcodesConfig>): Promise<void> {
     const $ = getPty();
-    await $.spawn(`xcodes select "${newVersion}"`, { interactive: true, stdin: true });
+    const resolved = await resolveInstalledVersion(newVersion);
+    if (!resolved) throw new Error(`Unable to resolve xcode version "${newVersion}" to select. Ensure it is listed in xcodeVersions.`);
+    await $.spawn(`xcodes select "${resolved}"`, { interactive: true, stdin: true });
+    await this.acceptLicenseIfNeeded(plan);
   }
 
   override async remove(): Promise<void> {
     const $ = getPty();
     await $.spawn('xcode-select --reset', { requiresRoot: true });
   }
+
+  // xcodes select only ever selects a fully-installed Xcode.app (never a
+  // CommandLineTools-only instance, which xcodes doesn't track), so once select
+  // succeeds above, xcode-select is guaranteed to point at a full Xcode and
+  // xcodebuild -license accept can run safely.
+  private async acceptLicenseIfNeeded(plan: Plan<XcodesConfig>): Promise<void> {
+    if (plan.desiredConfig?.acceptLicense === false) return;
+
+    const $ = getPty();
+    const { status } = await $.spawnSafe('xcodebuild -license status');
+    if (status === SpawnStatus.SUCCESS) return;
+    await $.spawn('xcodebuild -license accept', { requiresRoot: true });
+  }
 }
 
 function parseSelectedVersion(output: string): string | null {

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

@@ -1,8 +1,7 @@
-import { ArrayParameterSetting, ArrayStatefulParameter, Plan, SpawnStatus, getPty } from '@codifycli/plugin-core';
+import { ArrayParameterSetting, ArrayStatefulParameter, Plan, getPty } from '@codifycli/plugin-core';
 
 import { XcodesConfig } from './xcodes-resource.js';
-
-export const LATEST_VERSION_KEYWORD = 'latest';
+import { LATEST_VERSION_KEYWORD, parseInstalledVersions, resolveInstalledVersion } from './xcodes-utils.js';
 
 export class XcodeVersionsParameter extends ArrayStatefulParameter<XcodesConfig, string> {
   getSettings(): ArrayParameterSetting {
@@ -24,7 +23,7 @@ export class XcodeVersionsParameter extends ArrayStatefulParameter<XcodesConfig,
 
   override async addItem(version: string, plan: Plan<XcodesConfig>): Promise<void> {
     const $ = getPty();
-    const { appleId, appleIdPassword, acceptLicense } = plan.desiredConfig ?? {};
+    const { appleId, appleIdPassword } = plan.desiredConfig ?? {};
 
     const env: Record<string, string> = {};
     if (appleId) env['XCODES_USERNAME'] = appleId;
@@ -36,57 +35,16 @@ export class XcodeVersionsParameter extends ArrayStatefulParameter<XcodesConfig,
       stdin: true,
       ...(Object.keys(env).length > 0 ? { env } : {}),
     });
-
-    if (acceptLicense !== false) {
-      const installedVersion = await this.resolveInstalledVersion(version);
-      if (installedVersion) await this.acceptLicenseIfNeeded(installedVersion);
-    }
-  }
-
-  private async resolveInstalledVersion(version: string): Promise<string | null> {
-    if (version !== LATEST_VERSION_KEYWORD) return version;
-
-    const $ = getPty();
-    const { data } = await $.spawnSafe('xcodes installed');
-    const installed = parseInstalledVersions(data);
-    return installed.at(-1) ?? null;
-  }
-
-  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> {
     const $ = getPty();
-    const installedVersion = await this.resolveInstalledVersion(version);
+    const installedVersion = await resolveInstalledVersion(version);
     if (!installedVersion) return;
     await $.spawn(`xcodes uninstall "${installedVersion}"`, { interactive: true });
   }
 }
 
-function parseInstalledVersions(output: string): string[] {
-  return output
-    .split('\n')
-    .map((line) => line.trim())
-    .filter(Boolean)
-    .map((line) => {
-      const match = line.match(/^(.+?)\s+\([^)]+\)/);
-      return match ? match[1].trim() : null;
-    })
-    .filter((v): v is string => v !== null);
-}
-
 /**
  * Replaces whichever installed version fulfills the "latest" sentinel with the
  * literal string "latest" so the framework's equality check (desired === current)

src/resources/xcodes/xcodes-resource.ts

@@ -26,7 +26,8 @@ const schema = z
       .string()
       .describe(
         'The active Xcode version to select (e.g. "15.2"). ' +
-        'Must be one of the installed xcodeVersions. Equivalent to running xcodes select.'
+        'Must be one of the installed xcodeVersions. Equivalent to running xcodes select. ' +
+        'Use "latest" to select the newest installed Xcode version.'
       )
       .optional(),
     appleId: z
@@ -46,8 +47,8 @@ const schema = z
       .boolean()
       .optional()
       .describe(
-        'Automatically accept the Xcode license agreement after installation. ' +
-        'Runs `sudo xcodebuild -license accept`. Defaults to true.'
+        'Automatically accept the Xcode license agreement after selecting an Xcode version. ' +
+        'Runs `sudo xcodebuild -license accept`. Only applies when `selected` is set. Defaults to true.'
       ),
   })
   .describe('xcodes resource — install and manage multiple Xcode versions via the xcodes CLI');

src/resources/xcodes/xcodes-utils.ts

@@ -0,0 +1,28 @@
+import { getPty } from '@codifycli/plugin-core';
+
+export const LATEST_VERSION_KEYWORD = 'latest';
+
+export function parseInstalledVersions(output: string): string[] {
+  return output
+    .split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .map((line) => {
+      const match = line.match(/^(.+?)\s+\([^)]+\)/);
+      return match ? match[1].trim() : null;
+    })
+    .filter((v): v is string => v !== null);
+}
+
+/**
+ * Resolves the "latest" sentinel to the newest installed Xcode version.
+ * Returns the input unchanged if it isn't the "latest" sentinel.
+ */
+export async function resolveInstalledVersion(version: string): Promise<string | null> {
+  if (version !== LATEST_VERSION_KEYWORD) return version;
+
+  const $ = getPty();
+  const { data } = await $.spawnSafe('xcodes installed', { interactive: true });
+  const installed = parseInstalledVersions(data);
+  return installed.at(-1) ?? null;
+}