@ricsam/r5d-worker 0.0.46 → 0.0.47

package/dist/mjs/main.mjs

@@ -21,7 +21,8 @@ import {
   WORKSPACE_PERIODIC_SCAN_INTERVAL_MS,
   WorkspaceSyncSingleFlight,
   calculateWorkspaceDiffFingerprint,
-  synchronizeWorkspace
+  synchronizeWorkspace,
+  workspaceProjectsForSync
 } from "./workspace-sync.mjs";
 class WorkerServerUnavailableError extends Error {
   name = "WorkerServerUnavailableError";
@@ -578,6 +579,14 @@ function validatePlanId(planId) {
     throw new Error(`Invalid plan id from server: ${planId}`);
   }
 }
+const NON_RECURSIVE_GIT_CONFIG_ARGS = [
+  "-c",
+  "submodule.recurse=false",
+  "-c",
+  "fetch.recurseSubmodules=false",
+  "-c",
+  "push.recurseSubmodules=false"
+];
 function gitExtraHeaderConfigKey(extraHeaderUrl) {
   return `http.${normalizeBaseUrl(extraHeaderUrl)}/.extraHeader`;
 }
@@ -585,10 +594,23 @@ function gitAuthArgs(auth) {
   if (!auth) {
     return [];
   }
-  return ["-c", `${gitExtraHeaderConfigKey(auth.extraHeaderUrl)}=${auth.header}`];
+  const scopedKey = gitExtraHeaderConfigKey(auth.extraHeaderUrl);
+  return ["-c", "http.extraHeader=", "-c", `${scopedKey}=`, "-c", `${scopedKey}=${auth.header}`];
+}
+const visibleCheckoutGitTestHarness = {
+  gitAuthArgs,
+  commandArgs: (args, auth) => ["git", ...NON_RECURSIVE_GIT_CONFIG_ARGS, ...gitAuthArgs(auth), ...args],
+  cloneArgs: (remoteUrl, branchPath) => ["clone", "--no-recurse-submodules", "--origin", "origin", remoteUrl, branchPath],
+  fetchArgs: (...args) => ["fetch", "--no-recurse-submodules", ...args]
+};
+function visibleCheckoutCloneArgs(remoteUrl, branchPath) {
+  return visibleCheckoutGitTestHarness.cloneArgs(remoteUrl, branchPath);
+}
+function visibleCheckoutFetchArgs(...args) {
+  return visibleCheckoutGitTestHarness.fetchArgs(...args);
 }
 function runGit(args, options = {}) {
-  const command = ["git", ...gitAuthArgs(options.auth), ...args];
+  const command = visibleCheckoutGitTestHarness.commandArgs(args, options.auth);
   const result = Bun.spawnSync(command, {
     cwd: options.cwd,
     stdout: "pipe",
@@ -732,8 +754,28 @@ function resolveWorkerFilePath(branchPath, inputPath, builtInPaths) {
 function fallbackInternalRemoteUrl(baseUrl, projectId) {
   return new URL(`/git/${projectId}.git`, baseUrl).toString();
 }
-function githubRemoteUrlFor(baseUrl, projectId, manifest) {
-  return manifest?.repoHttpUrl ?? fallbackInternalRemoteUrl(baseUrl, projectId);
+function visibleCheckoutRemoteFor(input) {
+  const canonicalCheckout = input.manifest?.canonicalCheckouts?.find((checkout) => checkout.branchName === input.branchName);
+  const isCanonicalManifestBranch = Boolean(canonicalCheckout);
+  const usesCanonicalRemote = isCanonicalManifestBranch || !input.manifest?.repoHttpUrl;
+  if (usesCanonicalRemote) {
+    return {
+      remoteUrl: fallbackInternalRemoteUrl(input.baseUrl, input.projectId),
+      authHeader: `Authorization: Bearer ${input.token}`,
+      persistAuth: false,
+      reconcileExistingOrigin: isCanonicalManifestBranch,
+      requireRemoteBranch: isCanonicalManifestBranch,
+      requiredBaseCommit: canonicalCheckout?.scaffoldCommitHash ?? null
+    };
+  }
+  return {
+    remoteUrl: input.manifest?.repoHttpUrl ?? fallbackInternalRemoteUrl(input.baseUrl, input.projectId),
+    authHeader: input.manifest?.repoAuthHeader ?? null,
+    persistAuth: true,
+    reconcileExistingOrigin: Boolean(input.manifest?.repoHttpUrl),
+    requireRemoteBranch: false,
+    requiredBaseCommit: null
+  };
 }
 function gitExtraHeaderUrlForRemote(remoteUrl) {
   try {
@@ -762,6 +804,10 @@ function ensureOriginRemote(branchPath, remoteUrl) {
     runGit(["remote", "add", "origin", remoteUrl], { cwd: branchPath });
   }
 }
+function originRemoteUrl(branchPath) {
+  if (!tryGit(["remote", "get-url", "origin"], { cwd: branchPath })) return null;
+  return runGit(["remote", "get-url", "origin"], { cwd: branchPath });
+}
 function shellQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -830,6 +876,18 @@ function configureVisibleGitHubAuth(branchPath, remoteUrl, authHeader) {
   }
   runGit(["config", `${gitExtraHeaderConfigKey(gitExtraHeaderUrlForRemote(remoteUrl))}`, authHeader], { cwd: branchPath });
 }
+function clearVisibleGitAuthentication(branchPath) {
+  let extraHeaderKeys = [];
+  try {
+    extraHeaderKeys = runGit(["config", "--local", "--name-only", "--get-regexp", "^http\\..*extraheader$"], { cwd: branchPath }).split(/\r?\n/).filter(Boolean);
+  } catch {
+  }
+  for (const key of extraHeaderKeys) {
+    tryGit(["config", "--local", "--unset-all", key], { cwd: branchPath });
+  }
+  runGit(["config", "--local", "--replace-all", "credential.helper", ""], { cwd: branchPath });
+  tryGit(["config", "--local", "--unset-all", "credential.useHttpPath"], { cwd: branchPath });
+}
 function dockerConfigPath() {
   return path.join(os.homedir(), ".docker", "config.json");
 }
@@ -918,18 +976,58 @@ function checkoutVisibleBranch(input) {
   });
   const clean = !hasWorktreeChanges(input.branchPath);
   if (remoteBranchExists && clean) {
-    runGit(["checkout", "-B", input.branchName, `origin/${input.branchName}`], { cwd: input.branchPath });
+    runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName, `origin/${input.branchName}`], {
+      cwd: input.branchPath
+    });
     return;
   }
   if (branchExists) {
-    runGit(["checkout", input.branchName], { cwd: input.branchPath });
+    runGit(["checkout", "--no-recurse-submodules", input.branchName], { cwd: input.branchPath });
     return;
   }
   if (defaultRemoteExists) {
-    runGit(["checkout", "-B", input.branchName, `origin/${input.defaultBranch}`], { cwd: input.branchPath });
+    runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName, `origin/${input.defaultBranch}`], {
+      cwd: input.branchPath
+    });
     return;
   }
-  runGit(["checkout", "-B", input.branchName], { cwd: input.branchPath });
+  runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName], { cwd: input.branchPath });
+}
+function migrateExistingCheckoutToRequiredRemote(input) {
+  if (originRemoteUrl(input.branchPath) === input.remoteUrl) return;
+  if (hasWorktreeChanges(input.branchPath)) {
+    throw new Error(`Cannot migrate dirty checkout for ${input.branchName} to its canonical remote`);
+  }
+  runGit(
+    visibleCheckoutFetchArgs("--no-tags", input.remoteUrl, `+refs/heads/${input.branchName}:refs/remotes/origin/${input.branchName}`),
+    {
+      cwd: input.branchPath,
+      auth: input.remoteAuth
+    }
+  );
+  const canonicalRemoteRef = `refs/remotes/origin/${input.branchName}`;
+  if (!tryGit(["show-ref", "--verify", "--quiet", canonicalRemoteRef], { cwd: input.branchPath })) {
+    throw new Error(`Canonical branch ${input.branchName} is unavailable during checkout migration`);
+  }
+  if (input.requiredBaseCommit && (!tryGit(["cat-file", "-e", `${input.requiredBaseCommit}^{commit}`], { cwd: input.branchPath }) || !tryGit(["merge-base", "--is-ancestor", input.requiredBaseCommit, canonicalRemoteRef], { cwd: input.branchPath }))) {
+    throw new Error(`Canonical branch ${input.branchName} is not derived from required scaffold ${input.requiredBaseCommit}`);
+  }
+  if (tryGit(["rev-parse", "--verify", "HEAD"], { cwd: input.branchPath })) {
+    const previousHead = runGit(["rev-parse", "HEAD"], { cwd: input.branchPath });
+    runGit(["update-ref", `refs/r5d/pre-canonical-checkout/${previousHead}`, previousHead], { cwd: input.branchPath });
+  }
+  ensureOriginRemote(input.branchPath, input.remoteUrl);
+  runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName, `origin/${input.branchName}`], {
+    cwd: input.branchPath
+  });
+}
+function assertCheckoutDerivedFromRequiredBase(input) {
+  const remoteRevision = `refs/remotes/origin/${input.branchName}`;
+  for (const revision of [remoteRevision, "HEAD"]) {
+    if (!tryGit(["cat-file", "-e", `${input.requiredBaseCommit}^{commit}`], { cwd: input.branchPath }) || !tryGit(["merge-base", "--is-ancestor", input.requiredBaseCommit, revision], { cwd: input.branchPath })) {
+      throw new Error(`Canonical checkout ${input.branchName} is not derived from required scaffold ${input.requiredBaseCommit}`);
+    }
+  }
 }
 function ensureVisibleGitCheckout(input) {
   validateBranchName(input.branchName);
@@ -939,40 +1037,114 @@ function ensureVisibleGitCheckout(input) {
   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 })) {
+    const cloned = tryGit(visibleCheckoutCloneArgs(input.remoteUrl, branchPath), {
+      auth: input.remoteAuth
+    });
+    if (!cloned && input.requireRemoteBranch) {
+      fs.rmSync(branchPath, { recursive: true, force: true });
+      throw new Error(`Failed to clone canonical checkout for branch ${input.branchName}`);
+    }
+    if (!cloned) {
       fs.mkdirSync(branchPath, { recursive: true });
       runGit(["init"], { cwd: branchPath });
     }
-    ensureOriginRemote(branchPath, input.githubRemoteUrl);
-    configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
+    ensureOriginRemote(branchPath, input.remoteUrl);
+    if (input.clearPersistentAuth) clearVisibleGitAuthentication(branchPath);
+    else configureVisibleGitHubAuth(branchPath, input.remoteUrl, input.persistentAuthHeader);
     configureVisibleGitIdentity(branchPath, visibleGitIdentity, runGit);
-    tryGit(["fetch", "origin", "--prune"], { cwd: branchPath, auth: input.githubAuth });
+    tryGit(visibleCheckoutFetchArgs("origin", "--prune"), { cwd: branchPath, auth: input.remoteAuth });
+    if (input.requireRemoteBranch && !tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], { cwd: branchPath })) {
+      fs.rmSync(branchPath, { recursive: true, force: true });
+      throw new Error(`Canonical branch ${input.branchName} is unavailable after clone`);
+    }
     checkoutVisibleBranch({ branchPath, branchName: input.branchName, defaultBranch: input.defaultBranch });
+    if (input.requiredBaseCommit) {
+      try {
+        assertCheckoutDerivedFromRequiredBase({
+          branchPath,
+          branchName: input.branchName,
+          requiredBaseCommit: input.requiredBaseCommit
+        });
+      } catch (error) {
+        fs.rmSync(branchPath, { recursive: true, force: true });
+        throw error;
+      }
+    }
     return branchPath;
   }
+  if (input.requireRemoteBranch) {
+    if (input.allowRequiredRemoteMigration === false && originRemoteUrl(branchPath) !== input.remoteUrl) {
+      throw new Error(`Canonical checkout ${input.branchName} no longer uses its required remote`);
+    }
+    migrateExistingCheckoutToRequiredRemote({
+      branchPath,
+      branchName: input.branchName,
+      remoteUrl: input.remoteUrl,
+      remoteAuth: input.remoteAuth,
+      requiredBaseCommit: input.requiredBaseCommit
+    });
+    runGit(
+      visibleCheckoutFetchArgs("--no-tags", input.remoteUrl, `+refs/heads/${input.branchName}:refs/remotes/origin/${input.branchName}`),
+      {
+        cwd: branchPath,
+        auth: input.remoteAuth
+      }
+    );
+  }
   if (input.reconcileExistingOrigin) {
-    ensureOriginRemote(branchPath, input.githubRemoteUrl);
+    ensureOriginRemote(branchPath, input.remoteUrl);
+  }
+  if (input.requireRemoteBranch && !tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], { cwd: branchPath })) {
+    throw new Error(`Existing checkout for ${input.branchName} does not contain its canonical remote branch`);
+  }
+  if (input.requiredBaseCommit) {
+    assertCheckoutDerivedFromRequiredBase({
+      branchPath,
+      branchName: input.branchName,
+      requiredBaseCommit: input.requiredBaseCommit
+    });
   }
-  configureVisibleGitHubAuth(branchPath, input.githubRemoteUrl, input.githubAuthHeader);
+  if (input.clearPersistentAuth) clearVisibleGitAuthentication(branchPath);
+  else configureVisibleGitHubAuth(branchPath, input.remoteUrl, input.persistentAuthHeader);
   configureVisibleGitIdentity(branchPath, visibleGitIdentity, runGit);
   return branchPath;
 }
 function ensureBranchWorkspace(input) {
   const defaultBranch = input.manifest?.defaultBranch || "main";
-  const githubRemoteUrl = githubRemoteUrlFor(input.baseUrl, input.projectId, input.manifest);
-  const githubAuth = gitAuthForRemote(githubRemoteUrl, input.manifest?.repoAuthHeader);
+  const remote = visibleCheckoutRemoteFor(input);
   return {
     branchPath: ensureVisibleGitCheckout({
       projectRoot: input.projectRoot,
       branchName: input.branchName,
-      githubRemoteUrl,
-      githubAuth,
-      githubAuthHeader: input.manifest?.repoAuthHeader ?? null,
+      remoteUrl: remote.remoteUrl,
+      remoteAuth: gitAuthForRemote(remote.remoteUrl, remote.authHeader),
+      persistentAuthHeader: remote.persistAuth ? remote.authHeader : null,
       defaultBranch,
-      reconcileExistingOrigin: Boolean(input.manifest?.repoHttpUrl)
+      reconcileExistingOrigin: remote.reconcileExistingOrigin,
+      requireRemoteBranch: remote.requireRemoteBranch,
+      requiredBaseCommit: remote.requiredBaseCommit,
+      clearPersistentAuth: !remote.persistAuth
     })
   };
 }
+function workspaceSyncCheckoutTargets(input) {
+  const selected = /* @__PURE__ */ new Map();
+  const add = (target) => {
+    selected.set(`${target.projectId}\0${target.branchName}`, target);
+  };
+  if (input.canonicalCheckoutOnly) {
+    add(input.canonicalCheckoutOnly);
+  } else if (input.includeAllManifestCheckouts) {
+    for (const project of input.projects) {
+      for (const branchName of project.branches) add({ projectId: project.projectId, branchName });
+    }
+  } else {
+    for (const target of input.pendingTargets) add(target);
+  }
+  return [...selected.values()].sort(
+    (left, right) => left.projectId.localeCompare(right.projectId) || left.branchName.localeCompare(right.branchName)
+  );
+}
 function resolveCommandCwd(branchPath, cwd) {
   if (!cwd) {
     return branchPath;
@@ -2196,6 +2368,7 @@ async function startWorker(options) {
   let reloadAfterClose = false;
   const workspaceSyncInput = (trigger, overrides = {}) => {
     if (!workspaceRemoteUrl) throw new Error("Worker workspace manifest has not been received");
+    const projects = workspaceProjectsForSync([...manifestByProjectId.values()], trigger);
     return {
       workerLabel: label,
       remoteUrl: workspaceRemoteUrl,
@@ -2203,7 +2376,7 @@ async function startWorker(options) {
       projectsRoot,
       plansRoot: planRoot,
       shadowRoot: workspaceShadowRoot,
-      projects: [...manifestByProjectId.values()],
+      projects,
       trigger,
       ...overrides
     };
@@ -2215,7 +2388,7 @@ async function startWorker(options) {
   const allManifestCheckouts = () => [...manifestByProjectId.values()].flatMap(
     (manifest) => manifest.branches.map((branchName) => ({ projectId: manifest.projectId, branchName }))
   );
-  const ensureVisibleWorkspaceCheckouts = (targets) => {
+  const ensureVisibleWorkspaceCheckouts = (targets, options2 = {}) => {
     const created = [];
     for (const target of targets) {
       const manifest = manifestByProjectId.get(target.projectId);
@@ -2227,15 +2400,25 @@ async function startWorker(options) {
       const projectRoot = projectRootFor(projectsRoot, manifest.projectId, manifestByProjectId);
       const branchPath = path.join(projectRoot, target.branchName);
       const existed = hasNormalVisibleGitDir(branchPath);
-      const githubRemoteUrl = githubRemoteUrlFor(baseUrl, manifest.projectId, manifest);
+      const remote = visibleCheckoutRemoteFor({
+        baseUrl,
+        token,
+        projectId: manifest.projectId,
+        branchName: target.branchName,
+        manifest
+      });
       ensureVisibleGitCheckout({
         projectRoot,
         branchName: target.branchName,
-        githubRemoteUrl,
-        githubAuth: gitAuthForRemote(githubRemoteUrl, manifest.repoAuthHeader),
-        githubAuthHeader: manifest.repoAuthHeader,
+        remoteUrl: remote.remoteUrl,
+        remoteAuth: gitAuthForRemote(remote.remoteUrl, remote.authHeader),
+        persistentAuthHeader: remote.persistAuth ? remote.authHeader : null,
         defaultBranch: manifest.defaultBranch || "main",
-        reconcileExistingOrigin: Boolean(manifest.repoHttpUrl)
+        reconcileExistingOrigin: remote.reconcileExistingOrigin,
+        requireRemoteBranch: remote.requireRemoteBranch,
+        requiredBaseCommit: remote.requiredBaseCommit,
+        allowRequiredRemoteMigration: !(options2.strictCanonicalRevalidation && remote.requireRemoteBranch),
+        clearPersistentAuth: !remote.persistAuth
       });
       if (!existed) created.push(target);
     }
@@ -2247,15 +2430,30 @@ async function startWorker(options) {
       let pendingTargets = [];
       const result = await workspaceSyncSingleFlight.runPrepared(() => {
         const shouldEnsureCheckouts = !overrides.skipVisibleMirror && !overrides.resetToCanonical;
+        const syncProjects = workspaceProjectsForSync([...manifestByProjectId.values()], trigger);
+        const allowedCheckoutKeys = new Set(
+          syncProjects.flatMap((project) => project.branches.map((branchName) => manifestCheckoutKey(project.projectId, branchName)))
+        );
+        const scopedPendingTargets = [...pendingManifestCheckouts.values()].filter(
+          (target) => allowedCheckoutKeys.has(manifestCheckoutKey(target.projectId, target.branchName))
+        );
         let checkoutTargets = [];
         if (shouldEnsureCheckouts) {
-          checkoutTargets = trigger.type === "connect" ? allManifestCheckouts() : [...pendingManifestCheckouts.values()];
+          checkoutTargets = workspaceSyncCheckoutTargets({
+            projects: syncProjects,
+            pendingTargets: scopedPendingTargets,
+            includeAllManifestCheckouts: trigger.type === "connect",
+            ...trigger.canonicalCheckoutOnly && trigger.projectId && trigger.branchName ? { canonicalCheckoutOnly: { projectId: trigger.projectId, branchName: trigger.branchName } } : {}
+          });
         }
-        pendingTargets = shouldEnsureCheckouts ? [...pendingManifestCheckouts.values()] : [];
-        const createdCheckouts = ensureVisibleWorkspaceCheckouts(checkoutTargets);
+        pendingTargets = shouldEnsureCheckouts ? scopedPendingTargets : [];
+        const createdCheckouts = ensureVisibleWorkspaceCheckouts(checkoutTargets, {
+          strictCanonicalRevalidation: true
+        });
         const newVisibleCheckoutByKey = /* @__PURE__ */ new Map();
         for (const target of [...overrides.newVisibleCheckouts ?? [], ...createdCheckouts, ...pendingTargets]) {
-          newVisibleCheckoutByKey.set(manifestCheckoutKey(target.projectId, target.branchName), target);
+          const key = manifestCheckoutKey(target.projectId, target.branchName);
+          if (allowedCheckoutKeys.has(key)) newVisibleCheckoutByKey.set(key, target);
         }
         const newVisibleCheckouts = [...newVisibleCheckoutByKey.values()];
         return workspaceSyncInput(trigger, {
@@ -2331,7 +2529,8 @@ async function startWorker(options) {
         version: getWorkerVersion(),
         r5dctlVersion: readInstalledCliVersion("r5dctl"),
         capabilities: {
-          updateClis: true
+          updateClis: true,
+          canonicalResolverCheckout: true
         },
         projectRoot: projectsRoot,
         artifactRoot,
@@ -2391,7 +2590,15 @@ async function startWorker(options) {
             if (!workspaceRemoteUrl || activeWorkspaceIncidentId || cliUpdateInProgress || periodicWorkspaceScanInFlight) return;
             periodicWorkspaceScanInFlight = true;
             void (async () => {
-              if (pendingManifestCheckouts.size > 0) {
+              const genericCheckoutKeys = new Set(
+                workspaceProjectsForSync([...manifestByProjectId.values()], { type: "periodic" }).flatMap(
+                  (project) => project.branches.map((branchName) => manifestCheckoutKey(project.projectId, branchName))
+                )
+              );
+              const hasPendingGenericCheckout = [...pendingManifestCheckouts.values()].some(
+                (target) => genericCheckoutKeys.has(manifestCheckoutKey(target.projectId, target.branchName))
+              );
+              if (hasPendingGenericCheckout) {
                 previousPeriodicFingerprint = null;
                 await runRequestedWorkspaceSync(crypto.randomUUID(), {
                   type: "periodic",
@@ -2808,5 +3015,8 @@ export {
   resolveHostShell,
   resolveWorkerFilePath,
   syncSessionArtifacts,
+  visibleCheckoutGitTestHarness,
+  visibleCheckoutRemoteFor,
+  workspaceSyncCheckoutTargets,
   writeWorkerTextFile
 };

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "type": "module"
 }