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.
[codex] Make background VCS fetch non-interactive (#3133)
Andrew Forster75b3b3c48aa5
diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.tsindex c0e0f1876..173d7649b 100644--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts@@ -216,7 +216,7 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {}),);- it.effect("disables SSH askpass for background upstream status fetches", () =>+ it.effect("makes background upstream status fetches non-interactive", () =>Effect.gen(function* () {const cwd = yield* makeTmpDir();const tempDir = yield* makeTmpDir("git-vcs-driver-ssh-env-");@@ -225,15 +225,26 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {const pathService = yield* Path.Path;const sshLogPath = pathService.join(tempDir, "ssh-env.txt");const sshWrapperPath = pathService.join(tempDir, "ssh-wrapper.sh");- const previousGitSsh = process.env.GIT_SSH;- const previousAskpassRequire = process.env.SSH_ASKPASS_REQUIRE;- const previousAskpassLog = process.env.T3_TEST_SSH_ASKPASS_LOG;+ const envKeys = [+ "GCM_INTERACTIVE",+ "GIT_ASKPASS",+ "GIT_SSH",+ "GIT_TERMINAL_PROMPT",+ "SSH_ASKPASS",+ "SSH_ASKPASS_REQUIRE",+ "T3_TEST_SSH_ASKPASS_LOG",+ ] as const;+ const previousEnv = new Map(envKeys.map((key) => [key, process.env[key]]));yield* fileSystem.writeFileString(sshWrapperPath,["#!/bin/sh",- 'printf "%s\\n" "${SSH_ASKPASS_REQUIRE:-}" > "$T3_TEST_SSH_ASKPASS_LOG"',+ 'printf "GCM_INTERACTIVE=%s\\n" "${GCM_INTERACTIVE:-}" > "$T3_TEST_SSH_ASKPASS_LOG"',+ 'printf "GIT_ASKPASS=%s\\n" "${GIT_ASKPASS:-}" >> "$T3_TEST_SSH_ASKPASS_LOG"',+ 'printf "GIT_TERMINAL_PROMPT=%s\\n" "${GIT_TERMINAL_PROMPT:-}" >> "$T3_TEST_SSH_ASKPASS_LOG"',+ 'printf "SSH_ASKPASS=%s\\n" "${SSH_ASKPASS:-}" >> "$T3_TEST_SSH_ASKPASS_LOG"',+ 'printf "SSH_ASKPASS_REQUIRE=%s\\n" "${SSH_ASKPASS_REQUIRE:-}" >> "$T3_TEST_SSH_ASKPASS_LOG"',"exit 1","",].join("\n"),@@ -245,29 +256,32 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {yield* Effect.gen(function* () {process.env.GIT_SSH = sshWrapperPath;+ process.env.GCM_INTERACTIVE = "always";+ process.env.GIT_ASKPASS = "git-askpass";+ process.env.GIT_TERMINAL_PROMPT = "1";+ process.env.SSH_ASKPASS = "ssh-askpass";process.env.SSH_ASKPASS_REQUIRE = "force";process.env.T3_TEST_SSH_ASKPASS_LOG = sshLogPath;yield* (yield* GitVcsDriver.GitVcsDriver).statusDetails(cwd);- assert.equal((yield* fileSystem.readFileString(sshLogPath)).trim(), "never");+ assert.deepEqual((yield* fileSystem.readFileString(sshLogPath)).trim().split(/\r?\n/), [+ "GCM_INTERACTIVE=never",+ "GIT_ASKPASS=",+ "GIT_TERMINAL_PROMPT=0",+ "SSH_ASKPASS=",+ "SSH_ASKPASS_REQUIRE=never",+ ]);}).pipe(Effect.ensuring(Effect.sync(() => {- if (previousGitSsh === undefined) {- delete process.env.GIT_SSH;- } else {- process.env.GIT_SSH = previousGitSsh;- }- if (previousAskpassRequire === undefined) {- delete process.env.SSH_ASKPASS_REQUIRE;- } else {- process.env.SSH_ASKPASS_REQUIRE = previousAskpassRequire;- }- if (previousAskpassLog === undefined) {- delete process.env.T3_TEST_SSH_ASKPASS_LOG;- } else {- process.env.T3_TEST_SSH_ASKPASS_LOG = previousAskpassLog;+ for (const key of envKeys) {+ const previous = previousEnv.get(key);+ if (previous === undefined) {+ delete process.env[key];+ } else {+ process.env[key] = previous;+ }}}),),diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.tsindex 33d009b9d..a763026c2 100644--- a/apps/server/src/vcs/GitVcsDriverCore.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.ts@@ -54,6 +54,10 @@ const STATUS_UPSTREAM_REFRESH_TIMEOUT = Duration.seconds(5);const STATUS_UPSTREAM_REFRESH_FAILURE_COOLDOWN = Duration.seconds(5);const STATUS_UPSTREAM_REFRESH_CACHE_CAPACITY = 2_048;const STATUS_UPSTREAM_REFRESH_ENV = Object.freeze({+ GCM_INTERACTIVE: "never",+ GIT_ASKPASS: "",+ GIT_TERMINAL_PROMPT: "0",+ SSH_ASKPASS: "",SSH_ASKPASS_REQUIRE: "never",} satisfies NodeJS.ProcessEnv);const DEFAULT_BASE_BRANCH_CANDIDATES = ["main", "master"] as const;