feat: expand magic prompts coverage and split generation prompts (#835)
- Add configurable visible/instructions prompt families for commit/PR generation, PR checks/comments flows, and git conflict resolution helpers. - Refactor prompt sending to explicit visible + synthetic parts instead of newline-based splitting, with legacy override migration for old keys. - Polish Magic Prompts settings UX with grouped sidebar entries, tooltip-based descriptions, AI icon, and validation that visible prompts cannot be empty across web and VS Code runtimes.
This commit is contained in:
Bohdan Triapitsyn
committed by
GitHub
GitHub
parent
2e5b02e753
commit
5f0d1623ae
@@ -0,0 +1,322 @@
|
||||
import React from 'react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { GridLoader } from '@/components/ui/grid-loader';
|
||||
import { toast } from '@/components/ui';
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
|
||||
import { RiInformationLine } from '@remixicon/react';
|
||||
import {
|
||||
fetchMagicPromptOverrides,
|
||||
getDefaultMagicPromptTemplate,
|
||||
getMagicPromptDefinition,
|
||||
resetAllMagicPromptOverrides,
|
||||
resetMagicPromptOverride,
|
||||
saveMagicPromptOverride,
|
||||
type MagicPromptId,
|
||||
} from '@/lib/magicPrompts';
|
||||
import { useMagicPromptsStore } from '@/stores/useMagicPromptsStore';
|
||||
|
||||
type PromptBlock = {
|
||||
id: MagicPromptId;
|
||||
title: string;
|
||||
};
|
||||
|
||||
type PromptPageConfig = {
|
||||
title: string;
|
||||
description: string;
|
||||
blocks: PromptBlock[];
|
||||
};
|
||||
|
||||
const PROMPT_PAGE_MAP: Record<string, PromptPageConfig> = {
|
||||
'git.commit.generate': {
|
||||
title: 'Commit Generation',
|
||||
description: 'Prompts used for commit message generation: visible user message + hidden instructions.',
|
||||
blocks: [
|
||||
{ id: 'git.commit.generate.visible', title: 'Visible Prompt' },
|
||||
{ id: 'git.commit.generate.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'git.pr.generate': {
|
||||
title: 'PR Generation',
|
||||
description: 'Prompts used for PR title/body generation: visible user message + hidden instructions.',
|
||||
blocks: [
|
||||
{ id: 'git.pr.generate.visible', title: 'Visible Prompt' },
|
||||
{ id: 'git.pr.generate.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'github.pr.review': {
|
||||
title: 'PR Review',
|
||||
description: 'Prompts used for PR review flow: visible user message + hidden instruction payload.',
|
||||
blocks: [
|
||||
{ id: 'github.pr.review.visible', title: 'Visible Prompt' },
|
||||
{ id: 'github.pr.review.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'github.issue.review': {
|
||||
title: 'Issue Review',
|
||||
description: 'Prompts used for issue review flow: visible user message + hidden instruction payload.',
|
||||
blocks: [
|
||||
{ id: 'github.issue.review.visible', title: 'Visible Prompt' },
|
||||
{ id: 'github.issue.review.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'github.pr.checks.review': {
|
||||
title: 'PR Failed Checks Review',
|
||||
description: 'Prompts used for PR failed checks analysis.',
|
||||
blocks: [
|
||||
{ id: 'github.pr.checks.review.visible', title: 'Visible Prompt' },
|
||||
{ id: 'github.pr.checks.review.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'github.pr.comments.review': {
|
||||
title: 'PR Comments Review',
|
||||
description: 'Prompts used for PR comments analysis.',
|
||||
blocks: [
|
||||
{ id: 'github.pr.comments.review.visible', title: 'Visible Prompt' },
|
||||
{ id: 'github.pr.comments.review.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'github.pr.comment.single': {
|
||||
title: 'Single PR Comment Review',
|
||||
description: 'Prompts used for single PR comment analysis.',
|
||||
blocks: [
|
||||
{ id: 'github.pr.comment.single.visible', title: 'Visible Prompt' },
|
||||
{ id: 'github.pr.comment.single.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'git.conflict.resolve': {
|
||||
title: 'Merge/Rebase Conflict Resolution',
|
||||
description: 'Prompts used when resolving merge/rebase conflicts with AI.',
|
||||
blocks: [
|
||||
{ id: 'git.conflict.resolve.visible', title: 'Visible Prompt' },
|
||||
{ id: 'git.conflict.resolve.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
'git.integrate.cherrypick.resolve': {
|
||||
title: 'Cherry-pick Conflict Resolution',
|
||||
description: 'Prompts used when resolving cherry-pick conflicts in integrate flow.',
|
||||
blocks: [
|
||||
{ id: 'git.integrate.cherrypick.resolve.visible', title: 'Visible Prompt' },
|
||||
{ id: 'git.integrate.cherrypick.resolve.instructions', title: 'Instructions' },
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
const hasOwn = (input: Record<string, string>, key: string) => Object.prototype.hasOwnProperty.call(input, key);
|
||||
const isVisiblePromptId = (id: MagicPromptId): boolean => id.endsWith('.visible');
|
||||
|
||||
export const MagicPromptsPage: React.FC = () => {
|
||||
const selectedPromptId = useMagicPromptsStore((state) => state.selectedPromptId);
|
||||
const [loading, setLoading] = React.useState(true);
|
||||
const [overrides, setOverrides] = React.useState<Record<string, string>>({});
|
||||
const [drafts, setDrafts] = React.useState<Record<string, string>>({});
|
||||
const [savingIds, setSavingIds] = React.useState<Record<string, boolean>>({});
|
||||
const [resettingIds, setResettingIds] = React.useState<Record<string, boolean>>({});
|
||||
const [resettingAll, setResettingAll] = React.useState(false);
|
||||
|
||||
React.useEffect(() => {
|
||||
let active = true;
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const nextOverrides = await fetchMagicPromptOverrides();
|
||||
if (!active) return;
|
||||
setOverrides(nextOverrides);
|
||||
} catch (error) {
|
||||
console.warn('Failed to load magic prompts:', error);
|
||||
toast.error('Failed to load Magic Prompts');
|
||||
} finally {
|
||||
if (active) {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
void load();
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
}, []);
|
||||
|
||||
const pageConfig = PROMPT_PAGE_MAP[selectedPromptId] ?? PROMPT_PAGE_MAP['git.commit.generate'];
|
||||
const getBaseline = React.useCallback((id: MagicPromptId) => {
|
||||
return hasOwn(overrides, id) ? overrides[id] : getDefaultMagicPromptTemplate(id);
|
||||
}, [overrides]);
|
||||
|
||||
const getDraft = React.useCallback((id: MagicPromptId) => {
|
||||
return drafts[id] ?? getBaseline(id);
|
||||
}, [drafts, getBaseline]);
|
||||
|
||||
const setDraft = React.useCallback((id: MagicPromptId, value: string) => {
|
||||
setDrafts((current) => {
|
||||
if (current[id] === value) {
|
||||
return current;
|
||||
}
|
||||
return { ...current, [id]: value };
|
||||
});
|
||||
}, []);
|
||||
|
||||
const savePrompt = React.useCallback(async (id: MagicPromptId) => {
|
||||
const value = getDraft(id);
|
||||
if (isVisiblePromptId(id) && value.trim().length === 0) {
|
||||
toast.error('Visible prompt cannot be empty');
|
||||
return;
|
||||
}
|
||||
setSavingIds((current) => ({ ...current, [id]: true }));
|
||||
try {
|
||||
const payload = value === getDefaultMagicPromptTemplate(id)
|
||||
? await resetMagicPromptOverride(id)
|
||||
: await saveMagicPromptOverride(id, value);
|
||||
setOverrides(payload.overrides);
|
||||
toast.success('Magic prompt saved');
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
toast.error('Failed to save magic prompt', { description: message });
|
||||
} finally {
|
||||
setSavingIds((current) => ({ ...current, [id]: false }));
|
||||
}
|
||||
}, [getDraft]);
|
||||
|
||||
const resetPrompt = React.useCallback(async (id: MagicPromptId) => {
|
||||
setResettingIds((current) => ({ ...current, [id]: true }));
|
||||
try {
|
||||
const payload = await resetMagicPromptOverride(id);
|
||||
setOverrides(payload.overrides);
|
||||
setDrafts((current) => ({
|
||||
...current,
|
||||
[id]: getDefaultMagicPromptTemplate(id),
|
||||
}));
|
||||
toast.success('Prompt reset to default');
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
toast.error('Failed to reset prompt', { description: message });
|
||||
} finally {
|
||||
setResettingIds((current) => ({ ...current, [id]: false }));
|
||||
}
|
||||
}, []);
|
||||
|
||||
const handleResetAll = React.useCallback(async () => {
|
||||
setResettingAll(true);
|
||||
try {
|
||||
const payload = await resetAllMagicPromptOverrides();
|
||||
setOverrides(payload.overrides);
|
||||
setDrafts({});
|
||||
toast.success('All prompt overrides reset');
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
toast.error('Failed to reset all prompts', { description: message });
|
||||
} finally {
|
||||
setResettingAll(false);
|
||||
}
|
||||
}, []);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="py-6 px-6 flex items-center gap-2 text-muted-foreground">
|
||||
<GridLoader size="sm" />
|
||||
<span className="typography-ui">Loading Magic Prompts...</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="h-full overflow-auto">
|
||||
<div className="mx-auto w-full max-w-4xl px-6 py-6 space-y-4">
|
||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
||||
<div className="space-y-1">
|
||||
<div className="flex items-center gap-2">
|
||||
<h2 className="typography-ui-header font-semibold text-foreground">{pageConfig.title}</h2>
|
||||
<Tooltip delayDuration={700}>
|
||||
<TooltipTrigger asChild>
|
||||
<RiInformationLine className="h-3.5 w-3.5 text-muted-foreground/60 cursor-help" />
|
||||
</TooltipTrigger>
|
||||
<TooltipContent sideOffset={8} className="max-w-xs">
|
||||
{pageConfig.description}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</div>
|
||||
</div>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
void handleResetAll();
|
||||
}}
|
||||
disabled={resettingAll || Object.keys(overrides).length === 0}
|
||||
>
|
||||
{resettingAll ? 'Resetting...' : 'Reset All Overrides'}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{pageConfig.blocks.map((block, index) => {
|
||||
const definition = getMagicPromptDefinition(block.id);
|
||||
const baseline = getBaseline(block.id);
|
||||
const draft = getDraft(block.id);
|
||||
const isOverridden = hasOwn(overrides, block.id);
|
||||
const isDirty = draft !== baseline;
|
||||
const isInvalidEmptyVisiblePrompt = isVisiblePromptId(block.id) && draft.trim().length === 0;
|
||||
const saving = savingIds[block.id] === true;
|
||||
const resetting = resettingIds[block.id] === true;
|
||||
|
||||
return (
|
||||
<section key={block.id} className={index > 0 ? 'space-y-3 pt-5 border-t border-border' : 'space-y-3'}>
|
||||
<div className="space-y-1">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<h3 className="typography-ui-label text-foreground">{block.title}</h3>
|
||||
<Tooltip delayDuration={700}>
|
||||
<TooltipTrigger asChild>
|
||||
<RiInformationLine className="h-3.5 w-3.5 text-muted-foreground/60 cursor-help" />
|
||||
</TooltipTrigger>
|
||||
<TooltipContent sideOffset={8} className="max-w-xs">
|
||||
{definition.description}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</div>
|
||||
{definition.placeholders && definition.placeholders.length > 0 && (
|
||||
<div className="typography-micro text-muted-foreground">
|
||||
Placeholders: {definition.placeholders.map((item) => `{{${item.key}}}`).join(', ')}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Textarea
|
||||
value={draft}
|
||||
onChange={(event) => setDraft(block.id, event.target.value)}
|
||||
className="min-h-[220px] font-mono text-sm"
|
||||
/>
|
||||
{isInvalidEmptyVisiblePrompt && (
|
||||
<div className="typography-micro text-[var(--status-error)]">Visible prompt cannot be empty.</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<span className="typography-micro text-muted-foreground">
|
||||
{isDirty ? 'Unsaved changes' : isOverridden ? 'Using saved override' : 'Using built-in default'}
|
||||
</span>
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
void resetPrompt(block.id);
|
||||
}}
|
||||
disabled={!isOverridden || saving || resetting}
|
||||
>
|
||||
{resetting ? 'Resetting...' : 'Reset to Default'}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
void savePrompt(block.id);
|
||||
}}
|
||||
disabled={!isDirty || saving || resetting || isInvalidEmptyVisiblePrompt}
|
||||
>
|
||||
{saving ? 'Saving...' : 'Save'}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,73 @@
|
||||
import React from 'react';
|
||||
import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
|
||||
import { useMagicPromptsStore } from '@/stores/useMagicPromptsStore';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
interface MagicPromptsSidebarProps {
|
||||
onItemSelect?: () => void;
|
||||
}
|
||||
|
||||
export const MagicPromptsSidebar: React.FC<MagicPromptsSidebarProps> = ({ onItemSelect }) => {
|
||||
const selectedPromptId = useMagicPromptsStore((state) => state.selectedPromptId);
|
||||
const setSelectedPromptId = useMagicPromptsStore((state) => state.setSelectedPromptId);
|
||||
|
||||
const grouped = React.useMemo(() => {
|
||||
return [
|
||||
{
|
||||
group: 'Git',
|
||||
items: [
|
||||
{ id: 'git.commit.generate', title: 'Commit Generation' },
|
||||
{ id: 'git.pr.generate', title: 'PR Generation' },
|
||||
{ id: 'git.conflict.resolve', title: 'Merge/Rebase Conflict Resolution' },
|
||||
{ id: 'git.integrate.cherrypick.resolve', title: 'Cherry-pick Conflict Resolution' },
|
||||
],
|
||||
},
|
||||
{
|
||||
group: 'GitHub',
|
||||
items: [
|
||||
{ id: 'github.pr.review', title: 'PR Review' },
|
||||
{ id: 'github.issue.review', title: 'Issue Review' },
|
||||
{ id: 'github.pr.checks.review', title: 'PR Failed Checks Review' },
|
||||
{ id: 'github.pr.comments.review', title: 'PR Comments Review' },
|
||||
{ id: 'github.pr.comment.single', title: 'Single PR Comment Review' },
|
||||
],
|
||||
},
|
||||
] as const;
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="flex h-full flex-col bg-background">
|
||||
<div className="border-b px-3 pt-4 pb-3">
|
||||
<h2 className="text-base font-semibold text-foreground">Magic Prompts</h2>
|
||||
<p className="typography-meta mt-1 text-muted-foreground">Select a prompt template to edit.</p>
|
||||
</div>
|
||||
|
||||
<ScrollableOverlay outerClassName="flex-1 min-h-0" className="space-y-3 px-3 py-2 overflow-x-hidden">
|
||||
{grouped.map((group) => (
|
||||
<div key={group.group} className="space-y-1">
|
||||
<div className="typography-micro px-1 text-muted-foreground">{group.group}</div>
|
||||
{group.items.map((item) => {
|
||||
const selected = selectedPromptId === item.id;
|
||||
return (
|
||||
<button
|
||||
key={item.id}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setSelectedPromptId(item.id);
|
||||
onItemSelect?.();
|
||||
}}
|
||||
className={cn(
|
||||
'flex w-full items-center rounded-md px-2 py-1.5 text-left transition-colors',
|
||||
selected ? 'bg-interactive-selection text-foreground' : 'text-foreground hover:bg-interactive-hover'
|
||||
)}
|
||||
>
|
||||
<span className="typography-ui-label truncate font-normal">{item.title}</span>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
))}
|
||||
</ScrollableOverlay>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -29,6 +29,7 @@ import { useContextStore } from '@/stores/contextStore';
|
||||
import { useUIStore } from '@/stores/useUIStore';
|
||||
import { useGitHubAuthStore } from '@/stores/useGitHubAuthStore';
|
||||
import { opencodeClient } from '@/lib/opencode/client';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
import { createWorktreeSessionForNewBranch } from '@/lib/worktreeSessionCreator';
|
||||
import { generateBranchSlug } from '@/lib/git/branchNameGenerator';
|
||||
import type { GitHubIssue, GitHubIssueComment, GitHubIssuesListResult, GitHubIssueSummary } from '@/lib/api/types';
|
||||
@@ -450,42 +451,10 @@ export function GitHubIssuePickerDialog({
|
||||
}
|
||||
}
|
||||
|
||||
const visiblePromptText = 'Review this issue using the provided issue context: title, body, labels, assignees, comments, metadata.';
|
||||
const instructionsText = `Review this issue using the provided issue context.
|
||||
|
||||
Process:
|
||||
- First classify the issue type (bug / feature request / question/support / refactor / ops) and state it as: Type: <one label>.
|
||||
- Gather any needed repository context (code, config, docs) to validate assumptions.
|
||||
- After gathering, if anything is still unclear or cannot be verified, do not speculate—state what’s missing and ask targeted questions.
|
||||
|
||||
Output rules:
|
||||
- Compact output; pick ONE template below and omit the others.
|
||||
- No emojis. No code snippets. No fenced blocks.
|
||||
- Short inline code identifiers allowed.
|
||||
- Reference evidence with file paths and line ranges when applicable; if exact lines aren’t available, cite the file and say “approx” + why.
|
||||
- Keep the entire response under ~300 words.
|
||||
|
||||
Templates (choose one):
|
||||
Bug:
|
||||
- Summary (1-2 sentences)
|
||||
- Likely cause (max 2)
|
||||
- Repro/diagnostics needed (max 3)
|
||||
- Fix approach (max 4 steps)
|
||||
- Verification (max 3)
|
||||
|
||||
Feature:
|
||||
- Summary (1-2 sentences)
|
||||
- Requirements (max 4)
|
||||
- Unknowns/questions (max 4)
|
||||
- Proposed plan (max 5 steps)
|
||||
- Verification (max 3)
|
||||
|
||||
Question/Support:
|
||||
- Summary (1-2 sentences)
|
||||
- Answer/guidance (max 6 lines)
|
||||
- Missing info (max 4)
|
||||
|
||||
Do not implement changes until I confirm; end with: “Next actions: <1 sentence>”.`;
|
||||
const visiblePromptText = await renderMagicPrompt('github.issue.review.visible', {
|
||||
issue_number: String(issue.number),
|
||||
});
|
||||
const instructionsText = await renderMagicPrompt('github.issue.review.instructions');
|
||||
const contextText = buildIssueContextText({ repo: issueRes.repo, issue, comments });
|
||||
|
||||
void opencodeClient.sendMessage({
|
||||
|
||||
@@ -22,6 +22,7 @@ import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
|
||||
import { useProjectsStore } from '@/stores/useProjectsStore';
|
||||
import { useUIStore } from '@/stores/useUIStore';
|
||||
import { useGitHubAuthStore } from '@/stores/useGitHubAuthStore';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
import type { GitHubPullRequestContextResult, GitHubPullRequestSummary, GitHubPullRequestsListResult } from '@/lib/api/types';
|
||||
|
||||
const parsePrNumber = (value: string): number | null => {
|
||||
@@ -47,50 +48,6 @@ const buildPullRequestContextText = (payload: GitHubPullRequestContextResult) =>
|
||||
return `GitHub pull request context (JSON)\n${JSON.stringify(payload, null, 2)}`;
|
||||
};
|
||||
|
||||
const PR_REVIEW_INSTRUCTIONS = `Before reporting issues:
|
||||
- First identify the PR intent (what it's trying to achieve) from title/body/diff, then evaluate whether the implementation matches that intent; call out missing pieces, incorrect behavior vs intent, and scope creep.
|
||||
- Gather any needed repository context (code, config, docs) to validate assumptions.
|
||||
- No speculation: if something is unclear or cannot be verified, say what's missing and ask for it instead of guessing.
|
||||
|
||||
Output rules:
|
||||
- Start with a 1-2 sentence summary.
|
||||
- Provide a single concise PR review comment.
|
||||
- No emojis. No code snippets. No fenced blocks.
|
||||
- Short inline code identifiers allowed, but no snippets or fenced blocks.
|
||||
- Reference evidence with file paths and line ranges (e.g., path/to/file.ts:120-138). If exact lines aren't available, cite the file and say "approx" + why.
|
||||
- Keep the entire comment under ~300 words.
|
||||
|
||||
Report:
|
||||
- Must-fix issues (blocking)-brief why and a one-line action each.
|
||||
- Nice-to-have improvements (optional)-brief why and a one-line action each.
|
||||
|
||||
Quality & safety (general):
|
||||
- Call out correctness risks, edge cases, performance regressions, security/privacy concerns, and backwards-compatibility risks.
|
||||
- Call out missing tests/verification steps and suggest the minimal validation needed.
|
||||
- Note readability/maintainability issues when they materially affect future changes.
|
||||
|
||||
Applicability (only if relevant):
|
||||
- If changes affect multiple components/targets/environments (e.g., client/server, OSs, deployments), state what is affected vs not, and why.
|
||||
|
||||
Architecture:
|
||||
- Call out breakages, missing implementations across modules/targets, boundary violations, and cross-cutting concerns (errors, logging/observability, accessibility).
|
||||
|
||||
Precedence:
|
||||
- If local precedent conflicts with best practices, state it and suggest a follow-up task.
|
||||
|
||||
Do not implement changes until I confirm; end with a short "Next actions" sentence describing the recommended plan.
|
||||
|
||||
Format exactly:
|
||||
Must-fix:
|
||||
- <issue> - <brief why> - <file:line-range> - Action: <one-line action>
|
||||
Nice-to-have:
|
||||
- <issue> - <brief why> - <file:line-range> - Action: <one-line action>
|
||||
If no issues, write:
|
||||
Must-fix:
|
||||
- None
|
||||
Nice-to-have:
|
||||
- None`;
|
||||
|
||||
export function GitHubPrPickerDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
@@ -272,6 +229,7 @@ export function GitHubPrPickerDialog({
|
||||
}
|
||||
|
||||
if (onSelect) {
|
||||
const instructionsText = await renderMagicPrompt('github.pr.review.instructions');
|
||||
onSelect({
|
||||
number: context.pr.number,
|
||||
title: context.pr.title,
|
||||
@@ -279,7 +237,7 @@ export function GitHubPrPickerDialog({
|
||||
head: context.pr.head,
|
||||
base: context.pr.base,
|
||||
includeDiff,
|
||||
instructionsText: PR_REVIEW_INSTRUCTIONS,
|
||||
instructionsText,
|
||||
contextText: buildPullRequestContextText(context),
|
||||
author: context.pr.author
|
||||
? {
|
||||
|
||||
@@ -50,6 +50,7 @@ import { getWorktreeSetupCommands } from '@/lib/openchamberConfig';
|
||||
import { getRootBranch } from '@/lib/worktrees/worktreeStatus';
|
||||
import { generateBranchSlug } from '@/lib/git/branchNameGenerator';
|
||||
import { opencodeClient } from '@/lib/opencode/client';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
import { rankBranchesForQuery } from '@/lib/worktrees/branchSearch';
|
||||
import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
|
||||
import { useGitBranches, useGitStore, useGitLoadingBranches } from '@/stores/useGitStore';
|
||||
@@ -547,42 +548,10 @@ export function NewWorktreeDialog({
|
||||
throw new Error('Failed to load issue comments');
|
||||
}
|
||||
|
||||
const visiblePromptText = `Review this issue #${args.issue.number} using the provided issue context`;
|
||||
const instructionsText = `Review this issue using the provided issue context: title, body, labels, assignees, comments, metadata.
|
||||
|
||||
Process:
|
||||
- First classify the issue type (bug / feature request / question/support / refactor / ops) and state it as: Type: <one label>.
|
||||
- Gather any needed repository context (code, config, docs) to validate assumptions.
|
||||
- After gathering, if anything is still unclear or cannot be verified, do not speculate-state what's missing and ask targeted questions.
|
||||
|
||||
Output rules:
|
||||
- Compact output; pick ONE template below and omit the others.
|
||||
- No emojis. No code snippets. No fenced blocks.
|
||||
- Short inline code identifiers allowed.
|
||||
- Reference evidence with file paths and line ranges when applicable; if exact lines aren't available, cite the file and say "approx" + why.
|
||||
- Keep the entire response under ~300 words.
|
||||
|
||||
Templates (choose one):
|
||||
Bug:
|
||||
- Summary (1-2 sentences)
|
||||
- Likely cause (max 2)
|
||||
- Repro/diagnostics needed (max 3)
|
||||
- Fix approach (max 4 steps)
|
||||
- Verification (max 3)
|
||||
|
||||
Feature:
|
||||
- Summary (1-2 sentences)
|
||||
- Requirements (max 4)
|
||||
- Unknowns/questions (max 4)
|
||||
- Proposed plan (max 5 steps)
|
||||
- Verification (max 3)
|
||||
|
||||
Question/Support:
|
||||
- Summary (1-2 sentences)
|
||||
- Answer/guidance (max 6 lines)
|
||||
- Missing info (max 4)
|
||||
|
||||
Do not implement changes until I confirm; end with: "Next actions: <1 sentence>".`;
|
||||
const visiblePromptText = await renderMagicPrompt('github.issue.review.visible', {
|
||||
issue_number: String(args.issue.number),
|
||||
});
|
||||
const instructionsText = await renderMagicPrompt('github.issue.review.instructions');
|
||||
const contextText = buildIssueContextText({
|
||||
repo: issueRes.repo,
|
||||
issue: issueRes.issue,
|
||||
@@ -619,50 +588,10 @@ Do not implement changes until I confirm; end with: "Next actions: <1 sentence>"
|
||||
throw new Error('Failed to load PR context');
|
||||
}
|
||||
|
||||
const visiblePromptText = `Review this pull request #${args.pr.number} using the provided PR context`;
|
||||
const instructionsText = `Before reporting issues:
|
||||
- First identify the PR intent (what it's trying to achieve) from title/body/diff, then evaluate whether the implementation matches that intent; call out missing pieces, incorrect behavior vs intent, and scope creep.
|
||||
- Gather any needed repository context (code, config, docs) to validate assumptions.
|
||||
- No speculation: if something is unclear or cannot be verified, say what's missing and ask for it instead of guessing.
|
||||
|
||||
Output rules:
|
||||
- Start with a 1-2 sentence summary.
|
||||
- Provide a single concise PR review comment.
|
||||
- No emojis. No code snippets. No fenced blocks.
|
||||
- Short inline code identifiers allowed, but no snippets or fenced blocks.
|
||||
- Reference evidence with file paths and line ranges (e.g., path/to/file.ts:120-138). If exact lines aren't available, cite the file and say "approx" + why.
|
||||
- Keep the entire comment under ~300 words.
|
||||
|
||||
Report:
|
||||
- Must-fix issues (blocking)-brief why and a one-line action each.
|
||||
- Nice-to-have improvements (optional)-brief why and a one-line action each.
|
||||
|
||||
Quality & safety (general):
|
||||
- Call out correctness risks, edge cases, performance regressions, security/privacy concerns, and backwards-compatibility risks.
|
||||
- Call out missing tests/verification steps and suggest the minimal validation needed.
|
||||
- Note readability/maintainability issues when they materially affect future changes.
|
||||
|
||||
Applicability (only if relevant):
|
||||
- If changes affect multiple components/targets/environments (e.g., client/server, OSs, deployments), state what is affected vs not, and why.
|
||||
|
||||
Architecture:
|
||||
- Call out breakages, missing implementations across modules/targets, boundary violations, and cross-cutting concerns (errors, logging/observability, accessibility).
|
||||
|
||||
Precedence:
|
||||
- If local precedent conflicts with best practices, state it and suggest a follow-up task.
|
||||
|
||||
Do not implement changes until I confirm; end with a short "Next actions" sentence describing the recommended plan.
|
||||
|
||||
Format exactly:
|
||||
Must-fix:
|
||||
- <issue> - <brief why> - <file:line-range> - Action: <one-line action>
|
||||
Nice-to-have:
|
||||
- <issue> - <brief why> - <file:line-range> - Action: <one-line action>
|
||||
If no issues, write:
|
||||
Must-fix:
|
||||
- None
|
||||
Nice-to-have:
|
||||
- None`;
|
||||
const visiblePromptText = await renderMagicPrompt('github.pr.review.visible', {
|
||||
pr_number: String(args.pr.number),
|
||||
});
|
||||
const instructionsText = await renderMagicPrompt('github.pr.review.instructions');
|
||||
const contextText = buildPullRequestContextText(prContext);
|
||||
|
||||
await opencodeClient.sendMessage({
|
||||
|
||||
@@ -9,6 +9,7 @@ import { useSkillsStore } from '@/stores/useSkillsStore';
|
||||
import { useSkillsCatalogStore } from '@/stores/useSkillsCatalogStore';
|
||||
import {
|
||||
RiAiAgentLine,
|
||||
RiAiGenerate2,
|
||||
RiArrowLeftSLine,
|
||||
RiBarChart2Line,
|
||||
RiBookLine,
|
||||
@@ -22,9 +23,9 @@ import {
|
||||
RiGitBranchLine,
|
||||
RiGlobalLine,
|
||||
RiMicLine,
|
||||
RiListUnordered,
|
||||
RiNotification3Line,
|
||||
RiPaletteLine,
|
||||
RiListUnordered,
|
||||
RiRobot2Line,
|
||||
RiRestartLine,
|
||||
RiServerLine,
|
||||
@@ -48,6 +49,8 @@ import { ProvidersSidebar } from '@/components/sections/providers/ProvidersSideb
|
||||
import { ProvidersPage } from '@/components/sections/providers/ProvidersPage';
|
||||
import { UsageSidebar } from '@/components/sections/usage/UsageSidebar';
|
||||
import { UsagePage } from '@/components/sections/usage/UsagePage';
|
||||
import { MagicPromptsSidebar } from '@/components/sections/magic-prompts/MagicPromptsSidebar';
|
||||
import { MagicPromptsPage } from '@/components/sections/magic-prompts/MagicPromptsPage';
|
||||
import { GitPage } from '@/components/sections/git-identities/GitPage';
|
||||
import type { OpenChamberSection } from '@/components/sections/openchamber/types';
|
||||
import { OpenChamberPage } from '@/components/sections/openchamber/OpenChamberPage';
|
||||
@@ -86,6 +89,7 @@ const pageOrder: SettingsPageSlug[] = [
|
||||
'sessions',
|
||||
'shortcuts',
|
||||
'git',
|
||||
'magic-prompts',
|
||||
'projects',
|
||||
'remote-instances',
|
||||
'agents',
|
||||
@@ -122,6 +126,8 @@ function getSettingsNavIcon(slug: SettingsPageSlug): React.ComponentType<{ class
|
||||
return RiPaletteLine;
|
||||
case 'chat':
|
||||
return RiChatAi3Line;
|
||||
case 'magic-prompts':
|
||||
return RiAiGenerate2;
|
||||
case 'notifications':
|
||||
return RiNotification3Line;
|
||||
case 'shortcuts':
|
||||
@@ -404,6 +410,8 @@ export const SettingsView: React.FC<SettingsViewProps> = ({ onClose, forceMobile
|
||||
return <ProvidersSidebar onItemSelect={opts.onItemSelect} />;
|
||||
case 'usage':
|
||||
return <UsageSidebar onItemSelect={opts.onItemSelect} />;
|
||||
case 'magic-prompts':
|
||||
return <MagicPromptsSidebar onItemSelect={opts.onItemSelect} />;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
@@ -436,6 +444,8 @@ export const SettingsView: React.FC<SettingsViewProps> = ({ onClose, forceMobile
|
||||
return <ProvidersPage />;
|
||||
case 'usage':
|
||||
return <UsagePage />;
|
||||
case 'magic-prompts':
|
||||
return <MagicPromptsPage />;
|
||||
case 'git':
|
||||
return <GitPage />;
|
||||
case 'appearance':
|
||||
|
||||
@@ -14,6 +14,7 @@ import { useInputStore } from '@/sync/input-store';
|
||||
import { useUIStore } from '@/stores/useUIStore';
|
||||
import { toast } from '@/components/ui';
|
||||
import { getConflictDetails, type MergeConflictDetails } from '@/lib/gitApi';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
|
||||
interface ConflictDialogProps {
|
||||
open: boolean;
|
||||
@@ -65,36 +66,29 @@ export const ConflictDialog: React.FC<ConflictDialogProps> = ({
|
||||
});
|
||||
}, [open, directory]);
|
||||
|
||||
const buildConflictContext = React.useCallback((): {
|
||||
const buildConflictContext = React.useCallback(async (): Promise<{
|
||||
visibleText: string;
|
||||
instructionsText: string;
|
||||
payloadText: string;
|
||||
} | null => {
|
||||
} | null> => {
|
||||
if (!conflictDetails) return null;
|
||||
|
||||
const operationLabel = operation === 'merge' ? 'merge' : 'rebase';
|
||||
const headRef = conflictDetails.headInfo || (operation === 'merge' ? 'MERGE_HEAD' : 'REBASE_HEAD');
|
||||
const continueCmd = operation === 'merge' ? 'git commit --no-edit' : 'git rebase --continue';
|
||||
|
||||
const visibleText = `Resolve ${operationLabel} conflicts, stage the resolved files, and complete the ${operationLabel}. Preserve the intent of changes from ${headRef}.`;
|
||||
const visibleText = await renderMagicPrompt('git.conflict.resolve.visible', {
|
||||
operation_label: operationLabel,
|
||||
head_ref: headRef,
|
||||
});
|
||||
|
||||
const instructionsText = `Git ${operationLabel} operation is in progress with conflicts.
|
||||
- Directory: ${directory}
|
||||
- Operation: ${operation}
|
||||
- Head Info: ${conflictDetails.headInfo || 'N/A'}
|
||||
|
||||
Required steps:
|
||||
1. Read each conflicted file to understand the conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...)
|
||||
2. Edit each file to resolve conflicts by choosing the correct code or merging both changes appropriately
|
||||
3. Stage all resolved files with: git add <file>
|
||||
4. Complete the ${operationLabel} with: ${continueCmd}
|
||||
|
||||
Important:
|
||||
- Remove ALL conflict markers from files (<<<<<<< HEAD, =======, >>>>>>>)
|
||||
- Make sure the final code is syntactically correct and preserves intent from both sides
|
||||
- Do not leave any files with unresolved conflict markers
|
||||
- After completing all steps, confirm the ${operationLabel} was successful
|
||||
`;
|
||||
const instructionsText = await renderMagicPrompt('git.conflict.resolve.instructions', {
|
||||
operation_label: operationLabel,
|
||||
directory,
|
||||
operation,
|
||||
head_info: conflictDetails.headInfo || 'N/A',
|
||||
continue_cmd: continueCmd,
|
||||
});
|
||||
|
||||
const payloadText = `${operationLabel} conflict context (JSON)\n${JSON.stringify(
|
||||
{
|
||||
@@ -122,8 +116,8 @@ Important:
|
||||
onOpenChange(false);
|
||||
};
|
||||
|
||||
const handleResolveInCurrentSession = () => {
|
||||
const context = buildConflictContext();
|
||||
const handleResolveInCurrentSession = async () => {
|
||||
const context = await buildConflictContext();
|
||||
if (!context) {
|
||||
toast.error('No conflict details available');
|
||||
return;
|
||||
@@ -146,8 +140,8 @@ Important:
|
||||
onOpenChange(false);
|
||||
};
|
||||
|
||||
const handleResolveInNewSession = () => {
|
||||
const context = buildConflictContext();
|
||||
const handleResolveInNewSession = async () => {
|
||||
const context = await buildConflictContext();
|
||||
if (!context) {
|
||||
toast.error('No conflict details available');
|
||||
return;
|
||||
@@ -234,7 +228,9 @@ Important:
|
||||
<div className="flex flex-col gap-2 pt-2">
|
||||
<Button
|
||||
variant="default"
|
||||
onClick={handleResolveInNewSession}
|
||||
onClick={() => {
|
||||
void handleResolveInNewSession();
|
||||
}}
|
||||
disabled={isLoading || !conflictDetails}
|
||||
className="w-full gap-2"
|
||||
>
|
||||
|
||||
@@ -19,6 +19,7 @@ import { useSessionUIStore } from '@/sync/session-ui-store';
|
||||
import { useInputStore } from '@/sync/input-store';
|
||||
import { useUIStore } from '@/stores/useUIStore';
|
||||
import { execCommand } from '@/lib/execCommands';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
import {
|
||||
abortIntegrate,
|
||||
computeIntegratePlan,
|
||||
@@ -184,29 +185,18 @@ export const IntegrateCommitsSection: React.FC<{
|
||||
|
||||
const openNewSessionDraft = useSessionUIStore((s) => s.openNewSessionDraft);
|
||||
|
||||
const buildConflictContext = React.useCallback((payload: { state: IntegrateInProgress; details: IntegrateConflictDetails }) => {
|
||||
const visibleText = `Resolve cherry-pick conflicts, stage the resolved files, and continue the cherry-pick. Keep intent of commit ${payload.state.currentCommit} onto branch ${payload.state.targetBranch}.`;
|
||||
const instructionsText = `Worktree commit integration (cherry-pick) is in progress with conflicts.
|
||||
- Repo root: ${payload.state.repoRoot}
|
||||
- Temp target worktree: ${payload.state.tempWorktreePath}
|
||||
- Source branch: ${payload.state.sourceBranch}
|
||||
- Target branch: ${payload.state.targetBranch}
|
||||
- Current commit: ${payload.state.currentCommit}
|
||||
|
||||
Required steps:
|
||||
1. Read each conflicted file in the temp worktree to understand the conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...)
|
||||
2. Edit each file to resolve conflicts by choosing the correct code or merging both changes appropriately
|
||||
3. Stage all resolved files with: git add <file>
|
||||
4. Complete the cherry-pick with: git cherry-pick --continue
|
||||
|
||||
Important:
|
||||
- Work inside the temp worktree directory: ${payload.state.tempWorktreePath}
|
||||
- Remove ALL conflict markers from files (<<<<<<< HEAD, =======, >>>>>>>)
|
||||
- Preserve the intent of the commit being applied
|
||||
- Make sure the final code is syntactically correct
|
||||
- Do not leave any files with unresolved conflict markers
|
||||
- After completing all steps, confirm the cherry-pick was successful
|
||||
`;
|
||||
const buildConflictContext = React.useCallback(async (payload: { state: IntegrateInProgress; details: IntegrateConflictDetails }) => {
|
||||
const visibleText = await renderMagicPrompt('git.integrate.cherrypick.resolve.visible', {
|
||||
current_commit: payload.state.currentCommit,
|
||||
target_branch: payload.state.targetBranch,
|
||||
});
|
||||
const instructionsText = await renderMagicPrompt('git.integrate.cherrypick.resolve.instructions', {
|
||||
repo_root: payload.state.repoRoot,
|
||||
temp_worktree_path: payload.state.tempWorktreePath,
|
||||
source_branch: payload.state.sourceBranch,
|
||||
target_branch: payload.state.targetBranch,
|
||||
current_commit: payload.state.currentCommit,
|
||||
});
|
||||
const payloadText = `Cherry-pick conflict context (JSON)\n${JSON.stringify({
|
||||
repoRoot: payload.state.repoRoot,
|
||||
tempWorktreePath: payload.state.tempWorktreePath,
|
||||
@@ -227,11 +217,11 @@ Important:
|
||||
const setPendingInputText = useInputStore((s) => s.setPendingInputText);
|
||||
const setPendingSyntheticParts = useInputStore((s) => s.setPendingSyntheticParts);
|
||||
|
||||
const handleResolveWithAi = React.useCallback((
|
||||
const handleResolveWithAi = React.useCallback(async (
|
||||
payload: { state: IntegrateInProgress; details: IntegrateConflictDetails },
|
||||
useNewSession: boolean
|
||||
) => {
|
||||
const context = buildConflictContext(payload);
|
||||
const context = await buildConflictContext(payload);
|
||||
|
||||
if (useNewSession) {
|
||||
// Open new session with the conflict context as initial prompt + synthetic parts
|
||||
|
||||
@@ -45,6 +45,7 @@ import {
|
||||
CollapsibleTrigger,
|
||||
} from '@/components/ui/collapsible';
|
||||
import { generatePullRequestDescription } from '@/lib/gitApi';
|
||||
import { renderMagicPrompt } from '@/lib/magicPrompts';
|
||||
import { openExternalUrl } from '@/lib/url';
|
||||
import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
|
||||
import { useDeviceInfo } from '@/lib/device';
|
||||
@@ -831,13 +832,8 @@ export const PullRequestSection: React.FC<{
|
||||
return;
|
||||
}
|
||||
|
||||
const visibleText = 'Review these PR failed checks and propose likely fixes. Do not implement until I confirm.';
|
||||
const instructionsText = `Use the attached checks payload.
|
||||
- Summarize what is failing.
|
||||
- Prioritize check annotations/errors over generic status text.
|
||||
- Identify likely root cause(s).
|
||||
- Propose a minimal fix plan and verification steps.
|
||||
- No speculation: ask for missing info if needed.`;
|
||||
const visibleText = await renderMagicPrompt('github.pr.checks.review.visible');
|
||||
const instructionsText = await renderMagicPrompt('github.pr.checks.review.instructions');
|
||||
const failedAnnotations = failed.flatMap((run) => {
|
||||
const annotations = Array.isArray(run.annotations) ? run.annotations : [];
|
||||
return annotations.map((annotation) => ({
|
||||
@@ -888,12 +884,8 @@ export const PullRequestSection: React.FC<{
|
||||
return;
|
||||
}
|
||||
|
||||
const visibleText = 'Review these PR comments and propose the required changes and next actions. Do not implement until I confirm.';
|
||||
const instructionsText = `Use the attached comments payload.
|
||||
- Identify required vs optional changes.
|
||||
- Call out intent/implementation mismatch if present.
|
||||
- Propose a minimal plan and verification steps.
|
||||
- No speculation: ask for missing info if needed.`;
|
||||
const visibleText = await renderMagicPrompt('github.pr.comments.review.visible');
|
||||
const instructionsText = await renderMagicPrompt('github.pr.comments.review.instructions');
|
||||
const payloadText = `GitHub PR comments (JSON)\n${JSON.stringify({
|
||||
repo: context.repo ?? null,
|
||||
pr: context.pr ?? null,
|
||||
@@ -908,7 +900,7 @@ export const PullRequestSection: React.FC<{
|
||||
}
|
||||
}, [directory, dispatchSyntheticPrompt, github, pr, resolveChatDispatchTarget, setActiveMainTab]);
|
||||
|
||||
const sendSingleCommentToChat = React.useCallback((comment: TimelineCommentItem) => {
|
||||
const sendSingleCommentToChat = React.useCallback(async (comment: TimelineCommentItem) => {
|
||||
setCommentsDialogOpen(false);
|
||||
setActiveMainTab('chat');
|
||||
|
||||
@@ -917,12 +909,8 @@ export const PullRequestSection: React.FC<{
|
||||
return;
|
||||
}
|
||||
|
||||
const visibleText = 'Address this comment from PR and propose required changes. Do not implement until I confirm.';
|
||||
const instructionsText = `Use the attached single-comment payload.
|
||||
- Explain what the reviewer is asking for.
|
||||
- Identify exact code areas likely impacted.
|
||||
- Propose a minimal implementation plan and verification steps.
|
||||
- Call out ambiguity and ask focused follow-up questions if needed.`;
|
||||
const visibleText = await renderMagicPrompt('github.pr.comment.single.visible');
|
||||
const instructionsText = await renderMagicPrompt('github.pr.comment.single.instructions');
|
||||
const payloadText = `GitHub PR comment (JSON)\n${JSON.stringify({
|
||||
repo: commentsDetails?.repo ?? null,
|
||||
pr: commentsDetails?.pr ?? pr ?? null,
|
||||
@@ -1947,7 +1935,9 @@ export const PullRequestSection: React.FC<{
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="h-6 px-0 has-[>svg]:px-0 sm:px-2 sm:has-[>svg]:px-2.5 text-[var(--status-success)] hover:bg-[var(--status-success-background)] hover:text-[var(--status-success)] justify-start"
|
||||
onClick={() => sendSingleCommentToChat(comment)}
|
||||
onClick={() => {
|
||||
void sendSingleCommentToChat(comment);
|
||||
}}
|
||||
aria-label="Send this comment to agent"
|
||||
>
|
||||
<RiAiGenerate2 className="size-3.5" />
|
||||
|
||||
Reference in New Issue
Block a user