@starlein/paperclip-plugin-company-wizard 0.3.19 → 0.3.21

package/README.md

@@ -5,7 +5,7 @@
     <strong>Bootstrap AI agent teams from modular templates.</strong>
   </p>
   <p align="center">
-    <a href="https://github.com/starlein/paperclip-plugin-company-wizard/pkgs/npm/paperclip-plugin-company-wizard"><img src="https://img.shields.io/badge/GitHub%20Packages-@starlein%2Fpaperclip--plugin--company--wizard-blue" alt="GitHub Packages"></a>
+    <a href="https://www.npmjs.com/package/@starlein/paperclip-plugin-company-wizard"><img src="https://img.shields.io/npm/v/@starlein/paperclip-plugin-company-wizard?color=cb3837&label=npm" alt="npm version"></a>
     <a href="https://github.com/starlein/paperclip-plugin-company-wizard/actions/workflows/ci.yml"><img src="https://github.com/starlein/paperclip-plugin-company-wizard/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
     <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue" alt="License"></a>
     <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D20-brightgreen" alt="Node.js"></a>
@@ -139,6 +139,8 @@ Every company starts with just the **CEO** — and that's already a functional t
 
 No role is ever truly missing. When a specialist isn't present, the next best available person steps in. The CEO is always the final fallback.
 
+> **Enriched personas (opt-in):** set `enableEnrichedPersonas` to give expert roles named **domain lenses** (e.g. STRIDE, Nielsen's 10, RICE) in their `SOUL.md`, add **output/review bars** to module skills, and append **done-criteria** to `HEARTBEAT.md`. Off by default — the baseline personas stay lean.
+
 <details>
 <summary><strong>Full capability ownership table</strong></summary>
 
@@ -334,6 +336,8 @@ Git workflow and commit conventions.
 
 PR-based review workflow. Requires `github-repo`. Activates with `code-reviewer`, `product-owner`, `ui-designer`, `ux-researcher`, `qa`, or `devops`.
 
+Reviews run through the issue's native `executionPolicy` (stages), not child issues: a `review` stage for the Code Reviewer (plus relevant domain reviewers), an `approval` stage for the Product Owner, then a final `approval` **merge gate** owned by the Engineer — who is woken last to merge the PR before recording the verdict that closes the issue. The merge gate is deliberately the last stage so the Product Owner's approval does not auto-close the issue with the PR still open.
+
 - **Task:** Engineer sets up branch protection
 - **Doc:** `docs/pr-conventions.md`
 
@@ -587,6 +591,8 @@ Configure the plugin via **Settings → Plugins → Company Wizard** in the Pape
 | `paperclipPassword` | No | Board login password. Stored as a secret ref. |
 | `anthropicApiKey` | No | Anthropic API key for AI wizard mode. Stored as a secret ref. Required to use the AI-powered setup path. |
 | `disableBoardApprovalOnNewCompanies` | No | If `true`, the wizard PATCHes new companies to set `requireBoardApprovalForNewAgents=false` during provisioning. Leave `false` to preserve approval-gated hiring. Defaults to `false`. |
+| `enableEnrichedPersonas` | No | If `true`, expert roles get domain lenses (named mental models) in `SOUL.md`, module skills get concrete output/review bars, and `HEARTBEAT.md` gets explicit done-criteria. Leave `false` (default) for the lean baseline personas. |
+
 For isolated worktrees: there is no plugin setting. The policy is controlled by Paperclip instance settings under **Settings → Instance → Experimental → enableIsolatedWorkspaces** and is consumed by the plugin during provisioning.
 
 <br>

package/dist/manifest.js

@@ -2,7 +2,7 @@
 var manifest = {
   id: "starlein.paperclip-plugin-company-wizard",
   apiVersion: 1,
-  version: "0.3.19",
+  version: "0.3.21",
   displayName: "Company Wizard",
   description: "AI-powered wizard to bootstrap agent companies from composable templates",
   author: "Sascha Pietrowski <sp@speednetwork.de>",
@@ -59,6 +59,11 @@ var manifest = {
         type: "boolean",
         default: false,
         description: "Optional. If true, the wizard will PATCH new companies to set requireBoardApprovalForNewAgents=false during provisioning. Leave false to preserve approval-gated hiring policies."
+      },
+      enableEnrichedPersonas: {
+        type: "boolean",
+        default: false,
+        description: "Optional. If true, expert roles are enriched with domain lenses (named mental models), module skills gain concrete output/review bars with negative examples, and HEARTBEAT.md gains explicit done-criteria. Leave false (default) for the lean baseline personas."
       }
     }
   },

package/dist/manifest.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/manifest.ts"],
-  "sourcesContent": ["import type { PaperclipPluginManifestV1 } from '@paperclipai/plugin-sdk';\n\nconst manifest: PaperclipPluginManifestV1 = {\n  id: 'starlein.paperclip-plugin-company-wizard',\n  apiVersion: 1,\n  version: '0.3.19',\n  displayName: 'Company Wizard',\n  description: 'AI-powered wizard to bootstrap agent companies from composable templates',\n  author: 'Sascha Pietrowski <sp@speednetwork.de>',\n  categories: ['workspace', 'ui'],\n  capabilities: [\n    'companies.read',\n    'issues.create',\n    'issues.read',\n    'issues.update',\n    'goals.create',\n    'goals.read',\n    'agents.read',\n    'projects.read',\n    'plugin.state.read',\n    'plugin.state.write',\n    'secrets.read-ref',\n    'events.subscribe',\n    'ui.page.register',\n    'ui.sidebar.register',\n  ],\n  instanceConfigSchema: {\n    type: 'object',\n    properties: {\n      companiesDir: {\n        type: 'string',\n        description:\n          'Directory where assembled company workspaces are written. Defaults to ~/.paperclip/instances/default/companies. Override for Docker setups (e.g. /paperclip/instances/default/companies).',\n      },\n      templatesPath: {\n        type: 'string',\n        description:\n          'Path to the templates directory. Defaults to ~/.paperclip/plugin-templates (auto-downloaded from templatesRepoUrl if missing). Override for Docker setups (e.g. /paperclip/plugin-templates).',\n      },\n      templatesRepoUrl: {\n        type: 'string',\n        default: 'https://github.com/starlein/paperclip-plugin-company-wizard/tree/main/templates',\n        description:\n          'GitHub tree URL to pull templates from when the templates directory does not exist.',\n      },\n      anthropicApiKey: {\n        type: 'string',\n        description:\n          'Anthropic API key for the AI wizard (e.g. sk-ant-...). Required to use the AI-powered company setup path.',\n      },\n      paperclipUrl: {\n        type: 'string',\n        description:\n          'Paperclip instance URL. Defaults to http://localhost:3100 or the PAPERCLIP_PUBLIC_URL env var.',\n      },\n      paperclipEmail: {\n        type: 'string',\n        description: 'Board login email (for authenticated instances).',\n      },\n      paperclipPassword: {\n        type: 'string',\n        description: 'Board login password (for authenticated instances).',\n      },\n      disableBoardApprovalOnNewCompanies: {\n        type: 'boolean',\n        default: false,\n        description:\n          'Optional. If true, the wizard will PATCH new companies to set requireBoardApprovalForNewAgents=false during provisioning. Leave false to preserve approval-gated hiring policies.',\n      },\n    },\n  },\n  entrypoints: {\n    worker: './dist/worker.js',\n    ui: './dist/ui',\n  },\n  ui: {\n    slots: [\n      {\n        type: 'page',\n        id: 'company-wizard',\n        displayName: 'Company Wizard',\n        exportName: 'WizardPage',\n        routePath: 'company-creator',\n      },\n      {\n        type: 'sidebar',\n        id: 'company-wizard-link',\n        displayName: 'Create Company',\n        exportName: 'SidebarLink',\n      },\n    ],\n  },\n};\n\nexport default manifest;\n"],
-  "mappings": ";AAEA,IAAM,WAAsC;AAAA,EAC1C,IAAI;AAAA,EACJ,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,aAAa;AAAA,EACb,aAAa;AAAA,EACb,QAAQ;AAAA,EACR,YAAY,CAAC,aAAa,IAAI;AAAA,EAC9B,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,sBAAsB;AAAA,IACpB,MAAM;AAAA,IACN,YAAY;AAAA,MACV,cAAc;AAAA,QACZ,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,eAAe;AAAA,QACb,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,kBAAkB;AAAA,QAChB,MAAM;AAAA,QACN,SAAS;AAAA,QACT,aACE;AAAA,MACJ;AAAA,MACA,iBAAiB;AAAA,QACf,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,cAAc;AAAA,QACZ,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,gBAAgB;AAAA,QACd,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,mBAAmB;AAAA,QACjB,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,oCAAoC;AAAA,QAClC,MAAM;AAAA,QACN,SAAS;AAAA,QACT,aACE;AAAA,MACJ;AAAA,IACF;AAAA,EACF;AAAA,EACA,aAAa;AAAA,IACX,QAAQ;AAAA,IACR,IAAI;AAAA,EACN;AAAA,EACA,IAAI;AAAA,IACF,OAAO;AAAA,MACL;AAAA,QACE,MAAM;AAAA,QACN,IAAI;AAAA,QACJ,aAAa;AAAA,QACb,YAAY;AAAA,QACZ,WAAW;AAAA,MACb;AAAA,MACA;AAAA,QACE,MAAM;AAAA,QACN,IAAI;AAAA,QACJ,aAAa;AAAA,QACb,YAAY;AAAA,MACd;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAO,mBAAQ;",
+  "sourcesContent": ["import type { PaperclipPluginManifestV1 } from '@paperclipai/plugin-sdk';\n\nconst manifest: PaperclipPluginManifestV1 = {\n  id: 'starlein.paperclip-plugin-company-wizard',\n  apiVersion: 1,\n  version: '0.3.21',\n  displayName: 'Company Wizard',\n  description: 'AI-powered wizard to bootstrap agent companies from composable templates',\n  author: 'Sascha Pietrowski <sp@speednetwork.de>',\n  categories: ['workspace', 'ui'],\n  capabilities: [\n    'companies.read',\n    'issues.create',\n    'issues.read',\n    'issues.update',\n    'goals.create',\n    'goals.read',\n    'agents.read',\n    'projects.read',\n    'plugin.state.read',\n    'plugin.state.write',\n    'secrets.read-ref',\n    'events.subscribe',\n    'ui.page.register',\n    'ui.sidebar.register',\n  ],\n  instanceConfigSchema: {\n    type: 'object',\n    properties: {\n      companiesDir: {\n        type: 'string',\n        description:\n          'Directory where assembled company workspaces are written. Defaults to ~/.paperclip/instances/default/companies. Override for Docker setups (e.g. /paperclip/instances/default/companies).',\n      },\n      templatesPath: {\n        type: 'string',\n        description:\n          'Path to the templates directory. Defaults to ~/.paperclip/plugin-templates (auto-downloaded from templatesRepoUrl if missing). Override for Docker setups (e.g. /paperclip/plugin-templates).',\n      },\n      templatesRepoUrl: {\n        type: 'string',\n        default: 'https://github.com/starlein/paperclip-plugin-company-wizard/tree/main/templates',\n        description:\n          'GitHub tree URL to pull templates from when the templates directory does not exist.',\n      },\n      anthropicApiKey: {\n        type: 'string',\n        description:\n          'Anthropic API key for the AI wizard (e.g. sk-ant-...). Required to use the AI-powered company setup path.',\n      },\n      paperclipUrl: {\n        type: 'string',\n        description:\n          'Paperclip instance URL. Defaults to http://localhost:3100 or the PAPERCLIP_PUBLIC_URL env var.',\n      },\n      paperclipEmail: {\n        type: 'string',\n        description: 'Board login email (for authenticated instances).',\n      },\n      paperclipPassword: {\n        type: 'string',\n        description: 'Board login password (for authenticated instances).',\n      },\n      disableBoardApprovalOnNewCompanies: {\n        type: 'boolean',\n        default: false,\n        description:\n          'Optional. If true, the wizard will PATCH new companies to set requireBoardApprovalForNewAgents=false during provisioning. Leave false to preserve approval-gated hiring policies.',\n      },\n      enableEnrichedPersonas: {\n        type: 'boolean',\n        default: false,\n        description:\n          'Optional. If true, expert roles are enriched with domain lenses (named mental models), module skills gain concrete output/review bars with negative examples, and HEARTBEAT.md gains explicit done-criteria. Leave false (default) for the lean baseline personas.',\n      },\n    },\n  },\n  entrypoints: {\n    worker: './dist/worker.js',\n    ui: './dist/ui',\n  },\n  ui: {\n    slots: [\n      {\n        type: 'page',\n        id: 'company-wizard',\n        displayName: 'Company Wizard',\n        exportName: 'WizardPage',\n        routePath: 'company-creator',\n      },\n      {\n        type: 'sidebar',\n        id: 'company-wizard-link',\n        displayName: 'Create Company',\n        exportName: 'SidebarLink',\n      },\n    ],\n  },\n};\n\nexport default manifest;\n"],
+  "mappings": ";AAEA,IAAM,WAAsC;AAAA,EAC1C,IAAI;AAAA,EACJ,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,aAAa;AAAA,EACb,aAAa;AAAA,EACb,QAAQ;AAAA,EACR,YAAY,CAAC,aAAa,IAAI;AAAA,EAC9B,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,sBAAsB;AAAA,IACpB,MAAM;AAAA,IACN,YAAY;AAAA,MACV,cAAc;AAAA,QACZ,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,eAAe;AAAA,QACb,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,kBAAkB;AAAA,QAChB,MAAM;AAAA,QACN,SAAS;AAAA,QACT,aACE;AAAA,MACJ;AAAA,MACA,iBAAiB;AAAA,QACf,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,cAAc;AAAA,QACZ,MAAM;AAAA,QACN,aACE;AAAA,MACJ;AAAA,MACA,gBAAgB;AAAA,QACd,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,mBAAmB;AAAA,QACjB,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA,oCAAoC;AAAA,QAClC,MAAM;AAAA,QACN,SAAS;AAAA,QACT,aACE;AAAA,MACJ;AAAA,MACA,wBAAwB;AAAA,QACtB,MAAM;AAAA,QACN,SAAS;AAAA,QACT,aACE;AAAA,MACJ;AAAA,IACF;AAAA,EACF;AAAA,EACA,aAAa;AAAA,IACX,QAAQ;AAAA,IACR,IAAI;AAAA,EACN;AAAA,EACA,IAAI;AAAA,IACF,OAAO;AAAA,MACL;AAAA,QACE,MAAM;AAAA,QACN,IAAI;AAAA,QACJ,aAAa;AAAA,QACb,YAAY;AAAA,QACZ,WAAW;AAAA,MACb;AAAA,MACA;AAAA,QACE,MAAM;AAAA,QACN,IAAI;AAAA,QACJ,aAAa;AAAA,QACb,YAAY;AAAA,MACd;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAO,mBAAQ;",
   "names": []
 }

package/dist/worker.js

@@ -9366,6 +9366,9 @@ async function appendToFile(filePath, content) {
     await appendFile(filePath, content);
   }
 }
+function isEnrichmentFragment(name) {
+  return name === "LENSES.md" || name === "DONE.md" || name.endsWith(".bar.md");
+}
 async function readJson(p) {
   if (!await exists(p)) return null;
   return JSON.parse(await readFile(p, "utf-8"));
@@ -9397,6 +9400,7 @@ async function assembleCompany({
   presetRoutines = [],
   presetLabels = [],
   enableIsolatedWorktrees = false,
+  enableEnrichedPersonas = false,
   outputDir,
   templatesDir,
   onProgress = () => {
@@ -9480,7 +9484,7 @@ async function assembleCompany({
         await copyDir(join(roleSrc, entry.name), join(roleDest, entry.name), {
           skipExt: ".meta.json"
         });
-      } else if (!entry.name.endsWith(".meta.json")) {
+      } else if (!entry.name.endsWith(".meta.json") && !isEnrichmentFragment(entry.name)) {
         await copyFile(join(roleSrc, entry.name), join(roleDest, entry.name));
       }
     }
@@ -9497,6 +9501,7 @@ async function assembleCompany({
     const entries = await readdir(roleDir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory() || !entry.name.endsWith(".md")) continue;
+      if (isEnrichmentFragment(entry.name)) continue;
       await copyFile(join(roleDir, entry.name), join(destDir, entry.name));
     }
     onProgress(`+ agents/${roleName}/ (role)`);
@@ -9538,12 +9543,13 @@ async function assembleCompany({
       reviewers.push(role);
     }
     const approver = typeof reviewGate.approver === "string" && allRoles.has(reviewGate.approver) ? reviewGate.approver : void 0;
+    const mergeGate = typeof reviewGate.mergeGate === "string" && allRoles.has(reviewGate.mergeGate) ? reviewGate.mergeGate : void 0;
     if (approver) {
       const idx = reviewers.indexOf(approver);
       if (idx !== -1) reviewers.splice(idx, 1);
     }
-    if (reviewers.length === 0 && !approver) return null;
-    return { reviewers, approver };
+    if (reviewers.length === 0 && !approver && !mergeGate) return null;
+    return { reviewers, approver, mergeGate };
   };
   const renderReviewGate = (gate) => {
     const stages = [];
@@ -9555,6 +9561,11 @@ async function assembleCompany({
         `  - stage ${stages.length + 1} (approval) \u2192 assign ${JSON.stringify(gate.approver)}`
       );
     }
+    if (gate.mergeGate) {
+      stages.push(
+        `  - stage ${stages.length + 1} (approval) \u2192 assign ${JSON.stringify(gate.mergeGate)}  \u2014 merge gate: merge the PR, then record approved to close`
+      );
+    }
     return `- **executionPolicy** (set when creating this issue; resolve each role to its agentId):
 ${stages.join("\n")}
 
@@ -9671,7 +9682,18 @@ ${stages.join("\n")}
       if (!resolved) return false;
       const destSkillsDir = join(companyDir, "agents", roleName, "skills");
       await mkdir(destSkillsDir, { recursive: true });
-      await copyFile(resolved.path, join(destSkillsDir, fileName));
+      const destFile = join(destSkillsDir, fileName);
+      await copyFile(resolved.path, destFile);
+      let barApplied = false;
+      if (enableEnrichedPersonas && label === "primary") {
+        const barFileName = fileName.replace(/\.md$/, ".bar.md");
+        const bar = await resolveSkillFile(roleName, barFileName);
+        if (bar) {
+          const barContent = await readFile(bar.path, "utf-8");
+          await appendToFile(destFile, "\n" + barContent.trim() + "\n");
+          barApplied = true;
+        }
+      }
       await appendToFile(
         join(companyDir, "agents", roleName, "AGENTS.md"),
         `
@@ -9679,7 +9701,10 @@ Read and follow: \`$AGENT_HOME/skills/${fileName}\`
 `
       );
       const sourceTag = resolved.source === "shared" ? ", shared" : "";
-      onProgress(`+ agents/${roleName}/skills/${fileName} (${moduleName}, ${label}${sourceTag})`);
+      const barTag = barApplied ? ", output bar" : "";
+      onProgress(
+        `+ agents/${roleName}/skills/${fileName} (${moduleName}, ${label}${sourceTag}${barTag})`
+      );
       return true;
     }
     for (const [skillName, { primary, cap }] of capabilityOwners) {
@@ -9701,6 +9726,7 @@ Read and follow: \`$AGENT_HOME/skills/${fileName}\`
         if (!await exists(skillsDir)) continue;
         const skills = await readdir(skillsDir);
         for (const skillFile of skills) {
+          if (skillFile.endsWith(".bar.md")) continue;
           const skillName = skillFile.replace(/\.md$/, "");
           const skillBaseName = skillName.replace(/\.fallback$/, "");
           if (capabilityOwners.has(skillBaseName)) continue;
@@ -9744,6 +9770,24 @@ Read and follow: \`$AGENT_HOME/skills/${skillFile}\`
       onProgress(`+ agents/${modRole.name}/HEARTBEAT.md (${moduleName}, heartbeat section)`);
     }
   }
+  if (enableEnrichedPersonas) {
+    for (const roleName of allRoles) {
+      const lensesSrc = join(rolesDir, roleName, "LENSES.md");
+      const soulPath = join(companyDir, "agents", roleName, "SOUL.md");
+      if (await exists(lensesSrc) && await exists(soulPath)) {
+        const lenses = await readFile(lensesSrc, "utf-8");
+        await appendToFile(soulPath, "\n" + lenses.trim() + "\n");
+        onProgress(`+ agents/${roleName}/SOUL.md (domain lenses)`);
+      }
+      const doneSrc = join(rolesDir, roleName, "DONE.md");
+      const heartbeatPath = join(companyDir, "agents", roleName, "HEARTBEAT.md");
+      if (await exists(doneSrc) && await exists(heartbeatPath)) {
+        const done = await readFile(doneSrc, "utf-8");
+        await appendToFile(heartbeatPath, "\n" + done.trim() + "\n");
+        onProgress(`+ agents/${roleName}/HEARTBEAT.md (done criteria)`);
+      }
+    }
+  }
   const finalDocsDir = join(companyDir, "docs");
   if (await exists(finalDocsDir)) {
     const docs = (await readdir(finalDocsDir)).sort();
@@ -10064,6 +10108,12 @@ Read: \`docs/${doc}\`
     }
     return rows;
   };
+  const renderDeferredIsolationNote = (workspace) => {
+    if (!enableIsolatedWorktrees || !isFreshLocalRepo(workspace)) return "";
+    return `> **Enable isolated worktrees once the repo exists.** This instance has isolated worktrees enabled, but this project starts as a fresh local repository, so the \`executionWorkspacePolicy\` is intentionally omitted now \u2014 worktrees need an existing base ref and would fail on the first run. As the final step of **"Prepare GitHub repository"**, after the initial commit is pushed to \`main\`, switch this project to isolated worktrees (Project settings \u2192 isolated workspaces, or set \`executionWorkspacePolicy: { defaultMode: "isolated_workspace", workspaceStrategy: { type: "git_worktree", baseRef: "main" } }\` on the project). Until then agents share the project workspace; do not flip it before the repo has its first commit.
+
+`;
+  };
   const mainProject = resolvedProjects[0];
   const mainProjectName = mainProject?.name || companyName;
   if (resolvedProjects.length > 0) {
@@ -10088,6 +10138,7 @@ Read: \`docs/${doc}\`
 
 `;
       }
+      bootstrap += renderDeferredIsolationNote(workspace);
     }
   }
   if (bootstrapLabels.length > 0) {
@@ -10212,7 +10263,7 @@ Read: \`docs/${doc}\`
     bootstrap += `- Do not reuse parent workspaces for subissues unless explicitly requested.
 `;
     if (moduleNames.includes("pr-review")) {
-      bootstrap += `- Required PR reviews use the issue's \`executionPolicy\`: a \`review\` stage for the Code Reviewer (plus any relevant domain reviewer \u2014 QA/UI/UX/DevOps), then a final \`approval\` stage for the Product Owner. Resolve each reviewer/approver role to its agentId. Do not create separate child review issues and do not use @-mentions.
+      bootstrap += `- Required PR reviews use the issue's \`executionPolicy\`: a \`review\` stage for the Code Reviewer (plus any relevant domain reviewer \u2014 QA/UI/UX/DevOps), an \`approval\` stage for the Product Owner, then a final \`approval\` merge-gate stage for the Engineer (who merges the PR before recording approval, which closes the issue). The merge gate must be last so the Product Owner's approval does not auto-close the issue with the PR still open. Resolve each role to its agentId. Do not create separate child review issues and do not use @-mentions.
 `;
     }
     bootstrap += `
@@ -11150,6 +11201,7 @@ var plugin = definePlugin({
           presetRoutines: presetBootstrapData.routines,
           presetLabels: presetBootstrapData.labels,
           enableIsolatedWorktrees: await resolveEnableIsolatedWorkspacesFromInstance(cfg),
+          enableEnrichedPersonas: cfgBool(cfg, "enableEnrichedPersonas"),
           outputDir: tmpDir,
           templatesDir
         });
@@ -11255,6 +11307,7 @@ var plugin = definePlugin({
           "disableBoardApprovalOnNewCompanies"
         );
         const enableIsolatedWorktrees = await resolveEnableIsolatedWorkspacesFromInstance(cfg, log);
+        const enableEnrichedPersonas = cfgBool(cfg, "enableEnrichedPersonas");
         const companyName = typeof params.companyName === "string" ? params.companyName.trim() : "";
         const existingCompanyId = typeof params.existingCompanyId === "string" && params.existingCompanyId.trim() ? params.existingCompanyId.trim() : "";
         if (!companyName) return { error: "companyName is required", logs };
@@ -11295,6 +11348,7 @@ var plugin = definePlugin({
           presetRoutines: presetBootstrapData.routines,
           presetLabels: presetBootstrapData.labels,
           enableIsolatedWorktrees,
+          enableEnrichedPersonas,
           outputDir,
           templatesDir,
           onProgress: log