@prover-coder-ai/docker-git 1.0.45 → 1.0.46

package/dist/src/docker-git/main.js

@@ -286,7 +286,7 @@ var runCommandWithExitCodes = (spec, okExitCodes, onFailure) => Effect.gen(funct
 	const exitCode = yield* _(Command.exitCode(buildCommand(spec, "inherit", "inherit", "inherit")));
 	yield* _(ensureExitCode(Number(exitCode), okExitCodes, onFailure));
 });
-var runCommandExitCode = (spec) => Effect.map(Command.exitCode(buildCommand(spec, "pipe", "pipe", "inherit")), Number);
+var runCommandExitCode = (spec) => Effect.map(Command.exitCode(buildCommand(spec, "pipe", "pipe", "pipe")), Number);
 var collectUint8Array$1 = (chunks) => Chunk.reduce(chunks, new Uint8Array(), (acc, curr) => {
 	const next = new Uint8Array(acc.length + curr.length);
 	next.set(acc);
@@ -1394,7 +1394,7 @@ var readProjectConfig = (baseDir) => Effect.gen(function* (_) {
 //#endregion
 //#region ../lib/src/usecases/docker-git-config-search.ts
 var isDockerGitConfig = (entry) => entry.endsWith("docker-git.json");
-var shouldSkipDir = (entry) => entry === ".git" || entry === ".orch" || entry === ".docker-git" || entry === ".cache";
+var shouldSkipDir = (entry) => entry === ".git" || entry === ".orch" || entry === ".docker-git" || entry === ".cache" || entry === "node_modules";
 var isNotFoundStatError = (error) => error._tag === "SystemError" && error.reason === "NotFound";
 var processDockerGitEntry = (fs, path, dir, entry, state) => Effect.gen(function* (_) {
 	if (shouldSkipDir(entry)) return;
@@ -1620,6 +1620,7 @@ var resolveTemplateResourceLimits = (template) => Effect.succeed(withDefaultReso
 var successExitCode = Number(ExitCode(0));
 var gitBaseEnv$1 = {
 	GIT_TERMINAL_PROMPT: "0",
+	GIT_SSH_COMMAND: "ssh -o BatchMode=yes",
 	GIT_AUTHOR_NAME: "docker-git",
 	GIT_AUTHOR_EMAIL: "docker-git@users.noreply.github.com",
 	GIT_COMMITTER_NAME: "docker-git",
@@ -6565,6 +6566,150 @@ var authCodexStatus = (command) => withCodexAuth(command, ({ accountPath, cwd })
 }));
 var authCodexLogout = (command) => withCodexAuth(command, ({ accountPath, cwd }) => runCodexLogout(cwd, accountPath)).pipe(Effect.zipRight(autoSyncState(`chore(state): auth codex logout ${normalizeAccountLabel(command.label, "default")}`)));
 //#endregion
+//#region ../lib/src/usecases/auth-gemini-helpers.ts
+var geminiImageName = "docker-git-auth-gemini:latest";
+var geminiImageDir = ".docker-git/.orch/auth/gemini/.image";
+var geminiContainerHomeDir = "/gemini-home";
+var geminiCredentialsDir$1 = ".gemini";
+var geminiAuthRoot = ".docker-git/.orch/auth/gemini";
+var geminiApiKeyFileName = ".api-key";
+var geminiEnvFileName = ".env";
+var geminiApiKeyPath = (accountPath) => `${accountPath}/${geminiApiKeyFileName}`;
+var geminiEnvFilePath = (accountPath) => `${accountPath}/${geminiEnvFileName}`;
+var geminiCredentialsPath = (accountPath) => `${accountPath}/${geminiCredentialsDir$1}`;
+var renderGeminiDockerfile = () => String.raw`FROM ubuntu:24.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends ca-certificates curl bsdutils \
+  && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
+  && apt-get install -y --no-install-recommends nodejs \
+  && rm -rf /var/lib/apt/lists/*
+RUN npm install -g @google/gemini-cli@0.33.2
+`;
+var ensureGeminiOrchLayout = (cwd) => migrateLegacyOrchLayout(cwd, {
+	envGlobalPath: defaultTemplateConfig.envGlobalPath,
+	envProjectPath: defaultTemplateConfig.envProjectPath,
+	codexAuthPath: defaultTemplateConfig.codexAuthPath,
+	ghAuthPath: ".docker-git/.orch/auth/gh",
+	claudeAuthPath: ".docker-git/.orch/auth/claude",
+	geminiAuthPath: ".docker-git/.orch/auth/gemini"
+});
+var resolveGeminiAccountPath = (path, rootPath, label) => {
+	const accountLabel = normalizeAccountLabel(label, "default");
+	return {
+		accountLabel,
+		accountPath: path.join(rootPath, accountLabel)
+	};
+};
+var withGeminiAuth = (command, run, options = {}) => withFsPathContext(({ cwd, fs, path }) => Effect.gen(function* (_) {
+	yield* _(ensureGeminiOrchLayout(cwd));
+	const { accountLabel, accountPath } = resolveGeminiAccountPath(path, resolvePathFromCwd(path, cwd, command.geminiAuthPath), command.label);
+	yield* _(fs.makeDirectory(accountPath, { recursive: true }));
+	if (options.buildImage === true) yield* _(ensureDockerImage(fs, path, cwd, {
+		imageName: geminiImageName,
+		imageDir: geminiImageDir,
+		dockerfile: renderGeminiDockerfile(),
+		buildLabel: "gemini auth"
+	}));
+	return yield* _(run({
+		accountLabel,
+		accountPath,
+		cwd,
+		fs
+	}));
+}));
+var readApiKey = (fs, accountPath) => Effect.gen(function* (_) {
+	const apiKeyFilePath = geminiApiKeyPath(accountPath);
+	if (yield* _(isRegularFile$1(fs, apiKeyFilePath))) {
+		const trimmed = (yield* _(fs.readFileString(apiKeyFilePath), Effect.orElseSucceed(() => ""))).trim();
+		if (trimmed.length > 0) return trimmed;
+	}
+	const envFilePath = geminiEnvFilePath(accountPath);
+	if (yield* _(isRegularFile$1(fs, envFilePath))) {
+		const lines = (yield* _(fs.readFileString(envFilePath), Effect.orElseSucceed(() => ""))).split("\n");
+		for (const line of lines) {
+			const trimmed = line.trim();
+			if (trimmed.startsWith("GEMINI_API_KEY=")) {
+				const value = trimmed.slice(15).replaceAll(/^['"]|['"]$/g, "").trim();
+				if (value.length > 0) return value;
+			}
+		}
+	}
+	return null;
+});
+var hasOauthCredentials$1 = (fs, accountPath) => Effect.gen(function* (_) {
+	const credentialsDir = geminiCredentialsPath(accountPath);
+	if (!(yield* _(fs.exists(credentialsDir)))) return false;
+	const possibleFiles = [
+		`${credentialsDir}/oauth-tokens.json`,
+		`${credentialsDir}/credentials.json`,
+		`${credentialsDir}/application_default_credentials.json`
+	];
+	for (const filePath of possibleFiles) if (yield* _(isRegularFile$1(fs, filePath))) return true;
+	return false;
+});
+var resolveGeminiAuthMethod = (fs, accountPath) => Effect.gen(function* (_) {
+	if ((yield* _(readApiKey(fs, accountPath))) !== null) return "api-key";
+	return (yield* _(hasOauthCredentials$1(fs, accountPath))) ? "oauth" : "none";
+});
+var prepareGeminiCredentialsDir = (cwd, accountPath, fs) => Effect.gen(function* (_) {
+	const credentialsDir = geminiCredentialsPath(accountPath);
+	const removeFallback = pipe(runCommandExitCode({
+		cwd,
+		command: "docker",
+		args: [
+			"run",
+			"--rm",
+			"-v",
+			`${accountPath}:/target`,
+			"alpine",
+			"rm",
+			"-rf",
+			"/target/.gemini"
+		]
+	}), Effect.asVoid, Effect.orElse(() => Effect.void));
+	yield* _(fs.remove(credentialsDir, {
+		recursive: true,
+		force: true
+	}).pipe(Effect.orElse(() => removeFallback)));
+	yield* _(fs.makeDirectory(credentialsDir, { recursive: true }));
+	yield* _(runCommandExitCode({
+		cwd,
+		command: "chmod",
+		args: [
+			"-R",
+			"777",
+			credentialsDir
+		]
+	}).pipe(Effect.orElse(() => Effect.succeed(0))));
+	return credentialsDir;
+});
+var writeInitialSettings = (credentialsDir, fs) => Effect.gen(function* (_) {
+	const settingsPath = `${credentialsDir}/settings.json`;
+	yield* _(fs.writeFileString(settingsPath, JSON.stringify({
+		model: {
+			name: "gemini-2.0-flash",
+			compressionThreshold: .9,
+			disableLoopDetection: true
+		},
+		general: { defaultApprovalMode: "auto_edit" },
+		yolo: true,
+		sandbox: { enabled: false },
+		security: {
+			folderTrust: { enabled: false },
+			auth: { selectedType: "oauth-personal" },
+			approvalPolicy: "never"
+		}
+	}, null, 2)));
+	const trustedFoldersPath = `${credentialsDir}/trustedFolders.json`;
+	yield* _(fs.writeFileString(trustedFoldersPath, JSON.stringify({
+		"/": "TRUST_FOLDER",
+		[geminiContainerHomeDir]: "TRUST_FOLDER"
+	})));
+	return settingsPath;
+});
+//#endregion
 //#region ../lib/src/usecases/auth-gemini-oauth.ts
 var outputWindowSize = 262144;
 var authSuccessPatterns = [
@@ -6572,8 +6717,7 @@ var authSuccessPatterns = [
 	"Authentication successful",
 	"Successfully authenticated",
 	"Logged in as",
-	"You are now logged in",
-	"Logged in with Google"
+	"You are now logged in"
 ];
 var authFailurePatterns = [
 	"Authentication failed",
@@ -6605,6 +6749,7 @@ var buildDockerGeminiAuthSpec = (cwd, accountPath, image, containerPath, port) =
 		"NO_BROWSER=true",
 		"GEMINI_CLI_NONINTERACTIVE=true",
 		"GEMINI_CLI_TRUST_ALL=true",
+		"GEMINI_DISABLE_UPDATE_CHECK=true",
 		`OAUTH_CALLBACK_PORT=${port}`,
 		"OAUTH_CALLBACK_HOST=0.0.0.0"
 	]
@@ -6613,12 +6758,15 @@ var buildDockerGeminiAuthArgs = (spec) => {
 	const base = [
 		"run",
 		"--rm",
+		"--init",
 		"-i",
 		"-t",
 		"-v",
 		`${spec.hostPath}:${spec.containerPath}`,
 		"-p",
-		`${spec.callbackPort}:${spec.callbackPort}`
+		`${spec.callbackPort}:${spec.callbackPort}`,
+		"-w",
+		spec.containerPath
 	];
 	for (const entry of spec.env) {
 		const trimmed = entry.trim();
@@ -6629,7 +6777,8 @@ var buildDockerGeminiAuthArgs = (spec) => {
 		...base,
 		spec.image,
 		"gemini",
-		"login",
+		"mcp",
+		"list",
 		"--debug"
 	];
 };
@@ -6726,103 +6875,14 @@ var runGeminiOauthLoginWithPrompt = (cwd, accountPath, options) => Effect.scoped
 	const resultBox = { value: "pending" };
 	const stdoutFiber = yield* _(Effect.forkScoped(pumpDockerOutput(proc.stdout, 1, resultBox, authDeferred)));
 	const stderrFiber = yield* _(Effect.forkScoped(pumpDockerOutput(proc.stderr, 2, resultBox, authDeferred)));
-	const exitCode = yield* _(Effect.race(proc.exitCode.pipe(Effect.map(Number)), pipe(Deferred.await(authDeferred), Effect.flatMap(() => proc.kill()), Effect.map(() => 0))));
-	yield* _(Fiber$1.join(stdoutFiber));
-	yield* _(Fiber$1.join(stderrFiber));
+	const exitCode = yield* _(Effect.race(proc.exitCode.pipe(Effect.map(Number)), pipe(Deferred.await(authDeferred), Effect.delay("500 millis"), Effect.flatMap(() => proc.kill()), Effect.map(() => 0))));
+	yield* _(Fiber$1.interrupt(stdoutFiber));
+	yield* _(Fiber$1.interrupt(stderrFiber));
 	yield* _(fixGeminiAuthPermissions(hostPath, spec.containerPath));
 	return yield* _(resolveGeminiLoginResult(resultBox.value, exitCode));
 }));
 //#endregion
 //#region ../lib/src/usecases/auth-gemini.ts
-var geminiImageName = "docker-git-auth-gemini:latest";
-var geminiImageDir = ".docker-git/.orch/auth/gemini/.image";
-var geminiContainerHomeDir = "/gemini-home";
-var geminiCredentialsDir$1 = ".gemini";
-var geminiAuthRoot = ".docker-git/.orch/auth/gemini";
-var geminiApiKeyFileName = ".api-key";
-var geminiEnvFileName = ".env";
-var geminiApiKeyPath = (accountPath) => `${accountPath}/${geminiApiKeyFileName}`;
-var geminiEnvFilePath = (accountPath) => `${accountPath}/${geminiEnvFileName}`;
-var geminiCredentialsPath = (accountPath) => `${accountPath}/${geminiCredentialsDir$1}`;
-var renderGeminiDockerfile = () => String.raw`FROM ubuntu:24.04
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends ca-certificates curl bsdutils \
-  && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
-  && apt-get install -y --no-install-recommends nodejs \
-  && node -v \
-  && npm -v \
-  && rm -rf /var/lib/apt/lists/*
-RUN npm install -g @google/gemini-cli@latest
-ENTRYPOINT ["/bin/bash", "-c"]
-`;
-var ensureGeminiOrchLayout = (cwd) => migrateLegacyOrchLayout(cwd, {
-	envGlobalPath: defaultTemplateConfig.envGlobalPath,
-	envProjectPath: defaultTemplateConfig.envProjectPath,
-	codexAuthPath: defaultTemplateConfig.codexAuthPath,
-	ghAuthPath: ".docker-git/.orch/auth/gh",
-	claudeAuthPath: ".docker-git/.orch/auth/claude",
-	geminiAuthPath: ".docker-git/.orch/auth/gemini"
-});
-var resolveGeminiAccountPath = (path, rootPath, label) => {
-	const accountLabel = normalizeAccountLabel(label, "default");
-	return {
-		accountLabel,
-		accountPath: path.join(rootPath, accountLabel)
-	};
-};
-var withGeminiAuth = (command, run, options = {}) => withFsPathContext(({ cwd, fs, path }) => Effect.gen(function* (_) {
-	yield* _(ensureGeminiOrchLayout(cwd));
-	const { accountLabel, accountPath } = resolveGeminiAccountPath(path, resolvePathFromCwd(path, cwd, command.geminiAuthPath), command.label);
-	yield* _(fs.makeDirectory(accountPath, { recursive: true }));
-	if (options.buildImage === true) yield* _(ensureDockerImage(fs, path, cwd, {
-		imageName: geminiImageName,
-		imageDir: geminiImageDir,
-		dockerfile: renderGeminiDockerfile(),
-		buildLabel: "gemini auth"
-	}));
-	return yield* _(run({
-		accountLabel,
-		accountPath,
-		cwd,
-		fs
-	}));
-}));
-var readApiKey = (fs, accountPath) => Effect.gen(function* (_) {
-	const apiKeyFilePath = geminiApiKeyPath(accountPath);
-	if (yield* _(isRegularFile$1(fs, apiKeyFilePath))) {
-		const trimmed = (yield* _(fs.readFileString(apiKeyFilePath), Effect.orElseSucceed(() => ""))).trim();
-		if (trimmed.length > 0) return trimmed;
-	}
-	const envFilePath = geminiEnvFilePath(accountPath);
-	if (yield* _(isRegularFile$1(fs, envFilePath))) {
-		const lines = (yield* _(fs.readFileString(envFilePath), Effect.orElseSucceed(() => ""))).split("\n");
-		for (const line of lines) {
-			const trimmed = line.trim();
-			if (trimmed.startsWith("GEMINI_API_KEY=")) {
-				const value = trimmed.slice(15).replaceAll(/^['"]|['"]$/g, "").trim();
-				if (value.length > 0) return value;
-			}
-		}
-	}
-	return null;
-});
-var hasOauthCredentials$1 = (fs, accountPath) => Effect.gen(function* (_) {
-	const credentialsDir = geminiCredentialsPath(accountPath);
-	if (!(yield* _(fs.exists(credentialsDir)))) return false;
-	const possibleFiles = [
-		`${credentialsDir}/oauth-tokens.json`,
-		`${credentialsDir}/credentials.json`,
-		`${credentialsDir}/application_default_credentials.json`
-	];
-	for (const filePath of possibleFiles) if (yield* _(isRegularFile$1(fs, filePath))) return true;
-	return false;
-});
-var resolveGeminiAuthMethod = (fs, accountPath) => Effect.gen(function* (_) {
-	if ((yield* _(readApiKey(fs, accountPath))) !== null) return "api-key";
-	return (yield* _(hasOauthCredentials$1(fs, accountPath))) ? "oauth" : "none";
-});
 var authGeminiLogin = (command, apiKey) => {
 	const accountLabel = normalizeAccountLabel(command.label, "default");
 	return withGeminiAuth(command, ({ accountPath, fs }) => Effect.gen(function* (_) {
@@ -6843,39 +6903,6 @@ var authGeminiLoginCli = (_command) => Effect.gen(function* (_) {
 	yield* _(Effect.log("   - Use: docker-git menu -> Auth profiles -> Gemini CLI: login via OAuth"));
 	yield* _(Effect.log("   - Follow the prompts to authenticate with your Google account"));
 });
-var prepareGeminiCredentialsDir = (cwd, accountPath, fs) => Effect.gen(function* (_) {
-	const credentialsDir = geminiCredentialsPath(accountPath);
-	const removeFallback = pipe(runCommandExitCode({
-		cwd,
-		command: "docker",
-		args: [
-			"run",
-			"--rm",
-			"-v",
-			`${accountPath}:/target`,
-			"alpine",
-			"rm",
-			"-rf",
-			"/target/.gemini"
-		]
-	}), Effect.asVoid, Effect.orElse(() => Effect.void));
-	yield* _(fs.remove(credentialsDir, {
-		recursive: true,
-		force: true
-	}).pipe(Effect.orElse(() => removeFallback)));
-	yield* _(fs.makeDirectory(credentialsDir, { recursive: true }));
-	return credentialsDir;
-});
-var writeInitialSettings = (credentialsDir, fs) => Effect.gen(function* (_) {
-	const settingsPath = `${credentialsDir}/settings.json`;
-	yield* _(fs.writeFileString(settingsPath, JSON.stringify({ security: { folderTrust: { enabled: false } } })));
-	const trustedFoldersPath = `${credentialsDir}/trustedFolders.json`;
-	yield* _(fs.writeFileString(trustedFoldersPath, JSON.stringify({
-		"/": "TRUST_FOLDER",
-		[geminiContainerHomeDir]: "TRUST_FOLDER"
-	})));
-	return settingsPath;
-});
 var authGeminiLoginOauth = (command) => {
 	const accountLabel = normalizeAccountLabel(command.label, "default");
 	return withGeminiAuth(command, ({ accountPath, cwd, fs }) => Effect.gen(function* (_) {