6cf6bd076f
Pre-merge mergeability check via `git merge-tree --write-tree` (dry-run, no side effects). When conflicts exist the "Merge & Push" button is disabled and a ConflictResolutionPanel shows conflict files with options to resolve manually or spawn a conflict-resolution agent. Agent questions appear inline via QuestionForm; on completion the mergeability re-checks automatically. New server-side: MergeabilityResult type, BranchManager.checkMergeability, conflict-resolution prompt, checkInitiativeMergeability query, spawnConflictResolutionAgent mutation, getActiveConflictAgent query. New frontend: useConflictAgent hook, ConflictResolutionPanel component, mergeability badge + panel integration in InitiativeReview.
19 lines
1001 B
TypeScript
19 lines
1001 B
TypeScript
/**
|
|
* Agent Prompts — per-mode prompt builders and shared instructions.
|
|
*
|
|
* Each agent type lives in its own file. Shared instructions (signal format,
|
|
* input files, ID generation) are in shared.ts.
|
|
*/
|
|
|
|
export { SIGNAL_FORMAT, INPUT_FILES, ID_GENERATION, CODEBASE_EXPLORATION, CONTEXT_MANAGEMENT, DEVIATION_RULES, GIT_WORKFLOW, TEST_INTEGRITY, SESSION_STARTUP, PROGRESS_TRACKING, buildInterAgentCommunication } from './shared.js';
|
|
export { buildExecutePrompt } from './execute.js';
|
|
export { buildDiscussPrompt } from './discuss.js';
|
|
export { buildPlanPrompt } from './plan.js';
|
|
export { buildDetailPrompt } from './detail.js';
|
|
export { buildRefinePrompt } from './refine.js';
|
|
export { buildChatPrompt } from './chat.js';
|
|
export type { ChatHistoryEntry } from './chat.js';
|
|
export { buildWorkspaceLayout } from './workspace.js';
|
|
export { buildPreviewInstructions } from './preview.js';
|
|
export { buildConflictResolutionPrompt, buildConflictResolutionDescription } from './conflict-resolution.js';
|