chorus-cli 0.4.6 → 0.4.7

package/index.js

@@ -54,9 +54,8 @@ async function getMachineId() {
 
     if (!rawId) {
       rawId = randomUUID();
-      const configDir2 = path.join(os.homedir(), '.config', 'chorus');
-      await fs.mkdir(configDir2, { recursive: true });
-      await fs.writeFile(path.join(configDir2, 'machine-id'), rawId + '\n');
+      await fs.mkdir(configDir, { recursive: true });
+      await fs.writeFile(idPath, rawId + '\n');
     }
   }
 
@@ -581,7 +580,7 @@ async function processTicket(issueArg, { useSuper = false, skipQA = false, qaNam
       efs(CONFIG.ai.venvPython, ['-m', 'pip', 'install', '-r', reqFile], { stdio: 'inherit' });
     }
 
-    // 0a. Verify no modified tracked files (untracked files like .coder/ are fine)
+    // 0a. Verify no modified tracked files (untracked files like .chorus/ are fine)
     const { stdout: gitStatus } = await execPromise('git status --porcelain --untracked-files=no');
     if (gitStatus.trim()) {
       console.error('⚠️ Working directory has uncommitted changes. Commit or stash first:');
@@ -907,7 +906,7 @@ async function setupGitHub() {
   CONFIG.github.repo = repo;
   if (token) CONFIG.github.token = token;
 
-  console.log(`\n✅ GitHub config saved to ${envPath} (${owner}/${repo})\n`);
+  console.log(`\n✅ GitHub config saved (${owner}/${repo})\n`);
 }
 
 async function setupProxyAuth() {
@@ -1003,7 +1002,7 @@ async function setupProxyAuth() {
   CONFIG.ai.chorusApiKey = apiKey;
   process.env.CHORUS_API_KEY = apiKey;
 
-  console.log(`\n✅ Chorus API key saved to ${envPath}\n`);
+  console.log(`\n✅ Chorus API key saved\n`);
 }
 
 async function setupTeamsAuth() {
@@ -1028,7 +1027,7 @@ async function setupTeamsAuth() {
   await context.storageState({ path: CONFIG.teams.authPath });
   await browser.close();
 
-  console.log(`\n✅ Authentication state saved to ${CONFIG.teams.authPath}`);
+  console.log(`\n✅ Teams authentication saved`);
 }
 
 async function setupSlack() {
@@ -1076,7 +1075,7 @@ async function setupSlack() {
   CONFIG.messenger = 'slack';
   CONFIG.slack.botToken = token;
 
-  console.log(`\n✅ Slack config saved to ${envPath}\n`);
+  console.log(`\n✅ Slack config saved\n`);
 }
 
 async function setupAzureDevOps() {
@@ -1118,7 +1117,7 @@ async function setupAzureDevOps() {
   CONFIG.azuredevops.repo = adoRepo;
   if (adoPat) CONFIG.azuredevops.pat = adoPat;
 
-  console.log(`\n✅ Azure DevOps config saved to ${envPath} (${adoOrg}/${adoProject}/${adoRepo})\n`);
+  console.log(`\n✅ Azure DevOps config saved (${adoOrg}/${adoProject}/${adoRepo})\n`);
 }
 
 async function setup() {

package/package.json

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

package/tools/coder.py

@@ -785,7 +785,6 @@ def stream_response(client, messages, system):
             tool_results = []
             for tool_call in message.tool_calls:
                 function_name = tool_call.function.name
-                import json
                 try:
                     arguments = json.loads(tool_call.function.arguments)
                 except json.JSONDecodeError:
@@ -915,7 +914,6 @@ def run_prompt(client, prompt, plan_system, exec_system):
             tool_results = []
             for tool_call in message.tool_calls:
                 function_name = tool_call.function.name
-                import json
                 try:
                     arguments = json.loads(tool_call.function.arguments)
                 except json.JSONDecodeError:
@@ -1064,7 +1062,7 @@ def main():
 
     # Load codebase map if available
     map_suffix = ""
-    map_file = Path.cwd() / ".coder" / "map.md"
+    map_file = Path.cwd() / ".chorus" / "map.md"
     if map_file.exists():
         try:
             map_content = map_file.read_text(encoding="utf-8").strip()
@@ -1115,7 +1113,7 @@ def main():
     print(f"{C.DIM}Commands: /clear /quit /help{C.RESET}")
     print()
 
-    histfile = os.path.expanduser("~/.coder_history")
+    histfile = os.path.expanduser("~/.chorus_history")
     try:
         readline.read_history_file(histfile)
     except (FileNotFoundError, OSError, PermissionError):

package/tools/mapper.py

@@ -2,7 +2,7 @@
 """
 mapper.py — Generate a codebase map for the coder agent.
 
-Scans a project directory and produces a compact .coder/map.md that coder
+Scans a project directory and produces a compact .chorus/map.md that coder
 loads into its system prompt, so it starts every session already knowing
 the file structure, key modules, exports, dependencies, and test status.
 
@@ -275,6 +275,157 @@ def detect_project(root):
     return info
 
 
+def _parse_jsonc(text):
+    """Parse JSON with trailing commas and // comments (tsconfig, eslint, etc.)."""
+    # Strip single-line comments (but not inside strings)
+    lines = []
+    for line in text.splitlines():
+        stripped = line.lstrip()
+        if stripped.startswith("//"):
+            continue
+        # Remove inline // comments (naive but covers common cases)
+        in_str = False
+        result = []
+        i = 0
+        while i < len(line):
+            ch = line[i]
+            if ch == '"' and (i == 0 or line[i - 1] != '\\'):
+                in_str = not in_str
+            elif ch == '/' and i + 1 < len(line) and line[i + 1] == '/' and not in_str:
+                break
+            result.append(ch)
+            i += 1
+        lines.append(''.join(result))
+    cleaned = '\n'.join(lines)
+    # Strip trailing commas before } or ]
+    cleaned = re.sub(r',\s*([}\]])', r'\1', cleaned)
+    return json.loads(cleaned)
+
+
+def detect_project_rules(root):
+    """Extract project configuration and rules that the coder should follow."""
+    rules = {}
+
+    # TypeScript config — resolve extends chain to find compilerOptions
+    ts_candidates = ["tsconfig.json", "tsconfig.app.json", "tsconfig.build.json"]
+    ts_checked = set()
+    ts_queue = [name for name in ts_candidates if (root / name).exists()]
+    ts_merged = {}
+
+    while ts_queue:
+        name = ts_queue.pop(0)
+        if name in ts_checked:
+            continue
+        ts_checked.add(name)
+        ts_path = root / name
+        if not ts_path.exists():
+            continue
+        try:
+            data = _parse_jsonc(ts_path.read_text())
+            # Follow extends
+            extends = data.get("extends")
+            if extends and isinstance(extends, str):
+                ext_name = extends.lstrip("./")
+                if ext_name not in ts_checked:
+                    ts_queue.append(ext_name)
+            # Merge compilerOptions (later files override earlier)
+            compiler = data.get("compilerOptions", {})
+            for key in ("strict", "target", "module", "moduleResolution",
+                        "jsx", "baseUrl", "paths", "esModuleInterop",
+                        "noImplicitAny", "strictNullChecks", "skipLibCheck"):
+                if key in compiler:
+                    ts_merged[key] = compiler[key]
+            if data.get("include"):
+                ts_merged["include"] = data["include"]
+            if data.get("exclude"):
+                ts_merged["exclude"] = data["exclude"]
+        except (json.JSONDecodeError, OSError, ValueError):
+            pass
+
+    if ts_merged:
+        rules["tsconfig.json"] = ts_merged
+
+    # ESLint config
+    eslint_files = [
+        ".eslintrc.json", ".eslintrc.js", ".eslintrc.cjs", ".eslintrc.yml",
+        ".eslintrc.yaml", ".eslintrc", "eslint.config.js", "eslint.config.mjs",
+        "eslint.config.cjs",
+    ]
+    for name in eslint_files:
+        eslint_path = root / name
+        if eslint_path.exists():
+            try:
+                content = eslint_path.read_text(encoding="utf-8", errors="replace")
+                # For JSON configs, parse and extract key fields
+                if name.endswith(".json") or name == ".eslintrc":
+                    try:
+                        data = _parse_jsonc(content)
+                        summary = {}
+                        if data.get("extends"):
+                            summary["extends"] = data["extends"]
+                        if data.get("parser"):
+                            summary["parser"] = data["parser"]
+                        if data.get("rules"):
+                            summary["rules"] = data["rules"]
+                        rules[name] = summary
+                    except json.JSONDecodeError:
+                        # Treat as raw text
+                        if len(content) <= 3000:
+                            rules[name] = content
+                else:
+                    # JS/YAML configs — include raw (truncated)
+                    if len(content) <= 3000:
+                        rules[name] = content
+                    else:
+                        rules[name] = content[:3000] + "\n... (truncated)"
+            except OSError:
+                pass
+            break  # Only include the first eslint config found
+
+    # Prettier config
+    prettier_files = [
+        ".prettierrc", ".prettierrc.json", ".prettierrc.js", ".prettierrc.cjs",
+        ".prettierrc.yml", ".prettierrc.yaml", "prettier.config.js",
+        "prettier.config.cjs",
+    ]
+    for name in prettier_files:
+        p_path = root / name
+        if p_path.exists():
+            try:
+                content = p_path.read_text(encoding="utf-8", errors="replace")
+                if len(content) <= 1000:
+                    rules[name] = content
+            except OSError:
+                pass
+            break
+
+    # .editorconfig
+    ec_path = root / ".editorconfig"
+    if ec_path.exists():
+        try:
+            content = ec_path.read_text(encoding="utf-8", errors="replace")
+            if len(content) <= 1000:
+                rules[".editorconfig"] = content
+        except OSError:
+            pass
+
+    # AI agent instructions (CLAUDE.md, CONTRIBUTING.md, .cursorrules)
+    for name in ("CLAUDE.md", ".claude", "CONTRIBUTING.md", ".cursorrules",
+                 ".github/CONTRIBUTING.md"):
+        ai_path = root / name
+        if ai_path.exists() and ai_path.is_file():
+            try:
+                content = ai_path.read_text(encoding="utf-8", errors="replace")
+                if len(content) <= 5000:
+                    rules[name] = content
+                else:
+                    rules[name] = content[:5000] + "\n... (truncated)"
+            except OSError:
+                pass
+
+    return rules
+
+
 def detect_tests(root):
     """Check if the project has substantive test coverage."""
     test_dir_names = {"test", "tests", "__tests__", "spec", "specs", "test_suite"}
@@ -364,6 +515,22 @@ def generate_map(root):
             lines.append(f"  Dev dependencies: {dev_str}")
         lines.append("")
 
+    # Project rules and configs
+    rules = detect_project_rules(root)
+    if rules:
+        lines.append("PROJECT RULES")
+        for name, value in rules.items():
+            lines.append(f"  {name}:")
+            if isinstance(value, dict):
+                for k, v in value.items():
+                    lines.append(f"    {k}: {json.dumps(v) if not isinstance(v, str) else v}")
+            elif isinstance(value, str):
+                for vline in value.splitlines():
+                    lines.append(f"    {vline}")
+            else:
+                lines.append(f"    {value}")
+        lines.append("")
+
     # Tests
     test_status, test_files = detect_tests(root)
     lines.append("TESTS")
@@ -434,22 +601,22 @@ def main():
 
     map_content = generate_map(root)
 
-    out_dir = root / ".coder"
+    out_dir = root / ".chorus"
     out_dir.mkdir(exist_ok=True)
     out_file = out_dir / "map.md"
     out_file.write_text(map_content, encoding="utf-8")
 
-    # Add .coder to .gitignore if not already there
+    # Add .chorus to .gitignore if not already there
     gitignore = root / ".gitignore"
     if gitignore.exists():
         gi_text = gitignore.read_text()
-        if ".coder" not in gi_text and ".coder/" not in gi_text:
+        if ".chorus" not in gi_text and ".chorus/" not in gi_text:
             with open(gitignore, "a") as f:
-                f.write("\n.coder/\n")
-            print(f"Added .coder/ to .gitignore", file=sys.stderr)
+                f.write("\n.chorus/\n")
+            print(f"Added .chorus/ to .gitignore", file=sys.stderr)
     elif (root / ".git").is_dir():
-        gitignore.write_text(".coder/\n")
-        print(f"Created .gitignore with .coder/", file=sys.stderr)
+        gitignore.write_text(".chorus/\n")
+        print(f"Created .gitignore with .chorus/", file=sys.stderr)
 
     # Stats
     line_count = map_content.count("\n")