@locusai/cli 0.18.1 → 0.18.2

package/bin/locus.js

@@ -1440,6 +1440,9 @@ function updateIssueLabels(number, addLabels, removeLabels, options = {}) {
   }
   gh(args, options);
 }
+function deleteIssue(number, options = {}) {
+  gh(`issue delete ${number} --yes`, options);
+}
 function addIssueComment(number, body, options = {}) {
   const cwd = options.cwd ?? process.cwd();
   execFileSync("gh", ["issue", "comment", String(number), "--body", body], {
@@ -5822,6 +5825,10 @@ async function issueCommand(projectRoot, args) {
     case "close":
       await issueClose(projectRoot, parsed);
       break;
+    case "delete":
+    case "rm":
+      await issueDelete(projectRoot, parsed);
+      break;
     default:
       if (/^\d+$/.test(parsed.subcommand)) {
         parsed.positional.unshift(parsed.subcommand);
@@ -5949,21 +5956,26 @@ ${dim("────────────────────────
   }
 }
 function buildIssueCreationPrompt(userRequest) {
-  return [
-    "You are a task planner for a software development team.",
-    "Given a user request, create a well-structured GitHub issue.",
-    "",
-    "Output ONLY a valid JSON object with exactly these fields:",
-    '- "title": A concise, actionable issue title (max 80 characters)',
-    '- "body": Detailed markdown description with context, acceptance criteria, and technical notes',
-    '- "priority": One of: critical, high, medium, low',
-    '- "type": One of: feature, bug, chore, refactor, docs',
-    "",
-    `User request: ${userRequest}`,
-    "",
-    "Output ONLY the JSON object. No explanations, no code execution, no other text."
-  ].join(`
-`);
+  return `<role>
+You are a task planner for a software development team.
+Given a user request, create a well-structured GitHub issue.
+</role>
+
+<output-format>
+Output ONLY a valid JSON object with exactly these fields:
+- "title": A concise, actionable issue title (max 80 characters)
+- "body": Detailed markdown description with context, acceptance criteria, and technical notes
+- "priority": One of: critical, high, medium, low
+- "type": One of: feature, bug, chore, refactor, docs
+</output-format>
+
+<user-request>
+${userRequest}
+</user-request>
+
+<constraints>
+Output ONLY the JSON object. No explanations, no code execution, no other text.
+</constraints>`;
 }
 function extractJSON(text) {
   const codeBlock = text.match(/```(?:json)?\s*([\s\S]*?)```/);
@@ -6227,6 +6239,43 @@ async function issueClose(projectRoot, parsed) {
     process.exit(1);
   }
 }
+async function issueDelete(projectRoot, parsed) {
+  const issueNumbers = parsed.positional.filter((a) => /^\d+$/.test(a)).map(Number);
+  if (issueNumbers.length === 0) {
+    process.stderr.write(`${red("✗")} No issue numbers provided.
+`);
+    process.stderr.write(`  Usage: ${bold("locus issue delete <number...>")}
+`);
+    process.exit(1);
+  }
+  const label = issueNumbers.length === 1 ? `issue #${issueNumbers[0]}` : `${issueNumbers.length} issues (#${issueNumbers.join(", #")})`;
+  process.stderr.write(`${yellow("⚠")} This will ${bold("permanently delete")} ${label}.
+`);
+  const answer = await askQuestion(`${cyan("?")} Are you sure? ${dim("[y/N]")} `);
+  if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+    process.stderr.write(`${yellow("○")} Cancelled.
+`);
+    return;
+  }
+  let failed = 0;
+  for (const num of issueNumbers) {
+    process.stderr.write(`${cyan("●")} Deleting issue #${num}...`);
+    try {
+      deleteIssue(num, { cwd: projectRoot });
+      process.stderr.write(`\r${green("✓")} Deleted issue #${num}
+`);
+    } catch (e) {
+      process.stderr.write(`\r${red("✗")} #${num}: ${e.message}
+`);
+      failed++;
+    }
+  }
+  if (issueNumbers.length > 1 && failed === 0) {
+    process.stderr.write(`
+${green("✓")} All ${issueNumbers.length} issues deleted.
+`);
+  }
+}
 function formatPriority(labels) {
   for (const label of labels) {
     if (label === "p:critical")
@@ -6329,6 +6378,7 @@ ${bold("Subcommands:")}
   ${cyan("show")}          Show issue details
   ${cyan("label")}         Bulk-update labels / sprint assignment
   ${cyan("close")}         Close an issue
+  ${cyan("delete")} ${dim("(rm)")}  Permanently delete issues (bulk)
 
 ${bold("Create options:")}
   ${dim("--sprint, -s")}   Assign to sprint (milestone)
@@ -6350,6 +6400,7 @@ ${bold("Examples:")}
   locus issue show 42
   locus issue label 42 43 --sprint "Sprint 2"
   locus issue close 42
+  locus issue delete 42 43 44
 
 `);
 }
@@ -7047,30 +7098,30 @@ function buildFeedbackPrompt(ctx) {
 }
 function buildReplPrompt(userMessage, projectRoot, _config, previousMessages) {
   const sections = [];
-  const locusmd = readFileSafe(join13(projectRoot, "LOCUS.md"));
+  const locusmd = readFileSafe(join13(projectRoot, ".locus", "LOCUS.md"));
   if (locusmd) {
-    sections.push(`# Project Instructions
-
-${locusmd}`);
+    sections.push(`<project-instructions>
+${locusmd}
+</project-instructions>`);
   }
   const learnings = readFileSafe(join13(projectRoot, ".locus", "LEARNINGS.md"));
   if (learnings) {
-    sections.push(`# Past Learnings
-
-${learnings}`);
+    sections.push(`<past-learnings>
+${learnings}
+</past-learnings>`);
   }
   if (previousMessages && previousMessages.length > 0) {
     const recent = previousMessages.slice(-10);
     const historyLines = recent.map((msg) => `${msg.role === "user" ? "User" : "Assistant"}: ${msg.content}`);
-    sections.push(`# Previous Conversation
-
+    sections.push(`<previous-conversation>
 ${historyLines.join(`
 
-`)}`);
+`)}
+</previous-conversation>`);
   }
-  sections.push(`# Current Request
-
-${userMessage}`);
+  sections.push(`<current-request>
+${userMessage}
+</current-request>`);
   return sections.join(`
 
 ---
@@ -7078,18 +7129,18 @@ ${userMessage}`);
 `);
 }
 function buildSystemContext(projectRoot) {
-  const parts = ["# System Context"];
-  const locusmd = readFileSafe(join13(projectRoot, "LOCUS.md"));
+  const parts = [];
+  const locusmd = readFileSafe(join13(projectRoot, ".locus", "LOCUS.md"));
   if (locusmd) {
-    parts.push(`## Project Instructions (LOCUS.md)
-
-${locusmd}`);
+    parts.push(`<project-instructions>
+${locusmd}
+</project-instructions>`);
   }
   const learnings = readFileSafe(join13(projectRoot, ".locus", "LEARNINGS.md"));
   if (learnings) {
-    parts.push(`## Past Learnings
-
-${learnings}`);
+    parts.push(`<past-learnings>
+${learnings}
+</past-learnings>`);
   }
   const discussionsDir = join13(projectRoot, ".locus", "discussions");
   if (existsSync14(discussionsDir)) {
@@ -7098,43 +7149,46 @@ ${learnings}`);
       for (const file of files) {
         const content = readFileSafe(join13(discussionsDir, file));
         if (content) {
-          parts.push(`## Discussion: ${file.replace(".md", "")}
-
-${content.slice(0, 2000)}`);
+          const name = file.replace(".md", "");
+          parts.push(`<discussion name="${name}">
+${content.slice(0, 2000)}
+</discussion>`);
         }
       }
     } catch {}
   }
-  return parts.join(`
+  return `<system-context>
+${parts.join(`
 
-`);
+`)}
+</system-context>`;
 }
 function buildTaskContext(issue, comments) {
-  const parts = [
-    `# Task Context`,
-    ``,
-    `## Issue #${issue.number}: ${issue.title}`,
-    ``,
-    issue.body || "_No description provided._"
-  ];
+  const parts = [];
+  const issueParts = [issue.body || "_No description provided._"];
   const labels = issue.labels.filter((l) => l.startsWith("p:") || l.startsWith("type:"));
   if (labels.length > 0) {
-    parts.push(`
-**Labels:** ${labels.join(", ")}`);
+    issueParts.push(`**Labels:** ${labels.join(", ")}`);
   }
+  parts.push(`<issue number="${issue.number}" title="${issue.title}">
+${issueParts.join(`
+
+`)}
+</issue>`);
   if (comments && comments.length > 0) {
-    parts.push(`
-## Issue Comments
-`);
-    for (const comment of comments) {
-      parts.push(comment);
-    }
+    parts.push(`<issue-comments>
+${comments.join(`
+`)}
+</issue-comments>`);
   }
-  return parts.join(`
-`);
+  return `<task-context>
+${parts.join(`
+
+`)}
+</task-context>`;
 }
 function buildSprintContext(sprintName, position, diffSummary) {
-  const parts = ["# Sprint Context"];
+  const parts = [];
   if (sprintName) {
     parts.push(`**Sprint:** ${sprintName}`);
   }
@@ -7142,30 +7196,31 @@ function buildSprintContext(sprintName, position, diffSummary) {
     parts.push(`**Position:** Task ${position}`);
   }
   if (diffSummary) {
-    parts.push(`
-## Changes from Previous Tasks
-
+    parts.push(`<previous-changes>
 The following changes have already been made by earlier tasks in this sprint:
 
 \`\`\`diff
 ${diffSummary}
-\`\`\``);
+\`\`\`
+</previous-changes>`);
   }
-  parts.push(`
-**Important:** Build upon the changes from previous tasks. Do not revert or undo their work.`);
-  return parts.join(`
-`);
+  parts.push(`**Important:** Build upon the changes from previous tasks. Do not revert or undo their work.`);
+  return `<sprint-context>
+${parts.join(`
+
+`)}
+</sprint-context>`;
 }
 function buildRepoContext(projectRoot) {
-  const parts = ["# Repository Context"];
+  const parts = [];
   try {
     const tree = execSync10("find . -maxdepth 2 -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/.locus/*' -not -path '*/dist/*' -not -path '*/build/*' | head -80", { cwd: projectRoot, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
     if (tree) {
-      parts.push(`## File Tree
-
+      parts.push(`<file-tree>
 \`\`\`
 ${tree}
-\`\`\``);
+\`\`\`
+</file-tree>`);
     }
   } catch {}
   try {
@@ -7175,11 +7230,11 @@ ${tree}
       stdio: ["pipe", "pipe", "pipe"]
     }).trim();
     if (gitLog) {
-      parts.push(`## Recent Commits
-
+      parts.push(`<recent-commits>
 \`\`\`
 ${gitLog}
-\`\`\``);
+\`\`\`
+</recent-commits>`);
     }
   } catch {}
   try {
@@ -7190,13 +7245,14 @@ ${gitLog}
     }).trim();
     parts.push(`**Current branch:** ${branch}`);
   } catch {}
-  return parts.join(`
+  return `<repository-context>
+${parts.join(`
 
-`);
+`)}
+</repository-context>`;
 }
 function buildExecutionRules(config) {
-  return `# Execution Rules
-
+  return `<execution-rules>
 1. **Commit format:** Use conventional commits: \`feat: <title> (#<issue>)\`, \`fix: ...\`, \`chore: ...\`. Every commit message MUST be multi-line: the first line is the title, then a blank line, then \`Co-Authored-By: LocusAgent <agent@locusai.team>\` as a Git trailer. Use \`git commit -m "<title>" -m "Co-Authored-By: LocusAgent <agent@locusai.team>"\` (two separate -m flags) to ensure the trailer is on its own line.
 2. **Code quality:** Follow existing code style. Run linters/formatters if available.
 3. **Testing:** If test files exist for modified code, update them accordingly.
@@ -7208,37 +7264,37 @@ function buildExecutionRules(config) {
 5. **Base branch:** ${config.agent.baseBranch}
 6. **Provider:** ${config.ai.provider} / ${config.ai.model}
 
-When you are done, provide a brief summary of what you changed and why.`;
+When you are done, provide a brief summary of what you changed and why.
+</execution-rules>`;
 }
 function buildPRContext(prNumber, diff, comments) {
   const parts = [
-    `# Current State — PR #${prNumber}`,
-    ``,
-    `## PR Diff`,
-    ``,
-    "```diff",
-    diff.slice(0, 1e4),
-    "```"
+    `<pr-diff>
+\`\`\`diff
+${diff.slice(0, 1e4)}
+\`\`\`
+</pr-diff>`
   ];
   if (comments.length > 0) {
-    parts.push(`
-## Review Comments
-`);
-    for (const comment of comments) {
-      parts.push(comment);
-    }
+    parts.push(`<review-comments>
+${comments.join(`
+`)}
+</review-comments>`);
   }
-  return parts.join(`
-`);
+  return `<pr-context number="${prNumber}">
+${parts.join(`
+
+`)}
+</pr-context>`;
 }
 function buildFeedbackInstructions() {
-  return `# Instructions
-
+  return `<instructions>
 1. Address ALL review feedback from the comments above.
 2. Make targeted changes — do NOT rewrite code from scratch.
 3. If a reviewer comment is unclear, make your best judgment and note your interpretation.
 4. Push changes to the same branch — do NOT create a new PR.
-5. When done, summarize what you changed in response to each comment.`;
+5. When done, summarize what you changed in response to each comment.
+</instructions>`;
 }
 function readFileSafe(path) {
   try {
@@ -10102,16 +10158,21 @@ ${i.body?.slice(0, 300) ?? ""}`).join(`
 
 `);
   const { runAI: runAI2 } = await Promise.resolve().then(() => (init_run_ai(), exports_run_ai));
-  const prompt = `You are organizing GitHub issues for a sprint. Analyze these issues and suggest the optimal execution order.
+  const prompt = `<role>
+You are organizing GitHub issues for a sprint. Analyze these issues and suggest the optimal execution order.
+</role>
 
-Issues:
+<issues>
 ${issueDescriptions}
+</issues>
 
+<instructions>
 For each issue, output a line in this format:
 ORDER: #<number> <reason for this position>
 
 Order them so that dependencies are respected (issues that produce code needed by later issues should come first).
-Start with foundational/setup tasks, then core features, then integration/testing.`;
+Start with foundational/setup tasks, then core features, then integration/testing.
+</instructions>`;
   const aiResult = await runAI2({
     prompt,
     provider: config.ai.provider,
@@ -10184,59 +10245,62 @@ ${bold("Suggested Order:")}
 }
 function buildPlanningPrompt(projectRoot, config, directive, sprintName, id, planPathRelative) {
   const parts = [];
-  parts.push(`You are a sprint planning assistant for the GitHub repository ${config.github.owner}/${config.github.repo}.`);
-  parts.push("");
-  parts.push(`DIRECTIVE: ${directive}`);
-  if (sprintName) {
-    parts.push(`SPRINT: ${sprintName}`);
-  }
-  parts.push("");
-  const locusPath = join18(projectRoot, "LOCUS.md");
+  parts.push(`<role>
+You are a sprint planning assistant for the GitHub repository ${config.github.owner}/${config.github.repo}.
+</role>`);
+  parts.push(`<directive>
+${directive}${sprintName ? `
+
+**Sprint:** ${sprintName}` : ""}
+</directive>`);
+  const locusPath = join18(projectRoot, ".locus", "LOCUS.md");
   if (existsSync18(locusPath)) {
     const content = readFileSync13(locusPath, "utf-8");
-    parts.push("PROJECT CONTEXT (LOCUS.md):");
-    parts.push(content.slice(0, 3000));
-    parts.push("");
+    parts.push(`<project-context>
+${content.slice(0, 3000)}
+</project-context>`);
   }
   const learningsPath = join18(projectRoot, ".locus", "LEARNINGS.md");
   if (existsSync18(learningsPath)) {
     const content = readFileSync13(learningsPath, "utf-8");
-    parts.push("PAST LEARNINGS:");
-    parts.push(content.slice(0, 2000));
-    parts.push("");
-  }
-  parts.push("TASK:");
-  parts.push(`Break down the directive into specific, actionable GitHub issues and write them to the file: ${planPathRelative}`);
-  parts.push("");
-  parts.push(`Write ONLY a valid JSON file to ${planPathRelative} with this exact structure:`);
-  parts.push("");
-  parts.push("```json");
-  parts.push("{");
-  parts.push(`  "id": "${id}",`);
-  parts.push(`  "directive": ${JSON.stringify(directive)},`);
-  parts.push(`  "sprint": ${sprintName ? JSON.stringify(sprintName) : "null"},`);
-  parts.push(`  "createdAt": "${new Date().toISOString()}",`);
-  parts.push('  "issues": [');
-  parts.push("    {");
-  parts.push('      "order": 1,');
-  parts.push('      "title": "concise issue title",');
-  parts.push('      "body": "detailed markdown body with acceptance criteria",');
-  parts.push('      "priority": "critical|high|medium|low",');
-  parts.push('      "type": "feature|bug|chore|refactor|docs",');
-  parts.push('      "dependsOn": "none or comma-separated order numbers"');
-  parts.push("    }");
-  parts.push("  ]");
-  parts.push("}");
-  parts.push("```");
-  parts.push("");
-  parts.push("Requirements for the issues:");
-  parts.push("- Break the directive into 3-10 specific, actionable issues");
-  parts.push("- Each issue must be independently executable by an AI agent");
-  parts.push("- Order them so dependencies are respected (foundational tasks first)");
-  parts.push("- Write detailed issue bodies with clear acceptance criteria");
-  parts.push("- Use valid GitHub Markdown only in issue bodies");
-  parts.push("- Create the file using the Write tool — do not print the JSON to the terminal");
+    parts.push(`<past-learnings>
+${content.slice(0, 2000)}
+</past-learnings>`);
+  }
+  parts.push(`<task>
+Break down the directive into specific, actionable GitHub issues and write them to the file: ${planPathRelative}
+
+Write ONLY a valid JSON file to ${planPathRelative} with this exact structure:
+
+\`\`\`json
+{
+  "id": "${id}",
+  "directive": ${JSON.stringify(directive)},
+  "sprint": ${sprintName ? JSON.stringify(sprintName) : "null"},
+  "createdAt": "${new Date().toISOString()}",
+  "issues": [
+    {
+      "order": 1,
+      "title": "concise issue title",
+      "body": "detailed markdown body with acceptance criteria",
+      "priority": "critical|high|medium|low",
+      "type": "feature|bug|chore|refactor|docs",
+      "dependsOn": "none or comma-separated order numbers"
+    }
+  ]
+}
+\`\`\`
+</task>`);
+  parts.push(`<requirements>
+- Break the directive into 3-10 specific, actionable issues
+- Each issue must be independently executable by an AI agent
+- Order them so dependencies are respected (foundational tasks first)
+- Write detailed issue bodies with clear acceptance criteria
+- Use valid GitHub Markdown only in issue bodies
+- Create the file using the Write tool — do not print the JSON to the terminal
+</requirements>`);
   return parts.join(`
+
 `);
 }
 function sanitizePlanOutput(output) {
@@ -10535,47 +10599,55 @@ _Reviewed by Locus AI (${config.ai.provider}/${flags.model ?? config.ai.model})_
 }
 function buildReviewPrompt(projectRoot, config, pr, diff, focus) {
   const parts = [];
-  parts.push(`You are an expert code reviewer for the ${config.github.owner}/${config.github.repo} repository.`);
-  parts.push("");
-  const locusPath = join19(projectRoot, "LOCUS.md");
+  parts.push(`<role>
+You are an expert code reviewer for the ${config.github.owner}/${config.github.repo} repository.
+</role>`);
+  const locusPath = join19(projectRoot, ".locus", "LOCUS.md");
   if (existsSync19(locusPath)) {
     const content = readFileSync14(locusPath, "utf-8");
-    parts.push("PROJECT CONTEXT:");
-    parts.push(content.slice(0, 2000));
-    parts.push("");
+    parts.push(`<project-context>
+${content.slice(0, 2000)}
+</project-context>`);
   }
-  parts.push(`PULL REQUEST #${pr.number}: ${pr.title}`);
-  parts.push(`Branch: ${pr.head} → ${pr.base}`);
+  const prMeta = [`Branch: ${pr.head} → ${pr.base}`];
   if (pr.body) {
-    parts.push(`Description:
+    prMeta.push(`Description:
 ${pr.body.slice(0, 1000)}`);
   }
-  parts.push("");
-  parts.push("DIFF:");
-  parts.push(diff.slice(0, 50000));
-  parts.push("");
-  parts.push("REVIEW INSTRUCTIONS:");
-  parts.push("Provide a thorough code review. For each issue found, describe:");
-  parts.push("1. The file and approximate location");
-  parts.push("2. What the issue is");
-  parts.push("3. Why it matters");
-  parts.push("4. How to fix it");
-  parts.push("");
-  parts.push("Categories to check:");
-  parts.push("- Correctness: bugs, logic errors, edge cases");
-  parts.push("- Security: injection, XSS, auth issues, secret exposure");
-  parts.push("- Performance: N+1 queries, unnecessary allocations, missing caching");
-  parts.push("- Maintainability: naming, complexity, code organization");
-  parts.push("- Testing: missing tests, inadequate coverage");
+  parts.push(`<pull-request number="${pr.number}" title="${pr.title}">
+${prMeta.join(`
+`)}
+</pull-request>`);
+  parts.push(`<diff>
+${diff.slice(0, 50000)}
+</diff>`);
+  let instructions = `Provide a thorough code review. For each issue found, describe:
+1. The file and approximate location
+2. What the issue is
+3. Why it matters
+4. How to fix it
+
+Categories to check:
+- Correctness: bugs, logic errors, edge cases
+- Security: injection, XSS, auth issues, secret exposure
+- Performance: N+1 queries, unnecessary allocations, missing caching
+- Maintainability: naming, complexity, code organization
+- Testing: missing tests, inadequate coverage`;
   if (focus) {
-    parts.push("");
-    parts.push(`FOCUS AREAS: ${focus}`);
-    parts.push("Pay special attention to the above areas.");
+    instructions += `
+
+**Focus areas:** ${focus}
+Pay special attention to the above areas.`;
   }
-  parts.push("");
-  parts.push("End with an overall assessment: APPROVE, REQUEST_CHANGES, or COMMENT.");
-  parts.push("Be constructive and specific. Praise good patterns too.");
+  instructions += `
+
+End with an overall assessment: APPROVE, REQUEST_CHANGES, or COMMENT.
+Be constructive and specific. Praise good patterns too.`;
+  parts.push(`<review-instructions>
+${instructions}
+</review-instructions>`);
   return parts.join(`
+
 `);
 }
 var init_review = __esm(() => {
@@ -11130,55 +11202,67 @@ ${green("✓")} Discussion saved: ${cyan(id)} ${dim(`(${timer.formatted()})`)}
 }
 function buildDiscussionPrompt(projectRoot, config, topic, conversation, forceFinal) {
   const parts = [];
-  parts.push(`You are a senior software architect and consultant for the ${config.github.owner}/${config.github.repo} project.`);
-  parts.push("");
-  const locusPath = join20(projectRoot, "LOCUS.md");
+  parts.push(`<role>
+You are a senior software architect and consultant for the ${config.github.owner}/${config.github.repo} project.
+</role>`);
+  const locusPath = join20(projectRoot, ".locus", "LOCUS.md");
   if (existsSync20(locusPath)) {
     const content = readFileSync15(locusPath, "utf-8");
-    parts.push("PROJECT CONTEXT:");
-    parts.push(content.slice(0, 3000));
-    parts.push("");
+    parts.push(`<project-context>
+${content.slice(0, 3000)}
+</project-context>`);
   }
   const learningsPath = join20(projectRoot, ".locus", "LEARNINGS.md");
   if (existsSync20(learningsPath)) {
     const content = readFileSync15(learningsPath, "utf-8");
-    parts.push("PAST LEARNINGS:");
-    parts.push(content.slice(0, 2000));
-    parts.push("");
+    parts.push(`<past-learnings>
+${content.slice(0, 2000)}
+</past-learnings>`);
   }
-  parts.push(`DISCUSSION TOPIC: ${topic}`);
-  parts.push("");
+  parts.push(`<discussion-topic>
+${topic}
+</discussion-topic>`);
   if (conversation.length === 0) {
-    parts.push("Before providing recommendations, you need to ask targeted clarifying questions.");
-    parts.push("");
-    parts.push("Ask 3-5 focused questions that will significantly improve the quality of your analysis.");
-    parts.push("Format as a numbered list. Be specific and focused on the most important unknowns.");
-    parts.push("Do NOT provide any analysis yet — questions only.");
+    parts.push(`<instructions>
+Before providing recommendations, you need to ask targeted clarifying questions.
+
+Ask 3-5 focused questions that will significantly improve the quality of your analysis.
+Format as a numbered list. Be specific and focused on the most important unknowns.
+Do NOT provide any analysis yet — questions only.
+</instructions>`);
   } else {
-    parts.push("CONVERSATION SO FAR:");
-    parts.push("");
+    const historyLines = [];
     for (const turn of conversation) {
       if (turn.role === "user") {
-        parts.push(`USER: ${turn.content}`);
+        historyLines.push(`USER: ${turn.content}`);
       } else {
-        parts.push(`ASSISTANT: ${turn.content}`);
+        historyLines.push(`ASSISTANT: ${turn.content}`);
       }
-      parts.push("");
     }
+    parts.push(`<conversation-history>
+${historyLines.join(`
+
+`)}
+</conversation-history>`);
     if (forceFinal) {
-      parts.push("Based on everything discussed, provide your complete analysis and recommendations now.");
-      parts.push("Format as a thorough markdown document with a clear title (# Heading), sections, trade-offs, and actionable recommendations.");
+      parts.push(`<instructions>
+Based on everything discussed, provide your complete analysis and recommendations now.
+Format as a thorough markdown document with a clear title (# Heading), sections, trade-offs, and actionable recommendations.
+</instructions>`);
     } else {
-      parts.push("Review the information gathered so far.");
-      parts.push("");
-      parts.push("If you have enough information to make a thorough recommendation:");
-      parts.push("  → Provide a complete analysis as a markdown document with a title (# Heading), sections, trade-offs, and concrete recommendations.");
-      parts.push("");
-      parts.push("If you still need key information to give a good answer:");
-      parts.push("  → Ask 2-3 more focused follow-up questions (numbered list only, no analysis yet).");
+      parts.push(`<instructions>
+Review the information gathered so far.
+
+If you have enough information to make a thorough recommendation:
+  → Provide a complete analysis as a markdown document with a title (# Heading), sections, trade-offs, and concrete recommendations.
+
+If you still need key information to give a good answer:
+  → Ask 2-3 more focused follow-up questions (numbered list only, no analysis yet).
+</instructions>`);
     }
   }
   return parts.join(`
+
 `);
 }
 var MAX_DISCUSSION_ROUNDS = 5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locusai/cli",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "GitHub-native AI engineering assistant",
   "type": "module",
   "bin": {