@prover-coder-ai/docker-git 1.0.50 → 1.0.52

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

@@ -286,7 +286,13 @@ 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", "pipe")), Number);
+var runCommandExitCode = (spec) => Effect.scoped(Effect.gen(function* (_) {
+	const process = yield* _((yield* _(CommandExecutor.CommandExecutor)).start(buildCommand(spec, "pipe", "pipe", "pipe")));
+	yield* _(Effect.forkDaemon(Stream.runDrain(process.stdout)));
+	yield* _(Effect.forkDaemon(Stream.runDrain(process.stderr)));
+	const exitCode = yield* _(process.exitCode);
+	return Number(exitCode);
+}));
 var collectUint8Array$1 = (chunks) => Chunk.reduce(chunks, new Uint8Array(), (acc, curr) => {
 	const next = new Uint8Array(acc.length + curr.length);
 	next.set(acc);
@@ -295,6 +301,7 @@ var collectUint8Array$1 = (chunks) => Chunk.reduce(chunks, new Uint8Array(), (ac
 });
 var runCommandCapture = (spec, okExitCodes, onFailure) => Effect.scoped(Effect.gen(function* (_) {
 	const process = yield* _((yield* _(CommandExecutor.CommandExecutor)).start(buildCommand(spec, "pipe", "pipe", "pipe")));
+	yield* _(Effect.forkDaemon(Stream.runDrain(process.stderr)));
 	const bytes = yield* _(pipe(process.stdout, Stream.runCollect, Effect.map((chunks) => collectUint8Array$1(chunks))));
 	const exitCode = yield* _(process.exitCode);
 	yield* _(ensureExitCode(Number(exitCode), okExitCodes, onFailure));
@@ -5818,14 +5825,37 @@ var ensureFileReady = (fs, resolved, onDirectoryMessage) => Effect.gen(function*
 	}
 	return "exists";
 });
+var appendKeyIfMissing = (fs, resolved, source, desiredContents) => Effect.gen(function* (_) {
+	const currentContents = yield* _(fs.readFileString(resolved));
+	if (currentContents.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0).includes(desiredContents)) return;
+	const normalizedCurrent = currentContents.trimEnd();
+	const nextContents = normalizedCurrent.length === 0 ? `${desiredContents}\n` : `${normalizedCurrent}\n${desiredContents}\n`;
+	yield* _(fs.writeFileString(resolved, nextContents));
+	yield* _(Effect.log(`Authorized keys appended from ${source} to ${resolved}`));
+});
+var resolveAuthorizedKeysSource = (fs, path, cwd) => Effect.gen(function* (_) {
+	const sshPrivateKey = yield* _(findSshPrivateKey(fs, path, cwd));
+	const matchingPublicKey = sshPrivateKey === null ? null : yield* _(findExistingPath(fs, `${sshPrivateKey}.pub`));
+	return matchingPublicKey === null ? yield* _(findAuthorizedKeysSource(fs, path, cwd)) : matchingPublicKey;
+});
 var ensureAuthorizedKeys = (baseDir, authorizedKeysPath) => withFsPathContext(({ fs, path }) => Effect.gen(function* (_) {
 	const resolved = resolveAuthorizedKeysPath(path, baseDir, authorizedKeysPath);
-	if ((yield* _(ensureFileReady(fs, resolved, (resolvedPath, backupPath) => `Authorized keys was a directory, moved to ${backupPath}. Creating a file at ${resolvedPath}.`))) === "exists") return;
-	const source = yield* _(findAuthorizedKeysSource(fs, path, process.cwd()));
+	const managedDefaultAuthorizedKeys = path.join(defaultProjectsRoot(process.cwd()), "authorized_keys");
+	const state = yield* _(ensureFileReady(fs, resolved, (resolvedPath, backupPath) => `Authorized keys was a directory, moved to ${backupPath}. Creating a file at ${resolvedPath}.`));
+	const source = yield* _(resolveAuthorizedKeysSource(fs, path, process.cwd()));
 	if (source === null) {
 		yield* _(Effect.logError(`Authorized keys not found. Create ${resolved} with your public key to enable SSH.`));
 		return;
 	}
+	const desiredContents = (yield* _(fs.readFileString(source))).trim();
+	if (desiredContents.length === 0) {
+		yield* _(Effect.logWarning(`Authorized keys source ${source} is empty. Skipping SSH key sync.`));
+		return;
+	}
+	if (state === "exists") {
+		if (resolved === managedDefaultAuthorizedKeys) yield* _(appendKeyIfMissing(fs, resolved, source, desiredContents));
+		return;
+	}
 	yield* _(fs.makeDirectory(path.dirname(resolved), { recursive: true }));
 	yield* _(fs.copyFile(source, resolved));
 	yield* _(Effect.log(`Authorized keys copied from ${source} to ${resolved}`));