replicas-engine 0.1.276 → 0.1.277

package/dist/src/index.js

@@ -286,7 +286,7 @@ var WORKSPACE_SIZES = ["small", "large"];
 var INVALID_WORKSPACE_SIZE_ERROR = `Invalid size: must be one of ${WORKSPACE_SIZES.join(", ")}`;
 
 // ../shared/src/e2b.ts
-var E2B_TEMPLATE_NAME = "replicas-sandbox-2026-06-07-v1";
+var E2B_TEMPLATE_NAME = "replicas-sandbox-2026-06-07-v2";
 
 // ../shared/src/runtime-env.ts
 function parsePosixEnvFile(content) {
@@ -3236,6 +3236,14 @@ async function getCurrentBranch(cwd) {
     return null;
   }
 }
+async function resolveDiffBase(repoPath, defaultBranch) {
+  const baseBranch = `origin/${defaultBranch}`;
+  try {
+    return await runGitCommand(["merge-base", baseBranch, "HEAD"], repoPath);
+  } catch {
+  }
+  return await branchExists(baseBranch, repoPath) ? baseBranch : "HEAD";
+}
 
 // src/git/service.ts
 var FULL_DIFF_MAX_BUFFER = 50 * 1024 * 1024;
@@ -3450,7 +3458,7 @@ var GitService = class {
   getGitDiffStats(repoPath, defaultBranch) {
     return this.diffStatsInFlight.run(repoPath, async () => {
       try {
-        const diffBase = await this.getDiffBase(repoPath, defaultBranch);
+        const diffBase = await resolveDiffBase(repoPath, defaultBranch);
         const shortstat = await runGitCommand(["diff", diffBase, "--shortstat", "-M"], repoPath);
         let added = 0;
         let removed = 0;
@@ -3468,7 +3476,7 @@ var GitService = class {
           removed
         };
       } catch (error) {
-        console.error("Error getting git diff:", error);
+        console.warn(`[GitService] getGitDiffStats failed for ${repoPath} (defaultBranch=${defaultBranch}):`, error instanceof Error ? error.message : error);
         return null;
       }
     });
@@ -3559,7 +3567,7 @@ var GitService = class {
   getFullGitDiff(repoPath, defaultBranch) {
     return this.fullDiffInFlight.run(repoPath, async () => {
       try {
-        const diffBase = await this.getDiffBase(repoPath, defaultBranch);
+        const diffBase = await resolveDiffBase(repoPath, defaultBranch);
         const { stdout: trackedDiff } = await execFileAsync("git", ["diff", diffBase, "-M", "-C"], {
           cwd: repoPath,
           encoding: "utf-8",
@@ -3580,14 +3588,6 @@ var GitService = class {
       return "";
     }
   }
-  async getDiffBase(repoPath, defaultBranch) {
-    const baseBranch = `origin/${defaultBranch}`;
-    try {
-      return await runGitCommand(["merge-base", baseBranch, "HEAD"], repoPath);
-    } catch {
-      return baseBranch;
-    }
-  }
   async getPullRequestUrl(repoName, repoPath, currentBranchArg, persistedRepoStateArg) {
     try {
       const currentBranch = currentBranchArg ?? await getCurrentBranch(repoPath);
@@ -3676,9 +3676,7 @@ var GitService = class {
       this.defaultBranchCache.set(repoPath, fromSymbolicRef);
       return fromSymbolicRef;
     }
-    const fallback = "main";
-    this.defaultBranchCache.set(repoPath, fallback);
-    return fallback;
+    return "main";
   }
   async resolveDefaultBranchFromSymbolicRef(repoPath) {
     try {
@@ -6746,7 +6744,7 @@ var AspClient = class {
 // src/managers/codex-asp/app-server-process.ts
 var DEFAULT_CODEX_BINARY = "codex";
 var DEFAULT_CODEX_ARGS = ["app-server", "--listen", "stdio://"];
-var ENGINE_PACKAGE_VERSION = "0.1.276";
+var ENGINE_PACKAGE_VERSION = "0.1.277";
 var INITIALIZE_METHOD = "initialize";
 var INITIALIZED_NOTIFICATION = "initialized";
 var ACCOUNT_LOGIN_START_METHOD = "account/login/start";
@@ -10346,13 +10344,9 @@ var RepoFileService = class {
   async listChangedFiles(repoPath, defaultBranch) {
     const changedFiles = /* @__PURE__ */ new Set();
     try {
-      const mergeBase = await execGitAsync(
-        ["merge-base", `origin/${defaultBranch}`, "HEAD"],
-        repoPath,
-        SEARCH_TIMEOUT_MS
-      );
+      const diffBase = await resolveDiffBase(repoPath, defaultBranch);
       const diffOutput = await execGitAsync(
-        ["diff", "--name-only", "-M", mergeBase.trim()],
+        ["diff", "--name-only", "-M", diffBase],
         repoPath,
         SEARCH_TIMEOUT_MS
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-engine",
-  "version": "0.1.276",
+  "version": "0.1.277",
   "description": "Lightweight API server for Replicas workspaces",
   "type": "module",
   "main": "dist/src/index.js",