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.

Remove git.renameBranch RPC and harden branch rename args

Julius Marminge82681606d0a4
diff --git a/apps/server/src/git/Layers/GitCore.test.ts b/apps/server/src/git/Layers/GitCore.test.ts
index 19bd998a3..8e12cd0f1 100644
--- a/apps/server/src/git/Layers/GitCore.test.ts
+++ b/apps/server/src/git/Layers/GitCore.test.ts
@@ -913,6 +913,41 @@ it.layer(TestLayer)("git integration", (it) => {
expect(renamed.branch).toBe("t3code/feat/session-2");
}),
);
+
+ it.effect("uses '--' separator for branch rename arguments", () =>
+ Effect.gen(function* () {
+ const tmp = yield* makeTmpDir();
+ yield* initRepoWithCommit(tmp);
+ yield* createGitBranch({ cwd: tmp, branch: "feature/old-name" });
+ yield* checkoutGitBranch({ cwd: tmp, branch: "feature/old-name" });
+
+ const realGitService = yield* GitService;
+ let renameArgs: ReadonlyArray<string> | null = null;
+ const core = yield* makeIsolatedGitCore({
+ execute: (input) => {
+ if (input.args[0] === "branch" && input.args[1] === "-m") {
+ renameArgs = [...input.args];
+ }
+ return realGitService.execute(input);
+ },
+ });
+
+ const renamed = yield* core.renameBranch({
+ cwd: tmp,
+ oldBranch: "feature/old-name",
+ newBranch: "feature/new-name",
+ });
+
+ expect(renamed.branch).toBe("feature/new-name");
+ expect(renameArgs).toEqual([
+ "branch",
+ "-m",
+ "--",
+ "feature/old-name",
+ "feature/new-name",
+ ]);
+ }),
+ );
});
// ── createGitWorktree + removeGitWorktree ──
diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
index 06bb75afa..25848ad5f 100644
--- a/apps/server/src/git/Layers/GitCore.ts
+++ b/apps/server/src/git/Layers/GitCore.ts
@@ -282,7 +282,7 @@ const makeGitCore = Effect.gen(function* () {
return yield* createGitCommandError(
"GitCore.renameBranch",
cwd,
- ["branch", "-m", desiredBranch],
+ ["branch", "-m", "--", desiredBranch],
`Could not find an available branch name for '${desiredBranch}'.`,
);
});
@@ -1075,7 +1075,7 @@ const makeGitCore = Effect.gen(function* () {
yield* executeGit(
"GitCore.renameBranch",
input.cwd,
- ["branch", "-m", input.oldBranch, targetBranch],
+ ["branch", "-m", "--", input.oldBranch, targetBranch],
{
timeoutMs: 10_000,
fallbackErrorMessage: "git branch rename failed",
diff --git a/apps/server/src/git/Services/GitCore.ts b/apps/server/src/git/Services/GitCore.ts
index 0c5d54007..bc913d44c 100644
--- a/apps/server/src/git/Services/GitCore.ts
+++ b/apps/server/src/git/Services/GitCore.ts
@@ -17,8 +17,6 @@ import type {
GitListBranchesInput,
GitListBranchesResult,
GitPullResult,
- GitRenameBranchInput,
- GitRenameBranchResult,
GitRemoveWorktreeInput,
GitStatusInput,
GitStatusResult,
@@ -48,6 +46,16 @@ export interface GitRangeContext {
diffPatch: string;
}
+export interface GitRenameBranchInput {
+ cwd: string;
+ oldBranch: string;
+ newBranch: string;
+}
+
+export interface GitRenameBranchResult {
+ branch: string;
+}
+
/**
* GitCoreShape - Service API for low-level Git repository interactions.
*/
diff --git a/apps/server/src/wsServer.test.ts b/apps/server/src/wsServer.test.ts
index bed3d5b90..3f18e8929 100644
--- a/apps/server/src/wsServer.test.ts
+++ b/apps/server/src/wsServer.test.ts
@@ -371,7 +371,7 @@ describe("WebSocket Server", () => {
gitManager?: GitManagerShape;
gitCore?: Pick<
GitCoreShape,
- "listBranches" | "initRepo" | "pullCurrentBranch" | "renameBranch"
+ "listBranches" | "initRepo" | "pullCurrentBranch"
>;
terminalManager?: TerminalManagerShape;
} = {},
@@ -1471,7 +1471,6 @@ describe("WebSocket Server", () => {
}),
);
const initRepo = vi.fn(() => Effect.void);
- const renameBranch = vi.fn(() => Effect.succeed({ branch: "t3code/new-name" }));
const pullCurrentBranch = vi.fn(() =>
Effect.fail(
new GitCommandError({
@@ -1488,7 +1487,6 @@ describe("WebSocket Server", () => {
gitCore: {
listBranches,
initRepo,
- renameBranch,
pullCurrentBranch,
},
});
@@ -1513,18 +1511,6 @@ describe("WebSocket Server", () => {
expect(pullResponse.error?.message).toContain("No upstream configured");
expect(pullCurrentBranch).toHaveBeenCalledWith("/repo/path");
- const renameResponse = await sendRequest(ws, WS_METHODS.gitRenameBranch, {
- cwd: "/repo/path",
- oldBranch: "t3code/tmp-456",
- newBranch: "t3code/new-name",
- });
- expect(renameResponse.error).toBeUndefined();
- expect(renameResponse.result).toEqual({ branch: "t3code/new-name" });
- expect(renameBranch).toHaveBeenCalledWith({
- cwd: "/repo/path",
- oldBranch: "t3code/tmp-456",
- newBranch: "t3code/new-name",
- });
});
it("supports git.status over websocket", async () => {
diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.ts
index c0fa1e19d..5f4fb9d61 100644
--- a/apps/server/src/wsServer.ts
+++ b/apps/server/src/wsServer.ts
@@ -572,11 +572,6 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
return yield* git.createWorktree(body);
}
- case WS_METHODS.gitRenameBranch: {
- const body = stripRequestTag(request.body);
- return yield* git.renameBranch(body);
- }
-
case WS_METHODS.gitRemoveWorktree: {
const body = stripRequestTag(request.body);
return yield* git.removeWorktree(body);
diff --git a/apps/web/src/wsNativeApi.ts b/apps/web/src/wsNativeApi.ts
index a967ff6b8..f7ac04a9b 100644
--- a/apps/web/src/wsNativeApi.ts
+++ b/apps/web/src/wsNativeApi.ts
@@ -164,7 +164,6 @@ export function createWsNativeApi(): NativeApi {
runStackedAction: (input) => transport.request(WS_METHODS.gitRunStackedAction, input),
listBranches: (input) => transport.request(WS_METHODS.gitListBranches, input),
createWorktree: (input) => transport.request(WS_METHODS.gitCreateWorktree, input),
- renameBranch: (input) => transport.request(WS_METHODS.gitRenameBranch, input),
removeWorktree: (input) => transport.request(WS_METHODS.gitRemoveWorktree, input),
createBranch: (input) => transport.request(WS_METHODS.gitCreateBranch, input),
checkout: (input) => transport.request(WS_METHODS.gitCheckout, input),
diff --git a/packages/contracts/src/git.ts b/packages/contracts/src/git.ts
index 4f9df0ccc..e0441366e 100644
--- a/packages/contracts/src/git.ts
+++ b/packages/contracts/src/git.ts
@@ -1,6 +1,5 @@
import { Schema } from "effect";
import { NonNegativeInt, PositiveInt, TrimmedNonEmptyString } from "./baseSchemas";
-import { ChatAttachment, PROVIDER_SEND_TURN_MAX_ATTACHMENTS } from "./orchestration";
const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
@@ -70,32 +69,6 @@ export const GitCreateWorktreeInput = Schema.Struct({
});
export type GitCreateWorktreeInput = typeof GitCreateWorktreeInput.Type;
-export const GitGenerateBranchNameInput = Schema.Struct({
- cwd: TrimmedNonEmptyStringSchema,
- message: TrimmedNonEmptyStringSchema,
- attachments: Schema.optional(
- Schema.Array(ChatAttachment).check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_ATTACHMENTS)),
- ),
-});
-export type GitGenerateBranchNameInput = typeof GitGenerateBranchNameInput.Type;
-
-export const GitGenerateAndRenameBranchInput = Schema.Struct({
- cwd: TrimmedNonEmptyStringSchema,
- oldBranch: TrimmedNonEmptyStringSchema,
- message: TrimmedNonEmptyStringSchema,
- attachments: Schema.optional(
- Schema.Array(ChatAttachment).check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_ATTACHMENTS)),
- ),
-});
-export type GitGenerateAndRenameBranchInput = typeof GitGenerateAndRenameBranchInput.Type;
-
-export const GitRenameBranchInput = Schema.Struct({
- cwd: TrimmedNonEmptyStringSchema,
- oldBranch: TrimmedNonEmptyStringSchema,
- newBranch: TrimmedNonEmptyStringSchema,
-});
-export type GitRenameBranchInput = typeof GitRenameBranchInput.Type;
-
export const GitRemoveWorktreeInput = Schema.Struct({
cwd: TrimmedNonEmptyStringSchema,
path: TrimmedNonEmptyStringSchema,
@@ -164,21 +137,6 @@ export const GitCreateWorktreeResult = Schema.Struct({
});
export type GitCreateWorktreeResult = typeof GitCreateWorktreeResult.Type;
-export const GitGenerateBranchNameResult = Schema.Struct({
- branch: Schema.NullOr(TrimmedNonEmptyStringSchema),
-});
-export type GitGenerateBranchNameResult = typeof GitGenerateBranchNameResult.Type;
-
-export const GitGenerateAndRenameBranchResult = Schema.Struct({
- branch: Schema.NullOr(TrimmedNonEmptyStringSchema),
-});
-export type GitGenerateAndRenameBranchResult = typeof GitGenerateAndRenameBranchResult.Type;
-
-export const GitRenameBranchResult = Schema.Struct({
- branch: TrimmedNonEmptyStringSchema,
-});
-export type GitRenameBranchResult = typeof GitRenameBranchResult.Type;
-
export const GitRunStackedActionResult = Schema.Struct({
action: GitStackedAction,
commit: Schema.Struct({
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 78bd34ac1..ce1c0305a 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -1,8 +1,6 @@
import type {
GitCheckoutInput,
GitCreateBranchInput,
- GitRenameBranchInput,
- GitRenameBranchResult,
GitCreateWorktreeInput,
GitCreateWorktreeResult,
GitInitInput,
@@ -76,7 +74,6 @@ export interface NativeApi {
// Existing branch/worktree API
listBranches: (input: GitListBranchesInput) => Promise<GitListBranchesResult>;
createWorktree: (input: GitCreateWorktreeInput) => Promise<GitCreateWorktreeResult>;
- renameBranch: (input: GitRenameBranchInput) => Promise<GitRenameBranchResult>;
removeWorktree: (input: GitRemoveWorktreeInput) => Promise<void>;
createBranch: (input: GitCreateBranchInput) => Promise<void>;
checkout: (input: GitCheckoutInput) => Promise<void>;
diff --git a/packages/contracts/src/ws.ts b/packages/contracts/src/ws.ts
index 8f0ac0eaf..7f94615bd 100644
--- a/packages/contracts/src/ws.ts
+++ b/packages/contracts/src/ws.ts
@@ -16,7 +16,6 @@ import {
GitInitInput,
GitListBranchesInput,
GitPullInput,
- GitRenameBranchInput,
GitRemoveWorktreeInput,
GitRunStackedActionInput,
GitStatusInput,
@@ -51,7 +50,6 @@ export const WS_METHODS = {
gitRunStackedAction: "git.runStackedAction",
gitListBranches: "git.listBranches",
gitCreateWorktree: "git.createWorktree",
- gitRenameBranch: "git.renameBranch",
gitRemoveWorktree: "git.removeWorktree",
gitCreateBranch: "git.createBranch",
gitCheckout: "git.checkout",
@@ -113,7 +111,6 @@ export const WebSocketRequestBody = Schema.Union([
tagRequestBody(WS_METHODS.gitRunStackedAction, GitRunStackedActionInput),
tagRequestBody(WS_METHODS.gitListBranches, GitListBranchesInput),
tagRequestBody(WS_METHODS.gitCreateWorktree, GitCreateWorktreeInput),
- tagRequestBody(WS_METHODS.gitRenameBranch, GitRenameBranchInput),
tagRequestBody(WS_METHODS.gitRemoveWorktree, GitRemoveWorktreeInput),
tagRequestBody(WS_METHODS.gitCreateBranch, GitCreateBranchInput),
tagRequestBody(WS_METHODS.gitCheckout, GitCheckoutInput),