@ricsam/r5d-worker 0.0.62 → 0.0.64

package/dist/cjs/main.cjs

@@ -1032,6 +1032,19 @@ function checkoutVisibleBranch(input) {
   }
   runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName], { cwd: input.branchPath });
 }
+function reconcileRewrittenCanonicalHistory(input) {
+  const remoteRef = `refs/remotes/origin/${input.branchName}`;
+  if (!tryGit(["rev-parse", "--verify", "HEAD"], { cwd: input.branchPath })) return;
+  if (!tryGit(["show-ref", "--verify", "--quiet", remoteRef], { cwd: input.branchPath })) return;
+  if (tryGit(["merge-base", "HEAD", remoteRef], { cwd: input.branchPath })) return;
+  if (hasWorktreeChanges(input.branchPath)) return;
+  const localTree = runGit(["rev-parse", "HEAD^{tree}"], { cwd: input.branchPath });
+  const remoteTree = runGit(["rev-parse", `${remoteRef}^{tree}`], { cwd: input.branchPath });
+  if (localTree !== remoteTree) return;
+  const previousHead = runGit(["rev-parse", "HEAD"], { cwd: input.branchPath });
+  runGit(["update-ref", `refs/r5d/pre-canonical-checkout/${previousHead}`, previousHead], { cwd: input.branchPath });
+  runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName, remoteRef], { cwd: input.branchPath });
+}
 function migrateExistingCheckoutToRequiredRemote(input) {
   if (originRemoteUrl(input.branchPath) === input.remoteUrl) return;
   const dirtyWorkingTree = hasWorktreeChanges(input.branchPath);
@@ -1139,6 +1152,9 @@ function ensureVisibleGitCheckout(input) {
   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.requireRemoteBranch) {
+    reconcileRewrittenCanonicalHistory({ branchPath, branchName: input.branchName });
+  }
   if (input.requiredBaseCommit) {
     assertCheckoutDerivedFromRequiredBase({
       branchPath,
@@ -2889,7 +2905,6 @@ async function startWorker(options) {
           configureGitHubAuth(message.githubCredential);
           visibleGitIdentity = message.gitIdentity;
           workspaceRemoteUrl = message.workspaceRemoteUrl;
-          const migratedProjectIds = (0, import_managed_paths.migrateLegacyProjectRoots)(projectsRoot, message.projects);
           manifestByProjectId.clear();
           for (const project of message.projects) manifestByProjectId.set(project.projectId, project);
           const currentCheckouts = allManifestCheckouts();
@@ -2905,7 +2920,7 @@ async function startWorker(options) {
             if (!hasNormalVisibleGitDir(branchPath)) pendingManifestCheckouts.set(key, checkout);
           }
           if (!workspaceManifestRevision.isCurrent(revisionToken)) return false;
-          const created = firstBootstrap || migratedProjectIds.length > 0 ? ensureVisibleWorktrees(currentCheckouts, { strictCanonicalRevalidation: true }) : [];
+          const created = firstBootstrap ? ensureVisibleWorktrees(currentCheckouts, { strictCanonicalRevalidation: true }) : [];
           if (!workspaceManifestRevision.isCurrent(revisionToken)) return false;
           const bootstrapped = await (0, import_workspace_sync.convergeWorkspaceHead)(workspaceSyncInput({ type: "connect" }, { newVisibleCheckouts: created }), {
             // An existing checkout becomes routable after a fetch. Its
@@ -2934,10 +2949,8 @@ async function startWorker(options) {
               pendingManifestCheckouts.delete(manifestCheckoutKey(checkout.projectId, checkout.branchName));
             }
           }
-          process.stdout.write(
-            `[r5d-worker] workspace manifest: ${message.projects.length} projects${migratedProjectIds.length > 0 ? `; migrated ${migratedProjectIds.length} project checkout root(s)` : ""}
-`
-          );
+          process.stdout.write(`[r5d-worker] workspace manifest: ${message.projects.length} projects
+`);
           return true;
         });
         if (!completed || !workspaceManifestRevision.complete(revisionToken)) return;

package/dist/cjs/managed-paths.cjs

@@ -31,10 +31,8 @@ __export(managed_paths_exports, {
   BRANCH_NAME_MAX_LENGTH: () => BRANCH_NAME_MAX_LENGTH,
   BRANCH_NAME_PATTERN: () => BRANCH_NAME_PATTERN,
   assertPathInside: () => assertPathInside,
-  legacyProjectSlug: () => legacyProjectSlug,
   managedBranchPath: () => managedBranchPath,
   managedProjectRoot: () => managedProjectRoot,
-  migrateLegacyProjectRoots: () => migrateLegacyProjectRoots,
   validateCheckoutPathSegments: () => validateCheckoutPathSegments,
   validateManagedBranchName: () => validateManagedBranchName
 });
@@ -105,54 +103,13 @@ function managedBranchPath(projectsRoot, checkoutPathSegments, branchName) {
   assertNoSymlinkComponents(projectRoot, result);
   return result;
 }
-function legacyProjectSlug(projectPath, projectId) {
-  return (projectPath || projectId).trim().toLowerCase().replace(/[^a-z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "") || projectId;
-}
-function migrateLegacyProjectRoots(projectsRoot, projects) {
-  const resolvedRoot = import_node_path.default.resolve(projectsRoot);
-  const legacyOwners = /* @__PURE__ */ new Map();
-  const nestedOwners = /* @__PURE__ */ new Map();
-  const moves = [];
-  for (const project of projects) {
-    const nestedRoot = managedProjectRoot(resolvedRoot, project.checkoutPathSegments);
-    const legacySlug = legacyProjectSlug(project.projectPath, project.projectId);
-    const legacyRoot = import_node_path.default.join(resolvedRoot, legacySlug);
-    assertNoSymlinkComponents(resolvedRoot, legacyRoot);
-    const existingLegacyOwner = legacyOwners.get(legacyRoot);
-    if (existingLegacyOwner) {
-      throw new Error(`Projects ${existingLegacyOwner} and ${project.projectId} collide at legacy checkout path '${legacyRoot}'`);
-    }
-    legacyOwners.set(legacyRoot, project.projectId);
-    const existingNestedOwner = nestedOwners.get(nestedRoot);
-    if (existingNestedOwner) {
-      throw new Error(`Projects ${existingNestedOwner} and ${project.projectId} collide at checkout path '${nestedRoot}'`);
-    }
-    nestedOwners.set(nestedRoot, project.projectId);
-    const legacyExists = import_node_fs.default.existsSync(legacyRoot);
-    const nestedExists = import_node_fs.default.existsSync(nestedRoot);
-    if (legacyExists && nestedExists) {
-      throw new Error(
-        `Checkout migration is ambiguous for ${project.projectPath}: both '${legacyRoot}' and '${nestedRoot}' exist. Preserve the desired checkout and remove or relocate the other path before reconnecting the worker.`
-      );
-    }
-    if (legacyExists) moves.push({ projectId: project.projectId, legacyRoot, nestedRoot });
-  }
-  for (const move of moves) {
-    import_node_fs.default.mkdirSync(import_node_path.default.dirname(move.nestedRoot), { recursive: true });
-    assertNoSymlinkComponents(resolvedRoot, import_node_path.default.dirname(move.nestedRoot));
-    import_node_fs.default.renameSync(move.legacyRoot, move.nestedRoot);
-  }
-  return moves.map((move) => move.projectId);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BRANCH_NAME_MAX_LENGTH,
   BRANCH_NAME_PATTERN,
   assertPathInside,
-  legacyProjectSlug,
   managedBranchPath,
   managedProjectRoot,
-  migrateLegacyProjectRoots,
   validateCheckoutPathSegments,
   validateManagedBranchName
 });

package/dist/cjs/package.json

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

package/dist/cjs/workspace-manifest-admission.cjs

@@ -41,11 +41,8 @@ function hasNormalGitDirectory(checkoutPath) {
 function inspectWorkspaceManifestFilesystem(input) {
   const firstBootstrap = !hasNormalGitDirectory(input.workspaceShadowRoot);
   const missingCheckouts = [];
-  const migratedProjectIds = [];
   for (const project of input.projects) {
     const projectRoot = (0, import_managed_paths.managedProjectRoot)(input.projectsRoot, project.checkoutPathSegments);
-    const legacyRoot = import_node_path.default.join(input.projectsRoot, (0, import_managed_paths.legacyProjectSlug)(project.projectPath, project.projectId));
-    if (import_node_fs.default.existsSync(legacyRoot)) migratedProjectIds.push(project.projectId);
     for (const branchName of project.branches) {
       if (!hasNormalGitDirectory(import_node_path.default.join(projectRoot, branchName))) {
         missingCheckouts.push({ projectId: project.projectId, branchName });
@@ -54,8 +51,7 @@ function inspectWorkspaceManifestFilesystem(input) {
   }
   return {
     firstBootstrap,
-    missingCheckouts,
-    migratedProjectIds
+    missingCheckouts
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/mjs/main.mjs

@@ -35,7 +35,7 @@ import {
   WORKER_RELOAD_EXIT_CODE,
   WORKER_RUNTIME_ENV
 } from "./supervisor.mjs";
-import { managedProjectRoot, migrateLegacyProjectRoots, validateManagedBranchName } from "./managed-paths.mjs";
+import { managedProjectRoot, validateManagedBranchName } from "./managed-paths.mjs";
 import {
   WorkspaceSyncSingleFlight,
   convergeWorkspaceHead,
@@ -1003,6 +1003,19 @@ function checkoutVisibleBranch(input) {
   }
   runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName], { cwd: input.branchPath });
 }
+function reconcileRewrittenCanonicalHistory(input) {
+  const remoteRef = `refs/remotes/origin/${input.branchName}`;
+  if (!tryGit(["rev-parse", "--verify", "HEAD"], { cwd: input.branchPath })) return;
+  if (!tryGit(["show-ref", "--verify", "--quiet", remoteRef], { cwd: input.branchPath })) return;
+  if (tryGit(["merge-base", "HEAD", remoteRef], { cwd: input.branchPath })) return;
+  if (hasWorktreeChanges(input.branchPath)) return;
+  const localTree = runGit(["rev-parse", "HEAD^{tree}"], { cwd: input.branchPath });
+  const remoteTree = runGit(["rev-parse", `${remoteRef}^{tree}`], { cwd: input.branchPath });
+  if (localTree !== remoteTree) return;
+  const previousHead = runGit(["rev-parse", "HEAD"], { cwd: input.branchPath });
+  runGit(["update-ref", `refs/r5d/pre-canonical-checkout/${previousHead}`, previousHead], { cwd: input.branchPath });
+  runGit(["checkout", "--no-recurse-submodules", "-B", input.branchName, remoteRef], { cwd: input.branchPath });
+}
 function migrateExistingCheckoutToRequiredRemote(input) {
   if (originRemoteUrl(input.branchPath) === input.remoteUrl) return;
   const dirtyWorkingTree = hasWorktreeChanges(input.branchPath);
@@ -1110,6 +1123,9 @@ function ensureVisibleGitCheckout(input) {
   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.requireRemoteBranch) {
+    reconcileRewrittenCanonicalHistory({ branchPath, branchName: input.branchName });
+  }
   if (input.requiredBaseCommit) {
     assertCheckoutDerivedFromRequiredBase({
       branchPath,
@@ -2860,7 +2876,6 @@ async function startWorker(options) {
           configureGitHubAuth(message.githubCredential);
           visibleGitIdentity = message.gitIdentity;
           workspaceRemoteUrl = message.workspaceRemoteUrl;
-          const migratedProjectIds = migrateLegacyProjectRoots(projectsRoot, message.projects);
           manifestByProjectId.clear();
           for (const project of message.projects) manifestByProjectId.set(project.projectId, project);
           const currentCheckouts = allManifestCheckouts();
@@ -2876,7 +2891,7 @@ async function startWorker(options) {
             if (!hasNormalVisibleGitDir(branchPath)) pendingManifestCheckouts.set(key, checkout);
           }
           if (!workspaceManifestRevision.isCurrent(revisionToken)) return false;
-          const created = firstBootstrap || migratedProjectIds.length > 0 ? ensureVisibleWorktrees(currentCheckouts, { strictCanonicalRevalidation: true }) : [];
+          const created = firstBootstrap ? ensureVisibleWorktrees(currentCheckouts, { strictCanonicalRevalidation: true }) : [];
           if (!workspaceManifestRevision.isCurrent(revisionToken)) return false;
           const bootstrapped = await convergeWorkspaceHead(workspaceSyncInput({ type: "connect" }, { newVisibleCheckouts: created }), {
             // An existing checkout becomes routable after a fetch. Its
@@ -2905,10 +2920,8 @@ async function startWorker(options) {
               pendingManifestCheckouts.delete(manifestCheckoutKey(checkout.projectId, checkout.branchName));
             }
           }
-          process.stdout.write(
-            `[r5d-worker] workspace manifest: ${message.projects.length} projects${migratedProjectIds.length > 0 ? `; migrated ${migratedProjectIds.length} project checkout root(s)` : ""}
-`
-          );
+          process.stdout.write(`[r5d-worker] workspace manifest: ${message.projects.length} projects
+`);
           return true;
         });
         if (!completed || !workspaceManifestRevision.complete(revisionToken)) return;

package/dist/mjs/managed-paths.mjs

@@ -64,53 +64,12 @@ function managedBranchPath(projectsRoot, checkoutPathSegments, branchName) {
   assertNoSymlinkComponents(projectRoot, result);
   return result;
 }
-function legacyProjectSlug(projectPath, projectId) {
-  return (projectPath || projectId).trim().toLowerCase().replace(/[^a-z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "") || projectId;
-}
-function migrateLegacyProjectRoots(projectsRoot, projects) {
-  const resolvedRoot = path.resolve(projectsRoot);
-  const legacyOwners = /* @__PURE__ */ new Map();
-  const nestedOwners = /* @__PURE__ */ new Map();
-  const moves = [];
-  for (const project of projects) {
-    const nestedRoot = managedProjectRoot(resolvedRoot, project.checkoutPathSegments);
-    const legacySlug = legacyProjectSlug(project.projectPath, project.projectId);
-    const legacyRoot = path.join(resolvedRoot, legacySlug);
-    assertNoSymlinkComponents(resolvedRoot, legacyRoot);
-    const existingLegacyOwner = legacyOwners.get(legacyRoot);
-    if (existingLegacyOwner) {
-      throw new Error(`Projects ${existingLegacyOwner} and ${project.projectId} collide at legacy checkout path '${legacyRoot}'`);
-    }
-    legacyOwners.set(legacyRoot, project.projectId);
-    const existingNestedOwner = nestedOwners.get(nestedRoot);
-    if (existingNestedOwner) {
-      throw new Error(`Projects ${existingNestedOwner} and ${project.projectId} collide at checkout path '${nestedRoot}'`);
-    }
-    nestedOwners.set(nestedRoot, project.projectId);
-    const legacyExists = fs.existsSync(legacyRoot);
-    const nestedExists = fs.existsSync(nestedRoot);
-    if (legacyExists && nestedExists) {
-      throw new Error(
-        `Checkout migration is ambiguous for ${project.projectPath}: both '${legacyRoot}' and '${nestedRoot}' exist. Preserve the desired checkout and remove or relocate the other path before reconnecting the worker.`
-      );
-    }
-    if (legacyExists) moves.push({ projectId: project.projectId, legacyRoot, nestedRoot });
-  }
-  for (const move of moves) {
-    fs.mkdirSync(path.dirname(move.nestedRoot), { recursive: true });
-    assertNoSymlinkComponents(resolvedRoot, path.dirname(move.nestedRoot));
-    fs.renameSync(move.legacyRoot, move.nestedRoot);
-  }
-  return moves.map((move) => move.projectId);
-}
 export {
   BRANCH_NAME_MAX_LENGTH,
   BRANCH_NAME_PATTERN,
   assertPathInside,
-  legacyProjectSlug,
   managedBranchPath,
   managedProjectRoot,
-  migrateLegacyProjectRoots,
   validateCheckoutPathSegments,
   validateManagedBranchName
 };

package/dist/mjs/package.json

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

package/dist/mjs/workspace-manifest-admission.mjs

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { legacyProjectSlug, managedProjectRoot } from "./managed-paths.mjs";
+import { managedProjectRoot } from "./managed-paths.mjs";
 function hasNormalGitDirectory(checkoutPath) {
   const gitPath = path.join(checkoutPath, ".git");
   return fs.existsSync(gitPath) && fs.statSync(gitPath).isDirectory();
@@ -8,11 +8,8 @@ function hasNormalGitDirectory(checkoutPath) {
 function inspectWorkspaceManifestFilesystem(input) {
   const firstBootstrap = !hasNormalGitDirectory(input.workspaceShadowRoot);
   const missingCheckouts = [];
-  const migratedProjectIds = [];
   for (const project of input.projects) {
     const projectRoot = managedProjectRoot(input.projectsRoot, project.checkoutPathSegments);
-    const legacyRoot = path.join(input.projectsRoot, legacyProjectSlug(project.projectPath, project.projectId));
-    if (fs.existsSync(legacyRoot)) migratedProjectIds.push(project.projectId);
     for (const branchName of project.branches) {
       if (!hasNormalGitDirectory(path.join(projectRoot, branchName))) {
         missingCheckouts.push({ projectId: project.projectId, branchName });
@@ -21,8 +18,7 @@ function inspectWorkspaceManifestFilesystem(input) {
   }
   return {
     firstBootstrap,
-    missingCheckouts,
-    migratedProjectIds
+    missingCheckouts
   };
 }
 export {

package/dist/types/managed-paths.d.ts

@@ -1,15 +1,8 @@
 export declare const BRANCH_NAME_MAX_LENGTH = 45;
 export declare const BRANCH_NAME_PATTERN: RegExp;
 export type CheckoutPathSegments = [namespace: string, project: string];
-export type ManagedProjectManifestPath = {
-    projectId: string;
-    projectPath: string;
-    checkoutPathSegments: CheckoutPathSegments;
-};
 export declare function validateManagedBranchName(branchName: string): void;
 export declare function validateCheckoutPathSegments(value: unknown): CheckoutPathSegments;
 export declare function assertPathInside(root: string, candidate: string, label: string): void;
 export declare function managedProjectRoot(projectsRoot: string, checkoutPathSegments: unknown): string;
 export declare function managedBranchPath(projectsRoot: string, checkoutPathSegments: unknown, branchName: string): string;
-export declare function legacyProjectSlug(projectPath: string, projectId: string): string;
-export declare function migrateLegacyProjectRoots(projectsRoot: string, projects: ManagedProjectManifestPath[]): string[];

package/dist/types/workspace-manifest-admission.d.ts

@@ -1,6 +1,5 @@
 export type WorkspaceManifestCheckout = {
     projectId: string;
-    projectPath: string;
     checkoutPathSegments: [namespace: string, project: string];
     branches: string[];
 };
@@ -10,7 +9,6 @@ export type WorkspaceManifestFilesystemState = {
         projectId: string;
         branchName: string;
     }>;
-    migratedProjectIds: string[];
 };
 /**
  * Inspects manifest-related filesystem state without reserving visible paths.

package/package.json

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