Keep registered status when a stale concurrent registration attempt fails

Author: cursoragent

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }
 

apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts

@@ -535,6 +535,48 @@ describe("makeRelayDeviceRegistrationRequest", () => {
 }).pipe(Effect.provide(relayTestLayer));
 });
 
+it.effect("keeps the registered status when a stale concurrent attempt fails",()=>{
+constfetchMock=vi.fn((request: RequestInfo|URL)=>{
+consturl=requestinstanceofRequest ? request.url : String(request);
+returnPromise.resolve(
+Response.json(
+url.endsWith("/v1/client/dpop-token")
+ ? {
+access_token: "relay-dpop-token",
+issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
+token_type: "DPoP",
+expires_in: 300,
+scope: "mobile:registration",
+}
+ : {ok: true},
+),
+);
+});
+vi.stubGlobal("fetch",fetchMock);
+Constants.expoConfig!.extra={
+relay: {
+url: "https://relay.example.test/",
+},
+};
+
+// Sign-in enqueues a registration attempt that stays parked in the
+// background queue while the direct refresh below runs.
+setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
+
+returnEffect.gen(function*(){
+yield*refreshAgentAwarenessRegistration();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+
+// The queued sign-in attempt now fails; its stale failure must not
+// overwrite the registration the relay already accepted.
+vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValueOnce(
+newError("device id unavailable"),
+);
+yield*runBackgroundOperations();
+expect(getAgentAwarenessRegistrationStatus()).toBe("registered");
+}).pipe(Effect.provide(relayTestLayer));
+});
+
 it("clears registration status on cloud sign-out",()=>{
 setAgentAwarenessRelayTokenProvider(()=>Promise.resolve("clerk-token-user-a"));
 setAgentAwarenessRelayTokenProvider(null);

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

@@ -74,6 +74,13 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
 letregistrationStatus: AgentAwarenessRegistrationStatus="unknown";
 constregistrationStatusListeners=newSet<()=>void>();
 
+// Registration runs both through the background queue and directly via
+// refreshAgentAwarenessRegistration, so attempts can overlap. Counting relay
+// acceptances lets a failing attempt detect that a concurrent attempt already
+// succeeded while it was in flight, so a stale failure cannot overwrite a
+// registration the relay accepted.
+letregistrationSuccessCount=0;
+
 functionsetRegistrationStatus(next: AgentAwarenessRegistrationStatus): void{
 if(registrationStatus===next){
 return;
@@ -84,6 +91,18 @@ function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
 }
 }
 
+functionmarkRegistrationSucceeded(): void{
+registrationSuccessCount++;
+setRegistrationStatus("registered");
+}
+
+functionmarkRegistrationFailed(successCountAtAttemptStart: number): void{
+if(registrationSuccessCount!==successCountAtAttemptStart){
+return;
+}
+setRegistrationStatus("failed");
+}
+
 exportfunctiongetAgentAwarenessRegistrationStatus(): AgentAwarenessRegistrationStatus{
 returnregistrationStatus;
 }
@@ -316,7 +335,7 @@ function registerDeviceWithRelay(
 catch: (cause)=>cause,
 }).pipe(Effect.orElseSucceed(()=>null));
 if(persisted&&persisted.identity===identity&&persisted.signature===signature){
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 logRegistrationDebug("relay device registration skipped; already registered for account",{
  expectedGeneration,
 });
@@ -331,7 +350,7 @@ function registerDeviceWithRelay(
 clerkToken: token,
 payload: body,
 });
-setRegistrationStatus("registered");
+markRegistrationSucceeded();
 yield*Effect.promise(()=>
 saveAgentAwarenessRegistrationRecord({ identity, signature }).catch((error: unknown)=>{
 logRegistrationError("persist registration record failed",error);
@@ -466,11 +485,12 @@ function startPendingDeviceRegistration(): void {
 };
 activeDeviceRegistration=registration;
 registration.operation=(async()=>{
+constsuccessCountAtStart=registrationSuccessCount;
 constresult=awaitsettleAsyncResult(()=>
 runtime.runPromiseExit(registerDevice(next.input,generation)),
 );
 if(result._tag==="Failure"&&!isAtomCommandInterrupted(result)){
-setRegistrationStatus("failed");
+markRegistrationFailed(successCountAtStart);
 logRegistrationError(next.context,squashAtomCommandFailure(result));
 }
 logRegistrationDebug("device registration finished",{ generation });
@@ -675,14 +695,17 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
 never,
 ManagedRelay.ManagedRelayClient
 >{
-returnregisterDeviceForCurrentUser().pipe(
-Effect.catch((error)=>
-Effect.sync(()=>{
-setRegistrationStatus("failed");
-logRegistrationError("device registration refresh failed",error);
-}),
-),
-);
+returnEffect.suspend(()=>{
+constsuccessCountAtStart=registrationSuccessCount;
+returnregisterDeviceForCurrentUser().pipe(
+Effect.catch((error)=>
+Effect.sync(()=>{
+markRegistrationFailed(successCountAtStart);
+logRegistrationError("device registration refresh failed",error);
+}),
+),
+);
+});
 }
 
 exportfunction__resetAgentAwarenessRemoteRegistrationForTest(): void{
@@ -703,6 +726,7 @@ export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
 activeDeviceRegistration=null;
 pendingDeviceRegistration=null;
 registrationStatus="unknown";
+registrationSuccessCount=0;
 registrationStatusListeners.clear();
 }