paperclip-github-plugin 0.4.5 → 0.4.7

package/dist/worker.js

@@ -623,6 +623,8 @@ var GITHUB_TOKEN_PERMISSION_AUDIT_CACHE_TTL_MS = 5 * 6e4;
 var MANUAL_SYNC_RESPONSE_GRACE_PERIOD_MS = 500;
 var RUNNING_SYNC_MESSAGE = "GitHub sync is running in the background. This page will update when it finishes.";
 var CANCELLING_SYNC_MESSAGE = "Cancellation requested. GitHub sync will stop after the current step finishes.";
+var INTERRUPTED_SYNC_MESSAGE = "GitHub sync stopped unexpectedly before it finished. The worker restarted while the sync was running.";
+var INTERRUPTED_SYNC_ACTION = "Run GitHub sync again. If it stops on the same repository or issue, retry that narrower scope to isolate the failing step.";
 var SYNC_PROGRESS_PERSIST_INTERVAL_MS = 250;
 var MAX_SYNC_FAILURE_LOG_ENTRIES = 25;
 var GITHUB_SECONDARY_RATE_LIMIT_FALLBACK_MS = 6e4;
@@ -2895,6 +2897,97 @@ async function getSyncCancellationRequest(ctx) {
   }
   return normalizeSyncCancellationRequest(await ctx.state.get(SYNC_CANCELLATION_SCOPE));
 }
+function buildInterruptedSyncMessage(progress) {
+  const completedIssueCount = typeof progress?.completedIssueCount === "number" ? Math.max(0, progress.completedIssueCount) : void 0;
+  const totalIssueCount = typeof progress?.totalIssueCount === "number" ? Math.max(0, progress.totalIssueCount) : void 0;
+  const completionSummary = completedIssueCount !== void 0 && totalIssueCount !== void 0 ? ` Completed ${Math.min(completedIssueCount, totalIssueCount)} of ${totalIssueCount} issues before the worker restarted.` : "";
+  return `${INTERRUPTED_SYNC_MESSAGE}${completionSummary}`;
+}
+function getInterruptedSyncFailurePhase(progress) {
+  switch (progress?.phase) {
+    case "preparing":
+      return "building_import_plan";
+    case "importing":
+      return "importing_issue";
+    case "syncing":
+      return "evaluating_github_status";
+    default:
+      return void 0;
+  }
+}
+function getActiveRunningSyncForScope(companyId) {
+  const normalizedCompanyId = normalizeCompanyId(companyId);
+  if (activeRunningSyncState?.syncState.status !== "running") {
+    return null;
+  }
+  const activeSyncMatchesScope = normalizedCompanyId === void 0 || activeRunningSyncCompanyId === void 0 || activeRunningSyncCompanyId === normalizedCompanyId;
+  if (!activeSyncMatchesScope) {
+    return null;
+  }
+  return materializeScopedSettings(activeRunningSyncState, null, normalizedCompanyId);
+}
+async function reconcileOrphanedRunningSyncState(ctx, companyId, resolution = "error") {
+  const normalizedCompanyId = normalizeCompanyId(companyId);
+  const activeRunningSync = getActiveRunningSyncForScope(normalizedCompanyId);
+  if (activeRunningSync) {
+    return activeRunningSync;
+  }
+  const current = normalizeSettings(await ctx.state.get(SETTINGS_SCOPE));
+  const scopedSyncState = getScopedSyncState(current, normalizedCompanyId);
+  if (scopedSyncState.status !== "running") {
+    return materializeScopedSettings(current, null, normalizedCompanyId);
+  }
+  const trigger = scopedSyncState.lastRunTrigger ?? "manual";
+  const progress = normalizeSyncProgress(scopedSyncState.progress);
+  const syncCounts = {
+    syncedIssuesCount: scopedSyncState.syncedIssuesCount ?? 0,
+    createdIssuesCount: scopedSyncState.createdIssuesCount ?? 0,
+    skippedIssuesCount: scopedSyncState.skippedIssuesCount ?? 0,
+    erroredIssuesCount: scopedSyncState.erroredIssuesCount ?? 0
+  };
+  const nextSyncState = resolution === "cancelled" || Boolean(scopedSyncState.cancelRequestedAt?.trim()) ? createCancelledSyncState({
+    message: buildCancelledSyncMessage(void 0, progress),
+    trigger,
+    ...syncCounts,
+    ...progress ? { progress } : {}
+  }) : (() => {
+    const errorDetails = normalizeSyncErrorDetails({
+      ...getInterruptedSyncFailurePhase(progress) ? { phase: getInterruptedSyncFailurePhase(progress) } : {},
+      ...progress?.currentRepositoryUrl ? { repositoryUrl: progress.currentRepositoryUrl } : {},
+      ...typeof progress?.currentIssueNumber === "number" ? { githubIssueNumber: progress.currentIssueNumber } : {},
+      rawMessage: INTERRUPTED_SYNC_MESSAGE,
+      suggestedAction: INTERRUPTED_SYNC_ACTION
+    });
+    const message = buildInterruptedSyncMessage(progress);
+    return createErrorSyncState({
+      message,
+      trigger,
+      ...syncCounts,
+      ...progress ? { progress } : {},
+      ...errorDetails ? { errorDetails } : {},
+      recentFailures: appendRecentSyncFailureLogEntry(
+        scopedSyncState.recentFailures,
+        createSyncFailureLogEntry({
+          message,
+          ...errorDetails ? { errorDetails } : {}
+        })
+      )
+    });
+  })();
+  const next = await saveSettingsSyncState(ctx, current, nextSyncState, normalizedCompanyId);
+  await setSyncCancellationRequest(ctx, null);
+  return next;
+}
+function resolvePersistedRunningSyncCompanyId(settings) {
+  if (normalizeSyncState(settings.syncState).status === "running") {
+    return void 0;
+  }
+  const runningCompanyIds = Object.entries(settings.syncStateByCompanyId ?? {}).flatMap(([companyId, syncState]) => {
+    const normalizedCompanyId = normalizeCompanyId(companyId);
+    return normalizedCompanyId && normalizeSyncState(syncState).status === "running" ? [normalizedCompanyId] : [];
+  });
+  return runningCompanyIds.length === 1 ? runningCompanyIds[0] : null;
+}
 function buildCancelledSyncMessage(target, progress) {
   const completedIssueCount = typeof progress?.completedIssueCount === "number" ? Math.max(0, progress.completedIssueCount) : void 0;
   const totalIssueCount = typeof progress?.totalIssueCount === "number" ? Math.max(0, progress.totalIssueCount) : void 0;
@@ -2949,11 +3042,11 @@ async function waitForSyncResultWithinGracePeriod(promise, timeoutMs) {
 }
 async function getActiveOrCurrentSyncState(ctx, companyId) {
   const normalizedCompanyId = normalizeCompanyId(companyId);
-  if (activeRunningSyncState?.syncState.status === "running" && activeRunningSyncCompanyId === normalizedCompanyId) {
-    return materializeScopedSettings(activeRunningSyncState, null, normalizedCompanyId);
+  const activeRunningSync = getActiveRunningSyncForScope(normalizedCompanyId);
+  if (activeRunningSync) {
+    return activeRunningSync;
   }
-  const current = normalizeSettings(await ctx.state.get(SETTINGS_SCOPE));
-  return materializeScopedSettings(current, null, normalizedCompanyId);
+  return reconcileOrphanedRunningSyncState(ctx, normalizedCompanyId);
 }
 function updateSyncFailureContext(current, next) {
   if ("phase" in next) {
@@ -9467,6 +9560,9 @@ function shouldRunScheduledSync(settings, scheduledAt) {
   if (getActiveGitHubRateLimitPause(settings.syncState, now)) {
     return false;
   }
+  if (settings.syncState.status === "running") {
+    return false;
+  }
   if (!settings.syncState.checkedAt) {
     return true;
   }
@@ -9956,28 +10052,25 @@ async function performSync(ctx, trigger, options = {}) {
       await ctx.state.set(IMPORT_REGISTRY_SCOPE, nextRegistry);
       return materializeScopedSettings(next2, config, targetCompanyId);
     }
-    const next = {
-      ...currentSettings,
-      syncState: {
-        status: "success",
-        message: `${options.target ? `GitHub sync for ${options.target.displayLabel} is complete. ` : "Sync complete. "}Imported ${createdIssuesCount} issues, updated ${updatedStatusesCount} issue status${updatedStatusesCount === 1 ? "" : "es"}, updated ${updatedLabelsCount} issue label set${updatedLabelsCount === 1 ? "" : "s"}, updated ${updatedDescriptionsCount} issue description${updatedDescriptionsCount === 1 ? "" : "s"}, and skipped ${skippedIssuesCount} already-synced issue${skippedIssuesCount === 1 ? "" : "s"}.`,
-        checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        syncedIssuesCount,
-        createdIssuesCount,
-        skippedIssuesCount,
-        erroredIssuesCount: 0,
-        lastRunTrigger: trigger
-      }
+    const nextSyncState = {
+      status: "success",
+      message: `${options.target ? `GitHub sync for ${options.target.displayLabel} is complete. ` : "Sync complete. "}Imported ${createdIssuesCount} issues, updated ${updatedStatusesCount} issue status${updatedStatusesCount === 1 ? "" : "es"}, updated ${updatedLabelsCount} issue label set${updatedLabelsCount === 1 ? "" : "s"}, updated ${updatedDescriptionsCount} issue description${updatedDescriptionsCount === 1 ? "" : "s"}, and skipped ${skippedIssuesCount} already-synced issue${skippedIssuesCount === 1 ? "" : "s"}.`,
+      checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      syncedIssuesCount,
+      createdIssuesCount,
+      skippedIssuesCount,
+      erroredIssuesCount: 0,
+      lastRunTrigger: trigger
     };
-    await ctx.state.set(SETTINGS_SCOPE, next);
-    await ctx.state.set(SYNC_STATE_SCOPE, next.syncState);
+    const next = await saveSettingsSyncState(ctx, currentSettings, nextSyncState, targetCompanyId);
     await ctx.state.set(IMPORT_REGISTRY_SCOPE, nextRegistry);
     return next;
   } catch (error) {
     if (error instanceof SyncCancellationError) {
-      const next2 = {
-        ...currentSettings,
-        syncState: createCancelledSyncState({
+      const next2 = await saveSettingsSyncState(
+        ctx,
+        currentSettings,
+        createCancelledSyncState({
           message: buildCancelledSyncMessage(options.target, currentProgress),
           trigger,
           syncedIssuesCount,
@@ -9985,10 +10078,9 @@ async function performSync(ctx, trigger, options = {}) {
           skippedIssuesCount,
           erroredIssuesCount: recoverableFailures.length,
           progress: currentProgress
-        })
-      };
-      await ctx.state.set(SETTINGS_SCOPE, next2);
-      await ctx.state.set(SYNC_STATE_SCOPE, next2.syncState);
+        }),
+        targetCompanyId
+      );
       await ctx.state.set(IMPORT_REGISTRY_SCOPE, nextRegistry);
       return next2;
     }
@@ -10026,6 +10118,7 @@ async function startSync(ctx, trigger, options = {}) {
     );
     return quickResult2 ?? await getActiveOrCurrentSyncState(ctx);
   }
+  await reconcileOrphanedRunningSyncState(ctx, options.target?.companyId);
   const [config, persistedSettings] = await Promise.all([
     getResolvedConfig(ctx),
     ctx.state.get(SETTINGS_SCOPE).then((value) => normalizeSettings(value))
@@ -10893,6 +10986,7 @@ var plugin = definePlugin({
       const record = input && typeof input === "object" ? input : {};
       const requestedCompanyId = normalizeCompanyId(record.companyId);
       const includeAssignees = Boolean(requestedCompanyId && record.includeAssignees === true);
+      await reconcileOrphanedRunningSyncState(ctx, requestedCompanyId);
       const saved = await ctx.state.get(SETTINGS_SCOPE);
       const importRegistry = normalizeImportRegistry(await ctx.state.get(IMPORT_REGISTRY_SCOPE));
       const normalizedSettings = normalizeSettings(saved);
@@ -11179,7 +11273,12 @@ var plugin = definePlugin({
       });
     });
     ctx.actions.register("sync.cancel", async () => {
-      const currentSettings = await getActiveOrCurrentSyncState(ctx, activeRunningSyncCompanyId);
+      const persistedRunningSyncCompanyId = activeRunningSyncState?.syncState.status === "running" ? activeRunningSyncCompanyId : resolvePersistedRunningSyncCompanyId(normalizeSettings(await ctx.state.get(SETTINGS_SCOPE)));
+      const currentSettings = await reconcileOrphanedRunningSyncState(
+        ctx,
+        persistedRunningSyncCompanyId === null ? void 0 : persistedRunningSyncCompanyId,
+        "cancelled"
+      );
       if (currentSettings.syncState.status !== "running") {
         return currentSettings;
       }
@@ -11200,7 +11299,7 @@ var plugin = definePlugin({
           message: CANCELLING_SYNC_MESSAGE,
           cancelRequestedAt: cancellationRequest.requestedAt
         }),
-        activeRunningSyncCompanyId
+        persistedRunningSyncCompanyId === null ? void 0 : persistedRunningSyncCompanyId
       );
       activeRunningSyncState = next;
       return next;
@@ -11211,14 +11310,15 @@ var plugin = definePlugin({
       const trigger = job.trigger === "retry" ? "retry" : "schedule";
       const scheduledTargets = listScheduledSyncTargets(settings);
       if (scheduledTargets.length === 0) {
-        if (job.trigger === "schedule" && !shouldRunScheduledSync(settings, job.scheduledAt)) {
+        const reconciledSettings = await reconcileOrphanedRunningSyncState(ctx);
+        if (job.trigger === "schedule" && !shouldRunScheduledSync(reconciledSettings, job.scheduledAt)) {
           return;
         }
         await startSync(ctx, trigger);
         return;
       }
       for (const target of scheduledTargets) {
-        const scopedSettings = materializeScopedSettings(settings, null, target?.companyId);
+        const scopedSettings = await reconcileOrphanedRunningSyncState(ctx, target?.companyId);
         if (job.trigger === "schedule" && !shouldRunScheduledSync(scopedSettings, job.scheduledAt)) {
           continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-github-plugin",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Paperclip plugin for synchronizing GitHub issues into Paperclip projects.",
   "license": "Apache-2.0",
   "type": "module",