@ricsam/r5d-worker 0.0.6 → 0.0.8

package/dist/cjs/git-identity.cjs

@@ -0,0 +1,39 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var git_identity_exports = {};
+__export(git_identity_exports, {
+  configureVisibleGitIdentity: () => configureVisibleGitIdentity
+});
+module.exports = __toCommonJS(git_identity_exports);
+function configureVisibleGitIdentity(branchPath, identity, runGit) {
+  if (!identity) {
+    return;
+  }
+  const name = identity.name.trim();
+  const email = identity.email.trim();
+  if (!name || !email) {
+    throw new Error("Git identity must include name and email");
+  }
+  runGit(["config", "user.name", name], { cwd: branchPath });
+  runGit(["config", "user.email", email], { cwd: branchPath });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  configureVisibleGitIdentity
+});

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;
@@ -97,7 +98,7 @@ function getWorkerVersion() {
       return packageVersion;
     }
     const sourceVersion = readVersionFile(import_node_path.default.join(current, "VERSION.txt"));
-    if (sourceVersion && import_node_path.default.basename(current) === "binctl-packages") {
+    if (sourceVersion && import_node_path.default.basename(current) === "packages") {
       return sourceVersion;
     }
     const parent = import_node_path.default.dirname(current);
@@ -223,8 +224,8 @@ async function readResponseText(response) {
     return "";
   }
 }
-async function verifyBinctlAuth(baseUrl, token) {
-  const statusUrl = new URL("/api/binctl/auth/status", baseUrl);
+async function verifyR5dctlAuth(baseUrl, token) {
+  const statusUrl = new URL("/api/r5dctl/auth/status", baseUrl);
   let response;
   try {
     response = await fetch(statusUrl, {
@@ -253,12 +254,12 @@ async function verifyBinctlAuth(baseUrl, token) {
   );
 }
 function resolveCredentials(options, config) {
-  const token = options.token ?? process.env.R5D_WORKER_TOKEN ?? process.env.R5D_TOKEN ?? process.env.BINCTL_TOKEN ?? config.token ?? options.apiKey ?? process.env.R5D_API_KEY ?? process.env.BINCTL_API_KEY ?? config.apiKey;
+  const token = options.token ?? process.env.R5D_WORKER_TOKEN ?? process.env.R5D_TOKEN ?? process.env.R5DCTL_TOKEN ?? config.token ?? options.apiKey ?? process.env.R5D_API_KEY ?? process.env.R5DCTL_API_KEY ?? config.apiKey;
   if (!token) {
     throw new Error("Authentication required. Run `r5dctl auth login` or set R5D_WORKER_TOKEN/R5D_API_KEY.");
   }
   return {
-    baseUrl: normalizeBaseUrl(options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.BINCTL_BASE_URL ?? config.baseUrl ?? DEFAULT_BASE_URL),
+    baseUrl: normalizeBaseUrl(options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.R5DCTL_BASE_URL ?? config.baseUrl ?? DEFAULT_BASE_URL),
     token
   };
 }
@@ -685,6 +686,31 @@ async function collectStream(stream) {
   }
   return await new Response(stream).text();
 }
+async function streamCommandOutput(stream, onData) {
+  if (!stream) {
+    return;
+  }
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  try {
+    while (true) {
+      const chunk = await reader.read();
+      if (chunk.done) {
+        break;
+      }
+      const text = decoder.decode(chunk.value, { stream: true });
+      if (text.length > 0) {
+        onData(text);
+      }
+    }
+    const trailing = decoder.decode();
+    if (trailing.length > 0) {
+      onData(trailing);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
 function ensureOperationBranch(input) {
   return ensureBranchWorkspace(input);
 }
@@ -831,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);
@@ -952,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":
@@ -1053,6 +1246,105 @@ async function executeCommand(input) {
     activeProcesses.delete(input.message.runId);
   }
 }
+async function executeStreamingCommand(input) {
+  const startedAt = Date.now();
+  let timeout;
+  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,
+      token: input.token,
+      projectRoot: input.projectRoot,
+      syncRoot: input.syncRoot,
+      branchName: input.message.branchName,
+      manifest: input.manifest
+    });
+    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const subprocess = Bun.spawn(input.message.argv, {
+      cwd,
+      stdout: "pipe",
+      stderr: "pipe",
+      env: {
+        ...process.env,
+        ...containerRegistryEnv(),
+        ...input.message.env ?? {}
+      }
+    });
+    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    started = true;
+    sendWorkerMessage(input.ws, {
+      type: "exec_started",
+      requestId: input.message.requestId,
+      runId: input.message.runId
+    });
+    if (input.message.timeoutMs) {
+      timeout = setTimeout(() => {
+        timedOut = true;
+        subprocess.kill("SIGTERM");
+      }, input.message.timeoutMs);
+    }
+    const [exitCode] = await Promise.all([
+      subprocess.exited,
+      streamCommandOutput(subprocess.stdout, (data) => {
+        sendWorkerMessage(input.ws, {
+          type: "exec_output",
+          runId: input.message.runId,
+          stream: "stdout",
+          data
+        });
+      }),
+      streamCommandOutput(subprocess.stderr, (data) => {
+        sendWorkerMessage(input.ws, {
+          type: "exec_output",
+          runId: input.message.runId,
+          stream: "stderr",
+          data
+        });
+      })
+    ]);
+    sendWorkerMessage(input.ws, {
+      type: "exec_exit",
+      runId: input.message.runId,
+      exitCode,
+      durationMs: Date.now() - startedAt,
+      ...timedOut ? { timedOut: true } : {}
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (started) {
+      sendWorkerMessage(input.ws, {
+        type: "exec_error",
+        runId: input.message.runId,
+        error: message,
+        durationMs: Date.now() - startedAt
+      });
+    } else {
+      sendWorkerMessage(input.ws, {
+        type: "exec_start_error",
+        requestId: input.message.requestId,
+        runId: input.message.runId,
+        error: message
+      });
+    }
+  } finally {
+    if (timeout) {
+      clearTimeout(timeout);
+    }
+    activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
+  }
+}
 function sendWorkerMessage(ws, message) {
   ws.send(JSON.stringify(message));
 }
@@ -1370,7 +1662,7 @@ async function startWorker(options) {
   process.stdout.write(`[r5d-worker] server: ${baseUrl}
 `);
   runGit(["--version"]);
-  await verifyBinctlAuth(baseUrl, token);
+  await verifyR5dctlAuth(baseUrl, token);
   import_node_fs.default.mkdirSync(projectsRoot, { recursive: true });
   import_node_fs.default.mkdirSync(syncRoot, { recursive: true });
   const manifestByProjectId = /* @__PURE__ */ new Map();
@@ -1443,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;
@@ -1488,7 +1782,40 @@ async function startWorker(options) {
         ws.send(JSON.stringify(result));
         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 === "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);
+          process.stdout.write(`[r5d-worker] exec_start ${message.runId}: ${message.argv.join(" ")}
+`);
+          void withBranchLock(
+            message.projectId,
+            message.branchName,
+            () => executeStreamingCommand({ ws, message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, manifest })
+          ).catch((error) => {
+            sendWorkerMessage(ws, {
+              type: "exec_start_error",
+              requestId: message.requestId,
+              runId: message.runId,
+              error: error instanceof Error ? error.message : String(error)
+            });
+          });
+        } catch (error) {
+          sendWorkerMessage(ws, {
+            type: "exec_start_error",
+            requestId: message.requestId,
+            runId: message.runId,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+        return;
+      }
+      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);
@@ -1513,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.6",
+  "version": "0.0.8",
   "type": "commonjs"
 }

package/dist/mjs/git-identity.mjs

@@ -0,0 +1,15 @@
+function configureVisibleGitIdentity(branchPath, identity, runGit) {
+  if (!identity) {
+    return;
+  }
+  const name = identity.name.trim();
+  const email = identity.email.trim();
+  if (!name || !email) {
+    throw new Error("Git identity must include name and email");
+  }
+  runGit(["config", "user.name", name], { cwd: branchPath });
+  runGit(["config", "user.email", email], { cwd: branchPath });
+}
+export {
+  configureVisibleGitIdentity
+};

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;
@@ -74,7 +75,7 @@ function getWorkerVersion() {
       return packageVersion;
     }
     const sourceVersion = readVersionFile(path.join(current, "VERSION.txt"));
-    if (sourceVersion && path.basename(current) === "binctl-packages") {
+    if (sourceVersion && path.basename(current) === "packages") {
       return sourceVersion;
     }
     const parent = path.dirname(current);
@@ -200,8 +201,8 @@ async function readResponseText(response) {
     return "";
   }
 }
-async function verifyBinctlAuth(baseUrl, token) {
-  const statusUrl = new URL("/api/binctl/auth/status", baseUrl);
+async function verifyR5dctlAuth(baseUrl, token) {
+  const statusUrl = new URL("/api/r5dctl/auth/status", baseUrl);
   let response;
   try {
     response = await fetch(statusUrl, {
@@ -230,12 +231,12 @@ async function verifyBinctlAuth(baseUrl, token) {
   );
 }
 function resolveCredentials(options, config) {
-  const token = options.token ?? process.env.R5D_WORKER_TOKEN ?? process.env.R5D_TOKEN ?? process.env.BINCTL_TOKEN ?? config.token ?? options.apiKey ?? process.env.R5D_API_KEY ?? process.env.BINCTL_API_KEY ?? config.apiKey;
+  const token = options.token ?? process.env.R5D_WORKER_TOKEN ?? process.env.R5D_TOKEN ?? process.env.R5DCTL_TOKEN ?? config.token ?? options.apiKey ?? process.env.R5D_API_KEY ?? process.env.R5DCTL_API_KEY ?? config.apiKey;
   if (!token) {
     throw new Error("Authentication required. Run `r5dctl auth login` or set R5D_WORKER_TOKEN/R5D_API_KEY.");
   }
   return {
-    baseUrl: normalizeBaseUrl(options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.BINCTL_BASE_URL ?? config.baseUrl ?? DEFAULT_BASE_URL),
+    baseUrl: normalizeBaseUrl(options.baseUrl ?? process.env.R5D_BASE_URL ?? process.env.R5DCTL_BASE_URL ?? config.baseUrl ?? DEFAULT_BASE_URL),
     token
   };
 }
@@ -662,6 +663,31 @@ async function collectStream(stream) {
   }
   return await new Response(stream).text();
 }
+async function streamCommandOutput(stream, onData) {
+  if (!stream) {
+    return;
+  }
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  try {
+    while (true) {
+      const chunk = await reader.read();
+      if (chunk.done) {
+        break;
+      }
+      const text = decoder.decode(chunk.value, { stream: true });
+      if (text.length > 0) {
+        onData(text);
+      }
+    }
+    const trailing = decoder.decode();
+    if (trailing.length > 0) {
+      onData(trailing);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
 function ensureOperationBranch(input) {
   return ensureBranchWorkspace(input);
 }
@@ -808,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);
@@ -929,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":
@@ -1030,6 +1223,105 @@ async function executeCommand(input) {
     activeProcesses.delete(input.message.runId);
   }
 }
+async function executeStreamingCommand(input) {
+  const startedAt = Date.now();
+  let timeout;
+  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,
+      token: input.token,
+      projectRoot: input.projectRoot,
+      syncRoot: input.syncRoot,
+      branchName: input.message.branchName,
+      manifest: input.manifest
+    });
+    const cwd = resolveCommandCwd(branchPath.branchPath, input.message.cwd);
+    const subprocess = Bun.spawn(input.message.argv, {
+      cwd,
+      stdout: "pipe",
+      stderr: "pipe",
+      env: {
+        ...process.env,
+        ...containerRegistryEnv(),
+        ...input.message.env ?? {}
+      }
+    });
+    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    started = true;
+    sendWorkerMessage(input.ws, {
+      type: "exec_started",
+      requestId: input.message.requestId,
+      runId: input.message.runId
+    });
+    if (input.message.timeoutMs) {
+      timeout = setTimeout(() => {
+        timedOut = true;
+        subprocess.kill("SIGTERM");
+      }, input.message.timeoutMs);
+    }
+    const [exitCode] = await Promise.all([
+      subprocess.exited,
+      streamCommandOutput(subprocess.stdout, (data) => {
+        sendWorkerMessage(input.ws, {
+          type: "exec_output",
+          runId: input.message.runId,
+          stream: "stdout",
+          data
+        });
+      }),
+      streamCommandOutput(subprocess.stderr, (data) => {
+        sendWorkerMessage(input.ws, {
+          type: "exec_output",
+          runId: input.message.runId,
+          stream: "stderr",
+          data
+        });
+      })
+    ]);
+    sendWorkerMessage(input.ws, {
+      type: "exec_exit",
+      runId: input.message.runId,
+      exitCode,
+      durationMs: Date.now() - startedAt,
+      ...timedOut ? { timedOut: true } : {}
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (started) {
+      sendWorkerMessage(input.ws, {
+        type: "exec_error",
+        runId: input.message.runId,
+        error: message,
+        durationMs: Date.now() - startedAt
+      });
+    } else {
+      sendWorkerMessage(input.ws, {
+        type: "exec_start_error",
+        requestId: input.message.requestId,
+        runId: input.message.runId,
+        error: message
+      });
+    }
+  } finally {
+    if (timeout) {
+      clearTimeout(timeout);
+    }
+    activeProcesses.delete(input.message.runId);
+    cancelledProcessRuns.delete(input.message.runId);
+  }
+}
 function sendWorkerMessage(ws, message) {
   ws.send(JSON.stringify(message));
 }
@@ -1347,7 +1639,7 @@ async function startWorker(options) {
   process.stdout.write(`[r5d-worker] server: ${baseUrl}
 `);
   runGit(["--version"]);
-  await verifyBinctlAuth(baseUrl, token);
+  await verifyR5dctlAuth(baseUrl, token);
   fs.mkdirSync(projectsRoot, { recursive: true });
   fs.mkdirSync(syncRoot, { recursive: true });
   const manifestByProjectId = /* @__PURE__ */ new Map();
@@ -1420,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;
@@ -1465,7 +1759,40 @@ async function startWorker(options) {
         ws.send(JSON.stringify(result));
         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 === "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);
+          process.stdout.write(`[r5d-worker] exec_start ${message.runId}: ${message.argv.join(" ")}
+`);
+          void withBranchLock(
+            message.projectId,
+            message.branchName,
+            () => executeStreamingCommand({ ws, message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, manifest })
+          ).catch((error) => {
+            sendWorkerMessage(ws, {
+              type: "exec_start_error",
+              requestId: message.requestId,
+              runId: message.runId,
+              error: error instanceof Error ? error.message : String(error)
+            });
+          });
+        } catch (error) {
+          sendWorkerMessage(ws, {
+            type: "exec_start_error",
+            requestId: message.requestId,
+            runId: message.runId,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+        return;
+      }
+      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);
@@ -1490,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.6",
+  "version": "0.0.8",
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",
@@ -15,7 +15,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ricsam/r5d-dev.git",
-    "directory": "binctl-packages/r5d-worker"
+    "directory": "packages/r5d-worker"
   },
   "bin": {
     "r5d-worker": "dist/cjs/main.cjs"