npm - fifony - Versions diffs - 0.1.39 → 0.1.40 - Mend

fifony 0.1.39 → 0.1.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/app/dist/index.html CHANGED Viewed

@@ -20,12 +20,12 @@
     <link rel="icon" href="/assets/icon-32.png" sizes="32x32" type="image/png" />
     <link rel="icon" href="/assets/icon-16.png" sizes="16x16" type="image/png" />
     <link rel="apple-touch-icon" href="/assets/apple-touch-icon.png" />
-    <script type="module" crossorigin src="/assets/assets/index-D5rsr1We.js"></script>
+    <script type="module" crossorigin src="/assets/assets/index-C13WwYFD.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/assets/rolldown-runtime-Dw2cE7zH.js">
     <link rel="modulepreload" crossorigin href="/assets/assets/api-ChEctgc5.js">
     <link rel="modulepreload" crossorigin href="/assets/assets/vendor-DkWeBvNl.js">
     <link rel="modulepreload" crossorigin href="/assets/assets/createLucideIcon-R47sXufx.js">
-    <link rel="stylesheet" crossorigin href="/assets/assets/index-BWB0OQnx.css">
+    <link rel="stylesheet" crossorigin href="/assets/assets/index-BatA8x-K.css">
   </head>
   <body>
     <div id="root"></div>

package/app/dist/service-worker.js CHANGED Viewed

@@ -1,4 +1,4 @@
-const CACHE_VERSION = "1774287064241";
+const CACHE_VERSION = "1774372039411";
 const CORE_CACHE = `fifony-core-${CACHE_VERSION}`;
 const ASSET_CACHE = `fifony-assets-${CACHE_VERSION}`;
 const APP_SHELL_ROUTES = ["/kanban", "/issues", "/agents", "/settings", "/onboarding"];

package/dist/agent/run-local.js CHANGED Viewed

@@ -23,17 +23,17 @@ import {
   startApiServer,
   syncRuntimeConfigSettings,
   validateConfig
-} from "../chunk-DWMY2HBG.js";
+} from "../chunk-LYAI5RPK.js";
 import {
   cleanTerminalWorkspaces,
   initQueueWorkers,
   recoverOrphans,
   recoverState,
   stopQueueWorkers
-} from "../chunk-AVSRIV47.js";
+} from "../chunk-3QL4QAQ5.js";
 import {
   computeMetrics
-} from "../chunk-WBOBY75G.js";
+} from "../chunk-UXXUTDGV.js";
 import {
   detectAvailableProviders,
   detectDefaultBranch,
@@ -41,7 +41,7 @@ import {
   getProviderDefaultCommand,
   resolveDefaultProvider,
   setSkipSource
-} from "../chunk-UNYIR5AK.js";
+} from "../chunk-O3FGX4J6.js";
 import {
   initLogger,
   logger
@@ -51,7 +51,7 @@ import {
   fail,
   now,
   parseIntArg
-} from "../chunk-T2YJOZ6N.js";
+} from "../chunk-EPY5TTQK.js";
 import {
   CLI_ARGS,
   PACKAGE_ROOT,

package/dist/{agent-AAT7OHAL.js → agent-KDPOZCI5.js} RENAMED Viewed

@@ -15,9 +15,9 @@ import {
   runIssueOnce,
   runPlanningJob,
   tryParseJsonOutput
-} from "./chunk-DWMY2HBG.js";
-import "./chunk-AVSRIV47.js";
-import "./chunk-WBOBY75G.js";
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
+import "./chunk-UXXUTDGV.js";
 import {
   buildPrompt,
   buildProviderBasePrompt,
@@ -34,9 +34,9 @@ import {
   runCommandWithTimeout,
   runHook,
   shouldSkipMergePath
-} from "./chunk-UNYIR5AK.js";
+} from "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   addTokenUsage,
@@ -71,4 +71,4 @@ export {
   shouldSkipMergePath,
   tryParseJsonOutput
 };
-//# sourceMappingURL=agent-AAT7OHAL.js.map
+//# sourceMappingURL=agent-KDPOZCI5.js.map

package/dist/{chunk-AVSRIV47.js → chunk-3QL4QAQ5.js} RENAMED Viewed

@@ -26,7 +26,7 @@ async function initQueueWorkers(state) {
   }, 3e4);
   persistInterval = setInterval(() => {
     if (!active || !runtimeState) return;
-    import("./store-3YSID6N2.js").then(
+    import("./store-FNUWCFOX.js").then(
       ({ persistState }) => persistState(runtimeState).catch(() => {
       })
     ).catch(() => {
@@ -116,11 +116,11 @@ function sortQueue() {
 }
 async function dispatchPlan(issue) {
   logger.info({ issueId: issue.id, identifier: issue.identifier }, "[Queue] Dispatching plan job");
-  const { runPlanningJob } = await import("./issue-runner-JSHZGTKQ.js");
+  const { runPlanningJob } = await import("./issue-runner-YZM6WQMY.js");
   await runPlanningJob(runtimeState, issue);
 }
 async function dispatchExecute(issue) {
-  const { runIssueOnce } = await import("./issue-runner-JSHZGTKQ.js");
+  const { runIssueOnce } = await import("./issue-runner-YZM6WQMY.js");
   while (active && runtimeState) {
     const current = getCurrentIssue(issue.id);
     if (!current || current.state !== "Queued" && current.state !== "Running") break;
@@ -130,12 +130,12 @@ async function dispatchExecute(issue) {
 }
 async function dispatchReview(issue) {
   logger.info({ issueId: issue.id, identifier: issue.identifier }, "[Queue] Dispatching review job");
-  const { runIssueOnce } = await import("./issue-runner-JSHZGTKQ.js");
+  const { runIssueOnce } = await import("./issue-runner-YZM6WQMY.js");
   await runIssueOnce(runtimeState, issue, running);
 }
 async function checkStaleIssues() {
   if (!runtimeState) return;
-  const { ensureNotStale } = await import("./scheduler-GAO2MXGZ.js");
+  const { ensureNotStale } = await import("./scheduler-4R4ZAF25.js");
   await ensureNotStale(runtimeState, runtimeState.config.staleInProgressTimeoutMs);
 }
 var draining = false;
@@ -181,12 +181,14 @@ async function enqueue(issue, job) {
     return;
   }
   queue.push({ issueId: issue.id, job, enqueuedAt: Date.now() });
-  drain().catch((err) => logger.error({ err }, "[Queue] Drain loop error"));
+  setImmediate(() => {
+    drain().catch((err) => logger.error({ err }, "[Queue] Drain loop error"));
+  });
 }
 async function recoverState() {
   if (!runtimeState) return;
   try {
-    const { getIssueStateMachinePlugin, ISSUE_STATE_MACHINE_ID } = await import("./issue-state-machine-TEIICCAA.js");
+    const { getIssueStateMachinePlugin, ISSUE_STATE_MACHINE_ID } = await import("./issue-state-machine-KOZE5JWX.js");
     const fsmPlugin = getIssueStateMachinePlugin();
     if (fsmPlugin?.getState) {
       for (const issue of runtimeState.issues) {
@@ -204,8 +206,14 @@ async function recoverState() {
   }
   for (const issue of runtimeState.issues) {
     try {
-      if (issue.state === "Planning" && issue.planningStatus !== "planning") {
-        await enqueue(issue, "plan");
+      if (issue.state === "Planning") {
+        if (issue.planningStatus === "planning") {
+          logger.info({ issueId: issue.id, identifier: issue.identifier }, "[Queue] Clearing stale planningStatus from previous session");
+          issue.planningStatus = "idle";
+        }
+        if (!issue.plan) {
+          await enqueue(issue, "plan");
+        }
       } else if (issue.state === "Queued" || issue.state === "Running") {
         await enqueue(issue, "execute");
       } else if (issue.state === "Reviewing") {
@@ -218,9 +226,9 @@ async function recoverState() {
 }
 async function recoverOrphans() {
   if (!runtimeState) return;
-  const { isAgentStillRunning, cleanStalePidFile } = await import("./agent-AAT7OHAL.js");
-  const { executeTransition } = await import("./issue-state-machine-TEIICCAA.js");
-  const { addEvent } = await import("./issues-JPMKO2EE.js");
+  const { isAgentStillRunning, cleanStalePidFile } = await import("./agent-KDPOZCI5.js");
+  const { executeTransition } = await import("./issue-state-machine-KOZE5JWX.js");
+  const { addEvent } = await import("./issues-7HQC7OIN.js");
   const candidates = runtimeState.issues.filter((i) => i.state === "Running" || i.state === "Queued");
   logger.debug({ count: candidates.length }, "[Queue] Checking for orphaned agent processes");
   for (const issue of candidates) {
@@ -258,7 +266,7 @@ function cleanTerminalWorkspaces() {
   logger.info({ count: terminals.length }, "[Queue] Scheduling terminal workspace cleanup in background");
   const state = runtimeState;
   setImmediate(async () => {
-    const { cleanWorkspace } = await import("./agent-AAT7OHAL.js");
+    const { cleanWorkspace } = await import("./agent-KDPOZCI5.js");
     for (const issue of terminals) {
       try {
         await cleanWorkspace(issue.id, issue, state);
@@ -292,4 +300,4 @@ export {
   cleanTerminalWorkspaces,
   getQueueStats
 };
-//# sourceMappingURL=chunk-AVSRIV47.js.map
+//# sourceMappingURL=chunk-3QL4QAQ5.js.map

package/dist/{chunk-T2YJOZ6N.js → chunk-EPY5TTQK.js} RENAMED Viewed

@@ -196,36 +196,11 @@ var PROMPT_TEMPLATES = {
   // src/agents/prompts/integrations-agency-agents.stub.md
   "integrations-impeccable": '# Impeccable integration idea\n\nUse impeccable-oriented skills as a frontend review layer around fifony issues.\n\nSuggested pattern:\n\n1. Use `agency-senior-developer` or `codex` as executor.\n2. Route UI-heavy issues to a reviewer prompt that explicitly asks for impeccable-style critique.\n3. Expose the resulting review through the fifony MCP prompts or as a follow-up review issue.\n\nSuggested labels:\n- frontend\n- ui\n- design-system\n\nSuggested reviewer prompt seed:\n"Review this implementation using impeccable standards for frontend quality, polish, hierarchy, spacing, responsiveness, and interaction clarity."\n',
   // src/agents/prompts/integrations-impeccable.stub.md
-  "issue-enhancer-description": `You are helping improve issue metadata for a software execution queue.
-Rewrite the description to be clearer, complete, and directly actionable.
-Return strict JSON only with this schema:
-{ "field": "description", "value": "..." }
-Issue type: {{issueType}}
-Current title: {{title}}
-Current description: {{description}}
-{{#if images}}
-Visual evidence (attached screenshots for context):
-{{#each images}}
-- {{this}}
-{{/each}}
-{{/if}}
-Rules:
-- Keep it concise but include meaningful acceptance criteria tailored to the issue type.
-- For "bug": focus on problem description, expected behavior, and steps to reproduce.
-- For "feature": focus on goal, acceptance criteria, and any relevant notes.
-- For "refactor": describe current state, desired state, and scope.
-- For "docs": describe what to document and target audience.
-- For "chore": describe the task and why it's needed now.
-- Use markdown formatting appropriate for the type (## headings, bullet points).
-- Avoid extra wrappers, outer quotes, or extra explanation.
-- The value should be in Portuguese if the input is in Portuguese; otherwise in English.
-`,
+  "issue-enhancer-description": 'You are helping improve issue metadata for a software execution queue.\nRewrite the description to be clearer, complete, and directly actionable.\n\nIssue type: {{issueType}}\nCurrent title: {{title}}\nCurrent description: {{description}}\n{{#if images}}\nVisual evidence (attached screenshots for context):\n{{#each images}}\n- {{this}}\n{{/each}}\n{{/if}}\n\nRules:\n- Keep it concise but include meaningful acceptance criteria tailored to the issue type.\n- For "bug": focus on problem description, expected behavior, and steps to reproduce.\n- For "feature": focus on goal, acceptance criteria, and any relevant notes.\n- For "refactor": describe current state, desired state, and scope.\n- For "docs": describe what to document and target audience.\n- For "chore": describe the task and why it\'s needed now.\n- Use markdown formatting appropriate for the type (## headings, bullet points).\n- The value should be in Portuguese if the input is in Portuguese; otherwise in English.\n\nAfter your analysis, return a single JSON code block as the LAST thing in your output:\n```json\n{ "field": "description", "value": "<REPLACE_WITH_ACTUAL_DESCRIPTION>" }\n```\n',
   // src/agents/prompts/issue-enhancer-description.stub.md
-  "issue-enhancer-title": 'You are helping improve issue metadata for a software execution queue.\nRewrite the title for clarity, actionability, and specificity.\nReturn strict JSON only with this schema:\n{ "field": "title", "value": "..." }\n\nIssue type: {{issueType}}\nCurrent title: {{title}}\nDescription context: {{description}}\n{{#if images}}\nVisual evidence (attached screenshots for context):\n{{#each images}}\n- {{this}}\n{{/each}}\n{{/if}}\n\nRules:\n- Keep it concise and suitable as a task title.\n- Use imperative language when possible.\n- If the issue type is "bug", start with "fix: ". If "feature", start with "feat: ". If "refactor", start with "refactor: ". If "docs", start with "docs: ". If "chore", start with "chore: ". For "blank", use no prefix.\n- Do not include markdown, quotes, or extra explanation.\n- The value should be in Portuguese if the input is in Portuguese; otherwise in English.\n',
+  "issue-enhancer-title": 'You are helping improve issue metadata for a software execution queue.\nRewrite the title for clarity, actionability, and specificity.\n\nIssue type: {{issueType}}\nCurrent title: {{title}}\nDescription context: {{description}}\n{{#if images}}\nVisual evidence (attached screenshots for context):\n{{#each images}}\n- {{this}}\n{{/each}}\n{{/if}}\n\nRules:\n- Keep it concise and suitable as a task title.\n- Use imperative language when possible.\n- If the issue type is "bug", start with "fix: ". If "feature", start with "feat: ". If "refactor", start with "refactor: ". If "docs", start with "docs: ". If "chore", start with "chore: ". For "blank", use no prefix.\n- Do not include markdown, quotes, or extra explanation.\n- The value should be in Portuguese if the input is in Portuguese; otherwise in English.\n\nReturn a single JSON code block as the LAST thing in your output:\n```json\n{ "field": "title", "value": "<REPLACE_WITH_ACTUAL_TITLE>" }\n```\n',
   // src/agents/prompts/issue-enhancer-title.stub.md
-  "issue-planner": 'You are a senior technical execution planner.\nProduce the best possible plan for the issue below, filling the JSON schema precisely.\n{{#if fast}}\n\nFAST MODE: Be brief and direct. Minimize reasoning depth.\n- 2-4 steps maximum. Skip optional fields (unknowns, risks, alternatives).\n- Focus only on: summary, steps, estimatedComplexity, suggestedPaths.\n{{/if}}\n\n{{#if availableCapabilities}}\n## Installed Capabilities (recommend from these lists)\n\n{{#if availableSkills.length}}\n### Skills\n{{#each availableSkills}}\n- **{{name}}**{{#if description}} \u2014 {{description}}{{/if}}{{#if whenToUse}} (Use when: {{whenToUse}}){{/if}}\n{{/each}}\n{{/if}}\n{{#if availableAgents.length}}\n### Agents\n{{#each availableAgents}}\n- **{{name}}**{{#if description}} \u2014 {{description}}{{/if}}{{#if whenToUse}} (Use when: {{whenToUse}}){{/if}}{{#if avoidIf}} (Avoid if: {{avoidIf}}){{/if}}\n{{/each}}\n{{/if}}\n{{#if availableCommands.length}}\n### Commands\n{{#each availableCommands}}\n- /{{name}}\n{{/each}}\n{{/if}}\n\nRecommend skills and agents ONLY from these lists. Do not invent names.\nOnly recommend when there is a concrete benefit \u2014 not everything needs skills or agents.\n{{/if}}\n\nIssue title: {{title}}\nIssue description: {{description}}\n{{#if images}}\nVisual evidence (attached screenshots for context):\n{{#each images}}\n- {{this}}\n{{/each}}\n{{/if}}\n{{#unless fast}}\n\nQuality rules:\n- Be concrete, not generic. No vague phrases like \'implement\' or \'improve\' without detail.\n- Break work into actionable steps (2-8 steps). Each step describes WHAT, not HOW.\n- Each step must have a clear \'doneWhen\' acceptance criterion.\n- Identify assumptions, constraints, unknowns, and risks.\n- For unknowns, specify what question needs answering and how to resolve it.\n- Suggest file paths that are likely relevant to the changes.\n\nComplexity estimation:\n- trivial: < 5 min, single-file cosmetic change\n- low: 5-15 min, small focused change\n- medium: 15-60 min, multi-file change with testing\n- high: > 1 hour, architectural change or new feature\n\nEffort suggestion:\n- low: simple fixes, no deep reasoning needed\n- medium: standard development work\n- high: complex architecture, security, or cross-cutting changes\n- Set per-role if different: planner, executor, reviewer\n{{/unless}}\n\nReturn strict JSON matching this schema. No text outside JSON. Use these exact field names.\nIMPORTANT: Replace ALL placeholder values with real content specific to the issue above. Do NOT copy the example values literally \u2014 every field must contain actual plan content derived from the issue.\n\n```json\n{\n  "summary": "<YOUR one-line summary here>",\n  "estimatedComplexity": "trivial|low|medium|high",\n  "steps": [\n    {\n      "step": 1,\n      "action": "<YOUR concrete action here>",\n      "files": ["<real/path/to/file.ts>"],\n      "details": "<YOUR additional context>",\n      "doneWhen": "<YOUR acceptance criterion>"\n    }\n  ],\n  "assumptions": ["<YOUR assumptions>"],\n  "constraints": ["<YOUR constraints>"],\n  "unknowns": [\n    { "question": "<YOUR question>", "whyItMatters": "<YOUR reason>", "howToResolve": "<YOUR approach>" }\n  ],\n  "successCriteria": ["<YOUR criteria>"],\n  "risks": [\n    { "risk": "<YOUR risk>", "impact": "<YOUR impact>", "mitigation": "<YOUR mitigation>" }\n  ],\n  "suggestedPaths": ["<real/path/to/relevant/file.ts>"],\n  "suggestedSkills": ["<skill-name-from-list-above>"],\n  "suggestedAgents": ["<agent-name-from-list-above>"],\n  "suggestedEffort": { "default": "medium", "planner": "low", "executor": "medium", "reviewer": "medium" }\n}\n```\n',
+  "issue-planner": 'You are a senior technical execution planner.\nProduce the best possible plan for the issue below, filling the JSON schema precisely.\n{{#if fast}}\n\nFAST MODE: Be brief and direct. Minimize reasoning depth.\n- 2-4 steps maximum. Skip optional fields (unknowns, risks, alternatives).\n- Focus only on: summary, steps, estimatedComplexity, suggestedPaths.\n{{/if}}\n\n{{#if availableCapabilities}}\n## Installed Capabilities (recommend from these lists)\n\n{{#if availableSkills.length}}\n### Skills\n{{#each availableSkills}}\n- **{{name}}**{{#if description}} \u2014 {{description}}{{/if}}{{#if whenToUse}} (Use when: {{whenToUse}}){{/if}}\n{{/each}}\n{{/if}}\n{{#if availableAgents.length}}\n### Agents\n{{#each availableAgents}}\n- **{{name}}**{{#if description}} \u2014 {{description}}{{/if}}{{#if whenToUse}} (Use when: {{whenToUse}}){{/if}}{{#if avoidIf}} (Avoid if: {{avoidIf}}){{/if}}\n{{/each}}\n{{/if}}\n{{#if availableCommands.length}}\n### Commands\n{{#each availableCommands}}\n- /{{name}}\n{{/each}}\n{{/if}}\n\nRecommend skills and agents ONLY from these lists. Do not invent names.\nOnly recommend when there is a concrete benefit \u2014 not everything needs skills or agents.\n{{/if}}\n\nIssue title: {{title}}\nIssue description: {{description}}\n{{#if images}}\nVisual evidence (attached screenshots for context):\n{{#each images}}\n- {{this}}\n{{/each}}\n{{/if}}\n{{#unless fast}}\n\nQuality rules:\n- Be concrete, not generic. No vague phrases like \'implement\' or \'improve\' without detail.\n- Break work into actionable steps (2-8 steps). Each step describes WHAT, not HOW.\n- Each step must have a clear \'doneWhen\' acceptance criterion.\n- Identify assumptions, constraints, unknowns, and risks.\n- For unknowns, specify what question needs answering and how to resolve it.\n- Suggest file paths that are likely relevant to the changes.\n\nComplexity estimation:\n- trivial: < 5 min, single-file cosmetic change\n- low: 5-15 min, small focused change\n- medium: 15-60 min, multi-file change with testing\n- high: > 1 hour, architectural change or new feature\n\nEffort suggestion:\n- low: simple fixes, no deep reasoning needed\n- medium: standard development work\n- high: complex architecture, security, or cross-cutting changes\n- Set per-role if different: planner, executor, reviewer\n{{/unless}}\n\n## Instructions\n\nYou are encouraged to explore the codebase \u2014 read files, search for patterns, inspect structure \u2014 to produce an informed plan. Use any tools available to you.\n\nAfter your analysis, you MUST output the final plan as a single JSON code block (```json ... ```).\nThe JSON block must be the LAST thing in your output. Any analysis or reasoning should come BEFORE it.\n\nIMPORTANT: Replace ALL placeholder values with real content specific to the issue above. Do NOT copy the example values literally \u2014 every field must contain actual plan content derived from the issue.\n\nUse these exact field names:\n\n```json\n{\n  "summary": "<YOUR one-line summary here>",\n  "estimatedComplexity": "trivial|low|medium|high",\n  "steps": [\n    {\n      "step": 1,\n      "action": "<YOUR concrete action here>",\n      "files": ["<real/path/to/file.ts>"],\n      "details": "<YOUR additional context>",\n      "doneWhen": "<YOUR acceptance criterion>"\n    }\n  ],\n  "assumptions": ["<YOUR assumptions>"],\n  "constraints": ["<YOUR constraints>"],\n  "unknowns": [\n    { "question": "<YOUR question>", "whyItMatters": "<YOUR reason>", "howToResolve": "<YOUR approach>" }\n  ],\n  "successCriteria": ["<YOUR criteria>"],\n  "risks": [\n    { "risk": "<YOUR risk>", "impact": "<YOUR impact>", "mitigation": "<YOUR mitigation>" }\n  ],\n  "suggestedPaths": ["<real/path/to/relevant/file.ts>"],\n  "suggestedSkills": ["<skill-name-from-list-above>"],\n  "suggestedAgents": ["<agent-name-from-list-above>"],\n  "suggestedEffort": { "default": "medium", "planner": "low", "executor": "medium", "reviewer": "medium" }\n}\n```\n',
   // src/agents/prompts/issue-planner.stub.md
   "issue-planner-refine": "You are a senior technical execution planner refining an existing plan based on user feedback.\n\n## Original Issue\nTitle: {{title}}\nDescription: {{description}}\n\n## Current Plan (JSON)\n```json\n{{currentPlan}}\n```\n\n## User Feedback\n{{feedback}}\n\n## Instructions\n\nRevise the plan above to address the user's feedback precisely.\n\nRules:\n- Keep all parts of the plan that are NOT affected by the feedback unchanged.\n- Only modify, add, or remove elements that the feedback specifically requests.\n- Preserve the same JSON schema structure as the current plan.\n- Maintain step numbering consistency after changes.\n- If feedback asks to add steps, insert them in the logical position and renumber.\n- If feedback asks to remove steps, renumber remaining steps sequentially.\n- Update the summary if the overall direction changed.\n- Re-evaluate estimatedComplexity if the scope changed significantly.\n- Update suggestedPaths, suggestedSkills, and suggestedAgents if affected by the changes.\n\nReturn strict JSON. No text outside JSON.\n",
   // src/agents/prompts/issue-planner-refine.stub.md
@@ -237,6 +212,8 @@ Rules:
   // src/agents/prompts/mcp-issue.stub.md
   "mcp-review-workflow": "Review the pipeline configuration for this fifony workspace as {{provider}}.\n\nWorkspace: {{workspaceRoot}}\n\nFocus on:\n- provider orchestration quality (plan/execute/review stages)\n- hooks safety (beforeRun, afterRun, afterCreate, beforeRemove)\n- prompt clarity\n- issue lifecycle correctness\n- what an MCP client needs in order to integrate cleanly\n",
   // src/agents/prompts/mcp-review-workflow.stub.md
+  "merge-conflict-resolver": "You are resolving git merge conflicts in a software project.\n\n## Context\n\nIssue: {{issueIdentifier}} \u2014 {{title}}\n{{#if description}}\nDescription: {{description}}\n{{/if}}\nMerging branch `{{featureBranch}}` into `{{baseBranch}}`.\n\n## Conflicting Files\n\nThe following files have conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) that you must resolve:\n\n{{#each conflictFiles}}\n- {{this}}\n{{/each}}\n\n## Instructions\n\n1. Read each conflicting file and understand the intent of BOTH sides.\n2. Resolve the conflict markers by choosing the correct combination of changes. Prefer keeping both sides' intent when possible.\n3. After resolving, stage each file with `git add <file>`.\n4. Do NOT commit \u2014 the merge commit will be created automatically after you finish.\n5. Do NOT modify files that are not in the conflict list.\n6. Verify there are no remaining conflict markers (`<<<<<<<`) in any resolved file.\n",
+  // src/agents/prompts/merge-conflict-resolver.stub.md
   "project-analysis": `You are analyzing a software project to help configure an AI-powered development assistant.
 Look at the project structure, source code, configuration files, and any documentation you can find. Pay special attention to:
@@ -308,4 +285,4 @@ export {
   repairTruncatedJson,
   renderPrompt
 };
-//# sourceMappingURL=chunk-T2YJOZ6N.js.map
+//# sourceMappingURL=chunk-EPY5TTQK.js.map