@sideboard-ai/core 0.1.169 → 0.1.171

package/dist/index.cjs

@@ -1141,7 +1141,7 @@ function normalizeClaude(raw) {
   const out = {};
   if (typeof source.executablePath === "string") {
     const path2 = source.executablePath.trim();
-    if (path2) out.executablePath = path2;
+    if (path2 && (0, import_node_path8.isAbsolute)(path2)) out.executablePath = path2;
   }
   if (typeof source.chromeEnabled === "boolean") {
     out.chromeEnabled = source.chromeEnabled;
@@ -1154,17 +1154,24 @@ function normalizeCliExecutable(raw) {
   const out = {};
   if (typeof source.executablePath === "string") {
     const path2 = source.executablePath.trim();
-    if (path2) out.executablePath = path2;
+    if (path2 && (0, import_node_path8.isAbsolute)(path2)) out.executablePath = path2;
   }
   return out;
 }
+function absoluteExecutablePath(value) {
+  const path2 = value.trim();
+  if (!(0, import_node_path8.isAbsolute)(path2)) {
+    throw new Error("Executable path must be absolute. Leave it empty to use the system CLI.");
+  }
+  return path2;
+}
 function normalizeBrightsy(raw) {
   if (!raw || typeof raw !== "object") return {};
   const source = raw;
   const out = {};
   if (typeof source.executablePath === "string") {
     const path2 = source.executablePath.trim();
-    if (path2) out.executablePath = path2;
+    if (path2 && (0, import_node_path8.isAbsolute)(path2)) out.executablePath = path2;
   }
   if (typeof source.cloudConnectEnabled === "boolean") {
     out.cloudConnectEnabled = source.cloudConnectEnabled;
@@ -1643,7 +1650,7 @@ function updateClaudeSettings(patch) {
     if (patch.executablePath == null || patch.executablePath.trim() === "") {
       delete claude.executablePath;
     } else {
-      claude.executablePath = patch.executablePath.trim();
+      claude.executablePath = absoluteExecutablePath(patch.executablePath);
     }
   }
   if (typeof patch.chromeEnabled === "boolean") {
@@ -1658,7 +1665,7 @@ function updateBrightsySettings(patch) {
     if (patch.executablePath == null || patch.executablePath.trim() === "") {
       delete brightsy.executablePath;
     } else {
-      brightsy.executablePath = patch.executablePath.trim();
+      brightsy.executablePath = absoluteExecutablePath(patch.executablePath);
     }
   }
   if (typeof patch.cloudConnectEnabled === "boolean") {
@@ -1683,7 +1690,7 @@ function updateCodexSettings(patch) {
     if (patch.executablePath == null || patch.executablePath.trim() === "") {
       delete codex.executablePath;
     } else {
-      codex.executablePath = patch.executablePath.trim();
+      codex.executablePath = absoluteExecutablePath(patch.executablePath);
     }
   }
   return saveAppSettings({ ...current, codex });
@@ -1695,7 +1702,7 @@ function updateOpencodeSettings(patch) {
     if (patch.executablePath == null || patch.executablePath.trim() === "") {
       delete opencode.executablePath;
     } else {
-      opencode.executablePath = patch.executablePath.trim();
+      opencode.executablePath = absoluteExecutablePath(patch.executablePath);
     }
   }
   return saveAppSettings({ ...current, opencode });
@@ -9434,22 +9441,38 @@ var init_brightsy_targets = __esm({
 // src/agents/turn-input.ts
 function normalizeTurnInput(input) {
   if (typeof input === "string") return { prompt: input };
-  return { prompt: input.prompt, cachedPrefix: input.cachedPrefix?.trim() || void 0 };
+  return {
+    prompt: input.prompt,
+    cachedPrefix: input.cachedPrefix?.trim() || void 0,
+    systemPrompt: input.systemPrompt?.trim() || void 0
+  };
 }
 function dropCachedPrefixOnResume(input, sessionId) {
   const turn = normalizeTurnInput(input);
-  if (sessionId) return { prompt: turn.prompt };
+  if (sessionId) {
+    return turn.systemPrompt ? { prompt: turn.prompt, systemPrompt: turn.systemPrompt } : { prompt: turn.prompt };
+  }
   return turn;
 }
 function flattenTurnInput(input) {
-  const { cachedPrefix, prompt } = normalizeTurnInput(input);
-  if (!cachedPrefix) return prompt;
-  return `${cachedPrefix}
+  const { cachedPrefix, prompt, systemPrompt } = normalizeTurnInput(input);
+  if (cachedPrefix) return `${cachedPrefix}
 
 ---
 
 Current request:
 ${prompt}`;
+  if (systemPrompt) return `${systemPrompt}
+
+${prompt}`;
+  return prompt;
+}
+function splitTurnInputForSystemPrompt(input) {
+  const turn = normalizeTurnInput(input);
+  return {
+    promptText: flattenTurnInput({ cachedPrefix: turn.cachedPrefix, prompt: turn.prompt }),
+    systemPrompt: turn.systemPrompt
+  };
 }
 function buildCachedUserContent(input) {
   return [{ type: "text", text: flattenTurnInput(input) }];
@@ -11489,7 +11512,7 @@ var init_claude = __esm({
         const claude = resolveClaudeExecutable();
         const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
         const effective = dropCachedPrefixOnResume(input, sessionId);
-        const promptText = flattenTurnInput(effective);
+        const { promptText, systemPrompt } = splitTurnInputForSystemPrompt(effective);
         const useStdin = promptText.length > CLAUDE_PROMPT_ARG_MAX;
         if (process.env.SIDEBOARD_DEBUG_CLAUDE_TURN === "1") {
           console.error(
@@ -11541,6 +11564,9 @@ var init_claude = __esm({
           "--permission-mode",
           mode.claude
         ];
+        if (systemPrompt) {
+          args.push("--append-system-prompt", systemPrompt);
+        }
         const mcpConfigPath = writeMcpServersConfig(injectedServers);
         if (mcpConfigPath) {
           args.push("--mcp-config", mcpConfigPath);
@@ -13962,7 +13988,50 @@ function agentGitPrompt(action, opts) {
       return "Merge PR.";
   }
 }
-var AGENT_GIT_ACTIONS;
+function gitActionExpansion(action, base) {
+  switch (action) {
+    case "commit-push":
+      return "Commit any uncommitted work with a purpose-stating message, then push to origin (`git push -u origin HEAD`; this updates an existing PR when one is linked). Do not start a checks loop unless a goal was given.";
+    case "create-draft":
+      return "Commit, push, then create a draft PR with `gh pr create --draft -R <origin-owner/name>` (title/body from the change purpose). Update the existing PR instead if one is linked.";
+    case "create-web":
+      return "Commit, push, then `gh pr create --web -R <origin-owner/name>`.";
+    case "resolve-conflicts":
+      return `Fetch the PR base${base ? ` (\`${base}\`)` : ""}, merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+    case "merge":
+      return "This phrase is the explicit ask to merge this thread's open pull request on GitHub. 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.";
+  }
+}
+function expandCanonicalGitRequest(prompt) {
+  const trimmed = prompt.trim();
+  let action = null;
+  let base = null;
+  for (const candidate of AGENT_GIT_ACTIONS) {
+    if (candidate === "resolve-conflicts") continue;
+    if (agentGitPrompt(candidate) === trimmed) {
+      action = candidate;
+      break;
+    }
+  }
+  if (!action) {
+    const m = RESOLVE_CONFLICTS_RE.exec(trimmed);
+    if (m) {
+      action = "resolve-conflicts";
+      base = m[1] ?? null;
+    }
+  }
+  let expansion = action ? gitActionExpansion(action, base) : null;
+  if (!expansion && trimmed === "Address review comments.") {
+    expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
+  } else if (!expansion && FIX_CI_RE.test(trimmed)) {
+    expansion = "Investigate that failing check (`gh pr checks`, `gh run view --log-failed`), fix it, commit, and push. Loop only if a goal to keep going until it passes was given.";
+  }
+  if (!expansion) return prompt;
+  return `${trimmed}
+
+(Sideboard git request \u2014 do not ask for clarification: ${expansion})`;
+}
+var AGENT_GIT_ACTIONS, RESOLVE_CONFLICTS_RE, FIX_CI_RE;
 var init_agent_git_actions = __esm({
   "src/git/agent-git-actions.ts"() {
     "use strict";
@@ -13973,6 +14042,8 @@ var init_agent_git_actions = __esm({
       "resolve-conflicts",
       "merge"
     ];
+    RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
+    FIX_CI_RE = /^Fix CI: .+\.$/;
   }
 });
 
@@ -14230,47 +14301,82 @@ function formatToolPart(t, detail) {
 }
 function formatMessagesAsTranscript(messages, opts) {
   const tools = opts?.tools ?? "full";
-  const blocks = [];
-  for (const m of messages) {
-    if (m.role === "summary") {
-      blocks.push(`## Prior summary
-${m.text}`);
-      continue;
-    }
-    if (m.role === "user") {
-      blocks.push(`### User
-${m.text}`);
-      continue;
-    }
-    const bits = [];
-    if (m.text?.trim()) {
-      bits.push(`### Agent
+  const thinking = opts?.thinking ?? true;
+  return messages.map((m) => formatMessageBlock(m, { tools, thinking })).join("\n\n");
+}
+function formatMessageBlock(m, opts) {
+  if (m.role === "summary") return `## Prior summary
+${m.text}`;
+  if (m.role === "user") return `### User
+${m.text}`;
+  const bits = [];
+  if (m.text?.trim()) {
+    bits.push(`### Agent
 ${m.text}`);
-    } else {
-      bits.push("### Agent");
-    }
-    const thinking = (m.parts ?? []).filter((p) => p.type === "thinking");
-    for (const th of thinking) {
+  } else {
+    bits.push("### Agent");
+  }
+  if (opts.thinking) {
+    for (const th of m.parts ?? []) {
       if (th.type !== "thinking" || !th.text.trim()) continue;
       bits.push("Thinking:");
       bits.push(th.text);
     }
-    const toolParts = (m.parts ?? []).filter(
-      (p) => p.type === "tool"
-    );
-    if (tools !== "none" && toolParts.length > 0) {
-      if (tools === "summary") bits.push("Tools:");
-      for (const t of toolParts) {
-        bits.push(formatToolPart(t, tools));
-      }
+  }
+  const toolParts = (m.parts ?? []).filter(
+    (p) => p.type === "tool"
+  );
+  if (opts.tools !== "none" && toolParts.length > 0) {
+    if (opts.tools === "summary") bits.push("Tools:");
+    for (const t of toolParts) {
+      bits.push(formatToolPart(t, opts.tools));
     }
-    blocks.push(bits.join("\n"));
   }
-  return blocks.join("\n\n");
+  return bits.join("\n");
 }
 function buildSessionSeed(messages, opts) {
   if (messages.length === 0) return null;
-  const body = formatMessagesAsTranscript(messages, { tools: opts?.tools ?? "full" });
+  const tools = opts?.tools ?? "full";
+  const fullCount = opts?.fullToolMessages ?? SEED_FULL_TOOL_MESSAGES;
+  const maxChars = opts?.maxChars ?? SEED_MAX_CHARS;
+  const olderTools = tools === "none" ? "none" : "summary";
+  const fullFrom = Math.max(0, messages.length - fullCount);
+  const blocks = messages.map(
+    (m, i) => formatMessageBlock(m, {
+      tools: i >= fullFrom ? tools : olderTools,
+      thinking: false
+    })
+  );
+  const keep = new Array(blocks.length).fill(false);
+  let used = 0;
+  for (let i = 0; i < blocks.length; i++) {
+    if (messages[i].role === "summary") {
+      keep[i] = true;
+      used += blocks[i].length + 2;
+    }
+  }
+  for (let i = blocks.length - 1; i >= 0; i--) {
+    if (keep[i]) continue;
+    const next = used + blocks[i].length + 2;
+    if (next > maxChars && used > 0) break;
+    keep[i] = true;
+    used = next;
+  }
+  const dropped = keep.filter((k) => !k).length;
+  const kept = [];
+  let markerPlaced = false;
+  for (let i = 0; i < blocks.length; i++) {
+    if (!keep[i]) continue;
+    if (dropped > 0 && !markerPlaced && messages[i].role !== "summary") {
+      kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
+      markerPlaced = true;
+    }
+    kept.push(blocks[i]);
+  }
+  if (dropped > 0 && !markerPlaced) {
+    kept.push(`_(${dropped} older message${dropped === 1 ? "" : "s"} omitted for length)_`);
+  }
+  const body = kept.join("\n\n");
   if (!body.trim()) return null;
   return [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -14328,7 +14434,7 @@ function messagesSinceLastBrightsyContextSummary(messages) {
 function buildBrightsySessionSeed(messages) {
   const match = findLastBrightsyContextSummary(messages);
   const tail = match ? messages.slice(match.index + 1) : messages;
-  const body = formatMessagesAsTranscript(tail, { tools: "none" });
+  const body = formatMessagesAsTranscript(tail, { tools: "none", thinking: false });
   if (!match && !body.trim()) return null;
   const blocks = [
     "Sideboard conversation context (restored after compaction or a new session):",
@@ -14395,7 +14501,7 @@ async function maybeCompactContext(thread, thresholds = {}, summarize = summariz
     olderCount: older.length
   };
 }
-var CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, SESSION_RESET_OCCUPANCY_TOKENS, BRIGHTSY_SUMMARIZE_CONTEXT_TOOL;
+var CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, SESSION_RESET_OCCUPANCY_TOKENS, SEED_MAX_CHARS, SEED_FULL_TOOL_MESSAGES, BRIGHTSY_SUMMARIZE_CONTEXT_TOOL;
 var init_context_compact = __esm({
   "src/composer/context-compact.ts"() {
     "use strict";
@@ -14408,6 +14514,8 @@ var init_context_compact = __esm({
     CONTEXT_KEEP_RECENT_MESSAGES = 12;
     CONTEXT_MIN_MESSAGES = 10;
     SESSION_RESET_OCCUPANCY_TOKENS = 75e4;
+    SEED_MAX_CHARS = 6e4;
+    SEED_FULL_TOOL_MESSAGES = 6;
     BRIGHTSY_SUMMARIZE_CONTEXT_TOOL = "summarize_context";
   }
 });
@@ -19476,67 +19584,37 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(
     "- Always use this worktree's `origin` remote (`git remote get-url origin` from this cwd). Never push to or open PRs against `upstream` (template remotes)."
   );
-  lines.push(
-    "- Push with `git push -u origin HEAD` (or the current branch name). Do not `git push upstream`."
-  );
-  lines.push("");
   lines.push(formatGitAuthModeDirective(opts?.gitAuthMode ?? "auto"));
   lines.push(
-    "- Derive the PR title and body from what the changes actually do and why \u2014 inspect the diff/commits and the user request. Do not use the soccer-team worktree nickname or placeholder branch as the PR title."
-  );
-  lines.push(
-    "- Prefer a concise imperative title (Conventional Commits style when it fits: feat:/fix:/chore:/docs:). Body should summarize intent, key changes, and test notes."
+    "- PR title/body and commit messages state what the change does and why (inspect the diff/commits and the user request) \u2014 never the worktree nickname or placeholder branch. Concise imperative title (Conventional Commits when it fits: feat:/fix:/chore:/docs:); body = intent, key changes, test notes."
   );
   lines.push(
-    "- Commit with messages that state the purpose of the change (same standard as the PR). Stay on this thread branch. Never push directly to main/master or merge locally into the main checkout. Do not merge the PR unless this turn is a Merge PR request or the user explicitly asked. When merging, use GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
+    "- Stay on this thread branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     lines.push(
       `- A PR already exists (${thread.prUrl}). Update it (push + edit title/body if the purpose drifted) instead of opening a duplicate.`
     );
-  } else if (opts?.githubSlug) {
-    lines.push(
-      `- Prefer a draft PR first: \`gh pr create --draft -R ${opts.githubSlug}\` (or update via \`gh pr edit -R ${opts.githubSlug}\`) once the change set is coherent. Always pass \`-R ${opts.githubSlug}\` (this worktree's origin). Bare \`gh pr create\` may target upstream instead of origin on dual-remote checkouts. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name. If GitHub rejects the GraphQL body as too long, retry with a short \`--body-file\` (limit 65,536 characters) \u2014 do not paste a changelog or diff into \`--body\`.`
-    );
   } else {
+    const slug = opts?.githubSlug ?? "<origin-owner/name>";
+    const resolve = opts?.githubSlug ? "" : " Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree.";
     lines.push(
-      "- Prefer a draft PR first: `gh pr create --draft -R <origin-owner/name>` (or update via `gh pr edit -R \u2026`) once the change set is coherent. Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree \u2014 never from `upstream`. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name. If GitHub rejects the GraphQL body as too long, retry with a short `--body-file` (limit 65,536 characters) \u2014 do not paste a changelog or diff into `--body`."
+      `- Prefer a draft PR first: \`gh pr create --draft -R ${slug}\` (update via \`gh pr edit -R ${slug}\`). Always pass \`-R\` \u2014 bare \`gh pr create\` may target upstream on dual-remote checkouts.${resolve} Mark ready for review only when asked. If GitHub rejects the body as too long, retry with a short \`--body-file\` \u2014 do not paste a changelog or diff into \`--body\`.`
     );
   }
-  lines.push("");
-  lines.push(
-    "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). 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).'
+    '- Sideboard git buttons send short phrases ("Commit and push.", "Merge PR.", \u2026) with their meaning attached \u2014 act on them without asking for clarification. If the user gives a goal (Greptile 5/5, CI green, until checks pass), you get the watch-fix-push playbook with that request.'
   );
-  lines.push(
-    '- "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. 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.'
-  );
-  lines.push(
-    '- "Address review comments." \u2192 read PR review feedback, make the requested changes, commit, and push.'
-  );
-  lines.push(
-    '- "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());
+  lines.push(formatProcessGuideDirective({ worktreePath: thread.worktreePath }));
   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. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push.";
 }
+function mentionsPrGoal(prompt) {
+  return PR_GOAL_RE.test(prompt);
+}
 function issueTicketFromThread(thread, preferredSource = "github") {
   if (thread?.sourceType !== "ticket") return null;
   const ref = thread.sourceRef?.trim() ?? "";
@@ -19625,29 +19703,27 @@ function formatPrGateDirective() {
     "- 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() {
+function formatProcessGuideDirective(opts) {
+  const worktree = opts?.worktreePath?.trim();
+  const hasGraphSkill = !!worktree && (0, import_node_fs48.existsSync)((0, import_node_path45.join)(worktree, ".claude/skills/graph-engineering/SKILL.md"));
+  const hasReviewSkill = !!worktree && (0, import_node_fs48.existsSync)((0, import_node_path45.join)(worktree, ".claude/skills/review/SKILL.md"));
   return [
     "Process guides (recurring work only):",
-    "- Long jobs (pack, test, deploy, anything that may run more than ~30s): Sideboard always provides `/long-running`. Detach and wait; `stop_job` if hanging or wrong. 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: 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.",
+    hasGraphSkill ? "- Migrations, ports, batch fixes, and other fan-out: follow `.claude/skills/graph-engineering/SKILL.md` (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch around it." : null,
+    "- 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 it). Not under `.sideboard/skills/`. Point Codex/OpenCode at it from `AGENTS.md`.",
+    hasReviewSkill ? "- Merge-readiness notes go in `.claude/skills/review/SKILL.md` (edit it; do not create another review skill)." : "- Merge-readiness notes go in `.context/review.md` (copied from `.sideboard/review.md` when that file exists). Do not create a review 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");
+  ].filter(Boolean).join("\n");
 }
 function formatLongRunningDirective(opts) {
   const invoke = formatDetachedJobInvoke(opts?.scriptPath);
   return [
-    "Long-running jobs (mandatory when a command may run more than ~30s):",
-    "A Sideboard worktree turn SIGTERMs the agent shell (and its process group) when the user sends another message or the turn is interrupted. `block_until_ms: 0` is not enough. Do not ask the human to poll.",
-    `Helper (same tool as \`scripts/detached-job.cjs\` when that file exists in the worktree): \`${invoke}\``,
-    `- Start once: \`${invoke} start <id> -- <command> [args...]\` (cwd = this worktree). If JSON says already-running, do not start again.`,
-    "- Immediately `present_artifact` `type=log` with `artifact_id=<id>` and `status=running` \u2014 the side column is the live view.",
-    `- Loop Sideboard MCP \`wait_for_job\` with the same id (returns in ~45s). stillRunning \u2192 present the same id with \`content=delta\` only \u2192 wait_for_job again. Shell fallback: \`${invoke} wait <id>\`. Do not resend the full log or HTML.`,
-    `- If it is hanging, producing no useful output, or doing the wrong thing: MCP \`stop_job\` (same id, optional reason) or \`${invoke} stop <id>\`. Do not loop forever. Do not stop a pack/test/deploy that is clearly making progress.`,
-    "- Do not end the turn with \u201CI\u2019ll let you know when it\u2019s done.\u201D Stay in the loop until stillRunning is false (or you stopped it).",
-    "- ok \u2192 finish the task. failed / stopped \u2192 read the log, fix or narrow the command, start once.",
+    "Long-running jobs (mandatory when a command may run more than ~30s \u2014 pack, test, deploy, `gh pr checks --watch`):",
+    "A Sideboard worktree turn SIGTERMs the agent shell (and its process group) when the user sends another message or the turn is interrupted; `block_until_ms: 0` is not enough. Detach instead, and never ask the human to poll.",
+    `- Start once: \`${invoke} start <id> -- <command> [args...]\` (cwd = this worktree; same tool as \`scripts/detached-job.cjs\` when the worktree has it). If JSON says already-running, do not start again.`,
+    "- Immediately `present_artifact` `type=log` with `artifact_id=<id>` and `status=running`, then loop Sideboard MCP `wait_for_job` (returns in ~45s). stillRunning \u2192 present the same id with `content=delta` only \u2192 wait again. Shell fallback: the same helper with `wait <id>`.",
+    "- Hanging, no useful output, or the wrong thing \u2192 `stop_job` (or the helper with `stop <id>`). Do not stop a pack/test/deploy that is clearly making progress.",
+    "- Stay in the loop until stillRunning is false (or you stopped it). ok \u2192 finish the task. failed / stopped \u2192 read the log, fix or narrow the command, start once.",
     "State: `.context/.sideboard/detached-jobs/<id>/` (local scratch). Full guide: `/long-running` (always available)."
   ].join("\n");
 }
@@ -19657,84 +19733,17 @@ function formatLongRunningReminder(opts) {
 }
 function formatArtifactDirective() {
   return [
-    "Sideboard side column (desktop UI):",
-    "claude.ai\u2019s \u201CArtifact\u201D tool does NOT exist in Claude Code. That is expected.",
-    "Do not unprompted-duplicate a payload. Chat markdown (including tables) already renders in the transcript \u2014 do not also call present_schema with those same rows just to display them. If the user asks for an editable / interactive table, call present_schema even if markdown already showed the data. Do not also call present_artifact for a document you already fenced in chat.",
-    "Documents (HTML/SVG/markdown):",
-    "1) Emit a fenced code block tagged `html` (preferred), `svg`, or `markdown` with the FULL document \u2014 Sideboard opens a side column. Example:",
-    "```html",
-    "<!DOCTYPE html><html><head><title>Demo</title></head><body><h1>Hi</h1></body></html>",
-    "```",
-    "2) Or call Sideboard MCP `present_artifact` with title, type (html|svg|markdown|react|log), and content \u2014 not both a fence and this tool for the same body.",
-    "   type=log is append-only: same `artifact_id`, `content` = new lines only (plus optional status/phase). Do not resend the full log or wrap it in HTML.",
-    "CMS / JSON Schema forms & tables (Brightsy or any schema+schemaUi source):",
-    "3) Call Sideboard MCP `present_schema` when the user needs to filter, edit, publish, or persist rows \u2014 including after you already showed a markdown table, if they then ask for an editable table. If they only need to read the data, a markdown table is enough. When you do call it, pass title, mode (table|form), and either:",
-    "   - datasource=brightsy + resource_id (record type UUID) after fetching types via Brightsy MCP, or",
-    "   - datasource=inline + resource: { id, title, schema, schemaUi } and optional records/record.",
-    "Files / media browser (CMS file manager column):",
-    "4) Call Sideboard MCP `present_files` with optional title, path, and datasource (brightsy|memory).",
-    "   Opens the Files column for browse/upload/pick. Do NOT say a file manager UI is missing.",
-    "Multiple-choice questions:",
-    "5) Call Sideboard MCP `ask_user` only when work is blocked on choosing among a few concrete options (approach forks, which API, auth vs cookies). First write a short chat message that explains the decision and what each option means (tradeoffs, when to pick it). Include a description on every option. After calling, stop and wait for their next message with answers. If you are asking a real multiple-choice, use ask_user rather than chat bullets so Sideboard shows the composer picker.",
-    "Do not call ask_user 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. If one option is the obvious default, proceed without asking.",
-    "Never say artifacts, CMS UI, or the Files column are unavailable. present_schema is for interactive list/edit/publish (use it when they ask to edit, even if chat already had a markdown table); present_files for storage UI; html fences for standalone pages; ask_user only for those blocked predefined-option questions."
+    "Sideboard side column (desktop UI) \u2014 Sideboard MCP tools present_artifact, present_schema, present_files, ask_user (see their descriptions). claude.ai\u2019s \u201CArtifact\u201D tool does not exist here; never say artifacts, the CMS UI, or the Files column are unavailable.",
+    "- Standalone documents: a fenced block tagged `html` (preferred), `svg`, or `markdown` containing the FULL document opens the side column by itself. Use that or present_artifact \u2014 never both for the same body.",
+    "- present_artifact type=log appends: same artifact_id, content = new lines only (plus status/phase). Do not resend the full log or wrap it in HTML.",
+    "- Data: a markdown table is enough to read. Call present_schema only when the user needs to filter/edit/publish/persist rows \u2014 including when they ask for an editable table after you already showed markdown. Never re-present rows you already wrote just to display them.",
+    "- ask_user only when work is blocked on a few concrete options (approach fork, which API, auth vs cookies): first a short chat message explaining the decision and each option, then the call (description on every option), then stop and wait. Not for greetings, check-ins, or an invented menu of next tasks \u2014 reply in chat. If one option is the obvious default, proceed."
   ].join("\n");
 }
 function formatUiReminder() {
   return "Sideboard UI: markdown table is enough to read data; present_schema if they ask to edit/filter (even after markdown); present_files for the file manager. html fence or present_artifact, not both for the same document. type=log appends (same artifact_id, new lines only). ask_user only for a real multiple-choice (not hellos or \u201Cwhat next?\u201D) \u2014 reply in chat. Do not say artifacts/CMS UI are unavailable.";
 }
-function loadAgentInstructions(worktreePath, agent) {
-  const candidates = FILES_BY_AGENT[agent] ?? FILES_BY_AGENT.claude;
-  const seenPaths = /* @__PURE__ */ new Set();
-  const seenBodies = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const rel of candidates) {
-    if (seenPaths.has(rel)) continue;
-    const abs = (0, import_node_path45.join)(worktreePath, rel);
-    if (!(0, import_node_fs48.existsSync)(abs)) continue;
-    try {
-      if (!(0, import_node_fs48.statSync)(abs).isFile()) continue;
-      let content = (0, import_node_fs48.readFileSync)(abs, "utf8");
-      if (!content.trim()) continue;
-      if (content.length > MAX_CHARS_PER_FILE) {
-        content = `${content.slice(0, MAX_CHARS_PER_FILE)}
-
-\u2026(truncated)`;
-      }
-      const body = content.trim().replace(/\r\n/g, "\n");
-      if (seenBodies.has(body)) continue;
-      seenPaths.add(rel);
-      seenBodies.add(body);
-      out.push({ relativePath: rel, content });
-    } catch {
-    }
-  }
-  return out;
-}
-function formatAgentInstructions(files) {
-  if (files.length === 0) return null;
-  const parts = [
-    "Project agent instructions (from the worktree \u2014 follow these):",
-    ""
-  ];
-  for (const f of files) {
-    parts.push(`## ${f.relativePath}`);
-    parts.push("");
-    parts.push(f.content.trim());
-    parts.push("");
-    parts.push("---");
-    parts.push("");
-  }
-  return parts.join("\n").trimEnd();
-}
-function withAgentInstructions(prompt, files) {
-  const prefix = formatAgentInstructions(files);
-  if (!prefix) return prompt;
-  return `${prefix}
-
-${prompt}`;
-}
-var import_node_fs48, import_node_path45, GITHUB_TICKET_REF, KEYED_TICKET_REF, FILES_BY_AGENT, MAX_CHARS_PER_FILE;
+var import_node_fs48, import_node_path45, PR_GOAL_RE, GITHUB_TICKET_REF, KEYED_TICKET_REF;
 var init_instructions = __esm({
   "src/agents/instructions.ts"() {
     "use strict";
@@ -19743,22 +19752,9 @@ var init_instructions = __esm({
     init_git_auth_mode();
     init_worktree_labels();
     init_detached_job_path();
+    PR_GOAL_RE = /greptile|\bci\b.*\b(green|pass)|checks?\s+(pass|green)|until\s+.*\b(pass|green|merge|clean)|\bfix ci\b|watch[- ]fix[- ]push/i;
     GITHUB_TICKET_REF = /^(?:#?\d+|gh-\d+)$/i;
     KEYED_TICKET_REF = /^(?:[A-Z][A-Z0-9]{0,9}-\d+|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
-    FILES_BY_AGENT = {
-      claude: [
-        "CLAUDE.md",
-        ".claude/CLAUDE.md",
-        "CLAUDE.local.md",
-        "AGENTS.md",
-        "AGENT.md"
-      ],
-      codex: ["AGENTS.md", "AGENT.md", ".codex/AGENTS.md", "CLAUDE.md"],
-      opencode: ["AGENTS.md", "AGENT.md", "OPENCODE.md", "CLAUDE.md"],
-      brightsy: ["AGENTS.md", "AGENT.md", "CLAUDE.md"],
-      cursor: ["AGENTS.md", "AGENT.md", ".cursor/rules", "CLAUDE.md"]
-    };
-    MAX_CHARS_PER_FILE = 48e3;
   }
 });
 
@@ -21155,17 +21151,21 @@ var init_orchestrator = __esm({
         const slackReplyContext = formatSlackRepliesForTurn(
           pendingSlackExternalReplies(thread.messages)
         );
-        const agentPrompt = [
-          thread.planMode ? PLAN_MODE_INSTRUCTION : null,
-          orchestrationReminder,
+        const turnReminders = [
           worktreeReminder,
           optionalServicesReminder,
           issueToolsReminder,
           viewerContextReminder,
           artifactReminder,
-          longRunningReminder,
+          longRunningReminder
+        ].filter(Boolean).join("\n\n") || void 0;
+        const prGateDirective = thread.agent !== "brightsy" && !isOrchestratorThread(thread) && mentionsPrGoal(expandedPrompt) ? formatPrGateDirective() : null;
+        const agentPrompt = [
+          thread.planMode ? PLAN_MODE_INSTRUCTION : null,
+          orchestrationReminder,
+          prGateDirective,
           slackReplyContext,
-          expandedPrompt
+          expandCanonicalGitRequest(expandedPrompt)
         ].filter(Boolean).join("\n\n");
         if (thread.attachments.length > 0) {
           updateThread(threadId, { attachments: [] });
@@ -21255,7 +21255,7 @@ var init_orchestrator = __esm({
           const stderrTail = [];
           const handle = await spawnAgentTurn(
             fresh,
-            { cachedPrefix, prompt: agentPrompt },
+            { cachedPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
             (event) => {
               this.emit({ type: "turn_output", threadId, event });
               noteTurnLiveEvent(threadId, event);
@@ -21364,7 +21364,7 @@ var init_orchestrator = __esm({
             ].filter(Boolean).join("\n\n---\n\n");
             const retryHandle = await spawnAgentTurn(
               retryThread,
-              { cachedPrefix: retryPrefix, prompt: agentPrompt },
+              { cachedPrefix: retryPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
               (event) => {
                 this.emit({ type: "turn_output", threadId, event });
                 if (event.type === "session_id") {
@@ -22732,6 +22732,8 @@ __export(index_exports, {
   REVIEW_REQUEST_TEMPLATE: () => REVIEW_REQUEST_TEMPLATE,
   REVIEW_SKILL_NAME: () => REVIEW_SKILL_NAME,
   REVIEW_SKILL_PATH: () => REVIEW_SKILL_PATH,
+  SEED_FULL_TOOL_MESSAGES: () => SEED_FULL_TOOL_MESSAGES,
+  SEED_MAX_CHARS: () => SEED_MAX_CHARS,
   SESSION_RESET_OCCUPANCY_TOKENS: () => SESSION_RESET_OCCUPANCY_TOKENS,
   SIDEBOARD_FORCE_STOP: () => SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS: () => SIDEBOARD_MCP_ALLOWED_TOOLS,
@@ -22939,7 +22941,6 @@ __export(index_exports, {
   forkMessageSlice: () => forkMessageSlice,
   forkThreadWorktree: () => forkThreadWorktree,
   formatAccountProfilePlaybookLine: () => formatAccountProfilePlaybookLine,
-  formatAgentInstructions: () => formatAgentInstructions,
   formatArtifactDirective: () => formatArtifactDirective,
   formatBrightsyFetchError: () => formatBrightsyFetchError,
   formatDetachedJobInvoke: () => formatDetachedJobInvoke,
@@ -23144,7 +23145,6 @@ __export(index_exports, {
   listWorktreeFiles: () => listWorktreeFiles,
   listWorktrees: () => listWorktrees,
   liveActivitySummary: () => liveActivitySummary,
-  loadAgentInstructions: () => loadAgentInstructions,
   loadAppSettings: () => loadAppSettings,
   loadBrightsyConfig: () => loadBrightsyConfig,
   loadConductorSettings: () => loadConductorSettings,
@@ -23161,6 +23161,7 @@ __export(index_exports, {
   mcpAllowTools: () => mcpAllowTools,
   mcpAuthWarnings: () => mcpAuthWarnings,
   mcpStatusThinkingFromClaudeInit: () => mcpStatusThinkingFromClaudeInit,
+  mentionsPrGoal: () => mentionsPrGoal,
   mergeAgentGitAuthEnv: () => mergeAgentGitAuthEnv,
   mergePr: () => mergePr,
   mergePrStack: () => mergePrStack,
@@ -23334,6 +23335,7 @@ __export(index_exports, {
   slugify: () => slugify,
   spawnAgentTurn: () => spawnAgentTurn,
   splitForCompaction: () => splitForCompaction,
+  splitTurnInputForSystemPrompt: () => splitTurnInputForSystemPrompt,
   stackAgentDefaultsFrom: () => stackAgentDefaultsFrom,
   stackIdFrom: () => stackIdFrom,
   stackMergeReadiness: () => stackMergeReadiness,
@@ -23403,7 +23405,6 @@ __export(index_exports, {
   waitForPidExit: () => waitForPidExit,
   warmGithubAgentAuth: () => warmGithubAgentAuth,
   whichOnPath: () => whichOnPath,
-  withAgentInstructions: () => withAgentInstructions,
   withEventParentId: () => withEventParentId,
   withEventsParentId: () => withEventsParentId,
   withExportedPath: () => withExportedPath,
@@ -30460,6 +30461,8 @@ init_outbound_watch();
   REVIEW_REQUEST_TEMPLATE,
   REVIEW_SKILL_NAME,
   REVIEW_SKILL_PATH,
+  SEED_FULL_TOOL_MESSAGES,
+  SEED_MAX_CHARS,
   SESSION_RESET_OCCUPANCY_TOKENS,
   SIDEBOARD_FORCE_STOP,
   SIDEBOARD_MCP_ALLOWED_TOOLS,
@@ -30667,7 +30670,6 @@ init_outbound_watch();
   forkMessageSlice,
   forkThreadWorktree,
   formatAccountProfilePlaybookLine,
-  formatAgentInstructions,
   formatArtifactDirective,
   formatBrightsyFetchError,
   formatDetachedJobInvoke,
@@ -30872,7 +30874,6 @@ init_outbound_watch();
   listWorktreeFiles,
   listWorktrees,
   liveActivitySummary,
-  loadAgentInstructions,
   loadAppSettings,
   loadBrightsyConfig,
   loadConductorSettings,
@@ -30889,6 +30890,7 @@ init_outbound_watch();
   mcpAllowTools,
   mcpAuthWarnings,
   mcpStatusThinkingFromClaudeInit,
+  mentionsPrGoal,
   mergeAgentGitAuthEnv,
   mergePr,
   mergePrStack,
@@ -31062,6 +31064,7 @@ init_outbound_watch();
   slugify,
   spawnAgentTurn,
   splitForCompaction,
+  splitTurnInputForSystemPrompt,
   stackAgentDefaultsFrom,
   stackIdFrom,
   stackMergeReadiness,
@@ -31131,7 +31134,6 @@ init_outbound_watch();
   waitForPidExit,
   warmGithubAgentAuth,
   whichOnPath,
-  withAgentInstructions,
   withEventParentId,
   withEventsParentId,
   withExportedPath,