Integrate delivered HQ memory, finite physical convoy and RHS WCS dependencies

tools/headless_workbench.py

@@ -7,12 +7,14 @@ import argparse, fcntl, json, os, shutil, signal, subprocess, time
 from pathlib import Path
 from native_provenance import snapshot, persist, bindings, seal_run
 from headless_game import assert_prefix_idle, cleanup_owned_run
+from external_addons import policy as external_policy, prepare_profile, verify_profile
 ROOT = Path(__file__).resolve().parents[1]
 p = argparse.ArgumentParser(description=__doc__)
 p.add_argument('--steam', type=Path, default=Path.home()/'.local/share/Steam')
+p.add_argument('--external-addons', type=Path, help='Installed RHS/WCS/BMP source root; expose only audited closure in a separate Chat profile')
 p.add_argument('--compat', type=Path, required=True, help='Disposable cloned Proton compatdata directory outside Steam')
 p.add_argument('--profile', type=Path, required=True, help='Separate disposable successor Workbench profile')
-p.add_argument('--smoke', choices=['aircraft-field', 'aircraft-route', 'native-end-active', 'native-end-preparing', 'aircraft-control', 'aircraft-cancel', 'aircraft-translate', 'map-ownership', 'mortar-refresh', 'mortar-salvo', 'mortar-courier', 'station-teardown', 'prison-breach', 'powered-flight', 'powered-translate', 'local-admission', 'mortar-expiry', 'mortar-transfer', 'mortar-fire', 'patrol-hq', 'victory', 'lost-helicopter', 'player-death', 'radio-network', 'hq-response', 'mortar-inventory', 'startup-failure', 'site-survey', 'cache-loss', 'extraction-capacity', 'early-helicopter-loss', 'extraction-startup-failure', 'extraction-boundary-failure', 'transport-loss', 'transport-survey', 'lifecycle', 'objective-ui', 'recovery', 'prisoner-kit', 'medical', 'casualty-load', 'casualty-direct', 'casualty-bench', 'casualty-remove', 'environment', 'environment-restart', 'patrols', 'radio-document-loss', 'radio-document-loss-partial', 'guard-cancel', 'casualty-service'], default='victory')
+p.add_argument('--smoke', choices=['convoy', 'hq-memory', 'aircraft-field', 'aircraft-route', 'native-end-active', 'native-end-preparing', 'aircraft-control', 'aircraft-cancel', 'aircraft-translate', 'map-ownership', 'mortar-refresh', 'mortar-salvo', 'mortar-courier', 'station-teardown', 'prison-breach', 'powered-flight', 'powered-translate', 'local-admission', 'mortar-expiry', 'mortar-transfer', 'mortar-fire', 'patrol-hq', 'victory', 'lost-helicopter', 'player-death', 'radio-network', 'hq-response', 'mortar-inventory', 'startup-failure', 'site-survey', 'cache-loss', 'extraction-capacity', 'early-helicopter-loss', 'extraction-startup-failure', 'extraction-boundary-failure', 'transport-loss', 'transport-survey', 'lifecycle', 'objective-ui', 'recovery', 'prisoner-kit', 'medical', 'casualty-load', 'casualty-direct', 'casualty-bench', 'casualty-remove', 'environment', 'environment-restart', 'patrols', 'radio-document-loss', 'radio-document-loss-partial', 'guard-cancel', 'casualty-service'], default='victory')
 p.add_argument('--field-terrain-audit', action='store_true', help='After a fixed aircraft-field survey refusal, log one read-only 1681-node coarse terrain grid; never selects or qualifies a corridor')
 p.add_argument('--field-service-cancel', action='store_true', help='Explicit aircraft-field variant: Stop the original retained service during measured cruise; requires physical cancellation landing')
 p.add_argument('--route-service-cancel', action='store_true', help='Explicit aircraft-route variant: stop the retained service after actual airborne translation and require controlled cancellation landing')
@@ -36,6 +38,8 @@ if a.smoke == 'mortar-courier' and (a.project != 'chat' or a.rounds != 1 or a.ti
 if a.smoke in {'mortar-refresh', 'mortar-salvo', 'mortar-expiry', 'mortar-transfer', 'mortar-fire'} and (a.project != 'chat' or a.rounds != 1 or a.timeout < 400):
  p.error('mortar-refresh/mortar-salvo/mortar-expiry/mortar-transfer/mortar-fire requires --project chat --rounds 1 --timeout at least 400')
 if a.smoke in {'aircraft-field', 'aircraft-route', 'aircraft-control', 'aircraft-cancel', 'aircraft-translate'} and (a.project != 'chat' or a.rounds != 1 or a.timeout < 420): p.error('aircraft-field/aircraft-route/aircraft-control/aircraft-cancel/aircraft-translate requires Chat, one round, and at least 420 seconds')
+if a.smoke == 'convoy' and (a.project != 'chat' or a.rounds != 1 or a.timeout < 600): p.error('convoy requires Chat, exactly one round, and timeout at least600 seconds')
+if a.smoke == 'hq-memory' and (a.project != 'chat' or a.rounds != 1): p.error('hq-memory requires Chat and exactly one round')
 if a.smoke == 'map-ownership' and (a.project != 'chat' or a.rounds != 1 or a.timeout < 180): p.error('map-ownership requires Chat, one round, and at least 180 seconds')
 if a.smoke == 'powered-translate' and (a.project != 'core' or not a.flight_action_inputs or not a.flight_autohover): p.error('powered-translate requires Core with flight-action-inputs and flight-autohover')
 if a.flight_autohover and (a.project != 'core' or a.smoke not in {'powered-flight', 'powered-translate'} or not a.flight_action_inputs): p.error('flight-autohover requires Core powered-flight with flight-action-inputs')
@@ -52,6 +56,9 @@ if a.smoke == 'environment-restart':
  if any((profile/name).exists() or (profile/name).is_symlink() for name in fixture_names): p.error('environment-restart fixture paths must not preexist; preserve or move prior evidence before retrying')
 if compat.is_relative_to(steam) or not (compat/'pfx/system.reg').is_file():
  p.error('--compat must be a disposable cloned prefix outside the Steam installation')
+if a.external_addons and a.project != 'chat': p.error('External AI dependencies are not permitted in Core-only tests')
+if a.external_addons and profile == Path('/tmp/erri-workbench-profile'): p.error('Use a separate external-dependency profile; preserve the vanilla test profile')
+if a.project == 'chat' and not a.external_addons: p.error('Full Chat now requires --external-addons pointing to installed authorized RHS/WCS/BMP dependencies')
 prefix_lock = (compat/'.erri-workbench.lock').open('a')
 try: fcntl.flock(prefix_lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
 except BlockingIOError: p.error('Another test runner owns this disposable Wine prefix')
@@ -71,8 +78,17 @@ addons = profile/'addons'
 addons.mkdir(exist_ok=True)
 link = addons/'ArmaReforger'
 if not link.exists(): link.symlink_to(vanilla, target_is_directory=True)
-if link.resolve() != vanilla.resolve() or any(x.name not in {'ArmaReforger', 'saves'} for x in addons.iterdir()) or any((addons/'saves').rglob('*.gproj')):
- p.error('Test profile addons must contain only the intended vanilla link')
+external_inputs = None
+external_cache = profile/'external-source-cache.json'
+allowed_profile_addons = {'ArmaReforger', 'saves'}
+if a.external_addons:
+ try:
+  external_rules = external_policy(ROOT)
+  external_inputs = prepare_profile(addons, a.external_addons, external_rules, external_cache)
+  allowed_profile_addons.update('ERRI_'+guid for guid in external_inputs)
+ except (OSError, ValueError) as error: p.error(str(error))
+if link.resolve() != vanilla.resolve() or any(x.name not in allowed_profile_addons for x in addons.iterdir()) or any((addons/'saves').rglob('*.gproj')):
+ p.error('Test profile addons must contain only vanilla and the explicit audited external closure')
 profile_arg = 'Z:'+str(profile)
 # Refuse concurrency instead of terminating anybody else's editor.
 for proc in Path('/proc').iterdir():
@@ -152,6 +168,8 @@ with (profile/'headless-launch.log').open('w') as output:
     session = max(candidates, key=lambda x:x.stat().st_mtime)
     if session not in recorded_sessions:
      persist(session, captured_sources)
+     if external_inputs:
+      (session/'external-addons-inputs.json').write_text(json.dumps(external_inputs, indent=2)+'\n')
      recorded_sessions.add(session)
     console = session/'console.log'
     content = console.read_text(errors='replace') if console.exists() else ''
@@ -175,9 +193,14 @@ with (profile/'headless-launch.log').open('w') as output:
     result = 'cleanup-failed'
     cleanup_error = '; '.join(cleanup_report['errors'])
     runner_error = (runner_error + '; ' if runner_error else '') + cleanup_error
+external_unchanged = True
+if external_inputs:
+ try: external_unchanged = verify_profile(external_inputs, a.external_addons, external_rules, external_cache, addons)
+ except (OSError, ValueError): external_unchanged = False
+ if not external_unchanged: result = 'external-inputs-changed'
 stopped_evidence = seal_run(ROOT, session, captured_sources) if cleanup_ok and session else {}
 if stopped_evidence and not stopped_evidence['source_unchanged_after_run']: result = 'source-changed'
-summary = {**stopped_evidence, **bindings(captured_sources), 'started_unix':started, 'result':result, 'result_before_cleanup':result_before_cleanup, 'cleanup_confirmed':cleanup_ok, 'cleanup_report':cleanup_report, 'runner_error':runner_error, 'session':str(session) if session else None, 'rounds_required':a.rounds, 'project':a.project, 'display':'headless Gamescope 1280x720/30Hz', 'dedicated_server':False, 'audio':'silent sink and per-test-stream mute'}
+summary = {**stopped_evidence, **bindings(captured_sources), 'external_addons_unchanged_after_run':external_unchanged, 'external_addon_count':len(external_inputs or {}), 'external_addon_inputs':'external-addons-inputs.json' if external_inputs else None, 'started_unix':started, 'result':result, 'result_before_cleanup':result_before_cleanup, 'cleanup_confirmed':cleanup_ok, 'cleanup_report':cleanup_report, 'runner_error':runner_error, 'session':str(session) if session else None, 'rounds_required':a.rounds, 'project':a.project, 'display':'headless Gamescope 1280x720/30Hz', 'dedicated_server':False, 'audio':'silent sink and per-test-stream mute'}
 if session:
  (session/'runner.json').write_text(json.dumps(summary, indent=2)+'\n')
  shutil.copyfile(profile/'headless-launch.log', session/'headless-launch.log')