@modelprofile.com/authswitch 8.0.0 → 8.2.0

package/ts/classes.authoritydaemon.ts

@@ -10,6 +10,11 @@ import type {
 } from './authority-contract.js';
 import type { IReq_AuthSwitchBindAccount, IReq_AuthSwitchReleaseBinding,
   IReq_AuthSwitchResolveAccess } 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';
+import { AuthSwitchAuthorityImport,
+  type IAuthSwitchAuthorityImportOptions } from './classes.authorityimport.js';
 import { authSwitchBindingCapabilityHash, AuthSwitchAuthorityBroker,
   type IAuthSwitchAuthorityBrokerOptions } from './classes.authoritybroker.js';
 import { AuthSwitchAuthorityDatabase, type IAuthSwitchAuthorityDatabaseOptions } from './classes.authoritydatabase.js';
@@ -32,15 +37,41 @@ export interface IAuthSwitchAuthorityDaemonOptions extends IAuthSwitchAuthorityD
   claudeStatus?: ClaudeAccountStatus;
   /** Activated only after a verified backend source receipt has registered the native home. */
   claudeNative?: IClaudeNativeAuthorityOptions;
+  /** Where the one-time import reads the legacy stores. Defaults to this user's own locations. */
+  legacyImport?: IAuthSwitchAuthorityImportOptions;
 }
 
 const hasKeys = (value: unknown, keys: readonly string[]): value is Record<string, unknown> =>
   value !== null && typeof value === 'object' && !Array.isArray(value)
   && Object.keys(value).length === keys.length && keys.every(key => Object.hasOwn(value, key));
+// A malformed request is a caller's own bug, not an instruction for an owner, so it stays what it was:
+// its own text, no refusal marker. A client must not present it as something the owner can act on.
 const invalid = (): never => { throw new plugins.typedrequest.TypedResponseError('Invalid authswitch authority request.'); };
 const validBindingId = (value: unknown): value is string => typeof value === 'string' && /^[a-f0-9]{64}$/.test(value);
 const validBindingCapability = (value: unknown): value is string => typeof value === 'string'
   && /^[A-Za-z0-9_-]{43}$/.test(value);
+const validHash = (value: unknown): value is string => typeof value === 'string'
+  && /^[a-f0-9]{64}$/.test(value);
+const boundedToken = (value: unknown): value is string => typeof value === 'string'
+  && value.length > 0 && value.length <= 8192;
+
+/** A submission names a local source by id and digest, or carries one external store's own login. */
+const validImportSubmission = (value: unknown): value is TAuthSwitchImportSubmission => {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) return false;
+  const submission = value as Record<string, unknown>;
+  if (submission.kind === 'local') {
+    return hasKeys(submission, ['kind', 'sourceId', 'sourceDigest'])
+      && validHash(submission.sourceId) && validHash(submission.sourceDigest);
+  }
+  if (submission.kind !== 'external'
+    || !hasKeys(submission, ['kind', 'sourceKind', 'sourcePathHash', 'sourceDigest', 'credential'])
+    || submission.sourceKind !== 'agl_flex' || !validHash(submission.sourcePathHash)
+    || !validHash(submission.sourceDigest)) return false;
+  const credential = submission.credential;
+  return hasKeys(credential, ['providerId', 'accessToken', 'refreshToken', 'idToken'])
+    && credential.providerId === 'openai' && boundedToken(credential.accessToken)
+    && boundedToken(credential.refreshToken) && boundedToken(credential.idToken);
+};
 
 interface IPreuseAccountReservation {
   operationId: string;
@@ -52,6 +83,7 @@ export class AuthSwitchAuthorityDaemon {
   public readonly broker: AuthSwitchAuthorityBroker;
   public readonly usage: AuthSwitchAuthorityUsage;
   public readonly preuse: AuthSwitchAuthorityPreuse;
+  public readonly legacyImport: AuthSwitchAuthorityImport;
   public readonly claudeNative?: ClaudeNativeAuthority;
   private readonly managementRouter = new plugins.typedrequest.TypedRouter();
   private readonly runtimeRouter = new plugins.typedrequest.TypedRouter();
@@ -102,6 +134,7 @@ export class AuthSwitchAuthorityDaemon {
       provider,
     });
     this.preuse = new AuthSwitchAuthorityPreuse(this.database, this.broker, options.preuse);
+    this.legacyImport = new AuthSwitchAuthorityImport(this.database, options.legacyImport);
     if (options.claudeNative) {
       this.claudeNative = new ClaudeNativeAuthority(this.database, {
         ...options.claudeNative, onChanged: () => this.broker.notifyChanged(),
@@ -171,7 +204,7 @@ export class AuthSwitchAuthorityDaemon {
     const prepare = async (): Promise<void> => {
       if (this.closing || this.drainingAccounts.has(request.accountId)
         || this.preuseAccounts.has(request.accountId)) {
-        throw new Error('Account runtime drain is already in progress.');
+        throw new AuthSwitchRefusal('account_busy', 'Account runtime drain is already in progress.');
       }
       this.drainingAccounts.add(request.accountId);
       this.deviceDrainOwners.set(request.accountId, request.operationId);
@@ -198,46 +231,67 @@ export class AuthSwitchAuthorityDaemon {
     });
   }
 
+  /**
+   * One handler, with the only place a refusal becomes a marked answer.
+   *
+   * Both routers register through here, so a handler states its refusal by throwing `AuthSwitchRefusal`
+   * and never touches the wire shape; anything else it throws stays the transport's sanitised fault,
+   * which is what keeps "the outcome is unknown" distinguishable from "here is what to do instead".
+   */
+  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) {
+        if (error instanceof AuthSwitchRefusal) {
+          throw new plugins.typedrequest.TypedResponseError(error.message, error.data);
+        }
+        throw error;
+      }
+    });
+  }
+
   private register(): void {
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchUsage>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchUsage>(
       'authswitch.authority.usage', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)
           || !Object.hasOwn(request, 'accountId') || !Object.hasOwn(request, 'loginId')
           || 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 Error('Authswitch authority is closing.');
+        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(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchSwitchClaudeNative>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchSwitchClaudeNative>(
       'authswitch.authority.claude.switch', async request => {
         if (!hasKeys(request, ['accountId', 'loginId', 'purpose'])
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
           || request.purpose !== 'claude_host_native') invalid();
-        if (this.closing || !this.claudeNative) throw new Error('Claude native handoff is unavailable.');
+        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) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchClaudeNativeHandoff>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchClaudeNativeHandoff>(
       'authswitch.authority.claude.handoff', async request => {
         if (!hasKeys(request, ['operationId']) || typeof request.operationId !== 'string') invalid();
-        if (!this.claudeNative) throw new Error('Claude native handoff is unavailable.');
+        if (!this.claudeNative) throw new AuthSwitchRefusal('claude_home_unregistered', 'Claude native handoff is unavailable.');
         return { handoff: await this.claudeNative.getHandoff(request.operationId) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchClaudeNativeHandoffs>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchClaudeNativeHandoffs>(
       'authswitch.authority.claude.handoffs', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)
           || Object.keys(request).some(key => !['after', 'limit'].includes(key))) invalid();
-        if (!this.claudeNative) throw new Error('Claude native handoff is unavailable.');
+        if (!this.claudeNative) throw new AuthSwitchRefusal('claude_home_unregistered', 'Claude native handoff is unavailable.');
         return this.claudeNative.listHandoffs(request.after ?? null, request.limit ?? 128);
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchSnapshot>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchSnapshot>(
       '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();
         return { snapshot: await this.broker.snapshot(request) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchDoctor>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchDoctor>(
       'authswitch.authority.doctor', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)) invalid();
         const cursorKeys = ['accountAfter', 'loginAfter', 'codexHomeAfter', 'claudeHomeAfter',
@@ -248,44 +302,63 @@ export class AuthSwitchAuthorityDaemon {
             || request.limit < 1 || request.limit > 128))) invalid();
         return { page: await this.doctorPage(request) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchEvents>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchImportInventory>(
+      'authswitch.authority.import.inventory', async request => {
+        // A read with no parameters: the inventory is the whole host, and a caller cannot narrow it into
+        // 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.');
+        return { inventory: await this.legacyImport.inventory() };
+      }));
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchImportStatus>(
+      'authswitch.authority.import.status', async request => {
+        if (request === null || typeof request !== 'object' || Array.isArray(request)
+          || Object.keys(request).some(key => !['after', 'limit'].includes(key))
+          || (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.');
+        return { status: await this.legacyImport.status(request) };
+      }));
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchEvents>(
       'authswitch.authority.events', async (request, tools) => {
         if (!hasKeys(request, ['epoch', 'afterRevision', 'waitMs'])) invalid();
         return this.broker.events(request.epoch, request.afterRevision, request.waitMs, tools?.abortSignal);
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchBeginAdd>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchBeginAdd>(
       '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 Error('Authswitch authority is closing.');
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return { operation: await this.broker.beginAddOpenAi(request.operationId) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchBeginReauth>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchBeginReauth>(
       'authswitch.authority.reauth', async request => {
         if (!hasKeys(request, ['operationId', 'accountId', 'loginId', 'purpose', 'flow']) || request.flow !== 'device'
           || typeof request.operationId !== 'string'
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
           || request.purpose !== 'openai_managed') invalid();
-        if (this.closing) throw new Error('Authswitch authority is closing.');
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return { operation: await this.beginReauthOpenAi(request) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchGetOperation>(
+    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) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchListOperations>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchListOperations>(
       'authswitch.authority.operations', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)
           || Object.keys(request).some(key => !['after', 'limit'].includes(key))) invalid();
         return this.broker.listOperations(request.after ?? null, request.limit ?? 128);
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchCancelOperation>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchCancelOperation>(
       'authswitch.authority.cancel', async request => {
         if (!hasKeys(request, ['operationId']) || typeof request.operationId !== 'string') invalid();
         return { operation: await this.broker.cancelOperation(request.operationId) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchStartPreuse>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchStartPreuse>(
       'authswitch.authority.preuse.start', async request => {
         if (request === null || typeof request !== 'object' || Array.isArray(request)
           || !['operationId', 'accountId', 'loginId', 'purpose', 'prompt'].every(key => Object.hasOwn(request, key))
@@ -294,7 +367,7 @@ 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 Error('Authswitch authority is closing.');
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         const reservation: IPreuseAccountReservation = { operationId: request.operationId };
         let ownsReservation = false;
         const release = (): void => {
@@ -321,28 +394,28 @@ export class AuthSwitchAuthorityDaemon {
           throw error;
         }
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchGetPreuse>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchGetPreuse>(
       'authswitch.authority.preuse.operation', async request => {
         if (!hasKeys(request, ['operationId']) || typeof request.operationId !== 'string') invalid();
         return { operation: await this.preuse.get(request.operationId) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchCancelPreuse>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchCancelPreuse>(
       'authswitch.authority.preuse.cancel', async request => {
         if (!hasKeys(request, ['operationId']) || typeof request.operationId !== 'string') invalid();
         return { operation: await this.preuse.cancel(request.operationId) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchRenameAccount>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchRenameAccount>(
       'authswitch.authority.rename', async request => {
         if (!hasKeys(request, ['accountId', 'expectedRevision', 'label']) || typeof request.accountId !== 'string'
           || typeof request.expectedRevision !== 'number' || typeof request.label !== 'string') invalid();
         return { account: await this.broker.renameAccount(request.accountId, request.expectedRevision, request.label) };
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchRemoveAccount>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchRemoveAccount>(
       'authswitch.authority.remove', async request => {
         if (!hasKeys(request, ['accountId', 'expectedRevision']) || typeof request.accountId !== 'string'
           || typeof request.expectedRevision !== 'number') invalid();
         if (this.drainingAccounts.has(request.accountId) || this.preuseAccounts.has(request.accountId)) {
-          throw new Error('Account runtime drain is already in progress.');
+          throw new AuthSwitchRefusal('account_busy', 'Account runtime drain is already in progress.');
         }
         this.drainingAccounts.add(request.accountId);
         try {
@@ -350,7 +423,7 @@ export class AuthSwitchAuthorityDaemon {
           return { account: await this.broker.removeAccount(request.accountId, request.expectedRevision) };
         } finally { this.drainingAccounts.delete(request.accountId); }
       }));
-    this.managementRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchBindAccount>(
+    this.managementRouter.addTypedHandler(this.handler<IReq_AuthSwitchBindAccount>(
       'authswitch.authority.bind', async request => {
         if (!hasKeys(request, ['accountId', 'loginId', 'purpose', 'runtime', 'scopeId', 'incarnationId'])
           || typeof request.accountId !== 'string' || typeof request.loginId !== 'string'
@@ -358,7 +431,7 @@ export class AuthSwitchAuthorityDaemon {
           || typeof request.incarnationId !== 'string') invalid();
         return this.broker.bindAccount(request);
       }));
-    this.runtimeRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchResolveAccess>(
+    this.runtimeRouter.addTypedHandler(this.handler<IReq_AuthSwitchResolveAccess>(
       'authswitch.authority.resolveAccess', async request => {
         if ((typeof request !== 'object' || request === null || Array.isArray(request))
           || !['bindingId', 'capability', 'minValidityMs'].every(key => Object.hasOwn(request, key))
@@ -367,20 +440,34 @@ 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 Error('Authswitch authority is closing.');
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         const finish = this.beginRuntimeBindingAccess(this.runtimeBindingKey(request.bindingId, request.capability));
         try {
           return await this.broker.resolveAccess(request.bindingId, request.capability, request.minValidityMs,
             request.rejectedGrantGeneration);
         } finally { finish(); }
       }));
-    this.runtimeRouter.addTypedHandler(new plugins.typedrequest.TypedHandler<IReq_AuthSwitchReleaseBinding>(
+    this.runtimeRouter.addTypedHandler(this.handler<IReq_AuthSwitchReleaseBinding>(
       'authswitch.authority.release', async request => {
         if (!hasKeys(request, ['bindingId', 'capability'])
           || !validBindingId(request.bindingId) || !validBindingCapability(request.capability)) invalid();
-        if (this.closing) throw new Error('Authswitch authority is closing.');
+        if (this.closing) throw new AuthSwitchRefusal('authority_closing', 'Authswitch authority is closing.');
         return this.releaseRuntimeBinding(request.bindingId, request.capability);
       }));
+    this.runtimeRouter.addTypedHandler(this.handler<IReq_AuthSwitchImportSubmit>(
+      'authswitch.authority.import.submit', async request => {
+        // Backend-only: an external submission carries the material of a store this package cannot read.
+        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.');
+        // 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 }) };
+      }));
   }
 
   private async doctorPage(request: IReq_AuthSwitchDoctor['request']): Promise<IAuthSwitchDoctorPage> {
@@ -521,13 +608,13 @@ export class AuthSwitchAuthorityDaemon {
         const run = home.activeRun;
         if (!run) continue;
         const survivor = await findManagedCodexProcess(run.socketPath);
-        if (survivor) throw new Error('A managed Codex app-server still owns this account; stop its work before changing the account.');
+        if (survivor) throw new AuthSwitchRefusal('account_busy', 'A managed Codex app-server still owns this account; stop its work before changing the account.');
         if (run.pid === null || run.startedAt === null) {
-          throw new Error('A managed Codex launch has uncertain process ownership; reconcile it before changing the account.');
+          throw new AuthSwitchRefusal('account_busy', 'A managed Codex launch has uncertain process ownership; reconcile it before changing the account.');
         }
         try {
           process.kill(run.pid, 0);
-          throw new Error('A managed Codex process identity is still present; reconcile it before changing the account.');
+          throw new AuthSwitchRefusal('account_busy', 'A managed Codex process identity is still present; reconcile it before changing the account.');
         } catch (error) {
           if (!(error && typeof error === 'object' && 'code' in error && error.code === 'ESRCH')) throw error;
         }

package/ts/classes.authoritydatabase.ts

@@ -1,4 +1,5 @@
 import * as plugins from './plugins.js';
+import { AuthSwitchRefusal } from './authority-contract.js';
 import {
   AuthSwitchAuthorityAccountModel, AuthSwitchAuthorityBindingModel, AuthSwitchAuthorityClaudeHandoffModel,
   AuthSwitchAuthorityClaudeHomeModel, AuthSwitchAuthorityCodexHomeModel, AuthSwitchAuthorityEnrollmentModel,
@@ -8,7 +9,7 @@ import {
   assertStoredAuthorityBinding, assertStoredAuthorityClaudeHandoff, assertStoredAuthorityClaudeHome,
   assertStoredAuthorityEnrollment, assertStoredAuthorityGrant,
   assertStoredAuthorityHandoff, assertStoredAuthorityMigrationLedger, assertStoredAuthorityOperation,
-  assertStoredAuthorityUsage,
+  assertStoredAuthorityUsage, grantRefresherTransferRefusal, transfersGrantRefresher,
   type IStoredAuthorityAccount, type IStoredAuthorityBinding, type IStoredAuthorityClaudeHandoff,
   type IStoredAuthorityClaudeHome, type IStoredAuthorityCodexHome, type IStoredAuthorityEnrollment,
   type IStoredAuthorityEvent, type IStoredAuthorityGrant, type IStoredAuthorityHandoff,
@@ -358,7 +359,7 @@ export class AuthSwitchAuthorityDatabase {
             || account.primaryGrantId !== intent.grantId || !grant || grant.accountId !== intent.accountId
             || grant.providerId !== 'openai' || grant.purpose !== 'openai_managed'
             || grant.owner !== 'daemon' || ['removed', 'exchange_may_have_been_sent'].includes(grant.state)) {
-            throw new Error('Selected OpenAI login is unavailable for reauthentication.');
+            throw new AuthSwitchRefusal('login_unavailable', 'Selected OpenAI login is unavailable for reauthentication.');
           }
           expectedGrantGeneration = grant.grantGeneration;
         }
@@ -573,6 +574,19 @@ export class AuthSwitchAuthorityDatabase {
     return stored.map(item => AuthSwitchAuthorityMigrationLedgerModel.exact.toPersisted(item));
   }
 
+  /** Every migration ledger row in id order, one bounded page at a time. */
+  public async migrationLedgerPage(after: string | null,
+    limit = 128): Promise<{ rows: IStoredAuthorityMigrationLedger[]; nextCursor: string | null }> {
+    this.db();
+    if (!Number.isSafeInteger(limit) || limit < 1 || limit > 256) throw new Error('Invalid migration page size.');
+    const stored = await AuthSwitchAuthorityMigrationLedgerModel.exact.findStored({
+      filter: after ? { id: { $gt: after } } : {}, sort: { id: 1 }, limit: limit + 1,
+    });
+    const rows = stored.slice(0, limit)
+      .map(item => AuthSwitchAuthorityMigrationLedgerModel.exact.toPersisted(item));
+    return { rows, nextCursor: stored.length > limit ? rows[rows.length - 1].id : null };
+  }
+
   public async readAccountAndPrimaryGrant(id: string): Promise<{
     account: IStoredAuthorityAccount | null; grant: IStoredAuthorityGrant | null;
   }> {
@@ -973,9 +987,8 @@ export class AuthSwitchAuthorityDatabase {
         if (accountStored && accountStored.primaryGrantId !== grantId) {
           throw new Error('Primary grant identity cannot be replaced.');
         }
-        if (grantStored && ['legacy_native', 'claude_native'].includes(grantStored.owner)
-          && draft.grant.owner === 'daemon') {
-          throw new Error('Native ownership requires a verified handoff.');
+        if (grantStored && transfersGrantRefresher(grantStored.owner, draft.grant.owner)) {
+          throw new Error(grantRefresherTransferRefusal(grantStored.owner, draft.grant.owner));
         }
         await this.persistAccount(session, accountStored, draft.account);
         await this.persistGrant(session, grantStored, draft.grant);
@@ -1026,9 +1039,9 @@ export class AuthSwitchAuthorityDatabase {
         if (accountStored && accountStored.primaryGrantId !== grantId) {
           throw new Error('Primary grant identity cannot be replaced.');
         }
-        if (grantStored && ['legacy_native', 'claude_native'].includes(grantStored.owner)
-          && draft.grant.owner === 'daemon') {
-          throw new Error('Native ownership requires a verified handoff.');
+        // A device login commits daemon ownership; it is no proof that a native owner has stopped refreshing.
+        if (grantStored && transfersGrantRefresher(grantStored.owner, draft.grant.owner)) {
+          throw new Error(grantRefresherTransferRefusal(grantStored.owner, draft.grant.owner));
         }
         const completed: IStoredAuthorityDeviceOperation = {
           ...operation, state: 'complete', prompt: null,
@@ -1081,10 +1094,14 @@ export class AuthSwitchAuthorityDatabase {
         if (draft.id !== grantId || draft.accountId !== account.id || draft.updateId !== updateId) {
           throw new Error('Grant change has an invalid identity.');
         }
+        // This writer carries no handoff proof, so it may only move a grant within the ownership it already has.
+        if (transfersGrantRefresher(grant.owner, draft.owner)) {
+          throw new Error(grantRefresherTransferRefusal(grant.owner, draft.owner));
+        }
         if (grant.purpose === 'claude_host_native' && draft.state === 'exchange_may_have_been_sent'
           && grant.state !== 'exchange_may_have_been_sent'
           && !(await this.hasVerifiedClaudeGrantReceipt(account.id, grant.id, session))) {
-          throw new Error('Claude refresh requires a verified import receipt.');
+          throw new AuthSwitchRefusal('claude_receipt_missing', 'Claude refresh requires a verified import receipt.');
         }
         const accountDraft: IStoredAuthorityAccount = { ...account, revision: account.revision + 1,
           statusObservedAt: draft.statusObservedAt, updateId };
@@ -1124,6 +1141,10 @@ export class AuthSwitchAuthorityDatabase {
           || draft.providerId !== account.providerId || draft.updateId !== updateId) {
           throw new Error('Secondary grant identity is invalid.');
         }
+        // A secondary grant transfers its refresher by a verified handoff as well; one token, one refresher.
+        if (grant && transfersGrantRefresher(grant.owner, draft.owner)) {
+          throw new Error(grantRefresherTransferRefusal(grant.owner, draft.owner));
+        }
         await this.persistGrant(session, grantStored, draft);
         const updatedAccount = { ...account, revision: account.revision + 1,
           statusObservedAt: draft.statusObservedAt, updateId };
@@ -1150,7 +1171,7 @@ export class AuthSwitchAuthorityDatabase {
         const metaStored = await AuthSwitchAuthorityMetaModel.exact.findStoredOne({ id: 'authswitch-authority' }, { session });
         const accountStored = await AuthSwitchAuthorityAccountModel.exact.findStoredOne({ id: accountId }, { session });
         if (!metaStored || !accountStored || accountStored.removed || accountStored.revision !== expectedRevision) {
-          throw new Error('Account changed; refresh before removing.');
+          throw new AuthSwitchRefusal('account_changed', 'Account changed; refresh before removing.');
         }
         const account = AuthSwitchAuthorityAccountModel.exact.toPersisted(accountStored);
         const scan = async (visit: (grant: IStoredAuthorityGrant,
@@ -1169,13 +1190,13 @@ export class AuthSwitchAuthorityDatabase {
         await scan(async grant => {
           if (grant.state === 'removed') return;
           if (grant.owner === 'claude_native' || grant.owner === 'legacy_native') {
-            throw new Error('Stop the native owner and complete its handoff before removing this account.');
+            throw new AuthSwitchRefusal('native_owner_holds_login', 'Stop the native owner and complete its handoff before removing this account.');
           }
           if (grant.state === 'exchange_may_have_been_sent') {
-            throw new Error('Wait for the account refresh to finish before removing it.');
+            throw new AuthSwitchRefusal('account_busy', 'Wait for the account refresh to finish before removing it.');
           }
           if (['handoff_pending', 'handoff_quarantined'].includes(grant.state)) {
-            throw new Error('Resolve the Claude native handoff before removing this account.');
+            throw new AuthSwitchRefusal('claude_handoff_pending', 'Resolve the Claude native handoff before removing this account.');
           }
         });
         await scan(async (grant, stored) => {
@@ -1514,7 +1535,15 @@ export class AuthSwitchAuthorityDatabase {
     return { handoffs, nextCursor: stored.length > limit ? handoffs.at(-1)!.id : null };
   }
 
-  /** Only a verified backend import receipt may adopt a native home. No startup autodiscovery exists. */
+  /**
+   * Only a verified backend import receipt may adopt a native home. No startup autodiscovery exists.
+   *
+   * `import.submit` is the one route that reaches this, so its two decided outcomes -- a home another grant
+   * holds, and a login another home already holds -- answer with the importer's published code: the
+   * transaction refused, the ledger row stays `verified` and nothing rotating was sent, while an unmarked
+   * failure of that route means the outcome is unknown and the source must be read with `import.status`
+   * instead. The ambiguous write below keeps that unmarked meaning, because it genuinely is unknown.
+   */
   public async registerClaudeHomeFromReceipt(input: { homeId: string; accountId: string; grantId: string;
     receiptId: string; sourceDigest: string; accountUuid: string; organizationUuid: string;
     updateId: string; now: string }): Promise<IStoredAuthorityClaudeHome> {
@@ -1542,7 +1571,7 @@ export class AuthSwitchAuthorityDatabase {
         }
         if (current) {
           if (current.activeAccountId !== accountId || current.activeGrantId !== grantId) {
-            throw new Error('Claude native home belongs to another grant.');
+            throw new AuthSwitchRefusal('import_refusal', 'Claude native home belongs to another grant.');
           }
           return AuthSwitchAuthorityClaudeHomeModel.exact.toPersisted(current);
         }
@@ -1559,6 +1588,11 @@ export class AuthSwitchAuthorityDatabase {
         || !['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;
+      // 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',
+          'This Claude login is already registered to another native home.');
+      }
       throw new Error('Claude native home registration outcome is unknown.');
     }
   }