Skip to content

Move git action progress to toast and stop auto-opening PR pages #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 2 commits into from
Feb 13, 2026
Merged

Move git action progress to toast and stop auto-opening PR pages #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4b1f43
Move git action progress to toast and stop auto-opening PRs
juliusmarminge Feb 13, 2026
cfa9fa5
Fix Electron dev env and streamline Git action toast
juliusmarminge Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/desktop/scripts/dev-electron.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ await waitOn({
});

const command = process.platform === "win32" ? "electronmon.cmd" : "electronmon";
const childEnv = { ...process.env };
delete childEnv.ELECTRON_RUN_AS_NODE;

const child = spawn(command, ["dist-electron/main.js"], {
stdio: "inherit",
env: {
...process.env,
...childEnv,
VITE_DEV_SERVER_URL: devServerUrl,
},
});
Expand Down
7 changes: 3 additions & 4 deletions apps/server/src/gitManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ describe("GitManager", () => {
expect(result.push.status).toBe("skipped_up_to_date");
});

it("opens existing PR for commit/push/pr action", async () => {
it("returns existing PR metadata for commit/push/pr action", async () => {
const repoDir = makeTempDir("t3code-git-manager-");
await initRepo(repoDir);
await runGit(repoDir, ["checkout", "-b", "feature/existing-pr"]);
Expand Down Expand Up @@ -376,9 +376,7 @@ describe("GitManager", () => {

expect(result.pr.status).toBe("opened_existing");
expect(result.pr.number).toBe(42);
expect(
ghCalls.some((call) => call.startsWith("pr view feature/existing-pr --web")),
).toBe(true);
expect(ghCalls.some((call) => call.startsWith("pr view "))).toBe(false);
});

it("creates PR when one does not already exist", async () => {
Expand Down Expand Up @@ -422,6 +420,7 @@ describe("GitManager", () => {
expect(
ghCalls.some((call) => call.includes("pr create --base main --head feature-create-pr")),
).toBe(true);
expect(ghCalls.some((call) => call.startsWith("pr view "))).toBe(false);
});

it("rejects push/pr actions from detached HEAD", async () => {
Expand Down
10 changes: 0 additions & 10 deletions apps/server/src/gitManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ export class GitManager {

const existing = await this.findOpenPr(cwd, branch);
if (existing) {
await this.openPrInBrowser(cwd, branch);
return {
status: "opened_existing",
url: existing.url,
Expand Down Expand Up @@ -381,7 +380,6 @@ export class GitManager {
}

const created = await this.findOpenPr(cwd, branch);
await this.openPrInBrowser(cwd, branch);

if (!created) {
return {
Expand All @@ -402,14 +400,6 @@ export class GitManager {
};
}

private async openPrInBrowser(cwd: string, branch: string): Promise<void> {
try {
await this.runGh(cwd, ["pr", "view", branch, "--web"]);
} catch {
// Opening the browser is best-effort.
}
}

private async findOpenPr(
cwd: string,
branch: string,
Expand Down
Loading