@prover-coder-ai/docker-git 1.0.53 → 1.0.55

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

@@ -1740,7 +1740,7 @@ var isAutoSyncEnabled = (envValue, hasRemote) => {
 //#endregion
 //#region ../lib/src/usecases/state-repo/github-auth.ts
 var githubTokenKey = "GITHUB_TOKEN";
-var githubHttpsRemoteRe = /^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/;
+var githubHttpsRemoteRe = /^https:\/\/(?:[^/]+@)?github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/;
 var githubSshRemoteRe = /^git@github\.com:([^/]+)\/(.+?)(?:\.git)?$/;
 var githubSshUrlRemoteRe = /^ssh:\/\/git@github\.com\/([^/]+)\/(.+?)(?:\.git)?$/;
 var tryParseGithubRemoteParts = (originUrl) => {
@@ -1759,7 +1759,13 @@ var tryBuildGithubCompareUrl = (originUrl, baseBranch, headBranch) => {
 	if (parts === null) return null;
 	return `https://github.com/${parts.owner}/${parts.repo}/compare/${encodeURIComponent(baseBranch)}...${encodeURIComponent(headBranch)}?expand=1`;
 };
-var isGithubHttpsRemote = (url) => /^https:\/\/github\.com\//.test(url.trim());
+var isGithubHttpsRemote = (url) => /^https:\/\/(?:[^/]+@)?github\.com\//.test(url.trim());
+var normalizeGithubHttpsRemote = (url) => {
+	if (!isGithubHttpsRemote(url)) return null;
+	const parts = tryParseGithubRemoteParts(url);
+	return parts === null ? null : `https://github.com/${parts.owner}/${parts.repo}.git`;
+};
+var requiresGithubAuthHint = (originUrl, token) => isGithubHttpsRemote(originUrl) && (token?.trim() ?? "").length === 0;
 var resolveTokenFromProcessEnv = () => {
 	const github = process.env["GITHUB_TOKEN"];
 	if (github !== void 0) {
@@ -1819,6 +1825,35 @@ var withGithubAskpassEnv = (token, use) => Effect.scoped(Effect.gen(function* (_
 	}));
 }));
 //#endregion
+//#region ../lib/src/usecases/state-repo/github-auth-state.ts
+var githubAuthLoginHint = "GitHub is not authorized for docker-git. To use state sync, run: docker-git auth github login --web";
+var normalizeOriginUrlIfNeeded = (root, originUrl) => Effect.gen(function* (_) {
+	const normalized = normalizeGithubHttpsRemote(originUrl);
+	if (normalized === null || normalized === originUrl) return originUrl;
+	yield* _(git(root, [
+		"remote",
+		"set-url",
+		"origin",
+		normalized
+	], gitBaseEnv$1));
+	return normalized;
+});
+var resolveStateGithubContext = (fs, path, root) => Effect.gen(function* (_) {
+	const originUrl = yield* _(normalizeOriginUrlIfNeeded(root, yield* _(gitCapture$1(root, [
+		"remote",
+		"get-url",
+		"origin"
+	], gitBaseEnv$1).pipe(Effect.map((value) => value.trim())))));
+	const token = yield* _(resolveGithubToken(fs, path, root));
+	return {
+		originUrl,
+		token,
+		authHintNeeded: requiresGithubAuthHint(originUrl, token)
+	};
+});
+var shouldLogGithubAuthHintForStateSyncFailure = (originUrl, token, error) => requiresGithubAuthHint(originUrl, token) || isGithubHttpsRemote(originUrl) && error._tag === "CommandFailedError" && error.command === "git fetch origin --prune";
+var withGithubAuthHintOnFailure = (effect, enabled) => effect.pipe(Effect.tapError(() => enabled ? Effect.logWarning(githubAuthLoginHint) : Effect.void));
+//#endregion
 //#region ../lib/src/usecases/state-repo/gitignore.ts
 var stateGitignoreMarker = "# docker-git state repository";
 var legacySecretIgnorePatterns = ["**/.orch/env/", "**/.orch/auth/"];
@@ -4809,6 +4844,101 @@ var runStateSyncOps = (root, originUrl, message, env, options) => Effect.gen(fun
 }).pipe(Effect.asVoid);
 var runStateSyncWithToken = (token, root, originUrl, message) => withGithubAskpassEnv(token, (env) => runStateSyncOps(root, originUrl, message, env, { originPushUrlOverride: originUrl }));
 //#endregion
+//#region ../lib/src/usecases/state-repo/local-ops.ts
+var resolveStateRoot$2 = (path, cwd) => path.resolve(defaultProjectsRoot(cwd));
+var managedRepositoryCachePaths$1 = [".cache/git-mirrors", ".cache/packages"];
+var ensureStateIgnoreAndUntrackCaches$1 = (fs, path, root) => Effect.gen(function* (_) {
+	yield* _(ensureStateGitignore(fs, path, root));
+	yield* _(git(root, [
+		"rm",
+		"-r",
+		"--cached",
+		"--ignore-unmatch",
+		...managedRepositoryCachePaths$1
+	], gitBaseEnv$1));
+}).pipe(Effect.asVoid);
+var stateStatus = Effect.gen(function* (_) {
+	const output = yield* _(gitCapture$1(resolveStateRoot$2(yield* _(Path.Path), process.cwd()), [
+		"status",
+		"-sb",
+		"--porcelain=v1"
+	], gitBaseEnv$1));
+	yield* _(Effect.log(output.trim().length > 0 ? output.trimEnd() : "(clean)"));
+}).pipe(Effect.asVoid);
+var stateCommit = (message) => Effect.gen(function* (_) {
+	const fs = yield* _(FileSystem.FileSystem);
+	const path = yield* _(Path.Path);
+	const root = resolveStateRoot$2(path, process.cwd());
+	yield* _(ensureStateIgnoreAndUntrackCaches$1(fs, path, root));
+	yield* _(git(root, ["add", "-A"], gitBaseEnv$1));
+	if ((yield* _(gitExitCode(root, [
+		"diff",
+		"--cached",
+		"--quiet"
+	], gitBaseEnv$1))) === successExitCode) {
+		yield* _(Effect.log("Nothing to commit."));
+		return;
+	}
+	yield* _(git(root, [
+		"commit",
+		"-m",
+		message
+	], gitBaseEnv$1));
+}).pipe(Effect.asVoid);
+//#endregion
+//#region ../lib/src/usecases/state-repo/pull-push.ts
+var resolveStateRoot$1 = (path, cwd) => path.resolve(defaultProjectsRoot(cwd));
+var statePull = Effect.gen(function* (_) {
+	const fs = yield* _(FileSystem.FileSystem);
+	const path = yield* _(Path.Path);
+	const root = resolveStateRoot$1(path, process.cwd());
+	if ((yield* _(gitExitCode(root, [
+		"remote",
+		"get-url",
+		"origin"
+	], gitBaseEnv$1))) !== successExitCode) {
+		yield* _(git(root, ["pull", "--rebase"], gitBaseEnv$1));
+		return;
+	}
+	const auth = yield* _(resolveStateGithubContext(fs, path, root));
+	yield* _(withGithubAuthHintOnFailure(auth.token && auth.token.length > 0 && isGithubHttpsRemote(auth.originUrl) ? withGithubAskpassEnv(auth.token, (env) => git(root, ["pull", "--rebase"], env)) : git(root, ["pull", "--rebase"], gitBaseEnv$1), auth.authHintNeeded));
+}).pipe(Effect.asVoid);
+var statePush = Effect.gen(function* (_) {
+	const fs = yield* _(FileSystem.FileSystem);
+	const path = yield* _(Path.Path);
+	const root = resolveStateRoot$1(path, process.cwd());
+	if ((yield* _(gitExitCode(root, [
+		"remote",
+		"get-url",
+		"origin"
+	], gitBaseEnv$1))) !== successExitCode) {
+		yield* _(git(root, [
+			"push",
+			"-u",
+			"origin",
+			"HEAD"
+		], gitBaseEnv$1));
+		return;
+	}
+	const auth = yield* _(resolveStateGithubContext(fs, path, root));
+	yield* _(withGithubAuthHintOnFailure(auth.token && auth.token.length > 0 && isGithubHttpsRemote(auth.originUrl) ? withGithubAskpassEnv(auth.token, (env) => pipe(gitCapture$1(root, [
+		"rev-parse",
+		"--abbrev-ref",
+		"HEAD"
+	], env), Effect.map((value) => value.trim()), Effect.map((branch) => branch === "HEAD" ? "main" : branch), Effect.flatMap((branch) => git(root, [
+		"push",
+		"--no-verify",
+		auth.originUrl,
+		`HEAD:refs/heads/${branch}`
+	], env)))) : git(root, [
+		"push",
+		"--no-verify",
+		"-u",
+		"origin",
+		"HEAD"
+	], gitBaseEnv$1), auth.authHintNeeded));
+}).pipe(Effect.asVoid);
+//#endregion
 //#region ../lib/src/usecases/state-repo.ts
 var resolveStateRoot = (path, cwd) => path.resolve(defaultProjectsRoot(cwd));
 var managedRepositoryCachePaths = [".cache/git-mirrors", ".cache/packages"];
@@ -4853,13 +4983,13 @@ var stateSync = (message) => Effect.gen(function* (_) {
 			exitCode: originUrlExit
 		})));
 	}
-	const originUrl = yield* _(gitCapture$1(root, [
+	const originUrl = yield* _(normalizeOriginUrlIfNeeded(root, yield* _(gitCapture$1(root, [
 		"remote",
 		"get-url",
 		"origin"
-	], gitBaseEnv$1).pipe(Effect.map((value) => value.trim())));
+	], gitBaseEnv$1).pipe(Effect.map((value) => value.trim())))));
 	const token = yield* _(resolveGithubToken(fs, path, root));
-	yield* _(token && token.length > 0 && isGithubHttpsRemote(originUrl) ? runStateSyncWithToken(token, root, originUrl, message) : runStateSyncOps(root, originUrl, message, gitBaseEnv$1));
+	yield* _((token && token.length > 0 && isGithubHttpsRemote(originUrl) ? runStateSyncWithToken(token, root, originUrl, message) : runStateSyncOps(root, originUrl, message, gitBaseEnv$1)).pipe(Effect.tapError((error) => shouldLogGithubAuthHintForStateSyncFailure(originUrl, token, error) ? Effect.logWarning(githubAuthLoginHint) : Effect.void)));
 }).pipe(Effect.asVoid);
 var autoSyncState = (message) => Effect.gen(function* (_) {
 	const root = resolveStateRoot(yield* _(Path.Path), process.cwd());
@@ -4961,94 +5091,6 @@ var stateInit = (input) => {
 	const token = input.token?.trim() ?? "";
 	return token.length > 0 && isGithubHttpsRemote(input.repoUrl) ? withGithubAskpassEnv(token, doInit) : doInit(gitBaseEnv$1);
 };
-var stateStatus = Effect.gen(function* (_) {
-	const output = yield* _(gitCapture$1(resolveStateRoot(yield* _(Path.Path), process.cwd()), [
-		"status",
-		"-sb",
-		"--porcelain=v1"
-	], gitBaseEnv$1));
-	yield* _(Effect.log(output.trim().length > 0 ? output.trimEnd() : "(clean)"));
-}).pipe(Effect.asVoid);
-var statePull = Effect.gen(function* (_) {
-	const fs = yield* _(FileSystem.FileSystem);
-	const path = yield* _(Path.Path);
-	const root = resolveStateRoot(path, process.cwd());
-	if ((yield* _(gitExitCode(root, [
-		"remote",
-		"get-url",
-		"origin"
-	], gitBaseEnv$1))) !== successExitCode) {
-		yield* _(git(root, ["pull", "--rebase"], gitBaseEnv$1));
-		return;
-	}
-	const originUrl = yield* _(gitCapture$1(root, [
-		"remote",
-		"get-url",
-		"origin"
-	], gitBaseEnv$1).pipe(Effect.map((value) => value.trim())));
-	const token = yield* _(resolveGithubToken(fs, path, root));
-	yield* _(token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => git(root, ["pull", "--rebase"], env)) : git(root, ["pull", "--rebase"], gitBaseEnv$1));
-}).pipe(Effect.asVoid);
-var statePush = Effect.gen(function* (_) {
-	const fs = yield* _(FileSystem.FileSystem);
-	const path = yield* _(Path.Path);
-	const root = resolveStateRoot(path, process.cwd());
-	if ((yield* _(gitExitCode(root, [
-		"remote",
-		"get-url",
-		"origin"
-	], gitBaseEnv$1))) !== successExitCode) {
-		yield* _(git(root, [
-			"push",
-			"-u",
-			"origin",
-			"HEAD"
-		], gitBaseEnv$1));
-		return;
-	}
-	const originUrl = yield* _(gitCapture$1(root, [
-		"remote",
-		"get-url",
-		"origin"
-	], gitBaseEnv$1).pipe(Effect.map((value) => value.trim())));
-	const token = yield* _(resolveGithubToken(fs, path, root));
-	yield* _(token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => pipe(gitCapture$1(root, [
-		"rev-parse",
-		"--abbrev-ref",
-		"HEAD"
-	], env), Effect.map((value) => value.trim()), Effect.map((branch) => branch === "HEAD" ? "main" : branch), Effect.flatMap((branch) => git(root, [
-		"push",
-		"--no-verify",
-		originUrl,
-		`HEAD:refs/heads/${branch}`
-	], env)))) : git(root, [
-		"push",
-		"--no-verify",
-		"-u",
-		"origin",
-		"HEAD"
-	], gitBaseEnv$1));
-}).pipe(Effect.asVoid);
-var stateCommit = (message) => Effect.gen(function* (_) {
-	const fs = yield* _(FileSystem.FileSystem);
-	const path = yield* _(Path.Path);
-	const root = resolveStateRoot(path, process.cwd());
-	yield* _(ensureStateIgnoreAndUntrackCaches(fs, path, root));
-	yield* _(git(root, ["add", "-A"], gitBaseEnv$1));
-	if ((yield* _(gitExitCode(root, [
-		"diff",
-		"--cached",
-		"--quiet"
-	], gitBaseEnv$1))) === successExitCode) {
-		yield* _(Effect.log("Nothing to commit."));
-		return;
-	}
-	yield* _(git(root, [
-		"commit",
-		"-m",
-		message
-	], gitBaseEnv$1));
-}).pipe(Effect.asVoid);
 //#endregion
 //#region ../lib/src/usecases/terminal-cursor.ts
 var terminalSaneEscape = "\x1B[0m\x1B[?25h\x1B[?1l\x1B>\x1B[?1000l\x1B[?1002l\x1B[?1003l\x1B[?1005l\x1B[?1006l\x1B[?1015l\x1B[?1007l\x1B[?1004l\x1B[?2004l\x1B[>4;0m\x1B[>4m\x1B[<u";
@@ -6010,6 +6052,7 @@ var runCreateProject = (path, command) => Effect.gen(function* (_) {
 	}))));
 	const hasAgent = finalConfig.agentMode !== void 0;
 	const waitForAgent = hasAgent && (finalConfig.agentAuto ?? false);
+	yield* _(autoSyncState(`chore(state): update ${formatStateSyncLabel(projectConfig.repoUrl)}`));
 	yield* _(runDockerUpIfNeeded(resolvedOutDir, projectConfig, {
 		runUp: command.runUp,
 		waitForClone: command.waitForClone,
@@ -6019,7 +6062,6 @@ var runCreateProject = (path, command) => Effect.gen(function* (_) {
 	}));
 	if (command.runUp) yield* _(logDockerAccessInfo(resolvedOutDir, projectConfig));
 	yield* _(maybeCleanupAfterAgent(waitForAgent, resolvedOutDir));
-	yield* _(autoSyncState(`chore(state): update ${formatStateSyncLabel(projectConfig.repoUrl)}`));
 	yield* _(maybeOpenSsh(command, hasAgent, waitForAgent, projectConfig));
 }).pipe(Effect.asVoid);
 var createProject = (command) => Path.Path.pipe(Effect.flatMap((path) => runCreateProject(path, command)));