fix: add plan merging state transition and improve PR message generation

- Transition plan status to merging while merge train is active
- Add merging→running and merging→paused to valid plan transitions
- Improve orchestrator createPR with job status table and real test config
- Improve mc_pr tool with PR template lookup and conventional commit titles
- Always include Mission Control attribution in PR bodies

Author: nigel-dev

src/lib/orchestrator.ts

@@ -507,6 +507,8 @@ export class Orchestrator {
       }
 
       if (this.mergeTrain && this.mergeTrain.getQueue().length > 0) {
+        plan.status = 'merging';
+
         const nextJob = this.mergeTrain.getQueue()[0];
         this.showToast('Mission Control', `Merging job "${nextJob.name}"...`, 'info');
         this.notify(`⇄ Merging job "${nextJob.name}" into integration branch...`);
@@ -566,6 +568,10 @@ export class Orchestrator {
         }
       }
 
+      if (plan.status === 'merging' && (!this.mergeTrain || this.mergeTrain.getQueue().length === 0)) {
+        plan.status = 'running';
+      }
+
       const latestPlan = await loadPlan();
       if (!latestPlan) {
         return;
@@ -901,8 +907,50 @@ If your work needs human review before it can proceed: mc_report(status: "needs_
     }
 
     const defaultBranch = await getDefaultBranch();
-    const title = plan.name.replace(/"/g, '\\"');
-    const body = `Automated PR from Mission Control plan: ${plan.name}\n\nJobs:\n${plan.jobs.map((j) => `- ${j.name}`).join('\n')}`;
+    const title = `feat: ${plan.name}`;
+    const jobLines = plan.jobs.map((j) => {
+      const status = j.status === 'merged' ? '✅' : j.status === 'failed' ? '❌' : '⏳';
+      const mergedAt = j.mergedAt ? new Date(j.mergedAt).toISOString().slice(0, 19).replace('T', ' ') : '—';
+      return `| ${j.name} | ${status} ${j.status} | ${mergedAt} |`;
+    }).join('\n');
+
+    const mergeTrainConfig = this.getMergeTrainConfig();
+    const testingLines: string[] = [];
+    if (mergeTrainConfig.testCommand) {
+      testingLines.push(`- [x] \`${mergeTrainConfig.testCommand}\` passed after each merge`);
+    }
+    if (mergeTrainConfig.setupCommands?.length) {
+      testingLines.push(`- [x] Setup: \`${mergeTrainConfig.setupCommands.join(' && ')}\``);
+    }
+    if (testingLines.length === 0) {
+      testingLines.push('- No test command configured');
+    }
+
+    const body = [
+      '## Summary',
+      '',
+      `Orchestrated plan **${plan.name}** with ${plan.jobs.length} job(s).`,
+      '',
+      '## Jobs',
+      '',
+      '| Job | Status | Merged At |',
+      '|-----|--------|-----------|',
+      jobLines,
+      '',
+      '## Testing',
+      '',
+      ...testingLines,
+      '',
+      '## Notes',
+      '',
+      `- Integration branch: \`${plan.integrationBranch}\``,
+      `- Base commit: \`${plan.baseCommit.slice(0, 8)}\``,
+      `- Mode: ${plan.mode}`,
+      '',
+      '---',
+      '',
+      '🚀 *Automated PR from [Mission Control](https://github.com/nigel-dev/opencode-mission-control)*',
+    ].join('\n');
     const prResult = await this.runCommand([
       'gh',
       'pr',

src/lib/plan-types.ts

@@ -63,7 +63,7 @@ export const VALID_PLAN_TRANSITIONS: Record<PlanStatus, PlanStatus[]> = {
   pending: ['running', 'failed', 'canceled'],
   running: ['paused', 'merging', 'failed', 'canceled'],
   paused: ['running', 'failed', 'canceled'],
-  merging: ['creating_pr', 'failed', 'canceled'],
+  merging: ['running', 'paused', 'creating_pr', 'failed', 'canceled'],
   creating_pr: ['completed', 'failed', 'canceled'],
   completed: [],
   failed: [],

src/tools/pr.ts

@@ -1,6 +1,6 @@
 import { tool, type ToolDefinition } from '@opencode-ai/plugin';
 import { getDefaultBranch } from '../lib/git';
-import { getJobByName } from '../lib/job-state';
+import { getJobByName, type Job } from '../lib/job-state';
 
 export async function executeGhCommand(args: string[]): Promise<string> {
   const proc = Bun.spawn(['gh', 'pr', 'create', ...args], {
@@ -19,6 +19,45 @@ export async function executeGhCommand(args: string[]): Promise<string> {
   return stdout.trim();
 }
 
+async function loadPrTemplate(cwd?: string): Promise<string | null> {
+  const candidates = [
+    '.github/pull_request_template.md',
+    '.github/PULL_REQUEST_TEMPLATE.md',
+    'pull_request_template.md',
+    'PULL_REQUEST_TEMPLATE.md',
+    '.github/PULL_REQUEST_TEMPLATE/pull_request_template.md',
+  ];
+
+  for (const candidate of candidates) {
+    try {
+      const fullPath = cwd ? `${cwd}/${candidate}` : candidate;
+      const file = Bun.file(fullPath);
+      if (await file.exists()) {
+        return await file.text();
+      }
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+
+function buildDefaultBody(job: Job): string {
+  return [
+    '## Summary',
+    '',
+    job.prompt,
+    '',
+    '## Changes',
+    '',
+    `Branch: \`${job.branch}\``,
+    '',
+    '---',
+    '',
+    '🚀 *Created by [Mission Control](https://github.com/nigel-dev/opencode-mission-control)*',
+  ].join('\n');
+}
+
 export const mc_pr: ToolDefinition = tool({
   description: 'Create a pull request from a job\'s branch',
   args: {
@@ -28,11 +67,11 @@ export const mc_pr: ToolDefinition = tool({
     title: tool.schema
       .string()
       .optional()
-      .describe('PR title (defaults to job prompt)'),
+      .describe('PR title (defaults to conventional commit format using job name)'),
     body: tool.schema
       .string()
       .optional()
-      .describe('PR body'),
+      .describe('PR body (defaults to PR template or generated summary)'),
     draft: tool.schema
       .boolean()
       .optional()
@@ -57,8 +96,8 @@ export const mc_pr: ToolDefinition = tool({
       throw new Error(`Failed to push branch "${job.branch}": ${pushStderr}`);
     }
 
-    // 3. Determine PR title (default to job prompt)
-    const prTitle = args.title || job.prompt;
+    // 3. Determine PR title (conventional commit format)
+    const prTitle = args.title || `feat: ${job.name}`;
 
     // 4. Build gh pr create arguments
     const defaultBranch = await getDefaultBranch(job.worktreePath);
@@ -68,9 +107,17 @@ export const mc_pr: ToolDefinition = tool({
       '--base', defaultBranch,
     ];
 
-    // 5. Add optional body
+    // 5. Build PR body — use explicit body, or fall back to default
+    const mcAttribution = '\n\n---\n\n🚀 *Created by [Mission Control](https://github.com/nigel-dev/opencode-mission-control)*';
     if (args.body) {
-      ghArgs.push('--body', args.body);
+      ghArgs.push('--body', args.body + mcAttribution);
+    } else {
+      const template = await loadPrTemplate(job.worktreePath);
+      if (template) {
+        ghArgs.push('--body', template + mcAttribution);
+      } else {
+        ghArgs.push('--body', buildDefaultBody(job));
+      }
     }
 
     // 6. Add draft flag if specified

tests/tools/pr.test.ts

@@ -85,7 +85,7 @@ describe('mc_pr', () => {
   });
 
   describe('argument handling', () => {
-    it('should use job prompt as default title', async () => {
+    it('should use conventional commit format as default title', async () => {
       const job: Job = {
         id: 'job-1',
         name: 'feature-auth',