@murphai/murph 1.2.0 → 1.2.4

package/node_modules/@murphai/device-syncd/dist/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EACjC,yCAAyC,GAC1C,MAAM,0DAA0D,CAAC;AAIlE,MAAM,UAAU,wBAAwB,CAAC,YAA2C,EAAE;IACpF,MAAM,QAAQ,GAAG,iCAAiC,CAChD,sBAAsB,CACvB,CAAC;IAEF,MAAM,GAAG,GAAuB;QAC9B,QAAQ,CAAC,QAAQ;YACf,oCAAoC,CAAC,QAAQ,CAAC,CAAC;YAC/C,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QACD,GAAG,CAAC,QAAQ;YACV,OAAO,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,IAAI;YACF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,CAAC;KACF,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,QAA4B;IAC/E,MAAM,UAAU,GAAG,yCAAyC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAClF,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAEjE,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,4EAA4E,CACtH,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACjE,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,mFAAmF,CAC7H,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB;WAC7C,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;YAC3D,CAAC,CAAC,EAAE,IAAI,EAAE,cAAuB,EAAE;YACnC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,CAAC,CAAC;IACjC,MAAM,wBAAwB,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,oBAAoB,KAAK,KAAK,CAAC;IAC1F,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAE3E,IAAI,gBAAgB,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,wBAAwB,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9F,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,+EAA+E,CACzH,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EACjC,yCAAyC,GAC1C,MAAM,0DAA0D,CAAC;AAIlE,MAAM,UAAU,wBAAwB,CAAC,SAAS,GAAkC,EAAE;IACpF,MAAM,QAAQ,GAAG,iCAAiC,CAChD,sBAAsB,CACvB,CAAC;IAEF,MAAM,GAAG,GAAuB;QAC9B,QAAQ,CAAC,QAAQ;YACf,oCAAoC,CAAC,QAAQ,CAAC,CAAC;YAC/C,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QACD,GAAG,CAAC,QAAQ;YACV,OAAO,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,IAAI;YACF,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,CAAC;KACF,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,QAA4B;IAC/E,MAAM,UAAU,GAAG,yCAAyC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAClF,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAEjE,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,4EAA4E,CACtH,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACjE,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,mFAAmF,CAC7H,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB;WAC7C,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;YAC3D,CAAC,CAAC,EAAE,IAAI,EAAE,cAAuB,EAAE;YACnC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,CAAC,CAAC;IACjC,MAAM,wBAAwB,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,oBAAoB,KAAK,KAAK,CAAC;IAC1F,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAE3E,IAAI,gBAAgB,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,wBAAwB,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9F,MAAM,IAAI,SAAS,CACjB,wBAAwB,QAAQ,CAAC,QAAQ,+EAA+E,CACzH,CAAC;IACJ,CAAC;AACH,CAAC"}

package/node_modules/@murphai/device-syncd/dist/service.d.ts

@@ -45,7 +45,7 @@ export interface DeviceSyncService {
     handleOAuthCallback(input: HandleOAuthCallbackInput): Promise<CompleteConnectionResult>;
     handleWebhook(providerName: string, headers: Headers, rawBody: Buffer): Promise<HandleWebhookResult>;
     queueManualReconcile(accountId: string): QueueManualReconcileResult;
-    disconnectAccount(accountId: string): Promise<DisconnectAccountResult>;
+    disconnectAccount(accountId: string, expectedConnectedAt: string): Promise<DisconnectAccountResult>;
     getNextWakeAt(now?: string): string | null;
     runSchedulerOnce(): Promise<void>;
     runWorkerOnce(): Promise<DeviceSyncJobRecord | null>;

package/node_modules/@murphai/device-syncd/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/node_modules/@murphai/device-syncd/dist/service.js

@@ -1,12 +1,13 @@
 import { createImporters } from "@murphai/importers";
-import { normalizeConfiguredDeviceSyncJobInput, normalizeConfiguredDeviceSyncJobRecord, } from "./config/provider-manifests.js";
+import { normalizeConfiguredDeviceSyncJobInput, normalizeConfiguredDeviceSyncJobRecord, } from "./provider-job-definitions.js";
 import { buildDeviceSyncTokenCipherOptions, createSecretCodec } from "./local-secret-codec.js";
 import { deviceSyncError, isDeviceSyncError } from "./errors.js";
+import { isJunctionCompanionHrvRmssdJob, JUNCTION_COMPANION_HRV_OBSERVATION_INVALID_CODE, } from "./junction-resources.js";
 import { sanitizeHostedRuntimeDiagnosticText, sanitizeHostedRuntimeErrorText, } from "./hosted-runtime.js";
 import { createDeviceSyncPublicIngress, DeviceSyncPublicIngress } from "./public-ingress.js";
 import { toRedactedPublicDeviceSyncAccount } from "./public-account.js";
 import { createDeviceSyncRegistry } from "./registry.js";
-import { addMilliseconds, computeRetryDelayMs, defaultStateDatabasePath, generatePrefixedId, normalizeOriginList, normalizePublicBaseUrl, sha256Text, stringifyJson, toIsoTimestamp, } from "./shared.js";
+import { addMilliseconds, computeRetryDelayMs, defaultStateDatabasePath, generatePrefixedId, normalizeString, normalizeOriginList, normalizePublicBaseUrl, sha256Text, stringifyJson, toIsoTimestamp, } from "./shared.js";
 import { SqliteDeviceSyncStore } from "./store.js";
 import { DEVICE_SYNC_WEBHOOK_TRACE_COMPLETED, } from "./types.js";
 export { SqliteDeviceSyncStore } from "./store.js";
@@ -22,6 +23,8 @@ export function resolveDeviceSyncStoreNextWakeAt(input) {
 const DEVICE_SYNC_VALIDATION_ISSUE_LIMIT = 10;
 const DEVICE_SYNC_VALIDATION_CAUSE_DEPTH_LIMIT = 4;
 const DEVICE_SYNC_JOB_YIELD_POLL_MS = 100;
+const DEVICE_SYNC_CONNECTION_MUTATION_MAX_PENDING = 1;
+const DEVICE_SYNC_CONNECTION_MUTATION_WAIT_TIMEOUT_MS = 15_000;
 const DEFAULT_PROVIDER_JOB_BATCH_MAX_JOBS = 50;
 const DEFAULT_PROVIDER_JOB_BATCH_MAX_ESTIMATED_BYTES = 2 * 1024 * 1024;
 const DEFAULT_PROVIDER_JOB_BATCH_CANDIDATE_SCAN_LIMIT = 200;
@@ -96,6 +99,7 @@ class DeviceSyncServiceController {
     workerTimer = null;
     schedulerTimer = null;
     jobFailureDiagnostics = [];
+    connectionMutationStates = new Map();
     constructor(input) {
         this.vaultRoot = input.config.vaultRoot;
         this.publicBaseUrl = normalizePublicBaseUrl(input.config.publicBaseUrl);
@@ -146,8 +150,11 @@ class DeviceSyncServiceController {
                     nextReconcileAt: record.nextReconcileAt ?? null,
                 })),
                 markConnectionSetupFailed: (record) => {
-                    const account = this.store.markConnectionSetupFailed(record.accountId, record.now, record.code, record.message);
-                    return account ? this.toPublicAccount(account) : null;
+                    const result = this.store.markConnectionSetupFailed(record.accountId, record.expectedConnectedAt, record.now, record.code, record.message);
+                    return {
+                        account: result.account ? this.toPublicAccount(result.account) : null,
+                        applied: result.applied,
+                    };
                 },
                 getConnectionById: (accountId) => {
                     const account = this.store.getAccountById(accountId);
@@ -163,6 +170,7 @@ class DeviceSyncServiceController {
                 markWebhookReceived: (accountId, now) => this.store.markWebhookReceived(accountId, now),
             },
             hooks: {
+                runConnectionMutation: ({ provider }, operation) => this.runProviderConnectionMutation(provider, operation),
                 onConnectionEstablished: async ({ account, connection, provider }) => {
                     this.enqueueJobs(account, connection.initialJobs ?? []);
                     await this.ensureWebhookAdminUpkeepAfterConnectionEstablished(provider);
@@ -181,6 +189,54 @@ class DeviceSyncServiceController {
             log: this.logger,
         });
     }
+    async runProviderConnectionMutation(provider, operation) {
+        const existingState = this.connectionMutationStates.get(provider);
+        if (existingState
+            && existingState.activeAndWaiting >= DEVICE_SYNC_CONNECTION_MUTATION_MAX_PENDING + 1) {
+            throw connectionMutationBusyError();
+        }
+        const state = existingState ?? {
+            activeAndWaiting: 0,
+            tail: Promise.resolve(),
+        };
+        const previous = state.tail;
+        let releaseCurrent;
+        const current = new Promise((resolve) => {
+            releaseCurrent = resolve;
+        });
+        const tail = previous.then(() => current);
+        state.activeAndWaiting += 1;
+        state.tail = tail;
+        this.connectionMutationStates.set(provider, state);
+        let waitTimeout = null;
+        try {
+            await Promise.race([
+                previous,
+                new Promise((_resolve, reject) => {
+                    waitTimeout = setTimeout(() => reject(connectionMutationBusyError()), DEVICE_SYNC_CONNECTION_MUTATION_WAIT_TIMEOUT_MS);
+                }),
+            ]);
+            if (waitTimeout) {
+                clearTimeout(waitTimeout);
+                waitTimeout = null;
+            }
+            return await operation();
+        }
+        finally {
+            if (waitTimeout) {
+                clearTimeout(waitTimeout);
+            }
+            releaseCurrent();
+            state.activeAndWaiting -= 1;
+            void tail.then(() => {
+                if (state.activeAndWaiting === 0
+                    && state.tail === tail
+                    && this.connectionMutationStates.get(provider) === state) {
+                    this.connectionMutationStates.delete(provider);
+                }
+            });
+        }
+    }
     describeProviders() {
         return this.publicIngress.describeProviders();
     }
@@ -269,8 +325,8 @@ class DeviceSyncServiceController {
         const jobs = scheduledJobs.length > 0 ? scheduledJobs : [{ kind: "reconcile", priority: 80 }];
         const queuedJobs = this.enqueueJobs(account, jobs.map((job) => ({
             ...job,
-            priority: Math.max(job.priority ?? 0, 80),
-            availableAt: now,
+            priority: job.kind === "reconcile" ? Math.max(job.priority ?? 0, 80) : job.priority,
+            availableAt: job.kind === "reconcile" ? now : job.availableAt ?? now,
             dedupeKey: job.dedupeKey ??
                 `manual-reconcile:${job.kind}:${sha256Text(stringifyJson(job.payload ?? {}))}`,
         })));
@@ -289,8 +345,19 @@ class DeviceSyncServiceController {
             jobs: queuedJobs,
         };
     }
-    async disconnectAccount(accountId) {
+    async disconnectAccount(accountId, expectedConnectedAt) {
+        const normalizedExpectedConnectedAt = normalizeString(expectedConnectedAt);
+        if (!normalizedExpectedConnectedAt) {
+            throw connectionGenerationRequiredError();
+        }
+        const account = this.requireStoredAccount(accountId);
+        return await this.runProviderConnectionMutation(account.provider, () => this.disconnectAccountAfterConnectionMutation(accountId, normalizedExpectedConnectedAt));
+    }
+    async disconnectAccountAfterConnectionMutation(accountId, expectedConnectedAt) {
         const account = this.requireStoredAccount(accountId);
+        if (account.connectedAt !== expectedConnectedAt) {
+            throw connectionChangedDuringDisconnectError();
+        }
         const provider = this.requireProvider(account.provider);
         const now = this.nowIso();
         if (account.status !== "disconnected") {
@@ -307,8 +374,16 @@ class DeviceSyncServiceController {
                 });
             }
         }
-        this.store.markPendingJobsDeadForAccount(account.id, now, "ACCOUNT_DISCONNECTED", "Device account disconnected.");
-        const disconnected = this.store.disconnectAccount(account.id, now);
+        const disconnected = this.store.disconnectAccountAndMarkPendingJobsDeadIfConnectedAt({
+            accountId: account.id,
+            code: "ACCOUNT_DISCONNECTED",
+            expectedConnectedAt,
+            message: "Device account disconnected.",
+            now,
+        });
+        if (!disconnected) {
+            throw connectionChangedDuringDisconnectError();
+        }
         return {
             account: this.toPublicAccount(disconnected),
         };
@@ -411,16 +486,35 @@ class DeviceSyncServiceController {
             failClaimedJob("ACCOUNT_NOT_FOUND", `Device sync account ${job.accountId} does not exist.`, null, false);
             return finishPass();
         }
-        if (storedAccount.status === "disconnected") {
-            this.store.completeJob(job.id, now);
+        const preservesAcceptedCompanionHrv = isJunctionCompanionHrvRmssdJob(job);
+        if (storedAccount.status === "disconnected" && !preservesAcceptedCompanionHrv) {
+            const completed = this.store.completeJobIfOwned(job.id, this.workerId, currentNow());
+            if (!completed) {
+                this.logger.debug?.("Device sync job side effects skipped because execution was cancelled.", {
+                    provider: job.provider,
+                    accountId: job.accountId,
+                    jobId: job.id,
+                });
+            }
             return finishPass();
         }
-        if (storedAccount.status === "reauthorization_required") {
-            failClaimedJob("ACCOUNT_REAUTHORIZATION_REQUIRED", "Device sync account requires reconnection before queued jobs can run.", null, false);
-            this.store.markPendingJobsDeadForAccount(storedAccount.id, now, "ACCOUNT_REAUTHORIZATION_REQUIRED", "Device sync account requires reconnection before queued jobs can run.");
+        if (storedAccount.status === "reauthorization_required" && !preservesAcceptedCompanionHrv) {
+            const failed = failClaimedJob("ACCOUNT_REAUTHORIZATION_REQUIRED", "Device sync account requires reconnection before queued jobs can run.", null, false);
+            if (failed) {
+                this.store.markPendingJobsDeadForAccountIfCurrent({
+                    accountId: storedAccount.id,
+                    code: "ACCOUNT_REAUTHORIZATION_REQUIRED",
+                    expectedLocalConnectionRevision: storedAccount.localConnectionRevision,
+                    expectedStatus: "reauthorization_required",
+                    message: "Device sync account requires reconnection before queued jobs can run.",
+                    now: currentNow(),
+                });
+            }
             return finishPass();
         }
-        this.store.markSyncStarted(storedAccount.id, now);
+        if (storedAccount.status === "active") {
+            this.store.markSyncStarted(storedAccount.id, now);
+        }
         const disconnectGeneration = storedAccount.disconnectGeneration;
         const localConnectionRevision = storedAccount.localConnectionRevision;
         const jobExecutor = resolveProviderJobExecutor(provider);
@@ -441,18 +535,21 @@ class DeviceSyncServiceController {
                 }
             }
         };
-        const isAccountExecutionCurrent = () => {
+        const isOriginalActiveAccountExecutionCurrent = () => {
             const currentStoredAccount = this.store.getAccountById(storedAccount.id);
             return !!currentStoredAccount
                 && currentStoredAccount.status === "active"
                 && currentStoredAccount.disconnectGeneration === disconnectGeneration
                 && currentStoredAccount.localConnectionRevision === localConnectionRevision;
         };
+        const isAccountExecutionCurrent = () => preservesAcceptedCompanionHrv
+            ? this.store.getAccountById(storedAccount.id) !== null
+            : isOriginalActiveAccountExecutionCurrent();
         const releaseActiveJobsIfCurrentAccountActive = (releaseNow) => {
             const currentStoredAccount = this.store.getAccountById(storedAccount.id);
-            if (!currentStoredAccount
-                || currentStoredAccount.status !== "active"
-                || currentStoredAccount.disconnectGeneration !== disconnectGeneration) {
+            if (!currentStoredAccount || (!preservesAcceptedCompanionHrv
+                && (currentStoredAccount.status !== "active"
+                    || currentStoredAccount.disconnectGeneration !== disconnectGeneration))) {
                 return 0;
             }
             return activeJobs.filter((activeJob) => this.store.releaseJobIfOwned(activeJob.id, this.workerId, releaseNow)).length;
@@ -492,14 +589,16 @@ class DeviceSyncServiceController {
             ensureExecutionActive();
             currentAccount = this.toDecryptedAccount(storedAccount);
             const normalizedJob = normalizeConfiguredDeviceSyncJobRecord(provider.provider, job, "execution");
-            activeJobs = this.claimProviderJobBatch({
-                accountId: storedAccount.id,
-                jobExecutor,
-                maxJobRows,
-                normalizedSeedJob: normalizedJob,
-                now,
-                provider: provider.provider,
-            });
+            activeJobs = preservesAcceptedCompanionHrv
+                ? [normalizedJob]
+                : this.claimProviderJobBatch({
+                    accountId: storedAccount.id,
+                    jobExecutor,
+                    maxJobRows,
+                    normalizedSeedJob: normalizedJob,
+                    now,
+                    provider: provider.provider,
+                });
             const normalizedJobs = activeJobs.map((activeJob) => activeJob.id === normalizedJob.id
                 ? normalizedJob
                 : normalizeConfiguredDeviceSyncJobRecord(provider.provider, activeJob, "execution"));
@@ -513,11 +612,16 @@ class DeviceSyncServiceController {
                 throwIfAborted: assertJobExecutionNotYielded,
                 importSnapshot: async (snapshot) => {
                     ensureExecutionActive();
-                    return this.importer.importDeviceProviderSnapshot({
+                    const importResult = await this.importer.importDeviceProviderSnapshot({
                         provider: provider.provider,
                         snapshot,
                         vaultRoot: this.vaultRoot,
                     });
+                    const receipt = {
+                        canonicalEventCount: readCanonicalDeviceImportEventCount(importResult),
+                        durableDeliveryAccepted: true,
+                    };
+                    return receipt;
                 },
                 upsertConnectionSource: (input) => {
                     ensureExecutionActive();
@@ -565,8 +669,17 @@ class DeviceSyncServiceController {
                 },
                 disconnectAccount: async () => {
                     ensureExecutionActive();
-                    this.store.markPendingJobsDeadForAccount(currentAccount.id, now, "ACCOUNT_DISCONNECTED", "Device account disconnected.");
-                    const disconnected = this.store.disconnectAccount(currentAccount.id, now);
+                    const disconnected = this.store.disconnectAccountAndMarkPendingJobsDeadIfCurrent({
+                        accountId: currentAccount.id,
+                        code: "ACCOUNT_DISCONNECTED",
+                        expectedLocalConnectionRevision: localConnectionRevision,
+                        expectedStatus: "active",
+                        message: "Device account disconnected.",
+                        now: currentNow(),
+                    });
+                    if (!disconnected) {
+                        throw new DeviceSyncJobExecutionCancelledError(storedAccount.id, job.id);
+                    }
                     currentAccount = this.toDecryptedAccount(disconnected);
                 },
                 logger: this.logger,
@@ -576,7 +689,8 @@ class DeviceSyncServiceController {
                 : await jobExecutor.executeJob(jobContext, normalizedJob);
             ensureJobLeasesOwned();
             ensureAccountActive();
-            if (!this.store.completeJobsIfOwned(activeJobs.map((activeJob) => activeJob.id), this.workerId, currentNow())) {
+            if (preservesAcceptedCompanionHrv && !isOriginalActiveAccountExecutionCurrent()) {
+                this.store.completeJobsIfOwned(activeJobs.map((activeJob) => activeJob.id), this.workerId, currentNow());
                 return finishPass();
             }
             const successOptions = {
@@ -588,11 +702,22 @@ class DeviceSyncServiceController {
             if (Object.prototype.hasOwnProperty.call(result, "nextReconcileAt")) {
                 successOptions.nextReconcileAt = result.nextReconcileAt ?? null;
             }
-            const markedSucceeded = this.store.markSyncSucceeded(storedAccount.id, now, disconnectGeneration, successOptions);
-            if (!markedSucceeded) {
+            const scheduledJobs = this.normalizeJobsForEnqueue(storedAccount, result.scheduledJobs ?? []);
+            const completed = this.store.completeJobsMarkSyncSucceededAndEnqueueJobs({
+                accountId: storedAccount.id,
+                completedAt: currentNow(),
+                disconnectGeneration,
+                jobIds: activeJobs.map((activeJob) => activeJob.id),
+                jobs: scheduledJobs,
+                provider: provider.provider,
+                syncSucceededAt: now,
+                syncSuccessOptions: successOptions,
+                workerId: this.workerId,
+            });
+            if (!completed) {
+                releaseActiveJobsIfCurrentAccountActive(currentNow());
                 return finishPass();
             }
-            this.enqueueJobs(storedAccount, result.scheduledJobs ?? []);
             return finishPass();
         }
         catch (error) {
@@ -619,6 +744,9 @@ class DeviceSyncServiceController {
                 return finishPass();
             }
             const failure = normalizeExecutionError(error);
+            const retainsAcceptedCompanionHrvUntilSuccess = preservesAcceptedCompanionHrv
+                && failure.code !== JUNCTION_COMPANION_HRV_OBSERVATION_INVALID_CODE;
+            const retainedFailureRetryable = failure.retryable || retainsAcceptedCompanionHrvUntilSuccess;
             const failureNow = currentNow();
             if (!isAccountExecutionCurrent()) {
                 const released = releaseActiveJobsIfCurrentAccountActive(failureNow);
@@ -633,10 +761,10 @@ class DeviceSyncServiceController {
             }
             const failed = activeJobs
                 .map((activeJob) => {
-                const retryAt = failure.retryable
+                const retryAt = retainedFailureRetryable
                     ? addMilliseconds(failureNow, computeRetryDelayMs(activeJob.attempts))
                     : null;
-                return this.store.failJobIfOwned(activeJob.id, this.workerId, failureNow, failure.code, failure.message, retryAt, failure.retryable);
+                return this.store.failJobIfOwned(activeJob.id, this.workerId, failureNow, failure.code, failure.message, retryAt, retainedFailureRetryable, retainsAcceptedCompanionHrvUntilSuccess);
             })
                 .some(Boolean);
             if (!failed) {
@@ -653,14 +781,15 @@ class DeviceSyncServiceController {
                 jobKind: job.kind,
                 provider: provider.provider,
                 ...(failedJobResource ? { resource: failedJobResource } : {}),
-                retryable: failure.retryable,
+                retryable: retainedFailureRetryable,
                 summary: failure.message,
             });
-            const failureMetadataPatch = readDeviceSyncFailureMetadataPatch(error);
+            if (preservesAcceptedCompanionHrv && !isOriginalActiveAccountExecutionCurrent()) {
+                return finishPass();
+            }
             const failureOptions = {
                 disconnectGeneration,
                 localConnectionRevision,
-                ...(failureMetadataPatch ? { metadataPatch: failureMetadataPatch } : {}),
             };
             const markedFailed = this.store.markSyncFailed(storedAccount.id, failureNow, failure.code, failure.message, failure.accountStatus, failureOptions);
             if (!markedFailed) {
@@ -673,7 +802,14 @@ class DeviceSyncServiceController {
                 return finishPass();
             }
             if (failure.accountStatus === "reauthorization_required") {
-                this.store.markPendingJobsDeadForAccount(storedAccount.id, failureNow, "ACCOUNT_REAUTHORIZATION_REQUIRED", "Device sync account requires reconnection before queued jobs can run.");
+                this.store.markPendingJobsDeadForAccountIfCurrent({
+                    accountId: storedAccount.id,
+                    code: "ACCOUNT_REAUTHORIZATION_REQUIRED",
+                    expectedLocalConnectionRevision: localConnectionRevision + 1,
+                    expectedStatus: "reauthorization_required",
+                    message: "Device sync account requires reconnection before queued jobs can run.",
+                    now: failureNow,
+                });
             }
             this.logger.warn?.("Device sync job failed.", {
                 provider: provider.provider,
@@ -924,19 +1060,20 @@ class DeviceSyncServiceController {
         };
     }
     enqueueJobs(account, jobs) {
-        return jobs.map((job) => {
-            const normalizedJob = normalizeConfiguredDeviceSyncJobInput(account.provider, job, "enqueue");
-            return this.store.enqueueJob({
-                provider: account.provider,
-                accountId: account.id,
-                kind: normalizedJob.kind,
-                payload: normalizedJob.payload ?? {},
-                priority: normalizedJob.priority ?? 0,
-                availableAt: normalizedJob.availableAt,
-                maxAttempts: normalizedJob.maxAttempts,
-                dedupeKey: normalizedJob.dedupeKey,
-            });
-        });
+        return this.normalizeJobsForEnqueue(account, jobs)
+            .map((job) => this.store.enqueueJob({
+            provider: account.provider,
+            accountId: account.id,
+            kind: job.kind,
+            payload: job.payload ?? {},
+            priority: job.priority ?? 0,
+            availableAt: job.availableAt,
+            maxAttempts: job.maxAttempts,
+            dedupeKey: job.dedupeKey,
+        }));
+    }
+    normalizeJobsForEnqueue(account, jobs) {
+        return jobs.map((job) => normalizeConfiguredDeviceSyncJobInput(account.provider, job, "enqueue"));
     }
     async ensureWebhookAdminUpkeepAfterConnectionEstablished(provider) {
         if (provider.provider !== "oura") {
@@ -990,7 +1127,7 @@ export function createDeviceSyncService(input) {
         handleOAuthCallback: (callbackInput) => controller.handleOAuthCallback(callbackInput),
         handleWebhook: (providerName, headers, rawBody) => controller.handleWebhook(providerName, headers, rawBody),
         queueManualReconcile: (accountId) => controller.queueManualReconcile(accountId),
-        disconnectAccount: (accountId) => controller.disconnectAccount(accountId),
+        disconnectAccount: (accountId, expectedConnectedAt) => controller.disconnectAccount(accountId, expectedConnectedAt),
         getNextWakeAt: (now) => controller.getNextWakeAt(now),
         runSchedulerOnce: () => controller.runSchedulerOnce(),
         runWorkerOnce: () => controller.runWorkerOnce(),
@@ -1072,6 +1209,30 @@ function isDeviceSyncJobAbortError(error, signal, depth = 0) {
     const cause = "cause" in error ? error.cause : undefined;
     return cause !== undefined && isDeviceSyncJobAbortError(cause, signal, depth + 1);
 }
+function connectionMutationBusyError() {
+    return deviceSyncError({
+        code: "CONNECTION_MUTATION_BUSY",
+        message: "Another device connection update is still in progress. Retry shortly.",
+        retryable: true,
+        httpStatus: 503,
+    });
+}
+function connectionGenerationRequiredError() {
+    return deviceSyncError({
+        code: "CONNECTION_GENERATION_REQUIRED",
+        message: "Device account disconnect requires the expected connection generation.",
+        retryable: false,
+        httpStatus: 400,
+    });
+}
+function connectionChangedDuringDisconnectError() {
+    return deviceSyncError({
+        code: "CONNECTION_CHANGED_DURING_DISCONNECT",
+        message: "Device sync connection changed before disconnect could start. Retry with the current account.",
+        retryable: true,
+        httpStatus: 409,
+    });
+}
 function normalizeExecutionError(error) {
     if (isDeviceSyncError(error)) {
         return {
@@ -1155,13 +1316,6 @@ function buildDeviceSyncErrorFailureDiagnostics(error) {
         providerOAuthResponseShapeKind: readSafeDiagnosticToken(error.details?.oauthResponseShapeKind),
     });
 }
-function readDeviceSyncFailureMetadataPatch(error) {
-    if (!isDeviceSyncError(error)) {
-        return undefined;
-    }
-    const patch = toPlainRecord(error.details?.failureMetadataPatch);
-    return patch && Object.keys(patch).length > 0 ? patch : undefined;
-}
 function buildUnexpectedErrorFailureDiagnostics(error) {
     const cause = toPlainRecord(error.cause);
     return compactFailureDiagnostics({
@@ -1297,6 +1451,10 @@ function toPlainRecord(value) {
     }
     return value;
 }
+function readCanonicalDeviceImportEventCount(value) {
+    const record = toPlainRecord(value);
+    return record && Array.isArray(record.events) ? record.events.length : 0;
+}
 function formatValidationPath(value) {
     if (!Array.isArray(value) || value.length === 0) {
         return "$";