nex-code 0.3.3 → 0.3.4

package/README.md

@@ -18,7 +18,7 @@
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License: MIT"></a>
   <img src="https://img.shields.io/badge/node-%3E%3D18-brightgreen.svg" alt="Node >= 18">
   <img src="https://img.shields.io/badge/dependencies-2-green.svg" alt="Dependencies: 2">
-  <img src="https://img.shields.io/badge/tests-1780-blue.svg" alt="Tests: 1780">
+  <img src="https://img.shields.io/badge/tests-1783-blue.svg" alt="Tests: 1783">
 </p>
 
 ---
@@ -55,7 +55,7 @@ That's it. You'll see the banner, your project context, and the `>` prompt. Star
 | **Multi-provider** | 5 providers, swap at runtime | Anthropic only | Multi-provider | Multi-provider |
 | **Free local models** | Ollama (no API key) | — | Ollama | — |
 | **Runtime dependencies** | 2 (axios, dotenv) | Heavy | Heavy | Electron |
-| **Test coverage** | 1780 tests, 90% coverage | — | — | — |
+| **Test coverage** | 1783 tests, 90% coverage | — | — | — |
 | **Tool tiers** | Auto-adapts tools per model | Fixed | Fixed | Fixed |
 | **No lock-in** | `/model openai:gpt-4o` ↔ `/model local:llama3` | Anthropic only | Config change | Config change |
 
@@ -327,6 +327,7 @@ On startup, the CLI reads your project and injects context into the system promp
 - `README.md` — first 50 lines
 - Git info — branch, status, recent commits
 - `.gitignore` content
+- **Merge conflicts** — detected and shown as a red warning; included in LLM context so the agent avoids editing conflicted files
 
 ### Context Engine
 Automatic token management with compression when the context window gets full. Tracks token usage across system prompt, conversation, tool results, and tool definitions.
@@ -338,6 +339,7 @@ Three tiers of protection:
 - **SSH read-only safe list**: Common read-only SSH commands (`systemctl status`, `journalctl`, `tail`, `cat`, `git pull`, etc.) skip the dangerous-command confirmation
 - **Path protection**: Sensitive paths (`.ssh/`, `.aws/`, `.env`, credentials) are blocked from file operations
 - **Pre-push secret detection**: Git hook scans diffs for API keys, private keys, hardcoded secrets, SSH+IP patterns, and `.env` leaks before allowing push
+- **Post-merge automation**: Auto-bumps patch version on `devel→main` merge; runs `npm install` when `package.json` changes
 
 ### Sessions
 Save and restore conversations:
@@ -687,7 +689,7 @@ npm test              # Run all tests with coverage
 npm run test:watch    # Watch mode
 ```
 
-43 test suites, 1780 tests, 90% statement / 83% branch coverage.
+43 test suites, 1783 tests, 90% statement / 83% branch coverage.
 
 CI runs on GitHub Actions (Node 18/20/22).
 

package/cli/context.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 const { C } = require('./ui');
+const { getMergeConflicts } = require('./git');
 
 function safe(fn) {
   try {
@@ -50,6 +51,13 @@ function gatherProjectContext(cwd) {
   );
   if (log) parts.push(`RECENT COMMITS:\n${log}`);
 
+  // Merge conflicts
+  const conflicts = getMergeConflicts();
+  if (conflicts.length > 0) {
+    const conflictFiles = conflicts.map(c => `  ${c.file}`).join('\n');
+    parts.push(`MERGE CONFLICTS (resolve before editing these files):\n${conflictFiles}`);
+  }
+
   // .gitignore
   const giPath = path.join(cwd, '.gitignore');
   if (fs.existsSync(giPath)) {
@@ -74,6 +82,16 @@ function printContext(cwd) {
 
   if (project) console.log(`${C.dim}  project: ${project}${C.reset}`);
   if (branch) console.log(`${C.dim}  branch: ${branch}${C.reset}`);
+
+  const conflicts = getMergeConflicts();
+  if (conflicts.length > 0) {
+    console.log(`${C.red}  ⚠ ${conflicts.length} unresolved merge conflict(s):${C.reset}`);
+    for (const c of conflicts) {
+      console.log(`${C.red}    ${c.file}${C.reset}`);
+    }
+    console.log(`${C.yellow}  → Resolve conflicts before starting tasks${C.reset}`);
+  }
+
   console.log();
 }
 

package/cli/git.js

@@ -168,6 +168,14 @@ function formatDiffSummary() {
   return lines.join('\n');
 }
 
+/**
+ * Get files with unresolved merge conflicts (UU, AA, DD)
+ */
+function getMergeConflicts() {
+  const status = getStatus();
+  return status.filter(s => s.status === 'UU' || s.status === 'AA' || s.status === 'DD');
+}
+
 /**
  * Get diff-aware context (only changed files' content)
  * For use when the user is working on git-related tasks
@@ -199,4 +207,5 @@ module.exports = {
   commit,
   formatDiffSummary,
   getDiffContext,
+  getMergeConflicts,
 };

package/cli/sub-agent.js

@@ -48,7 +48,6 @@ function isRetryableError(err) {
   return false;
 }
 
-<<<<<<< Updated upstream
 async function callWithRetry(messages, tools, options) {
   let lastError;
   for (let attempt = 0; attempt <= MAX_CHAT_RETRIES; attempt++) {
@@ -56,13 +55,6 @@ async function callWithRetry(messages, tools, options) {
       // Use callStream (stream:true) — more reliable than callChat (stream:false)
       // with Ollama Cloud. Silently collect the full response via no-op onToken.
       return await callStream(messages, tools, { ...options, onToken: () => {} });
-=======
-async function callChatWithRetry(messages, tools, options) {
-  let lastError;
-  for (let attempt = 0; attempt <= MAX_CHAT_RETRIES; attempt++) {
-    try {
-      return await callChat(messages, tools, options);
->>>>>>> Stashed changes
     } catch (err) {
       lastError = err;
       if (attempt < MAX_CHAT_RETRIES && isRetryableError(err)) {
@@ -224,11 +216,7 @@ ERROR RECOVERY:
 
   try {
     for (let i = 0; i < maxIter; i++) {
-<<<<<<< Updated upstream
       const result = await callWithRetry(messages, availableTools, chatOptions);
-=======
-      const result = await callChatWithRetry(messages, availableTools, chatOptions);
->>>>>>> Stashed changes
 
       // Guard against null/undefined responses
       if (!result || typeof result !== 'object') {
@@ -434,8 +422,4 @@ async function executeSpawnAgents(args) {
   }
 }
 
-<<<<<<< Updated upstream
 module.exports = { runSubAgent, executeSpawnAgents, clearAllLocks, classifyTask, pickModelForTier, resolveSubAgentModel, isRetryableError, callWithRetry };
-=======
-module.exports = { runSubAgent, executeSpawnAgents, clearAllLocks, classifyTask, pickModelForTier, resolveSubAgentModel, isRetryableError, callChatWithRetry };
->>>>>>> Stashed changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nex-code",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Nex Code — Agentic Coding CLI with Multi-Provider Support",
   "bin": {
     "nex-code": "./bin/nex-code.js"
@@ -19,7 +19,7 @@
     "test": "jest --coverage",
     "test:watch": "jest --watch",
     "format": "prettier --write .",
-    "install-hooks": "ln -sf ../../hooks/pre-push .git/hooks/pre-push && chmod +x .git/hooks/pre-push && echo 'pre-push hook installed.'",
+    "install-hooks": "ln -sf ../../hooks/pre-push .git/hooks/pre-push && chmod +x .git/hooks/pre-push && ln -sf ../../hooks/post-merge .git/hooks/post-merge && chmod +x .git/hooks/post-merge && echo 'Hooks installed (pre-push, post-merge).'",
     "prepublishOnly": "npm test"
   },
   "keywords": [