@sideboard-ai/core 0.1.250 → 0.1.252

package/dist/{agents-7IIUQLCC.js → agents-B66CNEPB.js}

@@ -46,9 +46,9 @@ import {
   resolveLoginCommand,
   resolveQuotaFallbackAgent,
   whichOnPath
-} from "./chunk-DMT62X6L.js";
-import "./chunk-SJPK5Y5U.js";
-import "./chunk-566W54AN.js";
+} from "./chunk-BHPGORIY.js";
+import "./chunk-SJ3IUYG2.js";
+import "./chunk-NYXDZCMP.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-2P4XKWV2.js";
 import "./chunk-5F4YFGHL.js";

package/dist/{agents-72QLUO4L.js → agents-C7T4US6D.js}

@@ -55,12 +55,12 @@ import {
   resolveQuotaFallbackAgent,
   turnCostUsdFromCursorUsage,
   whichOnPath
-} from "./chunk-IJIMEK2K.js";
-import "./chunk-W4BGLHA3.js";
+} from "./chunk-4DGYMF7H.js";
+import "./chunk-6IP4FWMK.js";
 import "./chunk-XAISOBBG.js";
 import "./chunk-P2BSMNHB.js";
 import "./chunk-VKQGAWHY.js";
-import "./chunk-WSOFNJPD.js";
+import "./chunk-PV4KCI2S.js";
 import "./chunk-D6JWYJ4P.js";
 import "./chunk-RJC2MKXN.js";
 import "./chunk-H547WSSZ.js";

package/dist/{chunk-IJIMEK2K.js → chunk-4DGYMF7H.js}

@@ -2,7 +2,7 @@
 
 import {
   isOrchestratorThread
-} from "./chunk-W4BGLHA3.js";
+} from "./chunk-6IP4FWMK.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -20,7 +20,7 @@ import {
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-WSOFNJPD.js";
+} from "./chunk-PV4KCI2S.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -1744,6 +1744,15 @@ function isContextCompactInProgress(text) {
   if (isContextCompactDone(t)) return false;
   return /^Compressing context/i.test(t);
 }
+function isSystemStatusThinking(event) {
+  if (event.replace) return true;
+  const t = (event.data ?? "").trim();
+  if (!t) return true;
+  if (/^API retry\b/i.test(t)) return true;
+  if (/^MCP:/i.test(t)) return true;
+  if (isContextCompactInProgress(t) || isContextCompactDone(t)) return true;
+  return false;
+}
 function looksLikeConversationSummary(text) {
   const t = text.trim();
   if (t.length < 80) return false;
@@ -2198,15 +2207,6 @@ function applyAgentEvent(parts, event) {
       );
       return next2;
     }
-    if (contextCompactInProgress(parts, event.parentId)) {
-      return [
-        ...parts,
-        compactToolPart(data, `compact-${parts.length}`, {
-          parentId: event.parentId,
-          status: "running"
-        })
-      ];
-    }
     const runningSkillIdx = lastRunningSkillIndex(parts, event.parentId);
     if (runningSkillIdx >= 0) {
       const prev = parts[runningSkillIdx];
@@ -2225,6 +2225,15 @@ function applyAgentEvent(parts, event) {
       );
       return next2;
     }
+    if (contextCompactInProgress(parts, event.parentId)) {
+      return [
+        ...parts,
+        compactToolPart(data, `compact-${parts.length}`, {
+          parentId: event.parentId,
+          status: "running"
+        })
+      ];
+    }
     const next = [...parts];
     const last = next[next.length - 1];
     if (last?.type === "text" && sameParentId(last.parentId, event.parentId)) {
@@ -2261,7 +2270,9 @@ function applyAgentEvent(parts, event) {
   if (event.type === "thinking") {
     const data = event.data;
     if (!data) return parts;
-    parts = markRunningSkillsDone(parts, event.parentId);
+    if (!isSystemStatusThinking(event)) {
+      parts = markRunningSkillsDone(parts, event.parentId);
+    }
     const next = [...parts];
     if (event.replace) {
       for (let i = next.length - 1; i >= 0; i--) {
@@ -2947,7 +2958,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-MTBVW6GW.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-JJRPZNTY.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,

package/dist/{chunk-W4BGLHA3.js → chunk-6IP4FWMK.js}

@@ -8,7 +8,7 @@ import {
   resolveRepoRoot,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-WSOFNJPD.js";
+} from "./chunk-PV4KCI2S.js";
 import {
   ATTACHMENTS_DIR,
   attachmentsGitignoreBody

package/dist/{chunk-RLJHH6T7.js → chunk-AQQWP2TL.js}

@@ -44,7 +44,7 @@ import {
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-IJIMEK2K.js";
+} from "./chunk-4DGYMF7H.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -67,7 +67,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-W4BGLHA3.js";
+} from "./chunk-6IP4FWMK.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -117,7 +117,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-WSOFNJPD.js";
+} from "./chunk-PV4KCI2S.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -491,9 +491,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-MTBVW6GW.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-JJRPZNTY.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-Q53MIP2G.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-A2JJ5X7B.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -4050,6 +4050,7 @@ async function createThread(input, _onSetupLine) {
   let prTitle = null;
   let prAuthorLogin2 = null;
   let prLabels = [];
+  let prIsDraft = false;
   if (sourceType === "pr") {
     const num = Number(input.sourceRef.replace(/^#/, ""));
     if (!Number.isFinite(num)) throw new Error(`Invalid PR number: ${input.sourceRef}`);
@@ -4067,6 +4068,7 @@ async function createThread(input, _onSetupLine) {
     prUrl = pr.url;
     prAuthorLogin2 = pr.author?.login?.trim() || null;
     prLabels = pr.labels ?? [];
+    prIsDraft = Boolean(pr.isDraft);
     const localFetchBranch = `sideboard-pr-${pr.number}`;
     await fetchPrHead(repoPath, pr.number, localFetchBranch);
     sourceRef = localFetchBranch;
@@ -4091,6 +4093,7 @@ async function createThread(input, _onSetupLine) {
           prTitle = existing.title;
           prAuthorLogin2 = existing.author?.login?.trim() || null;
           prLabels = existing.labels ?? [];
+          prIsDraft = Boolean(existing.isDraft);
         }
       }
     }
@@ -4127,7 +4130,8 @@ async function createThread(input, _onSetupLine) {
     prUrl,
     prTitle,
     prAuthorLogin: prAuthorLogin2,
-    prLabels
+    prLabels,
+    prIsDraft
   });
   writeThread(thread);
   await ensureWorkspace(repoPath);
@@ -4595,7 +4599,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-24YJWKJQ.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-V3PZRTY5.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-5N2KTYIT.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -7101,7 +7105,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-NKG4R6TX.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-O3TVI7SN.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9298,6 +9302,14 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     return discoverSkills(thread.worktreePath);
   }
+  /** Skills for a project folder before a worktree exists (create modal). */
+  listSkillsForRepo(repoPath) {
+    const root = repoPath.trim();
+    if (!root || root === "/" || root === ".") {
+      return discoverSkills("/__sideboard_no_workspace__");
+    }
+    return discoverSkills(root);
+  }
   async previewLand(threadRef) {
     const thread = this.requireThread(threadRef);
     this.assertNotGlobal(thread, "Land");
@@ -9726,7 +9738,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-24YJWKJQ.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-V3PZRTY5.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -9780,7 +9792,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-VED7K2UL.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-UK62JCYF.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -9890,7 +9902,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-VED7K2UL.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-UK62JCYF.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({

package/dist/{chunk-DMT62X6L.js → chunk-BHPGORIY.js}

@@ -1,12 +1,12 @@
 import {
   isOrchestratorThread
-} from "./chunk-SJPK5Y5U.js";
+} from "./chunk-SJ3IUYG2.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-566W54AN.js";
+} from "./chunk-NYXDZCMP.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -1234,6 +1234,15 @@ function isContextCompactInProgress(text) {
   if (isContextCompactDone(t)) return false;
   return /^Compressing context/i.test(t);
 }
+function isSystemStatusThinking(event) {
+  if (event.replace) return true;
+  const t = (event.data ?? "").trim();
+  if (!t) return true;
+  if (/^API retry\b/i.test(t)) return true;
+  if (/^MCP:/i.test(t)) return true;
+  if (isContextCompactInProgress(t) || isContextCompactDone(t)) return true;
+  return false;
+}
 function looksLikeConversationSummary(text) {
   const t = text.trim();
   if (t.length < 80) return false;
@@ -1778,15 +1787,6 @@ function applyAgentEvent(parts, event) {
       );
       return next2;
     }
-    if (contextCompactInProgress(parts, event.parentId)) {
-      return [
-        ...parts,
-        compactToolPart(data, `compact-${parts.length}`, {
-          parentId: event.parentId,
-          status: "running"
-        })
-      ];
-    }
     const runningSkillIdx = lastRunningSkillIndex(parts, event.parentId);
     if (runningSkillIdx >= 0) {
       const prev = parts[runningSkillIdx];
@@ -1805,6 +1805,15 @@ function applyAgentEvent(parts, event) {
       );
       return next2;
     }
+    if (contextCompactInProgress(parts, event.parentId)) {
+      return [
+        ...parts,
+        compactToolPart(data, `compact-${parts.length}`, {
+          parentId: event.parentId,
+          status: "running"
+        })
+      ];
+    }
     const next = [...parts];
     const last = next[next.length - 1];
     if (last?.type === "text" && sameParentId(last.parentId, event.parentId)) {
@@ -1841,7 +1850,9 @@ function applyAgentEvent(parts, event) {
   if (event.type === "thinking") {
     const data = event.data;
     if (!data) return parts;
-    parts = markRunningSkillsDone(parts, event.parentId);
+    if (!isSystemStatusThinking(event)) {
+      parts = markRunningSkillsDone(parts, event.parentId);
+    }
     const next = [...parts];
     if (event.replace) {
       for (let i = next.length - 1; i >= 0; i--) {
@@ -2533,7 +2544,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-VWF5AOYN.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-PUJEGSOB.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -4529,6 +4540,7 @@ export {
   isCompactToolName,
   isContextCompactDone,
   isContextCompactInProgress,
+  isSystemStatusThinking,
   looksLikeConversationSummary,
   toolDetail,
   toolDescription,

package/dist/{chunk-EV4QJNR7.js → chunk-FKGVQKRX.js}

@@ -25,7 +25,7 @@ import {
   resolveQuotaFallbackAgent,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-DMT62X6L.js";
+} from "./chunk-BHPGORIY.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -48,7 +48,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-SJPK5Y5U.js";
+} from "./chunk-SJ3IUYG2.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -98,7 +98,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-566W54AN.js";
+} from "./chunk-NYXDZCMP.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -443,9 +443,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-VWF5AOYN.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-PUJEGSOB.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-ON5YI463.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-BX2R5EMW.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -3662,6 +3662,7 @@ function classifyWorktreeListBadges(group, viewerLogin = "", reviewLabel = "") {
       }
     ];
   }
+  if (!normalizeViewerLogin(viewerLogin)) return [];
   const draft = open.some((t) => t.prIsDraft);
   const readyLabel = reviewLabel.trim();
   const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : !draft;
@@ -4246,6 +4247,7 @@ async function createThread(input, _onSetupLine) {
   let prTitle = null;
   let prAuthorLogin2 = null;
   let prLabels = [];
+  let prIsDraft = false;
   if (sourceType === "pr") {
     const num = Number(input.sourceRef.replace(/^#/, ""));
     if (!Number.isFinite(num)) throw new Error(`Invalid PR number: ${input.sourceRef}`);
@@ -4263,6 +4265,7 @@ async function createThread(input, _onSetupLine) {
     prUrl = pr.url;
     prAuthorLogin2 = pr.author?.login?.trim() || null;
     prLabels = pr.labels ?? [];
+    prIsDraft = Boolean(pr.isDraft);
     const localFetchBranch = `sideboard-pr-${pr.number}`;
     await fetchPrHead(repoPath, pr.number, localFetchBranch);
     sourceRef = localFetchBranch;
@@ -4287,6 +4290,7 @@ async function createThread(input, _onSetupLine) {
           prTitle = existing.title;
           prAuthorLogin2 = existing.author?.login?.trim() || null;
           prLabels = existing.labels ?? [];
+          prIsDraft = Boolean(existing.isDraft);
         }
       }
     }
@@ -4323,14 +4327,15 @@ async function createThread(input, _onSetupLine) {
     prUrl,
     prTitle,
     prAuthorLogin: prAuthorLogin2,
-    prLabels
+    prLabels,
+    prIsDraft
   });
   writeThread(thread);
   await ensureWorkspace(repoPath);
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-7IIUQLCC.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-B66CNEPB.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -4803,7 +4808,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QWGSPLMF.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-FUOZIR3V.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-RXZPTCNH.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -7515,7 +7520,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-HEFTR7RA.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-O3V4UH73.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -9712,6 +9717,14 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     return discoverSkills(thread.worktreePath);
   }
+  /** Skills for a project folder before a worktree exists (create modal). */
+  listSkillsForRepo(repoPath) {
+    const root = repoPath.trim();
+    if (!root || root === "/" || root === ".") {
+      return discoverSkills("/__sideboard_no_workspace__");
+    }
+    return discoverSkills(root);
+  }
   async previewLand(threadRef) {
     const thread = this.requireThread(threadRef);
     this.assertNotGlobal(thread, "Land");
@@ -10140,7 +10153,7 @@ var Orchestrator = class {
     this.enforceHistoryRetention();
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-QWGSPLMF.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-FUOZIR3V.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -10194,7 +10207,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-RYZOFNY7.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-4DNK2CK6.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -10304,7 +10317,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-RYZOFNY7.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-4DNK2CK6.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({

package/dist/{chunk-566W54AN.js → chunk-NYXDZCMP.js}

@@ -1578,6 +1578,23 @@ 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(
@@ -2130,6 +2147,22 @@ async function listPrs(repoPath, opts) {
   if (exitCode !== 0 || !stdout.trim()) return [];
   return applyPrListResponse(stdout, { ...resolved, limit, viewerTeams });
 }
+var PR_INFO_JSON_FIELDS = "number,title,headRefName,url,isCrossRepository,author,isDraft,labels";
+function prInfoFromGhView(view) {
+  const author = view.author;
+  const login = author?.login?.trim();
+  return {
+    number: Number(view.number),
+    title: String(view.title ?? ""),
+    headRefName: String(view.headRefName ?? ""),
+    url: String(view.url ?? ""),
+    isCrossRepository: Boolean(view.isCrossRepository),
+    author: login ? { login } : null,
+    isDraft: Boolean(view.isDraft),
+    state: typeof view.state === "string" ? view.state : void 0,
+    labels: labelNames(view.labels)
+  };
+}
 async function getPr(repoPath, number) {
   const slug = await resolveGithubRepoSlug(repoPath);
   const args = [
@@ -2137,12 +2170,16 @@ async function getPr(repoPath, number) {
     "view",
     String(number),
     "--json",
-    "number,title,headRefName,url,isCrossRepository,author"
+    PR_INFO_JSON_FIELDS
   ];
   if (slug) args.push("--repo", slug);
   const { stdout, exitCode } = await gh(args, repoPath, { reject: false });
   if (exitCode !== 0 || !stdout.trim()) return null;
-  return JSON.parse(stdout);
+  try {
+    return prInfoFromGhView(JSON.parse(stdout));
+  } catch {
+    return null;
+  }
 }
 function normalizeGitBranchName(ref) {
   return ref.trim().replace(/^refs\/heads\//, "").replace(/^origin\//, "");
@@ -2196,7 +2233,7 @@ async function getPrForHeadBranch(repoPath, branch) {
     "--head",
     listHead,
     "--json",
-    "number,title,headRefName,url,isCrossRepository,author",
+    PR_INFO_JSON_FIELDS,
     "--limit",
     "1",
     "--state",
@@ -2207,7 +2244,7 @@ async function getPrForHeadBranch(repoPath, branch) {
   if (listed.exitCode === 0 && listed.stdout.trim()) {
     try {
       const rows = JSON.parse(listed.stdout);
-      if (rows[0]) return rows[0];
+      if (rows[0]) return prInfoFromGhView(rows[0]);
     } catch {
     }
   }
@@ -2216,13 +2253,13 @@ async function getPrForHeadBranch(repoPath, branch) {
     "view",
     head,
     "--json",
-    "number,title,headRefName,url,isCrossRepository,author,state"
+    `${PR_INFO_JSON_FIELDS},state`
   ];
   if (slug) viewArgs.push("--repo", slug);
   const viewed = await gh(viewArgs, repoPath, { reject: false });
   if (viewed.exitCode !== 0 || !viewed.stdout.trim()) return null;
   try {
-    const info = JSON.parse(viewed.stdout);
+    const info = prInfoFromGhView(JSON.parse(viewed.stdout));
     const state = (info.state ?? "OPEN").trim().toUpperCase();
     if (state !== "OPEN") return null;
     return info;
@@ -2322,9 +2359,10 @@ ${result.stderr}`;
 async function probeLocalMergeGate(cwd, gate) {
   const mergeable = (gate?.mergeable ?? "").toUpperCase();
   const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
-  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const githubConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const githubUnknown = mergeable === "UNKNOWN" || mergeState === "UNKNOWN";
   const inQueue = gate ? prIsInMergeQueue(gate) : false;
-  if (alreadyConflicting || inQueue) return { gate, files: [] };
+  if (inQueue) return { gate, files: [] };
   try {
     const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
     if (local.conflicting) {
@@ -2340,13 +2378,9 @@ async function probeLocalMergeGate(cwd, gate) {
         files: local.files
       };
     }
-    if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
+    if (gate && (githubConflicting || githubUnknown)) {
       return {
-        gate: {
-          ...gate,
-          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
-          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
-        },
+        gate: applyCleanLocalMergeTree(gate),
         files: []
       };
     }
@@ -2477,6 +2511,7 @@ var PR_DETAILS_JSON_FIELDS = [
   "isDraft",
   "reviewDecision",
   "author",
+  "createdAt",
   "baseRefName",
   "headRefName",
   "additions",
@@ -2506,6 +2541,7 @@ function parsePrDetailsView(view) {
     isDraft: Boolean(view.isDraft),
     reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
     author: { login: author.login ?? "unknown", name: author.name ?? null },
+    createdAt: typeof view.createdAt === "string" && view.createdAt ? view.createdAt : null,
     baseRefName: String(view.baseRefName ?? ""),
     headRefName: String(view.headRefName ?? ""),
     additions: Number(view.additions ?? 0),