@modelprofile.com/authswitch 9.0.0 → 9.2.0

package/ts/classes.authoritydaemon.ts

@@ -4,12 +4,13 @@ import type {
   IAuthSwitchDoctorPage, IReq_AuthSwitchDoctor,
   IReq_AuthSwitchBeginAdd, IReq_AuthSwitchBeginReauth, IReq_AuthSwitchCancelOperation,
   IReq_AuthSwitchClaudeNativeHandoff, IReq_AuthSwitchClaudeNativeHandoffs, IReq_AuthSwitchSwitchClaudeNative,
-  IReq_AuthSwitchEvents, IReq_AuthSwitchGetOperation, IReq_AuthSwitchListOperations, IReq_AuthSwitchRemoveAccount,
+  IReq_AuthSwitchEvents, IReq_AuthSwitchGetBinding, IReq_AuthSwitchGetOperation, IReq_AuthSwitchListOperations,
+  IReq_AuthSwitchRemoveAccount,
   IReq_AuthSwitchRenameAccount, IReq_AuthSwitchSnapshot,
   IReq_AuthSwitchCancelPreuse, IReq_AuthSwitchGetPreuse, IReq_AuthSwitchStartPreuse, IReq_AuthSwitchUsage,
 } from './authority-contract.js';
 import type { IReq_AuthSwitchBindAccount, IReq_AuthSwitchReleaseBinding,
-  IReq_AuthSwitchResolveAccess } from './authority-runtime-contract.js';
+  IReq_AuthSwitchResolveAccess, IReq_AuthSwitchUnbind } from './authority-runtime-contract.js';
 import { AuthSwitchRefusal } from './authority-contract.js';
 import type { IReq_AuthSwitchImportInventory, IReq_AuthSwitchImportStatus, IReq_AuthSwitchImportSubmit,
   TAuthSwitchImportSubmission } from './authority-import-contract.js';
@@ -39,6 +40,11 @@ export interface IAuthSwitchAuthorityDaemonOptions extends IAuthSwitchAuthorityD
   claudeNative?: IClaudeNativeAuthorityOptions;
   /** Where the one-time import reads the legacy stores, or `'none'`. Never derived from this host here. */
   legacyImport: TAuthSwitchAuthorityLegacyImport;
+  /**
+   * How long an accepted connection has to deliver its complete request, counted from its acceptance and
+   * never extended by the bytes it sends: 35 s unless stated.
+   */
+  requestDeliveryMs?: number;
 }
 
 /**
@@ -136,12 +142,19 @@ export class AuthSwitchAuthorityDaemon {
   private readonly runtimeBindingReleaseFences = new Set<string>();
   private readonly runtimeBindingReleases = new Map<string, Promise<IReq_AuthSwitchReleaseBinding['response']>>();
   private closing = false;
+  /** Every admitted request until its answer is written; shutdown settles these before it closes the store. */
+  private readonly inFlight = new Set<Promise<void>>();
+  private readonly requestDeliveryMs: number;
 
   constructor(private readonly options: IAuthSwitchAuthorityDaemonOptions) {
     // First, before anything is constructed: a daemon that was going to read the wrong host's credentials
     // must not come into existence at all. The type states it and this states it again, because a caller
     // without types is exactly the caller that would have defaulted here.
     assertStatedLegacyImport(options.legacyImport);
+    this.requestDeliveryMs = options.requestDeliveryMs ?? 35_000;
+    if (!Number.isSafeInteger(this.requestDeliveryMs) || this.requestDeliveryMs <= 0) {
+      throw new Error('Authswitch authority requestDeliveryMs must be a positive whole number of milliseconds.');
+    }
     this.database = new AuthSwitchAuthorityDatabase(options);
     const provider = options.broker?.provider ?? new plugins.flexAccounts.OpenAiProviderAdapter();
     this.broker = new AuthSwitchAuthorityBroker(this.database, { ...options.broker, provider });
@@ -182,8 +195,9 @@ export class AuthSwitchAuthorityDaemon {
     this.register();
   }
 
-  private runtimeBindingKey(bindingId: string, capability: string): string {
-    return `${bindingId}:${authSwitchBindingCapabilityHash(capability)}`;
+  /** One exact capability of one binding: what a release fences and what an access resolution holds open. */
+  private runtimeBindingKey(bindingId: string, capabilityHash: string): string {
+    return `${bindingId}:${capabilityHash}`;
   }
 
   private beginRuntimeBindingAccess(key: string): () => void {
@@ -210,8 +224,8 @@ export class AuthSwitchAuthorityDaemon {
   }
 
   private releaseRuntimeBinding(bindingId: string,
-    capability: string): Promise<IReq_AuthSwitchReleaseBinding['response']> {
-    const key = this.runtimeBindingKey(bindingId, capability);
+    capabilityHash: string): Promise<IReq_AuthSwitchReleaseBinding['response']> {
+    const key = this.runtimeBindingKey(bindingId, capabilityHash);
     const existing = this.runtimeBindingReleases.get(key);
     if (existing) return existing;
     // Capabilities are freshly random for every bind, including a successor that reuses the
@@ -219,7 +233,7 @@ export class AuthSwitchAuthorityDaemon {
     this.runtimeBindingReleaseFences.add(key);
     const task = (async (): Promise<IReq_AuthSwitchReleaseBinding['response']> => {
       await this.waitForRuntimeBindingAccess(key);
-      const state = await this.broker.releaseExternalBinding(bindingId, capability);
+      const state = await this.broker.releaseExternalCapability(bindingId, capabilityHash);
       this.runtimeBindingReleaseFences.delete(key);
       return { state };
     })();
@@ -279,8 +293,12 @@ export class AuthSwitchAuthorityDaemon {
   private handler<T extends ITypedRequest>(method: T['method'],
     run: plugins.typedrequest.THandlerFunction<T>): plugins.typedrequest.TypedHandler<T> {
     return new plugins.typedrequest.TypedHandler<T>(method, async (request, tools) => {
-      try { return await run(request, tools); }
-      catch (error) {
+      try {
+        // The one admission check: once shutdown begins no route starts work, and the requests already
+        // admitted are settled before the store closes.
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
+        return await run(request, tools);
+      } catch (error) {
         if (error instanceof AuthSwitchRefusal) {
           throw new plugins.typedrequest.TypedResponseError(error.message, error.data);
         }
@@ -297,7 +315,6 @@ export class AuthSwitchAuthorityDaemon {
           || Object.keys(request).some(key => !['accountId', 'loginId', 'force'].includes(key))
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
           || (request.force !== undefined && typeof request.force !== 'boolean')) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return { usage: await this.usage.get(request.accountId, request.loginId, request.force ?? false) };
       }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchSwitchClaudeNative>(
@@ -305,7 +322,6 @@ export class AuthSwitchAuthorityDaemon {
         if (!hasKeys(request, ['accountId', 'loginId', 'purpose'])
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
           || request.purpose !== 'claude_host_native') invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         if (!this.claudeNative) throw new AuthSwitchRefusal('claude_home_unregistered', 'Claude native handoff is unavailable.');
         return { handoff: await this.claudeNative.switchTo(request.accountId, request.loginId) };
       }));
@@ -326,7 +342,9 @@ export class AuthSwitchAuthorityDaemon {
       'authswitch.authority.snapshot', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)) invalid();
         const keys = Object.keys(request);
-        if (keys.some(key => !['accountAfter', 'loginAfter', 'bindingAfter', 'limit'].includes(key))) invalid();
+        if (keys.some(key => !['accountAfter', 'loginAfter', 'bindingAfter', 'nativeAssignmentAfter', 'limit',
+          'includeRemoved'].includes(key))
+          || (request.includeRemoved !== undefined && typeof request.includeRemoved !== 'boolean')) invalid();
         return { snapshot: await this.broker.snapshot(request) };
       }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchDoctor>(
@@ -346,7 +364,6 @@ export class AuthSwitchAuthorityDaemon {
         // believing a source does not exist.
         if (request === null || typeof request !== 'object' || Array.isArray(request)
           || Object.keys(request).length !== 0) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         if (!this.legacyImport) throw new AuthSwitchRefusal('import_refusal', legacyImportAbsent);
         return { inventory: await this.legacyImport.inventory() };
       }));
@@ -357,7 +374,6 @@ export class AuthSwitchAuthorityDaemon {
           || (request.after !== undefined && !validHash(request.after))
           || (request.limit !== undefined && (!Number.isSafeInteger(request.limit)
             || request.limit < 1 || request.limit > 128))) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         if (!this.legacyImport) throw new AuthSwitchRefusal('import_refusal', legacyImportAbsent);
         return { status: await this.legacyImport.status(request) };
       }));
@@ -370,7 +386,6 @@ export class AuthSwitchAuthorityDaemon {
       'authswitch.authority.add', async request => {
         if (!hasKeys(request, ['operationId', 'providerId', 'flow']) || typeof request.operationId !== 'string'
           || request.providerId !== 'openai' || request.flow !== 'device') invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return { operation: await this.broker.beginAddOpenAi(request.operationId) };
       }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchBeginReauth>(
@@ -379,13 +394,16 @@ export class AuthSwitchAuthorityDaemon {
           || typeof request.operationId !== 'string'
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
           || request.purpose !== 'openai_managed') invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return { operation: await this.beginReauthOpenAi(request) };
       }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchGetOperation>(
-      'authswitch.authority.operation', async request => {
-        if (!hasKeys(request, ['operationId']) || typeof request.operationId !== 'string') invalid();
-        return { operation: await this.broker.getOperation(request.operationId) };
+      'authswitch.authority.operation', async (request, tools) => {
+        const waits = hasKeys(request, ['operationId', 'afterRevision', 'waitMs']);
+        if ((!waits && !hasKeys(request, ['operationId'])) || typeof request.operationId !== 'string'
+          || (waits && (!Number.isSafeInteger(request.afterRevision) || request.afterRevision! < 0
+            || !Number.isSafeInteger(request.waitMs) || request.waitMs! < 0 || request.waitMs! > 30_000))) invalid();
+        return { operation: await this.broker.getOperation(request.operationId, waits
+          ? { afterRevision: request.afterRevision!, waitMs: request.waitMs! } : undefined, tools?.abortSignal) };
       }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchListOperations>(
       'authswitch.authority.operations', async request => {
@@ -407,7 +425,6 @@ export class AuthSwitchAuthorityDaemon {
           || typeof request.loginId !== 'string' || request.purpose !== 'openai_managed'
           || typeof request.prompt !== 'string'
           || (request.model !== undefined && typeof request.model !== 'string')) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         const reservation: IPreuseAccountReservation = { operationId: request.operationId };
         let ownsReservation = false;
         const release = (): void => {
@@ -450,6 +467,11 @@ export class AuthSwitchAuthorityDaemon {
           || typeof request.expectedRevision !== 'number' || typeof request.label !== 'string') invalid();
         return { account: await this.broker.renameAccount(request.accountId, request.expectedRevision, request.label) };
       }));
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchGetBinding>(
+      'authswitch.authority.binding', async request => {
+        if (!hasKeys(request, ['bindingId']) || !validBindingId(request.bindingId)) invalid();
+        return { binding: await this.broker.getBinding(request.bindingId) };
+      }));
     this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchRemoveAccount>(
       'authswitch.authority.remove', async request => {
         if (!hasKeys(request, ['accountId', 'expectedRevision']) || typeof request.accountId !== 'string'
@@ -471,6 +493,17 @@ export class AuthSwitchAuthorityDaemon {
           || typeof request.incarnationId !== 'string') invalid();
         return this.broker.bindAccount(request);
       }));
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchUnbind>(
+      'authswitch.authority.unbind', async request => {
+        if (!hasKeys(request, ['runtime', 'scopeId', 'incarnationId', 'expectedRevision'])
+          || !['flex', 'opencode', 'claude'].includes(request.runtime) || typeof request.scopeId !== 'string'
+          || typeof request.incarnationId !== 'string' || typeof request.expectedRevision !== 'number') invalid();
+        // The holder's own binding, found by the identity it bound under whatever its login's state; from
+        // here it is released exactly as its capability would release it.
+        const held = await this.broker.findHeldBinding(request);
+        if (!held) return { state: 'inactive' };
+        return this.releaseRuntimeBinding(held.bindingId, held.capabilityHash);
+      }));
     this.runtimeRouter.addTypedHandler(this.handler<IReq_AuthSwitchResolveAccess>(
       'authswitch.authority.resolveAccess', async request => {
         if ((typeof request !== 'object' || request === null || Array.isArray(request))
@@ -480,8 +513,8 @@ export class AuthSwitchAuthorityDaemon {
           || !validBindingId(request.bindingId) || !validBindingCapability(request.capability)
           || typeof request.minValidityMs !== 'number'
           || (request.rejectedGrantGeneration !== undefined && typeof request.rejectedGrantGeneration !== 'number')) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
-        const finish = this.beginRuntimeBindingAccess(this.runtimeBindingKey(request.bindingId, request.capability));
+        const finish = this.beginRuntimeBindingAccess(this.runtimeBindingKey(request.bindingId,
+          authSwitchBindingCapabilityHash(request.capability)));
         try {
           return await this.broker.resolveAccess(request.bindingId, request.capability, request.minValidityMs,
             request.rejectedGrantGeneration);
@@ -491,8 +524,7 @@ export class AuthSwitchAuthorityDaemon {
       'authswitch.authority.release', async request => {
         if (!hasKeys(request, ['bindingId', 'capability'])
           || !validBindingId(request.bindingId) || !validBindingCapability(request.capability)) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
-        return this.releaseRuntimeBinding(request.bindingId, request.capability);
+        return this.releaseRuntimeBinding(request.bindingId, authSwitchBindingCapabilityHash(request.capability));
       }));
     this.runtimeRouter.addTypedHandler(this.handler<IReq_AuthSwitchImportSubmit>(
       'authswitch.authority.import.submit', async request => {
@@ -500,14 +532,17 @@ export class AuthSwitchAuthorityDaemon {
         if (!hasKeys(request, ['submission', 'callerQuiescent', 'acknowledgeRunOrder'])
           || request.callerQuiescent !== true || request.acknowledgeRunOrder !== true
           || !validImportSubmission(request.submission)) invalid();
-        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         if (!this.legacyImport) throw new AuthSwitchRefusal('import_refusal', legacyImportAbsent);
         // An importer refusal is an `AuthSwitchRefusal` like every other, so the one conversion in
         // `handler()` marks it. What stays special is its meaning: an UNMARKED failure of this route
         // leaves the import outcome unknown, and the source must be read with `import.status` rather
         // than submitted again.
-        return { result: await this.legacyImport.submit({ submission: request.submission,
-          callerQuiescent: true, acknowledgeRunOrder: true }) };
+        // An import writes accounts, logins and native homes, also on a path that fails after a commit, so
+        // every outcome wakes the event readers; they read the committed revision themselves.
+        try {
+          return { result: await this.legacyImport.submit({ submission: request.submission,
+            callerQuiescent: true, acknowledgeRunOrder: true }) };
+        } finally { this.broker.notifyChanged(); }
       }));
   }
 
@@ -878,13 +913,24 @@ export class AuthSwitchAuthorityDaemon {
     await plugins.fs.promises.unlink(path);
   }
 
+  /**
+   * Serves one request on one connection. A connection's failure is its own: a client that went away before
+   * its answer -- EPIPE or a reset on the write, a read error -- only destroys that socket, and the close
+   * that follows aborts the request it had admitted. Nothing one client does can end the daemon.
+   *
+   * A connection has one deadline to deliver its complete request, `requestDeliveryMs` from acceptance, which
+   * no byte it sends extends: a client dripping a request slowly holds its connection no longer than one that
+   * sends nothing. Once admitted, the request runs until it answers or its client goes away: the client's own
+   * deadline governs, which may be longer than the delivery deadline.
+   */
   private accept(socket: plugins.net.Socket, router: plugins.typedrequest.TypedRouter): void {
     this.sockets.add(socket);
     const abort = new AbortController();
-    socket.on('close', () => { this.sockets.delete(socket); abort.abort(); });
+    const delivery = setTimeout(() => socket.destroy(), this.requestDeliveryMs);
+    socket.on('error', () => socket.destroy());
+    socket.on('close', () => { clearTimeout(delivery); this.sockets.delete(socket); abort.abort(); });
     const frame = new AuthSwitchAuthorityFrameReader();
     let handled = false;
-    socket.setTimeout(35_000, () => socket.destroy());
     socket.on('data', chunk => {
       if (handled) { socket.destroy(); return; }
       if (!Buffer.isBuffer(chunk)) { socket.destroy(); return; }
@@ -893,19 +939,29 @@ export class AuthSwitchAuthorityDaemon {
       catch { socket.destroy(); return; }
       if (input === null) return;
       handled = true;
+      clearTimeout(delivery);
       let request: ITypedRequest;
       try { request = JSON.parse(input) as ITypedRequest; }
       catch { socket.destroy(); return; }
-      void router.routeAndAddResponse(request, { trustedLocalData: { authoritySocket: socket },
+      const answered: Promise<void> = router.routeAndAddResponse(request, { trustedLocalData: { authoritySocket: socket },
         trustedAbortSignal: abort.signal })
-        .then(response => {
+        .then(async response => {
+          // A client that is already gone is owed no answer.
+          if (!socket.writable) return;
           const raw = JSON.stringify(response);
           if (authSwitchAuthorityFrameBytes(raw) > maxAuthSwitchAuthorityFrameBytes) { socket.destroy(); return; }
-          socket.end(raw + '\n');
-        }).catch(() => socket.destroy());
+          await new Promise<void>(resolve => socket.end(raw + '\n', () => resolve()));
+        }).catch(() => { socket.destroy(); })
+        .finally(() => { this.inFlight.delete(answered); });
+      this.inFlight.add(answered);
     });
   }
 
+  /**
+   * Stops admitting work -- the sockets keep listening so every new request is answered `authority_closing`
+   * -- settles everything already admitted, a waiting `events` or operation read being woken by the broker and
+   * answering from the still-open store, and only then closes the sockets and the store.
+   */
   public async close(): Promise<void> {
     this.closing = true;
     const errors: unknown[] = [];
@@ -923,6 +979,8 @@ export class AuthSwitchAuthorityDaemon {
     try { await this.usage.close(); } catch (error) { errors.push(error); }
     try { await this.broker.close(); } catch (error) { errors.push(error); }
     if (this.claudeNative) try { await this.claudeNative.close(); } catch (error) { errors.push(error); }
+    // A request that arrives meanwhile is refused at admission and joins this set; none of those reads the store.
+    while (this.inFlight.size) await Promise.allSettled([...this.inFlight]);
     const management = this.managementServer;
     const runtime = this.runtimeServer;
     this.managementServer = undefined;

package/ts/classes.authoritydatabase.ts

@@ -56,6 +56,11 @@ const sameUsageSource = (left: IAuthSwitchUsageContext, right: IAuthSwitchUsageC
       && left.nativeSource.credentialDigest === right.nativeSource.credentialDigest
       && left.nativeSource.configDigest === right.nativeSource.configDigest
       && left.nativeSource.accessTokenDigest === right.nativeSource.accessTokenDigest);
+/**
+ * Runtime bindings whose holder releases them over the runtime socket. Managed Codex bindings are the daemon's:
+ * the daemon closes that runtime and clears its durable run before it revokes the binding itself.
+ */
+const callerReleasedRuntimes: readonly IStoredAuthorityBinding['runtime'][] = ['flex', 'opencode', 'claude'];
 const storedOperation = (stored: Parameters<typeof AuthSwitchAuthorityOperationModel.exact.toPersisted>[0]): IStoredAuthorityOperation => {
   const operation = AuthSwitchAuthorityOperationModel.exact.toPersisted(stored);
   assertStoredAuthorityOperation(operation);
@@ -67,6 +72,7 @@ export class AuthSwitchAuthorityDatabase {
   private engine?: plugins.nosqldbEngine.LocalNoSqlDb;
   private database?: plugins.nosqldb.SmartdataDb;
   private started = false;
+  private readonly deviceOperationObservers = new Set<(operationId: string) => void>();
 
   constructor(private readonly options: IAuthSwitchAuthorityDatabaseOptions) {}
 
@@ -284,6 +290,20 @@ export class AuthSwitchAuthorityDatabase {
     return stored ? AuthSwitchAuthorityMigrationLedgerModel.exact.toPersisted(stored) : null;
   }
 
+  /**
+   * Calls `observer` with the id of every device sign-in this database writes, after the write committed or
+   * was proven. The writers below are the only ones, so an observer misses no change; it runs synchronously
+   * and must only wake a reader. Returns the unsubscribe.
+   */
+  public observeDeviceOperations(observer: (operationId: string) => void): () => void {
+    this.deviceOperationObservers.add(observer);
+    return () => { this.deviceOperationObservers.delete(observer); };
+  }
+
+  private deviceOperationChanged(operationId: string): void {
+    for (const observer of this.deviceOperationObservers) observer(operationId);
+  }
+
   public async readOperation(id: string): Promise<IStoredAuthorityOperation | null> {
     this.db();
     const stored = await AuthSwitchAuthorityOperationModel.exact.findStoredOne({ id });
@@ -339,7 +359,7 @@ export class AuthSwitchAuthorityDatabase {
       && current.accountId === intent.accountId && current.grantId === intent.grantId
       && current.purpose === intent.purpose;
     try {
-      return await this.transaction(async session => {
+      const admitted = await this.transaction(async session => {
         const existingStored = await AuthSwitchAuthorityOperationModel.exact.findStoredOne(
           { id: intent.id }, { session });
         if (existingStored) {
@@ -369,11 +389,15 @@ export class AuthSwitchAuthorityDatabase {
         if (result.status !== 'inserted') throw new Error('Account operation ID already exists.');
         return { operation, created: true };
       });
+      if (admitted.created) this.deviceOperationChanged(intent.id);
+      return admitted;
     } catch (error) {
       if (!(error instanceof plugins.nosqldb.SmartdataExactPersistenceError) || error.code !== 'ambiguous_write') throw error;
       const stored = await this.readOperation(intent.id);
       if (stored && sameRequest(stored)) {
-        return { operation: stored, created: stored.updateId === intent.updateId };
+        const created = stored.updateId === intent.updateId;
+        if (created) this.deviceOperationChanged(intent.id);
+        return { operation: stored, created };
       }
       throw new Error('Account operation creation outcome is unknown; no provider login was started.');
     }
@@ -435,11 +459,15 @@ export class AuthSwitchAuthorityDatabase {
         current: stored, change: model => Object.assign(model, draft),
       });
       if (result.status !== 'transitioned') throw new Error('Account operation changed concurrently.');
+      this.deviceOperationChanged(operationId);
       return draft;
     } catch (error) {
       if (!(error instanceof plugins.nosqldb.SmartdataExactPersistenceError) || error.code !== 'ambiguous_write') throw error;
       const stored = await this.readOperation(operationId);
-      if (stored?.kind !== 'preuse_openai' && stored?.updateId === updateId) return stored;
+      if (stored?.kind !== 'preuse_openai' && stored?.updateId === updateId) {
+        this.deviceOperationChanged(operationId);
+        return stored;
+      }
       throw new Error('Account operation transition outcome is unknown.');
     }
   }
@@ -742,10 +770,16 @@ export class AuthSwitchAuthorityDatabase {
     }
   }
 
-  public async page(accountAfter: string | null, grantAfter: string | null, bindingAfter: string | null, limit: number): Promise<{
+  /**
+   * One repeatable-read page of the published authority state. Native homes are part of it: every write that
+   * changes which account a home runs on appends an account event, so the metadata revision covers them.
+   */
+  public async page(accountAfter: string | null, grantAfter: string | null, bindingAfter: string | null,
+    claudeHomeAfter: string | null, limit: number): Promise<{
     meta: IStoredAuthorityMeta; accounts: IStoredAuthorityAccount[]; grants: IStoredAuthorityGrant[];
-    bindings: IStoredAuthorityBinding[];
+    bindings: IStoredAuthorityBinding[]; claudeHomes: IStoredAuthorityClaudeHome[];
     nextAccountCursor: string | null; nextGrantCursor: string | null; nextBindingCursor: string | null;
+    nextClaudeHomeCursor: string | null;
   }> {
     if (!Number.isSafeInteger(limit) || limit < 1 || limit > 256) throw new Error('Invalid authority page size.');
     return this.transaction(async session => {
@@ -763,15 +797,21 @@ export class AuthSwitchAuthorityDatabase {
         filter: bindingAfter ? { id: { $gt: bindingAfter } } : {},
         sort: { id: 1 }, limit: limit + 1, session,
       });
+      const claudeHomes = await AuthSwitchAuthorityClaudeHomeModel.exact.findStored({
+        filter: claudeHomeAfter ? { id: { $gt: claudeHomeAfter } } : {},
+        sort: { id: 1 }, limit: limit + 1, session,
+      });
       const accountPage = accounts.slice(0, limit).map(item => AuthSwitchAuthorityAccountModel.exact.toPersisted(item));
       const grantPage = grants.slice(0, limit).map(item => AuthSwitchAuthorityGrantModel.exact.toPersisted(item));
       const bindingPage = bindings.slice(0, limit).map(item => AuthSwitchAuthorityBindingModel.exact.toPersisted(item));
+      const claudeHomePage = claudeHomes.slice(0, limit).map(item => AuthSwitchAuthorityClaudeHomeModel.exact.toPersisted(item));
       return {
         meta: AuthSwitchAuthorityMetaModel.exact.toPersisted(meta),
-        accounts: accountPage, grants: grantPage, bindings: bindingPage,
+        accounts: accountPage, grants: grantPage, bindings: bindingPage, claudeHomes: claudeHomePage,
         nextAccountCursor: accounts.length > limit ? accountPage.at(-1)!.id : null,
         nextGrantCursor: grants.length > limit ? grantPage.at(-1)!.id : null,
         nextBindingCursor: bindings.length > limit ? bindingPage.at(-1)!.id : null,
+        nextClaudeHomeCursor: claudeHomes.length > limit ? claudeHomePage.at(-1)!.id : null,
       };
     });
   }
@@ -1013,7 +1053,7 @@ export class AuthSwitchAuthorityDatabase {
       account: IStoredAuthorityAccount; grant: IStoredAuthorityGrant;
     }): Promise<{ account: IStoredAuthorityAccount; grant: IStoredAuthorityGrant; operation: IStoredAuthorityDeviceOperation }> {
     try {
-      return await this.transaction(async session => {
+      const committed = await this.transaction(async session => {
         const metaStored = await AuthSwitchAuthorityMetaModel.exact.findStoredOne({ id: 'authswitch-authority' }, { session });
         const operationStored = await AuthSwitchAuthorityOperationModel.exact.findStoredOne({ id: operationId }, { session });
         if (!metaStored || !operationStored) throw new Error('Device operation is unavailable.');
@@ -1061,6 +1101,8 @@ export class AuthSwitchAuthorityDatabase {
           updateId, 'account', accountId);
         return { ...draft, operation: completed };
       });
+      this.deviceOperationChanged(operationId);
+      return committed;
     } catch (error) {
       if (!(error instanceof plugins.nosqldb.SmartdataExactPersistenceError) || error.code !== 'ambiguous_write') throw error;
       const [event, operation, pair] = await Promise.all([
@@ -1070,6 +1112,7 @@ export class AuthSwitchAuthorityDatabase {
       if (event && operation?.kind !== 'preuse_openai' && operation?.state === 'complete' && operation.updateId === updateId
         && pair.account?.updateId === updateId && pair.grant?.updateId === updateId
         && operation.result?.accountId === accountId && operation.result.grantId === grantId) {
+        this.deviceOperationChanged(operationId);
         return { account: pair.account, grant: pair.grant, operation };
       }
       throw new Error('Device login commit outcome is unknown; inspect the durable operation before retrying.');
@@ -1163,7 +1206,11 @@ export class AuthSwitchAuthorityDatabase {
     }
   }
 
-  /** Remove all managed grants in one transaction; native owners must be stopped and handed off first. */
+  /**
+   * Remove all managed grants in one transaction. Native owners must be stopped and handed off first, and a
+   * runtime binding its holder releases must be released first; the daemon's own managed Codex bindings go
+   * with the account.
+   */
   public async removeAccountAndGrants(updateId: string, accountId: string,
     expectedRevision: number, statusObservedAt: string): Promise<IStoredAuthorityAccount> {
     try {
@@ -1199,6 +1246,29 @@ export class AuthSwitchAuthorityDatabase {
             throw new AuthSwitchRefusal('claude_handoff_pending', 'Resolve the Claude native handoff before removing this account.');
           }
         });
+        // A runtime the caller holds is released by the caller, which stops that runtime first; removing the
+        // account under it would strand a runtime whose next access fails. Managed Codex bindings are the
+        // daemon's own, and the daemon has proven their runs gone before it asks for this removal.
+        const heldRuntimes = new Set<string>();
+        let heldAfter: string | null = null;
+        while (true) {
+          const bindings = await AuthSwitchAuthorityBindingModel.exact.findStored({
+            filter: heldAfter ? { accountId, id: { $gt: heldAfter } } : { accountId },
+            sort: { id: 1 }, limit: 128, session,
+          });
+          for (const binding of bindings) {
+            if (callerReleasedRuntimes.includes(binding.runtime)) heldRuntimes.add(binding.runtime);
+          }
+          if (bindings.length < 128) break;
+          heldAfter = bindings.at(-1)!.id;
+        }
+        if (heldRuntimes.size) {
+          const names = [...heldRuntimes].sort();
+          const listed = names.length === 1 ? names[0] : `${names.slice(0, -1).join(', ')} and ${names.at(-1)}`;
+          throw new AuthSwitchRefusal('account_busy', `This account still backs ${listed} runtime bindings. `
+            + 'Stop those runtimes and release their bindings before removing the account. A holder that lost '
+            + 'its capability unbinds its own runtime and scope instead, which needs no sign-in.');
+        }
         await scan(async (grant, stored) => {
           if (grant.state === 'removed') return;
           const draft: IStoredAuthorityGrant = {
@@ -1278,9 +1348,16 @@ export class AuthSwitchAuthorityDatabase {
     }
   }
 
+  /**
+   * Binds a runtime and scope, or rebinds them. The binding's revision is the authority revision of the event
+   * that writes it, handed to `change` as `revision`: the authority revision never repeats, so no two binds of
+   * a runtime and scope ever share one -- not even across a release, which deletes the record, followed by a
+   * bind that inserts it again -- and a holder that names a binding by the revision it read never names its
+   * successor. Records written before carry smaller revisions, which a later bind therefore still exceeds.
+   */
   public async changeBinding(updateId: string, bindingId: string, accountId: string, grantId: string,
     change: (draft: IStoredAuthorityBinding | null, account: IStoredAuthorityAccount,
-      grant: IStoredAuthorityGrant | null) => IStoredAuthorityBinding): Promise<{
+      grant: IStoredAuthorityGrant | null, revision: number) => IStoredAuthorityBinding): Promise<{
       meta: IStoredAuthorityMeta; binding: IStoredAuthorityBinding;
     }> {
     try {
@@ -1292,8 +1369,11 @@ export class AuthSwitchAuthorityDatabase {
         const grantStored = await AuthSwitchAuthorityGrantModel.exact.findStoredOne({ id: grantId }, { session });
         const grant = grantStored ? AuthSwitchAuthorityGrantModel.exact.toPersisted(grantStored) : null;
         const current = await AuthSwitchAuthorityBindingModel.exact.findStoredOne({ id: bindingId }, { session });
-        const draft = change(current ? structuredClone(AuthSwitchAuthorityBindingModel.exact.toPersisted(current)) : null, account, grant);
-        if (draft.id !== bindingId || draft.accountId !== accountId || draft.updateId !== updateId) throw new Error('Binding change has an invalid identity.');
+        const revision = metaStored.revision + 1;
+        const draft = change(current ? structuredClone(AuthSwitchAuthorityBindingModel.exact.toPersisted(current)) : null,
+          account, grant, revision);
+        if (draft.id !== bindingId || draft.accountId !== accountId || draft.updateId !== updateId
+          || draft.revision !== revision) throw new Error('Binding change has an invalid identity.');
         if (draft.grantId !== grantId || grant?.accountId !== accountId) {
           throw new Error('Binding login does not belong to the account.');
         }
@@ -1331,7 +1411,7 @@ export class AuthSwitchAuthorityDatabase {
         if (!metaStored) throw new Error('Authswitch authority metadata is missing.');
         const current = await AuthSwitchAuthorityBindingModel.exact.findStoredOne({ id: bindingId }, { session });
         if (!current || current.capabilityHash !== capabilityHash
-          || (externalOnly && !['flex', 'opencode'].includes(current.runtime))) return false;
+          || (externalOnly && !callerReleasedRuntimes.includes(current.runtime))) return false;
         const result = await AuthSwitchAuthorityBindingModel.exact.delete({ current }, { session });
         if (result.status !== 'deleted') throw new Error('Runtime binding changed during revocation.');
         await this.appendEvent(session, AuthSwitchAuthorityMetaModel.exact.toPersisted(metaStored),
@@ -1354,7 +1434,7 @@ export class AuthSwitchAuthorityDatabase {
     return this.revokeBindingExact(updateId, bindingId, capabilityHash, false);
   }
 
-  /** External callers can release only Flex/OpenCode bindings; managed Codex cleanup stays daemon-owned. */
+  /** External callers release only Flex, OpenCode and Claude bindings; managed Codex cleanup stays daemon-owned. */
   public releaseExternalBinding(updateId: string, bindingId: string, capabilityHash: string): Promise<boolean> {
     return this.revokeBindingExact(updateId, bindingId, capabilityHash, true);
   }
@@ -1579,15 +1659,21 @@ export class AuthSwitchAuthorityDatabase {
           activeGrantId: grantId, pendingOperationId: null, status: 'ready', revision: 1,
           createdAt: input.now, updateId };
         assertStoredAuthorityClaudeHome(home);
+        const metaStored = await AuthSwitchAuthorityMetaModel.exact.findStoredOne({ id: 'authswitch-authority' }, { session });
+        if (!metaStored) throw new Error('Authswitch authority metadata is missing.');
         const inserted = await AuthSwitchAuthorityClaudeHomeModel.exact.insert(home, { session });
         if (inserted.status !== 'inserted') throw new Error('Claude native home changed concurrently.');
+        // The snapshot publishes which account this home runs on, so registering it is an account change.
+        await this.appendEvent(session, AuthSwitchAuthorityMetaModel.exact.toPersisted(metaStored),
+          updateId, 'account', accountId);
         return home;
       });
     } catch (error) {
       if (!(error instanceof plugins.nosqldb.SmartdataExactPersistenceError)
         || !['ambiguous_write', 'unique_conflict'].includes(error.code)) throw error;
       const home = await this.readClaudeHome(homeId);
-      if (home?.updateId === updateId && home.activeAccountId === accountId && home.activeGrantId === grantId) return home;
+      if (home?.updateId === updateId && home.activeAccountId === accountId && home.activeGrantId === grantId
+        && await AuthSwitchAuthorityEventModel.exact.findStoredOne({ id: updateId })) return home;
       // One grant, one home: the unique index refused a second home for a login another one already holds.
       if (error.code === 'unique_conflict') {
         throw new AuthSwitchRefusal('import_refusal',

package/ts/classes.authorityimport.ts

@@ -347,7 +347,7 @@ export class AuthSwitchAuthorityImport {
       const grant = row.grantId === null ? null : await this.database.readGrant(row.grantId);
       const handoff = await this.database.readHandoff(importHandoffId(row.id));
       entries.push({
-        sourceId: row.id, sourceKind: row.sourceKind, status: row.status,
+        sourceId: row.id, sourceKind: row.sourceKind, sourcePathHash: row.sourcePathHash, status: row.status,
         accountId: row.accountId, loginId: row.grantId, owner: grant?.owner ?? null,
         action: importAction(row.status, handoff), statusObservedAt: row.statusObservedAt,
       });

package/ts/classes.authoritymodels.ts

@@ -444,7 +444,10 @@ export const assertStoredAuthorityGrant: (value: unknown) => asserts value is IS
     throw new Error('Claude handoff grant has incompatible custody.');
   }
   if (value.purpose === 'openai_managed' && value.providerId !== 'openai') throw new Error('OpenAI grant provider mismatch.');
-  if (value.purpose === 'claude_container_setup' && value.owner === 'claude_native') throw new Error('Container setup grant has a native host owner.');
+  // No native tool refreshes a container setup token: the authority holds it, or nobody does.
+  if (value.purpose === 'claude_container_setup' && value.owner !== 'daemon' && value.owner !== 'none') {
+    throw new Error('Container setup grant has a native owner.');
+  }
 };
 
 export const assertStoredAuthorityBinding: (value: unknown) => asserts value is IStoredAuthorityBinding = value => {