From baf568564efc1fcff9bf8057fc09e053005df508 Mon Sep 17 00:00:00 2001
From: cmanu <cmanughian@anaconda.com>
Date: Fri, 7 Aug 2026 13:19:31 -0700
Subject: [PATCH] fix(pr-view): don't include skipped prs in pr summary and
 also remove unused files causing checks to fail

---
 .../src/agent-manager/PRStatusPoller.ts       |   2 +-
 .../src/agent-manager/am-pr-utils.ts          |   4 +-
 .../agent-manager/default-base-branch.tsx     | 130 ------------------
 .../agent-manager/pr/PRFileChanges.tsx        |  26 ----
 4 files changed, 4 insertions(+), 158 deletions(-)
 delete mode 100644 packages/kilo-vscode/webview-ui/agent-manager/default-base-branch.tsx
 delete mode 100644 packages/kilo-vscode/webview-ui/agent-manager/pr/PRFileChanges.tsx

diff --git a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
index afe6a3e3854..b66c42ba434 100644
--- a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
+++ b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts
@@ -405,7 +405,7 @@ export class PRStatusPoller {
         duration: formatCheckDuration(c.startedAt, c.completedAt),
       }))
 
-      const total = checks.length
+      const total = checks.filter((c) => c.status !== "skipped").length
       const passed = checks.filter((c) => c.status === "success").length
       const failed = checks.filter((c) => c.status === "failure").length
       const pending = checks.filter((c) => c.status === "pending").length
diff --git a/packages/kilo-vscode/src/agent-manager/am-pr-utils.ts b/packages/kilo-vscode/src/agent-manager/am-pr-utils.ts
index 9cf563d0aef..5877d4ab021 100644
--- a/packages/kilo-vscode/src/agent-manager/am-pr-utils.ts
+++ b/packages/kilo-vscode/src/agent-manager/am-pr-utils.ts
@@ -30,9 +30,11 @@ export function parsePRResult(json: string): PRResult | null {
 export function checkStatus(state: string): CheckStatus {
   switch (state.toUpperCase()) {
     case "SUCCESS":
+    case "NEUTRAL":
       return "success"
     case "FAILURE":
     case "ERROR":
+    case "ACTION_REQUIRED":
       return "failure"
     case "PENDING":
     case "QUEUED":
@@ -48,7 +50,7 @@ export function checkStatus(state: string): CheckStatus {
     case "STARTUP_FAILURE":
       return "cancelled"
     default:
-      return "pending"
+      return "cancelled"
   }
 }
 
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/default-base-branch.tsx b/packages/kilo-vscode/webview-ui/agent-manager/default-base-branch.tsx
deleted file mode 100644
index 421c17c8bf3..00000000000
--- a/packages/kilo-vscode/webview-ui/agent-manager/default-base-branch.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/** @jsxImportSource solid-js */
-
-import { createSignal, createMemo, onCleanup } from "solid-js"
-import type { AgentManagerBranchesMessage, BranchInfo } from "../src/types/messages"
-import { Dialog } from "@kilocode/kilo-ui/dialog"
-import { useDialog } from "@kilocode/kilo-ui/context/dialog"
-import { BranchSelect } from "../src/components/shared/BranchSelect"
-import type { useVSCode } from "../src/context/vscode"
-import type { useLanguage } from "../src/context/language"
-import type { Accessor, Setter } from "solid-js"
-
-interface Deps {
-  vscode: ReturnType<typeof useVSCode>
-  dialog: ReturnType<typeof useDialog>
-  t: ReturnType<typeof useLanguage>["t"]
-  defaultBaseBranch: Accessor<string | undefined>
-  setDefaultBaseBranch: (v: Parameters<Setter<string | undefined>>[0]) => void
-  setRepoDetectedBranch: Setter<string | undefined>
-  repoDetectedBranch: Accessor<string | undefined>
-  hasConfiguredBranch: Accessor<boolean>
-}
-
-export function createChangeDefaultBaseBranch(deps: Deps) {
-  const {
-    vscode,
-    dialog,
-    t,
-    defaultBaseBranch,
-    setDefaultBaseBranch,
-    setRepoDetectedBranch,
-    repoDetectedBranch,
-    hasConfiguredBranch,
-  } = deps
-
-  return () => {
-    const [search, setSearch] = createSignal("")
-    const [branches, setBranches] = createSignal<BranchInfo[]>([])
-    const [loading, setLoading] = createSignal(true)
-    const [highlighted, setHighlighted] = createSignal(-1)
-
-    const unsub = vscode.onMessage((msg) => {
-      if (msg.type === "agentManager.branches") {
-        const ev = msg as AgentManagerBranchesMessage
-        setBranches(ev.branches)
-        if (ev.defaultBranch) setRepoDetectedBranch(ev.defaultBranch)
-        setLoading(false)
-      }
-    })
-
-    vscode.postMessage({ type: "agentManager.requestBranches" })
-
-    const filtered = createMemo(() => {
-      const s = search().toLowerCase()
-      if (!s) return branches()
-      return branches().filter((b) => b.name.toLowerCase().includes(s))
-    })
-
-    const selectBranch = (name: string | undefined) => {
-      vscode.postMessage({ type: "agentManager.setDefaultBaseBranch", branch: name })
-      setDefaultBaseBranch(name)
-      dialog.close()
-    }
-
-    const handleKeyDown = (e: KeyboardEvent) => {
-      const items = filtered()
-      // offset by 1 for auto-detect option (-1 = auto-detect)
-      const total = items.length + 1
-      if (e.key === "ArrowDown") {
-        e.preventDefault()
-        e.stopPropagation()
-        setHighlighted((prev) => Math.min(prev + 1, total - 2))
-      } else if (e.key === "ArrowUp") {
-        e.preventDefault()
-        e.stopPropagation()
-        setHighlighted((prev) => Math.max(prev - 1, -1))
-      } else if (e.key === "Enter") {
-        e.preventDefault()
-        e.stopPropagation()
-        const idx = highlighted()
-        if (idx === -1) {
-          selectBranch(undefined)
-        } else {
-          const branch = items[idx]
-          if (branch) selectBranch(branch.name)
-        }
-      } else if (e.key === "Escape") {
-        e.preventDefault()
-        e.stopPropagation()
-        dialog.close()
-      }
-    }
-
-    dialog.show(() => {
-      onCleanup(unsub)
-      return (
-        <Dialog title={t("agentManager.worktree.defaultBaseBranch")} fit>
-          <div class="am-default-base-branch">
-            <BranchSelect
-              branches={filtered()}
-              loading={loading()}
-              search={search()}
-              onSearch={(v) => {
-                setSearch(v)
-                setHighlighted(-1)
-              }}
-              onSelect={(b) => selectBranch(b.name)}
-              onSearchKeyDown={handleKeyDown}
-              selected={defaultBaseBranch()}
-              highlighted={highlighted()}
-              onHighlight={setHighlighted}
-              searchPlaceholder={t("agentManager.dialog.searchBranches")}
-              emptyLabel={t("agentManager.import.noMatchingBranches")}
-              loadingLabel={t("agentManager.import.loadingBranches")}
-              defaultLabel={t("agentManager.dialog.branchBadge.default")}
-              remoteLabel={t("agentManager.dialog.branchBadge.remote")}
-              defaultName={defaultBaseBranch()}
-              autoOption={{
-                label: t("agentManager.worktree.defaultBaseBranchAuto"),
-                hint: repoDetectedBranch(),
-                active: !hasConfiguredBranch(),
-                highlighted: highlighted() === -1,
-                onSelect: () => selectBranch(undefined),
-              }}
-            />
-          </div>
-        </Dialog>
-      )
-    })
-  }
-}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/pr/PRFileChanges.tsx b/packages/kilo-vscode/webview-ui/agent-manager/pr/PRFileChanges.tsx
deleted file mode 100644
index 971948d8e28..00000000000
--- a/packages/kilo-vscode/webview-ui/agent-manager/pr/PRFileChanges.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @jsxImportSource solid-js */
-import { Show } from "solid-js"
-
-export function PRFileChanges(props: { files: number; additions: number; deletions: number }) {
-  return (
-    <>
-      <div class="am-pr-panel-divider" />
-      <div class="am-pr-panel-section">
-        <div class="am-pr-panel-section-heading am-pr-row">
-          File Changes
-          <span class="am-pr-panel-section-count am-pr-panel-diff am-pr-row">
-            <Show when={props.files > 0}>
-              <span class="am-stat-files">{props.files}f</span>
-            </Show>
-            <Show when={props.additions > 0}>
-              <span class="am-stat-additions">+{props.additions}</span>
-            </Show>
-            <Show when={props.deletions > 0}>
-              <span class="am-stat-deletions">−{props.deletions}</span>
-            </Show>
-          </span>
-        </div>
-      </div>
-    </>
-  )
-}