@ricsam/r5d-worker 0.0.5 → 0.0.6

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/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");
 }
@@ -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]);
@@ -896,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,
@@ -927,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 {
@@ -1254,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: () => {
@@ -1394,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);

package/dist/cjs/package.json

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

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");
 }
@@ -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]);
@@ -873,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,
@@ -904,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 {
@@ -1231,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: () => {
@@ -1371,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);

package/dist/mjs/package.json

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