@ricsam/r5d-worker 0.0.33 → 0.0.34

package/dist/cjs/main.cjs

@@ -43,6 +43,7 @@ __export(main_exports, {
   resolveHostShell: () => resolveHostShell,
   resolveProjectFilePath: () => resolveProjectFilePath,
   resolveWorkerFilePath: () => resolveWorkerFilePath,
+  selectManifestSyncTargets: () => selectManifestSyncTargets,
   syncManifestProjectsFromInternal: () => syncManifestProjectsFromInternal,
   syncProjectPlans: () => syncProjectPlans,
   syncSessionArtifacts: () => syncSessionArtifacts
@@ -1162,11 +1163,28 @@ function findRepositorySyncBlockers(input) {
   }
   return blockedBy;
 }
+function selectManifestSyncTargets(input) {
+  if (!input.requestedTargets) {
+    return input.manifests.flatMap((manifest) => {
+      const branches = manifest.branches.length > 0 ? manifest.branches : [manifest.defaultBranch || "main"];
+      return [...new Set(branches)].map((branchName) => ({ manifest, branchName }));
+    });
+  }
+  const manifestsByProjectId = new Map(input.manifests.map((manifest) => [manifest.projectId, manifest]));
+  const selected = /* @__PURE__ */ new Map();
+  for (const target of input.requestedTargets) {
+    const manifest = manifestsByProjectId.get(target.projectId);
+    if (!manifest) {
+      continue;
+    }
+    selected.set(`${target.projectId}\0${target.branchName}`, { manifest, branchName: target.branchName });
+  }
+  return [...selected.values()];
+}
 async function syncManifestProjectsFromInternal(input) {
-  const requestedProjectIds = input.projectIds ? new Set(input.projectIds) : null;
-  const targets = input.manifests.filter((manifest) => !requestedProjectIds || requestedProjectIds.has(manifest.projectId)).flatMap((manifest) => {
-    const branches = manifest.branches.length > 0 ? manifest.branches : [manifest.defaultBranch || "main"];
-    return [...new Set(branches)].map((branchName) => ({ manifest, branchName }));
+  const targets = selectManifestSyncTargets({
+    manifests: input.manifests,
+    requestedTargets: input.requestedTargets
   });
   const blockedBy = findRepositorySyncBlockers({
     targets: targets.map(({ manifest, branchName }) => ({
@@ -1185,11 +1203,12 @@ async function syncManifestProjectsFromInternal(input) {
       branchName: active.branchName
     }))
   });
-  if (blockedBy.length > 0) {
-    return { status: "blocked", results: [], blockedBy };
-  }
+  const blockedTargetKeys = new Set(blockedBy.map((blocker) => `${blocker.projectId}\0${blocker.branchName}`));
   const results = [];
   for (const { manifest, branchName } of targets) {
+    if (blockedTargetKeys.has(`${manifest.projectId}\0${branchName}`)) {
+      continue;
+    }
     try {
       const commitHash = await forceSyncManifestBranchFromInternal({
         projectId: manifest.projectId,
@@ -1217,10 +1236,11 @@ async function syncManifestProjectsFromInternal(input) {
       });
     }
   }
+  const hasFailures = results.some((result) => result.status === "failed");
   return {
-    status: results.some((result) => result.status === "failed") ? "partial" : "completed",
+    status: blockedBy.length > 0 && results.length === 0 ? "blocked" : blockedBy.length > 0 || hasFailures ? "partial" : "completed",
     results,
-    blockedBy: []
+    blockedBy
   };
 }
 function resolveCommandCwd(branchPath, cwd) {
@@ -2580,7 +2600,7 @@ async function startWorker(options) {
               projectsRoot,
               syncRoot,
               manifests: [...manifestByProjectId.values()],
-              projectIds: message.projectIds
+              requestedTargets: message.targets
             });
             for (const result of syncResult.results) {
               if (result.status !== "synced") continue;
@@ -2948,6 +2968,7 @@ if (isCliEntrypoint()) {
   resolveHostShell,
   resolveProjectFilePath,
   resolveWorkerFilePath,
+  selectManifestSyncTargets,
   syncManifestProjectsFromInternal,
   syncProjectPlans,
   syncSessionArtifacts

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -1112,11 +1112,28 @@ function findRepositorySyncBlockers(input) {
   }
   return blockedBy;
 }
+function selectManifestSyncTargets(input) {
+  if (!input.requestedTargets) {
+    return input.manifests.flatMap((manifest) => {
+      const branches = manifest.branches.length > 0 ? manifest.branches : [manifest.defaultBranch || "main"];
+      return [...new Set(branches)].map((branchName) => ({ manifest, branchName }));
+    });
+  }
+  const manifestsByProjectId = new Map(input.manifests.map((manifest) => [manifest.projectId, manifest]));
+  const selected = /* @__PURE__ */ new Map();
+  for (const target of input.requestedTargets) {
+    const manifest = manifestsByProjectId.get(target.projectId);
+    if (!manifest) {
+      continue;
+    }
+    selected.set(`${target.projectId}\0${target.branchName}`, { manifest, branchName: target.branchName });
+  }
+  return [...selected.values()];
+}
 async function syncManifestProjectsFromInternal(input) {
-  const requestedProjectIds = input.projectIds ? new Set(input.projectIds) : null;
-  const targets = input.manifests.filter((manifest) => !requestedProjectIds || requestedProjectIds.has(manifest.projectId)).flatMap((manifest) => {
-    const branches = manifest.branches.length > 0 ? manifest.branches : [manifest.defaultBranch || "main"];
-    return [...new Set(branches)].map((branchName) => ({ manifest, branchName }));
+  const targets = selectManifestSyncTargets({
+    manifests: input.manifests,
+    requestedTargets: input.requestedTargets
   });
   const blockedBy = findRepositorySyncBlockers({
     targets: targets.map(({ manifest, branchName }) => ({
@@ -1135,11 +1152,12 @@ async function syncManifestProjectsFromInternal(input) {
       branchName: active.branchName
     }))
   });
-  if (blockedBy.length > 0) {
-    return { status: "blocked", results: [], blockedBy };
-  }
+  const blockedTargetKeys = new Set(blockedBy.map((blocker) => `${blocker.projectId}\0${blocker.branchName}`));
   const results = [];
   for (const { manifest, branchName } of targets) {
+    if (blockedTargetKeys.has(`${manifest.projectId}\0${branchName}`)) {
+      continue;
+    }
     try {
       const commitHash = await forceSyncManifestBranchFromInternal({
         projectId: manifest.projectId,
@@ -1167,10 +1185,11 @@ async function syncManifestProjectsFromInternal(input) {
       });
     }
   }
+  const hasFailures = results.some((result) => result.status === "failed");
   return {
-    status: results.some((result) => result.status === "failed") ? "partial" : "completed",
+    status: blockedBy.length > 0 && results.length === 0 ? "blocked" : blockedBy.length > 0 || hasFailures ? "partial" : "completed",
     results,
-    blockedBy: []
+    blockedBy
   };
 }
 function resolveCommandCwd(branchPath, cwd) {
@@ -2530,7 +2549,7 @@ async function startWorker(options) {
               projectsRoot,
               syncRoot,
               manifests: [...manifestByProjectId.values()],
-              projectIds: message.projectIds
+              requestedTargets: message.targets
             });
             for (const result of syncResult.results) {
               if (result.status !== "synced") continue;
@@ -2897,6 +2916,7 @@ export {
   resolveHostShell,
   resolveProjectFilePath,
   resolveWorkerFilePath,
+  selectManifestSyncTargets,
   syncManifestProjectsFromInternal,
   syncProjectPlans,
   syncSessionArtifacts

package/dist/mjs/package.json

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

package/dist/types/main.d.ts

@@ -26,6 +26,10 @@ type WorkerRepositorySyncTarget = {
     projectPath: string;
     branchName: string;
 };
+type WorkerRepositorySyncSelector = {
+    projectId: string;
+    branchName: string;
+};
 type WorkerRepositorySyncResult = {
     status: "completed" | "partial" | "blocked";
     results: Array<WorkerRepositorySyncTarget & ({
@@ -142,13 +146,20 @@ export declare function findRepositorySyncBlockers(input: {
         branchName: string;
     }>;
 }): WorkerRepositorySyncResult["blockedBy"];
+export declare function selectManifestSyncTargets(input: {
+    manifests: WorkerProjectManifestEntry[];
+    requestedTargets?: WorkerRepositorySyncSelector[];
+}): Array<{
+    manifest: WorkerProjectManifestEntry;
+    branchName: string;
+}>;
 export declare function syncManifestProjectsFromInternal(input: {
     baseUrl: string;
     token: string;
     projectsRoot: string;
     syncRoot: string;
     manifests: WorkerProjectManifestEntry[];
-    projectIds?: string[];
+    requestedTargets?: WorkerRepositorySyncSelector[];
 }): Promise<WorkerRepositorySyncResult>;
 export declare function readWorkerTextFile(branchPath: string, filePath: string, offset?: number, limit?: number): WorkerReadFileResult;
 export declare function grepWorkerFiles(branchPath: string, input: {

package/package.json

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