spec-cat 0.1.62 → 0.1.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.output/nitro.json +1 -1
- package/.output/public/_nuxt/builds/latest.json +1 -1
- package/.output/public/_nuxt/builds/meta/74089fa1-2fbb-4792-94aa-7535d2aec557.json +1 -0
- package/.output/server/chunks/_/chatGit.mjs +4 -1
- package/.output/server/chunks/_/chatGit.mjs.map +1 -1
- package/.output/server/chunks/nitro/nitro.mjs +505 -505
- package/.output/server/chunks/routes/api/chat/finalize.post.mjs +6 -6
- package/.output/server/chunks/routes/api/chat/finalize.post.mjs.map +1 -1
- package/.output/server/package.json +1 -1
- package/package.json +1 -1
- package/.output/public/_nuxt/builds/meta/df07a2f8-c6d6-420d-a863-ac6e0e7673e0.json +0 -1
|
@@ -6,7 +6,7 @@ import { r as resolveExistingBaseBranch } from '../../../_/baseBranch.mjs';
|
|
|
6
6
|
import { b as guardServerProviderCapability } from '../../../_/aiProviderSelection.mjs';
|
|
7
7
|
import { g as getChatWorktreePath } from '../../../_/worktreePaths.mjs';
|
|
8
8
|
import { v as validateWorktreePath } from '../../../_/validateWorktree.mjs';
|
|
9
|
-
import { a as assertSafeBranchName, g as git } from '../../../_/chatGit.mjs';
|
|
9
|
+
import { a as assertSafeBranchName, l as localBranchRef, g as git } from '../../../_/chatGit.mjs';
|
|
10
10
|
import { a as autoCommitChanges } from '../../../_/claudeService.mjs';
|
|
11
11
|
import { w as withLock } from '../../../_/asyncLock.mjs';
|
|
12
12
|
import 'node:http';
|
|
@@ -80,7 +80,7 @@ const finalize_post = defineEventHandler(async (event) => {
|
|
|
80
80
|
if (!baseBranch) {
|
|
81
81
|
return { success: false, error: "Unable to resolve a valid base branch for this worktree." };
|
|
82
82
|
}
|
|
83
|
-
|
|
83
|
+
const baseBranchRef = localBranchRef(baseBranch, "base branch");
|
|
84
84
|
return withLock(projectDir, async () => {
|
|
85
85
|
try {
|
|
86
86
|
if (!existsSync(worktreePath)) {
|
|
@@ -89,7 +89,7 @@ const finalize_post = defineEventHandler(async (event) => {
|
|
|
89
89
|
await autoCommitChanges(worktreePath);
|
|
90
90
|
let commitCount;
|
|
91
91
|
try {
|
|
92
|
-
const countStr = await git(worktreePath, ["rev-list", "--count", `${
|
|
92
|
+
const countStr = await git(worktreePath, ["rev-list", "--count", `${baseBranchRef}..HEAD`]);
|
|
93
93
|
commitCount = parseInt(countStr, 10);
|
|
94
94
|
} catch {
|
|
95
95
|
return { success: false, error: `Cannot compare with base branch "${baseBranch}". It may not exist.` };
|
|
@@ -98,7 +98,7 @@ const finalize_post = defineEventHandler(async (event) => {
|
|
|
98
98
|
return { success: false, error: "No commits to finalize." };
|
|
99
99
|
}
|
|
100
100
|
try {
|
|
101
|
-
await git(worktreePath, ["rebase",
|
|
101
|
+
await git(worktreePath, ["rebase", baseBranchRef]);
|
|
102
102
|
} catch {
|
|
103
103
|
logger.chat.warn("Rebase conflict during finalize", { conversationId });
|
|
104
104
|
const conflictFiles = await collectConflictFiles(worktreePath);
|
|
@@ -109,12 +109,12 @@ const finalize_post = defineEventHandler(async (event) => {
|
|
|
109
109
|
rebaseInProgress: true
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
-
await git(worktreePath, ["reset", "--soft",
|
|
112
|
+
await git(worktreePath, ["reset", "--soft", baseBranchRef]);
|
|
113
113
|
execSync("git commit -F -", { cwd: worktreePath, input: commitMessage, encoding: "utf-8" });
|
|
114
114
|
try {
|
|
115
115
|
const currentBranch = await git(projectDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
|
|
116
116
|
if (currentBranch !== baseBranch) {
|
|
117
|
-
await git(projectDir, ["
|
|
117
|
+
await git(projectDir, ["switch", baseBranch]);
|
|
118
118
|
}
|
|
119
119
|
} catch {
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finalize.post.mjs","sources":["../../../../../../server/api/chat/finalize.post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0BA,eAAA,qBAAA,YAAA,EAAA;AACA,EAAA,IAAA;AACA,IAAA,MAAA,UAAA,GAAA,MAAA,GAAA,CAAA,YAAA,EAAA,CAAA,MAAA,EAAA,aAAA,EAAA,iBAAA,CAAA,CAAA;AACA,IAAA,MAAA,QAAA,UAAA,CAAA,KAAA,CAAA,IAAA,CAAA,CAAA,OAAA,OAAA,CAAA;AACA,IAAA,IAAA,KAAA,CAAA,MAAA,GAAA,CAAA,EAAA,OAAA,KAAA;AAAA,EACA,CAAA,CAAA,MAAA;AAAA,EAAA;AACA,EAAA,IAAA;AACA,IAAA,MAAA,eAAA,MAAA,GAAA,CAAA,cAAA,CAAA,QAAA,EAAA,aAAA,CAAA,CAAA;AACA,IAAA,OAAA,aACA,KAAA,CAAA,IAAA,EACA,MAAA,CAAA,CAAA,IAAA,KAAA,4BAAA,IAAA,CAAA,IAAA,CAAA,CAAA,CACA,IAAA,CAAA,IAAA,KAAA,IAAA,CAAA,UAAA,CAAA,CAAA,CAAA,MAAA,CAAA;AAAA,EACA,CAAA,CAAA,MAAA;AACA,IAAA,OAAA,EAAA;AAAA,EACA;AACA;AAEA,sBAAA,kBAAA,CAAA,OAAA,KAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,QAAA,CAAA,KAAA,CAAA;AAEA,EAAA,IAAA,EAAA,IAAA,IAAA,IAAA,GAAA,MAAA,GAAA,IAAA,CAAA,cAAA,CAAA,IAAA,EAAA,6BAAA,aAAA,CAAA,EAAA;AACA,IAAA,MAAA,WAAA,CAAA;AAAA,MACA,UAAA,EAAA,GAAA;AAAA,MACA,OAAA,EAAA;AAAA,KACA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,EAAA,cAAA,EAAA,aAAA,EAAA,GAAA,IAAA;AACA,EAAA,MAAA,gBAAA,MAAA,6BAAA;AAAA,IACA,YAAA;AAAA,IACA;AAAA,GACA;AACA,EAAA,IAAA,aAAA,aAAA,EAAA;AACA,IAAA,OAAA,aAAA,CAAA,OAAA;AAAA,EACA;AAEA,EAAA,MAAA,aAAA,aAAA,EAAA;AACA,EAAA,MAAA,aAAA,oBAAA,CAAA,IAAA,CAAA,kBAAA,CAAA,GAAA,EAAA,cAAA,IAAA,QAAA,CAAA;AACA,EAAA,MAAA,YAAA,GAAA,IAAA,CAAA,YAAA,IAAA,mBAAA,CAAA,cAAA,CAAA;AACA,EAAA,MAAA,gBAAA,IAAA,CAAA,aAAA,GAAA,qBAAA,IAAA,CAAA,aAAA,EAAA,gBAAA,CAAA,GAAA,MAAA;AAEA,EAAA,IAAA,UAAA,CAAA,YAAA,CAAA,EAAA;AACA,IAAA,oBAAA,CAAA,YAAA,CAAA;AAAA,EACA;AAEA,EAAA,MAAA,CAAA,KAAA,IAAA,CAAA,yBAAA,EAAA,EAAA,cAAA,EAAA,YAAA,CAAA;AAEA,EAAA,MAAA,UAAA,GAAA,MAAA,yBAAA,CAAA;AAAA,IACA,GAAA,EAAA,UAAA;AAAA,IACA,qBAAA,IAAA,CAAA,UAAA;AAAA,IACA,cAAA,EAAA;AAAA,GACA,CAAA;AACA,EAAA,IAAA,CAAA,UAAA,EAAA;AACA,IAAA,OAAA,EAAA,OAAA,EAAA,KAAA,EAAA,KAAA,EAAA,0DAAA,EAAA;AAAA,EACA;AACA,EAAA,
|
|
1
|
+
{"version":3,"file":"finalize.post.mjs","sources":["../../../../../../server/api/chat/finalize.post.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"id":"df07a2f8-c6d6-420d-a863-ac6e0e7673e0","timestamp":1781167962564,"prerendered":[]}
|