@gitkraken/compose-tools 0.5.0 → 0.7.0

package/dist/tasks/compose-group/prompt.js

@@ -1,4 +1,4 @@
-import{hunkContentForPrompt as e}from"../utils/redact.js";import{groupingResultSchema as t}from"../group/schema.js";import{z as n}from"zod";const r=JSON.stringify(n.toJSONSchema(t),null,2),i=`
+import{assembleHunkPrompt as e}from"../utils/budget.js";import{groupingResultJsonSchema as t}from"../group/schema.js";const n=JSON.stringify(t,null,2),r=`
 In addition to the \`branches\` field, include an \`analysis\` field at the top level:
 
 \`\`\`json
@@ -10,15 +10,12 @@ In addition to the \`branches\` field, include an \`analysis\` field at the top
   "branches": [ ... ]
 }
 \`\`\`
-`,a=`5. Write a full commit message for each commit containing both a summary and a description:
+`,i=`5. Write a full commit message for each commit containing both a summary and a description:
    - **Summary** (first line): concise, 50 chars max, third-person singular present tense ("Fixes", "Adds", "Improves"). This line stands alone as the commit subject.
    - **Blank line**: mandatory separator between summary and description.
    - **Description** (body): one or more lines explaining *why* this change was made, not *what* it does. Focus on motivation, trade-offs, or context a reviewer needs. For non-trivial changes, always include a description — don't leave it at just the summary.
-   - Informal yet professional tone.`;function o(e,t=`branches`,n,r,i){return i?t===`commits`?d(e,n):f(e,n):t===`commits`?s(e,n,r):c(e,n,r)}function s(e,t,n){let o=e?.promptFragment?`5. Write a commit message for each commit following the repository's conventions (see below).
-6. Write a detailed explanation for each commit as if explaining to a reviewer.
-
-${e.promptFragment}`:`${a}
-6. Write a detailed explanation for each commit as if explaining to a reviewer`,s=u(t?.commitGranularity);return`You are an advanced AI programming assistant tasked with analyzing and organizing code changes into commits.
+   - Informal yet professional tone.`,a=`5. Write a concise single-line commit message for each commit — a subject only, no body: 50 chars max, third-person singular present tense ("Fixes", "Adds", "Improves"). This repository's history overwhelmingly uses one-line commit messages, so do not add a description.`;function o(e,t=`branches`,n,r,i){return i?t===`commits`?d(e,n):f(e,n):t===`commits`?s(e,n,r):c(e,n,r)}function s(e,t,o){let s=`${e?.commits.bodyStyle===`minimal`?a:i}
+6. Write a detailed explanation for each commit as if explaining to a reviewer.${e?.promptFragment?`\n\n${e.promptFragment}`:``}`,c=u(t?.commitGranularity);return`You are an advanced AI programming assistant tasked with analyzing and organizing code changes into commits.
 
 ## Critical constraints (output is rejected if violated)
 
@@ -29,37 +26,34 @@ ${e.promptFragment}`:`${a}
 
 Before producing the \`<output>\` tag, do a self-check: count the total number of hunk indices across every commit's \`hunks\` array. That count MUST equal the input hunk count. If it does not match, you have either duplicated or skipped a hunk — find and fix it before outputting.
 
-${n?`## Step 1: Analysis`:`## Step 1: Internal Analysis`}
+${o?`## Step 1: Analysis`:`## Step 1: Internal Analysis`}
 
 Before grouping, analyze the changes to understand:
 - **Concerns** — what distinct themes, features, or purposes exist across the hunks
 - **Dependencies** — which hunks provide things (define functions, types, files) that other hunks consume (import, call, reference)
 - **Ordering constraints** — if hunk A defines something hunk B uses, they should be in the same commit or A's commit should come before B's
 
-${n?"Output this analysis as a JSON field named `analysis` alongside your `branches` field. The `analysis` field should contain:\n- `concerns`: array of strings, each describing a distinct theme or feature in the changes\n- `key_dependencies`: array of strings, each describing an ordering dependency between concerns":`Do NOT output this analysis. Use it internally to inform your grouping decisions.`}
+${o?"Output this analysis as a JSON field named `analysis` alongside your `branches` field. The `analysis` field should contain:\n- `concerns`: array of strings, each describing a distinct theme or feature in the changes\n- `key_dependencies`: array of strings, each describing an ordering dependency between concerns":`Do NOT output this analysis. Use it internally to inform your grouping decisions.`}
 
 ## Step 2: Group hunks into commits
 
 1. Group hunks into logical units that make sense together and can be applied atomically
 2. Ensure each commit is self-contained and atomic
-${o}
 ${s}
+${c}
 
 ## Required Output Format
 
 Output your organization as JSON inside a <output> tag matching this schema:
 
 \`\`\`json
-${r}
+${n}
 \`\`\`
-${n?i:``}
+${o?r:``}
 Wrap all commits in a single branch object with id "default", name "", title "", and description "".
 
-Return only the <output> tag and no other text.`}function c(e,t,n){let o=e?.promptFragment?`5. Write a commit message for each commit following the repository's conventions (see below).
-6. Write a detailed explanation for each commit as if explaining to a reviewer.
-
-${e.promptFragment}`:`${a}
-6. Write a detailed explanation for each commit as if explaining to a reviewer`,s=l(t?.branchSplitting,e),c=u(t?.commitGranularity);return`You are an advanced AI programming assistant tasked with analyzing and organizing code changes into commits and branches.
+Return only the <output> tag and no other text.`}function c(e,t,o){let s=`${e?.commits.bodyStyle===`minimal`?a:i}
+6. Write a detailed explanation for each commit as if explaining to a reviewer.${e?.promptFragment?`\n\n${e.promptFragment}`:``}`,c=l(t?.branchSplitting,e),d=u(t?.commitGranularity);return`You are an advanced AI programming assistant tasked with analyzing and organizing code changes into commits and branches.
 
 ## Critical constraints (output is rejected if violated)
 
@@ -70,7 +64,7 @@ ${e.promptFragment}`:`${a}
 
 Before producing the \`<output>\` tag, do a self-check: count the total number of hunk indices across every commit's \`hunks\` array (across every branch). That count MUST equal the input hunk count. If it does not match, you have either duplicated or skipped a hunk — find and fix it before outputting.
 
-${n?`## Step 1: Analysis`:`## Step 1: Internal Analysis`}
+${o?`## Step 1: Analysis`:`## Step 1: Internal Analysis`}
 
 Before grouping, analyze the changes to understand:
 - **Concerns** — what distinct themes, features, or purposes exist across the hunks
@@ -78,7 +72,7 @@ Before grouping, analyze the changes to understand:
 - **Ordering constraints** — if hunk A defines something hunk B uses, they should be in the same commit or A's commit should come before B's
 - **Merge-order preference** — even if two concerns compile independently, would merging one without the other be confusing or incomplete?
 
-${n?"Output this analysis as a JSON field named `analysis` alongside your `branches` field. The `analysis` field should contain:\n- `concerns`: array of strings, each describing a distinct theme or feature in the changes\n- `key_dependencies`: array of strings, each describing an ordering dependency between concerns":`Do NOT output this analysis. Use it internally to inform your grouping decisions.`}
+${o?"Output this analysis as a JSON field named `analysis` alongside your `branches` field. The `analysis` field should contain:\n- `concerns`: array of strings, each describing a distinct theme or feature in the changes\n- `key_dependencies`: array of strings, each describing an ordering dependency between concerns":`Do NOT output this analysis. Use it internally to inform your grouping decisions.`}
 
 ## Step 2: Organize hunks into commits and branches
 
@@ -91,21 +85,21 @@ Your job has two levels:
 
 1. Group hunks into logical units that make sense together and can be applied atomically
 2. Ensure each commit is self-contained and atomic
-${o}
-${c}
+${s}
+${d}
 
 ### Branch guidelines
 
-${s}
+${c}
 
 ## Required Output Format
 
 Output your organization as JSON inside a <output> tag matching this schema:
 
 \`\`\`json
-${r}
+${n}
 \`\`\`
-${n?i:``}
+${o?r:``}
 Return only the <output> tag and no other text.`}function l(e,t){let n=`Each branch must have a descriptive name, a short PR-style title (under 72 characters, imperative mood), and at least one commit.`,r=`- Each commit belongs to exactly one branch.
 ${t?.promptFragment?`- ${n} Follow the repository's branch naming conventions (see above).`:`- ${n}`}
 - Changes addressing the same pattern across different files belong in ONE branch.`,i=`- Consider merge-order preference, not just code dependencies. Even if two concerns compile independently, they may need to be in the same branch if merging one without the other would be confusing or incomplete.`;return e===`conservative`?`${r}\n- Default to a single branch. Only create multiple branches when concerns are completely unrelated.\n${i}\n- When in doubt, use fewer branches.`:e===`aggressive`?`${r}\n- Create separate branches for each distinct concern.\n${i}\n- Prefer more branches over fewer.`:`${r}\n- Create separate branches when concerns are genuinely independent — meaning a reviewer would gain nothing from seeing them together.\n- Keep changes in the same branch when they form a coherent story.\n${i}\n- When in doubt: "Would a reviewer want to see these together?"`}function u(e){return e===`consolidated`?`
@@ -158,11 +152,11 @@ JSON inside <output> tags. Each branch needs a unique ID and non-empty name.
 
 CRITICAL: Every hunk index must appear exactly once across all commits in all branches. Every commit must contain at least one hunk. Missing hunks, duplicate hunks, or empty commits will fail validation. Each branch must have a unique ID and non-empty name.
 
-Return only the <output> tag and no other text.`}function p(t){let{hunks:n,commitMessages:r,commitOrder:i,branchName:a,baseBranch:o,issueUrl:s,pullRequestUrl:c,instructions:l,condensed:u,redactHunkContent:d}=t,f=JSON.stringify(u?n.map(e=>({index:e.index,fileName:e.fileName,hunkHeader:e.hunkHeader,additions:e.additions,deletions:e.deletions,...e.isBinary?{isBinary:!0}:{},...e.isRename?{isRename:!0}:{},...e.originalFileName?{originalFileName:e.originalFileName}:{}})):n.map(t=>({index:t.index,fileName:t.fileName,hunkHeader:t.hunkHeader,content:e(t,d),...t.isBinary?{isBinary:!0}:{},...t.isRename?{isRename:!0}:{},...t.originalFileName?{originalFileName:t.originalFileName}:{}}))),p=`Organize these ${n.length} code hunks (indices 0 to ${n.length-1}) into commits. Every index must appear exactly once.
+Return only the <output> tag and no other text.`}function p(t){let{hunks:n,commitMessages:r,commitOrder:i,branchName:a,baseBranch:o,issueUrl:s,pullRequestUrl:c,instructions:l,condensed:u,redactHunkContent:d,inputTokenBudget:f,systemPromptChars:p,onBudgetReduction:m}=t,{prompt:h,hunksCondensedForBudget:g}=e({hunks:n,assemble:e=>{let t=`Organize these ${n.length} code hunks (indices 0 to ${n.length-1}) into commits. Every index must appear exactly once.
 
 <hunks>
-${f}
-</hunks>`,m=[];return a&&m.push(`Branch: ${a}`),o&&m.push(`Base: ${o}`),s&&m.push(`Issue: ${s}`),c&&m.push(`PR: ${c}`),m.length>0&&(p+=`\n\nContext:\n${m.join(`
-`)}`),r?.length&&(p+=`\n\nOriginal commit messages (match their style):\n<commit_messages>\n${JSON.stringify(r)}\n</commit_messages>`),i?.length&&(p+=`\n\nOriginal commit order:\n${JSON.stringify(i)}`),l&&(p+=`\n\nAdditional instructions:\n${l}`),p+=`
+${e}
+</hunks>`,u=[];return a&&u.push(`Branch: ${a}`),o&&u.push(`Base: ${o}`),s&&u.push(`Issue: ${s}`),c&&u.push(`PR: ${c}`),u.length>0&&(t+=`\n\nContext:\n${u.join(`
+`)}`),r?.length&&(t+=`\n\nOriginal commit messages (match their style):\n<commit_messages>\n${JSON.stringify(r)}\n</commit_messages>`),i?.length&&(t+=`\n\nOriginal commit order:\n${JSON.stringify(i)}`),l&&(t+=`\n\nAdditional instructions:\n${l}`),t+=`
 
-Return only the <output> tag and no other text.`,p}export{o as buildComposeGroupSystemPrompt,p as buildComposeGroupUserPrompt};
+Return only the <output> tag and no other text.`,t},condensed:u,redactHunkContent:d,inputTokenBudget:f,systemPromptChars:p});return m?.(g),h}export{o as buildComposeGroupSystemPrompt,p as buildComposeGroupUserPrompt};

package/dist/tasks/compose-group/types.d.ts

@@ -40,6 +40,11 @@ interface ComposeGroupInput {
   condensed?: boolean;
   /** No-op when `condensed: true`. See {@link RedactHunkContent}. */
   redactHunkContent?: RedactHunkContent;
+  /**
+   * Input-token ceiling. When exceeded, hunks are condensed to metadata biggest-first;
+   * throws `DiffTooLargeError` if they still cannot fit. Defaults to `DEFAULT_INPUT_TOKEN_BUDGET`.
+   */
+  inputTokenBudget?: number;
   model: AiModelPort;
   /** Prior session to resume from. When `completedSteps.composeGroup` is present, skip the AI call. */
   session?: ComposeSession;

package/dist/tasks/group/group.js

@@ -1 +1 @@
-import{TaskInputError as e}from"../../errors/task.js";import{runAiLoop as t}from"../ai-loop.js";import{applyUserPromptOverride as n}from"../types.js";import{validateGroupResponse as r}from"./validator.js";import{buildGroupContinuationPrompt as i,buildGroupSystemPrompt as a,buildGroupUserPrompt as o}from"./prompt.js";async function s(s){let c=s.hunks,l=s.mode??`branches`;if((!c||c.length===0)&&!s.session)throw new e(`No hunks provided: supply 'hunks' or run analyze() first with a session`);if(s.session?.completedSteps.group)return{result:s.session.completedSteps.group,session:s.session,attempts:0,durationMs:0,callIds:[]};let u=n(s.session?i(s,l):o({hunks:c,commitMessages:s.commitMessages,instructions:s.instructions,mode:l,redactHunkContent:s.redactHunkContent}),s.promptOverride),d=c?.length??s.session?.completedSteps.analyze?.hunkAnnotations.length??0;if(d===0)throw new e(`Cannot validate grouping: no hunk count available from input or session`);let f=await t({model:s.model,systemPrompt:s.session?void 0:s.promptOverride?.system??a(s.conventions,l,s.strategy),userPrompt:u,session:s.session,maxRetries:s.maxRetries,maxTokens:s.maxTokens,onProgress:s.onProgress,cancellation:s.cancellation,onBeforeModelCall:s.onBeforeModelCall,onAfterModelCall:s.onAfterModelCall,onBeforePrompt:s.onBeforePrompt,validate:e=>r(e,d,l,s.existingBranchNames),taskName:`group`}),p=s.session?.completedSteps??{},m={...f.session,completedSteps:{...p,group:f.result}};return{result:f.result,session:m,usage:f.usage,attempts:f.attempts,durationMs:f.durationMs,callIds:f.callIds}}export{s as group};
+import{TaskInputError as e}from"../../errors/task.js";import{runAiLoop as t}from"../ai-loop.js";import{applyUserPromptOverride as n}from"../types.js";import{validateGroupResponse as r}from"./validator.js";import{buildGroupContinuationPrompt as i,buildGroupSystemPrompt as a,buildGroupUserPrompt as o}from"./prompt.js";async function s(s){let c=s.hunks,l=s.mode??`branches`;if((!c||c.length===0)&&!s.session)throw new e(`No hunks provided: supply 'hunks' or run analyze() first with a session`);if(s.session?.completedSteps.group)return{result:s.session.completedSteps.group,session:s.session,attempts:0,durationMs:0,callIds:[]};let u=s.session?void 0:s.promptOverride?.system??a(s.conventions,l,s.strategy),d,f=n(s.session?i(s,l):o({hunks:c,commitMessages:s.commitMessages,instructions:s.instructions,mode:l,redactHunkContent:s.redactHunkContent,inputTokenBudget:s.inputTokenBudget,systemPromptChars:u?.length,onBudgetReduction:e=>{d=e}}),s.promptOverride),p=c?.length??s.session?.completedSteps.analyze?.hunkAnnotations.length??0;if(p===0)throw new e(`Cannot validate grouping: no hunk count available from input or session`);let m=await t({model:s.model,systemPrompt:u,userPrompt:f,session:s.session,maxRetries:s.maxRetries,maxTokens:s.maxTokens,onProgress:s.onProgress,cancellation:s.cancellation,onBeforeModelCall:s.onBeforeModelCall,onAfterModelCall:s.onAfterModelCall,onBeforePrompt:s.onBeforePrompt,validate:e=>r(e,p,l,s.existingBranchNames),taskName:`group`}),h=s.session?.completedSteps??{},g={...m.session,completedSteps:{...h,group:m.result}};return{result:m.result,session:g,usage:m.usage,attempts:m.attempts,durationMs:m.durationMs,callIds:m.callIds,hunksCondensedCount:d}}export{s as group};

package/dist/tasks/group/prompt.d.ts

@@ -10,7 +10,10 @@ declare function buildGroupUserPrompt(params: {
   commitMessages?: string[];
   instructions?: string;
   mode?: 'commits' | 'branches';
-  redactHunkContent?: RedactHunkContent;
+  redactHunkContent?: RedactHunkContent; /** Input-token ceiling that triggers progressive hunk reduction. Defaults to the shared budget. */
+  inputTokenBudget?: number; /** Char count of the system prompt, folded into the budget estimate. Defaults to 0. */
+  systemPromptChars?: number; /** Reports how many hunks were condensed for budget (full to condensed), for consumer telemetry. */
+  onBudgetReduction?: (hunksCondensedForBudget: number) => void;
 }): string;
 declare function buildGroupContinuationPrompt(input: GroupInput, mode: 'commits' | 'branches'): string;
 //#endregion

package/dist/tasks/group/prompt.js

@@ -1,8 +1,8 @@
-import{hunkContentForPrompt as e}from"../utils/redact.js";import{groupingResultSchema as t}from"./schema.js";import{z as n}from"zod";const r=JSON.stringify(n.toJSONSchema(t),null,2),i=`5. Write a full commit message for each commit containing both a summary and a description:
+import{assembleHunkPrompt as e}from"../utils/budget.js";import{groupingResultJsonSchema as t}from"./schema.js";const n=JSON.stringify(t,null,2),r=`5. Write a full commit message for each commit containing both a summary and a description:
    - **Summary** (first line): concise, 50 chars max, third-person singular present tense ("Fixes", "Adds", "Improves"). This line stands alone as the commit subject.
    - **Blank line**: mandatory separator between summary and description.
    - **Description** (body): one or more lines explaining *why* this change was made, not *what* it does. Focus on motivation, trade-offs, or context a reviewer needs. For non-trivial changes, always include a description — don't leave it at just the summary.
-   - Informal yet professional tone.`,a=`Each branch must have a descriptive name, a short PR-style title (under 72 characters, imperative mood), and at least one commit.`;function o(e,t=`branches`,n){return t===`commits`?s(e,n):c(e,n)}function s(e,t){return`You are an advanced AI programming assistant tasked with organizing code changes into commits. You will be working with individual code hunks.
+   - Informal yet professional tone.`,i=`5. Write a concise single-line commit message for each commit — a subject only, no body: 50 chars max, third-person singular present tense ("Fixes", "Adds", "Improves"). This repository's history overwhelmingly uses one-line commit messages, so do not add a description.`,a=`Each branch must have a descriptive name, a short PR-style title (under 72 characters, imperative mood), and at least one commit.`;function o(e,t=`branches`,n){return t===`commits`?s(e,n):c(e,n)}function s(e,t){return`You are an advanced AI programming assistant tasked with organizing code changes into commits. You will be working with individual code hunks.
 
 ## Critical constraints (output is rejected if violated)
 
@@ -17,11 +17,8 @@ Before producing the \`<output>\` tag, do a self-check: count the total number o
 
 1. Group hunks into logical units that make sense together and can be applied atomically
 2. Ensure each commit is self-contained and atomic
-${e?.promptFragment?`5. Write a commit message for each commit following the repository's conventions (see below).
-6. Write a detailed explanation for each commit as if explaining to a reviewer.
-
-${e.promptFragment}`:`${i}
-6. Write a detailed explanation for each commit as if explaining to a reviewer`}
+${`${e?.commits.bodyStyle===`minimal`?i:r}
+6. Write a detailed explanation for each commit as if explaining to a reviewer.${e?.promptFragment?`\n\n${e.promptFragment}`:``}`}
 ${u(t?.commitGranularity)}
 
 ## Required Output Format
@@ -29,16 +26,13 @@ ${u(t?.commitGranularity)}
 Output your organization as JSON inside a <output> tag matching this schema:
 
 \`\`\`json
-${r}
+${n}
 \`\`\`
 
 Wrap all commits in a single branch object with id "default", name "", title "", and description "".
 
-Return only the <output> tag and no other text.`}function c(e,t){let n=e?.promptFragment?`5. Write a commit message for each commit following the repository's conventions (see below).
-6. Write a detailed explanation for each commit as if explaining to a reviewer.
-
-${e.promptFragment}`:`${i}
-6. Write a detailed explanation for each commit as if explaining to a reviewer`,a=l(t?.branchSplitting,e);return`You are an advanced AI programming assistant tasked with organizing code changes into commits and branches. You will be working with individual code hunks.
+Return only the <output> tag and no other text.`}function c(e,t){let a=`${e?.commits.bodyStyle===`minimal`?i:r}
+6. Write a detailed explanation for each commit as if explaining to a reviewer.${e?.promptFragment?`\n\n${e.promptFragment}`:``}`,o=l(t?.branchSplitting,e);return`You are an advanced AI programming assistant tasked with organizing code changes into commits and branches. You will be working with individual code hunks.
 
 Your job has two levels:
 
@@ -58,19 +52,19 @@ Before producing the \`<output>\` tag, do a self-check: count the total number o
 
 1. Group hunks into logical units that make sense together and can be applied atomically
 2. Ensure each commit is self-contained and atomic
-${n}
+${a}
 ${u(t?.commitGranularity)}
 
 ## Branch guidelines
 
-${a}
+${o}
 
 ## Required Output Format
 
 Output your organization as JSON inside a <output> tag matching this schema:
 
 \`\`\`json
-${r}
+${n}
 \`\`\`
 
 Return only the <output> tag and no other text.`}function l(e,t){let n=`- Each commit belongs to exactly one branch.
@@ -87,20 +81,20 @@ ${r}
 ${r}
 - When in doubt, consider: "Would a reviewer want to see these changes together, or would separating them make review easier?" If separating helps, split.`}function u(e){return e===`consolidated`?`
 Prefer fewer, larger commits. Combine related changes into a single commit when they serve the same purpose. A commit can touch many files if they are all part of the same logical change.`:e===`granular`?`
-Prefer more, smaller commits. Each distinct change should be its own commit, even if multiple changes serve a similar purpose. Aim for commits that touch as few files as possible.`:``}function d(t){let{hunks:n,commitMessages:r,instructions:i,mode:a=`branches`,redactHunkContent:o}=t,s=JSON.stringify(n.map(t=>({index:t.index,fileName:t.fileName,hunkHeader:t.hunkHeader,content:e(t,o),...t.isBinary?{isBinary:!0}:{},...t.isRename?{isRename:!0}:{},...t.originalFileName?{originalFileName:t.originalFileName}:{}}))),c=`${a===`commits`?`Examine the following ${n.length} code hunks (indices 0 to ${n.length-1}) and organize them into commits. Every index must appear exactly once.`:`Examine the following ${n.length} code hunks (indices 0 to ${n.length-1}) and organize them into commits and branches. Every index must appear exactly once.`}
+Prefer more, smaller commits. Each distinct change should be its own commit, even if multiple changes serve a similar purpose. Aim for commits that touch as few files as possible.`:``}function d(t){let{hunks:n,commitMessages:r,instructions:i,mode:a=`branches`,redactHunkContent:o,inputTokenBudget:s,systemPromptChars:c,onBudgetReduction:l}=t,u=a===`commits`?`Examine the following ${n.length} code hunks (indices 0 to ${n.length-1}) and organize them into commits. Every index must appear exactly once.`:`Examine the following ${n.length} code hunks (indices 0 to ${n.length-1}) and organize them into commits and branches. Every index must appear exactly once.`,{prompt:d,hunksCondensedForBudget:f}=e({hunks:n,assemble:e=>{let t=`${u}
 
 <hunks>
-${s}
-</hunks>`;return r?.length&&(c+=`
+${e}
+</hunks>`;return r?.length&&(t+=`
 
 The following commit messages are from the original commits. Use them to understand intent and match their style:
 
 <commit_messages>
 ${JSON.stringify(r)}
-</commit_messages>`),i&&(c+=`
+</commit_messages>`),i&&(t+=`
 
 Carefully follow these additional instructions, but do not deviate from the output structure:
-${i}`),c+=`\n\n${a===`commits`?`Now organize the hunks into commits.`:`Now organize the hunks into commits and branches.`} Return only the <output> tag and no other text.`,c}function f(e,t){let n;return n=t===`commits`?`Based on your analysis of the changes, now organize the hunks into commits. Each hunk must be assigned to exactly one commit.`:p(e.strategy),e.conventions?.promptFragment&&(n+=`\n\n${e.conventions.promptFragment}`),e.commitMessages?.length&&(n+=`\n\nMatch the style of these original commit messages:\n${JSON.stringify(e.commitMessages)}`),e.instructions&&(n+=`\n\nAdditional instructions:\n${e.instructions}`),t===`commits`?n+=`
+${i}`),t+=`\n\n${a===`commits`?`Now organize the hunks into commits.`:`Now organize the hunks into commits and branches.`} Return only the <output> tag and no other text.`,t},redactHunkContent:o,inputTokenBudget:s,systemPromptChars:c});return l?.(f),d}function f(e,t){let n;return n=t===`commits`?`Based on your analysis of the changes, now organize the hunks into commits. Each hunk must be assigned to exactly one commit.`:p(e.strategy),e.conventions?.promptFragment&&(n+=`\n\n${e.conventions.promptFragment}`),e.commitMessages?.length&&(n+=`\n\nMatch the style of these original commit messages:\n${JSON.stringify(e.commitMessages)}`),e.instructions&&(n+=`\n\nAdditional instructions:\n${e.instructions}`),t===`commits`?n+=`
 
 Return your grouping as JSON inside <output> tags. Wrap all commits in a single branch with id "default", name "", title "", description "":
 <output>

package/dist/tasks/group/schema.d.ts

@@ -1,19 +1,91 @@
-import { z } from "zod";
-
 //#region src/tasks/group/schema.d.ts
-declare const groupingResultSchema: z.ZodObject<{
-  branches: z.ZodArray<z.ZodObject<{
-    id: z.ZodString;
-    name: z.ZodString;
-    title: z.ZodString;
-    description: z.ZodString;
-    commits: z.ZodArray<z.ZodObject<{
-      id: z.ZodString;
-      message: z.ZodString;
-      explanation: z.ZodString;
-      hunks: z.ZodArray<z.ZodNumber>;
-    }, z.core.$strip>>;
-  }, z.core.$strip>>;
-}, z.core.$strip>;
+/** Shape of the LLM JSON output before the validator maps it to public types (`hunks` → `hunkIndices`). */
+interface GroupingWire {
+  branches: GroupingWireBranch[];
+}
+interface GroupingWireBranch {
+  id: string;
+  name: string;
+  title: string;
+  description: string;
+  commits: GroupingWireCommit[];
+}
+interface GroupingWireCommit {
+  id: string;
+  message: string;
+  explanation: string;
+  hunks: number[];
+}
+declare const groupingResultJsonSchema: {
+  readonly $schema: "https://json-schema.org/draft/2020-12/schema";
+  readonly type: "object";
+  readonly properties: {
+    readonly branches: {
+      readonly minItems: 1;
+      readonly type: "array";
+      readonly items: {
+        readonly type: "object";
+        readonly properties: {
+          readonly id: {
+            readonly type: "string";
+            readonly minLength: 1;
+            readonly description: "Unique branch ID";
+          };
+          readonly name: {
+            readonly type: "string";
+            readonly description: "Branch name (empty string for commits-only mode)";
+          };
+          readonly title: {
+            readonly type: "string";
+            readonly description: "Short PR-style title for this branch (under 72 chars, imperative mood, e.g. 'Add user authentication')";
+          };
+          readonly description: {
+            readonly type: "string";
+            readonly description: "What this branch accomplishes";
+          };
+          readonly commits: {
+            readonly minItems: 1;
+            readonly type: "array";
+            readonly items: {
+              readonly type: "object";
+              readonly properties: {
+                readonly id: {
+                  readonly type: "string";
+                  readonly description: "Unique commit ID (e.g. commit-1)";
+                };
+                readonly message: {
+                  readonly type: "string";
+                  readonly description: "Commit message";
+                };
+                readonly explanation: {
+                  readonly type: "string";
+                  readonly description: "Detailed explanation of the commit";
+                };
+                readonly hunks: {
+                  readonly type: "array";
+                  readonly items: {
+                    readonly type: "integer";
+                    readonly minimum: -9007199254740991;
+                    readonly maximum: 9007199254740991;
+                    readonly description: "Hunk index";
+                  };
+                  readonly description: "Hunk indices included in this commit";
+                };
+              };
+              readonly required: readonly ["id", "message", "explanation", "hunks"];
+              readonly additionalProperties: false;
+            };
+            readonly description: "Commits in this branch";
+          };
+        };
+        readonly required: readonly ["id", "name", "title", "description", "commits"];
+        readonly additionalProperties: false;
+      };
+      readonly description: "Branches containing grouped commits";
+    };
+  };
+  readonly required: readonly ["branches"];
+  readonly additionalProperties: false;
+};
 //#endregion
-export { groupingResultSchema };
+export { GroupingWire, GroupingWireBranch, GroupingWireCommit, groupingResultJsonSchema };

package/dist/tasks/group/schema.js

@@ -1 +1 @@
-import{z as e}from"zod";const t=e.object({id:e.string().describe(`Unique commit ID (e.g. commit-1)`),message:e.string().describe(`Commit message`),explanation:e.string().describe(`Detailed explanation of the commit`),hunks:e.array(e.number().int().describe(`Hunk index`)).describe(`Hunk indices included in this commit`)}),n=e.object({id:e.string().min(1).describe(`Unique branch ID`),name:e.string().describe(`Branch name (empty string for commits-only mode)`),title:e.string().describe(`Short PR-style title for this branch (under 72 chars, imperative mood, e.g. 'Add user authentication')`),description:e.string().describe(`What this branch accomplishes`),commits:e.array(t).min(1).describe(`Commits in this branch`)}),r=e.object({branches:e.array(n).min(1).describe(`Branches containing grouped commits`)});export{r as groupingResultSchema};
+const e={$schema:`https://json-schema.org/draft/2020-12/schema`,type:`object`,properties:{branches:{minItems:1,type:`array`,items:{type:`object`,properties:{id:{type:`string`,minLength:1,description:`Unique branch ID`},name:{type:`string`,description:`Branch name (empty string for commits-only mode)`},title:{type:`string`,description:`Short PR-style title for this branch (under 72 chars, imperative mood, e.g. 'Add user authentication')`},description:{type:`string`,description:`What this branch accomplishes`},commits:{minItems:1,type:`array`,items:{type:`object`,properties:{id:{type:`string`,description:`Unique commit ID (e.g. commit-1)`},message:{type:`string`,description:`Commit message`},explanation:{type:`string`,description:`Detailed explanation of the commit`},hunks:{type:`array`,items:{type:`integer`,minimum:-9007199254740991,maximum:9007199254740991,description:`Hunk index`},description:`Hunk indices included in this commit`}},required:[`id`,`message`,`explanation`,`hunks`],additionalProperties:!1},description:`Commits in this branch`}},required:[`id`,`name`,`title`,`description`,`commits`],additionalProperties:!1},description:`Branches containing grouped commits`}},required:[`branches`],additionalProperties:!1};export{e as groupingResultJsonSchema};

package/dist/tasks/group/types.d.ts

@@ -38,6 +38,12 @@ interface GroupInput {
   existingBranchNames?: Set<string>;
   /** See {@link RedactHunkContent}. */
   redactHunkContent?: RedactHunkContent;
+  /**
+   * Input-token ceiling for the hunk prompt. When exceeded, hunks are progressively reduced
+   * (biggest-first) to metadata; a diff that can't fit even condensed throws `DiffTooLargeError`.
+   * Defaults to `DEFAULT_INPUT_TOKEN_BUDGET`. Only applies to the initial (non-session) call.
+   */
+  inputTokenBudget?: number;
   model: AiModelPort;
   session?: ComposeSession;
   maxRetries?: number;
@@ -61,6 +67,8 @@ interface GroupOutput {
   attempts: number;
   durationMs: number;
   callIds: string[];
+  /** Hunks condensed to metadata to fit the input-token budget. Undefined when the AI call was skipped. */
+  hunksCondensedCount?: number;
 }
 //#endregion
 export { GroupInput, GroupOutput, GroupingResult, GroupingStrategy };

package/dist/tasks/group/validator.js

@@ -1,9 +1,9 @@
-import{extractOutputTag as e}from"../ai-loop.js";import{groupingResultSchema as t}from"./schema.js";function n(n,a,o=`branches`,s){let c=null;try{if(c=e(n),!c)return r([`No <output> tag found in response`],i(o));let l=JSON.parse(c),u=t.safeParse(l);if(!u.success)return r(u.error.issues.map(e=>`${e.path.join(`.`)}: ${e.message}`),i(o));let d=u.data,f=[],p=new Set,m=[],h=new Map,g=new Set,_=[],v=[],y=new Set,b=new Set;for(let e of d.branches){if(y.has(e.id))return r([`Duplicate branch ID: '${e.id}'`],i(o));if(y.add(e.id),o===`branches`&&e.name.length===0)return r([`Branch '${e.id}': missing or empty 'name'`],i(o));if(o===`branches`&&e.name.length>0){if(b.has(e.name))return r([`Duplicate branch name: '${e.name}'`],`Multiple branches use the name '${e.name}'. Each branch must have a unique name. Please rename one of them.`);if(b.add(e.name),s?.has(e.name))return r([`Branch name '${e.name}' already exists in the repository`],`The branch name '${e.name}' already exists in the repository. Please choose a different name for branch '${e.id}'.`)}let t=[];for(let n of e.commits){g.has(n.id)&&_.push(n.id),g.add(n.id);let r=[],i=o===`branches`?`${e.id}/${n.id}`:n.id;for(let e of n.hunks){p.has(e)&&m.push(e),p.add(e),r.push(e);let t=h.get(e);t?t.push(i):h.set(e,[i])}r.length===0&&v.push(n.id),t.push({id:n.id,message:n.message,explanation:n.explanation,hunkIndices:r})}f.push({id:e.id,name:e.name,title:e.title,description:e.description,commits:t})}if(_.length>0)return r([`Duplicate commit IDs: ${_.join(`, `)}`],`Some commit IDs appear multiple times. Each must be unique.\n\nDuplicates: ${_.join(`, `)}`);if(v.length>0)return r([`Empty commits (no hunks assigned): ${v.join(`, `)}`],`Every commit must contain at least one hunk. These commits have an empty \`hunks\` array: ${v.join(`, `)}.
+import{extractOutputTag as e}from"../ai-loop.js";import{validateJsonSchema as t}from"../utils/json-schema.js";import{groupingResultJsonSchema as n}from"./schema.js";function r(r,o,s=`branches`,c){let l=null;try{if(l=e(r),!l)return i([`No <output> tag found in response`],a(s));let u=t(n,JSON.parse(l));if(!u.success)return i(u.issues.map(e=>`${e.path.join(`.`)}: ${e.message}`),a(s));let d=u.data,f=[],p=new Set,m=[],h=new Map,g=new Set,_=[],v=[],y=new Set,b=new Set;for(let e of d.branches){if(y.has(e.id))return i([`Duplicate branch ID: '${e.id}'`],a(s));if(y.add(e.id),s===`branches`&&e.name.length===0)return i([`Branch '${e.id}': missing or empty 'name'`],a(s));if(s===`branches`&&e.name.length>0){if(b.has(e.name))return i([`Duplicate branch name: '${e.name}'`],`Multiple branches use the name '${e.name}'. Each branch must have a unique name. Please rename one of them.`);if(b.add(e.name),c?.has(e.name))return i([`Branch name '${e.name}' already exists in the repository`],`The branch name '${e.name}' already exists in the repository. Please choose a different name for branch '${e.id}'.`)}let t=[];for(let n of e.commits){g.has(n.id)&&_.push(n.id),g.add(n.id);let r=[],i=s===`branches`?`${e.id}/${n.id}`:n.id;for(let e of n.hunks){p.has(e)&&m.push(e),p.add(e),r.push(e);let t=h.get(e);t?t.push(i):h.set(e,[i])}r.length===0&&v.push(n.id),t.push({id:n.id,message:n.message,explanation:n.explanation,hunkIndices:r})}f.push({id:e.id,name:e.name,title:e.title,description:e.description,commits:t})}if(_.length>0)return i([`Duplicate commit IDs: ${_.join(`, `)}`],`Some commit IDs appear multiple times. Each must be unique.\n\nDuplicates: ${_.join(`, `)}`);if(v.length>0)return i([`Empty commits (no hunks assigned): ${v.join(`, `)}`],`Every commit must contain at least one hunk. These commits have an empty \`hunks\` array: ${v.join(`, `)}.
 
-Either assign at least one hunk to each of these commits, or remove them entirely. If a commit's purpose is already covered by another commit, remove the duplicate. If a commit is supposed to cover specific hunks, assign those hunk indices to it. Every hunk index still needs to appear in exactly one commit.`);let x=new Set(Array.from({length:a},(e,t)=>t)),S=[...x].filter(e=>!p.has(e)),C=[...p].filter(e=>!x.has(e));if(m.length>0||S.length>0||C.length>0){let e=[],t=[];if(m.length>0){let n=[...new Set(m)].sort((e,t)=>e-t),r=n.map(e=>`  hunk ${e} → ${(h.get(e)??[]).join(`, `)}`).join(`
-`);e.push(`Duplicate hunks (each must appear in exactly ONE commit):\n${r}`),t.push(`Duplicate hunks: ${n.join(`, `)}`)}S.length>0&&(e.push(`Missing hunks (not assigned to any commit): ${S.join(`, `)}`),t.push(`Missing hunks: ${S.join(`, `)}`)),C.length>0&&(e.push(`Extra hunks (index out of range): ${C.join(`, `)}`),t.push(`Extra hunks: ${C.join(`, `)}`));let n=[...h.values()].reduce((e,t)=>e+t.length,0);return r(t,`There are ${a} hunks (indices 0 to ${a-1}). Every index must appear in exactly one commit — no duplicates, no gaps, no out-of-range indices.
+Either assign at least one hunk to each of these commits, or remove them entirely. If a commit's purpose is already covered by another commit, remove the duplicate. If a commit is supposed to cover specific hunks, assign those hunk indices to it. Every hunk index still needs to appear in exactly one commit.`);let x=new Set(Array.from({length:o},(e,t)=>t)),S=[...x].filter(e=>!p.has(e)),C=[...p].filter(e=>!x.has(e));if(m.length>0||S.length>0||C.length>0){let e=[],t=[];if(m.length>0){let n=[...new Set(m)].sort((e,t)=>e-t),r=n.map(e=>`  hunk ${e} → ${(h.get(e)??[]).join(`, `)}`).join(`
+`);e.push(`Duplicate hunks (each must appear in exactly ONE commit):\n${r}`),t.push(`Duplicate hunks: ${n.join(`, `)}`)}S.length>0&&(e.push(`Missing hunks (not assigned to any commit): ${S.join(`, `)}`),t.push(`Missing hunks: ${S.join(`, `)}`)),C.length>0&&(e.push(`Extra hunks (index out of range): ${C.join(`, `)}`),t.push(`Extra hunks: ${C.join(`, `)}`));let n=[...h.values()].reduce((e,t)=>e+t.length,0);return i(t,`There are ${o} hunks (indices 0 to ${o-1}). Every index must appear in exactly one commit — no duplicates, no gaps, no out-of-range indices.
 
-Your response listed ${n} hunk references across ${h.size} unique indices. Expected: ${a} references across ${a} unique indices.
+Your response listed ${n} hunk references across ${h.size} unique indices. Expected: ${o} references across ${o} unique indices.
 
 Specific problems:
 ${e.map(e=>`- ${e}`).join(`
@@ -11,7 +11,7 @@ ${e.map(e=>`- ${e}`).join(`
 
 To fix duplicates: for each duplicated hunk index, decide which one commit it truly belongs in and remove it from the others. Do not split a single hunk across two commits — git only knows how to apply a hunk once.
 
-Return the corrected JSON inside <output> tags.`)}return{valid:!0,result:{branches:f}}}catch(e){let t=e instanceof Error?e.message:String(e),a=(c??n).slice(-300);return r([`Failed to parse response as valid JSON: ${t}`,`Response tail: ${a}`],i(o))}}function r(e,t){return{valid:!1,errors:e,retryFeedback:t}}function i(e){return e===`commits`?`Your response has an invalid structure. Please return JSON inside <output> tags. Use a single branch with id "default", name "", description "":
+Return the corrected JSON inside <output> tags.`)}return{valid:!0,result:{branches:f}}}catch(e){let t=e instanceof Error?e.message:String(e),n=(l??r).slice(-300);return i([`Failed to parse response as valid JSON: ${t}`,`Response tail: ${n}`],a(s))}}function i(e,t){return{valid:!1,errors:e,retryFeedback:t}}function a(e){return e===`commits`?`Your response has an invalid structure. Please return JSON inside <output> tags. Use a single branch with id "default", name "", description "":
 <output>
 {
   "branches": [
@@ -55,4 +55,4 @@ Return only the <output> tag and no other text.`:`Your response has an invalid s
 }
 </output>
 
-Return only the <output> tag and no other text.`}export{n as validateGroupResponse};
+Return only the <output> tag and no other text.`}export{r as validateGroupResponse};

package/dist/tasks/order/prompt.js

@@ -1,4 +1,4 @@
-import{orderingResultSchema as e}from"./schema.js";import{z as t}from"zod";const n=JSON.stringify(t.toJSONSchema(e),null,2);function r(){return`You are an advanced AI programming assistant tasked with determining the optimal order for commits within each branch. Your goal is to order commits so that:
+import{orderingResultJsonSchema as e}from"./schema.js";const t=JSON.stringify(e,null,2);function n(){return`You are an advanced AI programming assistant tasked with determining the optimal order for commits within each branch. Your goal is to order commits so that:
 
 1. **Dependencies are respected** — if commit A introduces something that commit B relies on, A must come before B
 2. **Refactoring before features** — structural improvements and refactors should precede new functionality that builds on them
@@ -13,12 +13,12 @@ You will receive one or more branches, each containing unordered commits. Order
 Output the ordered commit IDs per branch as JSON inside a <output> tag matching this schema:
 
 \`\`\`json
-${n}
+${t}
 \`\`\`
 
-Return only the <output> tag and no other text.`}function i(e){let{branches:t,hunks:n,instructions:r}=e,i=`Determine the optimal commit order within each branch:\n\n<branches>\n${JSON.stringify(t.map(e=>({id:e.id,name:e.name,commits:e.commits.map(e=>({id:e.id,message:e.message,explanation:e.explanation,hunkIndices:e.hunkIndices}))})))}\n</branches>`;if(n?.length){let e=JSON.stringify(n.map(e=>({index:e.index,fileName:e.fileName,hunkHeader:e.hunkHeader})));i+=`\n\nFor reference, here is the hunk index to file mapping:\n<hunk_map>\n${e}\n</hunk_map>`}return r&&(i+=`\n\nAdditional instructions:\n${r}`),i+=`
+Return only the <output> tag and no other text.`}function r(e){let{branches:t,hunks:n,instructions:r}=e,i=`Determine the optimal commit order within each branch:\n\n<branches>\n${JSON.stringify(t.map(e=>({id:e.id,name:e.name,commits:e.commits.map(e=>({id:e.id,message:e.message,explanation:e.explanation,hunkIndices:e.hunkIndices}))})))}\n</branches>`;if(n?.length){let e=JSON.stringify(n.map(e=>({index:e.index,fileName:e.fileName,hunkHeader:e.hunkHeader})));i+=`\n\nFor reference, here is the hunk index to file mapping:\n<hunk_map>\n${e}\n</hunk_map>`}return r&&(i+=`\n\nAdditional instructions:\n${r}`),i+=`
 
-Return the ordered commit IDs per branch. Return only the <output> tag and no other text.`,i}function a(e){let t=`Based on the branches and commits you created, determine the optimal order for the commits within each branch.
+Return the ordered commit IDs per branch. Return only the <output> tag and no other text.`,i}function i(e){let t=`Based on the branches and commits you created, determine the optimal order for the commits within each branch.
 
 Ordering principles:
 1. Dependencies first — if commit A introduces something commit B relies on, A must come before B
@@ -42,4 +42,4 @@ Return the ordered commit IDs per branch as JSON inside <output> tags:
 }
 </output>
 
-Return only the <output> tag and no other text.`,t}export{a as buildOrderContinuationPrompt,r as buildOrderSystemPrompt,i as buildOrderUserPrompt};
+Return only the <output> tag and no other text.`,t}export{i as buildOrderContinuationPrompt,n as buildOrderSystemPrompt,r as buildOrderUserPrompt};

package/dist/tasks/order/schema.d.ts

@@ -1,12 +1,37 @@
-import { z } from "zod";
-
 //#region src/tasks/order/schema.d.ts
-declare const orderingResultSchema: z.ZodObject<{
-  branches: z.ZodArray<z.ZodObject<{
-    branchId: z.ZodString;
-    orderedCommitIds: z.ZodArray<z.ZodString>;
-  }, z.core.$strip>>;
-  rationale: z.ZodString;
-}, z.core.$strip>;
+declare const orderingResultJsonSchema: {
+  readonly $schema: "https://json-schema.org/draft/2020-12/schema";
+  readonly type: "object";
+  readonly properties: {
+    readonly branches: {
+      readonly type: "array";
+      readonly items: {
+        readonly type: "object";
+        readonly properties: {
+          readonly branchId: {
+            readonly type: "string";
+            readonly description: "ID of the branch being ordered";
+          };
+          readonly orderedCommitIds: {
+            readonly type: "array";
+            readonly items: {
+              readonly type: "string";
+            };
+            readonly description: "Commit IDs in optimal order";
+          };
+        };
+        readonly required: readonly ["branchId", "orderedCommitIds"];
+        readonly additionalProperties: false;
+      };
+      readonly description: "Ordered commits per branch";
+    };
+    readonly rationale: {
+      readonly type: "string";
+      readonly description: "Explanation of ordering decisions";
+    };
+  };
+  readonly required: readonly ["branches", "rationale"];
+  readonly additionalProperties: false;
+};
 //#endregion
-export { orderingResultSchema };
+export { orderingResultJsonSchema };

package/dist/tasks/order/schema.js

@@ -1 +1 @@
-import{z as e}from"zod";const t=e.object({branchId:e.string().describe(`ID of the branch being ordered`),orderedCommitIds:e.array(e.string()).describe(`Commit IDs in optimal order`)}),n=e.object({branches:e.array(t).describe(`Ordered commits per branch`),rationale:e.string().describe(`Explanation of ordering decisions`)});export{n as orderingResultSchema};
+const e={$schema:`https://json-schema.org/draft/2020-12/schema`,type:`object`,properties:{branches:{type:`array`,items:{type:`object`,properties:{branchId:{type:`string`,description:`ID of the branch being ordered`},orderedCommitIds:{type:`array`,items:{type:`string`},description:`Commit IDs in optimal order`}},required:[`branchId`,`orderedCommitIds`],additionalProperties:!1},description:`Ordered commits per branch`},rationale:{type:`string`,description:`Explanation of ordering decisions`}},required:[`branches`,`rationale`],additionalProperties:!1};export{e as orderingResultJsonSchema};

package/dist/tasks/order/validator.js

@@ -1,4 +1,4 @@
-import{extractOutputTag as e}from"../ai-loop.js";import{orderingResultSchema as t}from"./schema.js";function n(n,a){let o=null;try{if(o=e(n),!o)return r([`No <output> tag found in response`],i(a));let s=JSON.parse(o),c=t.safeParse(s);if(!c.success)return r(c.error.issues.map(e=>`${e.path.join(`.`)}: ${e.message}`),i(a));let l=c.data,u=[],d=new Set;for(let e of l.branches){d.add(e.branchId);let t=a.find(t=>t.branchId===e.branchId);if(!t)return r([`Unknown branch ID: '${e.branchId}'`],`Branch ID '${e.branchId}' doesn't match any known branch.\n\nKnown branches: ${a.map(e=>e.branchId).join(`, `)}`);let n=new Set(t.commitIds),i=new Set,o=[],s=[];for(let t of e.orderedCommitIds)i.has(t)&&o.push(t),n.has(t)||s.push(t),i.add(t);if(o.length>0)return r([`Branch '${e.branchId}': duplicate commit IDs: ${o.join(`, `)}`],`Branch '${e.branchId}' has duplicate commits. Each must appear exactly once.\n\nDuplicates: ${o.join(`, `)}`);if(s.length>0)return r([`Branch '${e.branchId}': unknown commit IDs: ${s.join(`, `)}`],`Branch '${e.branchId}' references unknown commits.\n\nUnknown: ${s.join(`, `)}\nValid: ${t.commitIds.join(`, `)}`);let c=t.commitIds.filter(e=>!i.has(e));if(c.length>0)return r([`Branch '${e.branchId}': missing commit IDs: ${c.join(`, `)}`],`Branch '${e.branchId}' is missing some commits.\n\nMissing: ${c.join(`, `)}`);u.push({branchId:e.branchId,orderedCommitIds:e.orderedCommitIds})}let f=a.filter(e=>!d.has(e.branchId));return f.length>0?r([`Missing branches: ${f.map(e=>e.branchId).join(`, `)}`],`Some branches are not included in the ordering.\n\nMissing: ${f.map(e=>e.branchId).join(`, `)}`):{valid:!0,result:{branches:u,rationale:l.rationale}}}catch(e){let t=e instanceof Error?e.message:String(e),s=(o??n).slice(-300);return r([`Failed to parse response as valid JSON: ${t}`,`Response tail: ${s}`],i(a))}}function r(e,t){return{valid:!1,errors:e,retryFeedback:t}}function i(e){return`Your response has an invalid structure. Return JSON inside <output> tags:
+import{extractOutputTag as e}from"../ai-loop.js";import{validateJsonSchema as t}from"../utils/json-schema.js";import{orderingResultJsonSchema as n}from"./schema.js";function r(r,o){let s=null;try{if(s=e(r),!s)return i([`No <output> tag found in response`],a(o));let c=t(n,JSON.parse(s));if(!c.success)return i(c.issues.map(e=>`${e.path.join(`.`)}: ${e.message}`),a(o));let l=c.data,u=[],d=new Set;for(let e of l.branches){d.add(e.branchId);let t=o.find(t=>t.branchId===e.branchId);if(!t)return i([`Unknown branch ID: '${e.branchId}'`],`Branch ID '${e.branchId}' doesn't match any known branch.\n\nKnown branches: ${o.map(e=>e.branchId).join(`, `)}`);let n=new Set(t.commitIds),r=new Set,a=[],s=[];for(let t of e.orderedCommitIds)r.has(t)&&a.push(t),n.has(t)||s.push(t),r.add(t);if(a.length>0)return i([`Branch '${e.branchId}': duplicate commit IDs: ${a.join(`, `)}`],`Branch '${e.branchId}' has duplicate commits. Each must appear exactly once.\n\nDuplicates: ${a.join(`, `)}`);if(s.length>0)return i([`Branch '${e.branchId}': unknown commit IDs: ${s.join(`, `)}`],`Branch '${e.branchId}' references unknown commits.\n\nUnknown: ${s.join(`, `)}\nValid: ${t.commitIds.join(`, `)}`);let c=t.commitIds.filter(e=>!r.has(e));if(c.length>0)return i([`Branch '${e.branchId}': missing commit IDs: ${c.join(`, `)}`],`Branch '${e.branchId}' is missing some commits.\n\nMissing: ${c.join(`, `)}`);u.push({branchId:e.branchId,orderedCommitIds:e.orderedCommitIds})}let f=o.filter(e=>!d.has(e.branchId));return f.length>0?i([`Missing branches: ${f.map(e=>e.branchId).join(`, `)}`],`Some branches are not included in the ordering.\n\nMissing: ${f.map(e=>e.branchId).join(`, `)}`):{valid:!0,result:{branches:u,rationale:l.rationale}}}catch(e){let t=e instanceof Error?e.message:String(e),n=(s??r).slice(-300);return i([`Failed to parse response as valid JSON: ${t}`,`Response tail: ${n}`],a(o))}}function i(e,t){return{valid:!1,errors:e,retryFeedback:t}}function a(e){return`Your response has an invalid structure. Return JSON inside <output> tags:
 <output>
 {
   "branches": [
@@ -9,4 +9,4 @@ ${e.map(e=>`    { "branchId": "${e.branchId}", "orderedCommitIds": ${JSON.string
 }
 </output>
 
-All branches must be present with all their commits ordered. Return only the <output> tag and no other text.`}export{n as validateOrderResponse};
+All branches must be present with all their commits ordered. Return only the <output> tag and no other text.`}export{r as validateOrderResponse};