lim 0.34.0-rc.1 → 0.35.0

package/README.md

@@ -481,7 +481,7 @@ lim xcode get <ID>        # Get details of a specific instance
 lim xcode delete <ID>     # Delete an instance
 lim xcode attach-simulator <IOS_ID> --id <XCODE_ID>
 lim xcode version         # Xcode the sandbox builds with
-lim xcode use xcode@27    # Prefer an Xcode major for this workspace (switches the sandbox now)
+lim xcode use xcode@27    # Prefer an Xcode version for this workspace (switches the sandbox now)
 lim xcode version list    # Xcode versions the sandbox can build with
 ```
 
@@ -527,10 +527,11 @@ LIM_WEBHOOK_URL=https://ci.example.com/hooks/limrun \
 # Attach an existing simulator so builds auto-install there
 lim xcode attach-simulator ios_abc123 --id sandbox_def456
 
-# Pick the Xcode major for this workspace once; builds, tests, runs, syncs, RBE and new sandboxes follow it
+# Pick the Xcode for this workspace once; builds, tests, runs, syncs, RBE and new sandboxes follow it.
+# A bare major selects that major's GA release; a major.minor pins an exact version, typically a beta.
 lim xcode use xcode@27
-lim xcode build ./MyProject           # builds with Xcode 27
-lim xcode build ./MyProject --xcode-version 26   # one-off override, not remembered
+lim xcode build ./MyProject           # builds with the Xcode 27 GA
+lim xcode build ./MyProject --xcode-version 27.1   # one-off override to the 27.1 beta, not remembered
 lim xcode version unset               # forget the preference; the sandbox goes back to the node default
 
 # Tune sync cache or ignore additional paths
@@ -817,7 +818,7 @@ lim xcode run -- mise use --pin node@24.5.0
 
 `lim xcode tools install` syncs the project and runs `mise install` in that sandbox. Use `--no-sync` to install its current selections without syncing, `--cwd apps/mobile` for a nested project, and `--id` to choose an existing sandbox. The command never creates or replaces an instance.
 
-`lim xcode use xcode@27` is equivalent to `lim xcode version set 27`: it remembers the workspace Xcode major and switches the existing sandbox. With no sandbox, it saves the preference for the next one. You can combine requests, for example `lim xcode use xcode@27 node@24`; only the other tools go into mise. Xcode requires a bare major. `--cwd` applies only to mise tools; `--workspace` chooses the Limrun workspace preference.
+`lim xcode use xcode@27` is equivalent to `lim xcode version set 27`: it remembers the workspace Xcode version and switches the existing sandbox. With no sandbox, it saves the preference for the next one. You can combine requests, for example `lim xcode use xcode@27 node@24`; only the other tools go into mise. Xcode takes a major (`27`, the GA of that major) or a major.minor (`27.1`, an exact version). `--cwd` applies only to mise tools; `--workspace` chooses the Limrun workspace preference.
 
 `lim xcode use` selects tools in an existing sandbox after project sync. Mise installs a requested version if needed; use `lim xcode tools install` to install tools declared by synced project files. Use `--cwd apps/mobile` for a nested project. Sandbox selections take precedence over synced project tool requests and apply to later runs and builds.
 

package/dist/base-command.d.ts

@@ -4,7 +4,7 @@ import { type LastAndroidInstance, type LastIosInstance, type LastXcodeInstance,
 import type { XcodeCacheConfig, XcodeCacheFollowResult, XcodeClient, XcodeSelectResult } from '@limrun/api';
 import { type RequestedXcodeVersion } from './lib/xcode-version';
 import type { TunnelCommandIO } from './lib/tunnel-command';
-type XcodeTarget = LastIosInstance | LastXcodeInstance;
+type XcodeTarget = LastXcodeInstance;
 type CachePublicationFollow = {
     start: number;
     result: XcodeCacheFollowResult;
@@ -76,7 +76,7 @@ export declare abstract class BaseCommand extends Command {
     protected signedStreamUrl(status: {
         signedStreamUrl?: string;
     } | undefined): string | undefined;
-    protected resolveXcodeClient(target: string | XcodeTarget): Promise<Limrun.XcodeClient>;
+    protected resolveXcodeClient(target: XcodeTarget): Promise<Limrun.XcodeClient>;
     private tryResolveAndroidInstance;
     protected resolveAndroidInstance(providedId: string | undefined): LastAndroidInstance;
     protected resolveAndroidInstanceOrCreate(providedId: string | undefined): Promise<LastAndroidInstance>;
@@ -105,7 +105,7 @@ export declare abstract class BaseCommand extends Command {
      * instance is perfectly usable. A restore that genuinely broke removes the instance, since
      * the caller asked for a warm workspace and handing back a silently cold one is worse.
      */
-    protected awaitCacheRestore(cacheInstanceId: string, removeInstance: () => Promise<unknown>): Promise<void>;
+    protected awaitCacheRestore(instanceId: string, removeInstance: () => Promise<unknown>): Promise<void>;
     /**
      * Applies cache flags to a target a command is about to build on. An instance this
      * invocation created already carries the whole configuration from its create, so all that is
@@ -114,7 +114,7 @@ export declare abstract class BaseCommand extends Command {
      */
     protected applyBuildCacheToTarget(target: XcodeTarget, cache: XcodeCacheConfig | undefined): Promise<void>;
     /**
-     * Binds the sandbox to an Xcode major when the caller asked for one and the sandbox is on
+     * Binds the sandbox to an Xcode version when the caller asked for one and the sandbox is on
      * another. The version is a property of the sandbox, not of this invocation: nothing is
      * remembered locally, and a later run without the flag keeps building with the switched
      * Xcode. Refusals from the daemon (not installed, busy) surface with its message.
@@ -126,12 +126,11 @@ export declare abstract class BaseCommand extends Command {
     protected tryResolveXcodeTarget(providedId: string | undefined): Promise<XcodeTarget | undefined>;
     private notFound;
     /**
-     * The error a /xcode 404 deserves when the sandbox behind the target no longer exists, else
+     * The error a /xcode 404 deserves when the target no longer exists, else
      * undefined. A cached target is trusted without a round-trip, so the SDK's "daemon predates
      * selection" reading of a 404 is also what a deleted sandbox produces; the API tells the two
      * apart. Sandboxes this run created, or pinned through the environment (synthetic ids), are
-     * taken at their word. A standalone sandbox is a NotFoundError like anywhere else; one behind a
-     * live simulator is not, because withAuth would then forget and replace the simulator itself.
+     * taken at their word.
      */
     private vanishedXcodeSandboxError;
     /**
@@ -145,36 +144,31 @@ export declare abstract class BaseCommand extends Command {
      * /xcode; undefined when nothing names a sandbox or the remembered one is gone.
      */
     protected tryReadXcodeStatus(providedId: string | undefined): Promise<{
-        target: XcodeTarget;
+        target: LastXcodeInstance;
         client: Limrun.XcodeClient;
         status: Limrun.XcodeStatus;
     } | undefined>;
     /** Save the workspace preference and switch its existing sandbox when available. */
-    protected setPreferredXcodeVersion(major: string, providedId?: string): Promise<void>;
+    protected setPreferredXcodeVersion(version: string, providedId?: string): Promise<void>;
     /** setXcode with the daemon's own refusal message instead of the transport's wrapping. */
-    protected selectXcode(xcodeClient: XcodeClient, major: string): Promise<XcodeSelectResult>;
+    protected selectXcode(xcodeClient: XcodeClient, version: string): Promise<XcodeSelectResult>;
     private readXcodeSelection;
     /** The daemon's own words when it refused an Xcode selection (400 not available, 409 busy). */
     protected xcodeRefusal(err: unknown): {
         status: 400 | 409;
         message: string;
     } | undefined;
-    /**
-     * The id the cache endpoints take. For an iOS-backed target that is its Xcode sandbox, which
-     * is the instance that owns the workspace.
-     */
-    protected cacheInstanceId(target: XcodeTarget): string;
     /**
      * Binds the key an existing instance publishes under. The build happens now and publication
      * only at termination, possibly long after this process is gone, so the key has to live on
      * the instance rather than in this invocation.
      */
-    protected bindCacheKey(cacheInstanceId: string, key: string): Promise<void>;
+    protected bindCacheKey(instanceId: string, key: string): Promise<void>;
     /**
      * Starts following an instance's cache publication before it is deleted, so a publication
      * that finishes quickly is still seen. Never rejects; the caller renders the result.
      */
-    protected startCachePublicationFollow(cacheInstanceId: string): CachePublicationWatch;
+    protected startCachePublicationFollow(instanceId: string): CachePublicationWatch;
     /** Prints how a publication ended. Returns false when it did not publish what it should have. */
     protected renderCachePublication(watch: CachePublicationWatch): Promise<boolean>;
     /**
@@ -203,7 +197,7 @@ export declare abstract class BaseCommand extends Command {
         target: LastGradleInstance;
         client: import("@limrun/api").GradleClient;
     } | {
-        target: XcodeTarget;
+        target: LastXcodeInstance;
         client: Limrun.XcodeClient;
     }>;
     private createStandaloneGradleInstance;

package/dist/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}

package/dist/base-command.js

@@ -261,56 +261,18 @@ class BaseCommand extends core_1.Command {
         return status?.signedStreamUrl;
     }
     async resolveXcodeClient(target) {
-        const resolvedTarget = typeof target === 'string' ? this.xcodeTargetFromId(target) : target;
-        const id = resolvedTarget.id;
-        if (resolvedTarget.type === 'ios') {
-            if (resolvedTarget.sandboxXcodeUrl && resolvedTarget.token) {
-                try {
-                    return await this.client.xcodeInstances.createClient({
-                        apiUrl: resolvedTarget.sandboxXcodeUrl,
-                        token: resolvedTarget.token,
-                    });
-                }
-                catch (err) {
-                    if (this.isCachedXcodeClientNotFound(err)) {
-                        throw this.notFound(id);
-                    }
-                    throw err;
-                }
-            }
-            const instance = await this.client.iosInstances.get(id);
-            let sandboxUrl = instance.status.sandbox?.xcode?.url;
-            let token = instance.status.token;
-            (0, config_1.registerCreatedInstance)(instance, ['xcode']);
-            if (!sandboxUrl) {
-                if (resolvedTarget.sandboxXcodeUrl) {
-                    sandboxUrl = resolvedTarget.sandboxXcodeUrl;
-                    token = resolvedTarget.token || token;
-                }
-            }
-            if (!sandboxUrl) {
-                this.error(`iOS instance ${id} does not have an Xcode sandbox. Create one and attach the simulator with: lim xcode create --attach --simulator-id ${id}`);
-            }
-            return this.client.xcodeInstances.createClient({
-                apiUrl: sandboxUrl,
-                token,
-            });
-        }
-        if (resolvedTarget.apiUrl && resolvedTarget.token) {
+        if (target.apiUrl && target.token) {
             try {
-                return await this.client.xcodeInstances.createClient({
-                    apiUrl: resolvedTarget.apiUrl,
-                    token: resolvedTarget.token,
-                });
+                return await this.client.xcodeInstances.createClient({ apiUrl: target.apiUrl, token: target.token });
             }
             catch (err) {
                 if (this.isCachedXcodeClientNotFound(err)) {
-                    throw this.notFound(id);
+                    throw this.notFound(target.id);
                 }
                 throw err;
             }
         }
-        const instance = await this.client.xcodeInstances.get(id);
+        const instance = await this.client.xcodeInstances.get(target.id);
         (0, config_1.registerCreatedInstance)(instance);
         return this.client.xcodeInstances.createClient({ instance });
     }
@@ -489,7 +451,7 @@ class BaseCommand extends core_1.Command {
         // A requested creation-time timeout cannot be applied to an existing
         // instance. Skip the cached target so headless one-shot commands get a
         // fresh instance with the requested lifecycle.
-        if (target?.type === 'xcode' && !this.autoCreateInactivityTimeout()) {
+        if (target && !this.autoCreateInactivityTimeout()) {
             this._lastResolvedInstanceId = target.id;
             return target;
         }
@@ -508,8 +470,8 @@ class BaseCommand extends core_1.Command {
         const id = this._overrideInstanceId ?? providedId;
         if (id) {
             const target = this.xcodeTargetFromId(id);
-            if (target.type === 'xcode' && !(await this.xcodeTargetHasAttachedSimulator(target))) {
-                throw new Error(`--ios requires an iOS-backed Xcode target or an Xcode instance with an attached simulator, got ${id}`);
+            if (!(await this.xcodeTargetHasAttachedSimulator(target))) {
+                throw new Error(`--ios requires an Xcode instance with an attached simulator, got ${id}`);
             }
             this._lastResolvedInstanceId = target.id;
             return target;
@@ -530,15 +492,11 @@ class BaseCommand extends core_1.Command {
         }
         const target = (0, config_1.loadLastXcodeInstance)();
         const forceFresh = Boolean(this.autoCreateInactivityTimeout());
-        if (target?.type === 'ios' && !forceFresh) {
-            this._lastResolvedInstanceId = target.id;
-            return target;
-        }
         // The recorded Xcode target wins even when it has no simulator yet:
         // attach one instead of abandoning it for a fresh sandbox, so a prior
         // `lim xcode sync` or `lim xcode create` keeps all commands pointed at
         // the same instance. Only a dead target falls through to creation.
-        if (target?.type === 'xcode' && !forceFresh) {
+        if (target && !forceFresh) {
             try {
                 const xcodeClient = await this.resolveXcodeClient(target);
                 const status = await xcodeClient.getSimulator();
@@ -551,7 +509,7 @@ class BaseCommand extends core_1.Command {
                     // attachNewSimulator deletes the simulator itself when the attach fails.
                     const { simulator } = await xcodeClient.attachNewSimulator();
                     this._instancesCreatedThisRun.add(simulator.metadata.id);
-                    saveLastCreatedInstance(simulator);
+                    (0, config_1.registerCreatedInstance)(simulator);
                     this.info(`Attached new simulator ${simulator.metadata.id} to Xcode target ${target.id}.`);
                 }
                 this._lastResolvedInstanceId = target.id;
@@ -642,12 +600,12 @@ class BaseCommand extends core_1.Command {
     async createIosInstance() {
         const instance = await this.client.iosInstances.create({ wait: true, spec: {} });
         this._instancesCreatedThisRun.add(instance.metadata.id);
-        return saveLastCreatedInstance(instance);
+        return (0, config_1.registerCreatedInstance)(instance);
     }
     async createAndroidInstance() {
         const instance = await this.client.androidInstances.create({ wait: true, spec: {} });
         this._instancesCreatedThisRun.add(instance.metadata.id);
-        return saveLastCreatedInstance(instance);
+        return (0, config_1.registerCreatedInstance)(instance);
     }
     /** Whether `id` is a server-side instance THIS invocation auto-created. */
     wasCreatedThisRun(id) {
@@ -671,12 +629,12 @@ class BaseCommand extends core_1.Command {
      * instance is perfectly usable. A restore that genuinely broke removes the instance, since
      * the caller asked for a warm workspace and handing back a silently cold one is worse.
      */
-    async awaitCacheRestore(cacheInstanceId, removeInstance) {
+    async awaitCacheRestore(instanceId, removeInstance) {
         const start = Date.now();
         this.info('Restoring build cache...');
         let result;
         try {
-            result = await this.client.xcodeInstances.followCache(cacheInstanceId, {
+            result = await this.client.xcodeInstances.followCache(instanceId, {
                 onUpdate: (cache) => {
                     const line = (0, cache_1.restoreProgressLine)(cache);
                     if (line)
@@ -687,19 +645,19 @@ class BaseCommand extends core_1.Command {
         catch (err) {
             if (err instanceof api_1.XcodeCacheGoneError) {
                 // Not a wait that broke but an instance that ended, so there is nothing to keep or check.
-                throw new Error(`Instance ${cacheInstanceId} was collected before its cache restore started.`);
+                throw new Error(`Instance ${instanceId} was collected before its cache restore started.`);
             }
             // The restore may well still be running, so the instance stays: deleting it over a
             // client-side wait that broke would throw away a workspace that is probably fine.
-            throw new Error(`Could not follow the cache restore of ${cacheInstanceId}: ${err instanceof Error ? err.message : String(err)}\n` + `The instance is still there. Check it with: lim xcode get ${cacheInstanceId}`);
+            throw new Error(`Could not follow the cache restore of ${instanceId}: ${err instanceof Error ? err.message : String(err)}\n` + `The instance is still there. Check it with: lim xcode get ${instanceId}`);
         }
         if (result.gone) {
-            throw new Error(`Instance ${cacheInstanceId} was gone before its cache restore finished (last phase: ${result.cache.restore.phase}).`);
+            throw new Error(`Instance ${instanceId} was gone before its cache restore finished (last phase: ${result.cache.restore.phase}).`);
         }
         const outcome = (0, cache_1.restoreOutcome)(result.cache, Date.now() - start);
         if (outcome.failed) {
             await removeInstance();
-            throw new Error(`${outcome.line}\nRemoved instance ${cacheInstanceId}.`);
+            throw new Error(`${outcome.line}\nRemoved instance ${instanceId}.`);
         }
         this.info(outcome.line);
         if (result.cache.restore.phase !== 'restored') {
@@ -722,11 +680,11 @@ class BaseCommand extends core_1.Command {
             this.info(`Cache: instance ${target.id} already exists, so its restore keys and paths stay as they were created.`);
         }
         if (cache.key) {
-            await this.bindCacheKey(this.cacheInstanceId(target), cache.key);
+            await this.bindCacheKey(target.id, cache.key);
         }
     }
     /**
-     * Binds the sandbox to an Xcode major when the caller asked for one and the sandbox is on
+     * Binds the sandbox to an Xcode version when the caller asked for one and the sandbox is on
      * another. The version is a property of the sandbox, not of this invocation: nothing is
      * remembered locally, and a later run without the flag keeps building with the switched
      * Xcode. Refusals from the daemon (not installed, busy) surface with its message.
@@ -735,26 +693,37 @@ class BaseCommand extends core_1.Command {
         if (!requested)
             return;
         // One round trip: the daemon answers alreadyBound for a no-op, before any busy check, so
-        // the steady state (sandbox already on the preferred major) costs no switch and no 409.
+        // the steady state (sandbox already on the preferred version) costs no switch and no 409.
         let result;
         try {
-            result = await this.readXcodeSelection(() => xcodeClient.setXcode(requested.major));
+            result = await xcodeClient.setXcode(requested.version);
         }
         catch (err) {
-            if (!(err instanceof api_1.XcodeSelectionUnsupportedError))
+            if (err instanceof api_1.XcodeSelectionUnsupportedError) {
+                // A vanished sandbox must stay a NotFoundError (withAuth clears the cache and recreates),
+                // not a claim that the daemon predates selection.
+                const gone = await this.vanishedXcodeSandboxError(target);
+                if (gone)
+                    throw gone;
+                // The workspace preference is a standing wish, not this command's request: on a daemon
+                // that cannot honour it, say so and build with what the sandbox has.
+                if (requested.source === 'workspace') {
+                    this.warn(`${err.message} Building with the sandbox's current Xcode.`);
+                    return;
+                }
                 throw err;
-            // A vanished sandbox must stay a NotFoundError (withAuth clears the cache and recreates),
-            // not a claim that the daemon predates selection.
-            const gone = await this.vanishedXcodeSandboxError(target);
-            if (gone)
-                throw gone;
-            // The workspace preference is a standing wish, not this command's request: on a daemon
-            // that cannot honour it, say so and build with what the sandbox has.
-            if (requested.source === 'workspace') {
-                this.warn(`${err.message} Building with the sandbox's current Xcode.`);
-                return;
             }
-            throw err;
+            const refusal = this.xcodeRefusal(err);
+            if (!refusal)
+                throw err;
+            // A saved minor outlives the beta it named once the fleet retires it; the fix is a local
+            // command, so name it. A flag is this command's own request and gets the daemon's words.
+            if (refusal.status === 400 && requested.source === 'workspace') {
+                this.error(`${refusal.message}. This workspace prefers Xcode ${requested.version}; pick an installed version with ` +
+                    '`lim xcode version set <version>` (a bare major such as 27 selects the GA) or drop the preference with ' +
+                    '`lim xcode version unset`.');
+            }
+            this.error(refusal.message);
         }
         if (result.alreadyBound)
             return;
@@ -778,30 +747,24 @@ class BaseCommand extends core_1.Command {
         return new api_1.NotFoundError(404, { message: `Instance ${id} was not found` }, undefined, new Headers());
     }
     /**
-     * The error a /xcode 404 deserves when the sandbox behind the target no longer exists, else
+     * The error a /xcode 404 deserves when the target no longer exists, else
      * undefined. A cached target is trusted without a round-trip, so the SDK's "daemon predates
      * selection" reading of a 404 is also what a deleted sandbox produces; the API tells the two
      * apart. Sandboxes this run created, or pinned through the environment (synthetic ids), are
-     * taken at their word. A standalone sandbox is a NotFoundError like anywhere else; one behind a
-     * live simulator is not, because withAuth would then forget and replace the simulator itself.
+     * taken at their word.
      */
     async vanishedXcodeSandboxError(target) {
-        if (this.wasCreatedThisRun(target.id) || (0, set_instance_1.envInstanceTarget)(target.type)?.id === target.id)
-            return undefined;
-        const sandboxId = (0, config_1.xcodeSandboxIdOf)(target);
-        if (!sandboxId)
+        if (this.wasCreatedThisRun(target.id) || (0, set_instance_1.envInstanceTarget)('xcode')?.id === target.id)
             return undefined;
         try {
-            await this.client.xcodeInstances.get(sandboxId);
+            await this.client.xcodeInstances.get(target.id);
             return undefined;
         }
         catch (err) {
             if (!(err instanceof api_1.NotFoundError))
                 throw err;
         }
-        if (target.type !== 'ios')
-            return this.notFound(target.id);
-        return new Error(`Xcode sandbox ${sandboxId} behind simulator ${target.id} no longer exists; attach a new one with: lim xcode create --attach --simulator-id ${target.id}`);
+        return this.notFound(target.id);
     }
     /**
      * Runs a /xcode call on a target. A remembered standalone sandbox that no longer exists is
@@ -818,7 +781,7 @@ class BaseCommand extends core_1.Command {
             const gone = await this.vanishedXcodeSandboxError(target);
             if (!gone)
                 throw err;
-            if (this._lastResolvedXcodeSource !== 'memory' || target.type === 'ios')
+            if (this._lastResolvedXcodeSource !== 'memory')
                 throw gone;
             (0, daemon_1.stopDaemon)(target.id);
             (0, config_1.clearLastInstanceId)(target.id);
@@ -839,12 +802,12 @@ class BaseCommand extends core_1.Command {
         return status ? { target, client, status } : undefined;
     }
     /** Save the workspace preference and switch its existing sandbox when available. */
-    async setPreferredXcodeVersion(major, providedId) {
+    async setPreferredXcodeVersion(version, providedId) {
         const previous = (0, config_1.loadXcodeVersionPreference)();
-        // Keep the workspace preference on transient failures, but reject majors the node cannot provide.
+        // Keep the workspace preference on transient failures, but reject versions the node cannot provide.
         const record = () => {
-            (0, config_1.setXcodeVersionPreference)(major);
-            this.info(`Xcode ${major} is now the preferred version${this.scopeSuffix()}.`);
+            (0, config_1.setXcodeVersionPreference)(version);
+            this.info(`Xcode ${version} is now the preferred version${this.scopeSuffix()}.`);
         };
         await this.withAuth(async () => {
             const target = await this.tryResolveXcodeTarget(providedId);
@@ -852,14 +815,14 @@ class BaseCommand extends core_1.Command {
             try {
                 result =
                     target ?
-                        await this.readXcodeSelectionOrForget(target, async () => (await this.resolveXcodeClient(target)).setXcode(major))
+                        await this.readXcodeSelectionOrForget(target, async () => (await this.resolveXcodeClient(target)).setXcode(version))
                         : undefined;
             }
             catch (err) {
                 const refusal = this.xcodeRefusal(err);
                 if (refusal?.status === 400) {
-                    if (previous === major) {
-                        this.error(`${refusal.message}. This workspace already prefers Xcode ${major}; drop it with: lim xcode version unset`);
+                    if (previous === version) {
+                        this.error(`${refusal.message}. This workspace already prefers Xcode ${version}; drop it with: lim xcode version unset`);
                     }
                     this.error(`${refusal.message}. The workspace preference stays ${previous ? `Xcode ${previous}` : 'unset'}.`);
                 }
@@ -871,13 +834,13 @@ class BaseCommand extends core_1.Command {
             record();
             if (!target || !result) {
                 if (this.isJsonEnabled())
-                    this.outputJson({ preferred: major });
+                    this.outputJson({ preferred: version });
                 else
                     this.output(`No sandbox instance found${this.scopeSuffix()}; the next one uses it.`);
                 return;
             }
             if (this.isJsonEnabled()) {
-                this.outputJson({ instanceId: target.id, preferred: major, ...result });
+                this.outputJson({ instanceId: target.id, preferred: version, ...result });
                 return;
             }
             const verb = result.alreadyBound ? 'already uses' : 'now uses';
@@ -888,8 +851,8 @@ class BaseCommand extends core_1.Command {
         }, { createReplacement: false });
     }
     /** setXcode with the daemon's own refusal message instead of the transport's wrapping. */
-    async selectXcode(xcodeClient, major) {
-        return this.readXcodeSelection(() => xcodeClient.setXcode(major));
+    async selectXcode(xcodeClient, version) {
+        return this.readXcodeSelection(() => xcodeClient.setXcode(version));
     }
     async readXcodeSelection(call) {
         try {
@@ -915,21 +878,14 @@ class BaseCommand extends core_1.Command {
         }
         return { status: err.status, message };
     }
-    /**
-     * The id the cache endpoints take. For an iOS-backed target that is its Xcode sandbox, which
-     * is the instance that owns the workspace.
-     */
-    cacheInstanceId(target) {
-        return (0, config_1.xcodeSandboxIdOf)(target) ?? target.id;
-    }
     /**
      * Binds the key an existing instance publishes under. The build happens now and publication
      * only at termination, possibly long after this process is gone, so the key has to live on
      * the instance rather than in this invocation.
      */
-    async bindCacheKey(cacheInstanceId, key) {
+    async bindCacheKey(instanceId, key) {
         try {
-            await this.client.xcodeInstances.bindCacheKey(cacheInstanceId, key);
+            await this.client.xcodeInstances.bindCacheKey(instanceId, key);
             this.info(`Cache: publishing this workspace under ${key} when the instance terminates.`);
         }
         catch (err) {
@@ -944,14 +900,14 @@ class BaseCommand extends core_1.Command {
      * Starts following an instance's cache publication before it is deleted, so a publication
      * that finishes quickly is still seen. Never rejects; the caller renders the result.
      */
-    startCachePublicationFollow(cacheInstanceId) {
+    startCachePublicationFollow(instanceId) {
         const start = Date.now();
         let open = () => { };
         const opened = new Promise((resolve) => {
             open = resolve;
         });
         const done = this.client.xcodeInstances
-            .followCache(cacheInstanceId, {
+            .followCache(instanceId, {
             side: 'save',
             onOpen: open,
             onUpdate: (cache) => {
@@ -1008,20 +964,10 @@ class BaseCommand extends core_1.Command {
         return (this.id ?? '').split(/[: ]+/).filter(Boolean);
     }
     xcodeTargetFromId(id) {
-        const type = (0, instance_client_factory_1.detectInstanceType)(id);
-        if (type === 'ios') {
-            const cached = (0, config_1.loadIosInstanceCache)(id);
-            if (cached)
-                return cached;
-            return { id, type: 'ios' };
-        }
-        if (type === 'xcode') {
-            const cached = (0, config_1.loadXcodeInstanceCache)(id);
-            if (cached)
-                return cached;
-            return { id, type: 'xcode' };
+        if ((0, instance_client_factory_1.detectInstanceType)(id) !== 'xcode') {
+            throw new Error(`Expected an Xcode instance (sandbox_...), got ${id}`);
         }
-        throw new Error(`Expected an iOS or Xcode target, got ${id}`);
+        return (0, config_1.loadXcodeInstanceCache)(id) ?? { id, type: 'xcode' };
     }
     androidInstanceFromId(id) {
         const type = (0, instance_client_factory_1.detectInstanceType)(id);
@@ -1038,9 +984,7 @@ class BaseCommand extends core_1.Command {
         return (0, config_1.loadIosInstanceCache)(id) ?? { id, type: 'ios' };
     }
     // Creates a standalone Xcode instance plus a fresh simulator and attaches
-    // them, replacing the legacy server-side paired creation
-    // (spec.sandbox.xcode.enabled). Separate creation keeps the two lifecycles
-    // independent and is the supported way to get a simulator-backed target.
+    // them. Separate creation keeps the two lifecycles independent.
     // The simulator keeps the org-default inactivity timeout on purpose: a
     // build-scoped --inactivity-timeout (e.g. 3s) belongs to the build sandbox,
     // and a simulator carrying it would idle out before the build finishes.
@@ -1057,7 +1001,7 @@ class BaseCommand extends core_1.Command {
             throw err;
         }
         this._instancesCreatedThisRun.add(simulator.metadata.id);
-        saveLastCreatedInstance(simulator);
+        (0, config_1.registerCreatedInstance)(simulator);
         return target;
     }
     async createStandaloneXcodeInstance() {
@@ -1071,12 +1015,12 @@ class BaseCommand extends core_1.Command {
             },
         });
         this._instancesCreatedThisRun.add(instance.metadata.id);
-        saveLastCreatedInstance(instance);
+        (0, config_1.registerCreatedInstance)(instance);
         if ((0, cache_1.wantsRestore)(cache)) {
             await this.awaitCacheRestore(instance.metadata.id, () => this.deleteCreatedInstance(instance.metadata.id));
         }
         const target = (0, config_1.loadLastXcodeInstance)();
-        if (!target || target.type !== 'xcode') {
+        if (!target) {
             throw new Error(`Created Xcode instance ${instance.metadata.id}, but failed to load it from local cache.`);
         }
         return target;
@@ -1145,7 +1089,7 @@ class BaseCommand extends core_1.Command {
             return this.client.gradleInstances.createClient({ apiUrl: target.apiUrl, token: target.token });
         }
         const instance = await this.client.gradleInstances.get(target.id);
-        saveLastCreatedInstance(instance);
+        (0, config_1.registerCreatedInstance)(instance);
         return this.client.gradleInstances.createClient({ instance });
     }
     async resolveBuildToolClient(platform, id, mode = 'work') {
@@ -1172,7 +1116,7 @@ class BaseCommand extends core_1.Command {
         this._instancesCreatedThisRun.add(instance.metadata.id);
         // The save path builds the record from the instance we just created, so
         // the returned union member is necessarily the gradle shape.
-        return saveLastCreatedInstance(instance);
+        return (0, config_1.registerCreatedInstance)(instance);
     }
 }
 exports.BaseCommand = BaseCommand;
@@ -1211,7 +1155,4 @@ BaseCommand.readOnlyFlags = {
     quiet: BaseCommand.baseFlags.quiet,
     workspace: BaseCommand.baseFlags.workspace,
 };
-function saveLastCreatedInstance(instanceOrId, relatedTypes = []) {
-    return (0, config_1.registerCreatedInstance)(instanceOrId, relatedTypes);
-}
 //# sourceMappingURL=base-command.js.map