@sideboard-ai/core 0.1.279 → 0.1.281

package/dist/mcp/run-stdio.js

@@ -18,9 +18,9 @@ import {
   searchAbleTimeTasks,
   toAbleTimeIssueInfo,
   updateAbleTimeTask
-} from "../chunk-R7HLXD4I.js";
-import "../chunk-XKZAVGTT.js";
-import "../chunk-IJDQKC5A.js";
+} from "../chunk-BS3QLVPL.js";
+import "../chunk-I6HSGKMZ.js";
+import "../chunk-PY4UCMRI.js";
 import {
   AGENT_GIT_ACTIONS,
   BOARD_COLUMN_DEFS,
@@ -29,8 +29,11 @@ import {
   HOME_BOARD_CACHE_TTL_MS,
   MAX_RUN_LOG_CHARS,
   agentBlockFields,
+  applyIssueListWindow,
+  applyWorkspaceTags,
   assembleHomeBoard,
   chatBlockedSuffix,
+  clampMcpIssueLimit,
   createSchedule,
   dedupeBoardIssues,
   dedupeBoardPrs,
@@ -40,15 +43,23 @@ import {
   findBoardPr,
   findLiveThreadForCreate,
   fireSchedule,
+  formatGitHubSearchUpdatedSince,
+  formatListedIssuesForMcp,
   getOrchestrator,
   getSchedule,
   isAccountWideIssueSource,
   isInjectedNoticeText,
+  issueMatchesUpdatedSince,
   issueNeedsWorkspacePick,
   listSchedules,
   localhostPreviewUrl,
+  mcpIssueUpdatedSinceSchema,
+  mcpJson,
   notifyOrchestrator,
+  parseIssueSince,
+  previewIssueCommentBody,
   readTurnLive,
+  registerViewerContextTools,
   resolveNotifyCallerThread,
   resolveOrchChildFollowUp,
   resolveScheduleThreadId,
@@ -58,8 +69,9 @@ import {
   stampNotifyBlock,
   stampPlanBlock,
   syncBoardPins,
-  updateSchedule
-} from "../chunk-CPGJ5ICZ.js";
+  updateSchedule,
+  workspaceTagTargetRef
+} from "../chunk-BYZ7F2BQ.js";
 import "../chunk-LX5R5JOR.js";
 import {
   PRESENT_PLAN_REQUIRES_PLAN_MODE,
@@ -78,7 +90,7 @@ import {
   sideboardMcpProfile,
   trustSystemCertificates,
   worktreeMcpToolNames
-} from "../chunk-RK5PIWCW.js";
+} from "../chunk-ADXVTKLC.js";
 import "../chunk-TQRSVE7D.js";
 import "../chunk-P2BSMNHB.js";
 import {
@@ -94,17 +106,16 @@ import {
   waitForDetachedJob,
   waitForTurnToolResult,
   workspaceAgentChatSummaries
-} from "../chunk-YDXNCBA2.js";
+} from "../chunk-EIEAR62M.js";
 import {
   clipToolResultForStore,
   isInternalAgentStatusText,
   looksLikeHugeToolResultDump
-} from "../chunk-CPA43FBK.js";
+} from "../chunk-W7HIK2A6.js";
 import {
   GLOBAL_WORKSPACE_ID,
-  isCloudCoordinatorThread,
-  listWorkspaces
-} from "../chunk-TZ5JHIYK.js";
+  isCloudCoordinatorThread
+} from "../chunk-2SJXQ4UX.js";
 import {
   canonicalizeRepoPath,
   formatGhLandError,
@@ -115,7 +126,7 @@ import {
   resolveListPrsOptions,
   resolveRepoRoot,
   warmGithubAgentAuth
-} from "../chunk-K7MWJLR7.js";
+} from "../chunk-5MGLNVNK.js";
 import {
   CLI_DIR
 } from "../chunk-N2WW62LF.js";
@@ -131,13 +142,11 @@ import {
   isAbleTimeConnected,
   isLinearConnected,
   loadAppSettings,
-  readViewerContext,
   resolveEffectiveIssueSource,
   resolveProjectReviewLabel,
   resolveViewerProfile,
   resolveViewerProfileForRepo,
-  saveLinearOAuth,
-  writeViewerContext
+  saveLinearOAuth
 } from "../chunk-WRIMAEF2.js";
 import "../chunk-NSTQ6QKD.js";
 import {
@@ -145,7 +154,9 @@ import {
 } from "../chunk-WWUABK6B.js";
 import "../chunk-FJZWM2ON.js";
 import "../chunk-UN5Q7POQ.js";
-import "../chunk-JANCPF7Z.js";
+import {
+  normalizeWorkspaceTags
+} from "../chunk-JPH7PYSK.js";
 import "../chunk-4RZRHTSZ.js";
 import "../chunk-KGZBYWZ3.js";
 import {
@@ -240,7 +251,7 @@ function createClippedMcpServer() {
 }
 
 // src/mcp/server.ts
-import { z as z8 } from "zod";
+import { z as z6 } from "zod";
 import { randomUUID as randomUUID3 } from "crypto";
 import { basename } from "path";
 
@@ -264,7 +275,7 @@ function extractGitHubIssueAttachments(issue) {
   const texts = [issue.body ?? "", ...issue.comments.map((comment) => comment.body)];
   return mergeIssueAttachments(
     texts.flatMap(
-      (text6) => extractHttpUrls(text6).filter(isGitHubIssueAttachmentUrl).map((url) => ({
+      (text5) => extractHttpUrls(text5).filter(isGitHubIssueAttachmentUrl).map((url) => ({
         id: url,
         name: url.split("/").pop() || "attachment",
         url
@@ -293,74 +304,127 @@ async function downloadGitHubIssueAttachment(input, opts) {
   });
 }
 
-// src/integrations/issue-since.ts
-var ISSUE_SINCE_ERROR = "updatedSince must be an ISO datetime, YYYY-MM-DD, or relative time (yesterday, 2d, 3 hours ago)";
-var DATE_ONLY_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
-var DATE_TIME_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/;
-var RELATIVE_RE = /^(\d+)\s*(hours?|hrs?|h|days?|d|weeks?|wks?|w)(?:\s+ago)?$/i;
-function startOfLocalDay(date) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
-}
-function addLocalDays(date, days) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + days);
-}
-function parseIssueSince(input, now = /* @__PURE__ */ new Date()) {
-  const raw = input.trim();
-  if (!raw) throw new Error(ISSUE_SINCE_ERROR);
-  const dateOnly = raw.match(DATE_ONLY_RE);
-  if (dateOnly) {
-    const year = Number(dateOnly[1]);
-    const month = Number(dateOnly[2]);
-    const day = Number(dateOnly[3]);
-    const local = new Date(year, month - 1, day);
-    if (local.getFullYear() !== year || local.getMonth() !== month - 1 || local.getDate() !== day) {
-      throw new Error(ISSUE_SINCE_ERROR);
+// src/integrations/github-projects.ts
+function rewriteGitHubProjectReadError(detail) {
+  const text5 = detail.trim() || "gh could not read GitHub Projects";
+  if (/read:project|project scope|missing required scopes/i.test(text5)) {
+    return `${text5} \u2014 run \`gh auth refresh -s read:project\` so Sideboard can read GitHub Projects.`;
+  }
+  return text5;
+}
+function githubProjectsUnreadable(result) {
+  return /project|scope|unknown json field/i.test(`${result.stderr}
+${result.stdout}`);
+}
+function githubProjectsOnIssue(raw) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const fromItems = raw.projectItems ?? raw.projects ?? raw.projectItemsV2;
+  if (!Array.isArray(fromItems)) return out;
+  for (const item of fromItems) {
+    if (typeof item === "string") {
+      const name2 = item.trim();
+      const key2 = name2.toLowerCase();
+      if (!name2 || seen.has(key2)) continue;
+      seen.add(key2);
+      out.push({ name: name2 });
+      continue;
+    }
+    if (!item || typeof item !== "object") continue;
+    const rec = item;
+    const nested = rec.project && typeof rec.project === "object" ? rec.project : rec;
+    const id = String(nested.id ?? rec.id ?? "").trim();
+    const name = String(nested.title ?? nested.name ?? rec.title ?? rec.name ?? "").trim();
+    const label = name || id;
+    const key = label.toLowerCase();
+    if (!label || seen.has(key)) continue;
+    seen.add(key);
+    out.push({ ...id ? { id } : {}, name: label });
+  }
+  return out;
+}
+async function readGitHubIssueProjects(number, cwd, repoArgs) {
+  const result = await gh(
+    ["issue", "view", String(number), ...repoArgs, "--json", "projectItems"],
+    cwd,
+    { reject: false }
+  );
+  if (result.exitCode !== 0 || !result.stdout.trim()) {
+    const detail = (result.stderr || result.stdout).trim();
+    if (detail && githubProjectsUnreadable(result)) {
+      return { projects: [], error: rewriteGitHubProjectReadError(detail) };
+    }
+    return { projects: [] };
+  }
+  try {
+    const parsed = JSON.parse(result.stdout);
+    return { projects: githubProjectsOnIssue(parsed) };
+  } catch {
+    return { projects: [] };
+  }
+}
+async function listGitHubIssueProjectNames(number, cwd, repoArgs) {
+  const read = await readGitHubIssueProjects(number, cwd, repoArgs);
+  return read.projects.map((project) => project.name).filter(Boolean);
+}
+function parseGitHubProjectList(stdout) {
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch {
+    return [];
+  }
+  const rows = Array.isArray(parsed) ? parsed : parsed && typeof parsed === "object" && Array.isArray(parsed.projects) ? parsed.projects ?? [] : [];
+  const out = [];
+  for (const row of rows) {
+    if (!row || typeof row !== "object") continue;
+    const rec = row;
+    const title = String(rec.title ?? rec.name ?? "").trim();
+    if (!title) continue;
+    const ownerRec = rec.owner && typeof rec.owner === "object" ? rec.owner : null;
+    const owner = ownerRec?.login?.trim() || (typeof rec.owner === "string" ? rec.owner.trim() : "");
+    const number = Number(rec.number);
+    out.push({
+      ...typeof rec.id === "string" && rec.id.trim() ? { id: rec.id.trim() } : {},
+      ...Number.isFinite(number) ? { number } : {},
+      title,
+      ...typeof rec.url === "string" && rec.url.trim() ? { url: rec.url.trim() } : {},
+      ...typeof rec.closed === "boolean" ? { closed: rec.closed } : {},
+      ...owner ? { owner } : {}
+    });
+  }
+  return out;
+}
+async function listGitHubProjects(opts) {
+  const cwd = await resolveRepoRoot((opts?.repoPath ?? "").trim() || process.cwd());
+  const slug = await resolveGithubRepoSlug(cwd);
+  const owners = /* @__PURE__ */ new Set([""]);
+  const repoOwner = slug?.split("/")[0]?.trim();
+  if (repoOwner) owners.add(repoOwner);
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  let lastError = "";
+  let anyOk = false;
+  for (const owner of owners) {
+    const args = ["project", "list", "--limit", "100", "--format", "json"];
+    if (owner) args.push("--owner", owner);
+    const result = await gh(args, cwd, { reject: false });
+    if (result.exitCode !== 0 || !result.stdout.trim()) {
+      lastError = (result.stderr || result.stdout).trim() || lastError;
+      continue;
     }
-    return startOfLocalDay(local).toISOString();
-  }
-  if (DATE_TIME_RE.test(raw)) {
-    const ms = Date.parse(raw);
-    if (!Number.isFinite(ms)) throw new Error(ISSUE_SINCE_ERROR);
-    return new Date(ms).toISOString();
-  }
-  const lower = raw.toLowerCase();
-  if (lower === "today") return startOfLocalDay(now).toISOString();
-  if (lower === "yesterday") return addLocalDays(startOfLocalDay(now), -1).toISOString();
-  if (lower === "last week" || lower === "lastweek") {
-    return addLocalDays(startOfLocalDay(now), -7).toISOString();
-  }
-  const relative = lower.match(RELATIVE_RE);
-  if (relative) {
-    const n = Number(relative[1]);
-    if (!Number.isInteger(n) || n < 1) throw new Error(ISSUE_SINCE_ERROR);
-    const unit = relative[2];
-    if (unit.startsWith("h")) return new Date(now.getTime() - n * 36e5).toISOString();
-    if (unit.startsWith("w")) return addLocalDays(startOfLocalDay(now), -7 * n).toISOString();
-    return addLocalDays(startOfLocalDay(now), -n).toISOString();
-  }
-  throw new Error(ISSUE_SINCE_ERROR);
-}
-function formatGitHubSearchUpdatedSince(iso) {
-  return iso.replace(/\.\d{3}Z$/, "Z");
-}
-function issueMatchesUpdatedSince(issue, sinceIso) {
-  const ts = issue.updatedAt || issue.createdAt;
-  if (!ts) return false;
-  const value = Date.parse(ts);
-  const since = Date.parse(sinceIso);
-  return Number.isFinite(value) && Number.isFinite(since) && value >= since;
-}
-var ISSUE_COMMENT_PREVIEW_CHARS = 240;
-function previewIssueCommentBody(body) {
-  const flat = body.replace(/\s+/g, " ").trim();
-  if (flat.length <= ISSUE_COMMENT_PREVIEW_CHARS) return flat;
-  return `${flat.slice(0, ISSUE_COMMENT_PREVIEW_CHARS - 1).trimEnd()}\u2026`;
-}
-function issueActivityKind(issue, sinceIso) {
-  const created = issue.createdAt ? Date.parse(issue.createdAt) : Number.NaN;
-  const since = Date.parse(sinceIso);
-  if (Number.isFinite(created) && Number.isFinite(since) && created >= since) return "created";
-  return "updated";
+    anyOk = true;
+    for (const project of parseGitHubProjectList(result.stdout)) {
+      const key = (project.id || `${project.owner ?? ""}:${project.number ?? ""}:${project.title}`).toLowerCase();
+      if (seen.has(key)) continue;
+      seen.add(key);
+      out.push(project);
+    }
+  }
+  if (!anyOk) {
+    throw new Error(rewriteGitHubProjectReadError(lastError || "gh project list failed"));
+  }
+  return out;
 }
 
 // src/integrations/github-issues.ts
@@ -529,7 +593,11 @@ async function getGitHubIssue(id, opts) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error(`GitHub issue not found: #${number}`);
   }
-  return toGitHubIssue(parsed);
+  const issue = toGitHubIssue(parsed);
+  const projects = await readGitHubIssueProjects(number, cwd, repoArgs);
+  issue.projects = projects.projects;
+  if (projects.error) issue.projectsError = projects.error;
+  return issue;
 }
 async function commentGitHubIssue(input, opts) {
   const number = parseGitHubIssueNumber(input.id);
@@ -567,46 +635,6 @@ function githubRelationEditFlag(type, remove = false) {
 function labelsEqual(a, b) {
   return a.trim().toLowerCase() === b.trim().toLowerCase();
 }
-function parseProjectTitles(raw) {
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  const push = (name) => {
-    const title = name.trim();
-    const key = title.toLowerCase();
-    if (!title || seen.has(key)) return;
-    seen.add(key);
-    out.push(title);
-  };
-  const fromItems = raw.projectItems ?? raw.projects ?? raw.projectItemsV2;
-  if (Array.isArray(fromItems)) {
-    for (const item of fromItems) {
-      if (typeof item === "string") {
-        push(item);
-        continue;
-      }
-      if (!item || typeof item !== "object") continue;
-      const rec = item;
-      const nested = rec.project && typeof rec.project === "object" ? rec.project : rec;
-      const title = String(nested.title ?? nested.name ?? rec.title ?? rec.name ?? "").trim();
-      if (title) push(title);
-    }
-  }
-  return out;
-}
-async function listGitHubIssueProjects(number, cwd, repoArgs) {
-  const result = await gh(
-    ["issue", "view", String(number), ...repoArgs, "--json", "projectItems"],
-    cwd,
-    { reject: false }
-  );
-  if (result.exitCode !== 0 || !result.stdout.trim()) return [];
-  try {
-    const parsed = JSON.parse(result.stdout);
-    return parseProjectTitles(parsed);
-  } catch {
-    return [];
-  }
-}
 async function updateGitHubIssue(input, opts) {
   const number = parseGitHubIssueNumber(input.id);
   const title = input.title?.trim();
@@ -646,7 +674,7 @@ async function updateGitHubIssue(input, opts) {
     if (remove.length) args.push("--remove-label", remove.join(","));
   }
   if (input.project !== void 0) {
-    const current = await listGitHubIssueProjects(number, cwd, repoArgs);
+    const current = await listGitHubIssueProjectNames(number, cwd, repoArgs);
     if (isGitHubNoneToken(input.project)) {
       for (const name of current) args.push("--remove-project", name);
     } else {
@@ -945,6 +973,7 @@ var LIST_ISSUE_FIELDS = `
   team { id key }
   labels(first: 10) { nodes { name } }
   cycle { id name number startsAt endsAt completedAt }
+  project { id name }
 `;
 var ISSUE_REF_FIELDS = `
   id
@@ -1121,9 +1150,10 @@ query SideboardTeamLabels($id: String!, $first: Int!, $after: String) {
 }
 `;
 var PROJECTS_QUERY = `
-query SideboardProjects($first: Int!, $filter: ProjectFilter) {
-  projects(first: $first, filter: $filter) {
+query SideboardProjects($first: Int!, $filter: ProjectFilter, $after: String) {
+  projects(first: $first, filter: $filter, after: $after) {
     nodes { id name slugId }
+    pageInfo { hasNextPage endCursor }
   }
 }
 `;
@@ -1345,6 +1375,7 @@ function toIssueInfo(issue) {
     assignees: issue.assignee?.name ? [issue.assignee.name] : void 0,
     cycle: issue.cycle ?? null,
     teamKey: issue.team?.key || void 0,
+    ...issue.project ? { projects: [issue.project] } : {},
     ...issue.createdAt ? { createdAt: issue.createdAt } : {},
     ...issue.updatedAt ? { updatedAt: issue.updatedAt } : {}
   };
@@ -1510,30 +1541,35 @@ async function listLinearLabels(opts) {
   }
   return listLinearWorkspaceLabels(opts);
 }
-async function listLinearProjects(filter, opts) {
-  const json = await linearGraphql(PROJECTS_QUERY, { first: 50, filter: filter ?? {} }, opts);
-  return (json.projects?.nodes ?? []).flatMap((node) => {
-    const id = String(node.id ?? "").trim();
-    if (!id) return [];
-    return [
-      {
-        id,
-        name: String(node.name ?? ""),
-        ...node.slugId ? { slugId: String(node.slugId) } : {}
-      }
-    ];
-  });
+async function queryLinearProjects(filter, opts) {
+  const out = [];
+  let after;
+  for (let page = 0; page < 4; page++) {
+    const json = await linearGraphql(PROJECTS_QUERY, { first: 50, filter: filter ?? {}, ...after ? { after } : {} }, opts);
+    for (const node of json.projects?.nodes ?? []) {
+      const id = String(node.id ?? "").trim();
+      if (!id) continue;
+      out.push({ id, name: String(node.name ?? ""), ...node.slugId ? { slugId: String(node.slugId) } : {} });
+    }
+    const pageInfo = json.projects?.pageInfo;
+    if (!pageInfo?.hasNextPage || !pageInfo.endCursor) break;
+    after = pageInfo.endCursor;
+  }
+  return out;
+}
+function listLinearProjects(opts) {
+  return queryLinearProjects(void 0, opts);
 }
 async function resolveLinearProjectId(project, opts) {
   if (isLinearNoneToken(project)) return null;
   const s = (project ?? "").trim();
   const filter = UUID_RE.test(s) ? { id: { eq: s } } : { name: { eqIgnoreCase: s } };
-  const matched = await listLinearProjects(filter, opts);
+  const matched = await queryLinearProjects(filter, opts);
   try {
     return resolveLinearProject(matched, s);
   } catch {
     if (UUID_RE.test(s)) return s;
-    const listed = await listLinearProjects(void 0, opts);
+    const listed = await queryLinearProjects(void 0, opts);
     return resolveLinearProject(listed, s);
   }
 }
@@ -1915,32 +1951,43 @@ function issueMatchesAssignee(issue, assignee, viewerName = "") {
 async function listGitHubIssues(repoPath, opts) {
   const limit = Math.max(1, Math.min(1e3, opts?.limit ?? 200));
   const slug = await resolveGithubRepoSlug(repoPath);
-  const args = [
-    "issue",
-    "list",
-    "--json",
-    "number,title,url,labels,assignees,createdAt,updatedAt",
-    "--limit",
-    String(limit),
-    "--state",
-    "open"
-  ];
-  const query = opts?.query?.trim() ?? "";
-  const assignee = opts?.assignee?.trim() ?? "";
-  const key = assignee.toLowerCase();
-  const searchParts = [];
-  if (query) searchParts.push(query);
-  if (opts?.updatedSince) {
-    searchParts.push(`updated:>=${formatGitHubSearchUpdatedSince(opts.updatedSince)}`);
-  }
-  if (key === "unassigned" || key === "none" || key === "null") {
-    searchParts.push("no:assignee");
-  } else if (key && key !== "all" && key !== "*") {
-    args.push("--assignee", key === "me" || key === "@me" ? "@me" : assignee);
+  const plainFields = "number,title,url,labels,assignees,createdAt,updatedAt";
+  const buildArgs = (jsonFields) => {
+    const args = [
+      "issue",
+      "list",
+      "--json",
+      jsonFields,
+      "--limit",
+      String(limit),
+      "--state",
+      "open"
+    ];
+    const query = opts?.query?.trim() ?? "";
+    const assignee = opts?.assignee?.trim() ?? "";
+    const key = assignee.toLowerCase();
+    const searchParts = [];
+    if (query) searchParts.push(query);
+    if (opts?.updatedSince) {
+      searchParts.push(`updated:>=${formatGitHubSearchUpdatedSince(opts.updatedSince)}`);
+    }
+    if (key === "unassigned" || key === "none" || key === "null") {
+      searchParts.push("no:assignee");
+    } else if (key && key !== "all" && key !== "*") {
+      args.push("--assignee", key === "me" || key === "@me" ? "@me" : assignee);
+    }
+    if (searchParts.length) args.push("--search", searchParts.join(" "));
+    if (slug) args.push("--repo", slug);
+    return args;
+  };
+  let { stdout, exitCode } = await gh(
+    buildArgs(`${plainFields},projectItems`),
+    repoPath,
+    { reject: false }
+  );
+  if (exitCode !== 0) {
+    ({ stdout, exitCode } = await gh(buildArgs(plainFields), repoPath, { reject: false }));
   }
-  if (searchParts.length) args.push("--search", searchParts.join(" "));
-  if (slug) args.push("--repo", slug);
-  const { stdout, exitCode } = await gh(args, repoPath, { reject: false });
   if (exitCode !== 0 || !stdout.trim()) return [];
   let parsed;
   try {
@@ -1959,6 +2006,9 @@ async function listGitHubIssues(repoPath, opts) {
     const assignees = (item.assignees ?? []).map((a) => typeof a === "string" ? a : String(a?.login ?? "")).map((login) => login.trim()).filter(Boolean);
     const createdAt = item.createdAt?.trim() || void 0;
     const updatedAt = item.updatedAt?.trim() || void 0;
+    const record = raw;
+    const projects = githubProjectsOnIssue(record);
+    const readProjects = "projectItems" in record || "projects" in record || "projectItemsV2" in record;
     return {
       id: Number.isFinite(number) ? `gh-${number}` : identifier,
       identifier,
@@ -1968,6 +2018,7 @@ async function listGitHubIssues(repoPath, opts) {
       provider: "github",
       assignee: assignees[0],
       assignees,
+      ...readProjects ? { projects } : {},
       ...createdAt ? { createdAt } : {},
       ...updatedAt ? { updatedAt } : {}
     };
@@ -2101,13 +2152,164 @@ function resolveRunScriptThreadRef(ref) {
   return thread.id;
 }
 
+// src/mcp/create-thread-agent.ts
+function resolveOrchCreateThreadOptions(input) {
+  const { resolveNewThreadOptions } = input;
+  const account = resolveNewThreadOptions({});
+  const requested = input.requestedAgent;
+  const parent = input.parentAgent ?? void 0;
+  const cursorReady = input.cursorReady ?? isCursorApiKeyConfigured();
+  let agent = account.agent;
+  let ignoredAgent;
+  let honorRequestedModel = false;
+  if (requested) {
+    const parentEcho = Boolean(parent) && requested === parent && requested !== account.agent;
+    const cursorAutofill = requested === "cursor" && account.agent !== "cursor";
+    if (parentEcho || cursorAutofill) {
+      ignoredAgent = requested;
+    } else {
+      agent = requested;
+      honorRequestedModel = input.requestedModel !== void 0;
+    }
+  }
+  let coercedFrom;
+  if (agent === "codex" && parent === "codex" && cursorReady) {
+    coercedFrom = requested ?? "codex";
+    agent = "cursor";
+  }
+  const opts = resolveNewThreadOptions({
+    agent,
+    model: honorRequestedModel ? input.requestedModel : void 0
+  });
+  return {
+    ...opts,
+    ...ignoredAgent ? { ignoredAgent } : {},
+    ...coercedFrom ? { coercedFrom } : {}
+  };
+}
+function orchCreateThreadAgentNote(input) {
+  if (input.coercedFrom) {
+    return `Avoid nested Codex under a Codex orchestrator \u2014 used agent=${input.agent}`;
+  }
+  if (input.ignoredAgent) {
+    return `Ignored agent=${input.ignoredAgent} \u2014 used Account default agent=${input.agent}`;
+  }
+  return void 0;
+}
+
+// src/mcp/create-orch-child.ts
+var MAX_ORCH_THREADS = 5;
+var CREATE_THREAD_TIMEOUT_MS = 9e4;
+function withTimeout(promise, ms, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`${label} timed out after ${Math.round(ms / 1e3)}s`));
+    }, ms);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      }
+    );
+  });
+}
+async function createOrchChildThread(orch, args, resolveNewThreadOptions) {
+  const envParentId = process.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID?.trim() || "";
+  let parentId = args.parentChatId?.trim() || args.parentThreadId?.trim() || "";
+  let parent = parentId ? orch.getThread(parentId) : null;
+  let parentCorrectedFrom;
+  if (envParentId) {
+    const envParent = orch.getThread(envParentId);
+    if (envParent) {
+      if (parentId && parentId !== envParentId) parentCorrectedFrom = parentId;
+      else if (!parentId) parentCorrectedFrom = void 0;
+      parentId = envParentId;
+      parent = envParent;
+    }
+  }
+  if (parentId && !parent) {
+    parentCorrectedFrom = parentId;
+    parentId = "";
+    parent = null;
+  }
+  if (parentId) {
+    const children = orch.getThreads(false).filter((t) => t.parentThreadId === parentId);
+    if (children.length >= MAX_ORCH_THREADS) {
+      return {
+        ok: false,
+        text: `Thread-creation cap (${MAX_ORCH_THREADS}) reached for this orchestration session`
+      };
+    }
+  }
+  const opts = resolveOrchCreateThreadOptions({
+    requestedAgent: args.agent,
+    requestedModel: args.model,
+    parentAgent: parent?.agent,
+    resolveNewThreadOptions
+  });
+  const agentNote = orchCreateThreadAgentNote(opts);
+  try {
+    const priorIds = new Set(orch.getThreads(false).map((t) => t.id));
+    const thread = await withTimeout(
+      orch.createThread({
+        sourceType: args.sourceType,
+        sourceRef: args.sourceRef,
+        agent: opts.agent,
+        model: opts.model,
+        effort: opts.effort,
+        fast: opts.fast,
+        repoPath: args.repoPath,
+        title: args.title,
+        parentThreadId: parentId || null,
+        cowboy: args.cowboy || void 0,
+        attachments: args.attachments,
+        tags: args.tags === void 0 ? void 0 : normalizeWorkspaceTags(args.tags)
+      }),
+      CREATE_THREAD_TIMEOUT_MS,
+      "create_workspace"
+    );
+    const alreadyStarted = priorIds.has(thread.id);
+    const parentNote = parentCorrectedFrom ? parentId ? `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; nested under ${parentId}` : `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; created without parent` : void 0;
+    return {
+      ok: true,
+      text: JSON.stringify({
+        id: thread.id,
+        title: thread.title,
+        branchName: thread.branchName,
+        worktreePath: thread.worktreePath,
+        agent: thread.agent,
+        model: thread.model,
+        status: thread.status,
+        cowboy: Boolean(thread.cowboy),
+        link: `sideboard://chat/${thread.id}`,
+        parentChatId: thread.parentThreadId,
+        parentThreadId: thread.parentThreadId,
+        tags: thread.tags ?? [],
+        chats: workspaceAgentChatSummaries(thread.worktreePath),
+        ...alreadyStarted ? { alreadyStarted: true } : {},
+        ...opts.coercedFrom ? { agentCoercedFrom: opts.coercedFrom } : {},
+        ...opts.ignoredAgent ? { agentIgnored: opts.ignoredAgent } : {},
+        ...agentNote ? { note: agentNote } : {},
+        ...parentCorrectedFrom ? { parentCorrectedFrom, parentNote } : {}
+      })
+    };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { ok: false, text: `create_workspace failed: ${message}` };
+  }
+}
+
 // src/mcp/thread-visibility.ts
 function lastMessagePreview(messages, max = 160) {
   if (!messages?.length) return null;
   for (let i = messages.length - 1; i >= 0; i--) {
-    const text6 = messages[i]?.text?.trim();
-    if (!text6 || isInternalAgentStatusText(text6) || isInjectedNoticeText(text6)) continue;
-    const flat = text6.replace(/\s+/g, " ");
+    const text5 = messages[i]?.text?.trim();
+    if (!text5 || isInternalAgentStatusText(text5) || isInjectedNoticeText(text5)) continue;
+    const flat = text5.replace(/\s+/g, " ");
     return flat.length > max ? `${flat.slice(0, max)}\u2026` : flat;
   }
   return null;
@@ -2124,97 +2326,28 @@ function childThreadRefs(parentId, threads) {
 }
 
 // src/mcp/abletime-tools.ts
-import { z as z3 } from "zod";
+import { z as z2 } from "zod";
 
-// src/mcp/issue-list.ts
+// src/mcp/issue-payload.ts
 import { z } from "zod";
-var MCP_ISSUE_LIST_DEFAULT_LIMIT = 40;
-var MCP_ISSUE_LIST_MAX_LIMIT = 250;
-function clampMcpIssueLimit(limit) {
-  if (limit == null || !Number.isFinite(limit)) return MCP_ISSUE_LIST_DEFAULT_LIMIT;
-  return Math.max(1, Math.min(MCP_ISSUE_LIST_MAX_LIMIT, Math.floor(limit)));
-}
-function applyIssueListWindow(items, limit) {
-  const truncated = items.length > limit;
-  return {
-    items: truncated ? items.slice(0, limit) : items,
-    truncated
-  };
+
+// src/mcp/smart-crush.ts
+var MUST_KEEP_TEXT_RE = /\b(error|exception|failed|failure|fatal|critical|panic|traceback|npm err|assert)\b/i;
+var CRUSH_MIN_ITEMS = 5;
+var CRUSH_MIN_CHARS = 800;
+var CRUSH_COMMENT_MAX_CHARS = 16e3;
+var CRUSH_BODY_MIN_CHARS = 12e3;
+var CRUSH_BODY_MAX_CHARS = 8e3;
+var NEAR_DUP_JACCARD = 0.92;
+function looksLikeMustKeep(text5) {
+  return MUST_KEEP_TEXT_RE.test(text5);
 }
-var MCP_ISSUE_UPDATED_SINCE_DESCRIPTION = "ISO datetime, YYYY-MM-DD, or relative (yesterday, 2d, 3 hours ago). Tickets updated since then plus new comments. Use for \u201Cany updates since yesterday?\u201D";
-var mcpIssueUpdatedSinceSchema = z.string().min(1).optional().describe(MCP_ISSUE_UPDATED_SINCE_DESCRIPTION);
-function compactIssueRow(issue, opts) {
-  return {
-    identifier: issue.identifier,
-    title: issue.title,
-    ...issue.assignee ? { assignee: issue.assignee } : {},
-    ...issue.labels.length > 0 ? { labels: issue.labels } : {},
-    ...issue.teamKey ? { team: issue.teamKey } : {},
-    ...issue.cycle?.name ? { cycle: issue.cycle.name } : {},
-    ...issue.createdAt ? { createdAt: issue.createdAt } : {},
-    ...issue.updatedAt ? { updatedAt: issue.updatedAt } : {},
-    ...opts?.since ? { kind: issueActivityKind(issue, opts.since) } : {}
-  };
-}
-function formatMcpIssueList(input) {
-  const truncated = input.truncated || Boolean(input.commentsTruncated);
-  const comments = input.comments ?? [];
-  return {
-    ...input.source ? { source: input.source } : {},
-    ...input.viewer ? { viewer: input.viewer } : {},
-    limit: input.limit,
-    returned: input.issues.length,
-    truncated,
-    ...input.since ? { since: input.since } : {},
-    ...truncated ? {
-      hint: input.since ? "More issues or comments match. Pass a higher limit (max 250) or a tighter query." : "More issues match. Pass a higher limit (max 250) or a tighter query."
-    } : {},
-    issues: input.issues.map((issue) => compactIssueRow(issue, { since: input.since })),
-    ...input.since || comments.length > 0 ? { comments } : {}
-  };
-}
-function formatListedIssuesForMcp(result, page) {
-  const windowed = applyIssueListWindow(result.issues, page);
-  const comments = result.comments ?? [];
-  const commentWindow = applyIssueListWindow(comments, page);
-  return formatMcpIssueList({
-    source: result.source,
-    viewer: result.viewer?.name || result.viewer?.login,
-    limit: page,
-    issues: windowed.items,
-    truncated: windowed.truncated,
-    since: result.since,
-    comments: commentWindow.items,
-    commentsTruncated: commentWindow.truncated
-  });
-}
-function mcpJson(payload, isError = false) {
-  return {
-    content: [{ type: "text", text: JSON.stringify(payload) }],
-    ...isError ? { isError: true } : {}
-  };
-}
-
-// src/mcp/issue-payload.ts
-import { z as z2 } from "zod";
-
-// src/mcp/smart-crush.ts
-var MUST_KEEP_TEXT_RE = /\b(error|exception|failed|failure|fatal|critical|panic|traceback|npm err|assert)\b/i;
-var CRUSH_MIN_ITEMS = 5;
-var CRUSH_MIN_CHARS = 800;
-var CRUSH_COMMENT_MAX_CHARS = 16e3;
-var CRUSH_BODY_MIN_CHARS = 12e3;
-var CRUSH_BODY_MAX_CHARS = 8e3;
-var NEAR_DUP_JACCARD = 0.92;
-function looksLikeMustKeep(text6) {
-  return MUST_KEEP_TEXT_RE.test(text6);
-}
-function normalizeText(text6) {
-  return text6.replace(/\s+/g, " ").trim().toLowerCase();
+function normalizeText(text5) {
+  return text5.replace(/\s+/g, " ").trim().toLowerCase();
 }
-function wordSet(text6) {
+function wordSet(text5) {
   return new Set(
-    text6.toLowerCase().split(/\W+/).filter((w) => w.length > 2)
+    text5.toLowerCase().split(/\W+/).filter((w) => w.length > 2)
   );
 }
 function jaccard(a, b) {
@@ -2226,11 +2359,11 @@ function jaccard(a, b) {
   const union = a.size + b.size - inter;
   return union === 0 ? 0 : inter / union;
 }
-function importance(text6) {
-  let score = text6.length;
-  if (/```/.test(text6)) score += 400;
-  if (/https?:\/\//.test(text6)) score += 50;
-  if (looksLikeMustKeep(text6)) score += 1e4;
+function importance(text5) {
+  let score = text5.length;
+  if (/```/.test(text5)) score += 400;
+  if (/https?:\/\//.test(text5)) score += 50;
+  if (looksLikeMustKeep(text5)) score += 1e4;
   return score;
 }
 function meanStd(values) {
@@ -2244,15 +2377,15 @@ function dedupTextItems(items, getText) {
   const keptNorm = [];
   const keptWords = [];
   for (const item of items) {
-    const text6 = getText(item);
-    const norm = normalizeText(text6);
+    const text5 = getText(item);
+    const norm = normalizeText(text5);
     if (!norm) {
       kept.push(item);
       keptNorm.push(norm);
-      keptWords.push(wordSet(text6));
+      keptWords.push(wordSet(text5));
       continue;
     }
-    const words = wordSet(text6);
+    const words = wordSet(text5);
     let dupAt = -1;
     for (let i = 0; i < kept.length; i++) {
       if (keptNorm[i] === norm) {
@@ -2270,7 +2403,7 @@ function dedupTextItems(items, getText) {
       keptWords.push(words);
       continue;
     }
-    if (text6.length > getText(kept[dupAt]).length) {
+    if (text5.length > getText(kept[dupAt]).length) {
       kept[dupAt] = item;
       keptNorm[dupAt] = norm;
       keptWords[dupAt] = words;
@@ -2311,8 +2444,8 @@ function crushTextItems(items, getText, opts = {}) {
   const outlierFloor = mean + 2 * std;
   const mustKeep = /* @__PURE__ */ new Set();
   unique.forEach((item, i) => {
-    const text6 = getText(item);
-    if (looksLikeMustKeep(text6) || text6.length > outlierFloor) mustKeep.add(i);
+    const text5 = getText(item);
+    if (looksLikeMustKeep(text5) || text5.length > outlierFloor) mustKeep.add(i);
   });
   const remainingIdx = unique.map((_, i) => i).filter((i) => !mustKeep.has(i));
   let used = [...mustKeep].reduce((n, i) => n + lengths[i], 0);
@@ -2354,9 +2487,9 @@ function crushTextItems(items, getText, opts = {}) {
     reason: "budget"
   };
 }
-function splitBlocks(text6) {
-  if (/\n\n/.test(text6)) return text6.split(/\n\n+/);
-  return text6.split("\n");
+function splitBlocks(text5) {
+  if (/\n\n/.test(text5)) return text5.split(/\n\n+/);
+  return text5.split("\n");
 }
 function capOversizedBlock(block, maxChars) {
   if (block.length <= maxChars) return block;
@@ -2368,8 +2501,8 @@ function capOversizedBlock(block, maxChars) {
 
 ${block.slice(-tail)}`;
 }
-function crushMarkdown(text6, opts) {
-  const original = text6 ?? "";
+function crushMarkdown(text5, opts) {
+  const original = text5 ?? "";
   const minChars = opts?.minChars ?? CRUSH_BODY_MIN_CHARS;
   const maxChars = opts?.maxChars ?? CRUSH_BODY_MAX_CHARS;
   if (original.length < minChars) {
@@ -2441,7 +2574,7 @@ function crushMarkdown(text6, opts) {
 
 // src/mcp/issue-payload.ts
 var MCP_ISSUE_INCLUDE_VALUES = ["default", "full"];
-var mcpIssueIncludeSchema = z2.enum(MCP_ISSUE_INCLUDE_VALUES).optional().describe(
+var mcpIssueIncludeSchema = z.enum(MCP_ISSUE_INCLUDE_VALUES).optional().describe(
   "default applies SmartCrusher-style crush (dedup + budget; small unique tickets pass through). full returns the uncompressed vendor payload. Re-call with include=full if crush.truncated."
 );
 var MCP_ISSUE_CRUSH_HINT = "Pass include=full to re-fetch the uncompressed ticket from the vendor.";
@@ -2459,13 +2592,13 @@ function withComments(comments, meta) {
   }
   return { comments: crushed.items, meta };
 }
-function withBody(text6, meta) {
-  const crushed = crushMarkdown(text6);
+function withBody(text5, meta) {
+  const crushed = crushMarkdown(text5);
   if (crushed.truncated) {
     meta.body = { originalChars: crushed.originalChars };
     return { value: crushed.text, meta };
   }
-  return { value: text6, meta };
+  return { value: text5, meta };
 }
 function attachCrush(payload, meta) {
   if (!meta.comments && !meta.body) return payload;
@@ -2587,7 +2720,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_list_tasks",
     "List open AbleTime tasks (excludes done/archived). Optional projectId filter. Pass updatedSince for tasks updated since then and any comments on that page.",
-    { projectId: z3.string().optional(), updatedSince: mcpIssueUpdatedSinceSchema },
+    { projectId: z2.string().optional(), updatedSince: mcpIssueUpdatedSinceSchema },
     async ({ projectId, updatedSince }) => {
       try {
         const tasks = await listAbleTimeTasks({ projectId });
@@ -2600,7 +2733,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_search_tasks",
     "Search AbleTime tasks by text, reference, or tag. Pass updatedSince for tasks updated since then and any comments on that page.",
-    { query: z3.string(), updatedSince: mcpIssueUpdatedSinceSchema },
+    { query: z2.string(), updatedSince: mcpIssueUpdatedSinceSchema },
     async ({ query, updatedSince }) => {
       try {
         const tasks = await searchAbleTimeTasks(query);
@@ -2612,8 +2745,8 @@ function registerAbleTimeTools(server) {
   );
   server.tool(
     "abletime_get_task",
-    "Get one AbleTime task by id or reference (e.g. CRM-232): description, state, comments, attachments. Re-fetch to read new comments. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. To save a file, call abletime_download_attachment with the attachment id or url (writes `.context/attachments/`; do not dump bytes into the tool result).",
-    { id: z3.string(), include: mcpIssueIncludeSchema },
+    "Get one AbleTime task by id or reference (e.g. CRM-232): description, state, project, comments, attachments. Re-fetch to read new comments. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. To save a file, call abletime_download_attachment with the attachment id or url (writes `.context/attachments/`; do not dump bytes into the tool result).",
+    { id: z2.string(), include: mcpIssueIncludeSchema },
     async ({ id, include }) => {
       try {
         return text(formatAbleTimeTaskPayload(await getAbleTimeTask(id), include));
@@ -2626,9 +2759,9 @@ function registerAbleTimeTools(server) {
     "abletime_download_attachment",
     "Download an AbleTime task file into `.context/attachments/` using Account AbleTime auth. Pass the attachment id or URL from abletime_get_task. Returns the worktree-relative path \u2014 Read that file; do not dump bytes into chat.",
     {
-      id: z3.string().describe("Attachment id or URL from abletime_get_task."),
-      name: z3.string().optional().describe("Optional filename override."),
-      repoPath: z3.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).")
+      id: z2.string().describe("Attachment id or URL from abletime_get_task."),
+      name: z2.string().optional().describe("Optional filename override."),
+      repoPath: z2.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).")
     },
     async ({ id, name, repoPath }) => {
       try {
@@ -2641,7 +2774,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_comment",
     "Add a markdown comment on an AbleTime task (id or CRM-232). When reviewing a PR or ticket, show the draft in chat and wait until they type a next step \u2014 do not ask_user after the review. The author sees this immediately.",
-    { id: z3.string(), body: z3.string() },
+    { id: z2.string(), body: z2.string() },
     async (args) => {
       try {
         return text(await commentAbleTimeTask(args));
@@ -2650,23 +2783,23 @@ function registerAbleTimeTools(server) {
       }
     }
   );
-  const relationInputSchema = z3.object({
-    type: z3.string().describe("blockedBy (this waits on issue) or blocks (issue waits on this)."),
-    issue: z3.string().describe("Related task id or reference (CRM-232).")
+  const relationInputSchema = z2.object({
+    type: z2.string().describe("blockedBy (this waits on issue) or blocks (issue waits on this)."),
+    issue: z2.string().describe("Related task id or reference (CRM-232).")
   });
   server.tool(
     "abletime_update_task",
     'Update an AbleTime task (id or CRM-232). Pass title, description, state, labels, project, parent, and/or relations. labels replaces tags. project is name or id (tasks stay in a project). parent is CRM-232 or "none". relations sets the wait-on dependency (blockedBy/blocks); removeRelations clears it. When reviewing a PR or ticket, wait until they type a next step before changing the task \u2014 do not ask_user after the review. The author is notified.',
     {
-      id: z3.string(),
-      title: z3.string().optional(),
-      description: z3.string().optional(),
-      state: z3.string().optional(),
-      labels: z3.array(z3.string()).optional().describe("Replace tags/labels. Empty array clears when the host accepts it."),
-      project: z3.string().nullable().optional().describe("Project name or id. AbleTime tasks stay in a project."),
-      parent: z3.string().nullable().optional().describe('Parent task id or reference (CRM-232), or "none" to unset.'),
-      relations: z3.array(relationInputSchema).optional().describe("Set a wait-on dependency: blockedBy or blocks."),
-      removeRelations: z3.array(relationInputSchema).optional().describe("Clear a wait-on dependency.")
+      id: z2.string(),
+      title: z2.string().optional(),
+      description: z2.string().optional(),
+      state: z2.string().optional(),
+      labels: z2.array(z2.string()).optional().describe("Replace tags/labels. Empty array clears when the host accepts it."),
+      project: z2.string().nullable().optional().describe("Project name or id. AbleTime tasks stay in a project."),
+      parent: z2.string().nullable().optional().describe('Parent task id or reference (CRM-232), or "none" to unset.'),
+      relations: z2.array(relationInputSchema).optional().describe("Set a wait-on dependency: blockedBy or blocks."),
+      removeRelations: z2.array(relationInputSchema).optional().describe("Clear a wait-on dependency.")
     },
     async (args) => {
       try {
@@ -2685,12 +2818,12 @@ function registerAbleTimeTools(server) {
     "abletime_create_task",
     "Create an AbleTime task in a project. Call abletime_list_projects if you do not have a project id. Pass parent (CRM-232) for a spin-off. New tasks start in todo (or backlog).",
     {
-      title: z3.string(),
-      description: z3.string().optional(),
-      projectId: z3.string().optional(),
-      categoryId: z3.string().optional(),
-      state: z3.enum(["backlog", "todo"]).optional(),
-      parent: z3.string().optional().describe("Parent task id or reference (CRM-232) for a spin-off.")
+      title: z2.string(),
+      description: z2.string().optional(),
+      projectId: z2.string().optional(),
+      categoryId: z2.string().optional(),
+      state: z2.enum(["backlog", "todo"]).optional(),
+      parent: z2.string().optional().describe("Parent task id or reference (CRM-232) for a spin-off.")
     },
     async (args) => {
       try {
@@ -2704,10 +2837,10 @@ function registerAbleTimeTools(server) {
     "abletime_ensure_task",
     "Find or create an AbleTime task for this work, then create_workspace with sourceType=ticket.",
     {
-      title: z3.string(),
-      description: z3.string().optional(),
-      projectId: z3.string().optional(),
-      categoryId: z3.string().optional()
+      title: z2.string(),
+      description: z2.string().optional(),
+      projectId: z2.string().optional(),
+      categoryId: z2.string().optional()
     },
     async (args) => {
       try {
@@ -2721,7 +2854,7 @@ function registerAbleTimeTools(server) {
 }
 
 // src/mcp/github-tools.ts
-import { z as z4 } from "zod";
+import { z as z3 } from "zod";
 function text2(payload, isError = false) {
   return mcpJson(payload, isError);
 }
@@ -2731,15 +2864,15 @@ function fail2(err) {
     true
   );
 }
-var repoPathSchema = z4.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).");
+var repoPathSchema = z3.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).");
 function registerGithubIssueTools(server) {
   server.tool(
     "github_search_issues",
     "Search or list open GitHub issues in this repo via Account gh. Default 40; pass query and/or limit (max 250) when truncated. assignee: me, unassigned, all, or a login. Pass updatedSince for new/updated tickets and new comments (e.g. \u201Cany updates since yesterday?\u201D).",
     {
-      query: z4.string().optional().describe("Search text (title, body, identifiers). Omit to list by assignee only."),
-      assignee: z4.string().optional().describe("me, unassigned, all, or a GitHub login. Default: all when query is set, otherwise me."),
-      limit: z4.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
+      query: z3.string().optional().describe("Search text (title, body, identifiers). Omit to list by assignee only."),
+      assignee: z3.string().optional().describe("me, unassigned, all, or a GitHub login. Default: all when query is set, otherwise me."),
+      limit: z3.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
       updatedSince: mcpIssueUpdatedSinceSchema,
       repoPath: repoPathSchema
     },
@@ -2776,10 +2909,22 @@ function registerGithubIssueTools(server) {
       }
     }
   );
+  server.tool(
+    "github_list_projects",
+    "List open GitHub Projects for the signed-in user and this repo owner (title, number, id). Pass a title as project on github_update_issue. If GitHub says the token is missing read:project, run `gh auth refresh -s read:project`.",
+    { repoPath: repoPathSchema },
+    async ({ repoPath }) => {
+      try {
+        return text2({ projects: await listGitHubProjects({ repoPath }) });
+      } catch (err) {
+        return fail2(err);
+      }
+    }
+  );
   server.tool(
     "github_get_issue",
-    "Get a GitHub issue (#123 or URL): body, comments, state, attachments. Re-fetch to read new comments. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. Uses Account gh. To save a file, call github_download_attachment with the attachment URL (writes `.context/attachments/`; do not dump bytes into the tool result).",
-    { id: z4.string(), include: mcpIssueIncludeSchema, repoPath: repoPathSchema },
+    "Get a GitHub issue (#123 or URL): body, comments, state, projects, attachments. Re-fetch to read new comments. projectsError means GitHub refused Projects (usually missing read:project \u2014 run `gh auth refresh -s read:project`). Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. Uses Account gh. To save a file, call github_download_attachment with the attachment URL (writes `.context/attachments/`; do not dump bytes into the tool result).",
+    { id: z3.string(), include: mcpIssueIncludeSchema, repoPath: repoPathSchema },
     async ({ id, include, repoPath }) => {
       try {
         return text2(formatGitHubIssuePayload(await getGitHubIssue(id, { repoPath }), include));
@@ -2792,8 +2937,8 @@ function registerGithubIssueTools(server) {
     "github_download_attachment",
     "Download a GitHub issue file (github.com/user-attachments/\u2026 or githubusercontent.com) into `.context/attachments/` using Account gh. Pass the URL from github_get_issue attachments. Returns the worktree-relative path \u2014 Read that file; do not dump bytes into chat.",
     {
-      url: z4.string().describe("Attachment URL from github_get_issue."),
-      name: z4.string().optional().describe("Optional filename override."),
+      url: z3.string().describe("Attachment URL from github_get_issue."),
+      name: z3.string().optional().describe("Optional filename override."),
       repoPath: repoPathSchema
     },
     async ({ url, name, repoPath }) => {
@@ -2807,7 +2952,7 @@ function registerGithubIssueTools(server) {
   server.tool(
     "github_comment",
     "Add a markdown comment on a GitHub issue (#123 or URL). Uses Account gh. When reviewing a PR or ticket, show the draft in chat and wait until they type a next step \u2014 do not ask_user after the review. The author sees this immediately.",
-    { id: z4.string(), body: z4.string(), repoPath: repoPathSchema },
+    { id: z3.string(), body: z3.string(), repoPath: repoPathSchema },
     async ({ id, body, repoPath }) => {
       try {
         return text2(await commentGitHubIssue({ id, body }, { repoPath }));
@@ -2816,23 +2961,23 @@ function registerGithubIssueTools(server) {
       }
     }
   );
-  const relationInputSchema = z4.object({
-    type: z4.string().describe("blocks or blockedBy (this issue's view)."),
-    issue: z4.string().describe("Related issue #123 or URL.")
+  const relationInputSchema = z3.object({
+    type: z3.string().describe("blocks or blockedBy (this issue's view)."),
+    issue: z3.string().describe("Related issue #123 or URL.")
   });
   server.tool(
     "github_update_issue",
     'Update a GitHub issue (#123). Pass title, body, state (open|closed), labels, project, parent, and/or relations. labels replaces all names (pass [] to clear). project is a Project title, or "none" to remove. parent is #123 or "none". relations adds blockedBy/blocks; removeRelations drops them (`gh` 2.94+). When reviewing a PR or ticket, wait until they type a next step before changing the issue \u2014 do not ask_user after the review. The author is notified.',
     {
-      id: z4.string(),
-      title: z4.string().optional(),
-      body: z4.string().optional(),
-      state: z4.string().optional().describe("open or closed"),
-      labels: z4.array(z4.string()).optional().describe("Replace all labels. Empty array clears. Call github_get_issue first to keep existing."),
-      project: z4.string().nullable().optional().describe('GitHub Project title, or "none" to remove current projects.'),
-      parent: z4.string().nullable().optional().describe('Parent issue #123 or URL, or "none" to unset.'),
-      relations: z4.array(relationInputSchema).optional().describe("Add blockedBy or blocks relations (issue #123 or URL)."),
-      removeRelations: z4.array(relationInputSchema).optional().describe("Remove blockedBy or blocks relations."),
+      id: z3.string(),
+      title: z3.string().optional(),
+      body: z3.string().optional(),
+      state: z3.string().optional().describe("open or closed"),
+      labels: z3.array(z3.string()).optional().describe("Replace all labels. Empty array clears. Call github_get_issue first to keep existing."),
+      project: z3.string().nullable().optional().describe('GitHub Project title, or "none" to remove current projects.'),
+      parent: z3.string().nullable().optional().describe('Parent issue #123 or URL, or "none" to unset.'),
+      relations: z3.array(relationInputSchema).optional().describe("Add blockedBy or blocks relations (issue #123 or URL)."),
+      removeRelations: z3.array(relationInputSchema).optional().describe("Remove blockedBy or blocks relations."),
       repoPath: repoPathSchema
     },
     async (args) => {
@@ -2847,9 +2992,9 @@ function registerGithubIssueTools(server) {
     "github_create_issue",
     "Create a GitHub issue. Pass parent (#123) to mark a spin-off in the body.",
     {
-      title: z4.string(),
-      body: z4.string().optional(),
-      parent: z4.string().optional().describe("Parent issue #123 or URL for a spin-off."),
+      title: z3.string(),
+      body: z3.string().optional(),
+      parent: z3.string().optional().describe("Parent issue #123 or URL for a spin-off."),
       repoPath: repoPathSchema
     },
     async (args) => {
@@ -2863,7 +3008,7 @@ function registerGithubIssueTools(server) {
 }
 
 // src/mcp/linear-tools.ts
-import { z as z5 } from "zod";
+import { z as z4 } from "zod";
 function text3(payload, isError = false) {
   return mcpJson(payload, isError);
 }
@@ -2873,7 +3018,7 @@ function fail3(err) {
     true
   );
 }
-var prioritySchema = z5.number().int().min(0).max(4).optional().describe("0 none, 1 urgent, 2 high, 3 medium, 4 low");
+var prioritySchema = z4.number().int().min(0).max(4).optional().describe("0 none, 1 urgent, 2 high, 3 medium, 4 low");
 function registerLinearTools(server) {
   server.tool(
     "linear_list_teams",
@@ -2887,13 +3032,25 @@ function registerLinearTools(server) {
       }
     }
   );
+  server.tool(
+    "linear_list_projects",
+    "List Linear projects (id, name, slugId). Pass a name or id as project on linear_update_issue. linear_get_issue and search rows also include the project a ticket is on.",
+    {},
+    async () => {
+      try {
+        return text3({ projects: await listLinearProjects() });
+      } catch (err) {
+        return fail3(err);
+      }
+    }
+  );
   server.tool(
     "linear_search_issues",
     "Search or list open Linear issues. Default 40; pass query and/or limit (max 250) when truncated. assignee: me, unassigned, all (default with query), or a user id/name. Pass updatedSince for new/updated tickets and new comments (e.g. \u201Cany updates since yesterday?\u201D).",
     {
-      query: z5.string().optional().describe("Search text (identifier, title, description). Omit to list by assignee only."),
-      assignee: z5.string().optional().describe("me, unassigned, all, a Linear user id, or a display name. Default: all when query is set, otherwise me."),
-      limit: z5.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
+      query: z4.string().optional().describe("Search text (identifier, title, description). Omit to list by assignee only."),
+      assignee: z4.string().optional().describe("me, unassigned, all, a Linear user id, or a display name. Default: all when query is set, otherwise me."),
+      limit: z4.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
       updatedSince: mcpIssueUpdatedSinceSchema
     },
     async ({ query, assignee, limit, updatedSince }) => {
@@ -2932,8 +3089,8 @@ function registerLinearTools(server) {
   );
   server.tool(
     "linear_get_issue",
-    "Get a Linear issue by uuid or identifier (ENG-123): description, comments, relations, parent/children, attachments. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. To save a file, call linear_download_attachment with the attachment id or url (writes `.context/attachments/`; do not dump bytes into the tool result).",
-    { id: z5.string(), include: mcpIssueIncludeSchema },
+    "Get a Linear issue by uuid or identifier (ENG-123): description, comments, relations, parent/children, project, attachments. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload. To save a file, call linear_download_attachment with the attachment id or url (writes `.context/attachments/`; do not dump bytes into the tool result).",
+    { id: z4.string(), include: mcpIssueIncludeSchema },
     async ({ id, include }) => {
       try {
         return text3(formatLinearIssuePayload(await getLinearIssue(id), include));
@@ -2946,9 +3103,9 @@ function registerLinearTools(server) {
     "linear_download_attachment",
     "Download a Linear file attachment into `.context/attachments/` using Account Linear auth. Pass the attachment uuid or uploads.linear.app URL from linear_get_issue. Returns the worktree-relative path \u2014 Read that file; do not dump bytes into chat.",
     {
-      id: z5.string().describe("Attachment uuid or upload URL from linear_get_issue."),
-      name: z5.string().optional().describe("Optional filename override."),
-      repoPath: z5.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).")
+      id: z4.string().describe("Attachment uuid or upload URL from linear_get_issue."),
+      name: z4.string().optional().describe("Optional filename override."),
+      repoPath: z4.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).")
     },
     async ({ id, name, repoPath }) => {
       try {
@@ -2962,13 +3119,13 @@ function registerLinearTools(server) {
     "linear_create_issue",
     'Create a Linear issue. Call linear_list_teams first. team is id/key/name; state is name/type/id; assignee is "me" or a user id. Pass parent (ENG-123 or uuid) to nest a spin-off under the current ticket.',
     {
-      team: z5.string(),
-      title: z5.string(),
-      description: z5.string().optional(),
-      state: z5.string().optional(),
-      assignee: z5.string().nullable().optional(),
+      team: z4.string(),
+      title: z4.string(),
+      description: z4.string().optional(),
+      state: z4.string().optional(),
+      assignee: z4.string().nullable().optional(),
       priority: prioritySchema,
-      parent: z5.string().optional().describe("Parent issue uuid or identifier (ENG-123) for a spin-off / sub-issue.")
+      parent: z4.string().optional().describe("Parent issue uuid or identifier (ENG-123) for a spin-off / sub-issue.")
     },
     async (args) => {
       try {
@@ -2978,26 +3135,26 @@ function registerLinearTools(server) {
       }
     }
   );
-  const relationInputSchema = z5.object({
-    type: z5.string().describe("blocks, blockedBy, related, duplicate, or duplicateOf (this issue's view)."),
-    issue: z5.string().describe("Related issue uuid or identifier (ENG-123).")
+  const relationInputSchema = z4.object({
+    type: z4.string().describe("blocks, blockedBy, related, duplicate, or duplicateOf (this issue's view)."),
+    issue: z4.string().describe("Related issue uuid or identifier (ENG-123).")
   });
   server.tool(
     "linear_update_issue",
     'Update a Linear issue (uuid or ENG-123). Pass title, description, state, assignee, priority, cycle, labels, project, parent, and/or relations. Cycle/project/parent: name or id, or "none" to clear. labels replaces all names (pass [] to clear; get the issue first to keep existing). relations adds; removeRelations removes by type + issue. When reviewing a PR or ticket, wait until they type a next step before changing the ticket \u2014 do not ask_user after the review. The author is notified.',
     {
-      id: z5.string(),
-      title: z5.string().optional(),
-      description: z5.string().optional(),
-      state: z5.string().optional(),
-      assignee: z5.string().nullable().optional(),
+      id: z4.string(),
+      title: z4.string().optional(),
+      description: z4.string().optional(),
+      state: z4.string().optional(),
+      assignee: z4.string().nullable().optional(),
       priority: prioritySchema,
-      cycle: z5.string().nullable().optional().describe('Cycle name, number, "current"/"active", or "none" to unschedule.'),
-      labels: z5.array(z5.string()).optional().describe("Replace all labels (names or ids). Empty array clears. Call linear_get_issue first to keep existing."),
-      project: z5.string().nullable().optional().describe('Project name, id, slug, or "none" to unassign.'),
-      parent: z5.string().nullable().optional().describe('Parent issue uuid or identifier (ENG-123), or "none" to unset.'),
-      relations: z5.array(relationInputSchema).optional().describe("Add relations from this issue's view (blocks, blockedBy, related, duplicate, duplicateOf)."),
-      removeRelations: z5.array(relationInputSchema).optional().describe("Remove relations by type + related issue (uuid or ENG-123).")
+      cycle: z4.string().nullable().optional().describe('Cycle name, number, "current"/"active", or "none" to unschedule.'),
+      labels: z4.array(z4.string()).optional().describe("Replace all labels (names or ids). Empty array clears. Call linear_get_issue first to keep existing."),
+      project: z4.string().nullable().optional().describe('Project name, id, slug, or "none" to unassign.'),
+      parent: z4.string().nullable().optional().describe('Parent issue uuid or identifier (ENG-123), or "none" to unset.'),
+      relations: z4.array(relationInputSchema).optional().describe("Add relations from this issue's view (blocks, blockedBy, related, duplicate, duplicateOf)."),
+      removeRelations: z4.array(relationInputSchema).optional().describe("Remove relations by type + related issue (uuid or ENG-123).")
     },
     async (args) => {
       try {
@@ -3011,8 +3168,8 @@ function registerLinearTools(server) {
     "linear_comment",
     "Add a markdown comment on a Linear issue (uuid or ENG-123). When reviewing a PR or ticket, show the draft in chat and wait until they type a next step \u2014 do not ask_user after the review. The author sees this immediately.",
     {
-      id: z5.string(),
-      body: z5.string()
+      id: z4.string(),
+      body: z4.string()
     },
     async (args) => {
       try {
@@ -3031,104 +3188,6 @@ function registerConnectedIssueVendorTools(server, settings = loadAppSettings())
   if (isAbleTimeConnected(settings)) registerAbleTimeTools(server);
 }
 
-// src/mcp/viewer-context-tools.ts
-import { z as z6 } from "zod";
-function text4(payload, isError = false) {
-  return mcpJson(payload, isError);
-}
-function matchRegisteredWorkspace(repoPath) {
-  const hint = (repoPath ?? "").trim().replace(/\/+$/, "");
-  if (!hint) return null;
-  let best = null;
-  for (const w of listWorkspaces()) {
-    const stored = w.path.replace(/\/+$/, "");
-    if (stored === hint || hint.startsWith(`${stored}/`)) {
-      if (!best || stored.length > best.length) best = stored;
-    }
-  }
-  return best;
-}
-async function resolveProjectRepoPath(repoPath) {
-  const hint = repoPath?.trim() || process.cwd();
-  let root = hint;
-  try {
-    root = await resolveRepoRoot(hint);
-  } catch {
-    root = hint.replace(/\/+$/, "");
-  }
-  return matchRegisteredWorkspace(root) ?? matchRegisteredWorkspace(hint);
-}
-var PROJECT_PATH_HINT = "Pass repoPath from list_projects. Orchestration cwd is synthetic and empty \u2014 do not omit repoPath for project context.";
-function registerViewerContextTools(server) {
-  server.tool(
-    "get_viewer_context",
-    "Read account and project user context (Settings \u2192 Agents / Projects): roles, tickets, and review queues as freeform text. Orchestration must pass repoPath from list_projects for project context. Worktree turns may omit repoPath (uses cwd).",
-    {
-      repoPath: z6.string().optional().describe(
-        "Registered workspace or worktree path. Required from orchestration for a project. Omit on a worktree turn (uses cwd)."
-      )
-    },
-    async ({ repoPath }) => {
-      try {
-        const path = await resolveProjectRepoPath(repoPath);
-        return text4(readViewerContext(path ?? void 0));
-      } catch (err) {
-        return text4(
-          { error: err instanceof Error ? err.message : String(err) },
-          true
-        );
-      }
-    }
-  );
-  server.tool(
-    "update_viewer_context",
-    "Replace account or project user context (Settings \u2192 Agents / Projects). Never call until the user confirmed. Show the proposed text, ask_user (Save this context / Do not save), wait, then pass confirmed=true. Empty context clears that field.",
-    {
-      scope: z6.enum(["account", "project"]).describe("account = Settings \u2192 Agents; project = Settings \u2192 Projects for one repo"),
-      context: z6.string().describe("Full replacement text (roles, tickets, review queues). Empty clears."),
-      confirmed: z6.boolean().optional().describe("Must be true after the user confirmed via ask_user. False/omit is rejected."),
-      repoPath: z6.string().optional().describe(
-        "Required for scope=project from orchestration (path from list_projects). Worktree turns may omit it (cwd)."
-      )
-    },
-    async ({ scope, context, confirmed, repoPath }) => {
-      try {
-        if (scope === "project") {
-          const path = await resolveProjectRepoPath(repoPath);
-          if (!path) {
-            return text4(
-              {
-                ok: false,
-                error: "repoPath required",
-                message: PROJECT_PATH_HINT
-              },
-              true
-            );
-          }
-          const result2 = writeViewerContext({
-            scope,
-            context,
-            repoPath: path,
-            confirmed: confirmed === true
-          });
-          return text4(result2, !result2.ok);
-        }
-        const result = writeViewerContext({
-          scope,
-          context,
-          confirmed: confirmed === true
-        });
-        return text4(result, !result.ok);
-      } catch (err) {
-        return text4(
-          { error: err instanceof Error ? err.message : String(err) },
-          true
-        );
-      }
-    }
-  );
-}
-
 // src/mcp/pr-list.ts
 function compactPrRow(pr) {
   return {
@@ -3164,12 +3223,12 @@ function formatMcpPrList(input) {
 }
 
 // src/mcp/schedule-tools.ts
-import { z as z7 } from "zod";
-function text5(payload, isError = false) {
+import { z as z5 } from "zod";
+function text4(payload, isError = false) {
   return mcpJson(payload, isError);
 }
 function fail4(err) {
-  return text5(
+  return text4(
     { error: err instanceof Error ? err.message : String(err) },
     true
   );
@@ -3194,7 +3253,7 @@ function registerScheduleTools(server) {
     {},
     async () => {
       try {
-        return text5({ schedules: listSchedules() });
+        return text4({ schedules: listSchedules() });
       } catch (err) {
         return fail4(err);
       }
@@ -3204,18 +3263,18 @@ function registerScheduleTools(server) {
     "create_schedule",
     "Create a local schedule that, when due, sends a prompt to an existing chat (chatId) or starts a new Global orchestration chat (omit chatId). Pass chatId=self to continue this chat. If that chat is missing or archived when the job fires, Sideboard starts a new Global chat (recurring jobs then continue that chat). Exactly one of at (ISO datetime), every (15m/1h/6h/1d), or cron (5-field). Recurring jobs without chatId open a new Global chat each run. Creating or enabling a future job turns on Settings \u2192 Advanced \u2192 Caffeinate while schedules are enabled so the Mac stays awake until due. Sideboard.app must be running for the job to fire.",
     {
-      prompt: z7.string().describe("User message / goal queued when the schedule fires"),
-      name: z7.string().optional(),
-      at: z7.string().optional().describe("ISO datetime for a one-shot"),
-      every: z7.string().optional().describe("Interval such as 15m, 1h, 6h, 1d"),
-      cron: z7.string().optional().describe("5-field cron expression"),
-      tz: z7.string().optional().describe("IANA timezone for cron (default: system)"),
-      chatId: z7.string().optional().describe(
+      prompt: z5.string().describe("User message / goal queued when the schedule fires"),
+      name: z5.string().optional(),
+      at: z5.string().optional().describe("ISO datetime for a one-shot"),
+      every: z5.string().optional().describe("Interval such as 15m, 1h, 6h, 1d"),
+      cron: z5.string().optional().describe("5-field cron expression"),
+      tz: z5.string().optional().describe("IANA timezone for cron (default: system)"),
+      chatId: z5.string().optional().describe(
         'Existing chat id (orchestration or workspace), or "self" for this chat. Omit to create a new Global chat on fire.'
       ),
-      threadId: z7.string().optional().describe("Legacy alias for chatId."),
-      agent: z7.enum(["claude", "cursor", "codex", "opencode"]).optional().describe("Agent for a new Global chat (omit for Account default)"),
-      model: z7.string().optional()
+      threadId: z5.string().optional().describe("Legacy alias for chatId."),
+      agent: z5.enum(["claude", "cursor", "codex", "opencode"]).optional().describe("Agent for a new Global chat (omit for Account default)"),
+      model: z5.string().optional()
     },
     async (args) => {
       try {
@@ -3238,7 +3297,7 @@ function registerScheduleTools(server) {
           model: args.model,
           createdBy: "mcp"
         });
-        return text5({
+        return text4({
           schedule,
           hint: scheduleNeedsCaffeinate(schedule) ? "Fires while Sideboard.app is running. Recurring jobs without chatId create a new orchestration chat each run. Caffeinate while schedules are enabled is now on so the Mac can stay awake until this job is due." : "Fires while Sideboard.app is running. Recurring jobs without chatId create a new orchestration chat each run."
         });
@@ -3251,20 +3310,20 @@ function registerScheduleTools(server) {
     "update_schedule",
     "Update a local schedule (prompt, cadence, target chat, enabled). Pass id from list_schedules.",
     {
-      id: z7.string(),
-      prompt: z7.string().optional(),
-      name: z7.string().optional(),
-      at: z7.string().optional(),
-      every: z7.string().optional(),
-      cron: z7.string().optional(),
-      tz: z7.string().optional(),
-      chatId: z7.string().optional().describe(
+      id: z5.string(),
+      prompt: z5.string().optional(),
+      name: z5.string().optional(),
+      at: z5.string().optional(),
+      every: z5.string().optional(),
+      cron: z5.string().optional(),
+      tz: z5.string().optional(),
+      chatId: z5.string().optional().describe(
         'Existing chat (orchestration or workspace), "self", or empty string to create a new Global chat each run'
       ),
-      threadId: z7.string().optional().describe("Legacy alias for chatId."),
-      agent: z7.enum(["claude", "cursor", "codex", "opencode"]).optional(),
-      model: z7.string().optional(),
-      enabled: z7.boolean().optional()
+      threadId: z5.string().optional().describe("Legacy alias for chatId."),
+      agent: z5.enum(["claude", "cursor", "codex", "opencode"]).optional(),
+      model: z5.string().optional(),
+      enabled: z5.boolean().optional()
     },
     async (args) => {
       try {
@@ -3296,7 +3355,7 @@ function registerScheduleTools(server) {
           enabled: args.enabled,
           model: args.model
         });
-        return text5({ schedule });
+        return text4({ schedule });
       } catch (err) {
         return fail4(err);
       }
@@ -3305,11 +3364,11 @@ function registerScheduleTools(server) {
   server.tool(
     "delete_schedule",
     "Delete a local schedule. Pass id from list_schedules.",
-    { id: z7.string() },
+    { id: z5.string() },
     async ({ id }) => {
       try {
         deleteSchedule(id);
-        return text5({ ok: true, id });
+        return text4({ ok: true, id });
       } catch (err) {
         return fail4(err);
       }
@@ -3318,14 +3377,14 @@ function registerScheduleTools(server) {
   server.tool(
     "run_schedule",
     "Fire a schedule now (does not wait for nextRunAt). Queues the prompt on the target chat or starts a new Global chat. If Sideboard.app is running, the desktop drains the turn.",
-    { id: z7.string() },
+    { id: z5.string() },
     async ({ id }) => {
       try {
         if (!getSchedule(id)) {
           return fail4(new Error(`Schedule not found: ${id}`));
         }
         const schedule = await fireSchedule(id);
-        return text5({ schedule });
+        return text4({ schedule });
       } catch (err) {
         return fail4(err);
       }
@@ -3590,9 +3649,9 @@ async function getGitHubStatus() {
     };
   }
   const status = await run("gh", ["auth", "status"], { reject: false });
-  const text6 = `${status.stdout}
+  const text5 = `${status.stdout}
 ${status.stderr}`;
-  const loginMatch = text6.match(/Logged in to ([^\s]+) account (\S+)/i) ?? text6.match(/Logged in to ([^\s]+) as (\S+)/i);
+  const loginMatch = text5.match(/Logged in to ([^\s]+) account (\S+)/i) ?? text5.match(/Logged in to ([^\s]+) as (\S+)/i);
   if (loginMatch) {
     return {
       connected: true,
@@ -3609,154 +3668,7 @@ ${status.stderr}`;
   };
 }
 
-// src/mcp/create-thread-agent.ts
-function resolveOrchCreateThreadOptions(input) {
-  const { resolveNewThreadOptions } = input;
-  const account = resolveNewThreadOptions({});
-  const requested = input.requestedAgent;
-  const parent = input.parentAgent ?? void 0;
-  const cursorReady = input.cursorReady ?? isCursorApiKeyConfigured();
-  let agent = account.agent;
-  let ignoredAgent;
-  let honorRequestedModel = false;
-  if (requested) {
-    const parentEcho = Boolean(parent) && requested === parent && requested !== account.agent;
-    const cursorAutofill = requested === "cursor" && account.agent !== "cursor";
-    if (parentEcho || cursorAutofill) {
-      ignoredAgent = requested;
-    } else {
-      agent = requested;
-      honorRequestedModel = input.requestedModel !== void 0;
-    }
-  }
-  let coercedFrom;
-  if (agent === "codex" && parent === "codex" && cursorReady) {
-    coercedFrom = requested ?? "codex";
-    agent = "cursor";
-  }
-  const opts = resolveNewThreadOptions({
-    agent,
-    model: honorRequestedModel ? input.requestedModel : void 0
-  });
-  return {
-    ...opts,
-    ...ignoredAgent ? { ignoredAgent } : {},
-    ...coercedFrom ? { coercedFrom } : {}
-  };
-}
-function orchCreateThreadAgentNote(input) {
-  if (input.coercedFrom) {
-    return `Avoid nested Codex under a Codex orchestrator \u2014 used agent=${input.agent}`;
-  }
-  if (input.ignoredAgent) {
-    return `Ignored agent=${input.ignoredAgent} \u2014 used Account default agent=${input.agent}`;
-  }
-  return void 0;
-}
-
 // src/mcp/server.ts
-var MAX_ORCH_THREADS = 5;
-var CREATE_THREAD_TIMEOUT_MS = 9e4;
-function withTimeout(promise, ms, label) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      reject(new Error(`${label} timed out after ${Math.round(ms / 1e3)}s`));
-    }, ms);
-    promise.then(
-      (value) => {
-        clearTimeout(timer);
-        resolve(value);
-      },
-      (err) => {
-        clearTimeout(timer);
-        reject(err);
-      }
-    );
-  });
-}
-async function createOrchChildThread(orch, args, resolveNewThreadOptions) {
-  const envParentId = process.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID?.trim() || "";
-  let parentId = args.parentChatId?.trim() || args.parentThreadId?.trim() || "";
-  let parent = parentId ? orch.getThread(parentId) : null;
-  let parentCorrectedFrom;
-  if (envParentId) {
-    const envParent = orch.getThread(envParentId);
-    if (envParent) {
-      if (parentId && parentId !== envParentId) parentCorrectedFrom = parentId;
-      else if (!parentId) parentCorrectedFrom = void 0;
-      parentId = envParentId;
-      parent = envParent;
-    }
-  }
-  if (parentId && !parent) {
-    parentCorrectedFrom = parentId;
-    parentId = "";
-    parent = null;
-  }
-  if (parentId) {
-    const children = orch.getThreads(false).filter((t) => t.parentThreadId === parentId);
-    if (children.length >= MAX_ORCH_THREADS) {
-      return {
-        ok: false,
-        text: `Thread-creation cap (${MAX_ORCH_THREADS}) reached for this orchestration session`
-      };
-    }
-  }
-  const opts = resolveOrchCreateThreadOptions({
-    requestedAgent: args.agent,
-    requestedModel: args.model,
-    parentAgent: parent?.agent,
-    resolveNewThreadOptions
-  });
-  const agentNote = orchCreateThreadAgentNote(opts);
-  try {
-    const priorIds = new Set(orch.getThreads(false).map((t) => t.id));
-    const thread = await withTimeout(
-      orch.createThread({
-        sourceType: args.sourceType,
-        sourceRef: args.sourceRef,
-        agent: opts.agent,
-        model: opts.model,
-        effort: opts.effort,
-        fast: opts.fast,
-        repoPath: args.repoPath,
-        title: args.title,
-        parentThreadId: parentId || null,
-        cowboy: args.cowboy || void 0,
-        attachments: args.attachments
-      }),
-      CREATE_THREAD_TIMEOUT_MS,
-      "create_workspace"
-    );
-    const alreadyStarted = priorIds.has(thread.id);
-    const parentNote = parentCorrectedFrom ? parentId ? `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; nested under ${parentId}` : `Ignored unknown/stale parentThreadId ${parentCorrectedFrom}; created without parent` : void 0;
-    return {
-      ok: true,
-      text: JSON.stringify({
-        id: thread.id,
-        title: thread.title,
-        branchName: thread.branchName,
-        worktreePath: thread.worktreePath,
-        agent: thread.agent,
-        model: thread.model,
-        status: thread.status,
-        cowboy: Boolean(thread.cowboy),
-        link: `sideboard://chat/${thread.id}`,
-        parentChatId: thread.parentThreadId,
-        parentThreadId: thread.parentThreadId,
-        chats: workspaceAgentChatSummaries(thread.worktreePath),
-        ...alreadyStarted ? { alreadyStarted: true } : {},
-        ...opts.coercedFrom ? { agentCoercedFrom: opts.coercedFrom } : {},
-        ...opts.ignoredAgent ? { agentIgnored: opts.ignoredAgent } : {},
-        ...agentNote ? { note: agentNote } : {},
-        ...parentCorrectedFrom ? { parentCorrectedFrom, parentNote } : {}
-      })
-    };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    return { ok: false, text: `create_workspace failed: ${message}` };
-  }
-}
 function previewHint(preview) {
   return preview === "window" ? "Electron: the native window is the app. url is the renderer/HMR origin only \u2014 do not open it in a browser (no preload/IPC)." : "Open url in a browser, curl, or Playwright to use the app.";
 }
@@ -3854,16 +3766,16 @@ async function startMcpServer() {
       "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. 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: z8.string().optional().describe("Case-insensitive token search across title, id, labels, repo"),
-        repoPath: z8.string().optional().describe("Limit to one project path from list_projects"),
-        kind: z8.enum(["all", "tickets", "prs", "branches", "threads"]).optional().describe("Filter by worktree source (default all)"),
-        ownership: z8.enum(["all", "mine", "reviewing"]).optional().describe(
+        query: z6.string().optional().describe("Case-insensitive token search across title, id, labels, workspace tags, repo"),
+        repoPath: z6.string().optional().describe("Limit to one project path from list_projects"),
+        kind: z6.enum(["all", "tickets", "prs", "branches", "threads"]).optional().describe("Filter by worktree source (default all)"),
+        ownership: z6.enum(["all", "mine", "reviewing"]).optional().describe(
           "Mine = PRs you authored or local WIP; reviewing = someone else's PR. Uses the gh login."
         ),
-        column: z8.enum(["new", "draft", "review", "done", "needs_you"]).optional().describe(
+        column: z6.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."
         ),
-        limit: z8.number().int().positive().optional().describe("Max cards per column (default 40). hidden counts the remainder.")
+        limit: z6.number().int().positive().optional().describe("Max cards per column (default 40). hidden counts the remainder.")
       },
       async ({ query, repoPath, kind, ownership, column, limit }) => {
         const workspaces = orch.listWorkspaces();
@@ -3893,7 +3805,7 @@ async function startMcpServer() {
     server.tool(
       "get_chat",
       "Get a compact chat summary by id/ref. Includes last message preview, parentChatId, and child workspace chats (status + lastText). While running, includes progress (last tool/thinking) and lastActivityAt. Includes usage (billed token + costUsd totals when providers reported cost) and lastTurnUsage. blockedReason is why that agent is waiting on a person (question, plan approval, or a reported block).",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
         if (!t) {
@@ -3915,6 +3827,7 @@ async function startMcpServer() {
           sessionId: t.sessionId,
           parentChatId: t.parentThreadId,
           parentThreadId: t.parentThreadId,
+          tags: t.tags ?? [],
           children: childThreadRefs(t.id, orch.getThreads(false)),
           queueLength: t.queue.length,
           messageCount: t.messages.length,
@@ -3939,17 +3852,17 @@ async function startMcpServer() {
       "present_artifact",
       "Show a document or live log in Sideboard\u2019s side column. For html/svg/markdown/react, pass the FULL document and do not also fence that same body in chat. For type=log, pass only NEW lines (same artifact_id appends). Prefer type=log for long-running job output \u2014 do not resend HTML. type=react is a single default-export component (JSX/TSX); only react/react-dom imports.",
       {
-        title: z8.string().describe("Short title shown in the artifact pane header"),
-        type: z8.enum(["html", "svg", "markdown", "react", "log"]).describe(
+        title: z6.string().describe("Short title shown in the artifact pane header"),
+        type: z6.enum(["html", "svg", "markdown", "react", "log"]).describe(
           "html/svg/markdown/react replace the pane. log appends content to the same artifact_id (new lines only)."
         ),
-        content: z8.string().describe(
+        content: z6.string().describe(
           "html/svg/markdown/react: full document. log: only the new lines since the last call (empty is ok for a status-only update)."
         ),
-        artifact_id: z8.string().optional().describe("Stable id. Required for type=log so later calls append to the same pane."),
-        status: z8.enum(["running", "ok", "failed", "idle"]).optional().describe("Log header pill: running (working), ok (done), failed, idle"),
-        phase: z8.string().optional().describe("Log subtitle (Signing, Notarizing, \u2026)"),
-        mode: z8.enum(["append", "replace"]).optional().describe("log only: append (default) or replace the buffer")
+        artifact_id: z6.string().optional().describe("Stable id. Required for type=log so later calls append to the same pane."),
+        status: z6.enum(["running", "ok", "failed", "idle"]).optional().describe("Log header pill: running (working), ok (done), failed, idle"),
+        phase: z6.string().optional().describe("Log subtitle (Signing, Notarizing, \u2026)"),
+        mode: z6.enum(["append", "replace"]).optional().describe("log only: append (default) or replace the buffer")
       },
       async ({ title, type, artifact_id, status, phase, mode }) => {
         return mcpJson(
@@ -3962,15 +3875,15 @@ async function startMcpServer() {
     "ask_user",
     "Ask the user a clarifying multiple-choice question in Sideboard\u2019s composer. Call only when work is blocked on choosing among a few concrete options (approach fork, which API, auth vs cookies). Do not call for greetings, check-ins, \u201Chello\u201D, open-ended how-can-I-help, or to invent a menu of possible next tasks \u2014 reply in chat instead. If one option is the obvious default, proceed without asking. Before calling, write a short chat message explaining the decision and what each option means. Include a description on every option. After calling, stop and wait for answers. Not for \u201Cis the plan ready?\u201D.",
     {
-      questions: z8.array(
-        z8.object({
-          question: z8.string().describe("Full question text ending with ?"),
-          header: z8.string().max(24).optional().describe("Short label shown above the question"),
-          multiSelect: z8.boolean().optional().describe("Allow selecting multiple options"),
-          options: z8.array(
-            z8.object({
-              label: z8.string(),
-              description: z8.string().optional().describe("What this option means / when to choose it (strongly preferred)")
+      questions: z6.array(
+        z6.object({
+          question: z6.string().describe("Full question text ending with ?"),
+          header: z6.string().max(24).optional().describe("Short label shown above the question"),
+          multiSelect: z6.boolean().optional().describe("Allow selecting multiple options"),
+          options: z6.array(
+            z6.object({
+              label: z6.string(),
+              description: z6.string().optional().describe("What this option means / when to choose it (strongly preferred)")
             })
           ).min(2).max(6).describe("2\u20136 choices (Sideboard also offers Other)")
         })
@@ -3996,9 +3909,9 @@ async function startMcpServer() {
       "present_plan",
       PRESENT_PLAN_TOOL_DESCRIPTION,
       {
-        title: z8.string().optional().describe("Short plan title (defaults to Plan)"),
-        content: z8.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
-        thread_id: z8.string().optional().describe("Sideboard thread id when cwd is not the worktree")
+        title: z6.string().optional().describe("Short plan title (defaults to Plan)"),
+        content: z6.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
+        thread_id: z6.string().optional().describe("Sideboard thread id when cwd is not the worktree")
       },
       async ({ title, content, thread_id }) => {
         const { writePlanFile } = await import("../plan-file-VAHV5WBB.js");
@@ -4027,15 +3940,15 @@ async function startMcpServer() {
     "present_schema",
     "Open Sideboard\u2019s schema-driven side column (filterable table and/or form) when the user needs to filter, edit, publish, or persist records. Do not call this just to re-display rows you already wrote as a markdown table. If the user asks for an editable / interactive table, call this even if chat already showed those rows. Pass JSON Schema + optional schemaUi. Prefer datasource=inline with embedded resource/records. Use datasource=brightsy with resource_id only when the user is logged into Brightsy.",
     {
-      title: z8.string().describe("Pane title"),
-      mode: z8.enum(["table", "form"]).optional().describe("table = list/filter records; form = edit one record"),
-      datasource: z8.enum(["brightsy", "inline"]).optional().describe("brightsy resolves via login; inline uses embedded resource/records"),
-      resource_id: z8.string().optional().describe("Brightsy record type UUID (or generic resource id)"),
-      record_id: z8.string().optional().describe("Record id when opening form mode"),
-      resource: z8.record(z8.unknown()).optional().describe("Inline { id, title, schema, schemaUi?, slug? }"),
-      record: z8.record(z8.unknown()).optional().describe("Inline record { id, data, published_at? }"),
-      records: z8.array(z8.record(z8.unknown())).optional().describe("Inline records for table mode"),
-      pane_id: z8.string().optional().describe("Stable pane id across updates")
+      title: z6.string().describe("Pane title"),
+      mode: z6.enum(["table", "form"]).optional().describe("table = list/filter records; form = edit one record"),
+      datasource: z6.enum(["brightsy", "inline"]).optional().describe("brightsy resolves via login; inline uses embedded resource/records"),
+      resource_id: z6.string().optional().describe("Brightsy record type UUID (or generic resource id)"),
+      record_id: z6.string().optional().describe("Record id when opening form mode"),
+      resource: z6.record(z6.unknown()).optional().describe("Inline { id, title, schema, schemaUi?, slug? }"),
+      record: z6.record(z6.unknown()).optional().describe("Inline record { id, data, published_at? }"),
+      records: z6.array(z6.record(z6.unknown())).optional().describe("Inline records for table mode"),
+      pane_id: z6.string().optional().describe("Stable pane id across updates")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `schema_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -4056,10 +3969,10 @@ async function startMcpServer() {
     "present_files",
     "Open Sideboard\u2019s Files column (CMS-style file manager: browse, upload, pick). Use datasource=brightsy when the user is logged into Brightsy account storage; datasource=memory for a session-local demo store. Prefer this over claiming a file manager UI is unavailable. Pair with present_schema when editing records that need media.",
     {
-      title: z8.string().optional().describe("Pane title (default: Files)"),
-      datasource: z8.enum(["brightsy", "memory"]).optional().describe("brightsy = account storage via login; memory = session demo store"),
-      path: z8.string().optional().describe("Initial folder path (e.g. public)"),
-      pane_id: z8.string().optional().describe("Stable pane id across updates")
+      title: z6.string().optional().describe("Pane title (default: Files)"),
+      datasource: z6.enum(["brightsy", "memory"]).optional().describe("brightsy = account storage via login; memory = session demo store"),
+      path: z6.string().optional().describe("Initial folder path (e.g. public)"),
+      pane_id: z6.string().optional().describe("Stable pane id across updates")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `files_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -4079,8 +3992,8 @@ async function startMcpServer() {
       "wait_for_job",
       "Wait on a detached long job (tests, pack, deploy, connector CLI) started with detached-job.cjs. MCP clients kill tools around 60s, so this returns within 45s. Sideboard opens a type=log pane from this result (artifact_id = job id, content = delta). stillRunning is the source of truth \u2014 if true, call wait_for_job again. If the job is hanging, producing no useful output, or doing the wrong thing, call stop_job instead of looping forever. Do not end the turn or tell the user you will let them know later. If false, ok/failed is the result.",
       {
-        id: z8.string().describe("Detached job id (same kebab-case id passed to detached-job.cjs start)"),
-        timeoutMs: z8.number().optional()
+        id: z6.string().describe("Detached job id (same kebab-case id passed to detached-job.cjs start)"),
+        timeoutMs: z6.number().optional()
       },
       async ({ id, timeoutMs }) => {
         const result = await waitForDetachedJob(process.cwd(), id, {
@@ -4093,8 +4006,8 @@ async function startMcpServer() {
       "stop_job",
       "Stop a detached job you started with detached-job.cjs when it is hanging, producing no useful output, buffering forever, or doing the wrong thing (wrong project, infinite watch, huge dump). Do not stop a pack/test/deploy that is clearly making progress. The type=log pane updates to status=failed with the last delta. Then decide the next step.",
       {
-        id: z8.string().describe("Detached job id (same kebab-case id passed to detached-job.cjs start)"),
-        reason: z8.string().optional().describe("Why you are stopping (hanging, no progress, wrong output, already have the answer)")
+        id: z6.string().describe("Detached job id (same kebab-case id passed to detached-job.cjs start)"),
+        reason: z6.string().optional().describe("Why you are stopping (hanging, no progress, wrong output, already have the answer)")
       },
       async ({ id, reason }) => {
         const result = await stopDetachedJob(process.cwd(), id, { reason });
@@ -4106,7 +4019,7 @@ async function startMcpServer() {
     "list_run_scripts",
     "List .sideboard/.conductor run scripts for this thread (same menu as the desktop Dev button) and which are active. Each script and active run includes preview: url (open http://localhost:<SIDEBOARD_PORT>) or window (Electron: native window is the app; url is renderer/HMR only). Never guess :3000. Worktree turns may omit ref (uses cwd).",
     {
-      ref: z8.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd).")
+      ref: z6.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd).")
     },
     async ({ ref }) => {
       try {
@@ -4136,8 +4049,8 @@ async function startMcpServer() {
     "run_dev_script",
     "Start a .sideboard/.conductor run script (same as the desktop Dev / play button). Several named scripts can run at once; each gets its own port, and starting one does not stop the others. Logs and Stop appear in the thread UI \u2014 do not detached-job or shell-spawn the same command. Returns {port, ports, url, preview}. preview=url \u2192 open url (browser, curl, Playwright). preview=window \u2192 Electron: the native window is the app; url is renderer/HMR only (no preload/IPC in a browser). The port is allocated SIDEBOARD_PORT, not 3000. Worktree turns may omit ref (uses cwd). Omit name for the default script.",
     {
-      ref: z8.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
-      name: z8.string().optional().describe("Script name from list_run_scripts (default script if omitted).")
+      ref: z6.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
+      name: z6.string().optional().describe("Script name from list_run_scripts (default script if omitted).")
     },
     async ({ ref, name }) => {
       try {
@@ -4165,8 +4078,8 @@ async function startMcpServer() {
     "stop_dev_script",
     "Stop a run script started with run_dev_script or the desktop Dev button (same as UI Stop). Omit name to stop all scripts on this worktree. Worktree turns may omit ref (uses cwd).",
     {
-      ref: z8.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
-      name: z8.string().optional().describe("Script name to stop; omit to stop all active scripts.")
+      ref: z6.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
+      name: z6.string().optional().describe("Script name to stop; omit to stop all active scripts.")
     },
     async ({ ref, name }) => {
       try {
@@ -4183,9 +4096,9 @@ async function startMcpServer() {
     "get_run_log",
     "Read the Run-tab terminal for a worktree script (same stdout/stderr as the desktop Dev pane). Default is a tail \u2014 raise `tail` only if the error is missing. Worktree turns may omit ref (uses cwd). Omit name for the default script.",
     {
-      ref: z8.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
-      name: z8.string().optional().describe("Script name from list_run_scripts (default script if omitted)."),
-      tail: z8.number().int().min(1).max(MAX_RUN_LOG_CHARS).optional().describe(
+      ref: z6.string().optional().describe("Thread id. Omit on a worktree turn (uses cwd)."),
+      name: z6.string().optional().describe("Script name from list_run_scripts (default script if omitted)."),
+      tail: z6.number().int().min(1).max(MAX_RUN_LOG_CHARS).optional().describe(
         `Max characters to return from the end (default ${DEFAULT_RUN_LOG_TAIL_CHARS}). Do not request the full buffer unless the tail is truncated and you still need more.`
       )
     },
@@ -4223,8 +4136,8 @@ async function startMcpServer() {
       "notify_orchestrator",
       "Wake the parent Global orchestrator with a short status so it does not have to poll wait_for_turn. Use when you are blocked and the parent may have moved on (missing access, waiting on something the coordinator must handle). The message is shown on the sidebar and board until the next user message in this chat. ask_user already notifies for input-required \u2014 do not call this for the same question. Information only: never a git command. Do not use this to steer other worktrees.",
       {
-        message: z8.string().min(1).max(1500).describe("Why you are blocked / what the parent should know (short)."),
-        reason: z8.enum(["input-required", "blocked"]).optional().describe(
+        message: z6.string().min(1).max(1500).describe("Why you are blocked / what the parent should know (short)."),
+        reason: z6.enum(["input-required", "blocked"]).optional().describe(
           "input-required = waiting on the user in this chat; blocked = need the coordinator (default)."
         )
       },
@@ -4250,13 +4163,45 @@ async function startMcpServer() {
             ...result.deduped ? { deduped: true } : {}
           });
         } catch (err) {
-          const text6 = err instanceof Error ? err.message : String(err);
-          return { content: [{ type: "text", text: text6 }], isError: true };
+          const text5 = err instanceof Error ? err.message : String(err);
+          return { content: [{ type: "text", text: text5 }], isError: true };
         }
       }
     );
   }
   registerScheduleTools(server);
+  server.tool(
+    "set_workspace_tags",
+    worktreeProfile ? "Update tags on this workspace (the checkout you are in). Omit ref to use this chat. mode=replace (default), add, or remove. Short labels \u2014 the same ones the orchestrator used for this task. You cannot retag a different checkout." : "Label a project workspace so related checkouts stay recognizable in the sidebar and on the phone. Pass any chat id on that workspace. Use the same tags on every workspace from one task. mode=replace is the default; add and remove change the set. create_workspace tags= sets them at create time. Not for orchestration chats.",
+    {
+      ref: z6.string().optional().describe(
+        worktreeProfile ? "Omit for this chat. Another chat id only if it is on this same checkout." : "Chat id on the workspace to label."
+      ),
+      tags: z6.union([z6.string(), z6.array(z6.string())]).describe("Labels to set. A string may be comma-separated."),
+      mode: z6.enum(["replace", "add", "remove"]).optional()
+    },
+    async ({ ref, tags, mode }) => {
+      try {
+        const callerId = process.env[SIDEBOARD_THREAD_ID_ENV]?.trim() || "";
+        const target = workspaceTagTargetRef({
+          ownWorktreeOnly: worktreeProfile,
+          caller: callerId ? orch.getThread(callerId) : null,
+          requestedRef: ref,
+          find: (id) => orch.getThread(id)
+        });
+        const thread = applyWorkspaceTags(target, tags, mode ?? "replace");
+        return mcpJson({
+          id: thread.id,
+          worktreePath: thread.worktreePath,
+          tags: thread.tags ?? [],
+          chats: workspaceAgentChatSummaries(thread.worktreePath)
+        });
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return mcpJson({ ok: false, message }, true);
+      }
+    }
+  );
   if (!worktreeProfile) {
     registerConnectedIssueVendorTools(server);
     const { getCaffeinateHold, setCaffeinateHold } = await import("../caffeinate-hold-7JM5H5P3.js");
@@ -4267,7 +4212,7 @@ async function startMcpServer() {
       "set_caffeinate",
       "Keep this Mac awake with caffeinate (like Claude Code) across turns \u2014 independent of Settings toggles. Turn ON when the user will be away from the keyboard, is driving work from Slack, or asks you to keep the machine awake. Turn OFF when they say they are done, wrapping up, going to sleep, or no longer need the Mac awake. Closing or archiving this orchestration chat also releases the hold. macOS only.",
       {
-        enabled: z8.boolean().describe("true = hold caffeinate on; false = release and let the Mac sleep")
+        enabled: z6.boolean().describe("true = hold caffeinate on; false = release and let the Mac sleep")
       },
       async ({ enabled }) => {
         const threadId = process.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID?.trim() || null;
@@ -4291,25 +4236,28 @@ async function startMcpServer() {
     );
     server.tool(
       "create_workspace",
-      `Create a workspace (isolated git checkout + first chat) from branch, pr, or ticket. A ticket, PR, or named branch has one checkout \u2014 if one already matches, returns it (alreadyStarted=true) instead of a second checkout. That is not one agent: chats lists every agent on that checkout. Add another with fork_chat; send_to_chat only the chat that should do this job. Creating from the default branch still opens a new isolated checkout. Pass repoPath from list_projects. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentChatId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Omit agent/model \u2014 Sideboard applies ${accountDefaultsHint}. Do not pass your own agent or agent=cursor; those are ignored. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy).`,
+      `Create a workspace (isolated git checkout + first chat) from branch, pr, or ticket. A ticket, PR, or named branch has one checkout \u2014 if one already matches, returns it (alreadyStarted=true) instead of a second checkout. That is not one agent: chats lists every agent on that checkout. Add another with fork_chat; send_to_chat only the chat that should do this job. Creating from the default branch still opens a new isolated checkout. Pass repoPath from list_projects. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentChatId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Omit agent/model \u2014 Sideboard applies ${accountDefaultsHint}. Do not pass your own agent or agent=cursor; those are ignored. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy). Pass the same tags on every workspace you open for one task (short labels such as "phone-sync") so they still match in the sidebar the next day. Reusing a checkout adds those tags.`,
       {
-        sourceType: z8.enum(["branch", "pr", "ticket"]),
-        sourceRef: z8.string(),
-        agent: z8.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(
+        sourceType: z6.enum(["branch", "pr", "ticket"]),
+        sourceRef: z6.string(),
+        agent: z6.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(
           `Usually omit. Sideboard uses Account default agent (${accountDefaults.agent}). Passing your own agent or cursor is ignored.`
         ),
-        model: z8.string().nullable().optional().describe(
+        model: z6.string().nullable().optional().describe(
           `Usually omit to use Account default model (${accountDefaults.model?.trim() || "Auto"}). Pass null only to force Auto / agent-default.`
         ),
-        repoPath: z8.string(),
-        title: z8.string().optional(),
-        cowboy: z8.boolean().optional().describe(
+        repoPath: z6.string(),
+        title: z6.string().optional(),
+        cowboy: z6.boolean().optional().describe(
           "If true, work in the project folder on the default branch (no thread/* worktree). Requires Settings \u2192 Advanced \u2192 Cowboy mode. Land is commit+push to that branch. Archive does not delete the folder."
         ),
-        parentChatId: z8.string().optional().describe(
+        parentChatId: z6.string().optional().describe(
           "Orchestration: omit (preferred) or pass YOUR chat id from the turn reminder / AGENTS.md. Do not invent uuids."
         ),
-        parentThreadId: z8.string().optional().describe("Legacy alias for parentChatId.")
+        parentThreadId: z6.string().optional().describe("Legacy alias for parentChatId."),
+        tags: z6.union([z6.string(), z6.array(z6.string())]).optional().describe(
+          "Short labels for this workspace (or a comma-separated string). Use the same tags on every checkout for one task. Added when the checkout already exists."
+        )
       },
       async (args) => {
         const result = await createOrchChildThread(orch, args, resolveNewThreadOptions);
@@ -4323,12 +4271,15 @@ async function startMcpServer() {
       "start_board_card",
       "Same as create_workspace for a ticket, PR, or named branch (attaches issue text when Sideboard can resolve it). Does not create a second checkout when one already matches \u2014 returns that workspace (alreadyStarted) and its chats. A workspace can have many agents. fork_chat to add one; send_to_chat only the chat that should do this job.",
       {
-        kind: z8.enum(["ticket", "pr", "branch"]),
-        ref: z8.string().describe("Ticket identifier (ENG-12), PR number (44), or branch name from list_board"),
-        repoPath: z8.string().describe("Project path from list_projects / list_board"),
-        title: z8.string().optional()
+        kind: z6.enum(["ticket", "pr", "branch"]),
+        ref: z6.string().describe("Ticket identifier (ENG-12), PR number (44), or branch name from list_board"),
+        repoPath: z6.string().describe("Project path from list_projects / list_board"),
+        title: z6.string().optional(),
+        tags: z6.union([z6.string(), z6.array(z6.string())]).optional().describe(
+          "Short labels for this workspace. Same tags on every checkout for one task. Added when the checkout already exists."
+        )
       },
-      async ({ kind, ref, repoPath, title }) => {
+      async ({ kind, ref, repoPath, title, tags }) => {
         const root = await resolveRepoRoot(repoPath);
         const existing = findLiveThreadForCreate(
           {
@@ -4343,13 +4294,15 @@ async function startMcpServer() {
           }))
         );
         if (existing) {
+          const tagged = tags === void 0 ? orch.getThread(existing.id) : applyWorkspaceTags(existing.id, tags, "add");
           return mcpJson({
             alreadyStarted: true,
             id: existing.id,
             title: existing.title,
             status: existing.status,
+            tags: tagged?.tags ?? [],
             link: `sideboard://chat/${existing.id}`,
-            chats: workspaceAgentChatSummaries(orch.getThread(existing.id)?.worktreePath)
+            chats: workspaceAgentChatSummaries(tagged?.worktreePath)
           });
         }
         const workspaces = orch.listWorkspaces();
@@ -4363,7 +4316,8 @@ async function startMcpServer() {
               sourceType: "branch",
               sourceRef,
               repoPath: root,
-              title: title?.trim() || pin?.title || (sourceRef === "default" ? void 0 : sourceRef)
+              title: title?.trim() || pin?.title || (sourceRef === "default" ? void 0 : sourceRef),
+              tags
             },
             resolveNewThreadOptions
           );
@@ -4393,7 +4347,8 @@ async function startMcpServer() {
               sourceRef: ident,
               repoPath: root,
               title: title?.trim() || issue?.title,
-              attachments
+              attachments,
+              tags
             },
             resolveNewThreadOptions
           );
@@ -4410,7 +4365,8 @@ async function startMcpServer() {
             sourceType: "pr",
             sourceRef: number,
             repoPath: root,
-            title: title?.trim() || pr?.title
+            title: title?.trim() || pr?.title,
+            tags
           },
           resolveNewThreadOptions
         );
@@ -4422,11 +4378,11 @@ async function startMcpServer() {
     );
     server.tool(
       "send_to_chat",
-      'Steer a prompt on a workspace chat (Settings \u2192 Follow-up, default steer: front of the queue, skips the inbox; while the desktop board is running it starts as soon as the in-flight turn yields). Use after create_workspace to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. force_stop=true kills the in-flight turn and clears the queue before this prompt \u2014 only when the current request is wrong and must be replaced. Do not send_to_chat to check in, resume after a halt notice, or because wait_for_turn returned stillRunning; that interrupts the child mid-thought. Call wait_for_turn again instead.',
+      'Steer a prompt on a workspace chat (Settings \u2192 Follow-up, default steer: interrupt the in-flight turn and start now, same as the workspace composer). Use after create_workspace to start or continue a conversation. For commit/push/PR, prefer ask_git (canonical desktop-button phrases). Send "Merge PR." / ask_git merge only when the user explicitly asked to merge. force_stop=true kills the in-flight turn and clears the queue before this prompt \u2014 only when the current request is wrong and must be replaced. Do not send_to_chat to check in, resume after a halt notice, or because wait_for_turn returned stillRunning; that interrupts the child mid-thought. Call wait_for_turn again instead.',
       {
-        ref: z8.string(),
-        prompt: z8.string(),
-        force_stop: z8.boolean().optional()
+        ref: z6.string(),
+        prompt: z6.string(),
+        force_stop: z6.boolean().optional()
       },
       async ({ ref, prompt, force_stop }) => {
         if (force_stop) {
@@ -4451,8 +4407,8 @@ async function startMcpServer() {
         "wait_for_turn",
         "Wait until the chat finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. taskState is the A2A-style lifecycle: submitted (queued, not started), working, input-required (ask_user), completed, failed, canceled. stillRunning is true only for submitted/working. blockedReason is why the child 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. If stillRunning, text and usage are empty (they would be the previous turn) \u2014 read progress and call wait_for_turn again. Do not send_to_chat a check-in (that steers / interrupts). On failed, lastError/text is the failure. On canceled, the child did not finish \u2014 resume with send_to_chat or tell the user. On input-required, wait for the user in that chat. When finished, text is this turn\u2019s assistant reply and usage is that turn\u2019s tokens + costUsd (this turn, not the Claude session total; sessionCostUsd is the provider session total when present).",
         {
-          ref: z8.string(),
-          timeoutMs: z8.number().optional()
+          ref: z6.string(),
+          timeoutMs: z6.number().optional()
         },
         async ({ ref, timeoutMs }) => {
           const thread = await orch.waitForTurn(ref, mcpWaitForTurnTimeoutMs(timeoutMs), {
@@ -4480,7 +4436,7 @@ async function startMcpServer() {
     server.tool(
       "get_turn_result",
       "Assistant message and last-turn usage when the turn finished. While stillRunning (submitted/working), text and usage are empty so a previous reply cannot be mistaken for this turn \u2014 use progress for tools/thinking. Not the full transcript. Includes taskState (A2A lifecycle) and blockedReason (why the agent is waiting on a person).",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);
         const hint = mcpWaitTaskHint(result.taskState, result.status, result.blockedReason);
@@ -4494,12 +4450,13 @@ async function startMcpServer() {
     );
     server.tool(
       "stop_chat",
-      "Force-stop a thread: kill any in-flight agent turn AND clear queued prompts so drainQueue cannot continue. Does not archive the worktree. Optional force defaults to true.",
+      "Force-stop a thread: kill any in-flight agent turn AND clear queued prompts so drainQueue cannot continue. Does not archive the worktree. Optional force defaults to true. Pass reason \u2014 a short note on why this chat is stopping. It is stored on the thread and kept when the turn unwinds. If you omit it, Sideboard still records that the queue was cleared.",
       {
-        ref: z8.string(),
-        force: z8.boolean().optional()
+        ref: z6.string(),
+        force: z6.boolean().optional(),
+        reason: z6.string().optional().describe("Why this chat is stopping. Stored on the thread for the next session.")
       },
-      async ({ ref, force }) => {
+      async ({ ref, force, reason }) => {
         const t = orch.getThread(ref);
         if (!t) {
           return {
@@ -4509,18 +4466,19 @@ async function startMcpServer() {
         }
         const clearQueue = force !== false;
         const hadQueued = t.queue.length > 0;
-        const stopped = orch.stop(ref, { clearQueue, notifyParent: false });
+        const stopped = orch.stop(ref, { clearQueue, notifyParent: false, reason });
         return mcpJson({
           id: stopped.id,
           status: stopped.status,
-          clearedQueue: clearQueue && hadQueued
+          clearedQueue: clearQueue && hadQueued,
+          lastError: stopped.lastError ?? null
         });
       }
     );
     server.tool(
       "archive_chat",
       "Archive a thread (stops agent/dev, runs archive script, removes worktree when last chat tab). Coordinators commit, push, and open PRs by asking the worktree agent (ask_git). Merge only when the user explicitly asked.",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
         if (!t) {
@@ -4546,7 +4504,7 @@ async function startMcpServer() {
     server.tool(
       "restore_chat",
       "Restore an archived thread (recreates worktree from branch when needed)",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         try {
           const restored = await orch.restore(ref);
@@ -4565,8 +4523,8 @@ async function startMcpServer() {
       "get_diff",
       "Compact diff summary (capped hunks, paginated)",
       {
-        ref: z8.string(),
-        maxFiles: z8.number().optional()
+        ref: z6.string(),
+        maxFiles: z6.number().optional()
       },
       async ({ ref, maxFiles }) => {
         const summary = await orch.diffSummary(ref);
@@ -4579,7 +4537,7 @@ async function startMcpServer() {
     server.tool(
       "get_pr_checks",
       "Snapshot of GitHub PR checks for a worktree thread (`gh pr checks` plus merge/review gates). null = no PR. If the user gave a goal (Greptile 5/5, CI green), the worktree agent watches with `gh pr checks --watch` via /long-running \u2014 this tool is a snapshot, not a waiter. Coordinators: do not run gh from the orchestration cwd.",
-      { ref: z8.string().describe("Worktree thread id/ref") },
+      { ref: z6.string().describe("Worktree thread id/ref") },
       async ({ ref }) => {
         try {
           const checks = await orch.getPrChecks(ref);
@@ -4593,7 +4551,7 @@ async function startMcpServer() {
     server.tool(
       "request_review",
       'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). If that worktree has a single unused idle agent (no messages), runs the review there; otherwise opens a new Review chat tab. Attaches .claude/skills/review/SKILL.md when present (else copies .sideboard/review.md into .context/review.md, or seeds that file from the stock template), and sends "Review changes in this workspace." Expect Approve / Approve with nits / Request changes / Needs more information in that chat. The review stays there so the user can read it and type next steps \u2014 do not comment on or update the PR or ticket, and do not ask_user after the review, until they ask. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn (loop while stillRunning) / get_turn_result on the returned review thread id.',
-      { ref: z8.string().describe("Worktree thread id/ref to review") },
+      { ref: z6.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
           const tab = await orch.requestReview(ref);
@@ -4615,8 +4573,8 @@ async function startMcpServer() {
       "ask_git",
       "Commit & push, open a draft PR, mark ready for review, resolve conflicts, or merge \u2014 same prompts as the desktop git buttons (including Resolve). Always steers the worktree agent; does not push or open the PR locally. Then wait_for_turn (loop while stillRunning). Do not start a checks loop on a plain push \u2014 only if the user gave a goal (Greptile 5/5, CI green). Pass a worktree thread ref (not the orchestrator). action=ready-for-review and action=merge only when the user explicitly asked (or clicked the desktop button). Do not run git or gh from the orchestration cwd.",
       {
-        ref: z8.string().describe("Worktree thread id/ref"),
-        action: z8.enum(AGENT_GIT_ACTIONS).describe(
+        ref: z6.string().describe("Worktree thread id/ref"),
+        action: z6.enum(AGENT_GIT_ACTIONS).describe(
           "commit-push | create-draft | create-web | resolve-conflicts | ready-for-review | merge"
         )
       },
@@ -4645,7 +4603,7 @@ async function startMcpServer() {
         }
       }
     );
-    const agentEnum = z8.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
+    const agentEnum = z6.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
     server.tool(
       "list_models",
       "List models for an agent. Prefer Auto: do not call this unless you have a reason to pin a specific model (user request, cost/latency, capability). Omit agent to list all.",
@@ -4666,11 +4624,11 @@ async function startMcpServer() {
       "fork_workspace",
       "Fork a worktree agent chat into a NEW git worktree + chat (desktop \u201CFork to new workspace\u201D). Seeds a transcript (through through_index, default all). Optional agent override. Leave model unset for Auto (default) \u2014 only pass model when you have a reason. Not for the orchestrator. Then send_to_chat / wait_for_turn (loop while stillRunning) on the returned id.",
       {
-        ref: z8.string().describe("Worktree thread id/ref to fork"),
-        through_index: z8.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        ref: z6.string().describe("Worktree thread id/ref to fork"),
+        through_index: z6.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z8.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z8.string().optional()
+        model: z6.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z6.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -4704,11 +4662,11 @@ async function startMcpServer() {
       "fork_chat",
       "Add another agent chat on the SAME workspace (same files, Run, and git). Also forks a Global orchestration chat into a new orchestration tab. Pass agent when the new chat should use a different harness. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Use this for a second agent on a checkout (review, another harness, parallel work on the same branch). Do not create_workspace again for that \u2014 it returns the existing checkout. Then send_to_chat / wait_for_turn (loop while stillRunning) on the returned id. Use fork_workspace only when the work needs its own git checkout.",
       {
-        ref: z8.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
-        through_index: z8.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        ref: z6.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
+        through_index: z6.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z8.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z8.string().optional()
+        model: z6.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z6.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -4746,7 +4704,7 @@ async function startMcpServer() {
     server.tool(
       "run_setup",
       "Re-run workspace setup (Sideboard/Conductor settings, .cursor/worktrees.json, or script/setup). New worktrees already run this automatically.",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         const result = await orch.runSetup(ref);
         return mcpJson(result);
@@ -4755,7 +4713,7 @@ async function startMcpServer() {
     server.tool(
       "add_project",
       "Register a git repo as a Sideboard workspace",
-      { repoPath: z8.string() },
+      { repoPath: z6.string() },
       async ({ repoPath }) => {
         const ws = await orch.addWorkspace(repoPath);
         return mcpJson(ws);
@@ -4763,10 +4721,10 @@ async function startMcpServer() {
     );
     server.tool(
       "remove_project",
-      "Unregister a Sideboard workspace (does not archive threads)",
-      { repoPath: z8.string() },
+      "Unregister a Sideboard workspace and archive its chats",
+      { repoPath: z6.string() },
       async ({ repoPath }) => {
-        orch.removeWorkspace(repoPath);
+        await orch.removeWorkspace(repoPath);
         return { content: [{ type: "text", text: "ok" }] };
       }
     );
@@ -4774,12 +4732,12 @@ async function startMcpServer() {
       "fanout",
       "Best-of-n: create one thread per agent with the same prompt (parallel attempts)",
       {
-        prompt: z8.string(),
-        agents: z8.array(z8.enum(["claude", "codex", "opencode", "brightsy", "cursor"])),
-        repoPath: z8.string(),
-        sourceType: z8.enum(["branch", "pr", "ticket"]).optional(),
-        sourceRef: z8.string().optional(),
-        title: z8.string().optional()
+        prompt: z6.string(),
+        agents: z6.array(z6.enum(["claude", "codex", "opencode", "brightsy", "cursor"])),
+        repoPath: z6.string(),
+        sourceType: z6.enum(["branch", "pr", "ticket"]).optional(),
+        sourceRef: z6.string().optional(),
+        title: z6.string().optional()
       },
       async (args) => {
         const threads = await orch.bestOfN(args);
@@ -4797,8 +4755,8 @@ async function startMcpServer() {
       "list_branches",
       "List git branches in a registered workspace. Pass repoPath from list_projects (unmerged into the default branch by default \u2014 for create_workspace sourceType=branch).",
       {
-        repoPath: z8.string(),
-        unmergedOnly: z8.boolean().optional()
+        repoPath: z6.string(),
+        unmergedOnly: z6.boolean().optional()
       },
       async ({ repoPath, unmergedOnly }) => {
         const root = await resolveRepoRoot(repoPath);
@@ -4819,19 +4777,19 @@ async function startMcpServer() {
       "list_prs",
       `List GitHub PRs for a registered workspace (the review surface for assigned ticket work \u2014 not the tickets). Pass repoPath from list_projects. "Get me N tickets to review" \u2192 queue=review and limit=N: 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. Prefer teams that match Settings \u2192 Agents / Projects roles for this repo. A team like engineering-team is not a claim (you are on that team). Also: state (open|closed|merged|all|review), label, reviewer (me|unassigned|login), query, limit (default 40, max 250). Then create_workspace with sourceType=pr.`,
       {
-        repoPath: z8.string(),
-        query: z8.string().optional().describe("GitHub search tokens (title, draft:true, \u2026)"),
-        queue: z8.enum(["review", "mine", "approved", "changes"]).optional().describe(
+        repoPath: z6.string(),
+        query: z6.string().optional().describe("GitHub search tokens (title, draft:true, \u2026)"),
+        queue: z6.enum(["review", "mine", "approved", "changes"]).optional().describe(
           "review = unclaimed ready-for-review inbox (Settings \u2192 Projects label, default eng-review). mine = review-requested:@me. approved / changes = eng-approved / eng-requested-changes."
         ),
-        state: z8.enum(["open", "closed", "merged", "all", "review"]).optional().describe("GitHub PR state (default open). review is an alias for queue=review."),
-        label: z8.string().optional().describe(
+        state: z6.enum(["open", "closed", "merged", "all", "review"]).optional().describe("GitHub PR state (default open). review is an alias for queue=review."),
+        label: z6.string().optional().describe(
           "GitHub label / workflow tag. Comma-separated AND. Examples: eng-review, eng-approved, eng-requested-changes"
         ),
-        reviewer: z8.string().optional().describe(
+        reviewer: z6.string().optional().describe(
           "me (review requested of you), unassigned (no individual reviewer; team queues like engineering-team still count), all, or a GitHub login"
         ),
-        limit: z8.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true.")
+        limit: z6.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true.")
       },
       async ({ repoPath, query, queue, state, label, reviewer, limit }) => {
         const root = await resolveRepoRoot(repoPath);
@@ -4864,7 +4822,7 @@ async function startMcpServer() {
     server.tool(
       "get_pr_stack",
       "Load the GitHub PR stack for a thread worktree (`gh stack view --json`). Returns null JSON when the branch is not stacked. Prefer this before ask_git merge on stacked PRs (and only merge when the user explicitly asked).",
-      { ref: z8.string() },
+      { ref: z6.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);
         return mcpJson(stack);
@@ -4874,8 +4832,8 @@ async function startMcpServer() {
       "open_pr_stack_layers",
       "Materialize one worktree+thread per stack layer (or a single 1-based layer). Pass a thread ref already on the stack.",
       {
-        ref: z8.string(),
-        layer: z8.number().int().positive().optional()
+        ref: z6.string(),
+        layer: z6.number().int().positive().optional()
       },
       async ({ ref, layer }) => {
         const result = await orch.openPrStackLayers(ref, { layer });
@@ -4898,9 +4856,9 @@ async function startMcpServer() {
       "add_stack_layer",
       "Add a branch on top of the current stack (`gh stack add`) and open a worktree+thread for it.",
       {
-        ref: z8.string(),
-        branchName: z8.string(),
-        title: z8.string().optional()
+        ref: z6.string(),
+        branchName: z6.string(),
+        title: z6.string().optional()
       },
       async ({ ref, branchName, title }) => {
         const result = await orch.addStackLayer(ref, branchName, { title });
@@ -4918,11 +4876,11 @@ async function startMcpServer() {
       "create_pr_stack",
       "Create a new GitHub PR stack with one Sideboard worktree per layer (bottom\u2192top branch names). Requires `gh extension install github/gh-stack`.",
       {
-        repoPath: z8.string(),
-        branches: z8.array(z8.string()).min(1),
-        agent: z8.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
-        base: z8.string().optional(),
-        title: z8.string().optional()
+        repoPath: z6.string(),
+        branches: z6.array(z6.string()).min(1),
+        agent: z6.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
+        base: z6.string().optional(),
+        title: z6.string().optional()
       },
       async (args) => {
         const result = await orch.createPrStack({
@@ -4950,10 +4908,10 @@ async function startMcpServer() {
       "list_issues",
       "List or search issues (Linear, AbleTime, or GitHub; falls back to GitHub). Use Settings \u2192 Agents / Projects notes and roles to pick tickets relevant to the viewer (query + assignee=me or unassigned as the notes say). Default 40; pass query and/or limit (max 250) when truncated. assignee: me (Linear default), unassigned, all, or a user id. Pass updatedSince for new/updated tickets and new comments (\u201Cany updates since yesterday?\u201D). Then create_workspace with sourceType=ticket.",
       {
-        repoPath: z8.string(),
-        query: z8.string().optional().describe("Search title, identifier, or description"),
-        assignee: z8.string().optional().describe("me (Linear default), unassigned, all, a user id, or a GitHub login"),
-        limit: z8.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
+        repoPath: z6.string(),
+        query: z6.string().optional().describe("Search title, identifier, or description"),
+        assignee: z6.string().optional().describe("me (Linear default), unassigned, all, a user id, or a GitHub login"),
+        limit: z6.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true."),
         updatedSince: mcpIssueUpdatedSinceSchema
       },
       async ({ repoPath, query, assignee, limit, updatedSince }) => {