@sideboard-ai/core 0.1.160 → 0.1.161

package/dist/mcp/run-stdio.js

@@ -36,7 +36,7 @@ import {
   syncBoardPins,
   updateSchedule,
   waitForDetachedJob
-} from "../chunk-QYKADGPP.js";
+} from "../chunk-EZANYS5D.js";
 import {
   isInternalAgentStatusText,
   listModelsForAgent,
@@ -107,7 +107,7 @@ import {
 // src/mcp/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z as z7 } from "zod";
+import { z as z8 } from "zod";
 import { randomUUID as randomUUID2 } from "crypto";
 import { basename } from "path";
 
@@ -1189,13 +1189,52 @@ ${githubUrl.trim()}` : githubUrl.trim();
 ${link}` : link;
 }
 
-// src/mcp/slack-tools.ts
-function text(payload, isError = false) {
+// src/mcp/issue-list.ts
+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
+  };
+}
+function compactIssueRow(issue) {
+  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 } : {}
+  };
+}
+function formatMcpIssueList(input) {
+  return {
+    ...input.source ? { source: input.source } : {},
+    ...input.viewer ? { viewer: input.viewer } : {},
+    limit: input.limit,
+    returned: input.issues.length,
+    truncated: input.truncated,
+    ...input.truncated ? { hint: "More issues match. Pass a higher limit (max 250) or a tighter query." } : {},
+    issues: input.issues.map(compactIssueRow)
+  };
+}
+function mcpJson(payload, isError = false) {
   return {
-    content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
+    content: [{ type: "text", text: JSON.stringify(payload) }],
     ...isError ? { isError: true } : {}
   };
 }
+
+// src/mcp/slack-tools.ts
+function text(payload, isError = false) {
+  return mcpJson(payload, isError);
+}
 function fail(err) {
   return text(
     { error: err instanceof Error ? err.message : String(err) },
@@ -1461,48 +1500,329 @@ function registerSlackTools(server) {
 }
 
 // src/mcp/abletime-tools.ts
+import { z as z3 } from "zod";
+
+// src/mcp/issue-payload.ts
 import { z as z2 } from "zod";
 
-// src/mcp/issue-list.ts
-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)));
+// 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(text7) {
+  return MUST_KEEP_TEXT_RE.test(text7);
+}
+function normalizeText(text7) {
+  return text7.replace(/\s+/g, " ").trim().toLowerCase();
+}
+function wordSet(text7) {
+  return new Set(
+    text7.toLowerCase().split(/\W+/).filter((w) => w.length > 2)
+  );
 }
-function applyIssueListWindow(items, limit) {
-  const truncated = items.length > limit;
-  return {
-    items: truncated ? items.slice(0, limit) : items,
-    truncated
+function jaccard(a, b) {
+  if (a.size === 0 && b.size === 0) return 1;
+  let inter = 0;
+  for (const w of a) {
+    if (b.has(w)) inter += 1;
+  }
+  const union = a.size + b.size - inter;
+  return union === 0 ? 0 : inter / union;
+}
+function importance(text7) {
+  let score = text7.length;
+  if (/```/.test(text7)) score += 400;
+  if (/https?:\/\//.test(text7)) score += 50;
+  if (looksLikeMustKeep(text7)) score += 1e4;
+  return score;
+}
+function meanStd(values) {
+  if (values.length === 0) return { mean: 0, std: 0 };
+  const mean = values.reduce((a, b) => a + b, 0) / values.length;
+  const variance = values.reduce((a, b) => a + (b - mean) * (b - mean), 0) / values.length;
+  return { mean, std: Math.sqrt(variance) };
+}
+function dedupTextItems(items, getText) {
+  const kept = [];
+  const keptNorm = [];
+  const keptWords = [];
+  for (const item of items) {
+    const text7 = getText(item);
+    const norm = normalizeText(text7);
+    if (!norm) {
+      kept.push(item);
+      keptNorm.push(norm);
+      keptWords.push(wordSet(text7));
+      continue;
+    }
+    const words = wordSet(text7);
+    let dupAt = -1;
+    for (let i = 0; i < kept.length; i++) {
+      if (keptNorm[i] === norm) {
+        dupAt = i;
+        break;
+      }
+      if (keptWords[i].size >= 8 && words.size >= 8 && jaccard(keptWords[i], words) >= NEAR_DUP_JACCARD) {
+        dupAt = i;
+        break;
+      }
+    }
+    if (dupAt < 0) {
+      kept.push(item);
+      keptNorm.push(norm);
+      keptWords.push(words);
+      continue;
+    }
+    if (text7.length > getText(kept[dupAt]).length) {
+      kept[dupAt] = item;
+      keptNorm[dupAt] = norm;
+      keptWords[dupAt] = words;
+    }
+  }
+  return { items: kept, dropped: items.length - kept.length };
+}
+function crushTextItems(items, getText, opts = {}) {
+  const minItems = opts.minItems ?? CRUSH_MIN_ITEMS;
+  const minChars = opts.minChars ?? CRUSH_MIN_CHARS;
+  const maxChars = opts.maxChars ?? CRUSH_COMMENT_MAX_CHARS;
+  const original = items;
+  const totalChars = items.reduce((n, item) => n + getText(item).length, 0);
+  if (items.length < minItems || totalChars < minChars) {
+    return {
+      items,
+      truncated: false,
+      kept: items.length,
+      dropped: 0,
+      reason: "passthrough"
+    };
+  }
+  const deduped = dedupTextItems(items, getText);
+  const unique = deduped.items;
+  const uniqueChars = unique.reduce((n, item) => n + getText(item).length, 0);
+  if (uniqueChars <= maxChars) {
+    const changed = unique.length < original.length;
+    return {
+      items: unique,
+      truncated: changed,
+      kept: unique.length,
+      dropped: original.length - unique.length,
+      reason: changed ? "dedup" : "passthrough"
+    };
+  }
+  const lengths = unique.map((item) => getText(item).length);
+  const { mean, std } = meanStd(lengths);
+  const outlierFloor = mean + 2 * std;
+  const mustKeep = /* @__PURE__ */ new Set();
+  unique.forEach((item, i) => {
+    const text7 = getText(item);
+    if (looksLikeMustKeep(text7) || text7.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);
+  const pick = new Set(mustKeep);
+  const canTake = (i) => {
+    if (pick.has(i)) return false;
+    const next = used + lengths[i];
+    if (next > maxChars && pick.size > mustKeep.size) return false;
+    used = next;
+    pick.add(i);
+    return true;
   };
-}
-function compactIssueRow(issue) {
+  const k = remainingIdx.length;
+  const headN = Math.max(1, Math.ceil(k * 0.3));
+  const tailN = Math.max(1, Math.ceil(k * 0.15));
+  for (const i of remainingIdx.slice(0, headN)) canTake(i);
+  for (const i of remainingIdx.slice(-tailN).reverse()) canTake(i);
+  const middle = remainingIdx.filter((i) => !pick.has(i)).sort((a, b) => importance(getText(unique[b])) - importance(getText(unique[a])));
+  for (const i of middle) {
+    if (used >= maxChars) break;
+    canTake(i);
+  }
+  const crushed = unique.filter((_, i) => pick.has(i));
+  const crushedChars = crushed.reduce((n, item) => n + getText(item).length, 0);
+  if (crushed.length >= original.length && crushedChars >= totalChars) {
+    return {
+      items: original,
+      truncated: false,
+      kept: original.length,
+      dropped: 0,
+      reason: "passthrough"
+    };
+  }
   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 } : {}
+    items: crushed,
+    truncated: crushed.length < original.length,
+    kept: crushed.length,
+    dropped: original.length - crushed.length,
+    reason: "budget"
   };
 }
-function formatMcpIssueList(input) {
-  return {
-    ...input.source ? { source: input.source } : {},
-    ...input.viewer ? { viewer: input.viewer } : {},
-    limit: input.limit,
-    returned: input.issues.length,
-    truncated: input.truncated,
-    ...input.truncated ? { hint: "More issues match. Pass a higher limit (max 250) or a tighter query." } : {},
-    issues: input.issues.map(compactIssueRow)
+function splitBlocks(text7) {
+  if (/\n\n/.test(text7)) return text7.split(/\n\n+/);
+  return text7.split("\n");
+}
+function capOversizedBlock(block, maxChars) {
+  if (block.length <= maxChars) return block;
+  const head = Math.floor(maxChars * 0.3);
+  const tail = Math.floor(maxChars * 0.15);
+  return `${block.slice(0, head)}
+
+[\u2026crushed ${block.length - head - tail} chars; pass include=full to read the rest\u2026]
+
+${block.slice(-tail)}`;
+}
+function crushMarkdown(text7, opts) {
+  const original = text7 ?? "";
+  const minChars = opts?.minChars ?? CRUSH_BODY_MIN_CHARS;
+  const maxChars = opts?.maxChars ?? CRUSH_BODY_MAX_CHARS;
+  if (original.length < minChars) {
+    return { text: original, truncated: false, originalChars: original.length };
+  }
+  const rawBlocks = splitBlocks(original).filter((b) => b.length > 0);
+  const blocks = rawBlocks.map((b) => capOversizedBlock(b, maxChars));
+  const cappedABlock = blocks.some((b, i) => b !== rawBlocks[i]);
+  if (blocks.length <= 1) {
+    const cut = blocks[0] ?? original;
+    if (cut.length >= original.length) {
+      return { text: original, truncated: false, originalChars: original.length };
+    }
+    return { text: cut, truncated: true, originalChars: original.length };
+  }
+  const must = blocks.filter((b) => looksLikeMustKeep(b));
+  const rest = blocks.filter((b) => !looksLikeMustKeep(b));
+  const marker = `[\u2026crushed body; ${original.length} chars originally. Pass include=full to read the rest.]`;
+  let used = must.reduce((n, b) => n + b.length, 0) + marker.length;
+  const keptRest = [];
+  const headN = Math.max(1, Math.ceil(rest.length * 0.3));
+  const tailN = Math.max(1, Math.ceil(rest.length * 0.15));
+  const head = rest.slice(0, headN);
+  const tail = rest.slice(-tailN);
+  const middle = rest.slice(headN, Math.max(headN, rest.length - tailN));
+  const take = (block) => {
+    if (used + block.length + 2 > maxChars && keptRest.length + must.length > 0) {
+      return false;
+    }
+    used += block.length + 2;
+    keptRest.push(block);
+    return true;
   };
+  for (const b of head) take(b);
+  for (const b of tail) take(b);
+  const ranked = [...middle].sort((a, b) => importance(b) - importance(a));
+  for (const b of ranked) {
+    if (used >= maxChars) break;
+    take(b);
+  }
+  const keepSet = /* @__PURE__ */ new Set([...must, ...keptRest]);
+  const ordered = blocks.filter((b) => keepSet.has(b));
+  const omitted = blocks.length - ordered.length;
+  if (omitted <= 0) {
+    const joined = blocks.join("\n\n");
+    if (cappedABlock && joined.length < original.length) {
+      return { text: joined, truncated: true, originalChars: original.length };
+    }
+    return { text: original, truncated: false, originalChars: original.length };
+  }
+  const out = [];
+  let inserted = false;
+  for (const block of blocks) {
+    if (keepSet.has(block)) {
+      out.push(block);
+      continue;
+    }
+    if (!inserted) {
+      out.push(marker);
+      inserted = true;
+    }
+  }
+  const textOut = out.join("\n\n");
+  if (textOut.length >= original.length) {
+    return { text: original, truncated: false, originalChars: original.length };
+  }
+  return { text: textOut, truncated: true, originalChars: original.length };
 }
-function mcpJson(payload, isError = false) {
-  return {
-    content: [{ type: "text", text: JSON.stringify(payload) }],
-    ...isError ? { isError: true } : {}
+
+// src/mcp/issue-payload.ts
+var MCP_ISSUE_INCLUDE_VALUES = ["default", "full"];
+var mcpIssueIncludeSchema = z2.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.";
+function emptyMeta() {
+  return { truncated: true, hint: MCP_ISSUE_CRUSH_HINT };
+}
+function withComments(comments, meta) {
+  const crushed = crushTextItems(comments, (c) => c.body);
+  if (crushed.truncated) {
+    meta.comments = {
+      kept: crushed.kept,
+      dropped: crushed.dropped,
+      reason: crushed.reason
+    };
+  }
+  return { comments: crushed.items, meta };
+}
+function withBody(text7, meta) {
+  const crushed = crushMarkdown(text7);
+  if (crushed.truncated) {
+    meta.body = { originalChars: crushed.originalChars };
+    return { value: crushed.text, meta };
+  }
+  return { value: text7, meta };
+}
+function attachCrush(payload, meta) {
+  if (!meta.comments && !meta.body) return payload;
+  return { ...payload, crush: meta };
+}
+function formatLinearIssuePayload(issue, include) {
+  if (include === "full") return issue;
+  const meta = emptyMeta();
+  const comments = withComments(issue.comments, meta);
+  const description = withBody(issue.description, comments.meta);
+  const { team, ...rest } = issue;
+  const next = {
+    ...rest,
+    ...team ? { team: { id: team.id, key: team.key, name: team.name } } : {},
+    description: description.value,
+    comments: comments.comments
+  };
+  return attachCrush(next, description.meta);
+}
+function formatGitHubIssuePayload(issue, include) {
+  if (include === "full") return issue;
+  const meta = emptyMeta();
+  const comments = withComments(issue.comments, meta);
+  const body = withBody(issue.body, comments.meta);
+  const next = {
+    ...issue,
+    body: body.value,
+    comments: comments.comments
   };
+  return attachCrush(next, body.meta);
+}
+function formatAbleTimeTaskPayload(task, include) {
+  const base = {
+    ...toAbleTimeIssueInfo(task),
+    description: task.description,
+    state: task.state,
+    comments: task.comments
+  };
+  if (include === "full") return base;
+  const meta = emptyMeta();
+  const comments = withComments(task.comments, meta);
+  const description = withBody(task.description, comments.meta);
+  return attachCrush(
+    {
+      ...base,
+      description: description.value,
+      comments: comments.comments
+    },
+    description.meta
+  );
 }
 
 // src/mcp/abletime-tools.ts
@@ -1548,7 +1868,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_list_tasks",
     "List open AbleTime tasks (excludes done/archived). Optional projectId filter.",
-    { projectId: z2.string().optional() },
+    { projectId: z3.string().optional() },
     async ({ projectId }) => {
       try {
         const tasks = await listAbleTimeTasks({ projectId });
@@ -1561,7 +1881,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_search_tasks",
     "Search AbleTime tasks by text, reference, or tag.",
-    { query: z2.string() },
+    { query: z3.string() },
     async ({ query }) => {
       try {
         const tasks = await searchAbleTimeTasks(query);
@@ -1573,17 +1893,11 @@ function registerAbleTimeTools(server) {
   );
   server.tool(
     "abletime_get_task",
-    "Get one AbleTime task by id or reference (e.g. CRM-232): description, state, comments. Re-fetch to read new comments.",
-    { id: z2.string() },
-    async ({ id }) => {
+    "Get one AbleTime task by id or reference (e.g. CRM-232): description, state, comments. 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.",
+    { id: z3.string(), include: mcpIssueIncludeSchema },
+    async ({ id, include }) => {
       try {
-        const task = await getAbleTimeTask(id);
-        return text2({
-          ...toAbleTimeIssueInfo(task),
-          description: task.description,
-          state: task.state,
-          comments: task.comments
-        });
+        return text2(formatAbleTimeTaskPayload(await getAbleTimeTask(id), include));
       } catch (err) {
         return fail2(err);
       }
@@ -1592,7 +1906,7 @@ function registerAbleTimeTools(server) {
   server.tool(
     "abletime_comment",
     "Add a markdown comment on an AbleTime task (id or CRM-232).",
-    { id: z2.string(), body: z2.string() },
+    { id: z3.string(), body: z3.string() },
     async (args) => {
       try {
         return text2(await commentAbleTimeTask(args));
@@ -1605,10 +1919,10 @@ function registerAbleTimeTools(server) {
     "abletime_update_task",
     "Update an AbleTime task (id or CRM-232). Pass title, description, and/or state.",
     {
-      id: z2.string(),
-      title: z2.string().optional(),
-      description: z2.string().optional(),
-      state: z2.string().optional()
+      id: z3.string(),
+      title: z3.string().optional(),
+      description: z3.string().optional(),
+      state: z3.string().optional()
     },
     async (args) => {
       try {
@@ -1627,12 +1941,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: 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.")
+      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.")
     },
     async (args) => {
       try {
@@ -1646,10 +1960,10 @@ function registerAbleTimeTools(server) {
     "abletime_ensure_task",
     "Find or create an AbleTime task for this work, then create_thread with sourceType=ticket.",
     {
-      title: z2.string(),
-      description: z2.string().optional(),
-      projectId: z2.string().optional(),
-      categoryId: z2.string().optional()
+      title: z3.string(),
+      description: z3.string().optional(),
+      projectId: z3.string().optional(),
+      categoryId: z3.string().optional()
     },
     async (args) => {
       try {
@@ -1663,7 +1977,7 @@ function registerAbleTimeTools(server) {
 }
 
 // src/mcp/github-tools.ts
-import { z as z3 } from "zod";
+import { z as z4 } from "zod";
 
 // src/integrations/github-issues.ts
 function requireGhOk(result, label) {
@@ -1847,15 +2161,15 @@ function fail3(err) {
     true
   );
 }
-var repoPathSchema = z3.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).");
+var repoPathSchema = z4.string().optional().describe("Workspace / worktree path. Omit on a worktree turn (uses cwd).");
 function registerGithubIssueTools(server) {
   server.tool(
     "github_get_issue",
-    "Get a GitHub issue (#123 or URL): body, comments, state. Re-fetch to read new comments. Uses Account gh.",
-    { id: z3.string(), repoPath: repoPathSchema },
-    async ({ id, repoPath }) => {
+    "Get a GitHub issue (#123 or URL): body, comments, state. 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.",
+    { id: z4.string(), include: mcpIssueIncludeSchema, repoPath: repoPathSchema },
+    async ({ id, include, repoPath }) => {
       try {
-        return text3(await getGitHubIssue(id, { repoPath }));
+        return text3(formatGitHubIssuePayload(await getGitHubIssue(id, { repoPath }), include));
       } catch (err) {
         return fail3(err);
       }
@@ -1864,7 +2178,7 @@ function registerGithubIssueTools(server) {
   server.tool(
     "github_comment",
     "Add a markdown comment on a GitHub issue (#123 or URL). Uses Account gh.",
-    { id: z3.string(), body: z3.string(), repoPath: repoPathSchema },
+    { id: z4.string(), body: z4.string(), repoPath: repoPathSchema },
     async ({ id, body, repoPath }) => {
       try {
         return text3(await commentGitHubIssue({ id, body }, { repoPath }));
@@ -1877,10 +2191,10 @@ function registerGithubIssueTools(server) {
     "github_update_issue",
     "Update a GitHub issue (#123). Pass title, body, and/or state (open|closed).",
     {
-      id: z3.string(),
-      title: z3.string().optional(),
-      body: z3.string().optional(),
-      state: z3.string().optional().describe("open or closed"),
+      id: z4.string(),
+      title: z4.string().optional(),
+      body: z4.string().optional(),
+      state: z4.string().optional().describe("open or closed"),
       repoPath: repoPathSchema
     },
     async (args) => {
@@ -1895,9 +2209,9 @@ function registerGithubIssueTools(server) {
     "github_create_issue",
     "Create a GitHub issue. Pass parent (#123) to mark a spin-off in the body.",
     {
-      title: z3.string(),
-      body: z3.string().optional(),
-      parent: z3.string().optional().describe("Parent issue #123 or URL for a spin-off."),
+      title: z4.string(),
+      body: z4.string().optional(),
+      parent: z4.string().optional().describe("Parent issue #123 or URL for a spin-off."),
       repoPath: repoPathSchema
     },
     async (args) => {
@@ -1911,7 +2225,7 @@ function registerGithubIssueTools(server) {
 }
 
 // src/mcp/linear-tools.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 function text4(payload, isError = false) {
   return mcpJson(payload, isError);
 }
@@ -1921,7 +2235,7 @@ function fail4(err) {
     true
   );
 }
-var prioritySchema = z4.number().int().min(0).max(4).optional().describe("0 none, 1 urgent, 2 high, 3 medium, 4 low");
+var prioritySchema = z5.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",
@@ -1939,9 +2253,9 @@ function registerLinearTools(server) {
     "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.",
     {
-      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.")
+      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.")
     },
     async ({ query, assignee, limit }) => {
       try {
@@ -1968,11 +2282,11 @@ function registerLinearTools(server) {
   );
   server.tool(
     "linear_get_issue",
-    "Get a Linear issue by uuid or identifier (ENG-123): description, comments, relations, parent/children.",
-    { id: z4.string() },
-    async ({ id }) => {
+    "Get a Linear issue by uuid or identifier (ENG-123): description, comments, relations, parent/children. Default crushes redundant comments and huge pasted bodies (SmartCrusher-style; small unique tickets pass through). Pass include=full for the uncompressed vendor payload.",
+    { id: z5.string(), include: mcpIssueIncludeSchema },
+    async ({ id, include }) => {
       try {
-        return text4(await getLinearIssue(id));
+        return text4(formatLinearIssuePayload(await getLinearIssue(id), include));
       } catch (err) {
         return fail4(err);
       }
@@ -1982,13 +2296,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: z4.string(),
-      title: z4.string(),
-      description: z4.string().optional(),
-      state: z4.string().optional(),
-      assignee: z4.string().nullable().optional(),
+      team: z5.string(),
+      title: z5.string(),
+      description: z5.string().optional(),
+      state: z5.string().optional(),
+      assignee: z5.string().nullable().optional(),
       priority: prioritySchema,
-      parent: z4.string().optional().describe("Parent issue uuid or identifier (ENG-123) for a spin-off / sub-issue.")
+      parent: z5.string().optional().describe("Parent issue uuid or identifier (ENG-123) for a spin-off / sub-issue.")
     },
     async (args) => {
       try {
@@ -2002,11 +2316,11 @@ function registerLinearTools(server) {
     "linear_update_issue",
     "Update a Linear issue (uuid or ENG-123). Pass title, description, state, assignee, and/or priority.",
     {
-      id: z4.string(),
-      title: z4.string().optional(),
-      description: z4.string().optional(),
-      state: z4.string().optional(),
-      assignee: z4.string().nullable().optional(),
+      id: z5.string(),
+      title: z5.string().optional(),
+      description: z5.string().optional(),
+      state: z5.string().optional(),
+      assignee: z5.string().nullable().optional(),
       priority: prioritySchema
     },
     async (args) => {
@@ -2021,8 +2335,8 @@ function registerLinearTools(server) {
     "linear_comment",
     "Add a markdown comment on a Linear issue (uuid or ENG-123).",
     {
-      id: z4.string(),
-      body: z4.string()
+      id: z5.string(),
+      body: z5.string()
     },
     async (args) => {
       try {
@@ -2042,7 +2356,7 @@ function registerConnectedIssueVendorTools(server, settings = loadAppSettings())
 }
 
 // src/mcp/viewer-context-tools.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 function text5(payload, isError = false) {
   return mcpJson(payload, isError);
 }
@@ -2074,7 +2388,7 @@ function registerViewerContextTools(server) {
     "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_workspaces for project context. Worktree turns may omit repoPath (uses cwd).",
     {
-      repoPath: z5.string().optional().describe(
+      repoPath: z6.string().optional().describe(
         "Registered workspace or worktree path. Required from orchestration for a project. Omit on a worktree turn (uses cwd)."
       )
     },
@@ -2094,10 +2408,10 @@ function registerViewerContextTools(server) {
     "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: z5.enum(["account", "project"]).describe("account = Settings \u2192 Agents; project = Settings \u2192 Projects for one repo"),
-      context: z5.string().describe("Full replacement text (roles, tickets, review queues). Empty clears."),
-      confirmed: z5.boolean().optional().describe("Must be true after the user confirmed via ask_user. False/omit is rejected."),
-      repoPath: z5.string().optional().describe(
+      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_workspaces). Worktree turns may omit it (cwd)."
       )
     },
@@ -2174,12 +2488,9 @@ function formatMcpPrList(input) {
 }
 
 // src/mcp/schedule-tools.ts
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 function text6(payload, isError = false) {
-  return {
-    content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
-    ...isError ? { isError: true } : {}
-  };
+  return mcpJson(payload, isError);
 }
 function fail5(err) {
   return text6(
@@ -2217,17 +2528,17 @@ function registerScheduleTools(server) {
     "create_schedule",
     "Create a local schedule that, when due, sends a prompt to an orchestration chat (threadId) or starts a new Global orchestration chat (omit threadId). Pass threadId=self to continue this coordinator. Exactly one of at (ISO datetime), every (15m/1h/6h/1d), or cron (5-field). Recurring jobs without threadId open a new chat each run. Overnight/unattended runs need Settings \u2192 Advanced \u2192 Caffeinate while schedules are enabled, or set_caffeinate. Sideboard.app must be running for the job to fire.",
     {
-      prompt: z6.string().describe("User message / goal queued when the schedule fires"),
-      name: z6.string().optional(),
-      at: z6.string().optional().describe("ISO datetime for a one-shot"),
-      every: z6.string().optional().describe("Interval such as 15m, 1h, 6h, 1d"),
-      cron: z6.string().optional().describe("5-field cron expression"),
-      tz: z6.string().optional().describe("IANA timezone for cron (default: system)"),
-      threadId: z6.string().optional().describe(
+      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)"),
+      threadId: z7.string().optional().describe(
         'Existing orchestration chat id, or "self" for this coordinator. Omit to create a new Global chat on fire.'
       ),
-      agent: z6.enum(["claude", "cursor", "codex", "opencode"]).optional().describe("Agent for a new Global chat (omit for Account default)"),
-      model: z6.string().optional()
+      agent: z7.enum(["claude", "cursor", "codex", "opencode"]).optional().describe("Agent for a new Global chat (omit for Account default)"),
+      model: z7.string().optional()
     },
     async (args) => {
       try {
@@ -2260,17 +2571,17 @@ function registerScheduleTools(server) {
     "update_schedule",
     "Update a local schedule (prompt, cadence, target thread, enabled). Pass id from list_schedules.",
     {
-      id: z6.string(),
-      prompt: z6.string().optional(),
-      name: z6.string().optional(),
-      at: z6.string().optional(),
-      every: z6.string().optional(),
-      cron: z6.string().optional(),
-      tz: z6.string().optional(),
-      threadId: z6.string().optional().describe('Existing orchestration chat, "self", or empty string to create a new chat each run'),
-      agent: z6.enum(["claude", "cursor", "codex", "opencode"]).optional(),
-      model: z6.string().optional(),
-      enabled: z6.boolean().optional()
+      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(),
+      threadId: z7.string().optional().describe('Existing orchestration chat, "self", or empty string to create a new chat each run'),
+      agent: z7.enum(["claude", "cursor", "codex", "opencode"]).optional(),
+      model: z7.string().optional(),
+      enabled: z7.boolean().optional()
     },
     async (args) => {
       try {
@@ -2308,7 +2619,7 @@ function registerScheduleTools(server) {
   server.tool(
     "delete_schedule",
     "Delete a local schedule. Pass id from list_schedules.",
-    { id: z6.string() },
+    { id: z7.string() },
     async ({ id }) => {
       try {
         deleteSchedule(id);
@@ -2321,7 +2632,7 @@ function registerScheduleTools(server) {
   server.tool(
     "run_schedule",
     "Fire a schedule now (does not wait for nextRunAt). Queues the prompt or starts a new Global chat. If Sideboard.app is running, the desktop drains the turn.",
-    { id: z6.string() },
+    { id: z7.string() },
     async ({ id }) => {
       try {
         if (!getSchedule(id)) {
@@ -2742,13 +3053,13 @@ async function startMcpServer() {
       "list_board",
       "Home Kanban of worktrees (New, Draft, Review, Merged) \u2014 one card per checkout; sibling chat tabs nest as inner cards. 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), column, limit (default 40). create_thread adds a worktree (and a Home card), or returns the live one if that ticket/PR/named branch is already checked out.",
       {
-        query: z7.string().optional().describe("Case-insensitive token search across title, id, labels, repo"),
-        repoPath: z7.string().optional().describe("Limit to one workspace path from list_workspaces"),
-        kind: z7.enum(["all", "tickets", "prs", "branches", "threads"]).optional().describe("Filter by worktree source (default all)"),
-        column: z7.enum(["new", "draft", "review", "done", "needs_you"]).optional().describe(
+        query: z8.string().optional().describe("Case-insensitive token search across title, id, labels, repo"),
+        repoPath: z8.string().optional().describe("Limit to one workspace path from list_workspaces"),
+        kind: z8.enum(["all", "tickets", "prs", "branches", "threads"]).optional().describe("Filter by worktree source (default all)"),
+        column: z8.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: z7.number().int().positive().optional().describe("Max cards per column (default 40). hidden counts the remainder.")
+        limit: z8.number().int().positive().optional().describe("Max cards per column (default 40). hidden counts the remainder.")
       },
       async ({ query, repoPath, kind, column, limit }) => {
         const workspaces = orch.listWorkspaces();
@@ -2763,30 +3074,19 @@ async function startMcpServer() {
           limit,
           workspaceName: (path) => names.get(path) ?? ""
         });
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  columns: snap.columns,
-                  hidden: snap.hidden,
-                  totals: snap.totals,
-                  columnDefs: BOARD_COLUMN_DEFS,
-                  hint: HOME_BOARD_AGENT_HINT
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return mcpJson({
+          columns: snap.columns,
+          hidden: snap.hidden,
+          totals: snap.totals,
+          columnDefs: BOARD_COLUMN_DEFS,
+          hint: HOME_BOARD_AGENT_HINT
+        });
       }
     );
     server.tool(
       "get_thread",
       "Get a compact thread summary by id/ref. Includes last message preview, parentThreadId, and child worktree threads (status + lastText). While running, includes progress (last tool/thinking) and lastActivityAt. Includes usage (thread billed token + costUsd totals when providers reported cost) and lastTurnUsage.",
-      { ref: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
         if (!t) {
@@ -2820,7 +3120,7 @@ async function startMcpServer() {
           usage: spend.usage,
           lastTurnUsage: spend.lastTurnUsage
         };
-        return { content: [{ type: "text", text: JSON.stringify(summary, null, 2) }] };
+        return mcpJson(summary);
       }
     );
   }
@@ -2828,17 +3128,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: z7.string().describe("Short title shown in the artifact pane header"),
-      type: z7.enum(["html", "svg", "markdown", "react", "log"]).describe(
+      title: z8.string().describe("Short title shown in the artifact pane header"),
+      type: z8.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: z7.string().describe(
+      content: z8.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: z7.string().optional().describe("Stable id. Required for type=log so later calls append to the same pane."),
-      status: z7.enum(["running", "ok", "failed", "idle"]).optional().describe("Log header pill: running (working), ok (done), failed, idle"),
-      phase: z7.string().optional().describe("Log subtitle (Signing, Notarizing, \u2026)"),
-      mode: z7.enum(["append", "replace"]).optional().describe("log only: append (default) or replace the buffer")
+      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")
     },
     async ({ title, type, artifact_id, status, phase, mode }) => {
       const id = artifact_id?.trim() || `artifact_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -2852,22 +3152,22 @@ async function startMcpServer() {
         mode: type === "log" ? mode ?? "append" : void 0,
         message: type === "log" ? "Log accepted. Same artifact_id appends; send only new lines next time." : "Artifact accepted. Sideboard desktop opens it in the side column beside chat."
       };
-      return { content: [{ type: "text", text: JSON.stringify(payload) }] };
+      return mcpJson(payload);
     }
   );
   server.tool(
     "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: z7.array(
-        z7.object({
-          question: z7.string().describe("Full question text ending with ?"),
-          header: z7.string().max(24).optional().describe("Short label shown above the question"),
-          multiSelect: z7.boolean().optional().describe("Allow selecting multiple options"),
-          options: z7.array(
-            z7.object({
-              label: z7.string(),
-              description: z7.string().optional().describe("What this option means / when to choose it (strongly preferred)")
+      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)")
             })
           ).min(2).max(6).describe("2\u20136 choices (Sideboard also offers Other)")
         })
@@ -2879,16 +3179,16 @@ async function startMcpServer() {
         questions,
         message: "Questions shown in Sideboard\u2019s composer. Wait for the user\u2019s next message with their answers before continuing."
       };
-      return { content: [{ type: "text", text: JSON.stringify(payload) }] };
+      return mcpJson(payload);
     }
   );
   server.tool(
     "present_plan",
     "Save the implementation plan as markdown to .context/attachments/plan.md and show it in Sideboard chat for user approval (Copy / Hand off / Approve). Call this when the plan is ready \u2014 required in plan mode. Pass the full plan body in content. Then Claude should call ExitPlanMode.",
     {
-      title: z7.string().optional().describe("Short plan title (defaults to Plan)"),
-      content: z7.string().min(1).describe("Full plan markdown (headings, steps, risks, open questions)"),
-      thread_id: z7.string().optional().describe("Sideboard thread id when cwd is not the worktree")
+      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")
     },
     async ({ title, content, thread_id }) => {
       const { writePlanFile } = await import("../plan-file-I24VJVP2.js");
@@ -2904,22 +3204,22 @@ async function startMcpServer() {
         title: title?.trim() || "Plan",
         message: "Plan saved to .context/attachments/plan.md and shown in Sideboard chat for approval."
       };
-      return { content: [{ type: "text", text: JSON.stringify(payload) }] };
+      return mcpJson(payload);
     }
   );
   server.tool(
     "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: z7.string().describe("Pane title"),
-      mode: z7.enum(["table", "form"]).optional().describe("table = list/filter records; form = edit one record"),
-      datasource: z7.enum(["brightsy", "inline"]).optional().describe("brightsy resolves via login; inline uses embedded resource/records"),
-      resource_id: z7.string().optional().describe("Brightsy record type UUID (or generic resource id)"),
-      record_id: z7.string().optional().describe("Record id when opening form mode"),
-      resource: z7.record(z7.unknown()).optional().describe("Inline { id, title, schema, schemaUi?, slug? }"),
-      record: z7.record(z7.unknown()).optional().describe("Inline record { id, data, published_at? }"),
-      records: z7.array(z7.record(z7.unknown())).optional().describe("Inline records for table mode"),
-      pane_id: z7.string().optional().describe("Stable pane id across updates")
+      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")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `schema_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -2933,17 +3233,17 @@ async function startMcpServer() {
         record_id: args.record_id,
         message: "Schema pane accepted. Sideboard desktop opens the CMS column beside chat."
       };
-      return { content: [{ type: "text", text: JSON.stringify(payload) }] };
+      return mcpJson(payload);
     }
   );
   server.tool(
     "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: z7.string().optional().describe("Pane title (default: Files)"),
-      datasource: z7.enum(["brightsy", "memory"]).optional().describe("brightsy = account storage via login; memory = session demo store"),
-      path: z7.string().optional().describe("Initial folder path (e.g. public)"),
-      pane_id: z7.string().optional().describe("Stable pane id across updates")
+      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")
     },
     async (args) => {
       const id = args.pane_id?.trim() || `files_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
@@ -2955,21 +3255,21 @@ async function startMcpServer() {
         path: args.path,
         message: "Files pane accepted. Sideboard desktop opens the Files column beside chat."
       };
-      return { content: [{ type: "text", text: JSON.stringify(payload) }] };
+      return mcpJson(payload);
     }
   );
   server.tool(
     "wait_for_job",
     "Wait on a detached long job (tests, pack, deploy) started with detached-job.js. MCP clients kill tools around 60s, so this returns within 45s. stillRunning is the source of truth \u2014 if true, present_artifact type=log with content=delta (same artifact_id) and call wait_for_job again. Do not end the turn or tell the user you will let them know later. If false, ok/failed is the result.",
     {
-      id: z7.string().describe("Detached job id (same kebab-case id passed to detached-job.js start)"),
-      timeoutMs: z7.number().optional()
+      id: z8.string().describe("Detached job id (same kebab-case id passed to detached-job.js start)"),
+      timeoutMs: z8.number().optional()
     },
     async ({ id, timeoutMs }) => {
       const result = await waitForDetachedJob(process.cwd(), id, {
         timeoutMs: mcpWaitForJobTimeoutMs(timeoutMs)
       });
-      return { content: [{ type: "text", text: JSON.stringify(result) }] };
+      return mcpJson(result);
     }
   );
   if (!worktreeProfile) {
@@ -2984,56 +3284,44 @@ 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: z7.boolean().describe("true = hold caffeinate on; false = release and let the Mac sleep")
+        enabled: z8.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;
         const state = setCaffeinateHold(enabled, { threadId });
         if (enabled && !state.held) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  ...state,
-                  ok: false,
-                  message: state.platform === "darwin" ? "Could not start caffeinate." : "Caffeinate is macOS only."
-                })
-              }
-            ],
-            isError: true
-          };
-        }
-        return {
-          content: [
+          return mcpJson(
             {
-              type: "text",
-              text: JSON.stringify({
-                ...getCaffeinateHold(),
-                ok: true,
-                message: state.held ? "Mac will stay awake until you call set_caffeinate with enabled=false, the user says they are done, or this orchestration chat is closed." : "Caffeinate hold released. The Mac can sleep (unless Settings caffeinate toggles are on)."
-              })
-            }
-          ]
-        };
+              ...state,
+              ok: false,
+              message: state.platform === "darwin" ? "Could not start caffeinate." : "Caffeinate is macOS only."
+            },
+            true
+          );
+        }
+        return mcpJson({
+          ...getCaffeinateHold(),
+          ok: true,
+          message: state.held ? "Mac will stay awake until you call set_caffeinate with enabled=false, the user says they are done, or this orchestration chat is closed." : "Caffeinate hold released. The Mac can sleep (unless Settings caffeinate toggles are on)."
+        });
       }
     );
     server.tool(
       "create_thread",
       `Create a worktree thread (chat) from branch, pr, or ticket. A ticket, PR, or named branch may have only one live worktree \u2014 if one already matches, returns it (alreadyStarted=true) instead of a second checkout. Creating from the default branch still opens a new isolated worktree. Pass repoPath from list_workspaces. cowboy=true uses the project folder on the default branch (no isolated worktree; land is commit+push). From an orchestration chat, omit parentThreadId (Sideboard binds the child to this chat) or pass the exact id from the turn reminder \u2014 never invent a uuid. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Setup (settings.toml, .cursor/worktrees.json, or script/setup) runs in the background in parallel with the first turn (skipped for cowboy). Then use send_to_thread to chat.`,
       {
-        sourceType: z7.enum(["branch", "pr", "ticket"]),
-        sourceRef: z7.string(),
-        agent: z7.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(`Omit to use Account default agent (${accountDefaults.agent})`),
-        model: z7.string().nullable().optional().describe(
+        sourceType: z8.enum(["branch", "pr", "ticket"]),
+        sourceRef: z8.string(),
+        agent: z8.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(`Omit to use Account default agent (${accountDefaults.agent})`),
+        model: z8.string().nullable().optional().describe(
           `Usually omit to use Account default model (${accountDefaults.model?.trim() || "Auto"}). Pass null only to force Auto / agent-default.`
         ),
-        repoPath: z7.string(),
-        title: z7.string().optional(),
-        cowboy: z7.boolean().optional().describe(
+        repoPath: z8.string(),
+        title: z8.string().optional(),
+        cowboy: z8.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."
         ),
-        parentThreadId: z7.string().optional().describe(
+        parentThreadId: z8.string().optional().describe(
           "Orchestration: omit (preferred) or pass YOUR chat id from the turn reminder / AGENTS.md. Do not invent uuids."
         )
       },
@@ -3049,10 +3337,10 @@ async function startMcpServer() {
       "start_board_card",
       "Same as create_thread for a ticket, PR, or named branch (attaches issue text when Sideboard can resolve it). Does not create a second worktree when one already matches \u2014 returns that thread (alreadyStarted). Then send_to_thread.",
       {
-        kind: z7.enum(["ticket", "pr", "branch"]),
-        ref: z7.string().describe("Ticket identifier (ENG-12), PR number (44), or branch name from list_board"),
-        repoPath: z7.string().describe("Workspace path from list_workspaces / list_board"),
-        title: z7.string().optional()
+        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("Workspace path from list_workspaces / list_board"),
+        title: z8.string().optional()
       },
       async ({ kind, ref, repoPath, title }) => {
         const root = await resolveRepoRoot(repoPath);
@@ -3069,20 +3357,13 @@ async function startMcpServer() {
           }))
         );
         if (existing) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  alreadyStarted: true,
-                  id: existing.id,
-                  title: existing.title,
-                  status: existing.status,
-                  link: `sideboard://thread/${existing.id}`
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            alreadyStarted: true,
+            id: existing.id,
+            title: existing.title,
+            status: existing.status,
+            link: `sideboard://thread/${existing.id}`
+          });
         }
         const workspaces = orch.listWorkspaces();
         const loaded = await getHomeBoardInputs(workspaces);
@@ -3156,9 +3437,9 @@ async function startMcpServer() {
       "send_to_thread",
       'Queue a prompt on a worktree thread chat (runs under concurrency cap). Use after create_thread 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 force_stop to check in, resume after a halt notice, or because wait_for_turn returned stillRunning; that stops the child mid-thought. Call wait_for_turn again instead.',
       {
-        ref: z7.string(),
-        prompt: z7.string(),
-        force_stop: z7.boolean().optional()
+        ref: z8.string(),
+        prompt: z8.string(),
+        force_stop: z8.boolean().optional()
       },
       async ({ ref, prompt, force_stop }) => {
         if (force_stop) {
@@ -3168,79 +3449,58 @@ async function startMcpServer() {
           }
         }
         const thread = await orch.send(ref, prompt);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                id: thread.id,
-                status: thread.status,
-                queueLength: thread.queue.length,
-                forceStopped: Boolean(force_stop)
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          id: thread.id,
+          status: thread.status,
+          queueLength: thread.queue.length,
+          forceStopped: Boolean(force_stop)
+        });
       }
     );
     server.tool(
       "wait_for_turn",
       "Wait until the thread 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. stillRunning is the source of truth \u2014 if false, the child is not working (do not say it is waiting for a gate). If stillRunning is true, progress is tools/thinking (or \u201Cqueued, waiting for a concurrency slot\u201D if it has not started). Call wait_for_turn again. Do not send a check-in prompt, force_stop, or assume a hang. On status error, lastError/text is the failure. On status stopped or broken, the child did not finish \u2014 resume with send_to_thread or tell the user; do not treat that as success. When finished, usage is the last agent turn\u2019s tokens + costUsd (when the provider reported cost).",
       {
-        ref: z7.string(),
-        timeoutMs: z7.number().optional()
+        ref: z8.string(),
+        timeoutMs: z8.number().optional()
       },
       async ({ ref, timeoutMs }) => {
         const thread = await orch.waitForTurn(ref, mcpWaitForTurnTimeoutMs(timeoutMs), {
           resolveIfStillRunning: true
         });
         const result = orch.getTurnResult(thread.id);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                id: thread.id,
-                status: result.status,
-                text: result.text,
-                lastError: result.lastError,
-                stillRunning: result.stillRunning,
-                progress: result.progress,
-                lastActivityAt: result.lastActivityAt,
-                hint: result.stillRunning ? mcpWaitStillRunningHint(result.status) : mcpWaitFinishedHint(result.status),
-                incomplete: !result.stillRunning && Boolean(mcpWaitFinishedHint(result.status))
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          id: thread.id,
+          status: result.status,
+          text: result.text,
+          lastError: result.lastError,
+          stillRunning: result.stillRunning,
+          progress: result.progress,
+          lastActivityAt: result.lastActivityAt,
+          hint: result.stillRunning ? mcpWaitStillRunningHint(result.status) : mcpWaitFinishedHint(result.status),
+          incomplete: !result.stillRunning && Boolean(mcpWaitFinishedHint(result.status))
+        });
       }
     );
     server.tool(
       "get_turn_result",
       "Assistant message when the turn finished, or live progress while stillRunning. Not the full transcript. Includes usage for the last agent turn (tokens + costUsd when reported).",
-      { ref: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                ...result,
-                hint: result.stillRunning ? mcpWaitStillRunningHint(result.status) : mcpWaitFinishedHint(result.status),
-                incomplete: !result.stillRunning && Boolean(mcpWaitFinishedHint(result.status))
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          ...result,
+          hint: result.stillRunning ? mcpWaitStillRunningHint(result.status) : mcpWaitFinishedHint(result.status),
+          incomplete: !result.stillRunning && Boolean(mcpWaitFinishedHint(result.status))
+        });
       }
     );
     server.tool(
       "stop_thread",
       "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.",
       {
-        ref: z7.string(),
-        force: z7.boolean().optional()
+        ref: z8.string(),
+        force: z8.boolean().optional()
       },
       async ({ ref, force }) => {
         const t = orch.getThread(ref);
@@ -3253,24 +3513,17 @@ async function startMcpServer() {
         const clearQueue = force !== false;
         const hadQueued = t.queue.length > 0;
         const stopped = orch.stop(ref, { clearQueue, notifyParent: false });
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                id: stopped.id,
-                status: stopped.status,
-                clearedQueue: clearQueue && hadQueued
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          id: stopped.id,
+          status: stopped.status,
+          clearedQueue: clearQueue && hadQueued
+        });
       }
     );
     server.tool(
       "archive_thread",
       "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: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const t = orch.getThread(ref);
         if (!t) {
@@ -3287,38 +3540,24 @@ async function startMcpServer() {
           };
         }
         const archived = await orch.archive(ref);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                id: archived.id,
-                status: archived.status
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          id: archived.id,
+          status: archived.status
+        });
       }
     );
     server.tool(
       "restore_thread",
       "Restore an archived thread (recreates worktree from branch when needed)",
-      { ref: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         try {
           const restored = await orch.restore(ref);
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  id: restored.id,
-                  status: restored.status,
-                  worktreePath: restored.worktreePath
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            id: restored.id,
+            status: restored.status,
+            worktreePath: restored.worktreePath
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3329,34 +3568,25 @@ async function startMcpServer() {
       "get_diff",
       "Compact diff summary (capped hunks, paginated)",
       {
-        ref: z7.string(),
-        maxFiles: z7.number().optional()
+        ref: z8.string(),
+        maxFiles: z8.number().optional()
       },
       async ({ ref, maxFiles }) => {
         const summary = await orch.diffSummary(ref);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                ...summary,
-                files: summary.files.slice(0, maxFiles ?? 10)
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          ...summary,
+          files: summary.files.slice(0, maxFiles ?? 10)
+        });
       }
     );
     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: z7.string().describe("Worktree thread id/ref") },
+      { ref: z8.string().describe("Worktree thread id/ref") },
       async ({ ref }) => {
         try {
           const checks = await orch.getPrChecks(ref);
-          return {
-            content: [{ type: "text", text: JSON.stringify(checks) }]
-          };
+          return mcpJson(checks);
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3366,25 +3596,18 @@ async function startMcpServer() {
     server.tool(
       "request_review",
       'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). 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. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn (loop while stillRunning) / get_turn_result on the returned review tab id.',
-      { ref: z7.string().describe("Worktree thread id/ref to review") },
+      { ref: z8.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
           const tab = await orch.requestReview(ref);
           const from = orch.getThread(ref);
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  id: tab.id,
-                  title: tab.title,
-                  status: tab.status,
-                  fromThreadId: from?.id ?? ref,
-                  link: `sideboard://thread/${tab.id}`
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            id: tab.id,
+            title: tab.title,
+            status: tab.status,
+            fromThreadId: from?.id ?? ref,
+            link: `sideboard://thread/${tab.id}`
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3395,53 +3618,37 @@ async function startMcpServer() {
       "ask_git",
       "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` even when origin is SSH / Settings \u2192 Git is SSH). When dirty, queues the worktree agent to commit; 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=merge only when the user explicitly asked to merge that PR. Do not run git or gh from the orchestration cwd. If this tool errors that the GraphQL/PR body is too long, the branch is already pushed \u2014 have the worktree agent retry `gh pr create --body-file` with a short description (GitHub limit 65,536 characters). Do not invent SSH/auth failures from that error.",
       {
-        ref: z7.string().describe("Worktree thread id/ref"),
-        action: z7.enum(AGENT_GIT_ACTIONS).describe(
+        ref: z8.string().describe("Worktree thread id/ref"),
+        action: z8.enum(AGENT_GIT_ACTIONS).describe(
           "commit-push | create-draft | create-web | resolve-conflicts | merge"
         )
       },
       async ({ ref, action }) => {
         try {
           const thread = await orch.askGit(ref, action);
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  id: thread.id,
-                  status: thread.status,
-                  queueLength: thread.queue.length,
-                  action,
-                  link: `sideboard://thread/${thread.id}`
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            id: thread.id,
+            status: thread.status,
+            queueLength: thread.queue.length,
+            action,
+            link: `sideboard://thread/${thread.id}`
+          });
         } catch (err) {
           const raw = err instanceof Error ? err.message : String(err);
           const message = formatGhLandError(raw);
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify(
-                  {
-                    error: true,
-                    action,
-                    lastError: message,
-                    hint: /body is too long/i.test(message) ? "Branch is already pushed. send_to_thread so the worktree agent runs gh pr create --draft -R <origin> --body-file <short.md>. Keep the description short." : void 0
-                  },
-                  null,
-                  2
-                )
-              }
-            ],
-            isError: true
-          };
+          return mcpJson(
+            {
+              error: true,
+              action,
+              lastError: message,
+              hint: /body is too long/i.test(message) ? "Branch is already pushed. send_to_thread so the worktree agent runs gh pr create --draft -R <origin> --body-file <short.md>. Keep the description short." : void 0
+            },
+            true
+          );
         }
       }
     );
-    const agentEnum = z7.enum(["claude", "codex", "opencode", "brightsy", "cursor"]);
+    const agentEnum = z8.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.",
@@ -3451,9 +3658,7 @@ async function startMcpServer() {
       async ({ agent }) => {
         try {
           const catalogs = await listModelsForAgent(agent);
-          return {
-            content: [{ type: "text", text: JSON.stringify(catalogs, null, 2) }]
-          };
+          return mcpJson(catalogs);
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3464,11 +3669,11 @@ async function startMcpServer() {
       "fork_worktree",
       "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_thread / wait_for_turn (loop while stillRunning) on the returned id.",
       {
-        ref: z7.string().describe("Worktree thread id/ref to fork"),
-        through_index: z7.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        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)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z7.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z7.string().optional()
+        model: z8.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z8.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -3481,24 +3686,17 @@ async function startMcpServer() {
             model,
             title
           });
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  id: thread.id,
-                  title: thread.title,
-                  status: thread.status,
-                  agent: thread.agent,
-                  model: thread.model,
-                  branchName: thread.branchName,
-                  worktreePath: thread.worktreePath,
-                  fromThreadId: source?.id ?? ref,
-                  link: `sideboard://thread/${thread.id}`
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            id: thread.id,
+            title: thread.title,
+            status: thread.status,
+            agent: thread.agent,
+            model: thread.model,
+            branchName: thread.branchName,
+            worktreePath: thread.worktreePath,
+            fromThreadId: source?.id ?? ref,
+            link: `sideboard://thread/${thread.id}`
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3509,11 +3707,11 @@ async function startMcpServer() {
       "fork_chat",
       "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Slack / Global orchestrators use this to continue an orchestration chat on another agent after session limits. Then send_to_thread / wait_for_turn (loop while stillRunning) on the returned id. Use fork_worktree only for worktree agents that need a new git worktree.",
       {
-        ref: z7.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
-        through_index: z7.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
+        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)"),
         agent: agentEnum.optional().describe("Agent for the forked chat (default: same as source)"),
-        model: z7.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
-        title: z7.string().optional()
+        model: z8.string().nullable().optional().describe("Usually omit (Auto). Only set from list_models when you need a specific model"),
+        title: z8.string().optional()
       },
       async ({ ref, through_index, agent, model, title }) => {
         try {
@@ -3531,24 +3729,17 @@ async function startMcpServer() {
             model,
             title
           });
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  id: tab.id,
-                  title: tab.title,
-                  status: tab.status,
-                  agent: tab.agent,
-                  model: tab.model,
-                  sourceType: tab.sourceType,
-                  worktreePath: tab.worktreePath,
-                  fromThreadId: source.id,
-                  link: `sideboard://thread/${tab.id}`
-                })
-              }
-            ]
-          };
+          return mcpJson({
+            id: tab.id,
+            title: tab.title,
+            status: tab.status,
+            agent: tab.agent,
+            model: tab.model,
+            sourceType: tab.sourceType,
+            worktreePath: tab.worktreePath,
+            fromThreadId: source.id,
+            link: `sideboard://thread/${tab.id}`
+          });
         } catch (err) {
           const message = err instanceof Error ? err.message : String(err);
           return { content: [{ type: "text", text: message }], isError: true };
@@ -3559,49 +3750,35 @@ async function startMcpServer() {
       "run_dev_script",
       "Start a .sideboard/.conductor run script for a thread (default script if name omitted); returns port",
       {
-        ref: z7.string(),
-        name: z7.string().optional()
+        ref: z8.string(),
+        name: z8.string().optional()
       },
       async ({ ref, name }) => {
         const result = await orch.startDev(ref, name);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                port: result.port,
-                scriptName: result.scriptName,
-                ports: result.ports,
-                url: `http://localhost:${result.port}`
-              })
-            }
-          ]
-        };
+        return mcpJson({
+          port: result.port,
+          scriptName: result.scriptName,
+          ports: result.ports,
+          url: `http://localhost:${result.port}`
+        });
       }
     );
     server.tool(
       "list_run_scripts",
       "List named run scripts available for a thread",
-      { ref: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const scripts = orch.listThreadRunScripts(ref);
         const active = orch.getActiveRuns(ref);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({ scripts, active }, null, 2)
-            }
-          ]
-        };
+        return mcpJson({ scripts, active });
       }
     );
     server.tool(
       "stop_dev_script",
       "Stop a running script for a thread (all scripts if name omitted)",
       {
-        ref: z7.string(),
-        name: z7.string().optional()
+        ref: z8.string(),
+        name: z8.string().optional()
       },
       async ({ ref, name }) => {
         orch.stopDev(ref, name);
@@ -3611,27 +3788,25 @@ 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: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const result = await orch.runSetup(ref);
-        return {
-          content: [{ type: "text", text: JSON.stringify(result) }]
-        };
+        return mcpJson(result);
       }
     );
     server.tool(
       "add_workspace",
       "Register a git repo as a Sideboard workspace",
-      { repoPath: z7.string() },
+      { repoPath: z8.string() },
       async ({ repoPath }) => {
         const ws = await orch.addWorkspace(repoPath);
-        return { content: [{ type: "text", text: JSON.stringify(ws) }] };
+        return mcpJson(ws);
       }
     );
     server.tool(
       "remove_workspace",
       "Unregister a Sideboard workspace (does not archive threads)",
-      { repoPath: z7.string() },
+      { repoPath: z8.string() },
       async ({ repoPath }) => {
         orch.removeWorkspace(repoPath);
         return { content: [{ type: "text", text: "ok" }] };
@@ -3641,40 +3816,31 @@ async function startMcpServer() {
       "fanout",
       "Best-of-n: create one thread per agent with the same prompt (parallel attempts)",
       {
-        prompt: z7.string(),
-        agents: z7.array(z7.enum(["claude", "codex", "opencode", "brightsy", "cursor"])),
-        repoPath: z7.string(),
-        sourceType: z7.enum(["branch", "pr", "ticket"]).optional(),
-        sourceRef: z7.string().optional(),
-        title: z7.string().optional()
+        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()
       },
       async (args) => {
         const threads = await orch.bestOfN(args);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                threads.map((t) => ({
-                  id: t.id,
-                  agent: t.agent,
-                  branchName: t.branchName,
-                  worktreePath: t.worktreePath
-                })),
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return mcpJson(
+          threads.map((t) => ({
+            id: t.id,
+            agent: t.agent,
+            branchName: t.branchName,
+            worktreePath: t.worktreePath
+          }))
+        );
       }
     );
     server.tool(
       "list_branches",
       "List git branches in a registered workspace. Pass repoPath from list_workspaces (unmerged into the default branch by default \u2014 for create_thread sourceType=branch).",
       {
-        repoPath: z7.string(),
-        unmergedOnly: z7.boolean().optional()
+        repoPath: z8.string(),
+        unmergedOnly: z8.boolean().optional()
       },
       async ({ repoPath, unmergedOnly }) => {
         const root = await resolveRepoRoot(repoPath);
@@ -3695,19 +3861,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_workspaces. "Get me N tickets to review" \u2192 queue=review and limit=N: open non-draft PRs labeled 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_thread with sourceType=pr.',
       {
-        repoPath: z7.string(),
-        query: z7.string().optional().describe("GitHub search tokens (title, draft:true, \u2026)"),
-        queue: z7.enum(["review", "mine", "approved", "changes"]).optional().describe(
+        repoPath: z8.string(),
+        query: z8.string().optional().describe("GitHub search tokens (title, draft:true, \u2026)"),
+        queue: z8.enum(["review", "mine", "approved", "changes"]).optional().describe(
           'review = unclaimed eng-review inbox (use for "get me N tickets to review"). mine = review-requested:@me. approved / changes = eng-approved / eng-requested-changes.'
         ),
-        state: z7.enum(["open", "closed", "merged", "all", "review"]).optional().describe("GitHub PR state (default open). review is an alias for queue=review."),
-        label: z7.string().optional().describe(
+        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(
           "GitHub label / workflow tag. Comma-separated AND. Examples: eng-review, eng-approved, eng-requested-changes"
         ),
-        reviewer: z7.string().optional().describe(
+        reviewer: z8.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: z7.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true.")
+        limit: z8.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);
@@ -3739,89 +3905,65 @@ 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: z7.string() },
+      { ref: z8.string() },
       async ({ ref }) => {
         const stack = await orch.getPrStack(ref);
-        return {
-          content: [{ type: "text", text: JSON.stringify(stack, null, 2) }]
-        };
+        return mcpJson(stack);
       }
     );
     server.tool(
       "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: z7.string(),
-        layer: z7.number().int().positive().optional()
+        ref: z8.string(),
+        layer: z8.number().int().positive().optional()
       },
       async ({ ref, layer }) => {
         const result = await orch.openPrStackLayers(ref, { layer });
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  stackNumber: result.stack.stackNumber,
-                  trunk: result.stack.trunk,
-                  threads: result.threads.map((t) => ({
-                    id: t.id,
-                    title: t.title,
-                    branchName: t.branchName,
-                    stackLayer: t.stackLayer,
-                    worktreePath: t.worktreePath,
-                    prUrl: t.prUrl,
-                    link: `sideboard://thread/${t.id}`
-                  }))
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return mcpJson({
+          stackNumber: result.stack.stackNumber,
+          trunk: result.stack.trunk,
+          threads: result.threads.map((t) => ({
+            id: t.id,
+            title: t.title,
+            branchName: t.branchName,
+            stackLayer: t.stackLayer,
+            worktreePath: t.worktreePath,
+            prUrl: t.prUrl,
+            link: `sideboard://thread/${t.id}`
+          }))
+        });
       }
     );
     server.tool(
       "add_stack_layer",
       "Add a branch on top of the current stack (`gh stack add`) and open a worktree+thread for it.",
       {
-        ref: z7.string(),
-        branchName: z7.string(),
-        title: z7.string().optional()
+        ref: z8.string(),
+        branchName: z8.string(),
+        title: z8.string().optional()
       },
       async ({ ref, branchName, title }) => {
         const result = await orch.addStackLayer(ref, branchName, { title });
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  id: result.thread.id,
-                  title: result.thread.title,
-                  branchName: result.thread.branchName,
-                  stackLayer: result.thread.stackLayer,
-                  worktreePath: result.thread.worktreePath,
-                  link: `sideboard://thread/${result.thread.id}`
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return mcpJson({
+          id: result.thread.id,
+          title: result.thread.title,
+          branchName: result.thread.branchName,
+          stackLayer: result.thread.stackLayer,
+          worktreePath: result.thread.worktreePath,
+          link: `sideboard://thread/${result.thread.id}`
+        });
       }
     );
     server.tool(
       "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: z7.string(),
-        branches: z7.array(z7.string()).min(1),
-        agent: z7.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
-        base: z7.string().optional(),
-        title: z7.string().optional()
+        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()
       },
       async (args) => {
         const result = await orch.createPrStack({
@@ -3831,39 +3973,28 @@ async function startMcpServer() {
           base: args.base,
           title: args.title
         });
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  stackNumber: result.stack.stackNumber,
-                  trunk: result.stack.trunk,
-                  threads: result.threads.map((t) => ({
-                    id: t.id,
-                    title: t.title,
-                    branchName: t.branchName,
-                    stackLayer: t.stackLayer,
-                    worktreePath: t.worktreePath,
-                    link: `sideboard://thread/${t.id}`
-                  }))
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return mcpJson({
+          stackNumber: result.stack.stackNumber,
+          trunk: result.stack.trunk,
+          threads: result.threads.map((t) => ({
+            id: t.id,
+            title: t.title,
+            branchName: t.branchName,
+            stackLayer: t.stackLayer,
+            worktreePath: t.worktreePath,
+            link: `sideboard://thread/${t.id}`
+          }))
+        });
       }
     );
     server.tool(
       "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. Then create_thread with sourceType=ticket.",
       {
-        repoPath: z7.string(),
-        query: z7.string().optional().describe("Search title, identifier, or description"),
-        assignee: z7.string().optional().describe("me (Linear default), unassigned, all, a user id, or a GitHub login"),
-        limit: z7.number().int().positive().max(250).optional().describe("Page size (default 40, max 250). Raise when truncated is true.")
+        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.")
       },
       async ({ repoPath, query, assignee, limit }) => {
         const root = await resolveRepoRoot(repoPath);