fix: pin GH_HOST=github.com for extension upgrade in GHE environments (#34752)

Author: Copilot

.changeset/patch-fix-ghe-extension-upgrade-host.md

@@ -219,8 +219,10 @@ func checkForUpdates(noCheckUpdate bool, verbose bool) {
 func getLatestRelease(includePrereleases bool) (string, error) {
 	updateCheckLog.Print("Querying GitHub API for latest release...")
 
-	// Create GitHub REST client using go-gh
-	client, err := api.NewRESTClient(api.ClientOptions{})
+	// Always target github.com explicitly: gh-aw is only published to github.com,
+	// and users in mixed-host environments (e.g. a GHE active auth host) must
+	// still reach the canonical registry to get the correct release metadata.
+	client, err := api.NewRESTClient(api.ClientOptions{Host: "github.com"})
 	if err != nil {
 		return "", fmt.Errorf("failed to create GitHub client: %w", err)
 	}

pkg/cli/update_check.go

@@ -117,13 +117,13 @@ func upgradeExtensionIfOutdated(verbose bool, includePrereleases bool) (bool, st
 	// version.
 	if includePrereleases && !needsRenameWorkaround() {
 		updateExtensionCheckLog.Printf("Prerelease upgrade on macOS: skipping gh extension upgrade (uses /releases/latest, ignores prereleases), using pin-based install for %s", latestVersion)
-		removeCmd := exec.Command("gh", "extension", "remove", extensionRepo)
+		removeCmd := ghCmdForExtension("extension", "remove", extensionRepo)
 		removeCmd.Stdout = os.Stderr
 		removeCmd.Stderr = os.Stderr
 		if removeErr := removeCmd.Run(); removeErr != nil {
 			updateExtensionCheckLog.Printf("Could not remove extension before pin-based install (continuing anyway): %v", removeErr)
 		}
-		pinCmd := exec.Command("gh", "extension", "install", extensionRepo, "--pin", latestVersion)
+		pinCmd := ghCmdForExtension("extension", "install", extensionRepo, "--pin", latestVersion)
 		pinCmd.Stdout = os.Stderr
 		pinCmd.Stderr = os.Stderr
 		if pinErr := pinCmd.Run(); pinErr != nil {
@@ -144,7 +144,7 @@ func upgradeExtensionIfOutdated(verbose bool, includePrereleases bool) (bool, st
 	// rename+retry path succeeds and the user is not shown a confusing failure.
 	var firstAttemptBuf bytes.Buffer
 	firstAttemptOut := firstAttemptWriter(os.Stderr, &firstAttemptBuf)
-	firstCmd := exec.Command("gh", extensionUpgradeArgs()...)
+	firstCmd := ghCmdForExtension(extensionUpgradeArgs()...)
 	firstCmd.Stdout = firstAttemptOut
 	firstCmd.Stderr = firstAttemptOut
 	firstErr := firstCmd.Run()
@@ -248,7 +248,7 @@ func upgradeExtensionIfOutdated(verbose bool, includePrereleases bool) (bool, st
 	// been moved to the OS temp directory (above) so the remove step can always
 	// succeed.  In both cases we clear backupPath after a successful remove to
 	// avoid a misleading restore attempt on subsequent failures.
-	removeCmd := exec.Command("gh", "extension", "remove", extensionRepo)
+	removeCmd := ghCmdForExtension("extension", "remove", extensionRepo)
 	removeCmd.Stdout = os.Stderr
 	removeCmd.Stderr = os.Stderr
 	if removeErr := removeCmd.Run(); removeErr == nil {
@@ -258,7 +258,7 @@ func upgradeExtensionIfOutdated(verbose bool, includePrereleases bool) (bool, st
 		updateExtensionCheckLog.Printf("Could not remove extension before reinstall (will attempt install anyway): %v", removeErr)
 	}
 
-	retryCmd := exec.Command("gh", "extension", "install", extensionRepo, "--pin", latestVersion)
+	retryCmd := ghCmdForExtension("extension", "install", extensionRepo, "--pin", latestVersion)
 	retryCmd.Stdout = os.Stderr
 	retryCmd.Stderr = os.Stderr
 	if retryErr := retryCmd.Run(); retryErr != nil {
@@ -426,6 +426,26 @@ func extensionUpgradeArgs() []string {
 	return []string{"extension", "upgrade", extensionRepo, "--force"}
 }
 
+// ghCmdForExtension creates an exec.Cmd for a gh CLI invocation that must
+// target github.com.  gh-aw is only published to github.com; in mixed-host
+// environments where GH_HOST points at a GHE instance, the default gh
+// commands would hit the wrong host and report "already up to date" or fail.
+// Pinning GH_HOST=github.com in the child process environment prevents that.
+func ghCmdForExtension(args ...string) *exec.Cmd {
+	cmd := exec.Command("gh", args...)
+	// Inherit the full environment so that PATH, HOME, etc. remain intact,
+	// then override (or add) GH_HOST to ensure github.com is always used.
+	env := make([]string, 0, len(os.Environ())+1)
+	for _, e := range os.Environ() {
+		if !strings.HasPrefix(e, "GH_HOST=") {
+			env = append(env, e)
+		}
+	}
+	env = append(env, "GH_HOST=github.com")
+	cmd.Env = env
+	return cmd
+}
+
 func prereleaseChannelNotice(currentVersion, latestStable string, includePrereleases bool) []string {
 	if includePrereleases || latestStable == "" || !isPrereleaseVersion(currentVersion) {
 		return nil

pkg/cli/update_extension_check.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -341,3 +342,38 @@ func TestRenderReleaseVersion(t *testing.T) {
 	assert.Equal(t, "v0.74.8", renderReleaseVersion("v0.74.8"))
 	assert.Equal(t, "v0.75.3-beta.1 (pre-release)", renderReleaseVersion("v0.75.3-beta.1"))
 }
+
+// TestGhCmdForExtension verifies that ghCmdForExtension always pins
+// GH_HOST=github.com so that GHE-authenticated environments do not
+// redirect extension upgrade/install/remove commands to the wrong host.
+func TestGhCmdForExtension(t *testing.T) {
+	t.Run("sets GH_HOST to github.com", func(t *testing.T) {
+		cmd := ghCmdForExtension("extension", "list")
+		ghHost := ""
+		for _, e := range cmd.Env {
+			if v, ok := strings.CutPrefix(e, "GH_HOST="); ok {
+				ghHost = v
+			}
+		}
+		assert.Equal(t, "github.com", ghHost, "GH_HOST must be github.com")
+	})
+
+	t.Run("overrides existing GH_HOST set to a GHE instance", func(t *testing.T) {
+		t.Setenv("GH_HOST", "ghe.example.com")
+
+		cmd := ghCmdForExtension("extension", "upgrade", extensionRepo, "--force")
+		ghHostValues := []string{}
+		for _, e := range cmd.Env {
+			if v, ok := strings.CutPrefix(e, "GH_HOST="); ok {
+				ghHostValues = append(ghHostValues, v)
+			}
+		}
+		require.Len(t, ghHostValues, 1, "exactly one GH_HOST entry must be present")
+		assert.Equal(t, "github.com", ghHostValues[0], "GH_HOST must be overridden to github.com")
+	})
+
+	t.Run("uses gh as executable", func(t *testing.T) {
+		cmd := ghCmdForExtension("extension", "list")
+		assert.Equal(t, "gh", filepath.Base(cmd.Path), "executable must be gh")
+	})
+}

pkg/cli/update_extension_check_test.go

@@ -495,7 +495,7 @@ jobs:
           fi
           # shellcheck disable=SC1003
           sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/codex_harness.cjs codex exec${GH_AW_MODEL_DETECTION_CODEX:+ --model "$GH_AW_MODEL_DETECTION_CODEX"} -c web_search="disabled" --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+            -- /bin/bash -c 'export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/codex_harness.cjs codex exec${GH_AW_MODEL_DETECTION_CODEX:+ --model "$GH_AW_MODEL_DETECTION_CODEX"} -c web_search="disabled" -c fetch="disabled" --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
         env:
           CODEX_API_KEY: ${{ secrets.CODEX_API_KEY || secrets.OPENAI_API_KEY }}
           CODEX_HOME: /tmp/gh-aw/mcp-config