fix(state): push via https when token available

Author: skulidropek

packages/lib/src/usecases/state-repo.ts

@@ -253,7 +253,10 @@ export const statePush = Effect.gen(function*(_) {
   )
   const token = yield* _(resolveGithubToken(fs, path, root))
   const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl)
-    ? withGithubAskpassEnv(token, (env) => git(root, ["push", "-u", "origin", "HEAD"], env))
+    ? withGithubAskpassEnv(
+      token,
+      (env) => git(root, ["-c", `remote.origin.pushurl=${originUrl}`, "push", "-u", "origin", "HEAD"], env)
+    )
     : git(root, ["push", "-u", "origin", "HEAD"], gitBaseEnv)
   yield* _(effect)
 }).pipe(Effect.asVoid)

packages/lib/src/usecases/state-repo/sync-ops.ts

@@ -12,6 +12,26 @@ import { tryBuildGithubCompareUrl, withGithubAskpassEnv } from "./github-auth.js
 
 type StateRepoEnv = FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
 
+const withOriginPushUrlOverride = (originUrl: string | null, args: ReadonlyArray<string>): ReadonlyArray<string> => {
+  const trimmed = originUrl?.trim() ?? ""
+  if (trimmed.length === 0) {
+    return args
+  }
+  // Use a per-command config override so token-based pushes use HTTPS even when the repo has an SSH pushurl.
+  // This keeps the repo config unchanged while avoiding non-interactive SSH host key / passphrase prompts.
+  return ["-c", `remote.origin.pushurl=${trimmed}`, ...args]
+}
+
+const resolveSyncMessage = (value: string | null): string => {
+  const trimmed = value?.trim() ?? ""
+  return trimmed.length > 0 ? trimmed : defaultSyncMessage
+}
+
+const logOpenPr = (originUrl: string, baseBranch: string, prBranch: string, compareUrl: string | null) =>
+  compareUrl
+    ? Effect.log(`Open PR: ${compareUrl}`)
+    : Effect.log(`Open PR from '${prBranch}' into '${baseBranch}' (origin: ${originUrl}).`)
+
 const commitAllIfNeeded = (
   root: string,
   message: string,
@@ -68,6 +88,7 @@ const rebaseOntoOriginIfPossible = (
 const pushToNewBranch = (
   root: string,
   baseBranch: string,
+  originPushUrlOverride: string | null,
   env: GitAuthEnv
 ): Effect.Effect<string, CommandFailedError | PlatformError, CommandExecutor.CommandExecutor> =>
   Effect.gen(function*(_) {
@@ -77,7 +98,9 @@ const pushToNewBranch = (
     const timestamp = yield* _(Effect.sync(() => new Date().toISOString().replaceAll(":", "-").replaceAll(".", "-")))
     const branch = sanitizeBranchComponent(`state-sync/${baseBranch}/${timestamp}-${headShort}`)
 
-    yield* _(git(root, ["push", "origin", `HEAD:refs/heads/${branch}`], env))
+    yield* _(
+      git(root, withOriginPushUrlOverride(originPushUrlOverride, ["push", "origin", `HEAD:refs/heads/${branch}`]), env)
+    )
     return branch
   })
 
@@ -93,41 +116,42 @@ export const runStateSyncOps = (
   root: string,
   originUrl: string,
   message: string | null,
-  env: GitAuthEnv
+  env: GitAuthEnv,
+  options?: { readonly originPushUrlOverride?: string | null }
 ): Effect.Effect<void, CommandFailedError | PlatformError, StateRepoEnv> =>
   Effect.gen(function*(_) {
+    const originPushUrlOverride = options?.originPushUrlOverride ?? null
     yield* _(normalizeLegacyStateProjects(root))
-    const commitMessage = message && message.trim().length > 0 ? message.trim() : defaultSyncMessage
-    yield* _(commitAllIfNeeded(root, commitMessage, env))
+    yield* _(commitAllIfNeeded(root, resolveSyncMessage(message), env))
 
     const branch = yield* _(getCurrentBranch(root, env))
     const baseBranch = resolveBaseBranch(branch)
 
     const rebaseResult = yield* _(rebaseOntoOriginIfPossible(root, baseBranch, env))
     if (rebaseResult === "conflict") {
-      const prBranch = yield* _(pushToNewBranch(root, baseBranch, env))
+      const prBranch = yield* _(pushToNewBranch(root, baseBranch, originPushUrlOverride, env))
       const compareUrl = tryBuildGithubCompareUrl(originUrl, baseBranch, prBranch)
 
       yield* _(Effect.logWarning(`State sync needs manual merge: pushed changes to branch '${prBranch}'.`))
-      yield* (compareUrl
-        ? _(Effect.log(`Open PR: ${compareUrl}`))
-        : _(Effect.log(`Open PR from '${prBranch}' into '${baseBranch}' (origin: ${originUrl}).`)))
+      yield* _(logOpenPr(originUrl, baseBranch, prBranch, compareUrl))
       return
     }
 
-    const pushExit = yield* _(gitExitCode(root, ["push", "-u", "origin", "HEAD"], env))
+    const pushExit = yield* _(
+      gitExitCode(
+        root,
+        withOriginPushUrlOverride(originPushUrlOverride, ["push", "-u", "origin", "HEAD"]),
+        env
+      )
+    )
     if (pushExit === successExitCode) {
       return
     }
 
-    const prBranch = yield* _(pushToNewBranch(root, baseBranch, env))
+    const prBranch = yield* _(pushToNewBranch(root, baseBranch, originPushUrlOverride, env))
     const compareUrl = tryBuildGithubCompareUrl(originUrl, baseBranch, prBranch)
     yield* _(Effect.logWarning(`State push failed (exit ${pushExit}); pushed changes to branch '${prBranch}'.`))
-    if (compareUrl) {
-      yield* _(Effect.log(`Open PR: ${compareUrl}`))
-      return
-    }
-    yield* _(Effect.log(`Open PR from '${prBranch}' into '${baseBranch}' (origin: ${originUrl}).`))
+    yield* _(logOpenPr(originUrl, baseBranch, prBranch, compareUrl))
   }).pipe(Effect.asVoid)
 
 export const runStateSyncWithToken = (
@@ -136,4 +160,7 @@ export const runStateSyncWithToken = (
   originUrl: string,
   message: string | null
 ): Effect.Effect<void, CommandFailedError | PlatformError, StateRepoEnv> =>
-  withGithubAskpassEnv(token, (env) => runStateSyncOps(root, originUrl, message, env))
+  withGithubAskpassEnv(
+    token,
+    (env) => runStateSyncOps(root, originUrl, message, env, { originPushUrlOverride: originUrl })
+  )