fix(daemon): anchor provider session retention at expiry

Author: thymikee

src/daemon/handlers/__tests__/lease-artifacts.test.ts

@@ -97,7 +97,7 @@ test('artifacts refuses a released provider session after the retention window',
   assert.deepEqual(world.providerCalls, []);
 });
 
-test('artifacts retains an expired provider session only through the release window', async () => {
+test('artifacts refuses an expired provider session after retention before lazy cleanup', async () => {
   let now = 1_000;
   const world = createWorld({
     now: () => now,
@@ -108,15 +108,6 @@ test('artifacts retains an expired provider session only through the release win
   });
   const lease = await allocateLease(world, 'tenant-a', 'run-a');
 
-  now = lease.expiresAt + 1;
-  const retained = await listArtifacts(world, {
-    tenantId: 'tenant-a',
-    runId: 'run-a',
-    providerSessionId: 'session-tenant-a',
-  });
-  assert.equal(retained.ok, true);
-
-  world.providerCalls.length = 0;
   now = lease.expiresAt + 51;
   await assertProviderSessionNotOwned(world, {
     tenantId: 'tenant-a',

src/daemon/lease-registry.ts

@@ -376,7 +376,7 @@ export class LeaseRegistry {
     for (const lease of this.leases.values()) {
       if (lease.expiresAt > now) continue;
       this.leases.delete(lease.leaseId);
-      this.unbindLease(lease);
+      this.unbindLease(lease, lease.expiresAt);
       const expiredLease = { ...lease };
       expired.push(expiredLease);
       this.onLeaseExpired?.(expiredLease);
@@ -390,7 +390,7 @@ export class LeaseRegistry {
     const lease = this.leases.get(normalizedLeaseId);
     if (!lease || lease.expiresAt > this.now()) return undefined;
     this.leases.delete(lease.leaseId);
-    this.unbindLease(lease);
+    this.unbindLease(lease, lease.expiresAt);
     const expiredLease = { ...lease };
     this.onLeaseExpired?.(expiredLease);
     return expiredLease;
@@ -473,7 +473,7 @@ export class LeaseRegistry {
     }
   }
 
-  private unbindLease(lease: DeviceLease): void {
+  private unbindLease(lease: DeviceLease, releasedAt = this.now()): void {
     this.runBindings.delete(
       this.bindingKey({
         tenantId: lease.tenantId,
@@ -487,7 +487,7 @@ export class LeaseRegistry {
     if (deviceBindingKey) {
       this.deviceBindings.delete(deviceBindingKey);
     }
-    this.providerSessionOwnership.markLeaseReleased(lease);
+    this.providerSessionOwnership.markLeaseReleased(lease, releasedAt);
   }
 
   private bindingKey(params: {

src/daemon/provider-session-ownership.ts

@@ -48,11 +48,14 @@ export class ProviderSessionOwnershipRegistry {
     this.records.set(this.key(provider, providerSessionId), ownership);
   }
 
-  markLeaseReleased(lease: Pick<DeviceLease, 'leaseId' | 'leaseProvider'>): void {
+  markLeaseReleased(
+    lease: Pick<DeviceLease, 'leaseId' | 'leaseProvider'>,
+    releasedAt = this.now(),
+  ): void {
     const provider = lease.leaseProvider?.trim();
     if (!provider) return;
     this.prune();
-    const retainedUntil = this.now() + this.retentionMs;
+    const retainedUntil = releasedAt + this.retentionMs;
     for (const [key, record] of this.records) {
       if (record.provider !== provider || record.leaseId !== lease.leaseId) continue;
       this.records.set(key, { ...record, retainedUntil });