Fix envMode reset bug and use shell-free git spawn

- ChatView: change useEffect dependency from [activeThread] (new object ref every dispatch) to [activeThread?.id, activeThread?.worktreePath] so envMode is no longer silently reset to "local" on unrelated store dispatches, making the worktree code path reachable. - git.ts: replace shell command strings (runTerminalCommand + single-quote escaping) with a runGit helper that spawns git directly via argv array. Eliminates Windows quoting issues and the command injection surface.

Julius Marminge committed 9 months ago

Commit 198cc581 parent 6e3726e2 files · +55 −38Browse files

Unified · Split

2 files

apps/server/src/git.ts +54 −37
apps/web/src/components/ChatView.tsx +1 −1

apps/server/src/git.ts+54−37

   TerminalCommandResult,
 } from "@t3tools/contracts";
-function escapeSingleQuotes(value: string): string {
+/** Spawn git directly with an argv array — no shell, no quoting needed. */
-  return value.replace(/'/g, "'\\''");
+function runGit(
+  args: string[],
+  cwd: string,
+  timeoutMs = 30_000,
+): Promise<TerminalCommandResult> {
+  return new Promise((resolve, reject) => {
+    const child = spawn("git", args, {
+      cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const timeout = setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      setTimeout(() => {
+        if (!child.killed) child.kill("SIGKILL");
+      }, 1_000).unref();
+    }, timeoutMs);
+    child.stdout?.on("data", (chunk: Buffer) => {
+      stdout += chunk.toString();
+    });
+    child.stderr?.on("data", (chunk: Buffer) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", (error) => {
+      clearTimeout(timeout);
+      reject(error);
+    });
+    child.on("close", (code, signal) => {
+      clearTimeout(timeout);
+      resolve({ stdout, stderr, code: code ?? null, signal: signal ?? null, timedOut });
+    });
+  });
 }
 export async function runTerminalCommand(
 }
 export async function listGitBranches(input: GitListBranchesInput): Promise<GitListBranchesResult> {
-  const result = await runTerminalCommand({
+  const result = await runGit(["branch", "--no-color"], input.cwd, 10_000);
-    command: "git branch --no-color",
-    cwd: input.cwd,
-    timeoutMs: 10_000,
-  });
   if (result.code !== 0) {
     const stderr = result.stderr.trim();
   }
   // Resolve the real default branch from the remote
-  const defaultRef = await runTerminalCommand({
+  const defaultRef = await runGit(
-    command: "git symbolic-ref refs/remotes/origin/HEAD",
+    ["symbolic-ref", "refs/remotes/origin/HEAD"],
-    cwd: input.cwd,
+    input.cwd,
-    timeoutMs: 5_000,
+    5_000,
-  });
+  );
   const defaultBranch =
     defaultRef.code === 0 ? defaultRef.stdout.trim().replace(/^refs\/remotes\/origin\//, "") : null;
     input.path ?? path.join(os.homedir(), ".t3", "worktrees", repoName, sanitizedBranch);
   // Create a new branch from the base branch in a new worktree
-  const result = await runTerminalCommand({
+  const result = await runGit(
-    command: `git worktree add -b '${escapeSingleQuotes(input.newBranch)}' '${escapeSingleQuotes(worktreePath)}' '${escapeSingleQuotes(input.branch)}'`,
+    ["worktree", "add", "-b", input.newBranch, worktreePath, input.branch],
-    cwd: input.cwd,
+    input.cwd,
-    timeoutMs: 30_000,
+  );
-  });
   if (result.code !== 0) {
     throw new Error(result.stderr.trim() || "git worktree add failed");
 }
 export async function removeGitWorktree(input: GitRemoveWorktreeInput): Promise<void> {
-  const result = await runTerminalCommand({
+  const result = await runGit(["worktree", "remove", input.path], input.cwd, 15_000);
-    command: `git worktree remove '${escapeSingleQuotes(input.path)}'`,
-    cwd: input.cwd,
-    timeoutMs: 15_000,
-  });
   if (result.code !== 0) {
     throw new Error(result.stderr.trim() || "git worktree remove failed");
 }
 export async function createGitBranch(input: GitCreateBranchInput): Promise<void> {
-  const result = await runTerminalCommand({
+  const result = await runGit(["branch", input.branch], input.cwd, 10_000);
-    command: `git branch '${escapeSingleQuotes(input.branch)}'`,
-    cwd: input.cwd,
-    timeoutMs: 10_000,
-  });
   if (result.code !== 0) {
     throw new Error(result.stderr.trim() || "git branch create failed");
 }
 export async function checkoutGitBranch(input: GitCheckoutInput): Promise<void> {
-  const result = await runTerminalCommand({
+  const result = await runGit(["checkout", input.branch], input.cwd, 10_000);
-    command: `git checkout '${escapeSingleQuotes(input.branch)}'`,
-    cwd: input.cwd,
-    timeoutMs: 10_000,
-  });
   if (result.code !== 0) {
     throw new Error(result.stderr.trim() || "git checkout failed");
 }
 export async function initGitRepo(input: GitInitInput): Promise<void> {
-  const result = await runTerminalCommand({
+  const result = await runGit(["init"], input.cwd, 10_000);
-    command: "git init",
-    cwd: input.cwd,
-    timeoutMs: 10_000,
-  });
   if (result.code !== 0) {
     throw new Error(result.stderr.trim() || "git init failed");

apps/web/src/components/ChatView.tsx+1−1

@@ -319,7 +319,7 @@ export default function ChatView() { · 318 unmodified lines
319	useEffect(() => {	319	useEffect(() => {
320	if (!activeThread) return;	320	if (!activeThread) return;
321	setEnvMode(activeThread.worktreePath ? "worktree" : "local");	321	setEnvMode(activeThread.worktreePath ? "worktree" : "local");
322	}, [activeThread]);	322	}, [activeThread?.id, activeThread?.worktreePath]);
323		323
324	// Auto-resize textarea	324	// Auto-resize textarea
325	useEffect(() => {	325	useEffect(() => {

Fix envMode reset bug and use shell-free git spawn

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code