chorus-cli 0.4.2 → 0.4.4

package/index.js

@@ -18,6 +18,43 @@ const execPromise = util.promisify(exec);
 const execFilePromise = util.promisify(execFile);
 const fs = require('fs').promises;
 
+// Returns a stable hardware UUID for this machine, with a persistent fallback
+async function getMachineId() {
+  try {
+    if (process.platform === 'darwin') {
+      const { stdout } = await execPromise(
+        "ioreg -rd1 -c IOPlatformExpertDevice | awk -F'\"' '/IOPlatformUUID/{print $4}'"
+      );
+      if (stdout.trim()) return stdout.trim();
+    } else if (process.platform === 'linux') {
+      const fsp = require('fs').promises;
+      const id = (await fsp.readFile('/etc/machine-id', 'utf8')).trim();
+      if (id) return 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') return uuid;
+      }
+    }
+  } catch { /* fall through to persistent fallback */ }
+
+  // Persistent fallback: generate and cache a random UUID
+  const configDir = path.join(os.homedir(), '.config', 'chorus');
+  const idPath = path.join(configDir, 'machine-id');
+  try {
+    const existing = await fs.readFile(idPath, 'utf8');
+    if (existing.trim()) return existing.trim();
+  } catch { /* no file yet */ }
+
+  const { randomUUID } = require('crypto');
+  const newId = randomUUID();
+  await fs.mkdir(configDir, { recursive: true });
+  await fs.writeFile(idPath, newId + '\n');
+  return newId;
+}
+
 // Run coder.py with real-time stderr streaming so progress is visible
 function runCoder(prompt) {
   return new Promise((resolve, reject) => {
@@ -26,6 +63,9 @@ function runCoder(prompt) {
       env.CHORUS_API_KEY = CONFIG.ai.chorusApiKey;
       env.CHORUS_API_URL = CONFIG.ai.chorusApiUrl;
     }
+    if (CONFIG.ai.machineId) {
+      env.CHORUS_MACHINE_ID = CONFIG.ai.machineId;
+    }
     const proc = spawn(CONFIG.ai.venvPython, [CONFIG.ai.coderPath, '--prompt', prompt], {
       cwd: process.cwd(),
       env,
@@ -77,6 +117,9 @@ function runQAChat(issue, enrichedDetails, qaName, useSuper = false) {
       env.CHORUS_API_KEY = CONFIG.ai.chorusApiKey;
       env.CHORUS_API_URL = CONFIG.ai.chorusApiUrl;
     }
+    if (CONFIG.ai.machineId) {
+      env.CHORUS_MACHINE_ID = CONFIG.ai.machineId;
+    }
     if (CONFIG.messenger === 'slack' && CONFIG.slack.botToken) {
       env.SLACK_BOT_TOKEN = CONFIG.slack.botToken;
     }
@@ -194,10 +237,14 @@ IMPORTANT: Output ONLY the message above. Do not include any preamble, thinking
     if (!CONFIG.ai.chorusApiKey) {
       throw new Error('CHORUS_API_KEY environment variable is required. Run "chorus setup" to configure.');
     }
-    const openai = new OpenAI({
+    const openaiOpts = {
       apiKey: CONFIG.ai.chorusApiKey,
       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',
@@ -506,6 +553,9 @@ async function processTicket(issueArg, { useSuper = false, skipQA = false, qaNam
   try {
     console.log('🚀 Starting ticket processing...\n');
 
+    // Resolve machine fingerprint for per-machine usage tracking
+    CONFIG.ai.machineId = await getMachineId();
+
     // 0. Ensure Python venv exists and has required dependencies
     const reqFile = path.join(__dirname, 'tools', 'requirements.txt');
     const { execFileSync: efs } = require('child_process');
@@ -869,6 +919,9 @@ async function setupProxyAuth() {
 
   const baseUrl = CONFIG.ai.chorusApiUrl.replace(/\/v1\/?$/, '');
 
+  // Resolve machine fingerprint so the server can track per-machine usage
+  const machineId = await getMachineId();
+
   // Try register first, fall back to login if already registered
   let apiKey;
   try {
@@ -895,11 +948,11 @@ async function setupProxyAuth() {
     });
 
     console.log('   Registering...');
-    let res = await doPost(`${baseUrl}/auth/register`, { email, password });
+    let res = await doPost(`${baseUrl}/auth/register`, { email, password, machineId });
 
     if (res.status === 409 || (res.body && res.body.error && res.body.error.includes('already'))) {
       console.log('   Account exists, logging in...');
-      res = await doPost(`${baseUrl}/auth/login`, { email, password });
+      res = await doPost(`${baseUrl}/auth/login`, { email, password, machineId });
     }
 
     if (res.status >= 400) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chorus-cli",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Automated ticket resolution with AI, Teams, and Slack integration",
   "main": "index.js",
   "bin": {

package/tools/coder.py

@@ -50,23 +50,29 @@ def is_token_limit_error(err):
     return "token limit exceeded" in msg or "rate_limit_error" in msg
 
 SYSTEM_PROMPT = """\
-You are a coding agent running in the terminal.
+You are a coding agent running inside a CLI tool called Chorus.
+Your output goes straight to a terminal. There is no browser, no rich renderer.
 Working directory: {cwd}
 
 You help with software engineering tasks: writing code, debugging, refactoring, \
 explaining code, running commands, and managing files.
 
 Formatting:
-- Your output is displayed raw in a terminal. Never use markdown.
-- No ## headers, **bold**, *italic*, [links](url), or bullet symbols like -.
+- Plain text only. Never use markdown.
+- No ## headers, **bold**, *italic*, `backticks`, [links](url), or bullet symbols like -.
 - Use blank lines, indentation, and CAPS for emphasis or section labels.
 - Use plain numbered lists (1. 2. 3.) when listing things.
-- For inline code references, just use the name directly (e.g. myFunction, not `myFunction`).
-- Keep responses short and scannable.
+- Refer to code identifiers by name directly (e.g. myFunction, not `myFunction`).
+
+Communication style:
+- Be terse. Say what you are doing and why in one or two lines, then do it.
+- No greetings, preambles, encouragement, or sign-offs.
+- No "Great question!", "Let me", "Sure!", "I'll now", or similar filler.
+- When explaining your plan, use short declarative sentences. Skip obvious reasoning.
+- After completing work, state what changed and nothing else.
 
 {approach}Guidelines:
-- Be direct and concise. No filler.
-- Always use your tools. If a question can be answered by running a command (git, ls, etc.), use the bash tool — never guess.
+- Always use your tools. If a question can be answered by running a command (git, ls, etc.), use the bash tool. Never guess.
 - Always read a file before editing it.
 - If edit_file fails with "old_string not found", re-read the 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.
@@ -692,7 +698,7 @@ def run_prompt(client, prompt, system):
     
     plan_messages = [
         {"role": "system", "content": system},
-        {"role": "user", "content": f"{prompt}\n\nBefore making any code changes, please analyze this issue and explain:\n1. What is the problem/goal?\n2. What files do you need to examine first?\n3. What is your overall approach to solving this?\n4. Which files will you modify and how?\n\nDo NOT write any code yet - just explain your plan."}
+        {"role": "user", "content": f"{prompt}\n\nBefore making any code changes, briefly state:\n1. The goal\n2. Files to examine\n3. Files to modify and how\n\nKeep it short. Do NOT write any code yet."}
     ]
     
     try:
@@ -924,7 +930,11 @@ def main():
         sys.exit(1)
 
     base_url = os.environ.get("CHORUS_API_URL", "https://chorus-bad0f.web.app/v1")
-    client = OpenAI(api_key=api_key, base_url=base_url)
+    machine_id = os.environ.get("CHORUS_MACHINE_ID")
+    client_kwargs = {"api_key": api_key, "base_url": base_url}
+    if machine_id:
+        client_kwargs["default_headers"] = {"X-Machine-Id": machine_id}
+    client = OpenAI(**client_kwargs)
     system = SYSTEM_PROMPT.format(cwd=os.getcwd(), approach=APPROACH_BLOCK)
 
     # Load codebase map if available

package/tools/qa.py

@@ -403,7 +403,11 @@ Write a clear numbered list of requirements. Each requirement should be specific
 def run_qa_chat(issue_context, messenger, qa_name):
     api_key = os.environ.get("CHORUS_API_KEY")
     base_url = os.environ.get("CHORUS_API_URL", "https://chorus-bad0f.web.app/v1")
-    client = OpenAI(api_key=api_key, base_url=base_url)
+    machine_id = os.environ.get("CHORUS_MACHINE_ID")
+    client_kwargs = {"api_key": api_key, "base_url": base_url}
+    if machine_id:
+        client_kwargs["default_headers"] = {"X-Machine-Id": machine_id}
+    client = OpenAI(**client_kwargs)
     conversation = []
     raw_responses = []