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.
Show push target in Git action progress stages
Julius Marmingecc37865c2def
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.tsindex 25ad553d1..85e020178 100644--- a/apps/web/src/components/GitActionsControl.logic.test.ts+++ b/apps/web/src/components/GitActionsControl.logic.test.ts@@ -604,8 +604,9 @@ describe("buildGitActionProgressStages", () => {hasCustomCommitMessage: false,hasWorkingTreeChanges: true,forcePushOnly: true,+ pushTarget: "origin/feature/test",});- assert.deepEqual(stages, ["Pushing..."]);+ assert.deepEqual(stages, ["Pushing to origin/feature/test..."]);});it("includes commit stages for commit+push when working tree is dirty", () => {@@ -613,8 +614,13 @@ describe("buildGitActionProgressStages", () => {action: "commit_push",hasCustomCommitMessage: false,hasWorkingTreeChanges: true,+ pushTarget: "origin/feature/test",});- assert.deepEqual(stages, ["Generating commit message...", "Committing...", "Pushing..."]);+ assert.deepEqual(stages, [+ "Generating commit message...",+ "Committing...",+ "Pushing to origin/feature/test...",+ ]);});});diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.tsindex ebab3cbf5..f05db2462 100644--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -48,6 +48,7 @@ export function buildGitActionProgressStages(input: {hasCustomCommitMessage: boolean;hasWorkingTreeChanges: boolean;forcePushOnly?: boolean;+ pushTarget?: string;}): string[] {const shouldIncludeCommitStages =!input.forcePushOnly && (input.action === "commit" || input.hasWorkingTreeChanges);@@ -56,13 +57,14 @@ export function buildGitActionProgressStages(input: {: input.hasCustomCommitMessage? ["Committing..."]: ["Generating commit message...", "Committing..."];+ const pushStage = input.pushTarget ? `Pushing to ${input.pushTarget}...` : "Pushing...";if (input.action === "commit") {return commitStages;}if (input.action === "commit_push") {- return [...commitStages, "Pushing..."];+ return [...commitStages, pushStage];}- return [...commitStages, "Pushing...", "Creating PR..."];+ return [...commitStages, pushStage, "Creating PR..."];}export function summarizeGitResult(result: GitRunStackedActionResult): {diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsxindex 8c6b01034..001559c7c 100644--- a/apps/web/src/components/GitActionsControl.tsx+++ b/apps/web/src/components/GitActionsControl.tsx@@ -226,11 +226,13 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlPropif (!confirmed) return;onConfirmed?.();+ const pushTarget = gitStatus?.branch ? `origin/${gitStatus.branch}` : undefined;const progressStages = buildGitActionProgressStages({action,hasCustomCommitMessage: !!commitMessage?.trim(),hasWorkingTreeChanges: !!gitStatus?.hasWorkingTreeChanges,forcePushOnly: forcePushOnlyProgress,+ pushTarget,});const progressToastId = toastManager.add({type: "loading",