Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Keep non-default quick action on full PR flow

Julius Marmingedcd2d5076836
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.ts
index 720f32af6..8bf548515 100644
--- a/apps/web/src/components/GitActionsControl.logic.test.ts
+++ b/apps/web/src/components/GitActionsControl.logic.test.ts
@@ -365,7 +365,7 @@ describe("when: working tree has local changes", () => {
});
});
- it("resolveQuickAction returns commit and push when open PR exists", () => {
+ it("resolveQuickAction keeps full commit/push/pr flow on non-default branches even when PR exists", () => {
const quick = resolveQuickAction(
status({
hasWorkingTreeChanges: true,
@@ -382,8 +382,8 @@ describe("when: working tree has local changes", () => {
);
assert.deepInclude(quick, {
kind: "run_action",
- action: "commit_push",
- label: "Commit & push",
+ action: "commit_push_pr",
+ label: "Commit, push & create PR",
});
});
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts
index ccb78be31..59cb8b9d7 100644
--- a/apps/web/src/components/GitActionsControl.logic.ts
+++ b/apps/web/src/components/GitActionsControl.logic.ts
@@ -204,7 +204,7 @@ export function resolveQuickAction(
}
if (hasChanges) {
- if (hasOpenPr || isDefaultBranch) {
+ if (isDefaultBranch) {
return { label: "Commit & push", disabled: false, kind: "run_action", action: "commit_push" };
}
return {