spec-cat 0.1.43 → 0.1.45

package/.output/public/_nuxt/builds/latest.json

@@ -1 +1 @@
-{"id":"5201faab-9d06-4dd5-8459-59d164fdf02d","timestamp":1776856069807}
+{"id":"5567f874-e186-4cd9-ae4c-1a9a207c8045","timestamp":1776863107988}

package/.output/public/_nuxt/builds/meta/5567f874-e186-4cd9-ae4c-1a9a207c8045.json

@@ -0,0 +1 @@
+{"id":"5567f874-e186-4cd9-ae4c-1a9a207c8045","timestamp":1776863107988,"prerendered":[]}

package/.output/server/chunks/_/baseBranch.mjs

@@ -91,13 +91,14 @@ async function resolveConversationBaseBranch(options) {
   if (isUsableBaseBranchName(branch) && await branchExists(cwd, branch)) {
     return branch;
   }
-  if (isCommitHashLike(branch) && isUsableBaseBranchName(worktreeBranch) && await branchExists(cwd, worktreeBranch)) {
+  const normalizedWorktreeBranch = (worktreeBranch == null ? void 0 : worktreeBranch.trim()) || "";
+  if (isCommitHashLike(branch) && normalizedWorktreeBranch && await branchExists(cwd, normalizedWorktreeBranch)) {
     const defaultBranch = await detectDefaultBranch(cwd);
-    const candidates = (await listLocalBranches(cwd)).filter((candidate) => isUsableBaseBranchName(candidate) && candidate !== worktreeBranch);
+    const candidates = (await listLocalBranches(cwd)).filter((candidate) => isUsableBaseBranchName(candidate) && candidate !== normalizedWorktreeBranch);
     const matches = [];
     for (const candidate of candidates) {
       try {
-        const mergeBase = await execGitCommand(["merge-base", candidate, worktreeBranch], cwd);
+        const mergeBase = await execGitCommand(["merge-base", candidate, normalizedWorktreeBranch], cwd);
         if (mergeBase === branch) {
           matches.push(candidate);
         }
@@ -113,6 +114,24 @@ async function resolveConversationBaseBranch(options) {
   }
   return resolvePreferredBaseBranch(cwd);
 }
+async function resolveExistingBaseBranch(options) {
+  const { cwd, requestedBaseBranch, worktreeBranch } = options;
+  const branch = (requestedBaseBranch == null ? void 0 : requestedBaseBranch.trim()) || "";
+  if (isUsableBaseBranchName(branch) && await branchExists(cwd, branch)) {
+    return branch;
+  }
+  if (branch) {
+    const normalized = await resolveConversationBaseBranch({
+      cwd,
+      storedBaseBranch: branch,
+      worktreeBranch
+    });
+    if (normalized && await branchExists(cwd, normalized)) {
+      return normalized;
+    }
+  }
+  return resolvePreferredBaseBranch(cwd);
+}
 
-export { resolveConversationBaseBranch as a, isUsableBaseBranchName as i, resolvePreferredBaseBranch as r };
+export { resolvePreferredBaseBranch as a, resolveConversationBaseBranch as b, isUsableBaseBranchName as i, resolveExistingBaseBranch as r };
 //# sourceMappingURL=baseBranch.mjs.map

package/.output/server/chunks/_/baseBranch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"baseBranch.mjs","sources":["../../../../server/utils/baseBranch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseBranch.mjs","sources":["../../../../server/utils/baseBranch.ts"],"names":[],"mappings":"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"}

package/.output/server/chunks/_/codexProvider.mjs

@@ -797,7 +797,7 @@ const metadata = {
     permissions: isCodexAvailable(),
     resume: isCodexAvailable(),
     autoCommit: true,
-    conflictResolution: false
+    conflictResolution: true
   }
 };
 function buildCodexExecArgs(opts) {

package/.output/server/chunks/_/conversationStore.mjs

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import { writeFile, readdir, rm, readFile, mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { h as readSpecCatStore, j as getSpecCatDataDir, e as getProjectDir } from '../nitro/nitro.mjs';
-import { i as isUsableBaseBranchName, a as resolveConversationBaseBranch } from './baseBranch.mjs';
+import { i as isUsableBaseBranchName, b as resolveConversationBaseBranch } from './baseBranch.mjs';
 
 function generateBlockId() {
   return `blk-${Date.now()}-${Math.random().toString(36).substring(2, 6)}`;