@ricsam/r5d-worker 0.0.4 → 0.0.6

package/README.md

@@ -1,25 +1,25 @@
 # r5d-worker
 
-`r5d-worker` connects a local or remote machine to a r5d.dev project so the agent can run host commands through the virtual `worker` shell command.
+`r5d-worker` connects a local or remote machine to r5d.dev so the agent can run host commands through the live worker.
 
 ```sh
-r5d-worker start <project-id> --label macos
+r5d-worker start --label macos
+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/<project-id>/<branch-name>
+~/.r5d/projects/<namespace-repo>/<branch-name>
 ```
 
-`main` is cloned from the platform's HTTPS git remote. Other branches are created as git worktrees from the main clone.
+Visible branch checkouts use GitHub `origin` remotes. r5d internal sync git metadata lives separately under `~/.r5d/sync`.
 
-Worker labels are mandatory and unique per project. Choose labels that describe host capabilities, such as `macos`, `linux`, `ios`, or `ec2-build`.
+Worker labels are mandatory and unique per user. Choose labels that describe host capabilities, such as `macos`, `linux`, `ios`, or `ec2-build`.
 
 The agent runs commands through the virtual shell command:
 
 ```sh
-worker exec macos git pull --ff-only build-it-now main
 worker exec macos docker compose up -d
 worker exec macos bun test
 ```

package/dist/cjs/main.cjs

@@ -28,16 +28,21 @@ 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}$/;
 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");
 }
@@ -50,6 +55,7 @@ function defaultSyncRoot() {
 function printHelp() {
   process.stdout.write(`Usage:
   r5d-worker start --label <label> [--base-url <url>] [--token <token>] [--api-key <key>]
+  r5d-worker --version
 
 Options:
   --label <label>       Required unique worker label for this user, e.g. macos or ec2-build
@@ -59,9 +65,53 @@ Options:
   --config <path>       Config path (default ~/.config/r5d/r5dctl/config.json)
   --project-root <dir>  Override projects checkout root (default ~/.r5d/projects)
   --sync-root <dir>     Override r5d internal sync git root (default ~/.r5d/sync)
+  -v, --version         Show r5d-worker version
   -h, --help            Show this help
 `);
 }
+function readVersionFile(filePath) {
+  try {
+    const version = import_node_fs.default.readFileSync(filePath, "utf8").trim();
+    return version || null;
+  } catch {
+    return null;
+  }
+}
+function readInstalledPackageVersion(packageJsonPath) {
+  try {
+    const parsed = JSON.parse(import_node_fs.default.readFileSync(packageJsonPath, "utf8"));
+    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version.trim();
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function getWorkerVersion() {
+  const entrypoint = process.argv[1] ? import_node_path.default.resolve(process.argv[1]) : null;
+  let current = entrypoint ? import_node_path.default.dirname(entrypoint) : process.cwd();
+  for (let index = 0; index < 12; index += 1) {
+    const packageVersion = readInstalledPackageVersion(import_node_path.default.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const sourceVersion = readVersionFile(import_node_path.default.join(current, "VERSION.txt"));
+    if (sourceVersion && import_node_path.default.basename(current) === "binctl-packages") {
+      return sourceVersion;
+    }
+    const parent = import_node_path.default.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return "unknown";
+}
+function printVersion() {
+  process.stdout.write(`r5d-worker ${getWorkerVersion()}
+`);
+}
 function requireValue(value, message) {
   if (!value) {
     throw new Error(message);
@@ -71,7 +121,8 @@ function requireValue(value, message) {
 function parseArgs(argv) {
   const options = {
     configPath: defaultConfigPath(),
-    help: false
+    help: false,
+    version: false
   };
   const rest = [];
   for (let index = 0; index < argv.length; index += 1) {
@@ -83,6 +134,10 @@ function parseArgs(argv) {
       options.help = true;
       continue;
     }
+    if (arg === "-v" || arg === "--version") {
+      options.version = true;
+      continue;
+    }
     const readOption = (name) => {
       if (arg === name) {
         index += 1;
@@ -128,6 +183,9 @@ function parseArgs(argv) {
     }
     rest.push(arg);
   }
+  if (options.version) {
+    return { command: "version", options };
+  }
   if (options.help || rest.length === 0) {
     return { command: "help", options };
   }
@@ -547,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"]);
@@ -571,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]);
@@ -842,7 +904,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,
@@ -873,8 +935,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 {
@@ -1200,8 +1262,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: () => {
@@ -1325,7 +1387,7 @@ async function startWorker(options) {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: "0.1.0",
+        version: getWorkerVersion(),
         projectRoot: projectsRoot
       }
     };
@@ -1340,6 +1402,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);
@@ -1477,6 +1540,10 @@ async function main() {
     printHelp();
     return;
   }
+  if (parsed.command === "version") {
+    printVersion();
+    return;
+  }
   await startWorker(parsed.options);
 }
 main().catch((error) => {

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -5,16 +5,21 @@ 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}$/;
 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");
 }
@@ -27,6 +32,7 @@ function defaultSyncRoot() {
 function printHelp() {
   process.stdout.write(`Usage:
   r5d-worker start --label <label> [--base-url <url>] [--token <token>] [--api-key <key>]
+  r5d-worker --version
 
 Options:
   --label <label>       Required unique worker label for this user, e.g. macos or ec2-build
@@ -36,9 +42,53 @@ Options:
   --config <path>       Config path (default ~/.config/r5d/r5dctl/config.json)
   --project-root <dir>  Override projects checkout root (default ~/.r5d/projects)
   --sync-root <dir>     Override r5d internal sync git root (default ~/.r5d/sync)
+  -v, --version         Show r5d-worker version
   -h, --help            Show this help
 `);
 }
+function readVersionFile(filePath) {
+  try {
+    const version = fs.readFileSync(filePath, "utf8").trim();
+    return version || null;
+  } catch {
+    return null;
+  }
+}
+function readInstalledPackageVersion(packageJsonPath) {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+    if (parsed.name === WORKER_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version.trim();
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function getWorkerVersion() {
+  const entrypoint = process.argv[1] ? path.resolve(process.argv[1]) : null;
+  let current = entrypoint ? path.dirname(entrypoint) : process.cwd();
+  for (let index = 0; index < 12; index += 1) {
+    const packageVersion = readInstalledPackageVersion(path.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const sourceVersion = readVersionFile(path.join(current, "VERSION.txt"));
+    if (sourceVersion && path.basename(current) === "binctl-packages") {
+      return sourceVersion;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return "unknown";
+}
+function printVersion() {
+  process.stdout.write(`r5d-worker ${getWorkerVersion()}
+`);
+}
 function requireValue(value, message) {
   if (!value) {
     throw new Error(message);
@@ -48,7 +98,8 @@ function requireValue(value, message) {
 function parseArgs(argv) {
   const options = {
     configPath: defaultConfigPath(),
-    help: false
+    help: false,
+    version: false
   };
   const rest = [];
   for (let index = 0; index < argv.length; index += 1) {
@@ -60,6 +111,10 @@ function parseArgs(argv) {
       options.help = true;
       continue;
     }
+    if (arg === "-v" || arg === "--version") {
+      options.version = true;
+      continue;
+    }
     const readOption = (name) => {
       if (arg === name) {
         index += 1;
@@ -105,6 +160,9 @@ function parseArgs(argv) {
     }
     rest.push(arg);
   }
+  if (options.version) {
+    return { command: "version", options };
+  }
   if (options.help || rest.length === 0) {
     return { command: "help", options };
   }
@@ -524,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"]);
@@ -548,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]);
@@ -819,7 +881,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,
@@ -850,8 +912,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 {
@@ -1177,8 +1239,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: () => {
@@ -1302,7 +1364,7 @@ async function startWorker(options) {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: "0.1.0",
+        version: getWorkerVersion(),
         projectRoot: projectsRoot
       }
     };
@@ -1317,6 +1379,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);
@@ -1454,6 +1517,10 @@ async function main() {
     printHelp();
     return;
   }
+  if (parsed.command === "version") {
+    printVersion();
+    return;
+  }
   await startWorker(parsed.options);
 }
 main().catch((error) => {

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "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.4",
+  "version": "0.0.6",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",