@ricsam/r5d-worker 0.0.3 → 0.0.5

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/<repo-slug>/<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

@@ -29,6 +29,7 @@ var import_node_crypto = require("node:crypto");
 var import_node_os2 = require("node:os");
 var import_node_child_process = require("node:child_process");
 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;
@@ -37,6 +38,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const activeProcesses = /* @__PURE__ */ new Map();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
+let containerRegistryCredential = null;
 function defaultConfigPath() {
   return import_node_path.default.join(import_node_os.default.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -49,6 +51,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
@@ -58,9 +61,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);
@@ -70,7 +117,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) {
@@ -82,6 +130,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;
@@ -127,6 +179,9 @@ function parseArgs(argv) {
     }
     rest.push(arg);
   }
+  if (options.version) {
+    return { command: "version", options };
+  }
   if (options.help || rest.length === 0) {
     return { command: "help", options };
   }
@@ -447,6 +502,68 @@ function configureVisibleGitHubAuth(branchPath, remoteUrl, authHeader) {
   }
   runGit(["config", `${gitExtraHeaderConfigKey(gitExtraHeaderUrlForRemote(remoteUrl))}`, authHeader], { cwd: branchPath });
 }
+function dockerConfigPath() {
+  return import_node_path.default.join(import_node_os.default.homedir(), ".docker", "config.json");
+}
+function containersAuthPath() {
+  return import_node_path.default.join(import_node_os.default.homedir(), ".config", "containers", "auth.json");
+}
+function readJsonFile(filePath) {
+  if (!import_node_fs.default.existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(import_node_fs.default.readFileSync(filePath, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function writeRegistryAuthFile(filePath, credential) {
+  const config = readJsonFile(filePath);
+  const existingAuths = config.auths && typeof config.auths === "object" && !Array.isArray(config.auths) ? config.auths : {};
+  const auths = existingAuths;
+  auths[credential.registry] = {
+    username: credential.username,
+    password: credential.password,
+    auth: Buffer.from(`${credential.username}:${credential.password}`).toString("base64")
+  };
+  config.auths = auths;
+  import_node_fs.default.mkdirSync(import_node_path.default.dirname(filePath), { recursive: true });
+  import_node_fs.default.writeFileSync(filePath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+  import_node_fs.default.chmodSync(filePath, 384);
+}
+function configureContainerRegistryAuth(credential) {
+  containerRegistryCredential = credential;
+  if (!credential) {
+    return;
+  }
+  writeRegistryAuthFile(dockerConfigPath(), credential);
+  writeRegistryAuthFile(containersAuthPath(), credential);
+  if (credential.missingScopes.length > 0) {
+    process.stderr.write(
+      `[r5d-worker] GitHub token is missing GHCR scope(s): ${credential.missingScopes.join(", ")}. Sign in with GitHub again if GHCR push/pull fails.
+`
+    );
+  } else {
+    process.stdout.write(`[r5d-worker] configured GHCR auth for ${credential.username}
+`);
+  }
+}
+function containerRegistryEnv() {
+  if (!containerRegistryCredential) {
+    return {};
+  }
+  return {
+    R5D_GHCR_REGISTRY: containerRegistryCredential.registry,
+    R5D_GHCR_NAMESPACE: containerRegistryCredential.username,
+    R5D_GHCR_AUTH_FILE: containersAuthPath(),
+    REGISTRY_AUTH_FILE: containersAuthPath(),
+    GHCR_REGISTRY: containerRegistryCredential.registry,
+    GHCR_NAMESPACE: containerRegistryCredential.username
+  };
+}
 function checkoutVisibleBranch(input) {
   const branchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/heads/${input.branchName}`], { cwd: input.branchPath });
   const remoteBranchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], {
@@ -888,6 +1005,7 @@ async function executeCommand(input) {
       stderr: "pipe",
       env: {
         ...process.env,
+        ...containerRegistryEnv(),
         ...input.message.env ?? {}
       }
     });
@@ -1134,6 +1252,7 @@ function openPty(input) {
         cwd: branchPath.branchPath,
         env: {
           ...process.env,
+          ...containerRegistryEnv(),
           ...input.message.env ?? {},
           BUILD_IT_NOW_PROJECT_ID: input.projectId,
           BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
@@ -1260,7 +1379,7 @@ async function startWorker(options) {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: "0.1.0",
+        version: getWorkerVersion(),
         projectRoot: projectsRoot
       }
     };
@@ -1274,6 +1393,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "project_manifest") {
+        configureContainerRegistryAuth(message.githubContainerRegistry);
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);
@@ -1411,6 +1531,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.3",
+  "version": "0.0.5",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -6,6 +6,7 @@ import { createHash } from "node:crypto";
 import { hostname } from "node:os";
 import { spawn as spawnChildProcess } from "node:child_process";
 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;
@@ -14,6 +15,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const activeProcesses = /* @__PURE__ */ new Map();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
+let containerRegistryCredential = null;
 function defaultConfigPath() {
   return path.join(os.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -26,6 +28,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
@@ -35,9 +38,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);
@@ -47,7 +94,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) {
@@ -59,6 +107,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;
@@ -104,6 +156,9 @@ function parseArgs(argv) {
     }
     rest.push(arg);
   }
+  if (options.version) {
+    return { command: "version", options };
+  }
   if (options.help || rest.length === 0) {
     return { command: "help", options };
   }
@@ -424,6 +479,68 @@ function configureVisibleGitHubAuth(branchPath, remoteUrl, authHeader) {
   }
   runGit(["config", `${gitExtraHeaderConfigKey(gitExtraHeaderUrlForRemote(remoteUrl))}`, authHeader], { cwd: branchPath });
 }
+function dockerConfigPath() {
+  return path.join(os.homedir(), ".docker", "config.json");
+}
+function containersAuthPath() {
+  return path.join(os.homedir(), ".config", "containers", "auth.json");
+}
+function readJsonFile(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function writeRegistryAuthFile(filePath, credential) {
+  const config = readJsonFile(filePath);
+  const existingAuths = config.auths && typeof config.auths === "object" && !Array.isArray(config.auths) ? config.auths : {};
+  const auths = existingAuths;
+  auths[credential.registry] = {
+    username: credential.username,
+    password: credential.password,
+    auth: Buffer.from(`${credential.username}:${credential.password}`).toString("base64")
+  };
+  config.auths = auths;
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+  fs.chmodSync(filePath, 384);
+}
+function configureContainerRegistryAuth(credential) {
+  containerRegistryCredential = credential;
+  if (!credential) {
+    return;
+  }
+  writeRegistryAuthFile(dockerConfigPath(), credential);
+  writeRegistryAuthFile(containersAuthPath(), credential);
+  if (credential.missingScopes.length > 0) {
+    process.stderr.write(
+      `[r5d-worker] GitHub token is missing GHCR scope(s): ${credential.missingScopes.join(", ")}. Sign in with GitHub again if GHCR push/pull fails.
+`
+    );
+  } else {
+    process.stdout.write(`[r5d-worker] configured GHCR auth for ${credential.username}
+`);
+  }
+}
+function containerRegistryEnv() {
+  if (!containerRegistryCredential) {
+    return {};
+  }
+  return {
+    R5D_GHCR_REGISTRY: containerRegistryCredential.registry,
+    R5D_GHCR_NAMESPACE: containerRegistryCredential.username,
+    R5D_GHCR_AUTH_FILE: containersAuthPath(),
+    REGISTRY_AUTH_FILE: containersAuthPath(),
+    GHCR_REGISTRY: containerRegistryCredential.registry,
+    GHCR_NAMESPACE: containerRegistryCredential.username
+  };
+}
 function checkoutVisibleBranch(input) {
   const branchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/heads/${input.branchName}`], { cwd: input.branchPath });
   const remoteBranchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], {
@@ -865,6 +982,7 @@ async function executeCommand(input) {
       stderr: "pipe",
       env: {
         ...process.env,
+        ...containerRegistryEnv(),
         ...input.message.env ?? {}
       }
     });
@@ -1111,6 +1229,7 @@ function openPty(input) {
         cwd: branchPath.branchPath,
         env: {
           ...process.env,
+          ...containerRegistryEnv(),
           ...input.message.env ?? {},
           BUILD_IT_NOW_PROJECT_ID: input.projectId,
           BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
@@ -1237,7 +1356,7 @@ async function startWorker(options) {
         platform: process.platform,
         arch: process.arch,
         pid: process.pid,
-        version: "0.1.0",
+        version: getWorkerVersion(),
         projectRoot: projectsRoot
       }
     };
@@ -1251,6 +1370,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "project_manifest") {
+        configureContainerRegistryAuth(message.githubContainerRegistry);
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);
@@ -1388,6 +1508,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.3",
+  "version": "0.0.5",
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",