nex-code 0.3.4 → 0.3.5

package/README.md

@@ -8,7 +8,7 @@
 ```
 
 <p align="center">
-  <b>Agentic coding CLI — like Claude Code, but open-source and multi-provider.</b><br>
+  <b>Agentic coding CLI — open-source and multi-provider.</b><br>
   Use OpenAI, Anthropic, Google Gemini, Ollama Cloud, or local models. Your choice.
 </p>
 
@@ -49,15 +49,15 @@ That's it. You'll see the banner, your project context, and the `>` prompt. Star
 
 ## Why nex-code?
 
-| | nex-code | Claude Code | aider | Cursor |
-|---|---|---|---|---|
-| **Open-source** | MIT | Proprietary | Apache 2.0 | Proprietary |
-| **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** | 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 |
+| | nex-code | aider | Cursor |
+|---|---|---|---|
+| **Open-source** | MIT | Apache 2.0 | Proprietary |
+| **Multi-provider** | 5 providers, swap at runtime | Multi-provider | Multi-provider |
+| **Free local models** | Ollama (no API key) | Ollama | — |
+| **Runtime dependencies** | 2 (axios, dotenv) | Heavy | Electron |
+| **Test coverage** | 1783 tests, 90% coverage | — | — |
+| **Tool tiers** | Auto-adapts tools per model | Fixed | Fixed |
+| **No lock-in** | `/model openai:gpt-4o` ↔ `/model local:llama3` | Config change | Config change |
 
 ---
 
@@ -313,7 +313,7 @@ Pressing Ctrl+C during a running request immediately cancels the active HTTP str
 - 3x rapid Ctrl+C force-exits the process
 
 ### Diff Preview
-Every file change is shown in Claude Code-style format before being applied:
+Every file change is shown in a diff-style format before being applied:
 - **Header**: `⏺ Update(file)` or `⏺ Create(file)` with relative path
 - **Summary**: `⎿  Added N lines, removed M lines`
 - **Numbered lines**: right-justified line numbers with red `-` / green `+` markers

package/cli/sub-agent.js

@@ -48,6 +48,7 @@ function isRetryableError(err) {
   return false;
 }
 
+<<<<<<< Updated upstream
 async function callWithRetry(messages, tools, options) {
   let lastError;
   for (let attempt = 0; attempt <= MAX_CHAT_RETRIES; attempt++) {
@@ -55,6 +56,13 @@ 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)) {
@@ -216,7 +224,11 @@ 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') {
@@ -422,4 +434,8 @@ 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.4",
+  "version": "0.3.5",
   "description": "Nex Code — Agentic Coding CLI with Multi-Provider Support",
   "bin": {
     "nex-code": "./bin/nex-code.js"