@ricsam/r5d-worker 0.0.34 → 0.0.36

package/dist/cjs/main.cjs

@@ -43,7 +43,6 @@ __export(main_exports, {
   resolveHostShell: () => resolveHostShell,
   resolveProjectFilePath: () => resolveProjectFilePath,
   resolveWorkerFilePath: () => resolveWorkerFilePath,
-  selectManifestSyncTargets: () => selectManifestSyncTargets,
   syncManifestProjectsFromInternal: () => syncManifestProjectsFromInternal,
   syncProjectPlans: () => syncProjectPlans,
   syncSessionArtifacts: () => syncSessionArtifacts
@@ -1163,28 +1162,11 @@ 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 targets = selectManifestSyncTargets({
-    manifests: input.manifests,
-    requestedTargets: input.requestedTargets
+  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 blockedBy = findRepositorySyncBlockers({
     targets: targets.map(({ manifest, branchName }) => ({
@@ -1203,12 +1185,11 @@ async function syncManifestProjectsFromInternal(input) {
       branchName: active.branchName
     }))
   });
-  const blockedTargetKeys = new Set(blockedBy.map((blocker) => `${blocker.projectId}\0${blocker.branchName}`));
+  if (blockedBy.length > 0) {
+    return { status: "blocked", results: [], blockedBy };
+  }
   const results = [];
   for (const { manifest, branchName } of targets) {
-    if (blockedTargetKeys.has(`${manifest.projectId}\0${branchName}`)) {
-      continue;
-    }
     try {
       const commitHash = await forceSyncManifestBranchFromInternal({
         projectId: manifest.projectId,
@@ -1236,11 +1217,10 @@ async function syncManifestProjectsFromInternal(input) {
       });
     }
   }
-  const hasFailures = results.some((result) => result.status === "failed");
   return {
-    status: blockedBy.length > 0 && results.length === 0 ? "blocked" : blockedBy.length > 0 || hasFailures ? "partial" : "completed",
+    status: results.some((result) => result.status === "failed") ? "partial" : "completed",
     results,
-    blockedBy
+    blockedBy: []
   };
 }
 function resolveCommandCwd(branchPath, cwd) {
@@ -1959,9 +1939,12 @@ async function executeCommand(input) {
       projectId: input.projectId,
       sessionId: input.message.sessionId ?? "",
       branchName: input.message.branchName,
+      mode: "foreground",
+      pid: subprocess.pid,
+      processGroupId: process.platform === "win32" ? void 0 : subprocess.pid,
       argv: input.message.argv,
       command: input.message.argv.join(" "),
-      cwd: input.message.cwd,
+      cwd,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     if (input.message.timeoutMs) {
@@ -2064,17 +2047,23 @@ async function executeStreamingCommand(input) {
       projectId: input.projectId,
       sessionId: input.message.sessionId,
       branchName: input.message.branchName,
+      mode: input.message.mode,
+      pid: subprocess.pid,
+      processGroupId: process.platform === "win32" ? void 0 : subprocess.pid,
       credentialId: input.message.credentialId,
       argv: input.message.argv,
       command: input.message.command,
-      cwd: input.message.cwd,
+      cwd,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     started = true;
     sendWorkerMessage(input.ws, {
       type: "exec_started",
       requestId: input.message.requestId,
-      runId: input.message.runId
+      runId: input.message.runId,
+      cwd,
+      pid: subprocess.pid,
+      ...process.platform === "win32" ? {} : { processGroupId: subprocess.pid }
     });
     if (input.message.timeoutMs) {
       timeout = setTimeout(() => {
@@ -2153,6 +2142,11 @@ function buildActiveProcessReports() {
     projectId: active.projectId,
     sessionId: active.sessionId,
     branchName: active.branchName,
+    platform: process.platform,
+    arch: process.arch,
+    mode: active.mode,
+    ...active.pid !== void 0 ? { pid: active.pid } : {},
+    ...active.processGroupId !== void 0 ? { processGroupId: active.processGroupId } : {},
     ...active.credentialId ? { credentialId: active.credentialId } : {},
     argv: active.argv,
     command: active.command,
@@ -2600,7 +2594,7 @@ async function startWorker(options) {
               projectsRoot,
               syncRoot,
               manifests: [...manifestByProjectId.values()],
-              requestedTargets: message.targets
+              projectIds: message.projectIds
             });
             for (const result of syncResult.results) {
               if (result.status !== "synced") continue;
@@ -2968,7 +2962,6 @@ 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.34",
+  "version": "0.0.36",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -1112,28 +1112,11 @@ 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 targets = selectManifestSyncTargets({
-    manifests: input.manifests,
-    requestedTargets: input.requestedTargets
+  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 blockedBy = findRepositorySyncBlockers({
     targets: targets.map(({ manifest, branchName }) => ({
@@ -1152,12 +1135,11 @@ async function syncManifestProjectsFromInternal(input) {
       branchName: active.branchName
     }))
   });
-  const blockedTargetKeys = new Set(blockedBy.map((blocker) => `${blocker.projectId}\0${blocker.branchName}`));
+  if (blockedBy.length > 0) {
+    return { status: "blocked", results: [], blockedBy };
+  }
   const results = [];
   for (const { manifest, branchName } of targets) {
-    if (blockedTargetKeys.has(`${manifest.projectId}\0${branchName}`)) {
-      continue;
-    }
     try {
       const commitHash = await forceSyncManifestBranchFromInternal({
         projectId: manifest.projectId,
@@ -1185,11 +1167,10 @@ async function syncManifestProjectsFromInternal(input) {
       });
     }
   }
-  const hasFailures = results.some((result) => result.status === "failed");
   return {
-    status: blockedBy.length > 0 && results.length === 0 ? "blocked" : blockedBy.length > 0 || hasFailures ? "partial" : "completed",
+    status: results.some((result) => result.status === "failed") ? "partial" : "completed",
     results,
-    blockedBy
+    blockedBy: []
   };
 }
 function resolveCommandCwd(branchPath, cwd) {
@@ -1908,9 +1889,12 @@ async function executeCommand(input) {
       projectId: input.projectId,
       sessionId: input.message.sessionId ?? "",
       branchName: input.message.branchName,
+      mode: "foreground",
+      pid: subprocess.pid,
+      processGroupId: process.platform === "win32" ? void 0 : subprocess.pid,
       argv: input.message.argv,
       command: input.message.argv.join(" "),
-      cwd: input.message.cwd,
+      cwd,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     if (input.message.timeoutMs) {
@@ -2013,17 +1997,23 @@ async function executeStreamingCommand(input) {
       projectId: input.projectId,
       sessionId: input.message.sessionId,
       branchName: input.message.branchName,
+      mode: input.message.mode,
+      pid: subprocess.pid,
+      processGroupId: process.platform === "win32" ? void 0 : subprocess.pid,
       credentialId: input.message.credentialId,
       argv: input.message.argv,
       command: input.message.command,
-      cwd: input.message.cwd,
+      cwd,
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     started = true;
     sendWorkerMessage(input.ws, {
       type: "exec_started",
       requestId: input.message.requestId,
-      runId: input.message.runId
+      runId: input.message.runId,
+      cwd,
+      pid: subprocess.pid,
+      ...process.platform === "win32" ? {} : { processGroupId: subprocess.pid }
     });
     if (input.message.timeoutMs) {
       timeout = setTimeout(() => {
@@ -2102,6 +2092,11 @@ function buildActiveProcessReports() {
     projectId: active.projectId,
     sessionId: active.sessionId,
     branchName: active.branchName,
+    platform: process.platform,
+    arch: process.arch,
+    mode: active.mode,
+    ...active.pid !== void 0 ? { pid: active.pid } : {},
+    ...active.processGroupId !== void 0 ? { processGroupId: active.processGroupId } : {},
     ...active.credentialId ? { credentialId: active.credentialId } : {},
     argv: active.argv,
     command: active.command,
@@ -2549,7 +2544,7 @@ async function startWorker(options) {
               projectsRoot,
               syncRoot,
               manifests: [...manifestByProjectId.values()],
-              requestedTargets: message.targets
+              projectIds: message.projectIds
             });
             for (const result of syncResult.results) {
               if (result.status !== "synced") continue;
@@ -2916,7 +2911,6 @@ export {
   resolveHostShell,
   resolveProjectFilePath,
   resolveWorkerFilePath,
-  selectManifestSyncTargets,
   syncManifestProjectsFromInternal,
   syncProjectPlans,
   syncSessionArtifacts

package/dist/mjs/package.json

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

package/dist/types/main.d.ts

@@ -26,10 +26,6 @@ type WorkerRepositorySyncTarget = {
     projectPath: string;
     branchName: string;
 };
-type WorkerRepositorySyncSelector = {
-    projectId: string;
-    branchName: string;
-};
 type WorkerRepositorySyncResult = {
     status: "completed" | "partial" | "blocked";
     results: Array<WorkerRepositorySyncTarget & ({
@@ -146,20 +142,13 @@ 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[];
-    requestedTargets?: WorkerRepositorySyncSelector[];
+    projectIds?: string[];
 }): 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.34",
+  "version": "0.0.36",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",