opencode-magi 0.0.0-dev-20260520165753 → 0.0.0-dev-20260520173258

package/dist/orchestrator/triage.js

@@ -3,33 +3,27 @@ import { dirname, join } from "node:path";
 import { issueRunOutputDir } from "../config/output";
 import { worktreeBaseDir } from "../config/worktree";
 import { assignIssue, closeIssue, closePullRequest, configureGitIdentity, createPullRequest, fetchIssue, fetchIssueComments, fetchRelatedPullRequests, postIssueComment, pushHead, removeIssueLabels, removeWorktree, searchDuplicateIssues, shellQuote, updateIssueComment, } from "../github/commands";
-import { composeTriageBugPrompt, composeTriageActionPrompt, composeTriageCommentClassificationPrompt, composeTriageCommentPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageFeaturePrompt, composeTriageKindPrompt, composeTriageQuestionPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
-import { parseTriageActionOutput, parseTriageBinaryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, parseTriageFinalOutput, parseTriageKindOutput, } from "../prompts/output";
+import { composeTriageAcceptancePrompt, composeTriageActionPrompt, composeTriageCategoryPrompt, composeTriageCommentClassificationPrompt, composeTriageCommentPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageQuestionPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
+import { parseTriageActionOutput, parseTriageBinaryOutput, parseTriageCategoryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, } from "../prompts/output";
 import { aggregateStringMajority, majorityThreshold } from "./majority";
 import { runModelText, runModelWithRepair } from "./model";
 const MARKER_PREFIX = "opencode-magi:triage";
-const KIND_VOTES = ["ASK", "BUG", "FEATURE"];
 const BINARY_VOTES = ["ASK", "NO", "YES"];
 const DUPLICATE_VOTES = ["DUPLICATE", "NOT_DUPLICATE"];
 const EXISTING_PR_VOTES = [
     "RELATED_PR_DOES_NOT_HANDLE_ISSUE",
     "RELATED_PR_HANDLES_ISSUE",
 ];
-const FINAL_VOTES = [
-    "ASK",
-    "BUG_ACCEPTED",
-    "BUG_REJECTED",
-    "DUPLICATE",
-    "FEATURE_ACCEPTED",
-    "FEATURE_REJECTED",
-];
 const RECONSIDERATION_CLASSES = new Set([
     "CLARIFICATION",
     "NEW_EVIDENCE",
     "OBJECTION",
 ]);
 function marker(input) {
-    return `<!-- ${MARKER_PREFIX} v=1 issue=${input.issue} result=${input.result} action=${input.action} checkpoint=${input.checkpoint ?? "pending"} pr=${input.pr ?? "none"} processed=${(input.processed ?? []).join(",")} -->`;
+    const askReason = input.decision.askReason
+        ? ` askReason=${input.decision.askReason}`
+        : "";
+    return `<!-- ${MARKER_PREFIX} v=2 issue=${input.issue} category=${input.decision.category ?? "none"} disposition=${input.decision.disposition}${askReason} action=${input.action} checkpoint=${input.checkpoint ?? "pending"} pr=${input.pr ?? "none"} processed=${(input.processed ?? []).join(",")} -->`;
 }
 export function parseTriageMarker(body) {
     const match = body.match(/<!--\s*opencode-magi:triage\s+([^>]+?)\s*-->/);
@@ -45,13 +39,26 @@ export function parseTriageMarker(body) {
             : [part.slice(0, index), part.slice(index + 1)];
     }));
     const version = Number(entries.v);
-    if (version !== 1)
+    if (version !== 1 && version !== 2)
         return undefined;
     return {
         action: entries.action,
+        askReason: entries.askReason === "acceptance_unclear" ||
+            entries.askReason === "category_unclear"
+            ? entries.askReason
+            : undefined,
+        category: entries.category === "none" ? null : entries.category || undefined,
         checkpoint: entries.checkpoint && Number.isFinite(Number(entries.checkpoint))
             ? Number(entries.checkpoint)
             : undefined,
+        disposition: entries.disposition === "accepted" ||
+            entries.disposition === "rejected" ||
+            entries.disposition === "ask" ||
+            entries.disposition === "duplicate" ||
+            entries.disposition === "clear_only" ||
+            entries.disposition === "failed"
+            ? entries.disposition
+            : undefined,
         issue: entries.issue ? Number(entries.issue) : undefined,
         pr: entries.pr,
         processed: entries.processed
@@ -69,17 +76,15 @@ function existingClearLabels(issue, labels) {
     const existing = new Set(issue.labels.map((label) => label.toLowerCase()));
     return labels.filter((label) => existing.has(label.toLowerCase()));
 }
-export function resolveIssueKind(issue, repository) {
+export function resolveIssueCategory(issue, repository) {
     const triage = repository.triage;
     if (!triage)
         throw new Error("triage configuration is required");
-    const bug = labelsContain(issue.labels, triage.kind.bug.label) ||
-        (issue.type != null && triage.kind.bug.type.includes(issue.type));
-    const feature = labelsContain(issue.labels, triage.kind.feature.label) ||
-        (issue.type != null && triage.kind.feature.type.includes(issue.type));
-    if (bug === feature)
+    const matches = triage.categories.filter((category) => labelsContain(issue.labels, category.labels) ||
+        (issue.type != null && category.types.includes(issue.type)));
+    if (matches.length !== 1)
         return undefined;
-    return bug ? "BUG" : "FEATURE";
+    return matches[0].id;
 }
 function issueContext(input) {
     return JSON.stringify({
@@ -288,22 +293,42 @@ export function eligibleMentionReplies(input) {
     });
 }
 function finalResultFromMarker(marker) {
-    if (marker.result === "RESOLVED_BY_MERGED_PR")
-        return "BUG_ACCEPTED";
-    return isFinalResult(marker.result) ? marker.result : "FAILED";
-}
-function isFinalResult(value) {
-    return (value === "ASK" ||
-        value === "BUG_ACCEPTED" ||
-        value === "BUG_REJECTED" ||
-        value === "CLEAR_ONLY" ||
-        value === "DUPLICATE" ||
-        value === "FEATURE_ACCEPTED" ||
-        value === "FEATURE_REJECTED" ||
-        value === "FAILED");
+    if (marker.disposition) {
+        return {
+            askReason: marker.askReason,
+            category: marker.category ?? null,
+            disposition: marker.disposition,
+        };
+    }
+    switch (marker.result) {
+        case "BUG_ACCEPTED":
+        case "RESOLVED_BY_MERGED_PR":
+            return { category: "bug", disposition: "accepted" };
+        case "BUG_REJECTED":
+            return { category: "bug", disposition: "rejected" };
+        case "FEATURE_ACCEPTED":
+            return { category: "feature", disposition: "accepted" };
+        case "FEATURE_REJECTED":
+            return { category: "feature", disposition: "rejected" };
+        case "ASK":
+            return {
+                askReason: "acceptance_unclear",
+                category: null,
+                disposition: "ask",
+            };
+        case "CLEAR_ONLY":
+            return { category: null, disposition: "clear_only" };
+        case "DUPLICATE":
+            return { category: null, disposition: "duplicate" };
+        default:
+            return { category: null, disposition: "failed" };
+    }
+}
+function decisionText(decision) {
+    return JSON.stringify(decision);
 }
 function actionPlan(input) {
-    if (input.result === "CLEAR_ONLY") {
+    if (input.result.disposition === "clear_only") {
         return {
             action: "CLEAR_ONLY",
             allowedActions: ["CLEAR_ONLY"],
@@ -313,7 +338,7 @@ function actionPlan(input) {
             postComment: false,
         };
     }
-    if (input.result === "ASK") {
+    if (input.result.disposition === "ask") {
         return {
             action: "ASK",
             allowedActions: ["ASK"],
@@ -324,11 +349,9 @@ function actionPlan(input) {
         };
     }
     const closeIssue = input.triage.automation.close &&
-        (input.result === "BUG_REJECTED" ||
-            input.result === "DUPLICATE" ||
-            input.result === "FEATURE_REJECTED");
-    const createPr = input.triage.automation.pr &&
-        (input.result === "BUG_ACCEPTED" || input.result === "FEATURE_ACCEPTED");
+        (input.result.disposition === "rejected" ||
+            input.result.disposition === "duplicate");
+    const createPr = input.triage.automation.pr && input.result.disposition === "accepted";
     return {
         action: closeIssue ? "CLOSE" : createPr ? "PR" : "COMMENT",
         allowedActions: [closeIssue ? "CLOSE" : createPr ? "PR" : "COMMENT"],
@@ -428,18 +451,34 @@ async function runReconsiderationVote(input) {
         context: input.context,
         input: input.input,
         outputDir: input.outputDir,
-        parse: parseTriageFinalOutput,
+        parse: parseTriageBinaryOutput,
         phase: "reconsider",
         prompt: composeTriageReconsiderPrompt,
         schemaName: "triage reconsider",
-        votes: FINAL_VOTES,
+        votes: BINARY_VOTES,
     });
 }
 async function composeResultComment(input) {
     const agents = input.input.repository.agents.triage;
     if (!agents?.length)
         throw new Error("triage.agents is required");
-    const prompt = await (input.result === "ASK"
+    if (input.result.disposition === "ask" &&
+        input.result.askReason === "category_unclear") {
+        const language = input.input.repository.language?.toLowerCase() ?? "";
+        const body = language.includes("ja") || language.includes("japanese")
+            ? `@${input.issue.author} 現在の説明だけでは、何をすべきか判断できません。\n\n期待する動作、実際の動作、必要な理由、関連する例・ログ・スクリーンショットなどを追記してください。`
+            : `@${input.issue.author} I can't determine what should be done from the current description.\n\nPlease add more detail, such as the expected behavior, the actual behavior, the reason this is needed, or any relevant examples, logs, or screenshots.`;
+        const comment = `${body}\n\n${marker({
+            action: input.action,
+            checkpoint: "pending",
+            decision: input.result,
+            issue: input.issue.number,
+            processed: input.processed,
+        })}`;
+        await writeFile(join(input.outputDir, "comment.md"), `${comment}\n`);
+        return comment;
+    }
+    const prompt = await (input.result.disposition === "ask"
         ? composeTriageQuestionPrompt
         : composeTriageCommentPrompt)({
         author: input.issue.author,
@@ -461,9 +500,9 @@ async function composeResultComment(input) {
         `\n\n${marker({
             action: input.action,
             checkpoint: "pending",
+            decision: input.result,
             issue: input.issue.number,
             processed: input.processed,
-            result: input.result,
         })}`;
     await writeFile(join(input.outputDir, "comment.md"), `${comment}\n`);
     return comment;
@@ -486,10 +525,10 @@ async function persistProcessedMarker(input) {
     const updatedMarker = marker({
         action: input.marker.action ?? input.marker.result ?? "ASK",
         checkpoint: markerCheckpoint(input.marker),
+        decision: finalResultFromMarker(input.marker),
         issue: input.issue.number,
         pr: input.pr ?? markerPr(input.marker),
         processed: input.processed,
-        result: input.marker.result ?? "ASK",
     });
     const body = previousComment.body.replace(/<!--\s*opencode-magi:triage\s+[^>]+?\s*-->/, updatedMarker);
     if (body === previousComment.body)
@@ -516,7 +555,7 @@ async function finishWithResult(input) {
     const comment = plan.postComment
         ? await composeResultComment({
             action: plan.action,
-            context: `Result: ${input.result}\nAction: ${plan.action}\n\n${input.context}`,
+            context: `Result: ${decisionText(input.result)}\nAction: ${plan.action}\n\n${input.context}`,
             input: input.input,
             issue: input.issue,
             outputDir: input.outputDir,
@@ -576,7 +615,7 @@ async function finishWithResult(input) {
         }
     }
     const report = [
-        `Magi triage result for #${input.issue.number}: ${input.result}`,
+        `Magi triage result for #${input.issue.number}: ${decisionText(input.result)}`,
         prUrl ? `Created PR: ${prUrl}` : undefined,
         input.input.dryRun
             ? "Dry run: no GitHub mutations were performed."
@@ -690,7 +729,12 @@ export async function runTriage(input) {
     if (block) {
         const report = `Magi triage blocked for #${input.issue}: ${block}`;
         await writeFile(join(outputDir, "report.md"), `${report}\n`);
-        return { issue: input.issue, outputDir, report, result: "FAILED" };
+        return {
+            issue: input.issue,
+            outputDir,
+            report,
+            result: { category: null, disposition: "failed" },
+        };
     }
     let context = issueContext({ issue, relationship });
     await writeFile(join(outputDir, "context.md"), `${context}\n`);
@@ -765,8 +809,18 @@ export async function runTriage(input) {
             },
         });
         await writeFile(join(outputDir, "context.md"), `${context}\n`);
+        const vote = await runReconsiderationVote({ context, input, outputDir });
+        const previous = finalResultFromMarker(relationship.previousMarker);
         result =
-            (await runReconsiderationVote({ context, input, outputDir })) ?? "ASK";
+            vote === "YES"
+                ? { category: previous.category, disposition: "accepted" }
+                : vote === "NO"
+                    ? { category: previous.category, disposition: "rejected" }
+                    : {
+                        askReason: "acceptance_unclear",
+                        category: previous.category,
+                        disposition: "ask",
+                    };
     }
     if (!result && relationship.relatedPullRequests.length) {
         const vote = await runPhaseVote({
@@ -782,6 +836,10 @@ export async function runTriage(input) {
         if (vote === "RELATED_PR_HANDLES_ISSUE") {
             const merged = relationship.relatedPullRequests.some((pr) => pr.state === "MERGED");
             if (merged && triage.automation.close) {
+                const relatedPrDecision = {
+                    category: resolveIssueCategory(issue, input.repository) ?? null,
+                    disposition: "accepted",
+                };
                 const plan = {
                     action: "CLOSE",
                     allowedActions: ["CLOSE"],
@@ -795,16 +853,16 @@ export async function runTriage(input) {
                     input,
                     outputDir,
                     plan,
-                    result: "BUG_ACCEPTED",
+                    result: relatedPrDecision,
                 });
                 const body = await composeResultComment({
                     action: "CLOSE",
-                    context: `Result: BUG_ACCEPTED\nAction: CLOSE\n\n${context}`,
+                    context: `Result: ${decisionText(relatedPrDecision)}\nAction: CLOSE\n\n${context}`,
                     input,
                     issue,
                     outputDir,
                     processed,
-                    result: "BUG_ACCEPTED",
+                    result: relatedPrDecision,
                 });
                 if (!input.dryRun) {
                     await postMarkedIssueComment({
@@ -834,7 +892,7 @@ export async function runTriage(input) {
                     issue: issue.number,
                     outputDir,
                     report,
-                    result: "BUG_ACCEPTED",
+                    result: relatedPrDecision,
                 };
             }
             return finishWithResult({
@@ -844,7 +902,7 @@ export async function runTriage(input) {
                 outputDir,
                 processed,
                 relationship,
-                result: "CLEAR_ONLY",
+                result: { category: null, disposition: "clear_only" },
             });
         }
     }
@@ -857,59 +915,60 @@ export async function runTriage(input) {
         });
         if (duplicate) {
             context = `${context}\n\nDuplicate decision: ${JSON.stringify(duplicate)}`;
-            result = "DUPLICATE";
+            result = { category: null, disposition: "duplicate" };
         }
     }
     if (!result) {
-        const resolvedKind = resolveIssueKind(issue, input.repository);
-        await writeJson(join(outputDir, "kind-resolution.json"), {
-            kind: resolvedKind,
-            source: resolvedKind ? "config" : "vote",
+        const resolvedCategory = resolveIssueCategory(issue, input.repository);
+        await writeJson(join(outputDir, "category-resolution.json"), {
+            category: resolvedCategory,
+            source: resolvedCategory ? "config" : "vote",
         });
-        const kind = resolvedKind ??
+        const category = resolvedCategory ??
             (await runPhaseVote({
                 context,
                 input,
                 outputDir,
-                parse: parseTriageKindOutput,
-                phase: "kind",
-                prompt: composeTriageKindPrompt,
-                schemaName: "triage kind",
-                votes: KIND_VOTES,
+                parse: (text) => parseTriageCategoryOutput(text, triage.categories.map((item) => item.id)),
+                phase: "category",
+                prompt: composeTriageCategoryPrompt,
+                schemaName: "triage category",
+                votes: ["ASK", ...triage.categories.map((item) => item.id)],
             })) ??
             "ASK";
-        result = "ASK";
-        if (kind === "BUG") {
-            const vote = await runPhaseVote({
-                context,
-                input,
-                outputDir,
-                parse: parseTriageBinaryOutput,
-                phase: "bug",
-                prompt: composeTriageBugPrompt,
-                schemaName: "triage bug",
-                votes: BINARY_VOTES,
-            });
-            result =
-                vote === "YES" ? "BUG_ACCEPTED" : vote === "NO" ? "BUG_REJECTED" : "ASK";
+        if (category === "ASK") {
+            result = {
+                askReason: "category_unclear",
+                category: null,
+                disposition: "ask",
+            };
         }
-        if (kind === "FEATURE") {
+        else {
+            const categoryConfig = triage.categories.find((item) => item.id === category);
+            const voteContext = JSON.stringify({
+                category: categoryConfig,
+                triageContext: context,
+            }, null, 2);
             const vote = await runPhaseVote({
-                context,
+                context: voteContext,
                 input,
                 outputDir,
                 parse: parseTriageBinaryOutput,
-                phase: "feature",
-                prompt: composeTriageFeaturePrompt,
-                schemaName: "triage feature",
+                phase: "acceptance",
+                prompt: composeTriageAcceptancePrompt,
+                schemaName: "triage acceptance",
                 votes: BINARY_VOTES,
             });
             result =
                 vote === "YES"
-                    ? "FEATURE_ACCEPTED"
+                    ? { category, disposition: "accepted" }
                     : vote === "NO"
-                        ? "FEATURE_REJECTED"
-                        : "ASK";
+                        ? { category, disposition: "rejected" }
+                        : {
+                            askReason: "acceptance_unclear",
+                            category,
+                            disposition: "ask",
+                        };
         }
     }
     return finishWithResult({
@@ -919,6 +978,10 @@ export async function runTriage(input) {
         outputDir,
         processed,
         relationship,
-        result: result ?? "ASK",
+        result: result ?? {
+            askReason: "acceptance_unclear",
+            category: null,
+            disposition: "ask",
+        },
     });
 }

package/dist/prompts/compose.js

@@ -45,6 +45,7 @@ function reviewValues(input) {
         headSha: input.headSha,
         jsonEncodedWorktreePath: JSON.stringify(input.worktreePath),
         pr: String(input.pr),
+        reviewContext: input.reviewContext ?? "",
         worktreePath: input.worktreePath,
     };
 }
@@ -66,9 +67,16 @@ function editValues(input) {
     };
 }
 function triageValues(input) {
+    const categories = input.repository.triage?.categories ?? [];
+    const categoryOptions = categories
+        .map((category) => category.description
+        ? `- ${category.id}: ${category.description}`
+        : `- ${category.id}`)
+        .join("\n");
     return {
         ...repositoryValues(input.repository),
         author: input.author ?? "",
+        categoryOptions,
         context: input.context,
         issue: String(input.issue),
         worktreePath: input.worktreePath ?? "",
@@ -85,6 +93,9 @@ function previousReviewBlock(previousReview) {
         ? `<previous_review>\n${previousReview.trim()}\n</previous_review>`
         : "";
 }
+function reviewContextBlock(reviewContext) {
+    return reviewContext?.trim() ? reviewContext.trim() : "";
+}
 async function reviewGuidelinesBlock(input) {
     const body = (await readOptionalPrompt(input.directory, input.path, input.values)).trim();
     return body ? `<review_guidelines>\n${body}\n</review_guidelines>` : "";
@@ -95,6 +106,9 @@ async function editGuidelinesBlock(input) {
 }
 async function sessionContextBlocks(input) {
     return [
+        input.includeSessionContext
+            ? reviewContextBlock(input.values.reviewContext)
+            : "",
         input.includeSessionContext ? languageBlock(input.repository.language) : "",
         input.includeSessionContext ? personaBlock(input.reviewer.persona) : "",
         input.includeReviewGuidelines
@@ -116,6 +130,7 @@ export async function composeReviewPrompt(input) {
     });
     return [
         task,
+        reviewContextBlock(input.reviewContext),
         languageBlock(input.repository.language),
         personaBlock(input.reviewer.persona),
         await reviewGuidelinesBlock({
@@ -138,6 +153,7 @@ export async function composeRereviewPrompt(input) {
     });
     return [
         task,
+        reviewContextBlock(input.reviewContext),
         input.includeSessionContext === false
             ? ""
             : languageBlock(input.repository.language),
@@ -392,27 +408,23 @@ export async function composeTriageDuplicatePrompt(input) {
         outputContract: triageDuplicateOutputContract,
     });
 }
-export async function composeTriageKindPrompt(input) {
-    return composeTriageVotePrompt({
-        ...input,
-        builtin: "kind",
-        customPath: input.repository.triage?.prompts.kind,
-        outputContract: triageVoteOutputContract('"BUG" | "FEATURE" | "ASK"'),
-    });
-}
-export async function composeTriageBugPrompt(input) {
+export async function composeTriageCategoryPrompt(input) {
+    const categories = input.repository.triage?.categories ?? [];
+    const votes = ["ASK", ...categories.map((category) => category.id)]
+        .map((vote) => JSON.stringify(vote))
+        .join(" | ");
     return composeTriageVotePrompt({
         ...input,
-        builtin: "bug",
-        customPath: input.repository.triage?.prompts.bug,
-        outputContract: triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+        builtin: "category",
+        customPath: input.repository.triage?.prompts.category,
+        outputContract: triageVoteOutputContract(votes),
     });
 }
-export async function composeTriageFeaturePrompt(input) {
+export async function composeTriageAcceptancePrompt(input) {
     return composeTriageVotePrompt({
         ...input,
-        builtin: "feature",
-        customPath: input.repository.triage?.prompts.feature,
+        builtin: "acceptance",
+        customPath: input.repository.triage?.prompts.acceptance,
         outputContract: triageVoteOutputContract('"YES" | "NO" | "ASK"'),
     });
 }
@@ -429,6 +441,6 @@ export async function composeTriageReconsiderPrompt(input) {
         ...input,
         builtin: "reconsider",
         customPath: input.repository.triage?.prompts.reconsider,
-        outputContract: triageVoteOutputContract('"ASK" | "BUG_ACCEPTED" | "BUG_REJECTED" | "DUPLICATE" | "FEATURE_ACCEPTED" | "FEATURE_REJECTED"'),
+        outputContract: triageVoteOutputContract('"YES" | "NO" | "ASK"'),
     });
 }

package/dist/prompts/contracts.js

@@ -15,16 +15,25 @@ The object must match this shape:
       "perspective": "Optional review perspective."
     }
   ],
+  "requirementFindings": [
+    {
+      "issueNumber": 47,
+      "requirement": "Required closing-issue behavior that is missing.",
+      "evidence": "Why the PR does not satisfy the requirement.",
+      "fix": "How to satisfy the requirement."
+    }
+  ],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires an empty findings array.
-- CHANGES_REQUESTED requires at least one finding.
-- CLOSE requires a reason and an empty findings array.
+- MERGE requires empty findings and requirementFindings arrays.
+- CHANGES_REQUESTED requires at least one finding or requirementFinding.
+- CLOSE requires a reason and empty findings and requirementFindings arrays.
 - path must be repository-relative.
 - line and startLine must refer to lines inside the PR diff hunk.
 - Omit startLine for single-line findings.
+- Use requirementFindings for missing closing-issue requirements that do not map cleanly to a diff line.
 </output_contract>`.trim();
 export const rereviewOutputContract = `
 <output_contract>
@@ -36,15 +45,17 @@ The object must match this shape:
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
   "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
+  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires empty followUps and newFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp or newFinding.
-- CLOSE requires a reason and empty followUps and newFindings arrays.
+- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
+- CLOSE requires a reason and empty followUps, newFindings, and requirementFindings arrays.
 - line and startLine must refer to lines inside the latest PR diff hunk.
 - Omit startLine for single-line findings.
+- Use requirementFindings for missing closing-issue requirements that do not map cleanly to a diff line.
 </output_contract>`.trim();
 export const findingValidationOutputContract = `
 <output_contract>
@@ -83,12 +94,13 @@ The object must match this shape:
       "issue": "What is wrong.",
       "fix": "How to fix it."
     }
-  ]
+  ],
+  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
 }
 
 Rules:
-- MERGE requires an empty findings array.
-- CHANGES_REQUESTED requires at least one finding.
+- MERGE requires empty findings and requirementFindings arrays.
+- CHANGES_REQUESTED requires at least one finding or requirementFinding.
 - CLOSE is not allowed in this reconsideration step.
 - Omit startLine for single-line findings.
 </output_contract>`.trim();
@@ -101,12 +113,13 @@ The object must match this shape:
   "verdict": "MERGE" | "CHANGES_REQUESTED",
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
-  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }]
+  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
+  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
 }
 
 Rules:
-- MERGE requires empty followUps and newFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp or newFinding.
+- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
 - CLOSE is not allowed in this reconsideration step.
 - Omit startLine for single-line findings.
 </output_contract>`.trim();
@@ -240,13 +253,12 @@ const outputContractsBySchemaName = {
     "rereview close reconsideration": rereviewCloseReconsiderationOutputContract,
     review: reviewOutputContract,
     "triage action": triageActionOutputContract,
-    "triage bug": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+    "triage acceptance": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+    "triage category": triageVoteOutputContract('"ASK" or one of the configured category IDs'),
     "triage comment classification": triageCommentClassificationOutputContract,
     "triage duplicate": triageDuplicateOutputContract,
     "triage existing PR": triageVoteOutputContract('"RELATED_PR_HANDLES_ISSUE" | "RELATED_PR_DOES_NOT_HANDLE_ISSUE"'),
-    "triage feature": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
-    "triage kind": triageVoteOutputContract('"BUG" | "FEATURE" | "ASK"'),
-    "triage reconsider": triageVoteOutputContract('"ASK" | "BUG_ACCEPTED" | "BUG_REJECTED" | "DUPLICATE" | "FEATURE_ACCEPTED" | "FEATURE_REJECTED"'),
+    "triage reconsider": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
 };
 export function repairPrompt(schemaName) {
     const outputContract = outputContractsBySchemaName[schemaName];