@sideboard-ai/core 0.1.150 → 0.1.152

package/dist/index.js

@@ -9,6 +9,7 @@ import {
   CONTEXT_KEEP_RECENT_CHARS,
   CONTEXT_KEEP_RECENT_MESSAGES,
   CONTEXT_MIN_MESSAGES,
+  CONTEXT_REVIEW_PATH,
   DEFAULT_WORKTREE_SORT,
   HOME_BOARD_AGENT_HINT,
   HOME_BOARD_CACHE_TTL_MS,
@@ -71,6 +72,7 @@ import {
   disconnectOptionalService,
   disconnectSlackWorkspace,
   discoverSkills,
+  ensureReviewGuidelinesFile,
   ensureReviewRequestFile,
   ensureReviewSkillFile,
   estimateMessageChars,
@@ -98,6 +100,7 @@ import {
   formatMessagesAsTranscript,
   formatOptionalServicesDirective,
   formatOptionalServicesReminder,
+  formatPrGateDirective,
   formatProcessGuideDirective,
   formatRenameBranchDirective,
   formatScheduleWhen,
@@ -213,7 +216,7 @@ import {
   worktreeCleanupSettings,
   wrapReviewSkillMarkdown,
   writeWorktreeFile
-} from "./chunk-NUPITVRF.js";
+} from "./chunk-6X7Z34XE.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -224,7 +227,7 @@ import {
   readPlanFile,
   resolvePlanMarkdown,
   writePlanFile
-} from "./chunk-PTOSP4AH.js";
+} from "./chunk-RFMQY56R.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -307,7 +310,7 @@ import {
   withEventParentId,
   withEventsParentId,
   writeInjectedMcpConfig
-} from "./chunk-SDN4ZYQH.js";
+} from "./chunk-GFQ57XAX.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -332,7 +335,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-HAS5EPBS.js";
+} from "./chunk-K2ANSHUO.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -367,7 +370,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   takenTeamSlugsForOrchestration
-} from "./chunk-AF6O55PJ.js";
+} from "./chunk-G4MTYUWS.js";
 import {
   COORDINATOR_TOOL_PLAYBOOK,
   SLACK_REPLY_FORMATTING,
@@ -376,7 +379,7 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-NOTANBYC.js";
+} from "./chunk-2U6QF3PT.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   GITHUB_PR_BODY_MAX_CHARS,
@@ -468,13 +471,15 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-ZGFYFVJF.js";
+} from "./chunk-GE7M3QTE.js";
 import {
   ATTACHMENTS_DIR,
+  DETACHED_JOBS_DIR,
   LEGACY_ATTACHMENTS_DIR,
+  LEGACY_DETACHED_JOBS_DIR,
   attachmentsGitignoreBody,
   isWorkspaceScratchPath
-} from "./chunk-WHU7YGWP.js";
+} from "./chunk-JRH62XC4.js";
 import {
   ABLETIME_MCP_PATH,
   DEFAULT_ABLETIME_HOST,
@@ -649,7 +654,7 @@ import {
   workspaceSettingsSourceLabel,
   worktreesRoot
 } from "./chunk-QZQEXME2.js";
-import "./chunk-Y4NAPW5I.js";
+import "./chunk-QQKDGPUI.js";
 import {
   conductorBundledBinDir,
   enrichPathWithNpmGlobalBin,
@@ -3579,7 +3584,7 @@ async function startMcpServer() {
       thread_id: z5.string().optional().describe("Sideboard thread id when cwd is not the worktree")
     },
     async ({ title, content, thread_id }) => {
-      const { writePlanFile: writePlanFile2 } = await import("./plan-file-5S5TUNAW.js");
+      const { writePlanFile: writePlanFile2 } = await import("./plan-file-LSSSQGTQ.js");
       let root = process.cwd();
       if (thread_id?.trim()) {
         const t = orch.getThread(thread_id.trim());
@@ -4022,9 +4027,25 @@ async function startMcpServer() {
         };
       }
     );
+    server.tool(
+      "get_pr_checks",
+      "Snapshot of GitHub PR checks for a worktree thread (`gh pr checks` plus merge/review gates). null = no PR. If the user gave a goal (Greptile 5/5, CI green), the worktree agent watches with `gh pr checks --watch` via /long-running \u2014 this tool is a snapshot, not a waiter. Coordinators: do not run gh from the orchestration cwd.",
+      { ref: z5.string().describe("Worktree thread id/ref") },
+      async ({ ref }) => {
+        try {
+          const checks = await orch.getPrChecks(ref);
+          return {
+            content: [{ type: "text", text: JSON.stringify(checks) }]
+          };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          return { content: [{ type: "text", text: message }], isError: true };
+        }
+      }
+    );
     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 seeds that skill from .sideboard/review.md or 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.',
+      '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: z5.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
@@ -4052,7 +4073,7 @@ async function startMcpServer() {
     );
     server.tool(
       "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). 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.",
+      "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: z5.string().describe("Worktree thread id/ref"),
         action: z5.enum(AGENT_GIT_ACTIONS).describe(
@@ -6814,10 +6835,12 @@ export {
   CONTEXT_KEEP_RECENT_CHARS,
   CONTEXT_KEEP_RECENT_MESSAGES,
   CONTEXT_MIN_MESSAGES,
+  CONTEXT_REVIEW_PATH,
   CONVENTION_SETUP_RELPATHS,
   COORDINATOR_TOOL_PLAYBOOK,
   DEFAULT_ABLETIME_HOST,
   DEFAULT_WORKTREE_SORT,
+  DETACHED_JOBS_DIR,
   FAMOUS_SOCCER_TEAMS,
   FOLLOW_UP_BEHAVIORS,
   GITHUB_GIT_AUTH_MODES,
@@ -6828,6 +6851,7 @@ export {
   HOME_BOARD_CACHE_TTL_MS,
   ISSUE_SOURCE_LABELS,
   LEGACY_ATTACHMENTS_DIR,
+  LEGACY_DETACHED_JOBS_DIR,
   LEGACY_PLAN_FILE_REL,
   LEGACY_REVIEW_REQUEST_PATH,
   LINEAR_OAUTH_CANCELLED,
@@ -7018,6 +7042,7 @@ export {
   ensureConnectedBrightsyTeamTokens,
   ensureGhPreferOrigin,
   ensureGlobalCoordinatorCwd,
+  ensureReviewGuidelinesFile,
   ensureReviewRequestFile,
   ensureReviewSkillFile,
   ensureSlackCoordinator,
@@ -7067,6 +7092,7 @@ export {
   formatOptionalServicesReminder,
   formatPlanQuestionAnswers,
   formatPlanQuestionsForChat,
+  formatPrGateDirective,
   formatProcessGuideDirective,
   formatRateLimitResetHint,
   formatRenameBranchDirective,

package/dist/mcp/run-stdio.cjs

@@ -2931,14 +2931,12 @@ var init_gh_errors = __esm({
 // src/git/worktree-exclude.ts
 var worktree_exclude_exports = {};
 __export(worktree_exclude_exports, {
+  WORKTREE_CONTEXT_EXCLUDE: () => WORKTREE_CONTEXT_EXCLUDE,
   WORKTREE_SIDEBOARD_EXCLUDE: () => WORKTREE_SIDEBOARD_EXCLUDE,
   ensureWorktreeSideboardIgnored: () => ensureWorktreeSideboardIgnored
 });
-function excludeHasSideboard(body) {
-  return body.split(/\r?\n/).some((line) => {
-    const t = line.trim();
-    return t === ".sideboard/" || t === ".sideboard" || t === "/.sideboard/";
-  });
+function excludeHasLine(body, ...needles) {
+  return body.split(/\r?\n/).some((line) => needles.includes(line.trim()));
 }
 async function ensureWorktreeSideboardIgnored(worktreePath) {
   if (!worktreePath.trim()) return;
@@ -2957,16 +2955,20 @@ async function ensureWorktreeSideboardIgnored(worktreePath) {
   } catch {
     body = "";
   }
-  if (!excludeHasSideboard(body)) {
+  const missing = [];
+  if (!excludeHasLine(body, ".sideboard/", ".sideboard", "/.sideboard/")) {
+    missing.push(WORKTREE_SIDEBOARD_EXCLUDE);
+  }
+  if (!excludeHasLine(body, ".context/", ".context", "/.context/")) {
+    missing.push(WORKTREE_CONTEXT_EXCLUDE);
+  }
+  if (missing.length > 0) {
     const prefix = body && !body.endsWith("\n") ? `${body}
 ` : body;
-    (0, import_node_fs13.writeFileSync)(
-      excludePath,
-      `${prefix}${EXCLUDE_COMMENT}
-${WORKTREE_SIDEBOARD_EXCLUDE}
-`,
-      "utf8"
-    );
+    const header = body.includes(EXCLUDE_COMMENT) ? "" : `${EXCLUDE_COMMENT}
+`;
+    (0, import_node_fs13.writeFileSync)(excludePath, `${prefix}${header}${missing.join("\n")}
+`, "utf8");
   }
   const listed = await git(["ls-files", "-z", "--", ".sideboard"], worktreePath, {
     reject: false,
@@ -2980,7 +2982,7 @@ ${WORKTREE_SIDEBOARD_EXCLUDE}
     timeoutMs: 8e3
   });
 }
-var import_node_fs13, import_node_path14, WORKTREE_SIDEBOARD_EXCLUDE, EXCLUDE_COMMENT;
+var import_node_fs13, import_node_path14, WORKTREE_SIDEBOARD_EXCLUDE, WORKTREE_CONTEXT_EXCLUDE, EXCLUDE_COMMENT;
 var init_worktree_exclude = __esm({
   "src/git/worktree-exclude.ts"() {
     "use strict";
@@ -2988,6 +2990,7 @@ var init_worktree_exclude = __esm({
     import_node_path14 = require("path");
     init_run();
     WORKTREE_SIDEBOARD_EXCLUDE = ".sideboard/";
+    WORKTREE_CONTEXT_EXCLUDE = ".context/";
     EXCLUDE_COMMENT = "# Sideboard worktree scratch \u2014 do not commit";
   }
 });
@@ -6740,7 +6743,7 @@ function ensureGlobalCoordinatorCwd(opts) {
     "Typical flow (Home board): list_board \u2192 create_thread (sourceType=ticket|pr|branch) \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
     "Typical flow (branch / explicit source): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
     "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
-    "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
+    "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). If the user gave a goal (Greptile 5/5, CI green), pass that goal through so they watch-fix-push until it lands \u2014 do not start that loop on a plain push, and do not tell the human to poll. Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
     (0, import_node_fs17.writeFileSync)((0, import_node_path20.join)(dir, "CLAUDE.md"), `${body}
@@ -6820,15 +6823,16 @@ var init_coordinator_prompt = __esm({
       "- list_run_scripts / run_dev_script / stop_dev_script \u2014 start/stop named run scripts",
       "Inspect / review / PRs:",
       "- get_diff \u2014 compact diff summary",
-      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .claude/skills/review/SKILL.md when present, else seeds that skill / local guidelines; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id',
-      "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If ask_git / get_thread lastError says the GraphQL/PR body is too long, the branch is already pushed \u2014 send_to_thread so the worktree agent runs `gh pr create --body-file` with a short description. Do not invent SSH or auth failures from that error.",
+      "- get_pr_checks \u2014 snapshot of a worktree thread's PR checks (null = no PR). Use this to inspect status. If the user gave a goal, the worktree agent watches with `gh pr checks --watch` \u2014 do not poll for the human.",
+      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .claude/skills/review/SKILL.md when present, else .context/review.md copied from .sideboard/review.md / stock; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id',
+      "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing. If ask_git / get_thread lastError says the GraphQL/PR body is too long, the branch is already pushed \u2014 send_to_thread so the worktree agent runs `gh pr create --body-file` with a short description. Do not invent SSH or auth failures from that error. If the user gave a goal (Greptile 5/5, CI green), send_to_thread that goal so the worktree agent enters the watch-fix-push loop \u2014 do not tell the human to poll.",
       '- Merge (`ask_git` action=merge / send_to_thread "Merge PR.") only when the user explicitly asked to merge that PR. Do not merge because the work looks done, CI is green, or a typical flow includes it.',
       '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft -R <origin-owner/name>` using the workspace `github:` slug \u2014 never upstream). Never run git/gh from this orchestration cwd, and never merge the PR yourself.',
       "Process guides:",
       "- Long child jobs (pack, test, deploy, anything that may run more than ~30s): workers always have `/long-running` (Sideboard product skill). Tell them to detach and wait; do not ask the human to poll.",
       "- Recurring multi-item / fan-out: if the child worktree has `.claude/skills/graph-engineering/SKILL.md`, tell the worker to follow it (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch three threads.",
-      "- Recurring shapes: have the worktree agent write `.claude/skills/<kebab-name>/SKILL.md` (commit it) so later threads and native Claude Code / attach see it. Merge-review sentences go in `.claude/skills/review/SKILL.md` (create it \u2014 that is allowed). Do not use `.sideboard/skills/` (that folder only). Codex/OpenCode: one line in AGENTS.md pointing at that file.",
-      "- One-offs: no guide. Same miss across threads: edit the skill or `.claude/skills/review/SKILL.md`, then rerun the batch \u2014 do not patch three threads.",
+      "- Recurring shapes: have the worktree agent write `.claude/skills/<kebab-name>/SKILL.md` (commit it) so later threads and native Claude Code / attach see it. Merge-review sentences go in `.claude/skills/review/SKILL.md` when that skill already exists; otherwise `.context/review.md` (do not create a review skill). Do not use `.sideboard/skills/` (that folder only). Codex/OpenCode: one line in AGENTS.md pointing at that file.",
+      "- One-offs: no guide. Same miss across threads: edit the existing skill or `.context/review.md`, then rerun the batch \u2014 do not patch three threads.",
       "Human-only (do not attempt): ready-for-review land (confirm_land), purge_thread.",
       "Thread links in replies: when mentioning a chat/thread for the user, include a markdown link `[Title](sideboard://thread/<id>)` using the full id (or the link field from create_thread / list_threads). Sideboard renders these as clickable opens.",
       "Bash / Read / etc: allowed for (1) inspecting target worktrees / registered repo paths from MCP, and (2) greenfield setup under ~/sideboard/repos (git clone, gh repo create, git init+remote). Never git init/clone *inside* this synthetic home cwd \u2014 emptiness here is expected, not a bug."
@@ -12107,17 +12111,7 @@ var init_chat_tabs = __esm({
 });
 
 // src/review/review-request-template.ts
-function wrapReviewSkillMarkdown(body) {
-  const trimmed = body.replace(/^\uFEFF/, "").trim();
-  const source = trimmed || REVIEW_REQUEST_TEMPLATE.trim();
-  if (/^---\s*\n[\s\S]*?\n---\s*\n/.test(source)) {
-    return source.endsWith("\n") ? source : `${source}
-`;
-  }
-  return `${REVIEW_SKILL_FRONTMATTER}${source}
-`;
-}
-var REVIEW_REQUEST_TEMPLATE, REVIEW_SKILL_PATH, REVIEW_SKILL_NAME, REVIEW_SKILL_FRONTMATTER;
+var REVIEW_REQUEST_TEMPLATE, REVIEW_SKILL_PATH, REVIEW_SKILL_NAME;
 var init_review_request_template = __esm({
   "src/review/review-request-template.ts"() {
     "use strict";
@@ -12240,18 +12234,10 @@ File: src/client/frontends/desktop/core/UserData.ts
 
 ## Growing the rules
 
-If a blocking issue is a missing or ambiguous repo rule that will recur, add one sentence to \`.claude/skills/review/SKILL.md\` (create the skill if it is missing \u2014 that is allowed and should be committed). Do not only patch this diff when the same miss will happen again. Do not write new skills under \`.sideboard/skills/\`. Do not use \`.sideboard/review.md\` for new notes.
+If a blocking issue is a missing or ambiguous repo rule that will recur, add one sentence to \`.claude/skills/review/SKILL.md\` when that skill already exists. Otherwise write it to \`.context/review.md\` (do not create a review skill). Do not only patch this diff when the same miss will happen again. Do not write new skills under \`.sideboard/skills/\`.
 `;
     REVIEW_SKILL_PATH = ".claude/skills/review/SKILL.md";
     REVIEW_SKILL_NAME = "review";
-    REVIEW_SKILL_FRONTMATTER = `---
-name: review
-description: >-
-  Merge-readiness review for this repository. Use when reviewing a PR, worktree
-  diff, or Sideboard Review (Approve / Approve with nits / Request changes).
----
-
-`;
   }
 });
 
@@ -12294,37 +12280,57 @@ function skillGuidelines(content, source) {
     source
   };
 }
-function ensureReviewSkillFile(worktreePath) {
-  const abs = (0, import_node_path29.join)(worktreePath, REVIEW_SKILL_PATH);
-  const existing = readTextIfPresent(abs);
-  if (existing) {
-    return { path: REVIEW_SKILL_PATH, content: existing, wrote: false };
-  }
-  const fromRepo = readTextIfPresent((0, import_node_path29.join)(worktreePath, REPO_REVIEW_PATH));
-  const fromLocal = readLocalGuidelines(worktreePath)?.content ?? null;
-  const content = wrapReviewSkillMarkdown(fromRepo ?? fromLocal ?? REVIEW_REQUEST_TEMPLATE);
-  (0, import_node_fs29.mkdirSync)((0, import_node_path29.dirname)(abs), { recursive: true });
-  (0, import_node_fs29.writeFileSync)(abs, content, "utf8");
-  return { path: REVIEW_SKILL_PATH, content, wrote: true };
+function contextGuidelines(content, source) {
+  return {
+    path: CONTEXT_REVIEW_PATH,
+    name: REPO_REVIEW_NAME,
+    content,
+    source
+  };
 }
-function resolveReviewGuidelines(worktreePath) {
+function writeContextGuidelines(worktreePath, content) {
+  const abs = (0, import_node_path29.join)(worktreePath, CONTEXT_REVIEW_PATH);
+  (0, import_node_fs29.mkdirSync)((0, import_node_path29.dirname)(abs), { recursive: true });
+  const body = content.endsWith("\n") ? content : `${content}
+`;
+  (0, import_node_fs29.writeFileSync)(abs, body, "utf8");
+  return body;
+}
+function readSideboardReview(worktreePath, repoPath) {
+  const fromWorktree = readTextIfPresent((0, import_node_path29.join)(worktreePath, REPO_REVIEW_PATH));
+  if (fromWorktree) return fromWorktree;
+  const repo = repoPath?.replace(/\/+$/, "");
+  const wt = worktreePath.replace(/\/+$/, "");
+  if (!repo || repo === wt) return null;
+  return readTextIfPresent((0, import_node_path29.join)(repo, REPO_REVIEW_PATH));
+}
+function ensureReviewGuidelinesFile(worktreePath, repoPath) {
   const skillContent = readTextIfPresent((0, import_node_path29.join)(worktreePath, REVIEW_SKILL_PATH));
-  if (skillContent) return skillGuidelines(skillContent, "skill");
-  const local = readLocalGuidelines(worktreePath);
-  if (local) {
-    return {
-      path: local.path,
-      name: REVIEW_REQUEST_NAME,
-      content: local.content,
-      source: "local"
-    };
+  if (skillContent) {
+    return { ...skillGuidelines(skillContent, "skill"), wrote: false };
+  }
+  const contextContent = readTextIfPresent((0, import_node_path29.join)(worktreePath, CONTEXT_REVIEW_PATH));
+  if (contextContent && !shouldRefreshReviewRequestTemplate(contextContent)) {
+    return { ...contextGuidelines(contextContent, "local"), wrote: false };
+  }
+  const fromSideboard = readSideboardReview(worktreePath, repoPath);
+  if (fromSideboard && !shouldRefreshReviewRequestTemplate(fromSideboard)) {
+    const body2 = writeContextGuidelines(worktreePath, fromSideboard);
+    return { ...contextGuidelines(body2, "repo"), wrote: true };
   }
-  const seeded = ensureReviewSkillFile(worktreePath);
-  return skillGuidelines(seeded.content, seeded.wrote ? "stock" : "skill");
+  const local = readLocalGuidelines(worktreePath);
+  const body = writeContextGuidelines(worktreePath, local?.content ?? REVIEW_REQUEST_TEMPLATE);
+  return {
+    ...contextGuidelines(body, local ? "local" : "stock"),
+    wrote: true
+  };
+}
+function resolveReviewGuidelines(worktreePath, repoPath) {
+  return ensureReviewGuidelinesFile(worktreePath, repoPath);
 }
 function buildReviewRequestAttachment(content, opts) {
   const path = opts?.path ?? REVIEW_SKILL_PATH;
-  const name = opts?.name ?? (path === REVIEW_SKILL_PATH ? REVIEW_SKILL_NAME : path === REPO_REVIEW_PATH ? REPO_REVIEW_NAME : REVIEW_REQUEST_NAME);
+  const name = opts?.name ?? (path === REVIEW_SKILL_PATH ? REVIEW_SKILL_NAME : path === REPO_REVIEW_PATH || path === CONTEXT_REVIEW_PATH ? REPO_REVIEW_NAME : REVIEW_REQUEST_NAME);
   return {
     id: (0, import_node_crypto7.randomUUID)(),
     name,
@@ -12344,7 +12350,7 @@ async function requestReview(threadRef, send) {
   if (from.status === "archived") {
     throw new Error(`Thread is archived: ${from.id}`);
   }
-  const guidelines = resolveReviewGuidelines(from.worktreePath);
+  const guidelines = resolveReviewGuidelines(from.worktreePath, from.repoPath);
   const tab = createChatTab({
     fromThreadId: from.id,
     title: "Review",
@@ -12358,7 +12364,7 @@ async function requestReview(threadRef, send) {
   const started = await send(tab.id, REVIEW_REQUEST_PREFILL);
   return { tab: started, from };
 }
-var import_node_crypto7, import_node_fs29, import_node_path29, REPO_REVIEW_PATH, REPO_REVIEW_NAME, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
+var import_node_crypto7, import_node_fs29, import_node_path29, REPO_REVIEW_PATH, REPO_REVIEW_NAME, CONTEXT_REVIEW_PATH, REVIEW_REQUEST_PATH, LEGACY_REVIEW_REQUEST_PATH, REVIEW_REQUEST_NAME, REVIEW_REQUEST_PREFILL, LEGACY_REVIEW_TEMPLATE_MARKERS;
 var init_request_review = __esm({
   "src/review/request-review.ts"() {
     "use strict";
@@ -12372,6 +12378,7 @@ var init_request_review = __esm({
     init_workspace_scratch();
     REPO_REVIEW_PATH = ".sideboard/review.md";
     REPO_REVIEW_NAME = "review.md";
+    CONTEXT_REVIEW_PATH = ".context/review.md";
     REVIEW_REQUEST_PATH = `${ATTACHMENTS_DIR}/Review request.md`;
     LEGACY_REVIEW_REQUEST_PATH = `${LEGACY_ATTACHMENTS_DIR}/Review request.md`;
     REVIEW_REQUEST_NAME = "Review request.md";
@@ -12625,11 +12632,9 @@ async function runConventionSetup(repoPath, worktreePath, onLine, opts) {
 }
 async function runWorkspaceSetup(repoPath, worktreePath, onLine, opts) {
   await ensureWorktreeSideboardIgnored(worktreePath);
-  const reviewSkill = ensureReviewSkillFile(worktreePath);
-  if (reviewSkill.wrote) {
-    onLine?.(
-      `[setup] wrote ${REVIEW_SKILL_PATH} \u2014 commit it so later worktrees inherit Review guidelines`
-    );
+  const review = ensureReviewGuidelinesFile(worktreePath, repoPath);
+  if (review.wrote) {
+    onLine?.(`[setup] wrote ${review.path} \u2014 local Review guidelines`);
   }
   let setup = await runSetupScript(repoPath, worktreePath, onLine, opts);
   if (!setup.ran) {
@@ -16177,7 +16182,7 @@ node <detached-job.js> wait <id> --until-done
 node <detached-job.js> status <id>
 \`\`\`
 
-\`<id>\` is kebab-case (\`mac-release\`, \`core-test\`, \`fly-deploy\`). State is \`.sideboard/detached-jobs/<id>/\` (local scratch).
+\`<id>\` is kebab-case (\`mac-release\`, \`core-test\`, \`fly-deploy\`). State is \`.context/.sideboard/detached-jobs/<id>/\` (local scratch).
 
 Wait JSON:
 
@@ -16215,6 +16220,16 @@ node <detached-job.js> wait --pid-file FILE --log-file FILE [--ok-pattern TEXT]
 4. On \`ok\`, present once more (\`status=ok\`, last \`delta\`) and finish the task. On \`failed\`, fix from the log.
 
 Never tell the user \u201Csay status when it\u2019s done.\u201D You wait.
+
+## PR checks (only if a goal is given)
+
+Do **not** watch after every push. If the user gave a goal (Greptile 5/5, CI green, until checks pass), wait the same way:
+
+\`\`\`bash
+node <detached-job.js> start pr-checks -- gh pr checks --watch
+\`\`\`
+
+On miss, fix, commit, push, and watch again until the goal is met or you are blocked. Do not ask the human to poll. Do not merge unless asked.
 `;
   }
 });
@@ -16604,7 +16619,7 @@ function formatWorktreeDirective(thread, opts) {
     "Short git requests from the Sideboard UI are complete instructions \u2014 expand them using the rules above without asking for clarification:"
   );
   lines.push(
-    '- "Commit and push." \u2192 commit any uncommitted work with a purpose-stating message, then push to origin (updates an existing PR if one is linked).'
+    '- "Commit and push." \u2192 commit any uncommitted work with a purpose-stating message, then push to origin (updates an existing PR if one is linked). Do not start a checks loop unless they gave a goal.'
   );
   lines.push(
     '- "Commit, push, and open a draft PR." \u2192 commit, push, then create a draft PR with `gh pr create --draft -R \u2026` (title/body from the change purpose).'
@@ -16613,7 +16628,7 @@ function formatWorktreeDirective(thread, opts) {
     '- "Commit, push, and open a PR in the browser." \u2192 commit, push, then `gh pr create --web -R \u2026`.'
   );
   lines.push(
-    '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push.'
+    '- "Fix CI: <name>." \u2192 investigate that failing check, fix it, commit, and push. Loop only if they gave a goal to keep going until it passes.'
   );
   lines.push(
     '- "Merge the remote branch (<base>) into your branch and resolve conflicts. Then, commit and push your changes." \u2192 fetch the PR base, merge it into this branch, resolve conflicts carefully, commit, and push until the PR is mergeable.'
@@ -16625,11 +16640,21 @@ function formatWorktreeDirective(thread, opts) {
     '- "Merge PR." \u2192 merge this thread\'s open pull request on GitHub (this phrase is the explicit ask). If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.'
   );
   lines.push("");
+  lines.push(formatPrGateDirective());
+  lines.push("");
   lines.push(formatProcessGuideDirective());
   return lines.join("\n");
 }
 function formatWorktreeReminder() {
-  return "Sideboard worktree: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout.";
+  return "Sideboard worktree: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push.";
+}
+function formatPrGateDirective() {
+  return [
+    "If a goal is given (not after every push):",
+    "- Enter a watch-fix-push loop and stay in it until that goal is met or you are blocked (examples: \u201CGreptile 5/5\u201D, \u201CCI green\u201D, \u201Cuntil checks pass\u201D). Do not stop after one red run or one review cycle.",
+    "- Wait with `/long-running`: `gh pr checks --watch` (add `-R <origin>` when needed). Present the log. Do not ask the human to poll.",
+    "- Greptile 5/5: wait for the greptile check; read the latest `N/5` from the PR body or Greptile\u2019s most recently *updated* issue comment; also fetch unresolved review comments / the \u201CPrompt to fix all with AI\u201D block. Done = **5/5 and zero unresolved Greptile comments**. If Greptile is idle, comment `@greptile review`. Cap about 5 iterations, then report leftovers. Do not merge unless asked."
+  ].join("\n");
 }
 function formatProcessGuideDirective() {
   return [
@@ -16637,7 +16662,7 @@ function formatProcessGuideDirective() {
     "- Long jobs (pack, test, deploy, anything that may run more than ~30s): Sideboard always provides `/long-running`. Detach and wait \u2014 do not ask the human to poll.",
     "- If `.claude/skills/graph-engineering/SKILL.md` exists, follow it (`/graph-engineering`) for migrations, ports, batch fixes, and other fan-out. Judge first; state on disk; grow the rulebook; do not patch around it.",
     "- If this same shape of work will happen again, write `.claude/skills/<kebab-name>/SKILL.md` in this worktree (Claude Code project skill). Sideboard `/name`, Claude Code, and `attach` all load that path. Do not leave the method only in chat.",
-    "- Merge-readiness notes: create or edit `.claude/skills/review/SKILL.md` and commit it. That file is allowed. Do not use `.sideboard/review.md` for new notes (legacy; setup copies it into the skill).",
+    "- Merge-readiness notes: if `.claude/skills/review/SKILL.md` already exists, edit it. Otherwise write them to `.context/review.md` (copied from `.sideboard/review.md` when that file exists). Do not create a review skill.",
     "- Do not write new skills under `.sideboard/skills/` (that folder only \u2014 other `.sideboard/` files such as settings.toml are fine). Point Codex/OpenCode at the Claude skill from `AGENTS.md`. Optional: symlink `.cursor/skills/<name>` to the Claude skill.",
     "- Skip a guide for a one-off. If a matching skill exists, follow it. Same miss twice \u2192 edit the skill, do not patch around it."
   ].join("\n");
@@ -16652,7 +16677,7 @@ function formatLongRunningDirective(opts) {
     "- Immediately `present_artifact` `type=log` with `artifact_id=<id>` and `status=running` \u2014 the side column is the live view.",
     `- Loop \`${invoke} wait <id>\` (returns in ~45s). stillRunning \u2192 present the same id with \`content=delta\` only \u2192 wait again. Do not resend the full log or HTML.`,
     "- ok \u2192 finish the task. failed \u2192 read the log, fix, start once.",
-    "State: `.sideboard/detached-jobs/<id>/` (local scratch). Full guide: `/long-running` (always available)."
+    "State: `.context/.sideboard/detached-jobs/<id>/` (local scratch). Full guide: `/long-running` (always available)."
   ].join("\n");
 }
 function formatLongRunningReminder(opts) {
@@ -22502,9 +22527,25 @@ async function startMcpServer() {
         };
       }
     );
+    server.tool(
+      "get_pr_checks",
+      "Snapshot of GitHub PR checks for a worktree thread (`gh pr checks` plus merge/review gates). null = no PR. If the user gave a goal (Greptile 5/5, CI green), the worktree agent watches with `gh pr checks --watch` via /long-running \u2014 this tool is a snapshot, not a waiter. Coordinators: do not run gh from the orchestration cwd.",
+      { ref: import_zod5.z.string().describe("Worktree thread id/ref") },
+      async ({ ref }) => {
+        try {
+          const checks = await orch.getPrChecks(ref);
+          return {
+            content: [{ type: "text", text: JSON.stringify(checks) }]
+          };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          return { content: [{ type: "text", text: message }], isError: true };
+        }
+      }
+    );
     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 seeds that skill from .sideboard/review.md or 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.',
+      '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: import_zod5.z.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
@@ -22532,7 +22573,7 @@ async function startMcpServer() {
     );
     server.tool(
       "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). 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.",
+      "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: import_zod5.z.string().describe("Worktree thread id/ref"),
         action: import_zod5.z.enum(AGENT_GIT_ACTIONS).describe(