@ricsam/r5d-worker 0.0.5 → 0.0.7

package/README.md

@@ -10,7 +10,7 @@ r5d-worker --version
 The worker uses the existing `r5dctl` config file and accepts `R5D_WORKER_TOKEN` or `R5D_API_KEY`. Project checkouts are managed under:
 
 ```text
-~/.r5d/projects/<repo-slug>/<branch-name>
+~/.r5d/projects/<namespace-repo>/<branch-name>
 ```
 
 Visible branch checkouts use GitHub `origin` remotes. r5d internal sync git metadata lives separately under `~/.r5d/sync`.

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

@@ -28,6 +28,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 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 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}$/;
@@ -35,10 +36,13 @@ const BRANCH_RE = /^[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9]$|^[A-Za-z0-9]$/;
 const DEFAULT_READ_LIMIT = 2e3;
 const MAX_LINE_LENGTH = 2e3;
 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 activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
 let containerRegistryCredential = null;
+let visibleGitIdentity = null;
 function defaultConfigPath() {
   return import_node_path.default.join(import_node_os.default.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -93,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);
@@ -219,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, {
@@ -249,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
   };
 }
@@ -601,15 +605,19 @@ function ensureVisibleGitCheckout(input) {
   }
   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) {
-  if (tryInternalGit(context, ["remote", "get-url", "build-it-now"])) {
-    runInternalGit(context, ["remote", "set-url", "build-it-now", remoteUrl]);
+  if (tryInternalGit(context, ["remote", "get-url", R5D_REMOTE_NAME])) {
+    runInternalGit(context, ["remote", "set-url", R5D_REMOTE_NAME, remoteUrl]);
   } else {
-    runInternalGit(context, ["remote", "add", "build-it-now", remoteUrl]);
+    runInternalGit(context, ["remote", "add", R5D_REMOTE_NAME, remoteUrl]);
+  }
+  if (tryInternalGit(context, ["remote", "get-url", LEGACY_BUILD_IT_NOW_REMOTE_NAME])) {
+    runInternalGit(context, ["remote", "remove", LEGACY_BUILD_IT_NOW_REMOTE_NAME]);
   }
   runInternalGitDir(context, ["config", "user.name", "r5d.dev Worker"]);
   runInternalGitDir(context, ["config", "user.email", "worker@r5d.dev"]);
@@ -625,9 +633,9 @@ function ensureInternalSyncGit(input) {
   const context = { gitDir, workTree: input.branchPath, auth };
   const remoteUrl = internalRemoteUrlFor(input.baseUrl, input.projectId, input.manifest);
   configureInternalRepo(context, remoteUrl);
-  runInternalGit(context, ["fetch", "build-it-now", "--prune", "+refs/heads/*:refs/remotes/build-it-now/*"]);
-  const hasRemoteBranch = tryInternalGit(context, ["show-ref", "--verify", "--quiet", `refs/remotes/build-it-now/${input.branchName}`]);
-  const target = hasRemoteBranch ? `refs/remotes/build-it-now/${input.branchName}` : "refs/remotes/build-it-now/main";
+  runInternalGit(context, ["fetch", R5D_REMOTE_NAME, "--prune", `+refs/heads/*:refs/remotes/${R5D_REMOTE_NAME}/*`]);
+  const hasRemoteBranch = tryInternalGit(context, ["show-ref", "--verify", "--quiet", `refs/remotes/${R5D_REMOTE_NAME}/${input.branchName}`]);
+  const target = hasRemoteBranch ? `refs/remotes/${R5D_REMOTE_NAME}/${input.branchName}` : `refs/remotes/${R5D_REMOTE_NAME}/main`;
   const hasHead = tryInternalGit(context, ["rev-parse", "--verify", "HEAD"]);
   if (!hasHead || !hasInternalWorktreeChanges(context)) {
     runInternalGit(context, ["checkout", "-f", "-B", input.branchName, target]);
@@ -677,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);
 }
@@ -896,7 +929,7 @@ function syncBranch(input) {
   });
   runInternalGit(workspace.internalGit, ["commit", "-m", message]);
   const commitHash = getInternalCommitHash(workspace.internalGit);
-  runInternalGit(workspace.internalGit, ["push", "build-it-now", `HEAD:refs/heads/${input.branchName}`]);
+  runInternalGit(workspace.internalGit, ["push", R5D_REMOTE_NAME, `HEAD:refs/heads/${input.branchName}`]);
   return {
     type: "sync",
     changed: true,
@@ -927,8 +960,8 @@ function confirmLargeDiff(input) {
 }
 function pullBranch(input) {
   const workspace = ensureOperationBranch(input);
-  runInternalGit(workspace.internalGit, ["fetch", "build-it-now", "--prune", "+refs/heads/*:refs/remotes/build-it-now/*"]);
-  const target = input.commitHash ?? `build-it-now/${input.branchName}`;
+  runInternalGit(workspace.internalGit, ["fetch", R5D_REMOTE_NAME, "--prune", `+refs/heads/*:refs/remotes/${R5D_REMOTE_NAME}/*`]);
+  const target = input.commitHash ?? `${R5D_REMOTE_NAME}/${input.branchName}`;
   runInternalGit(workspace.internalGit, ["reset", "--hard", target]);
   runInternalGit(workspace.internalGit, ["clean", "-fd", "--", ".", ":(exclude).git"]);
   return {
@@ -1045,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));
 }
@@ -1254,8 +1376,8 @@ function openPty(input) {
           ...process.env,
           ...containerRegistryEnv(),
           ...input.message.env ?? {},
-          BUILD_IT_NOW_PROJECT_ID: input.projectId,
-          BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
+          R5D_PROJECT_ID: input.projectId,
+          R5D_BRANCH_NAME: input.message.branchName
         }
       },
       onOpened: () => {
@@ -1362,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();
@@ -1394,6 +1516,7 @@ async function startWorker(options) {
       }
       if (message.type === "project_manifest") {
         configureContainerRegistryAuth(message.githubContainerRegistry);
+        visibleGitIdentity = message.gitIdentity;
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);
@@ -1479,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.5",
+  "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

@@ -5,6 +5,7 @@ import path from "node:path";
 import { createHash } from "node:crypto";
 import { hostname } from "node:os";
 import { spawn as spawnChildProcess } from "node:child_process";
+import { configureVisibleGitIdentity } from "./git-identity.mjs";
 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}$/;
@@ -12,10 +13,13 @@ const BRANCH_RE = /^[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9]$|^[A-Za-z0-9]$/;
 const DEFAULT_READ_LIMIT = 2e3;
 const MAX_LINE_LENGTH = 2e3;
 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 activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
 let containerRegistryCredential = null;
+let visibleGitIdentity = null;
 function defaultConfigPath() {
   return path.join(os.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -70,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);
@@ -196,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, {
@@ -226,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
   };
 }
@@ -578,15 +582,19 @@ function ensureVisibleGitCheckout(input) {
   }
   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) {
-  if (tryInternalGit(context, ["remote", "get-url", "build-it-now"])) {
-    runInternalGit(context, ["remote", "set-url", "build-it-now", remoteUrl]);
+  if (tryInternalGit(context, ["remote", "get-url", R5D_REMOTE_NAME])) {
+    runInternalGit(context, ["remote", "set-url", R5D_REMOTE_NAME, remoteUrl]);
   } else {
-    runInternalGit(context, ["remote", "add", "build-it-now", remoteUrl]);
+    runInternalGit(context, ["remote", "add", R5D_REMOTE_NAME, remoteUrl]);
+  }
+  if (tryInternalGit(context, ["remote", "get-url", LEGACY_BUILD_IT_NOW_REMOTE_NAME])) {
+    runInternalGit(context, ["remote", "remove", LEGACY_BUILD_IT_NOW_REMOTE_NAME]);
   }
   runInternalGitDir(context, ["config", "user.name", "r5d.dev Worker"]);
   runInternalGitDir(context, ["config", "user.email", "worker@r5d.dev"]);
@@ -602,9 +610,9 @@ function ensureInternalSyncGit(input) {
   const context = { gitDir, workTree: input.branchPath, auth };
   const remoteUrl = internalRemoteUrlFor(input.baseUrl, input.projectId, input.manifest);
   configureInternalRepo(context, remoteUrl);
-  runInternalGit(context, ["fetch", "build-it-now", "--prune", "+refs/heads/*:refs/remotes/build-it-now/*"]);
-  const hasRemoteBranch = tryInternalGit(context, ["show-ref", "--verify", "--quiet", `refs/remotes/build-it-now/${input.branchName}`]);
-  const target = hasRemoteBranch ? `refs/remotes/build-it-now/${input.branchName}` : "refs/remotes/build-it-now/main";
+  runInternalGit(context, ["fetch", R5D_REMOTE_NAME, "--prune", `+refs/heads/*:refs/remotes/${R5D_REMOTE_NAME}/*`]);
+  const hasRemoteBranch = tryInternalGit(context, ["show-ref", "--verify", "--quiet", `refs/remotes/${R5D_REMOTE_NAME}/${input.branchName}`]);
+  const target = hasRemoteBranch ? `refs/remotes/${R5D_REMOTE_NAME}/${input.branchName}` : `refs/remotes/${R5D_REMOTE_NAME}/main`;
   const hasHead = tryInternalGit(context, ["rev-parse", "--verify", "HEAD"]);
   if (!hasHead || !hasInternalWorktreeChanges(context)) {
     runInternalGit(context, ["checkout", "-f", "-B", input.branchName, target]);
@@ -654,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);
 }
@@ -873,7 +906,7 @@ function syncBranch(input) {
   });
   runInternalGit(workspace.internalGit, ["commit", "-m", message]);
   const commitHash = getInternalCommitHash(workspace.internalGit);
-  runInternalGit(workspace.internalGit, ["push", "build-it-now", `HEAD:refs/heads/${input.branchName}`]);
+  runInternalGit(workspace.internalGit, ["push", R5D_REMOTE_NAME, `HEAD:refs/heads/${input.branchName}`]);
   return {
     type: "sync",
     changed: true,
@@ -904,8 +937,8 @@ function confirmLargeDiff(input) {
 }
 function pullBranch(input) {
   const workspace = ensureOperationBranch(input);
-  runInternalGit(workspace.internalGit, ["fetch", "build-it-now", "--prune", "+refs/heads/*:refs/remotes/build-it-now/*"]);
-  const target = input.commitHash ?? `build-it-now/${input.branchName}`;
+  runInternalGit(workspace.internalGit, ["fetch", R5D_REMOTE_NAME, "--prune", `+refs/heads/*:refs/remotes/${R5D_REMOTE_NAME}/*`]);
+  const target = input.commitHash ?? `${R5D_REMOTE_NAME}/${input.branchName}`;
   runInternalGit(workspace.internalGit, ["reset", "--hard", target]);
   runInternalGit(workspace.internalGit, ["clean", "-fd", "--", ".", ":(exclude).git"]);
   return {
@@ -1022,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));
 }
@@ -1231,8 +1353,8 @@ function openPty(input) {
           ...process.env,
           ...containerRegistryEnv(),
           ...input.message.env ?? {},
-          BUILD_IT_NOW_PROJECT_ID: input.projectId,
-          BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
+          R5D_PROJECT_ID: input.projectId,
+          R5D_BRANCH_NAME: input.message.branchName
         }
       },
       onOpened: () => {
@@ -1339,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();
@@ -1371,6 +1493,7 @@ async function startWorker(options) {
       }
       if (message.type === "project_manifest") {
         configureContainerRegistryAuth(message.githubContainerRegistry);
+        visibleGitIdentity = message.gitIdentity;
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);
@@ -1456,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.5",
+  "version": "0.0.7",
   "type": "module"
 }

package/dist/types/git-identity.d.ts

@@ -0,0 +1,9 @@
+export type WorkerGitIdentity = {
+    name: string;
+    email: string;
+};
+type RunGit = (args: string[], options?: {
+    cwd?: string;
+}) => string | void;
+export declare function configureVisibleGitIdentity(branchPath: string, identity: WorkerGitIdentity | null | undefined, runGit: RunGit): void;
+export {};

package/package.json

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