From a5baf2988c227bb823fc32a698d2d1fbd25325af Mon Sep 17 00:00:00 2001
From: Alex Alecu <a.marian.alexandru@gmail.com>
Date: Fri, 24 Apr 2026 17:34:37 +0300
Subject: [PATCH] fix(cli): detect fork parent repo

---
 .../src/kilocode/plugins/sidebar-pr.tsx        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/kilocode/plugins/sidebar-pr.tsx b/packages/opencode/src/kilocode/plugins/sidebar-pr.tsx
index 6319f5e148..1da6b70ab9 100644
--- a/packages/opencode/src/kilocode/plugins/sidebar-pr.tsx
+++ b/packages/opencode/src/kilocode/plugins/sidebar-pr.tsx
@@ -8,7 +8,10 @@ const GH_PROBE_TTL = 300_000
 
 type Pr = { number: number; title: string }
 type Item = Partial<Pr> & { headRefOid?: string }
-type Repo = { nameWithOwner?: unknown; parent?: { nameWithOwner?: unknown } | null }
+type Repo = {
+  nameWithOwner?: unknown
+  parent?: { nameWithOwner?: unknown; name?: unknown; owner?: { login?: unknown } } | null
+}
 
 let ghPath: string | null | undefined
 let ghProbeTime = 0
@@ -115,10 +118,17 @@ async function lookupParent(cwd: string, signal: AbortSignal): Promise<string |
   try {
     const data = JSON.parse(text) as Repo
     if (typeof data.nameWithOwner !== "string") return null
-    if (!data.parent || typeof data.parent.nameWithOwner !== "string") return null
-    if (data.parent.nameWithOwner === data.nameWithOwner) return null
+    if (!data.parent) return null
 
-    return data.parent.nameWithOwner
+    const parent =
+      typeof data.parent.nameWithOwner === "string"
+        ? data.parent.nameWithOwner
+        : typeof data.parent.owner?.login === "string" && typeof data.parent.name === "string"
+          ? `${data.parent.owner.login}/${data.parent.name}`
+          : null
+    if (!parent || parent === data.nameWithOwner) return null
+
+    return parent
   } catch {
     return null
   }