chorus-cli 0.4.7 → 0.4.8

package/index.js

@@ -6,7 +6,6 @@ const _configEnv = _path.join(_configDir, '.env');
 const _localEnv = _path.join(__dirname, '.env');
 // Prefer user config dir (works when installed globally), fall back to local .env for dev
 require('dotenv').config({ path: require('fs').existsSync(_configEnv) ? _configEnv : _localEnv });
-const { Octokit } = require('@octokit/rest');
 
 const { createProvider } = require('./providers');
 const OpenAI = require('openai');
@@ -29,16 +28,16 @@ async function getMachineId() {
       const { stdout } = await execPromise(
         "ioreg -rd1 -c IOPlatformExpertDevice | awk -F'\"' '/IOPlatformUUID/{print $4}'"
       );
-      if (stdout.trim()) rawId = stdout.trim();
+      if (stdout.trim()) {rawId = stdout.trim();}
     } else if (process.platform === 'linux') {
       const id = (await fs.readFile('/etc/machine-id', 'utf8')).trim();
-      if (id) rawId = id;
+      if (id) {rawId = id;}
     } else if (process.platform === 'win32') {
       const { stdout } = await execPromise('wmic csproduct get UUID');
       const lines = stdout.trim().split('\n');
       if (lines.length > 1) {
         const uuid = lines[1].trim();
-        if (uuid && uuid !== 'FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF') rawId = uuid;
+        if (uuid && uuid !== 'FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF') {rawId = uuid;}
       }
     }
   } catch { /* fall through to persistent fallback */ }
@@ -49,7 +48,7 @@ async function getMachineId() {
     const idPath = path.join(configDir, 'machine-id');
     try {
       const existing = await fs.readFile(idPath, 'utf8');
-      if (existing.trim()) rawId = existing.trim();
+      if (existing.trim()) {rawId = existing.trim();}
     } catch { /* no file yet */ }
 
     if (!rawId) {
@@ -77,7 +76,7 @@ function runCoder(prompt) {
       cwd: process.cwd(),
       env,
       stdio: ['ignore', 'pipe', 'pipe'],
-      timeout: 600000,
+      timeout: 600000
     });
 
     let stdout = '';
@@ -110,14 +109,14 @@ function runQAChat(issue, enrichedDetails, qaName, useSuper = false) {
       issue_number: issue.number,
       issue_title: issue.title,
       issue_body: issue.body || '',
-      enriched_questions: enrichedDetails,
+      enriched_questions: enrichedDetails
     });
 
-    const args = ['--messenger', CONFIG.messenger, '--qa', qaName];
+    const args = ['--messenger', CONFIG.messenger, '--qa', qaName?.login];
     if (CONFIG.messenger === 'teams') {
       args.push('--auth', CONFIG.teams.authPath);
     }
-    if (useSuper) args.push('--super');
+    if (useSuper) {args.push('--super');}
 
     const env = { ...process.env };
     if (CONFIG.ai.chorusApiKey) {
@@ -134,7 +133,7 @@ function runQAChat(issue, enrichedDetails, qaName, useSuper = false) {
       cwd: process.cwd(),
       env,
       stdio: ['pipe', 'pipe', 'pipe'],
-      timeout: 1800000, // 30 min
+      timeout: 1800000 // 30 min
     });
 
     let stdout = '';
@@ -168,13 +167,13 @@ const CONFIG = {
   github: {
     owner: process.env.GITHUB_OWNER,
     repo: process.env.GITHUB_REPO,
-    token: process.env.GITHUB_TOKEN,
+    token: process.env.GITHUB_TOKEN
   },
   azuredevops: {
     org: process.env.AZDO_ORG,
     project: process.env.AZDO_PROJECT,
     repo: process.env.AZDO_REPO,
-    pat: process.env.AZDO_PAT,
+    pat: process.env.AZDO_PAT
   },
   messenger: process.env.MESSENGER || 'teams',
   teams: {
@@ -182,11 +181,11 @@ const CONFIG = {
     pollInterval: 60000 // Check for response every 60 seconds
   },
   slack: {
-    botToken: process.env.SLACK_BOT_TOKEN || '',
+    botToken: process.env.SLACK_BOT_TOKEN || ''
   },
   ai: {
-    enrichmentTool: 'claude',  // 'claude' or 'kimi'
-    codingTool: 'coder',       // 'coder', 'claude', or 'kimi'
+    enrichmentTool: 'claude', // 'claude' or 'kimi'
+    codingTool: 'coder', // 'coder', 'claude', or 'kimi'
     coderPath: path.join(__dirname, 'tools', 'coder.py'),
     qaPath: path.join(__dirname, 'tools', 'qa.py'),
     mapperPath: path.join(__dirname, 'tools', 'mapper.py'),
@@ -194,7 +193,7 @@ const CONFIG = {
       ? path.join(os.homedir(), '.config', 'chorus', '.venv', 'Scripts', 'python.exe')
       : path.join(os.homedir(), '.config', 'chorus', '.venv', 'bin', 'python'),
     chorusApiKey: process.env.CHORUS_API_KEY,
-    chorusApiUrl: process.env.CHORUS_API_URL || 'https://chorus-bad0f.web.app/v1',
+    chorusApiUrl: process.env.CHORUS_API_URL || 'https://chorus-bad0f.web.app/v1'
   }
 };
 
@@ -236,9 +235,9 @@ Thanks!
 IMPORTANT: Output ONLY the message above. Do not include any preamble, thinking process, or explanations. Start directly with "Hi! I need clarification..."`;
 
   console.log('🤖 Enriching issue with AI...');
-  
+
   const tool = CONFIG.ai.enrichmentTool;
-  
+
   if (tool === 'claude') {
     // Use Chorus proxy API
     if (!CONFIG.ai.chorusApiKey) {
@@ -246,13 +245,13 @@ IMPORTANT: Output ONLY the message above. Do not include any preamble, thinking
     }
     const openaiOpts = {
       apiKey: CONFIG.ai.chorusApiKey,
-      baseURL: CONFIG.ai.chorusApiUrl,
+      baseURL: CONFIG.ai.chorusApiUrl
     };
     if (CONFIG.ai.machineId) {
       openaiOpts.defaultHeaders = { 'X-Machine-Id': CONFIG.ai.machineId };
     }
     const openai = new OpenAI(openaiOpts);
-    
+
     const response = await openai.chat.completions.create({
       model: 'anthropic/claude-opus-4',
       max_tokens: 2000,
@@ -269,12 +268,12 @@ IMPORTANT: Output ONLY the message above. Do not include any preamble, thinking
     }
 
     return response.choices[0].message.content.trim();
-  } else {
-    // Use Kimi CLI
-    const escapedPrompt = prompt.replace(/"/g, '\\"').replace(/\$/g, '\\$');
-    const { stdout } = await execPromise(`kimi --prompt "${escapedPrompt}"`);
-    return stdout.trim();
   }
+  // Use Kimi CLI
+  const escapedPrompt = prompt.replace(/"/g, '\\"').replace(/\$/g, '\\$');
+  const { stdout } = await execPromise(`kimi --prompt "${escapedPrompt}"`);
+  return stdout.trim();
+
 }
 
 // ===== CODE GENERATION =====
@@ -396,10 +395,10 @@ async function getCodeRabbitReview(solution, issue, provider) {
     );
 
     // 5. Clean up — undo the commit so changes stay in working tree, then go back to main
-    await execPromise(`git reset --mixed HEAD~1`);  // undo commit, keep changes in working tree
-    await execPromise(`git stash`);                  // stash working tree changes
+    await execPromise(`git reset --mixed HEAD~1`); // undo commit, keep changes in working tree
+    await execPromise(`git stash`); // stash working tree changes
     await execPromise(`git checkout main`);
-    await execPromise(`git stash pop`);              // restore coder's changes on main
+    await execPromise(`git stash pop`); // restore coder's changes on main
     await execPromise(`git branch -D ${branchName}`).catch(() => {});
 
     return {
@@ -489,7 +488,7 @@ async function lintAndFix(solution, provider) {
     console.log('   Auto-fix applied');
   } catch (e) {
     // eslint exits non-zero when there are unfixable errors — that's expected
-    if (e.stdout) console.log(e.stdout);
+    if (e.stdout) {console.log(e.stdout);}
   }
 
   // Second pass: check for remaining errors
@@ -525,7 +524,7 @@ ${lintOutput.slice(0, 5000)}`;
 
     // Update solution with any new files coder touched
     for (const f of (fixResult.files_modified || [])) {
-      if (!solution.files_modified.includes(f)) solution.files_modified.push(f);
+      if (!solution.files_modified.includes(f)) {solution.files_modified.push(f);}
     }
 
     console.log('   Lint fix pass complete\n');
@@ -585,12 +584,12 @@ async function processTicket(issueArg, { useSuper = false, skipQA = false, qaNam
     if (gitStatus.trim()) {
       console.error('⚠️ Working directory has uncommitted changes. Commit or stash first:');
       console.error(gitStatus);
-      //throw new Error('Dirty working directory');
+      // throw new Error('Dirty working directory');
     }
     const { stdout: currentBranch } = await execPromise('git rev-parse --abbrev-ref HEAD');
     if (currentBranch.trim() !== 'main') {
       console.warn(`⚠️ Not on main branch (currently on ${currentBranch.trim()}). Switch to main first.`);
-      //throw new Error('Not on main branch');
+      // throw new Error('Not on main branch');
     }
 
     // 0b. Map the codebase so coder starts with full context
@@ -629,6 +628,7 @@ async function processTicket(issueArg, { useSuper = false, skipQA = false, qaNam
       console.log('⏭️  Skipping QA conversation (--skip-qa)\n');
     } else {
       const qaName = qaNameOverride || await provider.getUserDisplayName(issue.user.login);
+      console.log(JSON.stringify(qaName));
       console.log(`💬 Starting QA conversation with ${qaName?.login}...`);
       const qaResult = await runQAChat(issue, enrichedDetails, qaName, useSuper);
       qaResponse = qaResult.requirements;
@@ -642,8 +642,17 @@ async function processTicket(issueArg, { useSuper = false, skipQA = false, qaNam
       }
       console.log(`QA complete (${qaResult.conversation_rounds} rounds)\n`);
     }
-    
+
     // 4. Generate code (with retry if coder doesn't actually write files)
+    // Snapshot current working-tree state so we can detect what the coder *actually* changed
+    let baselineDirty = new Set();
+    try {
+      const { stdout: bDiff } = await execPromise('git diff --name-only');
+      const { stdout: bNew } = await execPromise('git ls-files --others --exclude-standard');
+      bDiff.trim().split('\n').filter(Boolean).forEach(f => baselineDirty.add(f));
+      bNew.trim().split('\n').filter(Boolean).forEach(f => baselineDirty.add(f));
+    } catch { /* non-git or error — baseline stays empty */ }
+
     const maxCodeAttempts = 3;
     let solution;
 
@@ -683,7 +692,27 @@ CRITICAL: You MUST write code to actual files. Do not just describe changes —
         throw new Error('Code generation failed');
       }
 
-      const filesChanged = (solution.files_modified || []).length + (solution.files_created || []).length;
+      let filesChanged = (solution.files_modified || []).length + (solution.files_created || []).length;
+
+      // If coder reports 0 files, check git for actual working-tree changes
+      // the coder may have written files without reporting them
+      if (filesChanged === 0) {
+        try {
+          const { stdout: gitDiff } = await execPromise('git diff --name-only');
+          const { stdout: gitUntracked } = await execPromise('git ls-files --others --exclude-standard');
+          const diffFiles = gitDiff.trim().split('\n').filter(Boolean).filter(f => !baselineDirty.has(f));
+          const untrackedFiles = gitUntracked.trim().split('\n').filter(Boolean).filter(f => !baselineDirty.has(f));
+          const gitChangedFiles = [...diffFiles, ...untrackedFiles];
+
+          if (gitChangedFiles.length > 0) {
+            console.log(`   Coder didn't report files, but git detected ${gitChangedFiles.length} changed file(s)`);
+            // Backfill the solution so downstream steps (lint, review, PR) work
+            solution.files_modified = [...(solution.files_modified || []), ...diffFiles];
+            solution.files_created = [...(solution.files_created || []), ...untrackedFiles];
+            filesChanged = gitChangedFiles.length;
+          }
+        } catch { /* git check failed, fall through to existing logic */ }
+      }
 
       if (filesChanged > 0) {
         break; // Success — coder actually wrote files
@@ -698,7 +727,7 @@ CRITICAL: You MUST write code to actual files. Do not just describe changes —
     }
 
     console.log('Code generation complete\n');
-    if (solution.summary) console.log(`Summary: ${solution.summary}\n`);
+    if (solution.summary) {console.log(`Summary: ${solution.summary}\n`);}
 
     // 5. Lint files the coder touched
     await lintAndFix(solution, provider);
@@ -754,11 +783,11 @@ CRITICAL: You MUST write code to actual files. Do not just describe changes —
     while (userIteration < maxUserIterations) {
       const allFiles = [...new Set([
         ...(solution.files_modified || []),
-        ...(solution.files_created || []),
+        ...(solution.files_created || [])
       ])];
       console.log('FILES CHANGED:');
       allFiles.forEach(f => console.log(`  ${f}`));
-      if (solution.summary) console.log(`\nSUMMARY: ${solution.summary}`);
+      if (solution.summary) {console.log(`\nSUMMARY: ${solution.summary}`);}
       console.log();
 
       const answer = await prompt(rl, '✅ Happy with the changes? (y/n): ');
@@ -856,7 +885,7 @@ function prompt(rl, question, hidden = false) {
         } else if (ch === '\u0003') {
           process.exit();
         } else if (ch === '\u007F' || ch === '\b') {
-          if (input.length > 0) input = input.slice(0, -1);
+          if (input.length > 0) {input = input.slice(0, -1);}
         } else {
           input += ch;
         }
@@ -888,7 +917,7 @@ async function setupGitHub() {
   } catch { /* no .env yet */ }
 
   const updates = { GITHUB_OWNER: owner, GITHUB_REPO: repo };
-  if (token) updates.GITHUB_TOKEN = token;
+  if (token) {updates.GITHUB_TOKEN = token;}
 
   for (const [key, value] of Object.entries(updates)) {
     const regex = new RegExp(`^${key}=.*$`, 'm');
@@ -904,7 +933,7 @@ async function setupGitHub() {
   // Update in-memory config
   CONFIG.github.owner = owner;
   CONFIG.github.repo = repo;
-  if (token) CONFIG.github.token = token;
+  if (token) {CONFIG.github.token = token;}
 
   console.log(`\n✅ GitHub config saved (${owner}/${repo})\n`);
 }
@@ -940,7 +969,7 @@ async function setupProxyAuth() {
       const mod = parsed.protocol === 'https:' ? https : http;
       const req = mod.request(parsed, { method: 'POST', headers: { 'Content-Type': 'application/json' } }, (res) => {
         let data = '';
-        res.on('data', (chunk) => data += chunk);
+        res.on('data', (chunk) => { data += chunk; });
         res.on('end', () => {
           try {
             resolve({ status: res.statusCode, body: JSON.parse(data) });
@@ -1099,7 +1128,7 @@ async function setupAzureDevOps() {
   } catch { /* no .env yet */ }
 
   const updates = { AZDO_ORG: adoOrg, AZDO_PROJECT: adoProject, AZDO_REPO: adoRepo, PROVIDER: 'azuredevops' };
-  if (adoPat) updates.AZDO_PAT = adoPat;
+  if (adoPat) {updates.AZDO_PAT = adoPat;}
 
   for (const [key, value] of Object.entries(updates)) {
     const regex = new RegExp(`^${key}=.*$`, 'm');
@@ -1115,7 +1144,7 @@ async function setupAzureDevOps() {
   CONFIG.azuredevops.org = adoOrg;
   CONFIG.azuredevops.project = adoProject;
   CONFIG.azuredevops.repo = adoRepo;
-  if (adoPat) CONFIG.azuredevops.pat = adoPat;
+  if (adoPat) {CONFIG.azuredevops.pat = adoPat;}
 
   console.log(`\n✅ Azure DevOps config saved (${adoOrg}/${adoProject}/${adoRepo})\n`);
 }
@@ -1154,6 +1183,70 @@ async function setup() {
   console.log('\n✅ Setup complete. You can now run: chorus run\n');
 }
 
+// === EASTER EGG ====
+
+function printZEP() {
+  const w = 'zep';
+  const size = 9;
+  const thick = 2;
+  const blank = ' '.repeat(w.length);
+
+  // Colors
+  const red = '\x1b[31m';
+  const yellow = '\x1b[33m';
+  const cyan = '\x1b[36m';
+  const bold = '\x1b[1m';
+  const reset = '\x1b[0m';
+
+  // Z
+  const Z = [];
+  for (let i = 0; i < size; i++) {
+    if (i < thick || i >= size - thick) {
+      Z.push(w.repeat(size));
+    } else {
+      const pos = size - 1 - i;
+      Z.push(blank.repeat(pos) + w.repeat(thick) + blank.repeat(Math.max(0, size - pos - thick)));
+    }
+  }
+
+  // E
+  const E = [];
+  for (let i = 0; i < size; i++) {
+    if (i < thick || i >= size - thick || (i >= Math.floor(size / 2) - Math.floor(thick / 2) && i < Math.floor(size / 2) + thick - Math.floor(thick / 2))) {
+      E.push(w.repeat(size));
+    } else {
+      E.push(w.repeat(thick) + blank.repeat(size - thick));
+    }
+  }
+
+  // P
+  const P = [];
+  for (let i = 0; i < size; i++) {
+    if (i < thick || (i >= Math.floor(size / 2) - Math.floor(thick / 2) && i < Math.floor(size / 2) + thick - Math.floor(thick / 2))) {
+      P.push(w.repeat(size));
+    } else if (i < Math.floor(size / 2)) {
+      P.push(w.repeat(thick) + blank.repeat(size - thick * 2) + w.repeat(thick));
+    } else {
+      P.push(w.repeat(thick) + blank.repeat(size - thick));
+    }
+  }
+
+  const gap = '   ';
+
+  console.log('\n\n');
+  for (let i = 0; i < size; i++) {
+    console.log(
+      bold + red + Z[i] + reset +
+      gap +
+      bold + yellow + E[i] + reset +
+      gap +
+      bold + cyan + P[i] + reset
+    );
+  }
+  console.log('\n\n');
+}
+
+
 // ===== CLI =====
 const command = process.argv[2];
 const _envExists = require('fs').existsSync(path.join(os.homedir(), '.config', 'chorus', '.env'));
@@ -1190,6 +1283,8 @@ if (command === 'setup') {
     const { issueArg, ...opts } = parseRunArgs();
     processTicket(issueArg, opts).catch(console.error);
   }
+} else if (command === 'zep') {
+  printZEP()
 } else {
   if (!_envExists) {
     console.log(`
@@ -1210,12 +1305,12 @@ Usage:
   chorus run 4464                    - Process specific issue by number
   chorus run <url>                   - Process issue from full URL (auto-detects provider)
   chorus run 4464 --super            - Use Opus 4.6 for QA evaluation
-  chorus run 4464 --qa 'John Doe'   - Specify QA contact name for chat
+  chorus run 4464 --qa 'John Doe'    - Specify QA contact name for chat
   chorus run 4464 --skip-qa          - Skip QA conversation, go straight to coding
 
 GitHub examples:
   chorus run 4464
-  chorus run https://github.com/shesha-io/shesha-framework/issues/4464
+  chorus run https://github.com/org/repository/issues/4464
 
 Azure DevOps examples:
   chorus run 456
@@ -1238,4 +1333,4 @@ Configuration is stored in ~/.config/chorus/.env
 Run "chorus setup" to configure credentials and messenger auth.
     `);
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chorus-cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Automated ticket resolution with AI, Teams, and Slack integration",
   "main": "index.js",
   "bin": {
@@ -15,7 +15,9 @@
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
     "setup": "node index.js setup",
-    "start": "node index.js run"
+    "start": "node index.js run",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   },
   "dependencies": {
     "@octokit/rest": "^20.0.2",
@@ -23,6 +25,9 @@
     "openai": "^4.0.0",
     "playwright": "^1.40.0"
   },
+  "devDependencies": {
+    "eslint": "^8.56.0"
+  },
   "engines": {
     "node": ">=18.0.0"
   }

package/providers/azuredevops.js

@@ -22,8 +22,8 @@ function normalize(workItem) {
     user: {
       login: fields['System.CreatedBy']?.displayName
         || fields['System.CreatedBy']?.uniqueName
-        || 'unknown',
-    },
+        || 'unknown'
+    }
   };
 }
 
@@ -37,14 +37,14 @@ function createAzureDevOpsProvider(config) {
     const encoded = Buffer.from(`:${pat}`).toString('base64');
     return {
       Authorization: `Basic ${encoded}`,
-      'Content-Type': 'application/json',
+      'Content-Type': 'application/json'
     };
   }
 
   async function adoFetch(url, options = {}) {
     const res = await fetch(url, {
       ...options,
-      headers: { ...authHeaders(), ...options.headers },
+      headers: { ...authHeaders(), ...options.headers }
     });
     if (!res.ok) {
       const text = await res.text();
@@ -59,7 +59,7 @@ function createAzureDevOpsProvider(config) {
               WHERE [System.AssignedTo] = @me
                 AND [System.State] <> 'Closed'
                 AND [System.State] <> 'Removed'
-              ORDER BY [System.CreatedDate] DESC`,
+              ORDER BY [System.CreatedDate] DESC`
     };
 
     const result = await adoFetch(
@@ -88,7 +88,7 @@ function createAzureDevOpsProvider(config) {
   }
 
   function parseIssueArg(arg) {
-    if (!arg) return null;
+    if (!arg) {return null;}
 
     // Full ADO URL: https://dev.azure.com/{org}/{project}/_workitems/edit/{id}
     const urlMatch = arg.match(
@@ -98,7 +98,7 @@ function createAzureDevOpsProvider(config) {
       return {
         org: urlMatch[1],
         project: urlMatch[2],
-        number: parseInt(urlMatch[3], 10),
+        number: parseInt(urlMatch[3], 10)
       };
     }
 
@@ -142,7 +142,7 @@ function createAzureDevOpsProvider(config) {
         const cleanPath = filepath.trim();
         if (cleanPath.includes('/') || cleanPath.includes('.')) {
           const dir = cleanPath.substring(0, cleanPath.lastIndexOf('/'));
-          if (dir) await execPromise(`mkdir -p ${dir}`).catch(() => {});
+          if (dir) {await execPromise(`mkdir -p ${dir}`).catch(() => {});}
           await fs.writeFile(cleanPath, content.trim());
         }
       }
@@ -176,7 +176,7 @@ function createAzureDevOpsProvider(config) {
       sourceRefName: `refs/heads/${branchName}`,
       targetRefName: 'refs/heads/main',
       title: `Fix: ${issue.title}`,
-      description: `Resolves AB#${issue.number}\n\n## Summary\n${summary}${filesChanged ? `\n\n## Files Changed\n${filesChanged}` : ''}`,
+      description: `Resolves AB#${issue.number}\n\n## Summary\n${summary}${filesChanged ? `\n\n## Files Changed\n${filesChanged}` : ''}`
     };
 
     const prResult = await adoFetch(
@@ -195,7 +195,7 @@ function createAzureDevOpsProvider(config) {
     parseIssueArg,
     createPR,
     getSolutionFiles,
-    gitAddSolutionFiles,
+    gitAddSolutionFiles
   };
 }
 

package/providers/github.js

@@ -22,7 +22,7 @@ function createGitHubProvider(config) {
       assignee: 'james-baloyi',
       sort: 'created',
       direction: 'desc',
-      per_page: 10,
+      per_page: 10
     });
 
     if (issues.length === 0) {
@@ -37,7 +37,7 @@ function createGitHubProvider(config) {
     const { data: issue } = await octokit.issues.get({
       owner: issueOwner || owner,
       repo: issueRepo || repo,
-      issue_number: number,
+      issue_number: number
     });
     return issue;
   }
@@ -49,7 +49,7 @@ function createGitHubProvider(config) {
   }
 
   function parseIssueArg(arg) {
-    if (!arg) return null;
+    if (!arg) {return null;}
 
     // Full GitHub URL: https://github.com/owner/repo/issues/123
     const urlMatch = arg.match(/github\.com\/([^/]+)\/([^/]+)\/issues\/(\d+)/);
@@ -86,7 +86,19 @@ function createGitHubProvider(config) {
     console.log('🌿 Creating PR...');
 
     if (!isCoder) {
-      await writeSolutionToFiles(solution._raw || solution);
+      // Legacy: parse code blocks and write files
+      const fileRegex = /```(.+?)\n([\s\S]+?)```/g;
+      const raw = solution._raw || solution;
+      let match;
+      while ((match = fileRegex.exec(raw)) !== null) {
+        const [, filepath, content] = match;
+        const cleanPath = filepath.trim();
+        if (cleanPath.includes('/') || cleanPath.includes('.')) {
+          const dir = cleanPath.substring(0, cleanPath.lastIndexOf('/'));
+          if (dir) {await execPromise(`mkdir -p ${dir}`).catch(() => {});}
+          await fs.writeFile(cleanPath, content.trim());
+        }
+      }
     }
 
     // Clean up stale branch from previous runs
@@ -137,7 +149,7 @@ ${filesChanged ? `\n## Files Changed\n${filesChanged}` : ''}`;
     parseIssueArg,
     createPR,
     getSolutionFiles,
-    gitAddSolutionFiles,
+    gitAddSolutionFiles
   };
 }
 

package/providers/index.js

@@ -8,9 +8,9 @@ const { createAzureDevOpsProvider } = require('./azuredevops');
  * Returns 'github', 'azuredevops', or null if undetectable.
  */
 function detectProviderFromArg(issueArg) {
-  if (!issueArg || typeof issueArg !== 'string') return null;
-  if (issueArg.includes('github.com')) return 'github';
-  if (issueArg.includes('dev.azure.com')) return 'azuredevops';
+  if (!issueArg || typeof issueArg !== 'string') {return null;}
+  if (issueArg.includes('github.com')) {return 'github';}
+  if (issueArg.includes('dev.azure.com')) {return 'azuredevops';}
   return null;
 }
 
@@ -35,7 +35,7 @@ function createProvider(config, issueArg) {
     }
     return createAzureDevOpsProvider({
       ...config.azuredevops,
-      codingTool: config.ai.codingTool,
+      codingTool: config.ai.codingTool
     });
   }
 
@@ -44,7 +44,7 @@ function createProvider(config, issueArg) {
     owner: config.github.owner,
     repo: config.github.repo,
     token: config.github.token,
-    codingTool: config.ai.codingTool,
+    codingTool: config.ai.codingTool
   });
 }
 

package/scripts/postinstall.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-const { execFileSync, execSync } = require('child_process');
+const { execFileSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -25,7 +25,7 @@ function run(cmd, args, opts) {
     return execFileSync(cmd, args, { stdio: 'inherit', ...opts });
   } catch (e) {
     console.error(`   Command failed: ${cmd} ${args.join(' ')}`);
-    if (e.message) console.error(`   ${e.message}`);
+    if (e.message) {console.error(`   ${e.message}`);}
     return null;
   }
 }
@@ -35,7 +35,7 @@ function findPython() {
     try {
       const version = execFileSync(candidate, ['--version'], {
         encoding: 'utf8',
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ['ignore', 'pipe', 'pipe']
       }).trim(); // e.g. "Python 3.11.4"
 
       const match = version.match(/Python (\d+)\.(\d+)/);

package/tools/coder.py

@@ -50,183 +50,8 @@ def is_token_limit_error(err):
     return "token limit exceeded" in msg or "rate_limit_error" in msg
 
 
-# ── Shared formatting rules (included in all prompts) ─────────────────────
-_FORMAT_RULES = """\
-OUTPUT FORMAT
-
-Your output is displayed raw in a terminal. Never use markdown.
-No headings with #, no **bold**, no *italic*, no `backticks`, no [links](url),
-no bullet characters like - or *.
-Use blank lines and indentation for structure. Use CAPS for section labels.
-Use plain numbered lists (1. 2. 3.) when listing things.
-Refer to code identifiers by name directly (e.g. myFunction not `myFunction`).
-No greetings, preambles, encouragement, or sign-offs.
-No "Great question!", "Let me", "Sure!", "I'll now", or similar filler.
-State what you are doing, then do it. After completing work, state what changed."""
-
-# ── Phase 1: Planning prompt (used once at the start of headless mode) ────
-PLAN_PROMPT = """\
-You are a coding agent. You receive a GitHub/Azure DevOps issue, a codebase map, \
-and optionally a QA conversation with clarified requirements. Your job is to \
-plan the implementation.
-
-Working directory: {cwd}
-
-""" + _FORMAT_RULES + """
-
-
-TASK
-
-Read the issue, QA conversation (if provided), and codebase map. Then produce a
-written plan with exactly these sections:
-
-UNDERSTANDING:
-What the issue is asking for in one sentence.
-
-QUESTIONS STILL OPEN:
-Anything unresolved from QA. If --skip-qa was used, list assumptions you are making
-and flag them clearly. Prefer the conservative/conventional choice for each.
-
-FILES TO READ:
-The minimum set of existing files you need to examine to understand the patterns,
-interfaces, and conventions. Maximum 8 files. Justify each.
-
-FILES TO CREATE:
-New files with their paths and a one-line description of contents.
-
-FILES TO MODIFY:
-Existing files with a one-line description of what changes.
-
-APPROACH:
-How you will implement this in 2-4 sentences. Reference specific patterns
-from the codebase map.
-
-ON AMBIGUITY
-
-When requirements are unclear and no QA conversation was provided:
-1. State your assumption explicitly.
-2. Choose the most conventional/standard approach.
-3. Flag it so the reviewer can catch disagreements early.
-Do not guess ambitiously. Guess conservatively. A correct simple implementation beats
-a broken ambitious one.
-"""
-
-# ── Phase 2: Execution prompt (used on every turn of the tool loop) ───────
-EXEC_PROMPT = """\
-You are a coding agent executing a plan. Implement the changes described in the
-plan below. Do not re-plan or re-analyze. Execute.
-
-Working directory: {cwd}
-
-""" + _FORMAT_RULES + """
-
-
-TOOL USAGE
-
-  Always use read_file before editing a file.
-  If edit_file fails with "old_string not found", re-read the file with read_file to
-  get the actual current content before retrying. Never guess at file contents.
-  Use edit_file for targeted changes. Use write_file for new files or complete rewrites.
-  Prefer editing existing files over creating new ones.
-  Use read_file, list_files, and search_files instead of bash with cat, find, or grep.
-
-EXECUTION RULES
-
-Reading files:
-  Only use read_file on files listed in the plan. If you discover you need another
-  file, note why -- but if you have read more than 12 files total, stop and
-  re-evaluate. You are exploring, not implementing.
-  The one exception to reading a file again: if edit_file fails because old_string
-  was not found, re-read that file to get its current content before retrying.
-
-Writing code:
-  Follow existing patterns exactly. Match the conventions you observed for: naming,
-  exports, file structure, import ordering, indentation, and comment style.
-  Write complete files. Do not leave TODOs, placeholders, or "implement this" comments.
-  If the issue asks for a tool/script, it must work non-interactively (accept arguments
-  or config, not interactive prompts) unless the issue explicitly requires interactivity.
-
-Shell commands (bash tool):
-  You may run bash for: installing dependencies, running the project's existing
-  linter, running the project's existing tests, checking TypeScript compilation.
-  You may not run bash for: exploratory searching beyond what was in the plan,
-  reading files you did not plan to read, testing scripts with improvised piped input.
-  Maximum 10 bash commands total. If you are approaching this limit, you are doing
-  too much exploration or too much debugging. Ship what you have.
-
-BUDGET DISCIPLINE
-
-  Front-load the high-value work. Write the actual implementation code early. File
-  exploration is not progress -- committed code is progress.
-
-  Do not retry the same failing approach. If something fails twice, choose a different
-  approach or simplify. Do not iterate more than twice on the same problem.
-
-  If something fundamental is broken, stop. Produce what you have, note what is
-  incomplete, and let the human finish. A partial, clean implementation is more
-  valuable than a complete, broken one.
-
-  No yak-shaving. Deliver the core ask. Do not create demo scripts, markdown docs,
-  bash wrappers, or sample outputs unless the issue asks for them.
-
-WHAT NOT TO DO
-
-  Do not explore the filesystem to "understand the project." The codebase map and your
-  plan already cover that. Read specific files for specific reasons.
-
-  Do not overuse list_files, search_files, or bash for exploration. If you need more
-  than 3 exploratory calls, your plan was insufficient.
-
-  Do not create interactive scripts that require stdin.
-  Do not create documentation or READMEs unless the issue asks for them.
-  Do not modify package.json, CI configs, or project infrastructure unless the issue
-  specifically requires it.
-  Do not keep going when stuck. After 2 failed attempts at the same problem, note the
-  issue, deliver what works, and move on.
-
-WHEN YOU ARE DONE
-
-End with a verify block:
-
-1. List every file you created or modified.
-2. For each, confirm it is syntactically valid (ran linter or compiler if available).
-3. If tests exist for the area you changed, run them and confirm they pass.
-4. If you wrote a script/CLI tool, show the --help output or a dry-run invocation.
-5. Write a summary in this exact format:
-
-PR_TITLE: conventional commit format (feat:, fix:, chore:, etc.)
-PR_BODY: what changed, why, any assumptions made, anything the reviewer should
-look at carefully.
-
-Do not output anything after the summary.
-"""
-
-# ── Interactive REPL prompt (conversational, no phased workflow) ──────────
-REPL_PROMPT = """\
-You are a coding agent running in an interactive terminal session.
-Working directory: {cwd}
-
-""" + _FORMAT_RULES + """
-
-
-TOOL USAGE
-
-  Always use read_file before editing a file.
-  If edit_file fails with "old_string not found", re-read the file with read_file to
-  get the actual current content before retrying. Never guess at file contents.
-  Use edit_file for targeted changes. Use write_file for new files or complete rewrites.
-  Prefer editing existing files over creating new ones.
-  Use read_file, list_files, and search_files instead of bash with cat, find, or grep.
-
-GUIDELINES
-
-  Be direct and concise. State what you will do, then do it.
-  Always use your tools. Never guess when you can look.
-  Do not write new unit tests unless the project already has substantive test coverage.
-  Do not attempt to build or compile the project unless asked.
-  Do not add unnecessary comments, docstrings, or type annotations.
-  For bash commands, prefer non-interactive commands.
-"""
+# System prompts are served by the Chorus proxy (chorus_mode field).
+# The client sends mode + context; the server injects the full prompt.
 
 # ── Tool Definitions ────────────────────────────────────────────────────────
 
@@ -754,21 +579,22 @@ def prune_context(messages, token_budget=None):
 
 # ── Streaming Response Handler ──────────────────────────────────────────────
 
-def stream_response(client, messages, system):
+def stream_response(client, messages, chorus_mode, chorus_context):
     """Stream LLM response via Chorus proxy, handling tool-use loops until done."""
-    openai_messages = [{"role": "system", "content": system}]
-    # Convert existing messages to OpenAI format
-    for msg in messages:
-        openai_messages.append(msg)
-    
+    openai_messages = list(messages)
+
     while True:
         printed_text = False
-        
+
         response = client.chat.completions.create(
             model=MODEL,
             max_tokens=MAX_TOKENS,
             messages=openai_messages,
             tools=TOOLS,
+            extra_body={
+                "chorus_mode": chorus_mode,
+                "chorus_context": chorus_context,
+            },
         )
 
         message = response.choices[0].message
@@ -824,7 +650,7 @@ def stream_response(client, messages, system):
 
 # ── Headless Prompt Mode ────────────────────────────────────────────────────
 
-def run_prompt(client, prompt, plan_system, exec_system):
+def run_prompt(client, prompt, chorus_context):
     """Run a single prompt non-interactively. Returns a JSON-serializable dict."""
 
     # PHASE 1: Planning - separate API call with planning prompt
@@ -833,7 +659,6 @@ def run_prompt(client, prompt, plan_system, exec_system):
 
     plan_text = ""
     plan_messages = [
-        {"role": "system", "content": plan_system},
         {"role": "user", "content": f"{prompt}\n\nProduce the plan using the exact sections: UNDERSTANDING, QUESTIONS STILL OPEN, FILES TO READ, FILES TO CREATE, FILES TO MODIFY, APPROACH. Do NOT write any code yet."}
     ]
 
@@ -842,6 +667,10 @@ def run_prompt(client, prompt, plan_system, exec_system):
             model=MODEL,
             max_tokens=MAX_TOKENS,
             messages=plan_messages,
+            extra_body={
+                "chorus_mode": "plan",
+                "chorus_context": chorus_context,
+            },
         )
         plan_text = plan_response.choices[0].message.content.strip()
 
@@ -862,7 +691,6 @@ def run_prompt(client, prompt, plan_system, exec_system):
         exec_user_content = f"{prompt}\n\nHere is your plan. Follow it.\n\n{plan_text}"
 
     messages = [
-        {"role": "system", "content": exec_system},
         {"role": "user", "content": exec_user_content}
     ]
     files_modified = set()
@@ -886,6 +714,10 @@ def run_prompt(client, prompt, plan_system, exec_system):
                 max_tokens=MAX_TOKENS,
                 messages=messages,
                 tools=TOOLS,
+                extra_body={
+                    "chorus_mode": "exec",
+                    "chorus_context": chorus_context,
+                },
             )
         except Exception as e:
             if is_token_limit_error(e):
@@ -1073,12 +905,15 @@ def main():
         except OSError:
             pass
 
+    # Build context for server-side prompt injection
+    chorus_context = {"cwd": cwd}
+    if map_suffix:
+        chorus_context["map"] = map_suffix.strip()
+
     # ── Headless prompt mode ────────────────────────────────────────────
     if args.prompt:
-        plan_system = PLAN_PROMPT.format(cwd=cwd) + map_suffix
-        exec_system = EXEC_PROMPT.format(cwd=cwd) + map_suffix
         try:
-            result = run_prompt(client, args.prompt, plan_system, exec_system)
+            result = run_prompt(client, args.prompt, chorus_context)
             print(json.dumps(result, indent=2))
             sys.exit(0 if result["completed"] else 1)
         except Exception as e:
@@ -1103,7 +938,6 @@ def main():
             sys.exit(130)
 
     # ── Interactive REPL mode ───────────────────────────────────────────
-    system = REPL_PROMPT.format(cwd=cwd) + map_suffix
     messages = []
 
     mode_label = f" {C.YELLOW}(safe mode){C.RESET}" if SAFE_MODE else ""
@@ -1175,7 +1009,7 @@ def main():
 
             try:
                 print()
-                stream_response(client, messages, system)
+                stream_response(client, messages, "repl", chorus_context)
                 print()
             except KeyboardInterrupt:
                 del messages[snapshot:]