reorder prompt sections: task-first with dynamic TOC (#513)

* reorder prompt sections: task-first with dynamic TOC

put the actual task at the top of the prompt for primacy, add a
dynamic table of contents, and push system/runtime metadata to the end.

new section order: TOC → YOUR TASK → PROCEDURE → EVENT CONTEXT →
SYSTEM → LEARNINGS → RUNTIME

Made-with: Cursor

* enforce clean working tree: continue session if agent leaves uncommitted changes

after each agent run, check `git status --porcelain`. if dirty, resume
the same session with instructions to commit on a new branch, push, and
open a PR. retries up to 3 times before giving up.

- claude code: capture session_id from result event, use --resume <id>
- opencode: use --continue to resume the last session
- remove --no-session-persistence from claude (needed for --resume)
- update Task mode to clarify branch/push/PR is the default finalize step

Made-with: Cursor

* log full prompt in collapsible group for debugging

Made-with: Cursor

* fix: format tool refs in buildCommitPrompt via formatMcpToolRef

* enforce clean git status: general instructions, stop hook, and Task mode

Made-with: Cursor

* fix: rename stale titleBody references after body leak fix

Made-with: Cursor

---------

Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com>

mcp/review.ts

@@ -1,6 +1,6 @@
 import type { RestEndpointMethodTypes } from "@octokit/rest";
 import { type } from "arktype";
-import { ghPullfrogMcpName } from "../external.ts";
+import { formatMcpToolRef } from "../external.ts";
 import { apiFetch } from "../utils/apiFetch.ts";
 import { getApiUrl } from "../utils/apiUrl.ts";
 import { buildPullfrogFooter } from "../utils/buildPullfrogFooter.ts";
@@ -230,7 +230,7 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
             to: toSha,
             instructions:
               `new commits were pushed while you were reviewing. ` +
-              `call \`${ghPullfrogMcpName}/checkout_pr\` again to fetch the latest version — it will compute the incremental diff automatically. ` +
+              `call \`${formatMcpToolRef(ctx.agentId, "checkout_pr")}\` again to fetch the latest version — it will compute the incremental diff automatically. ` +
               `submit another review covering only the new changes. do not repeat feedback from your previous review.`,
           },
         };

mcp/selectMode.ts

@@ -1,5 +1,5 @@
 import { type } from "arktype";
-import { ghPullfrogMcpName } from "../external.ts";
+import { formatMcpToolRef } from "../external.ts";
 import type { Mode } from "../modes.ts";
 import { apiFetch } from "../utils/apiFetch.ts";
 import { log } from "../utils/log.ts";
@@ -19,9 +19,9 @@ function resolveMode(modes: Mode[], modeName: string): Mode | null {
   return modes.find((m) => m.name.toLowerCase() === modeName.toLowerCase()) ?? null;
 }
 
-// override guidance for contextual variants that aren't standalone modes
-const modeOverrides: Record<string, string> = {
-  PlanEdit: `### Checklist (editing existing plan)
+function buildModeOverrides(t: (name: string) => string): Record<string, string> {
+  return {
+    PlanEdit: `### Checklist (editing existing plan)
 
 An existing plan comment was found for this issue. Update that comment with the revised plan — do not create a new plan comment.
 
@@ -30,27 +30,28 @@ An existing plan comment was found for this issue. Update that comment with the
    - incorporate the current plan (\`previousPlanBody\`) and the user's revision request
    - gather relevant codebase context (file paths, architecture notes from AGENTS.md)
    - produce a structured plan with clear milestones
-3. Call \`${ghPullfrogMcpName}/report_progress\` with the full revised plan text and \`{ target_plan_comment: true }\` so it updates the existing plan comment (not the progress comment).
-4. Then post a short note to the progress comment (e.g. "Plan has been updated in the comment above.") via \`${ghPullfrogMcpName}/report_progress\` so it is not left as "Leaping...".`,
+3. Call \`${t("report_progress")}\` with the full revised plan text and \`{ target_plan_comment: true }\` so it updates the existing plan comment (not the progress comment).
+4. Then post a short note to the progress comment (e.g. "Plan has been updated in the comment above.") via \`${t("report_progress")}\` so it is not left as "Leaping...".`,
 
-  SummaryUpdate: `### Checklist (updating existing summary)
+    SummaryUpdate: `### Checklist (updating existing summary)
 
 An existing summary comment was found for this PR. Update it rather than creating a new one.
 
 1. Use \`previousSummaryBody\` from this response as the current summary to revise.
-2. Checkout the PR via \`${ghPullfrogMcpName}/checkout_pr\` — this returns PR metadata and a \`diffPath\`.
+2. Checkout the PR via \`${t("checkout_pr")}\` — this returns PR metadata and a \`diffPath\`.
 3. Delegate a subagent with:
    - the diff file path and PR metadata
    - the existing summary body (\`previousSummaryBody\`) so it can update rather than rewrite from scratch
    - format instructions from EVENT INSTRUCTIONS (if any)
    - instruct it to produce an updated summary reflecting the current state of the PR and return it as its final response
-4. After the subagent completes, call \`${ghPullfrogMcpName}/edit_issue_comment\` with \`commentId: existingSummaryCommentId\` (from this response) and the updated summary body.
-5. Call \`${ghPullfrogMcpName}/report_progress\` with a brief note (e.g., "Updated PR summary.").
+4. After the subagent completes, call \`${t("edit_issue_comment")}\` with \`commentId: existingSummaryCommentId\` (from this response) and the updated summary body.
+5. Call \`${t("report_progress")}\` with a brief note (e.g., "Updated PR summary.").
 
 ### Effort
 
 Use mini or auto effort.`,
-};
+  };
+}
 
 type OrchestratorGuidance = {
   modeName: string;
@@ -139,6 +140,9 @@ async function fetchExistingSummaryComment(
 }
 
 export function SelectModeTool(ctx: ToolContext) {
+  const t = (name: string) => formatMcpToolRef(ctx.agentId, name);
+  const overrides = buildModeOverrides(t);
+
   return tool({
     name: "select_mode",
     description:
@@ -180,7 +184,7 @@ export function SelectModeTool(ctx: ToolContext) {
             return {
               ...buildOrchestratorGuidance(selectedMode, {
                 ...guidanceOpts,
-                overrideGuidance: modeOverrides.PlanEdit,
+                overrideGuidance: overrides.PlanEdit,
               }),
               previousPlanBody: existing.body,
             };
@@ -197,7 +201,7 @@ export function SelectModeTool(ctx: ToolContext) {
             return {
               ...buildOrchestratorGuidance(selectedMode, {
                 ...guidanceOpts,
-                overrideGuidance: modeOverrides.SummaryUpdate,
+                overrideGuidance: overrides.SummaryUpdate,
               }),
               existingSummaryCommentId: existing.commentId,
               previousSummaryBody: existing.body,

mcp/server.ts

@@ -4,7 +4,7 @@ import { createServer } from "node:net";
 import { setTimeout as sleep } from "node:timers/promises";
 import { FastMCP, type Tool } from "fastmcp";
 import type { AgentUsage } from "../agents/index.ts";
-import { ghPullfrogMcpName } from "../external.ts";
+import { type AgentId, pullfrogMcpName } from "../external.ts";
 import type { Mode } from "../modes.ts";
 import type { PrepResult } from "../prep/index.ts";
 import { closeBrowserDaemon } from "../utils/browser.ts";
@@ -130,6 +130,7 @@ export function initToolState(params: InitToolStateParams): ToolState {
 }
 
 export interface ToolContext {
+  agentId: AgentId;
   repo: RunContextData["repo"];
   payload: ResolvedPayload;
   octokit: OctokitWithPlugins;
@@ -251,7 +252,7 @@ async function tryStartMcpServer(
   tools: Tool<any, any>[],
   port: number
 ): Promise<McpStartResult | null> {
-  const server = new FastMCP({ name: ghPullfrogMcpName, version: "0.0.1" });
+  const server = new FastMCP({ name: pullfrogMcpName, version: "0.0.1" });
   addTools(ctx, server, tools);
 
   try {