@sideboard-ai/core 0.1.298 → 0.1.299

package/dist/index.cjs

@@ -6362,12 +6362,7 @@ var init_agent_block_view = __esm({
   }
 });
 
-// src/board/home-board.ts
-function isHomeBoardThread(thread) {
-  if (thread.sourceType === "orchestration") return false;
-  if (thread.repoPath === GLOBAL_WORKSPACE_ID) return false;
-  return true;
-}
+// src/board/pr-state.ts
 function isOpenPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   const state = (prState ?? "OPEN").trim().toUpperCase();
@@ -6377,57 +6372,17 @@ function isMergedPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   return (prState ?? "").trim().toUpperCase() === "MERGED";
 }
-function groupCreatedAt(group) {
-  let min = group[0]?.createdAt ?? "";
-  for (const t of group) {
-    if (t.createdAt && t.createdAt < min) min = t.createdAt;
-  }
-  return min;
-}
-function groupUpdatedAt(group) {
-  let max = group[0]?.updatedAt ?? "";
-  for (const t of group) {
-    if (t.updatedAt && t.updatedAt > max) max = t.updatedAt;
-  }
-  return max;
-}
-function sortThreadsInWorktree(list) {
-  return [...list].sort((a, b) => {
-    const created = a.createdAt.localeCompare(b.createdAt);
-    if (created !== 0) return created;
-    return a.id.localeCompare(b.id);
-  });
-}
-function compareWorktreeGroups(a, b, mode, labelOf) {
-  if (mode === "name") {
-    const named = (labelOf?.(a) ?? a[0]?.id ?? "").localeCompare(
-      labelOf?.(b) ?? b[0]?.id ?? "",
-      void 0,
-      { sensitivity: "base" }
-    );
-    if (named !== 0) return named;
-  } else if (mode === "activity") {
-    const activity = groupUpdatedAt(b).localeCompare(groupUpdatedAt(a));
-    if (activity !== 0) return activity;
-  } else {
-    const created = groupCreatedAt(b).localeCompare(groupCreatedAt(a));
-    if (created !== 0) return created;
-  }
-  return (a[0]?.id ?? "").localeCompare(b[0]?.id ?? "");
-}
-function defaultWorktreeGroupLabel(group) {
-  return worktreeDisplayLabelForGroup(group);
+function isApprovedOpenPr(thread) {
+  if (!isOpenPrState(thread.prUrl, thread.prState) || thread.prIsDraft) return false;
+  return (thread.prReviewDecision ?? "").trim().toUpperCase() === "APPROVED";
 }
-function groupHomeBoardWorktrees(threads, sort = DEFAULT_WORKTREE_SORT, labelOf = defaultWorktreeGroupLabel) {
-  const map = /* @__PURE__ */ new Map();
-  for (const t of threads) {
-    const key = normalizeWorktreePath(t.worktreePath);
-    const list = map.get(key) ?? [];
-    list.push(t);
-    map.set(key, list);
+var init_pr_state = __esm({
+  "src/board/pr-state.ts"() {
+    "use strict";
   }
-  return [...map.values()].map((list) => sortThreadsInWorktree(list)).sort((a, b) => compareWorktreeGroups(a, b, sort, labelOf));
-}
+});
+
+// src/board/worktree-ownership.ts
 function normalizeViewerLogin(login) {
   return (login ?? "").trim().toLowerCase();
 }
@@ -6457,16 +6412,165 @@ function worktreeMatchesOwnership(group, filter, viewerLogin = "") {
   if (filter === "all") return true;
   return classifyWorktreeOwnership(group, viewerLogin) === filter;
 }
-function classifyWorktreeColumn(group) {
-  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) return "done";
-  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && !t.prIsDraft)) {
-    return "review";
+var DEFAULT_BOARD_OWNERSHIP;
+var init_worktree_ownership = __esm({
+  "src/board/worktree-ownership.ts"() {
+    "use strict";
+    DEFAULT_BOARD_OWNERSHIP = "all";
   }
-  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && t.prIsDraft)) {
-    return "draft";
+});
+
+// src/git/pr-gates.ts
+function prIsInMergeQueue(gate) {
+  if (gate.isInMergeQueue) return true;
+  return (gate.mergeStateStatus ?? "").toUpperCase() === "QUEUED";
+}
+function applyCleanLocalMergeTree(gate) {
+  const mergeable = (gate.mergeable ?? "").toUpperCase();
+  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
+  const githubConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  if (githubConflicting) {
+    return {
+      ...gate,
+      mergeable: "MERGEABLE",
+      mergeStateStatus: mergeState === "BEHIND" ? "BEHIND" : "CLEAN"
+    };
   }
-  return "new";
+  return {
+    ...gate,
+    mergeable: mergeable === "UNKNOWN" || !mergeable ? "MERGEABLE" : gate.mergeable,
+    mergeStateStatus: mergeState === "BEHIND" ? "BEHIND" : mergeState === "UNKNOWN" || !mergeState ? "CLEAN" : gate.mergeStateStatus
+  };
+}
+function classifyPrMergeIssue(gate) {
+  if (!gate) return null;
+  if (prIsInMergeQueue(gate)) return null;
+  const mergeable = (gate.mergeable ?? "").toUpperCase();
+  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
+  if (mergeable === "CONFLICTING" || mergeState === "DIRTY") return "conflicts";
+  if (mergeState === "BEHIND") return "behind";
+  return null;
 }
+function mergeStateSuggestsCheckFailure(gate) {
+  if (!gate) return false;
+  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
+  if (mergeState === "UNSTABLE") return true;
+  if (mergeState === "BLOCKED") {
+    return (gate.reviewDecision ?? "").toUpperCase() === "APPROVED";
+  }
+  return false;
+}
+function ciChecksFailed(checks) {
+  if (!checks?.length) return false;
+  return checks.some(
+    (check) => (!check.kind || check.kind === "ci") && check.bucket === "fail"
+  );
+}
+function buildMergeGateChecks(gate, opts = {}) {
+  const rows = [];
+  const base = gate.baseRefName?.trim() || "the base branch";
+  const link = gate.url?.trim() || null;
+  const mergeable = (gate.mergeable ?? "").toUpperCase();
+  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
+  const review = (gate.reviewDecision ?? "").toUpperCase();
+  const suppressBlocked = opts.suppressGenericBlocked !== false;
+  const conflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const inQueue = prIsInMergeQueue(gate);
+  if (conflicting && !inQueue) {
+    rows.push({
+      name: "Merge conflicts",
+      state: mergeable === "CONFLICTING" ? "CONFLICTING" : mergeState || "DIRTY",
+      bucket: "fail",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: `This branch has conflicts that must be resolved before it can merge into ${base}.`,
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
+  } else if (inQueue) {
+    rows.push({
+      name: "Merge queue",
+      state: "QUEUED",
+      bucket: "pending",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: `This pull request is in the GitHub merge queue for ${base}.`,
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
+  } else if (mergeState === "BEHIND") {
+    rows.push({
+      name: "Branch behind",
+      state: "BEHIND",
+      bucket: "info",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: `Head is behind ${base}. Update this branch (merge or rebase) before merging.`,
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
+  } else if (mergeState === "BLOCKED" && !suppressBlocked) {
+    rows.push({
+      name: "Merge blocked",
+      state: "BLOCKED",
+      bucket: "fail",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: "GitHub reports this PR as blocked (branch protection \u2014 required reviews and/or status checks).",
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
+  } else if (mergeable === "UNKNOWN" || mergeState === "UNKNOWN") {
+    rows.push({
+      name: "Mergeability",
+      state: "UNKNOWN",
+      bucket: "pending",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: "GitHub is still computing whether this branch can merge.",
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
+  }
+  if (review === "CHANGES_REQUESTED") {
+    rows.push({
+      name: "Code review",
+      state: "CHANGES_REQUESTED",
+      bucket: "fail",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: "A reviewer requested changes. Address their feedback before merging.",
+      workflow: "review",
+      kind: "review"
+    });
+  } else if (review === "REVIEW_REQUIRED") {
+    rows.push({
+      name: "Code review",
+      state: "REVIEW_REQUIRED",
+      bucket: "pending",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: "A required approving review is still outstanding.",
+      workflow: "review",
+      kind: "review"
+    });
+  }
+  return rows;
+}
+var init_pr_gates = __esm({
+  "src/git/pr-gates.ts"() {
+    "use strict";
+  }
+});
+
+// src/board/worktree-list-badges.ts
 function labelsInclude(labels, name) {
   const want = name.trim().toLowerCase();
   if (!want) return false;
@@ -6505,34 +6609,167 @@ function groupPrLabels(group) {
   }
   return out;
 }
+function isClosedPrState(prUrl, prState) {
+  if (!prUrl?.trim()) return false;
+  return (prState ?? "").trim().toUpperCase() === "CLOSED";
+}
+function listBadge(id, title, conflict = false) {
+  return {
+    id,
+    label: id,
+    title: conflict ? `${title} \xB7 merge conflicts` : title,
+    mod: `is-${id}`,
+    ...conflict ? { conflict: true } : {}
+  };
+}
+function hasMergeConflict(thread) {
+  if (!isOpenPrState(thread.prUrl, thread.prState)) return false;
+  return classifyPrMergeIssue({
+    mergeable: thread.prMergeable ?? null,
+    mergeStateStatus: thread.prMergeStateStatus ?? null,
+    isInMergeQueue: thread.prIsInMergeQueue
+  }) === "conflicts";
+}
+function groupPrError(group) {
+  const open = group.filter(
+    (thread) => isOpenPrState(thread.prUrl, thread.prState) && !thread.prIsInMergeQueue
+  );
+  if (open.some(
+    (thread) => thread.prChecksFailed || mergeStateSuggestsCheckFailure({
+      mergeStateStatus: thread.prMergeStateStatus ?? null,
+      reviewDecision: thread.prReviewDecision ?? null
+    })
+  )) {
+    return { label: "failing", title: "Checks failing" };
+  }
+  if (open.some(
+    (thread) => !thread.prIsDraft && (thread.prReviewDecision ?? "").trim().toUpperCase() === "CHANGES_REQUESTED"
+  )) {
+    return { label: "changes", title: "Changes requested" };
+  }
+  return void 0;
+}
+function withPrError(badges, error, conflict) {
+  if (!error) return badges;
+  const [first] = badges;
+  if (!first) {
+    return [
+      {
+        id: "error",
+        label: error.label,
+        title: conflict ? `${error.title} \xB7 merge conflicts` : error.title,
+        mod: "is-error",
+        ...conflict ? { conflict: true } : {}
+      }
+    ];
+  }
+  return [{ ...first, error }];
+}
 function classifyWorktreeListBadges(group, viewerLogin = "", reviewLabel = "") {
   if (group.length === 0 || group.some((t) => t.cowboy)) return [];
+  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) {
+    return [listBadge("merged", "Merged")];
+  }
+  const conflict = group.some(hasMergeConflict);
+  const error = groupPrError(group);
+  const finish2 = (badges) => withPrError(badges, error, conflict);
+  if (group.some((t) => isApprovedOpenPr(t))) {
+    return finish2([listBadge("approved", "Approved, not merged", conflict)]);
+  }
   const open = group.filter((t) => isOpenPrState(t.prUrl, t.prState));
-  if (open.length === 0) return [];
+  if (open.length === 0) {
+    if (group.some((t) => isClosedPrState(t.prUrl, t.prState))) return [];
+    return finish2([listBadge("new", "No pull request")]);
+  }
   const ownership = classifyWorktreeOwnership(group, viewerLogin);
   if (ownership === "reviewing") {
-    return [
-      {
-        id: "review",
-        label: "review",
-        title: "Someone else's PR",
-        mod: "is-review"
-      }
-    ];
+    return finish2([listBadge("review", "Someone else's PR", conflict)]);
+  }
+  if (!normalizeViewerLogin(viewerLogin)) return finish2([]);
+  if (!open.some((t) => !t.prIsDraft)) {
+    return finish2([listBadge("draft", "Draft pull request", conflict)]);
   }
-  if (!normalizeViewerLogin(viewerLogin)) return [];
-  const draft = open.some((t) => t.prIsDraft);
   const readyLabel = reviewLabel.trim();
-  const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : !draft;
-  if (!inReview) return [];
-  return [
-    {
-      id: "pending",
-      label: "pending",
-      title: "Waiting for review",
-      mod: "is-pending"
-    }
-  ];
+  const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : true;
+  if (!inReview) return finish2([]);
+  return finish2([listBadge("pending", "Waiting for review", conflict)]);
+}
+var init_worktree_list_badges = __esm({
+  "src/board/worktree-list-badges.ts"() {
+    "use strict";
+    init_pr_gates();
+    init_pr_state();
+    init_worktree_ownership();
+  }
+});
+
+// src/board/home-board.ts
+function isHomeBoardThread(thread) {
+  if (thread.sourceType === "orchestration") return false;
+  if (thread.repoPath === GLOBAL_WORKSPACE_ID) return false;
+  return true;
+}
+function groupCreatedAt(group) {
+  let min = group[0]?.createdAt ?? "";
+  for (const t of group) {
+    if (t.createdAt && t.createdAt < min) min = t.createdAt;
+  }
+  return min;
+}
+function groupUpdatedAt(group) {
+  let max = group[0]?.updatedAt ?? "";
+  for (const t of group) {
+    if (t.updatedAt && t.updatedAt > max) max = t.updatedAt;
+  }
+  return max;
+}
+function sortThreadsInWorktree(list) {
+  return [...list].sort((a, b) => {
+    const created = a.createdAt.localeCompare(b.createdAt);
+    if (created !== 0) return created;
+    return a.id.localeCompare(b.id);
+  });
+}
+function compareWorktreeGroups(a, b, mode, labelOf) {
+  if (mode === "name") {
+    const named = (labelOf?.(a) ?? a[0]?.id ?? "").localeCompare(
+      labelOf?.(b) ?? b[0]?.id ?? "",
+      void 0,
+      { sensitivity: "base" }
+    );
+    if (named !== 0) return named;
+  } else if (mode === "activity") {
+    const activity = groupUpdatedAt(b).localeCompare(groupUpdatedAt(a));
+    if (activity !== 0) return activity;
+  } else {
+    const created = groupCreatedAt(b).localeCompare(groupCreatedAt(a));
+    if (created !== 0) return created;
+  }
+  return (a[0]?.id ?? "").localeCompare(b[0]?.id ?? "");
+}
+function defaultWorktreeGroupLabel(group) {
+  return worktreeDisplayLabelForGroup(group);
+}
+function groupHomeBoardWorktrees(threads, sort = DEFAULT_WORKTREE_SORT, labelOf = defaultWorktreeGroupLabel) {
+  const map = /* @__PURE__ */ new Map();
+  for (const t of threads) {
+    const key = normalizeWorktreePath(t.worktreePath);
+    const list = map.get(key) ?? [];
+    list.push(t);
+    map.set(key, list);
+  }
+  return [...map.values()].map((list) => sortThreadsInWorktree(list)).sort((a, b) => compareWorktreeGroups(a, b, sort, labelOf));
+}
+function classifyWorktreeColumn(group) {
+  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) return "done";
+  if (group.some((t) => isApprovedOpenPr(t))) return "approved";
+  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && !t.prIsDraft)) {
+    return "review";
+  }
+  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && t.prIsDraft)) {
+    return "draft";
+  }
+  return "new";
 }
 function normalizeIssueKey(value) {
   return value.trim().toLowerCase().replace(/^#/, "");
@@ -6840,6 +7077,7 @@ function emptyColumns() {
     new: [],
     draft: [],
     review: [],
+    approved: [],
     done: []
   };
 }
@@ -6851,6 +7089,7 @@ function emptyHidden() {
     new: 0,
     draft: 0,
     review: 0,
+    approved: 0,
     done: 0
   };
 }
@@ -6919,6 +7158,7 @@ function assembleHomeBoard(input) {
     new: 0,
     draft: 0,
     review: 0,
+    approved: 0,
     done: 0,
     tickets: 0,
     prs: 0,
@@ -6931,6 +7171,7 @@ function assembleHomeBoard(input) {
     new: [],
     draft: [],
     review: [],
+    approved: [],
     done: []
   };
   for (const group of groupHomeBoardWorktrees(live)) {
@@ -6965,27 +7206,30 @@ function assembleHomeBoard(input) {
   }
   return { columns, hidden, totals };
 }
-var GLOBAL_WORKSPACE_ID, BOARD_COLUMN_DEFS, HOME_BOARD_CACHE_TTL_MS, DEFAULT_WORKTREE_SORT, DEFAULT_BOARD_OWNERSHIP, DEFAULTISH_BRANCH, BOARD_PAGE_SIZE, HOME_BOARD_AGENT_HINT;
+var GLOBAL_WORKSPACE_ID, BOARD_COLUMN_DEFS, HOME_BOARD_CACHE_TTL_MS, DEFAULT_WORKTREE_SORT, DEFAULTISH_BRANCH, BOARD_PAGE_SIZE, HOME_BOARD_AGENT_HINT;
 var init_home_board = __esm({
   "src/board/home-board.ts"() {
     "use strict";
     init_message_parts();
     init_worktree_labels();
     init_agent_block_view();
+    init_pr_state();
+    init_worktree_ownership();
+    init_worktree_list_badges();
     init_agent_block_view();
     GLOBAL_WORKSPACE_ID = "__global__";
     BOARD_COLUMN_DEFS = [
       { id: "new", title: "New" },
       { id: "draft", title: "Draft" },
       { id: "review", title: "Review" },
+      { id: "approved", title: "Approved" },
       { id: "done", title: "Merged" }
     ];
     HOME_BOARD_CACHE_TTL_MS = 15 * 60 * 1e3;
     DEFAULT_WORKTREE_SORT = "created";
-    DEFAULT_BOARD_OWNERSHIP = "all";
     DEFAULTISH_BRANCH = /^(main|master|develop|development|trunk|default|head)$/;
     BOARD_PAGE_SIZE = 40;
-    HOME_BOARD_AGENT_HINT = "Home is a Kanban of workspaces (one card per checkout; sibling chats on a card are separate agents). Do not create a second workspace for a ticket, PR, or named branch that already has a live checkout \u2014 create_workspace / start_board_card return that checkout (alreadyStarted) and its chats. Add another agent with fork_chat. Creating from the default branch still opens a new isolated workspace. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. blockedReason means an agent on that card is waiting on a person (the question, plan approval, or a reported block) \u2014 read it and do not send_to_chat a check-in. Orchestration chats stay in the sidebar. Do not invent status.";
+    HOME_BOARD_AGENT_HINT = "Home is a Kanban of workspaces (one card per checkout; sibling chats on a card are separate agents). Do not create a second workspace for a ticket, PR, or named branch that already has a live checkout \u2014 create_workspace / start_board_card return that checkout (alreadyStarted) and its chats. Add another agent with fork_chat. Creating from the default branch still opens a new isolated workspace. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Approved (approved, not merged) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. blockedReason means an agent on that card is waiting on a person (the question, plan approval, or a reported block) \u2014 read it and do not send_to_chat a check-in. Orchestration chats stay in the sidebar. Do not invent status.";
   }
 });
 
@@ -9039,138 +9283,6 @@ var init_repo_git_lock = __esm({
   }
 });
 
-// src/git/pr-gates.ts
-function prIsInMergeQueue(gate) {
-  if (gate.isInMergeQueue) return true;
-  return (gate.mergeStateStatus ?? "").toUpperCase() === "QUEUED";
-}
-function applyCleanLocalMergeTree(gate) {
-  const mergeable = (gate.mergeable ?? "").toUpperCase();
-  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
-  const githubConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  if (githubConflicting) {
-    return {
-      ...gate,
-      mergeable: "MERGEABLE",
-      mergeStateStatus: mergeState === "BEHIND" ? "BEHIND" : "CLEAN"
-    };
-  }
-  return {
-    ...gate,
-    mergeable: mergeable === "UNKNOWN" || !mergeable ? "MERGEABLE" : gate.mergeable,
-    mergeStateStatus: mergeState === "BEHIND" ? "BEHIND" : mergeState === "UNKNOWN" || !mergeState ? "CLEAN" : gate.mergeStateStatus
-  };
-}
-function ciChecksFailed(checks) {
-  if (!checks?.length) return false;
-  return checks.some(
-    (check) => (!check.kind || check.kind === "ci") && check.bucket === "fail"
-  );
-}
-function buildMergeGateChecks(gate, opts = {}) {
-  const rows = [];
-  const base = gate.baseRefName?.trim() || "the base branch";
-  const link = gate.url?.trim() || null;
-  const mergeable = (gate.mergeable ?? "").toUpperCase();
-  const mergeState = (gate.mergeStateStatus ?? "").toUpperCase();
-  const review = (gate.reviewDecision ?? "").toUpperCase();
-  const suppressBlocked = opts.suppressGenericBlocked !== false;
-  const conflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const inQueue = prIsInMergeQueue(gate);
-  if (conflicting && !inQueue) {
-    rows.push({
-      name: "Merge conflicts",
-      state: mergeable === "CONFLICTING" ? "CONFLICTING" : mergeState || "DIRTY",
-      bucket: "fail",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: `This branch has conflicts that must be resolved before it can merge into ${base}.`,
-      workflow: "mergeability",
-      kind: "mergeability"
-    });
-  } else if (inQueue) {
-    rows.push({
-      name: "Merge queue",
-      state: "QUEUED",
-      bucket: "pending",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: `This pull request is in the GitHub merge queue for ${base}.`,
-      workflow: "mergeability",
-      kind: "mergeability"
-    });
-  } else if (mergeState === "BEHIND") {
-    rows.push({
-      name: "Branch behind",
-      state: "BEHIND",
-      bucket: "info",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: `Head is behind ${base}. Update this branch (merge or rebase) before merging.`,
-      workflow: "mergeability",
-      kind: "mergeability"
-    });
-  } else if (mergeState === "BLOCKED" && !suppressBlocked) {
-    rows.push({
-      name: "Merge blocked",
-      state: "BLOCKED",
-      bucket: "fail",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: "GitHub reports this PR as blocked (branch protection \u2014 required reviews and/or status checks).",
-      workflow: "mergeability",
-      kind: "mergeability"
-    });
-  } else if (mergeable === "UNKNOWN" || mergeState === "UNKNOWN") {
-    rows.push({
-      name: "Mergeability",
-      state: "UNKNOWN",
-      bucket: "pending",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: "GitHub is still computing whether this branch can merge.",
-      workflow: "mergeability",
-      kind: "mergeability"
-    });
-  }
-  if (review === "CHANGES_REQUESTED") {
-    rows.push({
-      name: "Code review",
-      state: "CHANGES_REQUESTED",
-      bucket: "fail",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: "A reviewer requested changes. Address their feedback before merging.",
-      workflow: "review",
-      kind: "review"
-    });
-  } else if (review === "REVIEW_REQUIRED") {
-    rows.push({
-      name: "Code review",
-      state: "REVIEW_REQUIRED",
-      bucket: "pending",
-      startedAt: null,
-      completedAt: null,
-      link,
-      description: "A required approving review is still outstanding.",
-      workflow: "review",
-      kind: "review"
-    });
-  }
-  return rows;
-}
-var init_pr_gates = __esm({
-  "src/git/pr-gates.ts"() {
-    "use strict";
-  }
-});
-
 // src/git/stack.ts
 async function detectGhStack(cwd) {
   const now = Date.now();
@@ -11717,7 +11829,7 @@ function coordinatorTurnReminder(opts) {
     goal ? `- Goal / title: ${goal}` : null,
     accountDefaultsPlaybookLine(),
     accountContextReminderLine() || null,
-    "- Status: list_board (worktree Kanban: New \u2192 Draft \u2192 Review \u2192 Merged) or list_chats. Link chats as `[Title](sideboard://chat/<id>)`. Merge only if the user asked. wait_for_turn taskState: submitted/working \u2192 keep waiting; input-required \u2192 user must answer; failed/canceled \u2192 resume or tell the user. blockedReason is why that agent is waiting \u2014 read it; do not send_to_chat a check-in."
+    "- Status: list_board (worktree Kanban: New \u2192 Draft \u2192 Review \u2192 Approved \u2192 Merged) or list_chats. Link chats as `[Title](sideboard://chat/<id>)`. Merge only if the user asked. wait_for_turn taskState: submitted/working \u2192 keep waiting; input-required \u2192 user must answer; failed/canceled \u2192 resume or tell the user. blockedReason is why that agent is waiting \u2014 read it; do not send_to_chat a check-in."
   ].filter(Boolean).join("\n");
 }
 function ensureGlobalCoordinatorCwd(opts) {
@@ -11825,7 +11937,7 @@ var init_coordinator_prompt = __esm({
       "Sideboard MCP (fleet control \u2014 prefer these for status and orchestration):",
       "Discover:",
       "- list_projects \u2014 registered repos (path + github slug + project context when set). Use account / project context to pick the right repo for tickets or reviews.",
-      "- list_board \u2014 Home Kanban of workspaces (New / Draft / Review / Merged; one card per checkout). Sibling chats on a card are separate agents, not one agent. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 merged. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind, column, limit.",
+      "- list_board \u2014 Home Kanban of workspaces (New / Draft / Review / Approved / Merged; one card per checkout). Sibling chats on a card are separate agents, not one agent. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 approved \u2192 merged. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind, column, limit.",
       `- list_branches / list_prs / list_issues \u2014 pass repoPath from list_projects. Review is PRs (the surface for assigned ticket work), not the tickets: "Get me N tickets to review" \u2192 list_prs(queue=review, limit=N) then create_workspace sourceType=pr. That is open non-draft PRs labeled with this project's ready-for-review GitHub label (Settings \u2192 Projects; default eng-review) with no individual user reviewer yet. A team request (engineering-team) is not a claim \u2014 the viewer is on that team and can pick it up; claimed means an individual account is the reviewer. Bots ignored. Use Settings \u2192 Agents / Projects context (roles, teams, labels \u2014 freeform text; project adds to account) to prefer the right queues. queue=mine is review-requested:@me; queue=approved|changes uses those labels. Also: state, label, reviewer=me|unassigned|login, query, limit default 40 max 250; raise limit or tighten when truncated. list_issues (query, assignee=me|unassigned|all|user, limit default 40 max 250) lists Linear, AbleTime, or GitHub tickets \u2014 do not use it for that review-inbox ask. When they ask for tickets to work on, follow their context (assignee=me or unassigned as it says).`,
       "- Find work: when they ask to find work, pick up tickets, or list reviews, use Settings \u2192 Agents (account) plus Settings \u2192 Projects (per-repo) context. Tickets \u2192 Sideboard list_issues / linear_* (Account Linear). Reviews \u2192 list_prs(queue=review). Do not call Claude Linear MCP or any other vendor Linear MCP \u2014 those HTTP connectors hang or flap on the first turn. If a vendor MCP is down or reconnecting, ignore it and keep going with Sideboard tools. Show the options \u2014 do not create_workspace or start unless they also asked to start (e.g. \u201Cfind me work and start it\u201D). Do not start this unprompted. To change that context, show the proposed text, ask_user (Save this context / Do not save), wait, then update_viewer_context with confirmed=true. Never write it without confirmation.",
       "- Ticket updates: list_issues / linear_search_issues / github_search_issues with updatedSince (yesterday, 2d, or ISO). One call returns new assignments, ticket edits, and new comments \u2014 do not get_issue every ticket just to check for comments. kind=created vs updated distinguishes new tickets from existing ones.",
@@ -37040,7 +37152,7 @@ async function startMcpServer() {
     );
     server.tool(
       "list_board",
-      "Home Kanban of workspaces (New, Draft, Review, Merged) \u2014 one card per checkout; sibling chats on that card are separate agents. Same cards as desktop Home. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 merged. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind (ticket/PR/branch source), ownership (mine = your PRs / WIP; reviewing = someone else's PR), column, limit (default 40). create_workspace adds a workspace (and a Home card), or returns the live checkout if that ticket/PR/named branch is already checked out. That reuse is one checkout, not one agent \u2014 fork_chat to add another.",
+      "Home Kanban of workspaces (New, Draft, Review, Approved, Merged) \u2014 one card per checkout; sibling chats on that card are separate agents. Same cards as desktop Home. Path to merge: no PR \u2192 draft PR \u2192 open PR \u2192 approved \u2192 merged. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. Orchestration chats are not on the board. Filters: query, repoPath, kind (ticket/PR/branch source), ownership (mine = your PRs / WIP; reviewing = someone else's PR), column, limit (default 40). create_workspace adds a workspace (and a Home card), or returns the live checkout if that ticket/PR/named branch is already checked out. That reuse is one checkout, not one agent \u2014 fork_chat to add another.",
       {
         query: import_zod11.z.string().optional().describe("Case-insensitive token search across title, id, labels, workspace tags, repo"),
         repoPath: import_zod11.z.string().optional().describe("Limit to one project path from list_projects"),
@@ -37048,8 +37160,8 @@ async function startMcpServer() {
         ownership: import_zod11.z.enum(["all", "mine", "reviewing"]).optional().describe(
           "Mine = PRs you authored or local WIP; reviewing = someone else's PR. Uses the gh login."
         ),
-        column: import_zod11.z.enum(["new", "draft", "review", "done", "needs_you"]).optional().describe(
-          "Return cards for this column only (totals still include the rest). needs_you is a legacy alias for new."
+        column: import_zod11.z.enum(["new", "draft", "review", "approved", "done", "needs_you"]).optional().describe(
+          "Return cards for this column only (totals still include the rest). approved is an open PR GitHub has approved. needs_you is a legacy alias for new."
         ),
         limit: import_zod11.z.number().int().positive().optional().describe("Max cards per column (default 40). hidden counts the remainder.")
       },
@@ -41901,7 +42013,7 @@ function listPhoneSidebar(viewerLogin = phoneViewerLogin()) {
         label: worktreeDisplayLabelForGroup(group),
         chats: group.map(summarize),
         ...tags.length > 0 ? { tags } : {},
-        ...badge ? { badge: { id: badge.id, label: badge.label, title: badge.title } } : {}
+        ...badge ? { badge: { id: badge.id, label: badge.label, title: badge.title, ...badge.conflict ? { conflict: true } : {}, ...badge.error ? { error: badge.error } : {} } } : {}
       };
     })
   }));