@ricsam/r5d-worker 0.0.43 → 0.0.45

package/dist/cjs/main.cjs

@@ -431,21 +431,32 @@ async function fetchSessionArtifactManifest(input) {
     label: "artifact"
   });
 }
+const sessionArtifactSyncQueues = /* @__PURE__ */ new Map();
 async function syncSessionArtifacts(input) {
-  const targetDir = sessionArtifactDir(input.artifactRoot, input.sessionId);
-  const artifacts = await fetchSessionArtifactManifest(input);
-  return syncRemoteFileSet({
-    targetDir,
-    files: artifacts,
-    label: "Artifact path",
-    download: (artifact) => downloadRemoteSyncedFile({
-      url: artifactDownloadUrl(input.baseUrl, input.projectId, input.branchName, input.sessionId, artifact.filename),
-      token: input.token,
+  const queueKey = `${import_node_path.default.resolve(input.artifactRoot)}\0${input.sessionId}`;
+  const previous = sessionArtifactSyncQueues.get(queueKey);
+  const queued = (previous ? previous.catch(() => "") : Promise.resolve("")).then(async () => {
+    const targetDir = sessionArtifactDir(input.artifactRoot, input.sessionId);
+    const artifacts = await fetchSessionArtifactManifest(input);
+    return syncRemoteFileSet({
       targetDir,
-      file: artifact,
-      label: "artifact"
-    })
+      files: artifacts,
+      label: "Artifact path",
+      download: (artifact) => downloadRemoteSyncedFile({
+        url: artifactDownloadUrl(input.baseUrl, input.projectId, input.branchName, input.sessionId, artifact.filename),
+        token: input.token,
+        targetDir,
+        file: artifact,
+        label: "artifact"
+      })
+    });
   });
+  sessionArtifactSyncQueues.set(queueKey, queued);
+  const release = () => {
+    if (sessionArtifactSyncQueues.get(queueKey) === queued) sessionArtifactSyncQueues.delete(queueKey);
+  };
+  void queued.then(release, release);
+  return queued;
 }
 async function resolveArtifactEnvFilePath(input) {
   if (!isArtifactEnvPath(input.filePath)) {
@@ -2091,6 +2102,7 @@ async function startWorker(options) {
   let periodicWorkspaceScanInFlight = false;
   let terminalReplayTimer;
   let workspaceSyncRequestsInFlight = 0;
+  let sessionArtifactSyncRequestsInFlight = 0;
   let cliUpdateInProgress = false;
   let reloadAfterClose = false;
   const workspaceSyncInput = (trigger, overrides = {}) => {
@@ -2287,6 +2299,34 @@ async function startWorker(options) {
         }
         return;
       }
+      if (message.type === "sync_session_artifacts") {
+        sessionArtifactSyncRequestsInFlight += 1;
+        try {
+          await syncSessionArtifacts({
+            baseUrl,
+            token,
+            projectId: message.projectId,
+            branchName: message.branchName,
+            sessionId: message.sessionId,
+            artifactRoot
+          });
+          sendWorkerMessage(ws, {
+            type: "session_artifacts_sync_result",
+            requestId: message.requestId,
+            sessionId: message.sessionId
+          });
+        } catch (error) {
+          sendWorkerMessage(ws, {
+            type: "session_artifacts_sync_result",
+            requestId: message.requestId,
+            sessionId: message.sessionId,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        } finally {
+          sessionArtifactSyncRequestsInFlight -= 1;
+        }
+        return;
+      }
       if (message.type === "workspace_incident_updated") {
         activeWorkspaceIncidentId = message.status === "remediating" || message.status === "waiting_for_worker" ? message.incidentId : null;
         previousPeriodicFingerprint = null;
@@ -2305,7 +2345,7 @@ async function startWorker(options) {
           });
           return;
         }
-        if (activeProcesses.size > 0 || activePtys.size > 0 || workspaceSyncRequestsInFlight > 0) {
+        if (activeProcesses.size > 0 || activePtys.size > 0 || workspaceSyncRequestsInFlight > 0 || sessionArtifactSyncRequestsInFlight > 0) {
           sendWorkerMessage(ws, {
             type: "update_clis_result",
             requestId: message.requestId,

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -395,21 +395,32 @@ async function fetchSessionArtifactManifest(input) {
     label: "artifact"
   });
 }
+const sessionArtifactSyncQueues = /* @__PURE__ */ new Map();
 async function syncSessionArtifacts(input) {
-  const targetDir = sessionArtifactDir(input.artifactRoot, input.sessionId);
-  const artifacts = await fetchSessionArtifactManifest(input);
-  return syncRemoteFileSet({
-    targetDir,
-    files: artifacts,
-    label: "Artifact path",
-    download: (artifact) => downloadRemoteSyncedFile({
-      url: artifactDownloadUrl(input.baseUrl, input.projectId, input.branchName, input.sessionId, artifact.filename),
-      token: input.token,
+  const queueKey = `${path.resolve(input.artifactRoot)}\0${input.sessionId}`;
+  const previous = sessionArtifactSyncQueues.get(queueKey);
+  const queued = (previous ? previous.catch(() => "") : Promise.resolve("")).then(async () => {
+    const targetDir = sessionArtifactDir(input.artifactRoot, input.sessionId);
+    const artifacts = await fetchSessionArtifactManifest(input);
+    return syncRemoteFileSet({
       targetDir,
-      file: artifact,
-      label: "artifact"
-    })
+      files: artifacts,
+      label: "Artifact path",
+      download: (artifact) => downloadRemoteSyncedFile({
+        url: artifactDownloadUrl(input.baseUrl, input.projectId, input.branchName, input.sessionId, artifact.filename),
+        token: input.token,
+        targetDir,
+        file: artifact,
+        label: "artifact"
+      })
+    });
   });
+  sessionArtifactSyncQueues.set(queueKey, queued);
+  const release = () => {
+    if (sessionArtifactSyncQueues.get(queueKey) === queued) sessionArtifactSyncQueues.delete(queueKey);
+  };
+  void queued.then(release, release);
+  return queued;
 }
 async function resolveArtifactEnvFilePath(input) {
   if (!isArtifactEnvPath(input.filePath)) {
@@ -2055,6 +2066,7 @@ async function startWorker(options) {
   let periodicWorkspaceScanInFlight = false;
   let terminalReplayTimer;
   let workspaceSyncRequestsInFlight = 0;
+  let sessionArtifactSyncRequestsInFlight = 0;
   let cliUpdateInProgress = false;
   let reloadAfterClose = false;
   const workspaceSyncInput = (trigger, overrides = {}) => {
@@ -2251,6 +2263,34 @@ async function startWorker(options) {
         }
         return;
       }
+      if (message.type === "sync_session_artifacts") {
+        sessionArtifactSyncRequestsInFlight += 1;
+        try {
+          await syncSessionArtifacts({
+            baseUrl,
+            token,
+            projectId: message.projectId,
+            branchName: message.branchName,
+            sessionId: message.sessionId,
+            artifactRoot
+          });
+          sendWorkerMessage(ws, {
+            type: "session_artifacts_sync_result",
+            requestId: message.requestId,
+            sessionId: message.sessionId
+          });
+        } catch (error) {
+          sendWorkerMessage(ws, {
+            type: "session_artifacts_sync_result",
+            requestId: message.requestId,
+            sessionId: message.sessionId,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        } finally {
+          sessionArtifactSyncRequestsInFlight -= 1;
+        }
+        return;
+      }
       if (message.type === "workspace_incident_updated") {
         activeWorkspaceIncidentId = message.status === "remediating" || message.status === "waiting_for_worker" ? message.incidentId : null;
         previousPeriodicFingerprint = null;
@@ -2269,7 +2309,7 @@ async function startWorker(options) {
           });
           return;
         }
-        if (activeProcesses.size > 0 || activePtys.size > 0 || workspaceSyncRequestsInFlight > 0) {
+        if (activeProcesses.size > 0 || activePtys.size > 0 || workspaceSyncRequestsInFlight > 0 || sessionArtifactSyncRequestsInFlight > 0) {
           sendWorkerMessage(ws, {
             type: "update_clis_result",
             requestId: message.requestId,

package/dist/mjs/package.json

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

package/package.json

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