@saeed42/worktree-worker 1.1.0 → 1.3.0

package/dist/main.js

@@ -314,9 +314,14 @@ var GitService = class {
     return result.stdout.trim();
   }
   /**
-   * Check if branch exists
+   * Check if branch exists (local or remote)
+   * For remote branches, pass "origin/branch-name"
    */
   async branchExists(branch, cwd) {
+    if (branch.includes("/")) {
+      const result2 = await this.exec(["show-ref", "--verify", "--quiet", `refs/remotes/${branch}`], cwd);
+      return result2.code === 0;
+    }
     const result = await this.exec(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], cwd);
     return result.code === 0;
   }
@@ -566,6 +571,10 @@ var RepoService = class {
     await gitService.exec(["config", "--local", "safe.directory", repoRoot], repoRoot);
     const cleanUrl = options.repoUrl.replace(/^https:\/\/[^@]+@/, "https://");
     await gitService.exec(["remote", "set-url", "origin", cleanUrl], repoRoot);
+    log.info("Fetching all remote refs");
+    await gitService.fetch("origin", repoRoot, auth);
+    await gitService.exec(["branch", `--set-upstream-to=origin/${branch}`, branch], repoRoot).catch(() => {
+    });
     const headSha = await gitService.getHeadSha(repoRoot);
     const remote = await gitService.getRemoteUrl("origin", repoRoot);
     log.info("Repository initialized", { branch, headSha });
@@ -750,9 +759,24 @@ var WorktreeService = class {
       branchName,
       baseBranch,
       baseRepoDir,
-      hasToken: !!options.githubToken
+      hasToken: !!options.githubToken,
+      hasRepoUrl: !!options.repoUrl
     });
     await mkdir3(env.TRIALS_WORKSPACE_DIR, { recursive: true });
+    const repoStatus = await repoService.getStatus();
+    if (!repoStatus.initialized) {
+      if (!options.repoUrl) {
+        throw new Error(
+          "Main repository not initialized. Provide repoUrl to auto-initialize, or call /v1/repo/init first."
+        );
+      }
+      log.info("Main repo not initialized, auto-initializing", { repoUrl: options.repoUrl.replace(/ghp_[a-zA-Z0-9]+/, "ghp_***") });
+      await repoService.initRepo({
+        repoUrl: options.repoUrl,
+        branch: baseBranch,
+        githubToken: options.githubToken
+      });
+    }
     try {
       const stats = await stat3(worktreePath);
       if (stats.isDirectory()) {
@@ -792,7 +816,33 @@ var WorktreeService = class {
       await gitService.exec(["fetch", "origin", `${branchName}:${branchName}`], baseRepoDir);
       await gitService.execOrThrow(["worktree", "add", worktreePath, branchName], baseRepoDir);
     } else {
-      const baseRef = `origin/${baseBranch}`;
+      let baseRef = `origin/${baseBranch}`;
+      const baseBranchExistsOnRemote = await gitService.branchExists(baseRef, baseRepoDir);
+      if (!baseBranchExistsOnRemote) {
+        log.warn("Base branch not found, detecting default branch", { tried: baseRef });
+        const fallbackBranches = ["origin/main", "origin/master", "origin/dev", "origin/develop"];
+        let found = false;
+        for (const fallback of fallbackBranches) {
+          const exists = await gitService.branchExists(fallback, baseRepoDir);
+          if (exists) {
+            baseRef = fallback;
+            found = true;
+            log.info("Found fallback base branch", { baseRef });
+            break;
+          }
+        }
+        if (!found) {
+          const currentBranch = await gitService.getCurrentBranch(baseRepoDir);
+          if (currentBranch && currentBranch !== "HEAD") {
+            baseRef = currentBranch;
+            log.info("Using current branch as base", { baseRef });
+          } else {
+            throw new Error(
+              `Cannot find base branch. Tried: origin/${baseBranch}, ${fallbackBranches.join(", ")}. Ensure the repository has been fetched properly.`
+            );
+          }
+        }
+      }
       log.info("Creating worktree with new branch from base", { baseRef, branchName });
       await gitService.addWorktreeWithNewBranch(worktreePath, branchName, baseRef, baseRepoDir);
     }
@@ -965,8 +1015,10 @@ var resetWorktreeSchema = z2.object({
   baseBranch: z2.string().default("main"),
   trialBranch: z2.string().optional(),
   force: z2.boolean().default(false),
-  githubToken: z2.string().optional()
+  githubToken: z2.string().optional(),
   // Required for private repos
+  repoUrl: z2.string().url().optional()
+  // Required if repo not yet initialized
 });
 var commitSchema = z2.object({
   message: z2.string().min(1),
@@ -1005,7 +1057,8 @@ worktree.post("/trials/:trialId/worktree/reset", async (c) => {
       baseBranch: input.baseBranch,
       trialBranch: input.trialBranch,
       force: input.force,
-      githubToken: input.githubToken
+      githubToken: input.githubToken,
+      repoUrl: input.repoUrl
     });
     return c.json({ success: true, data: result });
   } catch (err) {

package/package.json

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