Commit b2be7f4e4f0aed3c4b03e3986dd3507c501a4abb | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-02 19:40:55-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-02 20:46:05-08:00
log	b2be7f4e4f0aed3c4b03e3986dd3507c501a4abb
tree	86237676586e04ab6742c9b9da721241fbc41f67
parent	94beb21a4358cda0590c448ba684f663ad476ec1

Address PR feedback on git workflows

Co-authored-by: codex <codex@users.noreply.github.com>

6 files changed, 56 insertions(+), 32 deletions(-)

apps
- server
  - src
    git
    Layers
    GitManager.test.ts
    GitManager.ts
- web
  - src
    components
    GitActionsControl.logic.test.ts
    GitActionsControl.tsx
    lib
    gitReactQuery.ts
packages
- shared
  - src
    git.ts

apps/server/src/git/Layers/GitManager.test.ts+17-1

...	@@ -546,8 +546,23 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -546,8 +546,23 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
546	yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);	546	yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
547	yield* runGit(repoDir, ["push", "-u", "origin", "main"]);	547	yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
548	fs.writeFileSync(path.join(repoDir, "README.md"), "hello\nfeature-branch\n");	548	fs.writeFileSync(path.join(repoDir, "README.md"), "hello\nfeature-branch\n");
		549	let generatedCount = 0;
549		550
550	const { manager } = yield* makeManager();	551	const { manager } = yield* makeManager({
		552	textGeneration: {
		553	generateCommitMessage: (input) =>
		554	Effect.sync(() => {
		555	generatedCount += 1;
		556	return {
		557	subject: "Implement stacked git actions",
		558	body: "",
		559	...(input.includeBranch
		560	? { branch: "feature/implement-stacked-git-actions" }
		561	: {}),
		562	};
		563	}),
		564	},
		565	});
551	const result = yield* runStackedAction(manager, {	566	const result = yield* runStackedAction(manager, {
552	cwd: repoDir,	567	cwd: repoDir,
553	action: "commit_push",	568	action: "commit_push",
...	@@ -571,6 +586,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {	...	@@ -571,6 +586,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
571	Effect.map((r) => r.stdout.trim()),	586	Effect.map((r) => r.stdout.trim()),
572	);	587	);
573	expect(mergeBase).toBe(mainSha);	588	expect(mergeBase).toBe(mainSha);
		589	expect(generatedCount).toBe(1);
574	}),	590	}),
575	);	591	);
576		592

apps/server/src/git/Layers/GitManager.ts+29-7

 @@ -105,6 +105,13 @@ function sanitizeCommitMessage(generated: {
   };
 }
+interface CommitAndBranchSuggestion {
+  subject: string;
+  body: string;
+  branch?: string | undefined;
+  commitMessage: string;
+}
 function formatCommitMessage(subject: string, body: string): string {
   const trimmedBody = body.trim();
   if (trimmedBody.length === 0) {
 @@ -311,13 +318,20 @@ export const makeGitManager = Effect.gen(function* () {
       };
     });
-  const runCommitStep = (cwd: string, branch: string | null, commitMessage?: string) =>
+  const runCommitStep = (
+    cwd: string,
+    branch: string | null,
+    commitMessage?: string,
+    preResolvedSuggestion?: CommitAndBranchSuggestion,
+  ) =>
     Effect.gen(function* () {
-      const suggestion = yield* resolveCommitAndBranchSuggestion({
+      const suggestion =
-        cwd,
+        preResolvedSuggestion ??
-        branch,
+        (yield* resolveCommitAndBranchSuggestion({
-        ...(commitMessage ? { commitMessage } : {}),
+          cwd,
-      });
+          branch,
+          ...(commitMessage ? { commitMessage } : {}),
+        }));
       if (!suggestion) {
         return { status: "skipped_no_changes" as const };
       }
 @@ -456,6 +470,7 @@ export const makeGitManager = Effect.gen(function* () {
       return {
         branchStep: { status: "created" as const, name: resolvedBranch },
         resolvedCommitMessage: suggestion.commitMessage,
+        resolvedCommitSuggestion: suggestion,
       };
     });
 @@ -477,6 +492,7 @@ export const makeGitManager = Effect.gen(function* () {
       let branchStep: { status: "created" | "skipped_not_requested"; name?: string };
       let commitMessageForStep = input.commitMessage;
+      let preResolvedCommitSuggestion: CommitAndBranchSuggestion | undefined = undefined;
       if (input.featureBranch) {
         const result = yield* runFeatureBranchStep(
 @@ -486,13 +502,19 @@ export const makeGitManager = Effect.gen(function* () {
         );
         branchStep = result.branchStep;
         commitMessageForStep = result.resolvedCommitMessage;
+        preResolvedCommitSuggestion = result.resolvedCommitSuggestion;
       } else {
         branchStep = { status: "skipped_not_requested" as const };
       }
       const currentBranch = branchStep.name ?? initialStatus.branch;
-      const commit = yield* runCommitStep(input.cwd, currentBranch, commitMessageForStep);
+      const commit = yield* runCommitStep(
+        input.cwd,
+        currentBranch,
+        commitMessageForStep,
+        preResolvedCommitSuggestion,
+      );
       const push = wantsPush
         ? yield* gitCore.pushCurrentBranch(input.cwd, currentBranch)

apps/web/src/components/GitActionsControl.logic.test.ts+5

 @@ -943,6 +943,11 @@ describe("resolveAutoFeatureBranchName", () => {
     assert.equal(branch, "feature/fix-toast-copy-3");
   });
+  it("treats existing branch names as case-insensitive for collision checks", () => {
+    const branch = resolveAutoFeatureBranchName(["Feature/Ticket-1"], "feature/ticket-1");
+    assert.equal(branch, "feature/ticket-1-2");
+  });
   it("falls back to feature/update when no preferred name is provided", () => {
     const branch = resolveAutoFeatureBranchName(["main"]);
     assert.equal(branch, "feature/update");

apps/web/src/components/GitActionsControl.tsx+4-3

 @@ -254,8 +254,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
         !skipDefaultBranchPrompt &&
         !featureBranch &&
         requiresDefaultBranchConfirmation(action, actionIsDefaultBranch) &&
-        actionBranch &&
+        actionBranch
-        !!actionStatus?.hasWorkingTreeChanges
       ) {
         if (action !== "commit_push" && action !== "commit_push_pr") {
           return;
 @@ -416,6 +415,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
     (actionParams: {
       action: GitStackedAction;
       commitMessage?: string;
+      forcePushOnlyProgress?: boolean;
       onConfirmed?: () => void;
     }) => {
       void runGitActionWithToast({
 @@ -429,11 +429,12 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
   const checkoutFeatureBranchAndContinuePendingAction = useCallback(() => {
     if (!pendingDefaultBranchAction) return;
-    const { action, commitMessage, onConfirmed } = pendingDefaultBranchAction;
+    const { action, commitMessage, forcePushOnlyProgress, onConfirmed } = pendingDefaultBranchAction;
     setPendingDefaultBranchAction(null);
     checkoutNewBranchAndRunAction({
       action,
       ...(commitMessage ? { commitMessage } : {}),
+      forcePushOnlyProgress,
       ...(onConfirmed ? { onConfirmed } : {}),
     });
   }, [pendingDefaultBranchAction, checkoutNewBranchAndRunAction]);

apps/web/src/lib/gitReactQuery.ts-20

...	@@ -16,8 +16,6 @@ export const gitQueryKeys = {	...	@@ -16,8 +16,6 @@ export const gitQueryKeys = {
16	export const gitMutationKeys = {	16	export const gitMutationKeys = {
17	init: (cwd: string \| null) => ["git", "mutation", "init", cwd] as const,	17	init: (cwd: string \| null) => ["git", "mutation", "init", cwd] as const,
18	checkout: (cwd: string \| null) => ["git", "mutation", "checkout", cwd] as const,	18	checkout: (cwd: string \| null) => ["git", "mutation", "checkout", cwd] as const,
19	createBranchAndCheckout: (cwd: string \| null) =>
20	["git", "mutation", "create-branch-and-checkout", cwd] as const,
21	runStackedAction: (cwd: string \| null) => ["git", "mutation", "run-stacked-action", cwd] as const,	19	runStackedAction: (cwd: string \| null) => ["git", "mutation", "run-stacked-action", cwd] as const,
22	pull: (cwd: string \| null) => ["git", "mutation", "pull", cwd] as const,	20	pull: (cwd: string \| null) => ["git", "mutation", "pull", cwd] as const,
23	};	21	};
...	@@ -89,24 +87,6 @@ export function gitCheckoutMutationOptions(input: {	...	@@ -89,24 +87,6 @@ export function gitCheckoutMutationOptions(input: {
89	});	87	});
90	}	88	}
91		89
92	export function gitCreateBranchAndCheckoutMutationOptions(input: {
93	cwd: string \| null;
94	queryClient: QueryClient;
95	}) {
96	return mutationOptions({
97	mutationKey: gitMutationKeys.createBranchAndCheckout(input.cwd),
98	mutationFn: async (branch: string) => {
99	const api = ensureNativeApi();
100	if (!input.cwd) throw new Error("Git branch creation is unavailable.");
101	await api.git.createBranch({ cwd: input.cwd, branch });
102	return api.git.checkout({ cwd: input.cwd, branch });
103	},
104	onSuccess: async () => {
105	await invalidateGitQueries(input.queryClient);
106	},
107	});
108	}
109
110	export function gitRunStackedActionMutationOptions(input: {	90	export function gitRunStackedActionMutationOptions(input: {
111	cwd: string \| null;	91	cwd: string \| null;
112	queryClient: QueryClient;	92	queryClient: QueryClient;

packages/shared/src/git.ts+1-1

...	@@ -46,7 +46,7 @@ export function resolveAutoFeatureBranchName(	...	@@ -46,7 +46,7 @@ export function resolveAutoFeatureBranchName(
46	const resolvedBase = sanitizeFeatureBranchName(	46	const resolvedBase = sanitizeFeatureBranchName(
47	preferred && preferred.length > 0 ? preferred : AUTO_FEATURE_BRANCH_FALLBACK,	47	preferred && preferred.length > 0 ? preferred : AUTO_FEATURE_BRANCH_FALLBACK,
48	);	48	);
49	const existingNames = new Set(existingBranchNames);	49	const existingNames = new Set(existingBranchNames.map((branch) => branch.toLowerCase()));
50		50
51	if (!existingNames.has(resolvedBase)) {	51	if (!existingNames.has(resolvedBase)) {
52	return resolvedBase;	52	return resolvedBase;