@ricsam/r5d-worker 0.0.7 → 0.0.9

package/README.md

@@ -13,7 +13,7 @@ The worker uses the existing `r5dctl` config file and accepts `R5D_WORKER_TOKEN`
 ~/.r5d/projects/<namespace-repo>/<branch-name>
 ```
 
-Visible branch checkouts use GitHub `origin` remotes. r5d internal sync git metadata lives separately under `~/.r5d/sync`.
+Visible branch checkouts are the user/agent workbench. The worker may clone the connected GitHub `origin` during first setup, but ongoing pull/push/fetch/reset behavior is manual Git work. r5d internal sync git metadata lives separately under `~/.r5d/sync`.
 
 Worker labels are mandatory and unique per user. Choose labels that describe host capabilities, such as `macos`, `linux`, `ios`, or `ec2-build`.
 

package/dist/cjs/main.cjs

@@ -6,6 +6,10 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -22,6 +26,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var main_exports = {};
+__export(main_exports, {
+  ensureVisibleGitCheckout: () => ensureVisibleGitCheckout
+});
+module.exports = __toCommonJS(main_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
@@ -29,6 +39,7 @@ var import_node_crypto = require("node:crypto");
 var import_node_os2 = require("node:os");
 var import_node_child_process = require("node:child_process");
 var import_git_identity = require("./git-identity.cjs");
+const import_meta = {};
 const DEFAULT_BASE_URL = "https://r5d.dev";
 const WORKER_PACKAGE_NAME = "@ricsam/r5d-worker";
 const LABEL_RE = /^[A-Za-z0-9][A-Za-z0-9_.-]{0,62}$/;
@@ -39,6 +50,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;
@@ -595,19 +607,23 @@ function ensureVisibleGitCheckout(input) {
   validateBranchName(input.branchName);
   import_node_fs.default.mkdirSync(input.projectRoot, { recursive: true });
   const branchPath = import_node_path.default.join(input.projectRoot, input.branchName);
-  if (!hasNormalVisibleGitDir(branchPath)) {
+  const createdCheckout = !hasNormalVisibleGitDir(branchPath);
+  if (createdCheckout) {
     import_node_fs.default.rmSync(branchPath, { recursive: true, force: true });
     import_node_fs.default.mkdirSync(import_node_path.default.dirname(branchPath), { recursive: true });
     if (!tryGit(["clone", "--origin", "origin", input.githubRemoteUrl, branchPath], { auth: input.githubAuth })) {
       import_node_fs.default.mkdirSync(branchPath, { recursive: true });
       runGit(["init"], { cwd: branchPath });
     }
+    ensureOriginRemote(branchPath, input.githubRemoteUrl);
+    configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
+    (0, import_git_identity.configureVisibleGitIdentity)(branchPath, visibleGitIdentity, runGit);
+    tryGit(["fetch", "origin", "--prune"], { cwd: branchPath, auth: input.githubAuth });
+    checkoutVisibleBranch({ branchPath, branchName: input.branchName, defaultBranch: input.defaultBranch });
+    return branchPath;
   }
-  ensureOriginRemote(branchPath, input.githubRemoteUrl);
   configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
   (0, import_git_identity.configureVisibleGitIdentity)(branchPath, visibleGitIdentity, runGit);
-  tryGit(["fetch", "origin", "--prune"], { cwd: branchPath, auth: input.githubAuth });
-  checkoutVisibleBranch({ branchPath, branchName: input.branchName, defaultBranch: input.defaultBranch });
   return branchPath;
 }
 function configureInternalRepo(context, remoteUrl) {
@@ -713,6 +729,15 @@ async function streamCommandOutput(stream, onData) {
 function ensureOperationBranch(input) {
   return ensureBranchWorkspace(input);
 }
+function internalGitProcessEnv(workspace, env) {
+  if (env?.R5D_USE_INTERNAL_GIT !== "1") {
+    return {};
+  }
+  return {
+    GIT_DIR: workspace.internalGit.gitDir,
+    GIT_WORK_TREE: workspace.branchPath
+  };
+}
 function formatLineNumberedContent(content, offset, limit) {
   const allLines = content.split("\n");
   const totalLines = allLines.length;
@@ -856,6 +881,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 +1167,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":
@@ -1022,7 +1214,7 @@ async function executeCommand(input) {
   const startedAt = Date.now();
   let timeout;
   try {
-    const branchPath = ensureBranchWorkspace({
+    const workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1031,7 +1223,7 @@ async function executeCommand(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const cwd = resolveCommandCwd(workspace.branchPath, input.message.cwd);
     const subprocess = Bun.spawn(input.message.argv, {
       cwd,
       stdout: "pipe",
@@ -1039,7 +1231,8 @@ async function executeCommand(input) {
       env: {
         ...process.env,
         ...containerRegistryEnv(),
-        ...input.message.env ?? {}
+        ...input.message.env ?? {},
+        ...internalGitProcessEnv(workspace, input.message.env)
       }
     });
     activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
@@ -1084,7 +1277,16 @@ async function executeStreamingCommand(input) {
   let started = false;
   let timedOut = false;
   try {
-    const branchPath = ensureBranchWorkspace({
+    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 workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1093,7 +1295,7 @@ async function executeStreamingCommand(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const cwd = resolveCommandCwd(workspace.branchPath, input.message.cwd);
     const subprocess = Bun.spawn(input.message.argv, {
       cwd,
       stdout: "pipe",
@@ -1101,7 +1303,8 @@ async function executeStreamingCommand(input) {
       env: {
         ...process.env,
         ...containerRegistryEnv(),
-        ...input.message.env ?? {}
+        ...input.message.env ?? {},
+        ...internalGitProcessEnv(workspace, input.message.env)
       }
     });
     activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
@@ -1165,6 +1368,7 @@ async function executeStreamingCommand(input) {
       clearTimeout(timeout);
     }
     activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
@@ -1557,14 +1761,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 +1809,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 +1841,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 +1866,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)}
@@ -1688,8 +1910,14 @@ async function main() {
   }
   await startWorker(parsed.options);
 }
-main().catch((error) => {
-  process.stderr.write(`[r5d-worker] ${error instanceof Error ? error.message : String(error)}
+if (import_meta.main) {
+  main().catch((error) => {
+    process.stderr.write(`[r5d-worker] ${error instanceof Error ? error.message : String(error)}
 `);
-  process.exit(1);
+    process.exit(1);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ensureVisibleGitCheckout
 });

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "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;
@@ -572,19 +573,23 @@ function ensureVisibleGitCheckout(input) {
   validateBranchName(input.branchName);
   fs.mkdirSync(input.projectRoot, { recursive: true });
   const branchPath = path.join(input.projectRoot, input.branchName);
-  if (!hasNormalVisibleGitDir(branchPath)) {
+  const createdCheckout = !hasNormalVisibleGitDir(branchPath);
+  if (createdCheckout) {
     fs.rmSync(branchPath, { recursive: true, force: true });
     fs.mkdirSync(path.dirname(branchPath), { recursive: true });
     if (!tryGit(["clone", "--origin", "origin", input.githubRemoteUrl, branchPath], { auth: input.githubAuth })) {
       fs.mkdirSync(branchPath, { recursive: true });
       runGit(["init"], { cwd: branchPath });
     }
+    ensureOriginRemote(branchPath, input.githubRemoteUrl);
+    configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
+    configureVisibleGitIdentity(branchPath, visibleGitIdentity, runGit);
+    tryGit(["fetch", "origin", "--prune"], { cwd: branchPath, auth: input.githubAuth });
+    checkoutVisibleBranch({ branchPath, branchName: input.branchName, defaultBranch: input.defaultBranch });
+    return branchPath;
   }
-  ensureOriginRemote(branchPath, input.githubRemoteUrl);
   configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
   configureVisibleGitIdentity(branchPath, visibleGitIdentity, runGit);
-  tryGit(["fetch", "origin", "--prune"], { cwd: branchPath, auth: input.githubAuth });
-  checkoutVisibleBranch({ branchPath, branchName: input.branchName, defaultBranch: input.defaultBranch });
   return branchPath;
 }
 function configureInternalRepo(context, remoteUrl) {
@@ -690,6 +695,15 @@ async function streamCommandOutput(stream, onData) {
 function ensureOperationBranch(input) {
   return ensureBranchWorkspace(input);
 }
+function internalGitProcessEnv(workspace, env) {
+  if (env?.R5D_USE_INTERNAL_GIT !== "1") {
+    return {};
+  }
+  return {
+    GIT_DIR: workspace.internalGit.gitDir,
+    GIT_WORK_TREE: workspace.branchPath
+  };
+}
 function formatLineNumberedContent(content, offset, limit) {
   const allLines = content.split("\n");
   const totalLines = allLines.length;
@@ -833,6 +847,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 +1133,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":
@@ -999,7 +1180,7 @@ async function executeCommand(input) {
   const startedAt = Date.now();
   let timeout;
   try {
-    const branchPath = ensureBranchWorkspace({
+    const workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1008,7 +1189,7 @@ async function executeCommand(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const cwd = resolveCommandCwd(workspace.branchPath, input.message.cwd);
     const subprocess = Bun.spawn(input.message.argv, {
       cwd,
       stdout: "pipe",
@@ -1016,7 +1197,8 @@ async function executeCommand(input) {
       env: {
         ...process.env,
         ...containerRegistryEnv(),
-        ...input.message.env ?? {}
+        ...input.message.env ?? {},
+        ...internalGitProcessEnv(workspace, input.message.env)
       }
     });
     activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
@@ -1061,7 +1243,16 @@ async function executeStreamingCommand(input) {
   let started = false;
   let timedOut = false;
   try {
-    const branchPath = ensureBranchWorkspace({
+    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 workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1070,7 +1261,7 @@ async function executeStreamingCommand(input) {
       branchName: input.message.branchName,
       manifest: input.manifest
     });
-    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const cwd = resolveCommandCwd(workspace.branchPath, input.message.cwd);
     const subprocess = Bun.spawn(input.message.argv, {
       cwd,
       stdout: "pipe",
@@ -1078,7 +1269,8 @@ async function executeStreamingCommand(input) {
       env: {
         ...process.env,
         ...containerRegistryEnv(),
-        ...input.message.env ?? {}
+        ...input.message.env ?? {},
+        ...internalGitProcessEnv(workspace, input.message.env)
       }
     });
     activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
@@ -1142,6 +1334,7 @@ async function executeStreamingCommand(input) {
       clearTimeout(timeout);
     }
     activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
@@ -1534,14 +1727,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 +1775,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 +1807,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 +1832,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)}
@@ -1665,8 +1876,13 @@ async function main() {
   }
   await startWorker(parsed.options);
 }
-main().catch((error) => {
-  process.stderr.write(`[r5d-worker] ${error instanceof Error ? error.message : String(error)}
+if (import.meta.main) {
+  main().catch((error) => {
+    process.stderr.write(`[r5d-worker] ${error instanceof Error ? error.message : String(error)}
 `);
-  process.exit(1);
-});
+    process.exit(1);
+  });
+}
+export {
+  ensureVisibleGitCheckout
+};

package/dist/mjs/package.json

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

package/dist/types/main.d.ts

@@ -1,2 +1,14 @@
 #!/usr/bin/env bun
+type GitAuth = {
+    extraHeaderUrl: string;
+    header: string;
+};
+export declare function ensureVisibleGitCheckout(input: {
+    projectRoot: string;
+    branchName: string;
+    githubRemoteUrl: string;
+    githubAuth?: GitAuth;
+    githubAuthHeader?: string | null;
+    defaultBranch: string;
+}): string;
 export {};

package/package.json

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