From c7cb40596ca732ee8a9663c761216985d917724f Mon Sep 17 00:00:00 2001
From: Merge Sim <sim@local>
Date: Mon, 7 Sep 2026 20:11:15 -0700
Subject: [PATCH] fix(git): narrow tracked upstream and complete relay test
 results

---
 src/relay/git-handler-status-ops.test.ts | 10 +++++-----
 src/shared/git-effective-upstream.ts     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/relay/git-handler-status-ops.test.ts b/src/relay/git-handler-status-ops.test.ts
index b572a289be5..86817d8db0f 100644
--- a/src/relay/git-handler-status-ops.test.ts
+++ b/src/relay/git-handler-status-ops.test.ts
@@ -277,7 +277,7 @@ describe('getStatusOp', () => {
         return { stdout: 'feature\n', stderr: '' }
       }
       if (args[0] === 'for-each-ref') {
-        return { stdout: '\0\n' }
+        return { stdout: '\0\n', stderr: '' }
       }
       if (args[0] === 'config' || args[0] === 'rev-parse') {
         throw Object.assign(new Error('missing fixture value'), { code: 1 })
@@ -311,7 +311,7 @@ describe('getStatusOp', () => {
         return { stdout: 'feature\n', stderr: '' }
       }
       if (args[0] === 'for-each-ref') {
-        return { stdout: '\0\n' }
+        return { stdout: '\0\n', stderr: '' }
       }
       if (args[0] === 'rev-parse' && args.includes('refs/remotes/origin/feature')) {
         throw Object.assign(new Error('missing remote branch'), { code: 1 })
@@ -339,7 +339,7 @@ describe('getStatusOp', () => {
       }
       if (args[0] === 'for-each-ref') {
         await Promise.resolve()
-        return { stdout: '\0\n' }
+        return { stdout: '\0\n', stderr: '' }
       }
       if (args[0] === 'rev-parse' && args.includes('refs/remotes/origin/feature')) {
         await Promise.resolve()
@@ -375,7 +375,7 @@ describe('getStatusOp', () => {
         return { stdout: `${branch}\n`, stderr: '' }
       }
       if (args[0] === 'for-each-ref') {
-        return { stdout: '\0\n' }
+        return { stdout: '\0\n', stderr: '' }
       }
       if (args[0] === 'rev-parse' && args.some((arg) => arg.startsWith('refs/remotes/origin/'))) {
         throw Object.assign(new Error('missing remote branch'), { code: 1 })
@@ -409,7 +409,7 @@ describe('getStatusOp', () => {
         return { stdout: 'feature/fix\n', stderr: '' }
       }
       if (args[0] === 'for-each-ref') {
-        return { stdout: '\0\n' }
+        return { stdout: '\0\n', stderr: '' }
       }
       if (args[0] === 'config' && args.includes('branch.feature/fix.pushRemote')) {
         return { stdout: 'fork\n', stderr: '' }
diff --git a/src/shared/git-effective-upstream.ts b/src/shared/git-effective-upstream.ts
index 3b6f75ce955..c922ecd3140 100644
--- a/src/shared/git-effective-upstream.ts
+++ b/src/shared/git-effective-upstream.ts
@@ -77,7 +77,7 @@ async function getCurrentBranchName(runGit: GitCommandRunner): Promise<string |
 async function getConfiguredUpstream(
   runGit: GitCommandRunner,
   currentBranchName: string | null
-): Promise<EffectiveGitUpstream | null> {
+): Promise<Extract<EffectiveGitUpstream, { isConfiguredUpstream: true }> | null> {
   if (!currentBranchName) {
     return null
   }