@sideboard-ai/core 0.1.203 → 0.1.204

package/dist/index.cjs

@@ -3298,6 +3298,9 @@ function humanizeAgentFailDetail(detail) {
   if (/\[resource_exhausted\]|resource_exhausted|findfileswithripgrep/.test(lower)) {
     return "Cursor local file search failed (ripgrep / resource_exhausted). Wait a minute and retry; if it keeps happening, check Cursor usage.";
   }
+  if (looksLikeCodexMcpError(raw)) {
+    return `${raw} \u2014 skip that vendor MCP and continue (PostHog: Settings \u2192 Connectors + HTTP API).`;
+  }
   if (/invalid user api key|invalid api key|not logged in|not authenticated|unauthorized|authentication|please run.*login|codex login|claude auth|cursor api/.test(
     lower
   )) {
@@ -3355,9 +3358,24 @@ function turnFailChatText(opts) {
 
 ${fail6}`;
 }
+function looksLikeCodexMcpError(text7) {
+  const t = text7.trim().toLowerCase();
+  if (!t) return false;
+  if (/authrequired|authorization required/.test(t) && /mcp|posthog|rmcp|connector|plugin/.test(t)) {
+    return true;
+  }
+  if (/\bposthog\b/.test(t) && /mcp|oauth|auth|unauthorized|401|plugin|app/.test(t)) {
+    return true;
+  }
+  if (/\brmcp\b/.test(t) && /fatal|quit|transport|error|died|kill|auth/.test(t)) {
+    return true;
+  }
+  return /mcp[_ -]?(server|tool|error|transport|client)/.test(t) && /fail|error|timeout|disconnect|auth|unauthorized/.test(t);
+}
 function shouldFeedErrorBackToAgent(opts) {
   const detail = opts.detail.trim();
   const chat = (opts.assistantText ?? "").trim();
+  if (looksLikeCodexMcpError(detail)) return true;
   if (looksLikeAgentFailureMessage(detail) || looksLikeAgentFailureMessage(chat)) {
     return false;
   }
@@ -7728,6 +7746,7 @@ __export(worktree_exports, {
   canonicalizeRepoPath: () => canonicalizeRepoPath,
   collectTakenTeamSlugs: () => collectTakenTeamSlugs,
   commitAll: () => commitAll,
+  connectedPrSelectors: () => connectedPrSelectors,
   countUnpushedVsOrigin: () => countUnpushedVsOrigin,
   createExistingBranchWorktree: () => createExistingBranchWorktree,
   createOrUpdatePr: () => createOrUpdatePr,
@@ -8061,26 +8080,21 @@ function resolvePrSelectors(thread) {
 function resolvePrSelector(thread) {
   return resolvePrSelectors(thread)[0] ?? null;
 }
+function connectedPrSelectors(thread, currentHeadPrUrl) {
+  const out = [];
+  const push = (value) => {
+    const v = value?.trim();
+    if (!v || out.includes(v)) return;
+    out.push(v);
+  };
+  push(currentHeadPrUrl);
+  for (const selector of resolvePrSelectors(thread)) push(selector);
+  return out;
+}
 async function getPrForHeadBranch(repoPath, branch) {
   const head = normalizeGitBranchName(branch);
   if (!head || isDefaultishSourceRef(head)) return null;
   const slug = await resolveGithubRepoSlug(repoPath);
-  const viewArgs = [
-    "pr",
-    "view",
-    head,
-    "--json",
-    "number,title,headRefName,url,isCrossRepository,author"
-  ];
-  if (slug) viewArgs.push("--repo", slug);
-  const viewed = await gh(viewArgs, repoPath, { reject: false });
-  if (viewed.exitCode === 0 && viewed.stdout.trim()) {
-    try {
-      return JSON.parse(viewed.stdout);
-    } catch {
-      return null;
-    }
-  }
   const listHead = slug ? ghHeadRef(slug, head) : head;
   const listArgs = [
     "pr",
@@ -8096,10 +8110,28 @@ async function getPrForHeadBranch(repoPath, branch) {
   ];
   if (slug) listArgs.push("--repo", slug);
   const listed = await gh(listArgs, repoPath, { reject: false });
-  if (listed.exitCode !== 0 || !listed.stdout.trim()) return null;
+  if (listed.exitCode === 0 && listed.stdout.trim()) {
+    try {
+      const rows = JSON.parse(listed.stdout);
+      if (rows[0]) return rows[0];
+    } catch {
+    }
+  }
+  const viewArgs = [
+    "pr",
+    "view",
+    head,
+    "--json",
+    "number,title,headRefName,url,isCrossRepository,author,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 rows = JSON.parse(listed.stdout);
-    return rows[0] ?? null;
+    const info = JSON.parse(viewed.stdout);
+    const state = (info.state ?? "OPEN").trim().toUpperCase();
+    if (state !== "OPEN") return null;
+    return info;
   } catch {
     return null;
   }
@@ -12869,7 +12901,18 @@ function toCodexDisableUserMcpArgs(names) {
   return args;
 }
 function toCodexUnattendedAppsArgs() {
-  return ["-c", "features.apps=false", "-c", "apps._default.enabled=false"];
+  return [
+    "-c",
+    "features.apps=false",
+    "-c",
+    "apps._default.enabled=false",
+    "-c",
+    "apps.posthog.enabled=false",
+    "-c",
+    "features.plugins=false",
+    "-c",
+    "mcp_servers.posthog.enabled=false"
+  ];
 }
 var import_node_fs32, import_node_os11, import_node_path33, import_smol_toml2;
 var init_orch_mcp_isolation = __esm({
@@ -14620,11 +14663,14 @@ function staleOk(now) {
   if (now - lastGood.at > CLAUDE_USAGE_STALE_OK_MS) return null;
   return lastGood.value;
 }
+function reuseLast() {
+  return lastGood?.value ?? null;
+}
 async function getClaudePlanUsage(opts = {}) {
   const now = opts.now ?? Date.now();
+  if (now < errorUntil) return reuseLast() ?? staleOk(now);
   if (!opts.force) {
     if (cache && now - cache.at < CLAUDE_USAGE_TTL_MS) return cache.value;
-    if (now < errorUntil) return staleOk(now);
   }
   if (inflight) return inflight;
   inflight = (async () => {
@@ -14655,6 +14701,12 @@ async function getClaudePlanUsage(opts = {}) {
         cache = { at: now, value: null };
         return null;
       }
+      if (res.status === 429) {
+        errorUntil = now + CLAUDE_USAGE_ERROR_TTL_MS;
+        const last = reuseLast();
+        if (last) cache = { at: now, value: last };
+        return last;
+      }
       if (!res.ok) {
         errorUntil = now + CLAUDE_USAGE_ERROR_TTL_MS;
         return staleOk(now);
@@ -15415,6 +15467,33 @@ var init_agent_git_actions = __esm({
 function normalizePrState(state) {
   return (state ?? "").trim().toUpperCase();
 }
+function sameLoginList(a, b) {
+  const left = [...a ?? []].map((s) => s.trim().toLowerCase()).filter(Boolean).sort();
+  const right = [...b ?? []].map((s) => s.trim().toLowerCase()).filter(Boolean).sort();
+  return left.length === right.length && left.every((login, i) => login === right[i]);
+}
+function threadPrMetaPatch(thread, meta) {
+  const prevState = normalizePrState(thread.prState);
+  const nextState = normalizePrState(meta.state);
+  const patch = {};
+  if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
+  if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
+  if (nextState && nextState !== prevState) patch.prState = nextState;
+  const nextDraft = Boolean(meta.isDraft) && nextState !== "MERGED" && nextState !== "CLOSED";
+  if (nextDraft !== Boolean(thread.prIsDraft)) patch.prIsDraft = nextDraft;
+  const nextAuthor = meta.authorLogin?.trim() || "";
+  if (nextAuthor && nextAuthor !== (thread.prAuthorLogin ?? "").trim()) {
+    patch.prAuthorLogin = nextAuthor;
+  }
+  const nextReviewers = meta.reviewerLogins ?? [];
+  if (!sameLoginList(nextReviewers, thread.prReviewerLogins)) {
+    patch.prReviewerLogins = nextReviewers;
+  }
+  if (thread.skipAutoArchiveOnMerge && nextState && nextState !== "MERGED" && nextState !== "CLOSED") {
+    patch.skipAutoArchiveOnMerge = false;
+  }
+  return patch;
+}
 function shouldAutoArchiveOnPrMerge(opts) {
   if (!opts.autoArchiveEnabled) return false;
   if (opts.isGlobal) return false;
@@ -17497,21 +17576,67 @@ var init_detect = __esm({
 // src/integrations/abletime-oauth.ts
 var abletime_oauth_exports = {};
 __export(abletime_oauth_exports, {
+  ABLETIME_OAUTH_CALLBACK_PATH: () => ABLETIME_OAUTH_CALLBACK_PATH,
   ABLETIME_OAUTH_CANCELLED: () => ABLETIME_OAUTH_CANCELLED,
+  ABLETIME_OAUTH_LOCAL_CALLBACK: () => ABLETIME_OAUTH_LOCAL_CALLBACK,
   ABLETIME_OAUTH_PORT: () => ABLETIME_OAUTH_PORT,
   ABLETIME_OAUTH_REDIRECT: () => ABLETIME_OAUTH_REDIRECT,
   ABLETIME_OAUTH_RESOURCE: () => ABLETIME_OAUTH_RESOURCE,
   AbleTimeOAuthCancelledError: () => AbleTimeOAuthCancelledError,
   BAKED_ABLETIME_OAUTH_CLIENT_ID: () => BAKED_ABLETIME_OAUTH_CLIENT_ID,
   ableTimeOAuthAuthorizeUrl: () => ableTimeOAuthAuthorizeUrl,
+  ableTimeOAuthBouncePage: () => ableTimeOAuthBouncePage,
   ableTimeOAuthClientId: () => ableTimeOAuthClientId,
+  ableTimeOAuthLocalBounceUrl: () => ableTimeOAuthLocalBounceUrl,
+  ableTimeOAuthRedirectUri: () => ableTimeOAuthRedirectUri,
   ableTimeOAuthResource: () => ableTimeOAuthResource,
   createAbleTimePkce: () => createAbleTimePkce,
   ensureAbleTimeAccessToken: () => ensureAbleTimeAccessToken,
   hasBakedAbleTimeOAuth: () => hasBakedAbleTimeOAuth,
   isAbleTimeOAuthCancelled: () => isAbleTimeOAuthCancelled,
+  parseAbleTimeOAuthCallbackUrl: () => parseAbleTimeOAuthCallbackUrl,
   startAbleTimeOAuth: () => startAbleTimeOAuth
 });
+function ableTimeOAuthRedirectUri() {
+  return process.env.SIDEBOARD_ABLETIME_OAUTH_REDIRECT?.trim() || ABLETIME_OAUTH_REDIRECT;
+}
+function parseAbleTimeOAuthCallbackUrl(reqUrl) {
+  let url;
+  try {
+    url = new URL(reqUrl, ABLETIME_OAUTH_REDIRECT);
+  } catch {
+    return null;
+  }
+  if (url.pathname !== ABLETIME_OAUTH_CALLBACK_PATH) return null;
+  return url;
+}
+function ableTimeOAuthLocalBounceUrl(reqUrl) {
+  const url = parseAbleTimeOAuthCallbackUrl(reqUrl);
+  if (!url) return null;
+  const dest = new URL(ABLETIME_OAUTH_LOCAL_CALLBACK);
+  for (const key of BOUNCE_QUERY_KEYS) {
+    const value = url.searchParams.get(key);
+    if (value) dest.searchParams.set(key, value);
+  }
+  return dest.toString();
+}
+function escapeHtml(value) {
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function ableTimeOAuthBouncePage(localUrl) {
+  const safe = escapeHtml(localUrl);
+  return `<!doctype html><html><head><meta charset="utf-8">
+<meta http-equiv="refresh" content="0;url=${safe}">
+<title>Returning to Sideboard</title>
+<script>location.replace(${JSON.stringify(localUrl)})</script>
+<style>body{font-family:ui-sans-serif,system-ui,sans-serif;padding:48px 24px;max-width:36rem;margin:0 auto;color:#1a1a1a}
+h1{font-size:1.25rem}p{line-height:1.5;color:#444}a{color:#0f7ed4}</style>
+</head><body>
+<h1>Returning to Sideboard</h1>
+<p>AbleTime authorized. Opening the app\u2026</p>
+<p><a href="${safe}">Open Sideboard</a> if it does not appear.</p>
+</body></html>`;
+}
 function hasBakedAbleTimeOAuth() {
   return Boolean(BAKED_ABLETIME_OAUTH_CLIENT_ID.trim());
 }
@@ -17531,7 +17656,7 @@ function ableTimeOAuthAuthorizeUrl(clientId, state, codeChallenge, host) {
   const params = new URLSearchParams({
     response_type: "code",
     client_id: clientId,
-    redirect_uri: ABLETIME_OAUTH_REDIRECT,
+    redirect_uri: ableTimeOAuthRedirectUri(),
     code_challenge: codeChallenge,
     code_challenge_method: "S256",
     state,
@@ -17703,7 +17828,7 @@ async function startAbleTimeOAuth(opts) {
   const body = new URLSearchParams({
     grant_type: "authorization_code",
     code,
-    redirect_uri: ABLETIME_OAUTH_REDIRECT,
+    redirect_uri: ableTimeOAuthRedirectUri(),
     client_id: clientId,
     code_verifier: pkce.verifier,
     resource: ableTimeOAuthResource(host)
@@ -17725,7 +17850,7 @@ async function startAbleTimeOAuth(opts) {
     return loadAppSettings();
   }
 }
-var import_node_crypto10, import_node_http, ABLETIME_OAUTH_PORT, ABLETIME_OAUTH_REDIRECT, BAKED_ABLETIME_OAUTH_CLIENT_ID, ABLETIME_OAUTH_RESOURCE, REFRESH_SKEW_MS2, refreshInFlight, ABLETIME_OAUTH_CANCELLED, AbleTimeOAuthCancelledError;
+var import_node_crypto10, import_node_http, ABLETIME_OAUTH_CALLBACK_PATH, ABLETIME_OAUTH_PORT, ABLETIME_OAUTH_LOCAL_CALLBACK, ABLETIME_OAUTH_REDIRECT, BOUNCE_QUERY_KEYS, BAKED_ABLETIME_OAUTH_CLIENT_ID, ABLETIME_OAUTH_RESOURCE, REFRESH_SKEW_MS2, refreshInFlight, ABLETIME_OAUTH_CANCELLED, AbleTimeOAuthCancelledError;
 var init_abletime_oauth = __esm({
   "src/integrations/abletime-oauth.ts"() {
     "use strict";
@@ -17734,8 +17859,11 @@ var init_abletime_oauth = __esm({
     init_fetch();
     init_app_settings();
     init_abletime_mcp();
+    ABLETIME_OAUTH_CALLBACK_PATH = "/oauth/abletime/callback";
     ABLETIME_OAUTH_PORT = 19849;
-    ABLETIME_OAUTH_REDIRECT = `http://127.0.0.1:${ABLETIME_OAUTH_PORT}/callback`;
+    ABLETIME_OAUTH_LOCAL_CALLBACK = `http://127.0.0.1:${ABLETIME_OAUTH_PORT}/callback`;
+    ABLETIME_OAUTH_REDIRECT = `https://www.sideboard.cloud${ABLETIME_OAUTH_CALLBACK_PATH}`;
+    BOUNCE_QUERY_KEYS = ["code", "state", "error", "error_description"];
     BAKED_ABLETIME_OAUTH_CLIENT_ID = "https://www.sideboard.cloud/oauth/abletime-client.json";
     ABLETIME_OAUTH_RESOURCE = `${DEFAULT_ABLETIME_HOST}/api/public/v2/mcp`;
     REFRESH_SKEW_MS2 = 5 * 6e4;
@@ -17989,8 +18117,11 @@ function firstStringArg(args, keys) {
 }
 async function callAbleTimeRestTool(name, args = {}, opts) {
   const token = normalizeAbleTimeCredential(opts?.token ?? getAbleTimeAccessToken() ?? "");
-  if (ableTimeCredentialKind(token) !== "org") {
-    throw new Error("AbleTime REST transport is for organization API keys (atk_\u2026)");
+  if (!token) {
+    throw new Error("AbleTime is not connected \u2014 paste an API key or connect via browser");
+  }
+  if (ableTimeCredentialKind(token) === "pat") {
+    throw new Error("AbleTime REST transport is for organization keys and OAuth tokens, not apt_\u2026");
   }
   const requestOpts = { ...opts, token };
   switch (name) {
@@ -18150,11 +18281,25 @@ function normalizeAbleTimeCredential(raw) {
   return raw.trim().replace(/^bearer\s+/i, "").trim();
 }
 function ableTimeCredentialKind(raw) {
-  const token = normalizeAbleTimeCredential(raw).toLowerCase();
-  if (token.startsWith(ABLETIME_PAT_PREFIX)) return "pat";
-  if (token.startsWith(ABLETIME_ORG_KEY_PREFIX)) return "org";
+  const token = normalizeAbleTimeCredential(raw);
+  const lower = token.toLowerCase();
+  if (lower.startsWith(ABLETIME_PAT_PREFIX)) return "pat";
+  if (lower.startsWith(ABLETIME_ORG_KEY_PREFIX)) return "org";
+  if (lower.startsWith(ABLETIME_OAUTH_TOKEN_PREFIX) || token.startsWith("eyJ")) return "oauth";
   return "unknown";
 }
+function ableTimeUsesRest(raw) {
+  const token = normalizeAbleTimeCredential(raw);
+  const kind = ableTimeCredentialKind(token);
+  if (kind === "org") return true;
+  if (kind === "oauth") return token.startsWith("eyJ");
+  return kind === "unknown";
+}
+function isAbleTimeRejectedCredential(message) {
+  return /INTEGRATION_KEY_INVALID|INTEGRATION_KEY_MISSING|INTEGRATION_PAT_REQUIRED|\b401\b/i.test(
+    message
+  );
+}
 function assertAbleTimeMcpCredential(raw) {
   const token = normalizeAbleTimeCredential(raw);
   if (!token) {
@@ -18316,7 +18461,7 @@ async function callAbleTimeTool(name, args = {}, opts) {
     throw new Error("AbleTime is not connected \u2014 paste a personal access token in Account settings");
   }
   const rawToken = opts?.token ?? await Promise.resolve().then(() => (init_abletime_oauth(), abletime_oauth_exports)).then((m) => m.ensureAbleTimeAccessToken());
-  if (rawToken && ableTimeCredentialKind(rawToken) === "org") {
+  if (rawToken && ableTimeUsesRest(rawToken)) {
     const { callAbleTimeRestTool: callAbleTimeRestTool2 } = await Promise.resolve().then(() => (init_abletime_rest(), abletime_rest_exports));
     return callAbleTimeRestTool2(name, args, { ...opts, token: rawToken });
   }
@@ -18332,10 +18477,14 @@ async function callAbleTimeTool(name, args = {}, opts) {
       await initializeIfNeeded(requestOpts);
       return await call();
     }
+    if (rawToken && ableTimeUsesRest(rawToken) && isAbleTimeRejectedCredential(message)) {
+      const { callAbleTimeRestTool: callAbleTimeRestTool2 } = await Promise.resolve().then(() => (init_abletime_rest(), abletime_rest_exports));
+      return callAbleTimeRestTool2(name, args, { ...opts, token: rawToken });
+    }
     throw err instanceof Error ? new Error(rewriteAbleTimeError(err.message)) : err;
   }
 }
-var DEFAULT_ABLETIME_HOST, ABLETIME_MCP_PATH, ABLETIME_MCP_PM_PATH, MCP_PROTOCOL_VERSION, ABLETIME_PM_TOOL_NAMES, ABLETIME_PAT_PREFIX, ABLETIME_ORG_KEY_PREFIX, ORG_KEY_HINT, REJECTED_CREDENTIAL_HINT, REWRITE_APPLIED;
+var DEFAULT_ABLETIME_HOST, ABLETIME_MCP_PATH, ABLETIME_MCP_PM_PATH, MCP_PROTOCOL_VERSION, ABLETIME_PM_TOOL_NAMES, ABLETIME_PAT_PREFIX, ABLETIME_ORG_KEY_PREFIX, ABLETIME_OAUTH_TOKEN_PREFIX, ORG_KEY_HINT, REJECTED_CREDENTIAL_HINT, REWRITE_APPLIED;
 var init_abletime_mcp = __esm({
   "src/integrations/abletime-mcp.ts"() {
     "use strict";
@@ -18359,8 +18508,9 @@ var init_abletime_mcp = __esm({
     ];
     ABLETIME_PAT_PREFIX = "apt_";
     ABLETIME_ORG_KEY_PREFIX = "atk_";
+    ABLETIME_OAUTH_TOKEN_PREFIX = "acn_";
     ORG_KEY_HINT = "AbleTime MCP needs a personal access token (apt_\u2026) from Edit Profile \u2192 API Access, not an organization API key (atk_\u2026) from Settings \u2192 Integrations \u2192 API Keys.";
-    REJECTED_CREDENTIAL_HINT = "AbleTime rejected this credential (unknown, revoked, or expired). Use a personal access token (apt_\u2026) from Edit Profile \u2192 API Access \u2014 organization API keys (atk_\u2026) cannot call MCP. Tokens are shown once; rotating replaces the previous one.";
+    REJECTED_CREDENTIAL_HINT = "AbleTime rejected this credential (unknown, revoked, or expired). Reconnect via browser, or paste a personal access token (apt_\u2026) from Edit Profile \u2192 API Access. Organization API keys (atk_\u2026) use REST, not MCP.";
     REWRITE_APPLIED = /— Enable Agent access \(MCP\)|— AbleTime MCP needs a personal access token|— AbleTime plan does not include API access|— AbleTime rejected this credential/;
   }
 });
@@ -18542,7 +18692,7 @@ function isOpenTask(task) {
 async function getAbleTimeOrientation(opts) {
   const raw = await callAbleTimeTool("orientation", {}, opts);
   const record = asRecord7(raw);
-  const viewerRec = firstRecord(record, ["viewer", "user", "actor", "me", "person"]) ?? record;
+  const viewerRec = firstRecord(record, ["viewer", "principal", "user", "actor", "me", "person"]) ?? record;
   const viewer = {
     id: firstString(viewerRec, ["id", "user_id"]) || void 0,
     name: firstString(viewerRec, ["name", "display_name", "full_name"]) || firstString(record, ["name"]) || void 0
@@ -22237,11 +22387,6 @@ function isPidAlive(pid) {
     return false;
   }
 }
-function sameLoginList(a, b) {
-  const left = [...a ?? []].map((s) => s.trim().toLowerCase()).filter(Boolean).sort();
-  const right = [...b ?? []].map((s) => s.trim().toLowerCase()).filter(Boolean).sort();
-  return left.length === right.length && left.every((login, i) => login === right[i]);
-}
 async function waitForPidExit(pid, timeoutMs) {
   const start = Date.now();
   while (isPidAlive(pid)) {
@@ -24080,12 +24225,18 @@ var init_orchestrator = __esm({
       /** Resolve PR selectors and optionally persist `prUrl` when found. */
       async withPrSelector(threadRef) {
         const thread = this.requireThread(threadRef);
-        const selectors = resolvePrSelectors(thread);
         const cwd = thread.worktreePath;
         if (!cwd?.trim()) {
           throw new Error(`Thread ${threadRef} has no worktreePath`);
         }
-        return { thread, selectors, cwd };
+        let headUrl = null;
+        try {
+          const head = await getPrForHeadBranch(cwd, thread.branchName);
+          headUrl = head?.url?.trim() || null;
+        } catch {
+          headUrl = null;
+        }
+        return { thread, selectors: connectedPrSelectors(thread, headUrl), cwd };
       }
       async getPrChecks(threadRef) {
         const { selectors, cwd } = await this.withPrSelector(threadRef);
@@ -24113,29 +24264,16 @@ var init_orchestrator = __esm({
       async persistPrMetaAndMaybeArchive(thread, meta) {
         const prevState = normalizePrState(thread.prState);
         const nextState = normalizePrState(meta.state);
-        const patch = {};
-        if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
-        if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
-        if (nextState && nextState !== prevState) patch.prState = nextState;
-        const nextDraft = Boolean(meta.isDraft) && nextState !== "MERGED" && nextState !== "CLOSED";
-        if (nextDraft !== Boolean(thread.prIsDraft)) patch.prIsDraft = nextDraft;
-        const nextAuthor = meta.authorLogin?.trim() || "";
-        if (nextAuthor && nextAuthor !== (thread.prAuthorLogin ?? "").trim()) {
-          patch.prAuthorLogin = nextAuthor;
-        }
-        const nextReviewers = meta.reviewerLogins ?? [];
-        if (!sameLoginList(nextReviewers, thread.prReviewerLogins)) {
-          patch.prReviewerLogins = nextReviewers;
+        const siblings = threadsSharingWorktree(thread.worktreePath);
+        const targets = siblings.length > 0 ? siblings : [thread];
+        for (const t of targets) {
+          const patch = threadPrMetaPatch(t, meta);
+          if (Object.keys(patch).length === 0) continue;
+          updateThread(t.id, patch);
         }
-        if (thread.skipAutoArchiveOnMerge && nextState && nextState !== "MERGED" && nextState !== "CLOSED") {
-          patch.skipAutoArchiveOnMerge = false;
-        }
-        if (Object.keys(patch).length > 0) {
-          updateThread(thread.id, patch);
-          const latest2 = this.requireThread(thread.id);
-          if (!latest2.userSetTitle && meta.title && latest2.title !== meta.title) {
-            updateThread(thread.id, { title: meta.title });
-          }
+        const titled = this.requireThread(thread.id);
+        if (!titled.userSetTitle && meta.title && titled.title !== meta.title) {
+          updateThread(thread.id, { title: meta.title });
         }
         const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
         const latest = this.requireThread(thread.id);
@@ -24149,22 +24287,7 @@ var init_orchestrator = __esm({
         })) {
           return;
         }
-        const siblings = threadsSharingWorktree(latest.worktreePath);
-        for (const t of siblings) {
-          const sibPatch = { prState: "MERGED", prIsDraft: false };
-          if (meta.url && meta.url !== t.prUrl) sibPatch.prUrl = meta.url;
-          if (meta.title && meta.title !== t.prTitle) sibPatch.prTitle = meta.title;
-          const sibAuthor = meta.authorLogin?.trim() || "";
-          if (sibAuthor && sibAuthor !== (t.prAuthorLogin ?? "").trim()) {
-            sibPatch.prAuthorLogin = sibAuthor;
-          }
-          const sibReviewers = meta.reviewerLogins ?? [];
-          if (!sameLoginList(sibReviewers, t.prReviewerLogins)) {
-            sibPatch.prReviewerLogins = sibReviewers;
-          }
-          if (Object.keys(sibPatch).length > 0) updateThread(t.id, sibPatch);
-        }
-        for (const t of siblings) {
+        for (const t of threadsSharingWorktree(latest.worktreePath)) {
           if (this.requireThread(t.id).status === "archived") continue;
           await this.archive(t.id);
         }
@@ -24682,10 +24805,13 @@ var index_exports = {};
 __export(index_exports, {
   ABLETIME_MCP_PATH: () => ABLETIME_MCP_PATH,
   ABLETIME_MCP_PM_PATH: () => ABLETIME_MCP_PM_PATH,
+  ABLETIME_OAUTH_CALLBACK_PATH: () => ABLETIME_OAUTH_CALLBACK_PATH,
   ABLETIME_OAUTH_CANCELLED: () => ABLETIME_OAUTH_CANCELLED,
+  ABLETIME_OAUTH_LOCAL_CALLBACK: () => ABLETIME_OAUTH_LOCAL_CALLBACK,
   ABLETIME_OAUTH_PORT: () => ABLETIME_OAUTH_PORT,
   ABLETIME_OAUTH_REDIRECT: () => ABLETIME_OAUTH_REDIRECT,
   ABLETIME_OAUTH_RESOURCE: () => ABLETIME_OAUTH_RESOURCE,
+  ABLETIME_OAUTH_TOKEN_PREFIX: () => ABLETIME_OAUTH_TOKEN_PREFIX,
   ABLETIME_ORG_KEY_PREFIX: () => ABLETIME_ORG_KEY_PREFIX,
   ABLETIME_PAT_PREFIX: () => ABLETIME_PAT_PREFIX,
   ABLETIME_PM_TOOL_NAMES: () => ABLETIME_PM_TOOL_NAMES,
@@ -24785,8 +24911,12 @@ __export(index_exports, {
   ableTimeCredentialKind: () => ableTimeCredentialKind,
   ableTimeDependencyTarget: () => ableTimeDependencyTarget,
   ableTimeOAuthAuthorizeUrl: () => ableTimeOAuthAuthorizeUrl,
+  ableTimeOAuthBouncePage: () => ableTimeOAuthBouncePage,
   ableTimeOAuthClientId: () => ableTimeOAuthClientId,
+  ableTimeOAuthLocalBounceUrl: () => ableTimeOAuthLocalBounceUrl,
+  ableTimeOAuthRedirectUri: () => ableTimeOAuthRedirectUri,
   ableTimeOAuthResource: () => ableTimeOAuthResource,
+  ableTimeUsesRest: () => ableTimeUsesRest,
   abletimeMcpRequest: () => abletimeMcpRequest,
   abletimeMcpUrl: () => abletimeMcpUrl,
   abletimeToolUsesPm: () => abletimeToolUsesPm,
@@ -24891,6 +25021,7 @@ __export(index_exports, {
   connectOptionalService: () => connectOptionalService,
   connectSlackToken: () => connectSlackToken,
   connectedOptionalServices: () => connectedOptionalServices,
+  connectedPrSelectors: () => connectedPrSelectors,
   contextTokens: () => contextTokens,
   coordinatorSystemPrompt: () => coordinatorSystemPrompt,
   coordinatorTurnReminder: () => coordinatorTurnReminder,
@@ -25111,6 +25242,7 @@ __export(index_exports, {
   invalidateThreadRecord: () => invalidateThreadRecord,
   isAbleTimeConnected: () => isAbleTimeConnected,
   isAbleTimeOAuthCancelled: () => isAbleTimeOAuthCancelled,
+  isAbleTimeRejectedCredential: () => isAbleTimeRejectedCredential,
   isAskUserToolName: () => isAskUserToolName,
   isBrightsyConnected: () => isBrightsyConnected,
   isBrightsyNdjsonLine: () => isBrightsyNdjsonLine,
@@ -25263,6 +25395,7 @@ __export(index_exports, {
   originFetchBranch: () => originFetchBranch,
   originGhRepoEnv: () => originGhRepoEnv,
   packagedDetachedJobPath: () => packagedDetachedJobPath,
+  parseAbleTimeOAuthCallbackUrl: () => parseAbleTimeOAuthCallbackUrl,
   parseClaudeUsagePayload: () => parseClaudeUsagePayload,
   parseCursorRunnerLine: () => parseCursorRunnerLine,
   parseDurationMs: () => parseDurationMs,
@@ -31496,11 +31629,11 @@ var SLACK_OAUTH_REDIRECT = `https://relay.sideboard.cloud${SLACK_OAUTH_CALLBACK_
 function slackOAuthRedirectUri() {
   return process.env.SIDEBOARD_SLACK_OAUTH_REDIRECT?.trim() || SLACK_OAUTH_REDIRECT;
 }
-function escapeHtml(value) {
+function escapeHtml2(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function slackOAuthHtmlPage(title, body) {
-  return `<!doctype html><html><head><meta charset="utf-8"><title>${escapeHtml(title)}</title>
+  return `<!doctype html><html><head><meta charset="utf-8"><title>${escapeHtml2(title)}</title>
 <style>body{font-family:ui-sans-serif,system-ui,sans-serif;padding:48px 24px;max-width:36rem;margin:0 auto;color:#1a1a1a}
 h1{font-size:1.25rem}p{line-height:1.5;color:#444}</style></head><body>${body}</body></html>`;
 }
@@ -33184,6 +33317,7 @@ async function tryServeStatic(req, res, root) {
 }
 
 // src/slack/relay-server.ts
+init_abletime_oauth();
 function sendHtml(res, status, title, body) {
   res.writeHead(status, { "Content-Type": "text/html; charset=utf-8" });
   res.end(slackOAuthHtmlPage(title, body));
@@ -33218,7 +33352,7 @@ async function startSlackRelayServer(opts) {
         res,
         400,
         "Slack",
-        `<h1>Authorization cancelled</h1><p>${escapeHtml(error)}</p>`
+        `<h1>Authorization cancelled</h1><p>${escapeHtml2(error)}</p>`
       );
       return true;
     }
@@ -33257,7 +33391,7 @@ async function startSlackRelayServer(opts) {
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       pending.put(state, { ok: false, error: message });
-      sendHtml(res, 400, "Slack", `<h1>Could not connect Slack</h1><p>${escapeHtml(message)}</p>`);
+      sendHtml(res, 400, "Slack", `<h1>Could not connect Slack</h1><p>${escapeHtml2(message)}</p>`);
     }
     return true;
   };
@@ -33282,6 +33416,16 @@ async function startSlackRelayServer(opts) {
       const reqUrl = req.url || "/";
       if (await handleCallback(reqUrl, res)) return;
       if (handleResult(reqUrl, res)) return;
+      const ableTimeBounce = ableTimeOAuthLocalBounceUrl(reqUrl);
+      if (ableTimeBounce && (req.method === "GET" || req.method === "HEAD")) {
+        res.writeHead(200, {
+          "Content-Type": "text/html; charset=utf-8",
+          "Cache-Control": "no-store",
+          Refresh: `0;url=${ableTimeBounce}`
+        });
+        res.end(req.method === "HEAD" ? "" : ableTimeOAuthBouncePage(ableTimeBounce));
+        return;
+      }
       if (req.url === "/health") {
         sendJson(res, 200, {
           ok: true,
@@ -33414,10 +33558,13 @@ init_outbound_watch();
 0 && (module.exports = {
   ABLETIME_MCP_PATH,
   ABLETIME_MCP_PM_PATH,
+  ABLETIME_OAUTH_CALLBACK_PATH,
   ABLETIME_OAUTH_CANCELLED,
+  ABLETIME_OAUTH_LOCAL_CALLBACK,
   ABLETIME_OAUTH_PORT,
   ABLETIME_OAUTH_REDIRECT,
   ABLETIME_OAUTH_RESOURCE,
+  ABLETIME_OAUTH_TOKEN_PREFIX,
   ABLETIME_ORG_KEY_PREFIX,
   ABLETIME_PAT_PREFIX,
   ABLETIME_PM_TOOL_NAMES,
@@ -33517,8 +33664,12 @@ init_outbound_watch();
   ableTimeCredentialKind,
   ableTimeDependencyTarget,
   ableTimeOAuthAuthorizeUrl,
+  ableTimeOAuthBouncePage,
   ableTimeOAuthClientId,
+  ableTimeOAuthLocalBounceUrl,
+  ableTimeOAuthRedirectUri,
   ableTimeOAuthResource,
+  ableTimeUsesRest,
   abletimeMcpRequest,
   abletimeMcpUrl,
   abletimeToolUsesPm,
@@ -33623,6 +33774,7 @@ init_outbound_watch();
   connectOptionalService,
   connectSlackToken,
   connectedOptionalServices,
+  connectedPrSelectors,
   contextTokens,
   coordinatorSystemPrompt,
   coordinatorTurnReminder,
@@ -33843,6 +33995,7 @@ init_outbound_watch();
   invalidateThreadRecord,
   isAbleTimeConnected,
   isAbleTimeOAuthCancelled,
+  isAbleTimeRejectedCredential,
   isAskUserToolName,
   isBrightsyConnected,
   isBrightsyNdjsonLine,
@@ -33995,6 +34148,7 @@ init_outbound_watch();
   originFetchBranch,
   originGhRepoEnv,
   packagedDetachedJobPath,
+  parseAbleTimeOAuthCallbackUrl,
   parseClaudeUsagePayload,
   parseCursorRunnerLine,
   parseDurationMs,