feat: preserve failed APT history for one signed UI-approved recovery
Rust development slice / linux (push) Failing after 6s

This commit is contained in:
2026-11-13 15:50:34 +01:00
parent a5c2dce4fb
commit fd7225600b
18 changed files with 1345 additions and 34 deletions
+14 -7
View File
@@ -98,7 +98,8 @@ def upgrade(payload):
require(general==old_general,'general policy changed')
require(all(manifest(Path(p))==v for p,v in preserved.items()) and markers[0].read_bytes()==marker and
(ledger.stat().st_dev,ledger.stat().st_ino)==inode,'preserved identity/attempt/ledger changed')
report.update(stage='installed_preserved',preserved_state=True,runtime_sha256=runtime_sha,apt_config_sha256=config_sha,apt_pin=pin,general_pin=general);save()
report.update(stage='installed_preserved',preserved_state=True,runtime_sha256=runtime_sha,apt_config_sha256=config_sha,apt_pin=pin,general_pin=general,
provider_sha256=sha(code),helper_sha256=sha(raw));save()
fcntl.flock(lockfd,fcntl.LOCK_UN);os.close(lockfd);lockfd=None
run(['systemd-analyze','verify','/etc/systemd/system/rmm-apt-helper.service'])
run(['systemctl','daemon-reload'])
@@ -135,17 +136,23 @@ def installed_metadata(payload):
def main():
parser=argparse.ArgumentParser();parser.add_argument('--local-file-fix',action='store_true');args=parser.parse_args()
parser=argparse.ArgumentParser();group=parser.add_mutually_exclusive_group()
group.add_argument('--local-file-fix',action='store_true')
group.add_argument('--native-retry',action='store_true',help='One versioned signed-retry upgrade; never a package retry itself')
args=parser.parse_args()
os.umask(0o077);m=cloud.contract
require(followup.evidence('gate')['unresolved']==0,'unresolved central job')
diagnosis=m.protected_json(followup.STATE/'diagnosis/checkpoint.json');require(diagnosis.get('verified') is True,'diagnostic evidence required')
reports=list(followup.STATE.glob('sandbox-*.json'))
if args.local_file_fix:
require(len(reports)==1,'exact prior successful sandbox upgrade required; never repeat migration')
prior=m.protected_json(reports[0]);require(prior['completed'] is True,'previous migration incomplete')
pins=m.protected_json(followup.STATE/'provider-before-local-file-fix.json')
if args.local_file_fix or args.native_retry:
require(len(reports)==(2 if args.native_retry else 1),'exact prior successful sandbox upgrades required; never repeat migration')
previous=[m.protected_json(p) for p in reports]
require(all(p['completed'] is True for p in previous),'previous migration incomplete')
pins=m.protected_json(followup.STATE/('provider-before-native-retry.json' if args.native_retry else 'provider-before-local-file-fix.json'))
candidates=[p for p in previous if p['runtime_sha256']==pins.get('runtime_sha256')] if args.native_retry else previous
require(len(candidates)==1,'reviewed prior runtime required');prior=candidates[0]
old=cloud.bootstrap.rpc('linux-vm.conf',installed_metadata,dict(pins,runtime_sha256=prior['runtime_sha256'],apt_pin=prior['apt_pin']))
artifact=(followup.STATE/'helper-local-file-fixed').read_bytes()
artifact=(followup.STATE/('helper-native-retry' if args.native_retry else 'helper-local-file-fixed')).read_bytes()
folders=[cloud.ROOT/'devstate/cloud-root/cases'/name for name in ('service_setup','service_start','service_stop','apt_native_install')]
folders += [followup.STATE/name for name in ('diagnosis','diagnosis-acquisition','diagnosis-hook','diagnosis-local-hook')]
expected=[str(uuid.UUID(m.protected_json(p/'checkpoint.json')['result']['result']['grant_id'])) for p in folders]