@ricsam/r5d-worker 0.0.7 → 0.0.8

package/dist/cjs/main.cjs

@@ -39,6 +39,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const R5D_REMOTE_NAME = "r5d";
 const LEGACY_BUILD_IT_NOW_REMOTE_NAME = "build-it-now";
 const activeProcesses = /* @__PURE__ */ new Map();
+const cancelledProcessRuns = /* @__PURE__ */ new Set();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
 let containerRegistryCredential = null;
@@ -856,6 +857,171 @@ async function executeEditFileOperation(input) {
     file: resolved.virtualPath
   };
 }
+function decodePatchPath(rawPath) {
+  const trimmed = rawPath.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+    try {
+      return JSON.parse(trimmed);
+    } catch {
+      return trimmed.slice(1, -1);
+    }
+  }
+  return trimmed;
+}
+function normalizePatchPath(rawPath) {
+  const withoutMetadata = rawPath.split("	")[0] ?? rawPath;
+  let patchPath = decodePatchPath(withoutMetadata);
+  if (patchPath === "/dev/null") {
+    return null;
+  }
+  if (patchPath.startsWith("a/") || patchPath.startsWith("b/")) {
+    patchPath = patchPath.slice(2);
+  }
+  if (!patchPath || import_node_path.default.isAbsolute(patchPath)) {
+    throw new Error(`Invalid patch path: ${rawPath}`);
+  }
+  const normalized = import_node_path.default.posix.normalize(patchPath);
+  if (normalized === "." || normalized.startsWith("../") || normalized === "..") {
+    throw new Error(`Invalid patch path: ${rawPath}`);
+  }
+  return normalized;
+}
+function readDiffPathToken(value, startIndex) {
+  let index = startIndex;
+  while (index < value.length && /\s/.test(value[index] ?? "")) {
+    index += 1;
+  }
+  if (index >= value.length) {
+    throw new Error("Missing path in patch header");
+  }
+  if (value[index] !== '"') {
+    const tokenStart2 = index;
+    while (index < value.length && !/\s/.test(value[index] ?? "")) {
+      index += 1;
+    }
+    return { token: value.slice(tokenStart2, index), nextIndex: index };
+  }
+  const tokenStart = index;
+  index += 1;
+  let escaped = false;
+  while (index < value.length) {
+    const character = value[index];
+    if (escaped) {
+      escaped = false;
+    } else if (character === "\\") {
+      escaped = true;
+    } else if (character === '"') {
+      index += 1;
+      return { token: value.slice(tokenStart, index), nextIndex: index };
+    }
+    index += 1;
+  }
+  throw new Error("Unterminated quoted path in patch header");
+}
+function parseDiffGitPaths(line) {
+  if (!line.startsWith("diff --git ")) {
+    throw new Error(`Invalid patch header: ${line}`);
+  }
+  const rest = line.slice("diff --git ".length);
+  const first = readDiffPathToken(rest, 0);
+  const second = readDiffPathToken(rest, first.nextIndex);
+  if (rest.slice(second.nextIndex).trim()) {
+    throw new Error(`Invalid patch header: ${line}`);
+  }
+  return {
+    oldPath: normalizePatchPath(first.token),
+    newPath: normalizePatchPath(second.token)
+  };
+}
+function summarizePatch(patch) {
+  if (!patch.trim()) {
+    throw new Error("Patch cannot be empty");
+  }
+  const files = [];
+  let current;
+  for (const line of patch.split(/\r?\n/)) {
+    if (line.startsWith("diff --git ")) {
+      const { oldPath, newPath } = parseDiffGitPaths(line);
+      if (!oldPath && !newPath) {
+        throw new Error(`Invalid patch header: ${line}`);
+      }
+      current = {
+        path: newPath ?? oldPath,
+        ...oldPath && newPath && oldPath !== newPath ? { oldPath } : {},
+        operation: oldPath && newPath && oldPath !== newPath ? "move" : "update",
+        additions: 0,
+        deletions: 0,
+        hunks: 0
+      };
+      files.push(current);
+      continue;
+    }
+    if (!current) {
+      continue;
+    }
+    if (line.startsWith("new file mode ")) {
+      current.operation = "add";
+      continue;
+    }
+    if (line.startsWith("deleted file mode ")) {
+      current.operation = "delete";
+      if (current.oldPath) {
+        current.path = current.oldPath;
+        delete current.oldPath;
+      }
+      continue;
+    }
+    if (line.startsWith("rename from ")) {
+      current.operation = "move";
+      current.oldPath = normalizePatchPath(line.slice("rename from ".length)) ?? void 0;
+      continue;
+    }
+    if (line.startsWith("rename to ")) {
+      current.operation = "move";
+      current.path = normalizePatchPath(line.slice("rename to ".length)) ?? current.path;
+      continue;
+    }
+    if (line.startsWith("@@")) {
+      current.hunks += 1;
+      continue;
+    }
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      current.additions += 1;
+      continue;
+    }
+    if (line.startsWith("-") && !line.startsWith("---")) {
+      current.deletions += 1;
+    }
+  }
+  if (files.length === 0) {
+    throw new Error("Patch must contain at least one diff --git file header");
+  }
+  return files;
+}
+async function executeApplyPatchOperation(input) {
+  const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
+  const files = summarizePatch(input.message.patch);
+  const patchPath = import_node_path.default.join(import_node_os.default.tmpdir(), `r5d-apply-patch-${(0, import_node_crypto.randomUUID)()}.patch`);
+  try {
+    import_node_fs.default.writeFileSync(patchPath, input.message.patch, "utf8");
+    runInternalGit(workspace.internalGit, ["apply", "--check", "--whitespace=nowarn", patchPath]);
+    runInternalGit(workspace.internalGit, ["apply", "--whitespace=nowarn", patchPath]);
+  } catch (error) {
+    throw new Error(`Patch did not apply: ${error instanceof Error ? error.message : String(error)}`);
+  } finally {
+    import_node_fs.default.rmSync(patchPath, { force: true });
+  }
+  return {
+    type: "apply_patch",
+    files,
+    summary: {
+      filesChanged: files.length,
+      additions: files.reduce((sum, file) => sum + file.additions, 0),
+      deletions: files.reduce((sum, file) => sum + file.deletions, 0),
+      hunks: files.reduce((sum, file) => sum + file.hunks, 0)
+    }
+  };
+}
 async function executeViewFileBytesOperation(input) {
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
   const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
@@ -977,6 +1143,8 @@ async function executeOperation(input) {
       return executeCreateFileOperation({ ...input, message: input.message });
     case "edit_file":
       return executeEditFileOperation({ ...input, message: input.message });
+    case "apply_patch":
+      return executeApplyPatchOperation({ ...input, message: input.message });
     case "view_file_bytes":
       return executeViewFileBytesOperation({ ...input, message: input.message });
     case "sync":
@@ -1084,6 +1252,15 @@ async function executeStreamingCommand(input) {
   let started = false;
   let timedOut = false;
   try {
+    if (cancelledProcessRuns.delete(input.message.runId)) {
+      sendWorkerMessage(input.ws, {
+        type: "exec_start_error",
+        requestId: input.message.requestId,
+        runId: input.message.runId,
+        error: "Command cancelled before it started"
+      });
+      return;
+    }
     const branchPath = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
@@ -1165,6 +1342,7 @@ async function executeStreamingCommand(input) {
       clearTimeout(timeout);
     }
     activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
@@ -1557,14 +1735,16 @@ async function startWorker(options) {
         const active = activeProcesses.get(message.runId);
         if (active) {
           active.process.kill("SIGTERM");
+        } else {
+          cancelledProcessRuns.add(message.runId);
         }
         ws.send(
           JSON.stringify({
             type: "cancel_result",
             requestId: message.requestId,
             runId: message.runId,
-            cancelled: !!active,
-            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "No active command with that run id"
+            cancelled: true,
+            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "Cancellation queued before command start"
           })
         );
         return;
@@ -1603,6 +1783,11 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "exec_start") {
+        sendWorkerMessage(ws, {
+          type: "exec_accepted",
+          requestId: message.requestId,
+          runId: message.runId
+        });
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
@@ -1630,7 +1815,7 @@ async function startWorker(options) {
         }
         return;
       }
-      if (message.type === "read_file" || message.type === "create_file" || message.type === "edit_file" || message.type === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
+      if (message.type === "read_file" || message.type === "create_file" || message.type === "edit_file" || message.type === "apply_patch" || message.type === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
@@ -1655,6 +1840,17 @@ async function startWorker(options) {
             })
           );
         }
+        return;
+      }
+      const unhandledMessage = message;
+      if (typeof unhandledMessage.requestId === "string") {
+        ws.send(
+          JSON.stringify({
+            type: "operation_result",
+            requestId: unhandledMessage.requestId,
+            error: `Unsupported worker message type: ${String(unhandledMessage.type)}`
+          })
+        );
       }
     })().catch((error) => {
       process.stderr.write(`[r5d-worker] message handling failed: ${error instanceof Error ? error.message : String(error)}

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -2,7 +2,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { hostname } from "node:os";
 import { spawn as spawnChildProcess } from "node:child_process";
 import { configureVisibleGitIdentity } from "./git-identity.mjs";
@@ -16,6 +16,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const R5D_REMOTE_NAME = "r5d";
 const LEGACY_BUILD_IT_NOW_REMOTE_NAME = "build-it-now";
 const activeProcesses = /* @__PURE__ */ new Map();
+const cancelledProcessRuns = /* @__PURE__ */ new Set();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
 let containerRegistryCredential = null;
@@ -833,6 +834,171 @@ async function executeEditFileOperation(input) {
     file: resolved.virtualPath
   };
 }
+function decodePatchPath(rawPath) {
+  const trimmed = rawPath.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+    try {
+      return JSON.parse(trimmed);
+    } catch {
+      return trimmed.slice(1, -1);
+    }
+  }
+  return trimmed;
+}
+function normalizePatchPath(rawPath) {
+  const withoutMetadata = rawPath.split("	")[0] ?? rawPath;
+  let patchPath = decodePatchPath(withoutMetadata);
+  if (patchPath === "/dev/null") {
+    return null;
+  }
+  if (patchPath.startsWith("a/") || patchPath.startsWith("b/")) {
+    patchPath = patchPath.slice(2);
+  }
+  if (!patchPath || path.isAbsolute(patchPath)) {
+    throw new Error(`Invalid patch path: ${rawPath}`);
+  }
+  const normalized = path.posix.normalize(patchPath);
+  if (normalized === "." || normalized.startsWith("../") || normalized === "..") {
+    throw new Error(`Invalid patch path: ${rawPath}`);
+  }
+  return normalized;
+}
+function readDiffPathToken(value, startIndex) {
+  let index = startIndex;
+  while (index < value.length && /\s/.test(value[index] ?? "")) {
+    index += 1;
+  }
+  if (index >= value.length) {
+    throw new Error("Missing path in patch header");
+  }
+  if (value[index] !== '"') {
+    const tokenStart2 = index;
+    while (index < value.length && !/\s/.test(value[index] ?? "")) {
+      index += 1;
+    }
+    return { token: value.slice(tokenStart2, index), nextIndex: index };
+  }
+  const tokenStart = index;
+  index += 1;
+  let escaped = false;
+  while (index < value.length) {
+    const character = value[index];
+    if (escaped) {
+      escaped = false;
+    } else if (character === "\\") {
+      escaped = true;
+    } else if (character === '"') {
+      index += 1;
+      return { token: value.slice(tokenStart, index), nextIndex: index };
+    }
+    index += 1;
+  }
+  throw new Error("Unterminated quoted path in patch header");
+}
+function parseDiffGitPaths(line) {
+  if (!line.startsWith("diff --git ")) {
+    throw new Error(`Invalid patch header: ${line}`);
+  }
+  const rest = line.slice("diff --git ".length);
+  const first = readDiffPathToken(rest, 0);
+  const second = readDiffPathToken(rest, first.nextIndex);
+  if (rest.slice(second.nextIndex).trim()) {
+    throw new Error(`Invalid patch header: ${line}`);
+  }
+  return {
+    oldPath: normalizePatchPath(first.token),
+    newPath: normalizePatchPath(second.token)
+  };
+}
+function summarizePatch(patch) {
+  if (!patch.trim()) {
+    throw new Error("Patch cannot be empty");
+  }
+  const files = [];
+  let current;
+  for (const line of patch.split(/\r?\n/)) {
+    if (line.startsWith("diff --git ")) {
+      const { oldPath, newPath } = parseDiffGitPaths(line);
+      if (!oldPath && !newPath) {
+        throw new Error(`Invalid patch header: ${line}`);
+      }
+      current = {
+        path: newPath ?? oldPath,
+        ...oldPath && newPath && oldPath !== newPath ? { oldPath } : {},
+        operation: oldPath && newPath && oldPath !== newPath ? "move" : "update",
+        additions: 0,
+        deletions: 0,
+        hunks: 0
+      };
+      files.push(current);
+      continue;
+    }
+    if (!current) {
+      continue;
+    }
+    if (line.startsWith("new file mode ")) {
+      current.operation = "add";
+      continue;
+    }
+    if (line.startsWith("deleted file mode ")) {
+      current.operation = "delete";
+      if (current.oldPath) {
+        current.path = current.oldPath;
+        delete current.oldPath;
+      }
+      continue;
+    }
+    if (line.startsWith("rename from ")) {
+      current.operation = "move";
+      current.oldPath = normalizePatchPath(line.slice("rename from ".length)) ?? void 0;
+      continue;
+    }
+    if (line.startsWith("rename to ")) {
+      current.operation = "move";
+      current.path = normalizePatchPath(line.slice("rename to ".length)) ?? current.path;
+      continue;
+    }
+    if (line.startsWith("@@")) {
+      current.hunks += 1;
+      continue;
+    }
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      current.additions += 1;
+      continue;
+    }
+    if (line.startsWith("-") && !line.startsWith("---")) {
+      current.deletions += 1;
+    }
+  }
+  if (files.length === 0) {
+    throw new Error("Patch must contain at least one diff --git file header");
+  }
+  return files;
+}
+async function executeApplyPatchOperation(input) {
+  const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
+  const files = summarizePatch(input.message.patch);
+  const patchPath = path.join(os.tmpdir(), `r5d-apply-patch-${randomUUID()}.patch`);
+  try {
+    fs.writeFileSync(patchPath, input.message.patch, "utf8");
+    runInternalGit(workspace.internalGit, ["apply", "--check", "--whitespace=nowarn", patchPath]);
+    runInternalGit(workspace.internalGit, ["apply", "--whitespace=nowarn", patchPath]);
+  } catch (error) {
+    throw new Error(`Patch did not apply: ${error instanceof Error ? error.message : String(error)}`);
+  } finally {
+    fs.rmSync(patchPath, { force: true });
+  }
+  return {
+    type: "apply_patch",
+    files,
+    summary: {
+      filesChanged: files.length,
+      additions: files.reduce((sum, file) => sum + file.additions, 0),
+      deletions: files.reduce((sum, file) => sum + file.deletions, 0),
+      hunks: files.reduce((sum, file) => sum + file.hunks, 0)
+    }
+  };
+}
 async function executeViewFileBytesOperation(input) {
   const workspace = ensureOperationBranch({ ...input, branchName: input.message.branchName });
   const resolved = resolveProjectFilePath(workspace.branchPath, input.message.filePath);
@@ -954,6 +1120,8 @@ async function executeOperation(input) {
       return executeCreateFileOperation({ ...input, message: input.message });
     case "edit_file":
       return executeEditFileOperation({ ...input, message: input.message });
+    case "apply_patch":
+      return executeApplyPatchOperation({ ...input, message: input.message });
     case "view_file_bytes":
       return executeViewFileBytesOperation({ ...input, message: input.message });
     case "sync":
@@ -1061,6 +1229,15 @@ async function executeStreamingCommand(input) {
   let started = false;
   let timedOut = false;
   try {
+    if (cancelledProcessRuns.delete(input.message.runId)) {
+      sendWorkerMessage(input.ws, {
+        type: "exec_start_error",
+        requestId: input.message.requestId,
+        runId: input.message.runId,
+        error: "Command cancelled before it started"
+      });
+      return;
+    }
     const branchPath = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
@@ -1142,6 +1319,7 @@ async function executeStreamingCommand(input) {
       clearTimeout(timeout);
     }
     activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
@@ -1534,14 +1712,16 @@ async function startWorker(options) {
         const active = activeProcesses.get(message.runId);
         if (active) {
           active.process.kill("SIGTERM");
+        } else {
+          cancelledProcessRuns.add(message.runId);
         }
         ws.send(
           JSON.stringify({
             type: "cancel_result",
             requestId: message.requestId,
             runId: message.runId,
-            cancelled: !!active,
-            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "No active command with that run id"
+            cancelled: true,
+            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "Cancellation queued before command start"
           })
         );
         return;
@@ -1580,6 +1760,11 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "exec_start") {
+        sendWorkerMessage(ws, {
+          type: "exec_accepted",
+          requestId: message.requestId,
+          runId: message.runId
+        });
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
@@ -1607,7 +1792,7 @@ async function startWorker(options) {
         }
         return;
       }
-      if (message.type === "read_file" || message.type === "create_file" || message.type === "edit_file" || message.type === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
+      if (message.type === "read_file" || message.type === "create_file" || message.type === "edit_file" || message.type === "apply_patch" || message.type === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
@@ -1632,6 +1817,17 @@ async function startWorker(options) {
             })
           );
         }
+        return;
+      }
+      const unhandledMessage = message;
+      if (typeof unhandledMessage.requestId === "string") {
+        ws.send(
+          JSON.stringify({
+            type: "operation_result",
+            requestId: unhandledMessage.requestId,
+            error: `Unsupported worker message type: ${String(unhandledMessage.type)}`
+          })
+        );
       }
     })().catch((error) => {
       process.stderr.write(`[r5d-worker] message handling failed: ${error instanceof Error ? error.message : String(error)}

package/dist/mjs/package.json

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

package/package.json

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