@saeed42/worktree-worker 1.3.2 → 1.3.4

package/dist/main.js

@@ -13,9 +13,10 @@ var env = {
   PORT: parseInt(process.env.PORT || "8787", 10),
   NODE_ENV: process.env.NODE_ENV || "development",
   WORKER_TOKEN: process.env.WORKER_TOKEN || "",
-  BASE_WORKSPACE_DIR: process.env.BASE_WORKSPACE_DIR || "/project/sandbox",
-  WORKSPACES_ROOT: process.env.WORKSPACES_ROOT || "/project/workspaces",
-  TRIALS_WORKSPACE_DIR: process.env.TRIALS_WORKSPACE_DIR || "/project/workspaces/trials",
+  // CRITICAL: Must be /project/sandbox to match trigger tasks and OpenCode
+  BASE_WORKSPACE_DIR: "/project/sandbox",
+  WORKSPACES_ROOT: "/project/workspaces",
+  TRIALS_WORKSPACE_DIR: "/project/workspaces/trials",
   DEFAULT_BRANCH: process.env.DEFAULT_BRANCH || "main",
   GIT_TIMEOUT_MS: parseInt(process.env.GIT_TIMEOUT_MS || "60000", 10),
   CLEANUP_AFTER_HOURS: parseInt(process.env.CLEANUP_AFTER_HOURS || "24", 10)
@@ -634,10 +635,26 @@ var RepoService = class {
           `Repository already initialized with different URL. Current: ${currentUrl}, Requested: ${requestedUrl}. Use force=true to re-initialize (this will delete all worktrees).`
         );
       }
-      log.warn("Force re-init: cleaning worktrees and updating remote in-place");
+      log.warn("Force re-init: clearing contents and cloning fresh");
       await this.cleanAllWorktrees();
-      const cleanUrl = options.repoUrl.replace(/^https:\/\/[^@]+@/, "https://");
-      await gitService.exec(["remote", "set-url", "origin", cleanUrl], repoRoot);
+      const targetBranch = options.branch || env.DEFAULT_BRANCH;
+      try {
+        const items = await readdir(repoRoot);
+        for (const item of items) {
+          const itemPath = `${repoRoot}/${item}`;
+          await rm(itemPath, { recursive: true, force: true });
+        }
+        log.info("Cleared directory contents", { repoRoot, itemsRemoved: items.length });
+      } catch (clearError) {
+        log.error("Failed to clear directory contents", { error: clearError });
+        throw new AppError("Failed to clear directory contents", "GIT_ERROR", clearError);
+      }
+      log.info("Cloning repository fresh", { branch: targetBranch });
+      await gitService.cloneRepo(options.repoUrl, repoRoot, {
+        branch: targetBranch,
+        blobless: true,
+        githubToken: options.githubToken
+      });
       await gitService.exec(["config", "--local", "user.name", "origin-agent[bot]"], repoRoot);
       await gitService.exec([
         "config",
@@ -646,14 +663,9 @@ var RepoService = class {
         "origin-agent[bot]@users.noreply.github.com"
       ], repoRoot);
       await gitService.exec(["config", "--local", "safe.directory", repoRoot], repoRoot);
-      const targetBranch = options.branch || env.DEFAULT_BRANCH;
-      log.info("Fetching from new remote", { branch: targetBranch });
+      const cleanUrl = options.repoUrl.replace(/^https:\/\/[^@]+@/, "https://");
+      await gitService.exec(["remote", "set-url", "origin", cleanUrl], repoRoot);
       await gitService.fetch("origin", repoRoot, auth);
-      try {
-        await gitService.exec(["checkout", "-B", targetBranch, `origin/${targetBranch}`, "--force"], repoRoot);
-      } catch {
-        await gitService.exec(["checkout", "-B", targetBranch, "--force"], repoRoot);
-      }
       await gitService.exec(["branch", `--set-upstream-to=origin/${targetBranch}`, targetBranch], repoRoot).catch(
         () => {
         }
@@ -661,7 +673,7 @@ var RepoService = class {
       const headSha2 = await gitService.getHeadSha(repoRoot);
       const branch2 = await gitService.getCurrentBranch(repoRoot);
       const remote2 = await gitService.getRemoteUrl("origin", repoRoot);
-      log.info("Repository re-initialized in-place", { branch: branch2, headSha: headSha2 });
+      log.info("Repository cloned fresh", { branch: branch2, headSha: headSha2 });
       return { path: repoRoot, branch: branch2, headSha: headSha2, remote: remote2 };
     }
     const parentDir = repoRoot.split("/").slice(0, -1).join("/");
@@ -670,8 +682,23 @@ var RepoService = class {
     const dirExists = await stat2(repoRoot).then(() => true).catch(() => false);
     const branch = options.branch || env.DEFAULT_BRANCH;
     if (dirExists) {
-      log.info("Directory exists, initializing git in-place", { branch });
-      await gitService.exec(["init"], repoRoot);
+      log.info("Directory exists, clearing contents and cloning fresh", { branch });
+      try {
+        const items = await readdir(repoRoot);
+        for (const item of items) {
+          const itemPath = `${repoRoot}/${item}`;
+          await rm(itemPath, { recursive: true, force: true });
+        }
+        log.info("Cleared directory contents", { repoRoot, itemsRemoved: items.length });
+      } catch (clearError) {
+        log.error("Failed to clear directory contents", { error: clearError });
+        throw new AppError("Failed to clear directory contents", "GIT_ERROR", clearError);
+      }
+      await gitService.cloneRepo(options.repoUrl, repoRoot, {
+        branch,
+        blobless: true,
+        githubToken: options.githubToken
+      });
       await gitService.exec(["config", "--local", "user.name", "origin-agent[bot]"], repoRoot);
       await gitService.exec([
         "config",
@@ -681,11 +708,8 @@ var RepoService = class {
       ], repoRoot);
       await gitService.exec(["config", "--local", "safe.directory", repoRoot], repoRoot);
       const cleanUrl = options.repoUrl.replace(/^https:\/\/[^@]+@/, "https://");
-      await gitService.exec(["remote", "add", "origin", cleanUrl], repoRoot).catch(async () => {
-        await gitService.exec(["remote", "set-url", "origin", cleanUrl], repoRoot);
-      });
+      await gitService.exec(["remote", "set-url", "origin", cleanUrl], repoRoot);
       await gitService.fetch("origin", repoRoot, auth);
-      await gitService.exec(["checkout", "-B", branch, `origin/${branch}`, "--force"], repoRoot);
       await gitService.exec(["branch", `--set-upstream-to=origin/${branch}`, branch], repoRoot).catch(
         () => {
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saeed42/worktree-worker",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Git worktree management service for AI agent trials",
   "type": "module",
   "main": "dist/main.js",