@moretea-labs/forge 1.6.0 → 1.7.1

package/src/runtime/plugins/ios-adapter.ts

@@ -5,6 +5,7 @@ import {
   iosAppBuild,
   iosAppInstall,
   iosAppLaunch,
+  iosXcodeTest,
   iosDevelopmentPlatform,
   iosProjectDiscover,
   iosSchemesList,
@@ -13,6 +14,7 @@ import {
   iosSimulatorsList,
   iosSmokeReview,
   iosXcodeStatus,
+  iosXcodeStatusSnapshot,
 } from '../safe-tooling/ios-development';
 import type {
   AssistantPluginActionDescriptor,
@@ -23,6 +25,7 @@ import type {
   AssistantPluginPermissionScope,
 } from './types';
 import { AssistantPluginError } from './errors';
+import { resolveAppStoreConnectXcodeAuthenticationReference } from './app-store-connect-adapter';
 import {
   executeIosAgentDeviceAction,
   iosAgentDeviceActions,
@@ -36,6 +39,7 @@ import {
   iosPhysicalDeviceCapabilities,
   iosPhysicalDeviceStatus,
   isIosPhysicalDeviceAction,
+  resolveIosPhysicalDeviceAuthorizationContext,
 } from './ios-physical-device';
 
 const IOS_PLUGIN_ID = 'ios';
@@ -62,7 +66,7 @@ function controllerArtifactRoot(input: AssistantPluginActionExecutionInput): str
 }
 
 function userFacingIosStatus(): Record<string, unknown> {
-  const xcode = iosXcodeStatus();
+  const xcode = iosXcodeStatusSnapshot().status;
   const discovery = iosProjectDiscover({
     repoId: 'probe',
     canonicalRoot: process.cwd(),
@@ -87,7 +91,8 @@ function userFacingIosStatus(): Record<string, unknown> {
 }
 
 function health(repoRoot: string): AssistantPluginHealth {
-  const xcode = iosXcodeStatus();
+  const xcodeSnapshot = iosXcodeStatusSnapshot();
+  const xcode = xcodeSnapshot.status;
   const discovery = iosProjectDiscover({
     repoId: 'probe',
     canonicalRoot: repoRoot,
@@ -98,14 +103,15 @@ function health(repoRoot: string): AssistantPluginHealth {
   const toolingReady = platformOk && Boolean(xcode && 'ready' in xcode && xcode.ready);
   const warnings: string[] = [];
   if (!platformOk) warnings.push('iOS plugin requires macOS with Xcode and Simulator.');
-  if (platformOk && !toolingReady) warnings.push('Xcode/simctl is not fully ready on this host.');
+  if (platformOk && !xcodeSnapshot.probed) warnings.push('Xcode/simctl readiness has not been explicitly probed in this runtime yet.');
+  else if (platformOk && !toolingReady) warnings.push('Xcode/simctl is not fully ready on this host.');
   if (!discovery.ready) warnings.push('No .xcworkspace/.xcodeproj/Package.swift discovered in this repository yet.');
   const status = userFacingStatusFrom(toolingReady, discovery.ready, Boolean(xcode && 'simctlAvailable' in xcode && xcode.simctlAvailable));
   return {
     state: !platformOk ? 'disabled' : toolingReady ? 'ready' : 'degraded',
     checkedAt: now(),
     ready: toolingReady,
-    probed: true,
+    probed: xcodeSnapshot.probed,
     errors: [],
     warnings,
     details: {
@@ -119,8 +125,10 @@ function health(repoRoot: string): AssistantPluginHealth {
         xcodeSelectPath: 'xcodeSelectPath' in xcode ? xcode.xcodeSelectPath : undefined,
         xcodebuildVersion: 'xcodebuildVersion' in xcode ? xcode.xcodebuildVersion : undefined,
         simctlAvailable: 'simctlAvailable' in xcode ? xcode.simctlAvailable : undefined,
+        probed: xcodeSnapshot.probed,
+        cached: xcodeSnapshot.cached,
       } : xcode,
-      agentDevice: iosAgentDeviceStatus(),
+      agentDevice: iosAgentDeviceStatus({ repoRoot }),
       physicalDevice: iosPhysicalDeviceStatus(),
       artifactRoots: {
         repoLocal: '.forge/ios/',
@@ -144,7 +152,7 @@ function permissions(ready: boolean): AssistantPluginPermissionScope[] {
     { scope: 'ios.discover', mode: 'read', description: 'Discover Xcode projects, schemes, and simulator inventory.', granted: ready, required: true },
     { scope: 'ios.build', mode: 'write', description: 'Build iOS app targets into bounded DerivedData.', granted: ready, required: true },
     { scope: 'ios.simulator', mode: 'write', description: 'Boot simulators, install, launch, screenshot, and collect logs.', granted: ready, required: true },
-    { scope: 'ios.device', mode: 'write', description: 'Inspect and interact with an exact paired physical iPhone through bounded CoreDevice and optional signed UI-runner actions.', granted: ready, required: false },
+    { scope: 'ios.device', mode: 'write', description: 'Inspect and operate an exact paired physical iPhone through CoreDevice; optional XCTest semantics are isolated in the agent-device fallback.', granted: ready, required: false },
   ];
 }
 
@@ -162,7 +170,7 @@ function capabilities(): AssistantPluginCapability[] {
       title: 'iOS Staged Smoke Review',
       description: 'Run a staged build/install/launch/screenshot workflow with per-stage evidence.',
       scopes: ['ios.build', 'ios.simulator'],
-      actions: ['smoke_review', 'build', 'launch_simulator', 'capture_screenshot'],
+      actions: ['smoke_review', 'build', 'xcode_test', 'launch_simulator', 'capture_screenshot'],
     },
     ...iosAgentDeviceCapabilities(),
     ...iosPhysicalDeviceCapabilities(),
@@ -175,6 +183,8 @@ function actions(): AssistantPluginActionDescriptor[] {
     { resource: 'workspace' as const, mode: 'write' as const },
     { resource: 'repo-state' as const, mode: 'write' as const },
   ];
+  const providerMutationClaims = [{ resource: 'provider-state' as const, mode: 'write' as const }];
+  const providerReadClaims = [{ resource: 'provider-state' as const, mode: 'read' as const }];
   return [
     {
       actionId: 'xcode_status',
@@ -184,7 +194,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       risk: 'readonly',
       confirmation: 'none',
       defaultTimeoutMs: 15_000,
-      cancellable: true,
+      cancellable: false,
       idempotent: true,
       scopes: ['ios.discover'],
       resourceClaims: [],
@@ -198,7 +208,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       risk: 'readonly',
       confirmation: 'none',
       defaultTimeoutMs: 30_000,
-      cancellable: true,
+      cancellable: false,
       idempotent: true,
       scopes: ['ios.discover'],
       resourceClaims: [],
@@ -219,7 +229,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       risk: 'readonly',
       confirmation: 'none',
       defaultTimeoutMs: 15_000,
-      cancellable: true,
+      cancellable: false,
       idempotent: true,
       scopes: ['ios.discover'],
       resourceClaims: readClaims,
@@ -233,7 +243,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       risk: 'readonly',
       confirmation: 'none',
       defaultTimeoutMs: 60_000,
-      cancellable: true,
+      cancellable: false,
       idempotent: true,
       scopes: ['ios.discover'],
       resourceClaims: readClaims,
@@ -256,6 +266,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       defaultTimeoutMs: 10 * 60_000,
       cancellable: true,
       idempotent: false,
+      executionMode: 'lightweight_process',
       scopes: ['ios.build'],
       resourceClaims: writeClaims,
       argumentsSchema: {
@@ -267,6 +278,39 @@ function actions(): AssistantPluginActionDescriptor[] {
           workspace: { type: 'string' },
           project: { type: 'string' },
           configuration: { type: 'string' },
+          destination_platform: { type: 'string', enum: ['ios_simulator', 'ios'] },
+          allow_provisioning_updates: { type: 'boolean' },
+          authentication_provider: { type: 'string', enum: ['app_store_connect'] },
+          timeout_ms: { type: 'number' },
+        },
+        additionalProperties: false,
+      },
+    },
+    {
+      actionId: 'xcode_test',
+      title: 'Run focused Xcode tests',
+      description: 'Run an Xcode test scheme, optionally narrowed with exact -only-testing selectors, and return bounded xcresult evidence.',
+      readOnly: false,
+      risk: 'workspace_write',
+      confirmation: 'authorization',
+      defaultTimeoutMs: 15 * 60_000,
+      cancellable: true,
+      idempotent: false,
+      executionMode: 'lightweight_process',
+      scopes: ['ios.build', 'ios.simulator'],
+      resourceClaims: writeClaims,
+      argumentsSchema: {
+        type: 'object',
+        properties: {
+          scheme: { type: 'string' },
+          udid: { type: 'string' },
+          simulator_name: { type: 'string' },
+          workspace: { type: 'string' },
+          project: { type: 'string' },
+          configuration: { type: 'string' },
+          only_testing: { type: 'array', items: { type: 'string' }, maxItems: 50 },
+          parallel_testing: { type: 'boolean' },
+          max_parallel_testing_workers: { type: 'number', minimum: 1, maximum: 8 },
           timeout_ms: { type: 'number' },
         },
         additionalProperties: false,
@@ -282,8 +326,9 @@ function actions(): AssistantPluginActionDescriptor[] {
       defaultTimeoutMs: 60_000,
       cancellable: true,
       idempotent: true,
+      executionMode: 'lightweight_process',
       scopes: ['ios.simulator'],
-      resourceClaims: writeClaims,
+      resourceClaims: providerMutationClaims,
       argumentsSchema: {
         type: 'object',
         properties: {
@@ -305,8 +350,9 @@ function actions(): AssistantPluginActionDescriptor[] {
       defaultTimeoutMs: 60_000,
       cancellable: true,
       idempotent: false,
+      executionMode: 'lightweight_process',
       scopes: ['ios.simulator'],
-      resourceClaims: writeClaims,
+      resourceClaims: providerReadClaims,
       argumentsSchema: {
         type: 'object',
         properties: {
@@ -327,6 +373,7 @@ function actions(): AssistantPluginActionDescriptor[] {
       defaultTimeoutMs: 15 * 60_000,
       cancellable: true,
       idempotent: false,
+      executionMode: 'lightweight_process',
       scopes: ['ios.build', 'ios.simulator'],
       resourceClaims: writeClaims,
       argumentsSchema: {
@@ -367,7 +414,7 @@ export function buildIosPluginManifest(previousRevision = 0, previousUpdatedAt?:
     authority: {
       strategy: 'derived',
       duplicateStateAllowed: false,
-      sourceOfTruth: ['local:xcodebuild', 'local:simctl', 'local:devicectl', 'local:agent-device-capability-contract', 'process-env:DEVELOPER_DIR', 'process-env:AGENT_DEVICE_IOS_TEAM_ID', 'process-env:AGENT_DEVICE_IOS_BUNDLE_ID', 'process-env:FORGE_IOS_DEVICE_RUNNER_URL', `repo-local:${CONFIG_ROOT}/ios.json`],
+      sourceOfTruth: ['local:xcodebuild', 'local:simctl', 'local:devicectl', 'local:agent-device-capability-contract', 'process-env:DEVELOPER_DIR', 'process-env:AGENT_DEVICE_IOS_TEAM_ID', 'process-env:AGENT_DEVICE_IOS_BUNDLE_ID', `repo-local:${CONFIG_ROOT}/ios.json`],
     },
     enabled,
     lifecycle: {
@@ -414,7 +461,22 @@ export async function executeIosPluginAction(input: AssistantPluginActionExecuti
           project: stringValue(input.args.project),
         }),
       };
-    case 'build':
+    case 'build': {
+      const destinationPlatform = stringValue(input.args.destination_platform);
+      if (destinationPlatform && destinationPlatform !== 'ios' && destinationPlatform !== 'ios_simulator') {
+        throw new AssistantPluginError('PLUGIN_ACTION_ARGUMENT_INVALID', 'destination_platform must be ios or ios_simulator.', { retryable: false });
+      }
+      const allowProvisioningUpdates = input.args.allow_provisioning_updates === true;
+      const authenticationProvider = stringValue(input.args.authentication_provider);
+      if (authenticationProvider && authenticationProvider !== 'app_store_connect') {
+        throw new AssistantPluginError('PLUGIN_ACTION_ARGUMENT_INVALID', 'authentication_provider must be app_store_connect.', { retryable: false });
+      }
+      if (authenticationProvider && !allowProvisioningUpdates) {
+        throw new AssistantPluginError('PLUGIN_ACTION_ARGUMENT_INVALID', 'authentication_provider requires allow_provisioning_updates=true.', { retryable: false });
+      }
+      const authentication = authenticationProvider === 'app_store_connect'
+        ? resolveAppStoreConnectXcodeAuthenticationReference(input.repoRoot, input.controllerHome, input.repoId)
+        : undefined;
       return {
         ...iosAppBuild(repository, {
           scheme: stringValue(input.args.scheme),
@@ -423,9 +485,33 @@ export async function executeIosPluginAction(input: AssistantPluginActionExecuti
           workspace: stringValue(input.args.workspace),
           project: stringValue(input.args.project),
           configuration: stringValue(input.args.configuration),
+          destinationPlatform: destinationPlatform as 'ios' | 'ios_simulator' | undefined,
+          provisioning: allowProvisioningUpdates ? { allowUpdates: true, authentication } : undefined,
           timeoutMs: typeof input.args.timeout_ms === 'number' ? input.args.timeout_ms : undefined,
         }),
       };
+    }
+    case 'xcode_test': {
+      const onlyTesting = Array.isArray(input.args.only_testing)
+        ? input.args.only_testing.map((entry) => String(entry).trim()).filter(Boolean).slice(0, 50)
+        : undefined;
+      return {
+        ...iosXcodeTest(repository, {
+          scheme: stringValue(input.args.scheme),
+          udid: stringValue(input.args.udid),
+          simulatorName: stringValue(input.args.simulator_name),
+          workspace: stringValue(input.args.workspace),
+          project: stringValue(input.args.project),
+          configuration: stringValue(input.args.configuration),
+          onlyTesting,
+          parallelTesting: input.args.parallel_testing === true,
+          maxParallelTestingWorkers: typeof input.args.max_parallel_testing_workers === 'number'
+            ? input.args.max_parallel_testing_workers
+            : undefined,
+          timeoutMs: typeof input.args.timeout_ms === 'number' ? input.args.timeout_ms : undefined,
+        }),
+      };
+    }
     case 'launch_simulator': {
       const udid = stringValue(input.args.udid);
       if (!udid) throw new AssistantPluginError('PLUGIN_ACTION_ARGUMENT_INVALID', 'udid is required.', { retryable: false });
@@ -489,7 +575,7 @@ export async function executeIosPluginAction(input: AssistantPluginActionExecuti
       const udid = stringValue(input.args.udid);
       const appPath = stringValue(input.args.app_path);
       if (!udid || !appPath) throw new AssistantPluginError('PLUGIN_ACTION_ARGUMENT_INVALID', 'udid and app_path are required.', { retryable: false });
-      return { ...iosAppInstall(repository, { udid, appPath }) };
+      return { ...iosAppInstall(repository, { udid, appPath, artifactRoot }) };
     }
     case 'launch_app': {
       const udid = stringValue(input.args.udid);
@@ -505,5 +591,9 @@ export async function executeIosPluginAction(input: AssistantPluginActionExecuti
 export const iosPluginAdapter = {
   pluginId: IOS_PLUGIN_ID,
   buildManifest: buildIosPluginManifest,
+  resolveAuthorizationContext: async (input: AssistantPluginActionExecutionInput) => {
+    if (!isIosPhysicalDeviceAction(input.actionId)) return undefined;
+    return resolveIosPhysicalDeviceAuthorizationContext(input);
+  },
   executeAction: executeIosPluginAction,
 };