@ricsam/r5d-worker 0.0.6 → 0.0.7

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

@@ -97,7 +97,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 +223,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 +253,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 +685,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);
 }
@@ -1053,6 +1078,95 @@ 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 {
+    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);
+  }
+}
 function sendWorkerMessage(ws, message) {
   ws.send(JSON.stringify(message));
 }
@@ -1370,7 +1484,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();
@@ -1488,6 +1602,34 @@ async function startWorker(options) {
         ws.send(JSON.stringify(result));
         return;
       }
+      if (message.type === "exec_start") {
+        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 === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
         try {
           const manifest = manifestByProjectId.get(message.projectId);

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "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

@@ -74,7 +74,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 +200,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 +230,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 +662,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);
 }
@@ -1030,6 +1055,95 @@ 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 {
+    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);
+  }
+}
 function sendWorkerMessage(ws, message) {
   ws.send(JSON.stringify(message));
 }
@@ -1347,7 +1461,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();
@@ -1465,6 +1579,34 @@ async function startWorker(options) {
         ws.send(JSON.stringify(result));
         return;
       }
+      if (message.type === "exec_start") {
+        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 === "view_file_bytes" || message.type === "sync" || message.type === "confirm_large_diff" || message.type === "pull_branch") {
         try {
           const manifest = manifestByProjectId.get(message.projectId);

package/dist/mjs/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "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"