@ricsam/r5d-worker 0.0.119 → 0.0.120

package/dist/cjs/main.cjs

@@ -5913,7 +5913,15 @@ async function startWorker(options, projectRuntime = {
       }
       if (message.type === "workspace_config") {
         const receiptGeneration = ++workspaceConfigurationReceiptGeneration;
-        const refreshesDeferredConfiguration = deferredWorkspaceConfiguration !== null && activeWorkspaceIncidentId === null && message.deferWorkspaceSyncForIncidentId === void 0;
+        const refreshesDeferredConfiguration = (0, import_workspace_incident_state.workspaceConfigurationRefreshesDeferredConfiguration)({
+          deferredIncidentId: deferredWorkspaceConfiguration?.incidentId ?? null,
+          activeIncidentId: activeWorkspaceIncidentId,
+          requestedDeferredIncidentId: message.deferWorkspaceSyncForIncidentId
+        });
+        if (refreshesDeferredConfiguration && deferredWorkspaceConfigurationRefreshTimer) {
+          clearTimeout(deferredWorkspaceConfigurationRefreshTimer);
+          deferredWorkspaceConfigurationRefreshTimer = void 0;
+        }
         const digest = (0, import_recovery_store.workerOperationDigest)(message);
         const cached = projectRuntime.configuration;
         const canReuseConfiguration = cached?.digest === digest && cached.workspaceSync?.remoteUrl === message.workspaceRemoteUrl && Boolean(cached.workspaceSync.credentialHelper) && cached.workspaceSync.credentialUsername === workerCredentialUsername && cached.workspaceSync.gitIdentity?.name === message.gitIdentity.name && cached.workspaceSync.gitIdentity?.email === message.gitIdentity.email && !unsafeWorkspaceSyncBouncePending && credentialGenerationFingerprint({ ...message, workerBaseUrl: baseUrl, workerAuthHeader: bearerAuthHeader }) === configuredCredentialGenerationFingerprint;

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.119",
+  "version": "0.0.120",
   "type": "commonjs"
 }

package/dist/cjs/workspace-incident-state.cjs

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var workspace_incident_state_exports = {};
 __export(workspace_incident_state_exports, {
-  applyWorkspaceIncidentUpdate: () => applyWorkspaceIncidentUpdate
+  applyWorkspaceIncidentUpdate: () => applyWorkspaceIncidentUpdate,
+  workspaceConfigurationRefreshesDeferredConfiguration: () => workspaceConfigurationRefreshesDeferredConfiguration
 });
 module.exports = __toCommonJS(workspace_incident_state_exports);
 function applyWorkspaceIncidentUpdate(currentIncidentId, update) {
@@ -26,7 +27,11 @@ function applyWorkspaceIncidentUpdate(currentIncidentId, update) {
   if (currentIncidentId && update.incidentId && update.incidentId !== currentIncidentId) return currentIncidentId;
   return null;
 }
+function workspaceConfigurationRefreshesDeferredConfiguration(input) {
+  return input.deferredIncidentId !== null && input.activeIncidentId === null && input.requestedDeferredIncidentId === void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  applyWorkspaceIncidentUpdate
+  applyWorkspaceIncidentUpdate,
+  workspaceConfigurationRefreshesDeferredConfiguration
 });

package/dist/mjs/main.mjs

@@ -34,7 +34,7 @@ import {
   registryAuthHasAppManagedGitHubCredential,
   RegistryAuthConfigurationError
 } from "./registry-auth.mjs";
-import { applyWorkspaceIncidentUpdate } from "./workspace-incident-state.mjs";
+import { applyWorkspaceIncidentUpdate, workspaceConfigurationRefreshesDeferredConfiguration } from "./workspace-incident-state.mjs";
 import {
   hasActiveVisibleProjectsWorkspaceTarget,
   PENDING_CREATED_BRANCH_AUTOMATIC_SYNC_GRACE_MS,
@@ -5932,7 +5932,15 @@ async function startWorker(options, projectRuntime = {
       }
       if (message.type === "workspace_config") {
         const receiptGeneration = ++workspaceConfigurationReceiptGeneration;
-        const refreshesDeferredConfiguration = deferredWorkspaceConfiguration !== null && activeWorkspaceIncidentId === null && message.deferWorkspaceSyncForIncidentId === void 0;
+        const refreshesDeferredConfiguration = workspaceConfigurationRefreshesDeferredConfiguration({
+          deferredIncidentId: deferredWorkspaceConfiguration?.incidentId ?? null,
+          activeIncidentId: activeWorkspaceIncidentId,
+          requestedDeferredIncidentId: message.deferWorkspaceSyncForIncidentId
+        });
+        if (refreshesDeferredConfiguration && deferredWorkspaceConfigurationRefreshTimer) {
+          clearTimeout(deferredWorkspaceConfigurationRefreshTimer);
+          deferredWorkspaceConfigurationRefreshTimer = void 0;
+        }
         const digest = workerOperationDigest(message);
         const cached = projectRuntime.configuration;
         const canReuseConfiguration = cached?.digest === digest && cached.workspaceSync?.remoteUrl === message.workspaceRemoteUrl && Boolean(cached.workspaceSync.credentialHelper) && cached.workspaceSync.credentialUsername === workerCredentialUsername && cached.workspaceSync.gitIdentity?.name === message.gitIdentity.name && cached.workspaceSync.gitIdentity?.email === message.gitIdentity.email && !unsafeWorkspaceSyncBouncePending && credentialGenerationFingerprint({ ...message, workerBaseUrl: baseUrl, workerAuthHeader: bearerAuthHeader }) === configuredCredentialGenerationFingerprint;

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.119",
+  "version": "0.0.120",
   "type": "module"
 }

package/dist/mjs/workspace-incident-state.mjs

@@ -3,6 +3,10 @@ function applyWorkspaceIncidentUpdate(currentIncidentId, update) {
   if (currentIncidentId && update.incidentId && update.incidentId !== currentIncidentId) return currentIncidentId;
   return null;
 }
+function workspaceConfigurationRefreshesDeferredConfiguration(input) {
+  return input.deferredIncidentId !== null && input.activeIncidentId === null && input.requestedDeferredIncidentId === void 0;
+}
 export {
-  applyWorkspaceIncidentUpdate
+  applyWorkspaceIncidentUpdate,
+  workspaceConfigurationRefreshesDeferredConfiguration
 };

package/dist/types/workspace-incident-state.d.ts

@@ -3,3 +3,17 @@ export type WorkspaceIncidentUpdate = {
     status: "remediating" | "waiting_for_worker" | "resolved" | "confirmed" | "reset" | null;
 };
 export declare function applyWorkspaceIncidentUpdate(currentIncidentId: string | null, update: WorkspaceIncidentUpdate): string | null;
+/**
+ * Whether an incoming `workspace_config` is the full configuration a terminal
+ * incident update promised: the worker still holds an incident-deferred
+ * configuration, no incident is active any more, and the server did not ask
+ * for another deferral. Arrival of that configuration disarms the refresh
+ * watchdog; from then on the configuration's own generation checks and its
+ * failure close govern, so a legitimately long full configuration is never
+ * cut off mid-flight by the arrival timer.
+ */
+export declare function workspaceConfigurationRefreshesDeferredConfiguration(input: {
+    deferredIncidentId: string | null;
+    activeIncidentId: string | null;
+    requestedDeferredIncidentId: string | undefined;
+}): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.119",
+  "version": "0.0.120",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",