@ricsam/r5d-worker 0.0.8 → 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}$/;
@@ -596,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) {
@@ -714,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;
@@ -1190,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,
@@ -1199,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",
@@ -1207,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 });
@@ -1261,7 +1286,7 @@ async function executeStreamingCommand(input) {
       });
       return;
     }
-    const branchPath = ensureBranchWorkspace({
+    const workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1270,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",
@@ -1278,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 });
@@ -1884,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.8",
+  "version": "0.0.9",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -573,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) {
@@ -691,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;
@@ -1167,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,
@@ -1176,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",
@@ -1184,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 });
@@ -1238,7 +1252,7 @@ async function executeStreamingCommand(input) {
       });
       return;
     }
-    const branchPath = ensureBranchWorkspace({
+    const workspace = ensureBranchWorkspace({
       projectId: input.projectId,
       baseUrl: input.baseUrl,
       token: input.token,
@@ -1247,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",
@@ -1255,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 });
@@ -1861,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.8",
+  "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.8",
+  "version": "0.0.9",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",