@nanocollective/nanocoder 1.13.2 → 1.13.3

package/README.md

@@ -164,6 +164,15 @@ Nanocoder supports any OpenAI-compatible API through a unified provider configur
 - `apiKey`: API key (optional, may not be required)
 - `models`: Available model list for `/model` command
 
+**Environment Variables:**
+
+Keep API keys out of version control using environment variables. Variables are loaded from shell environment (`.bashrc`, `.zshrc`) or `.env` file in your working directory.
+
+**Syntax:** `$VAR_NAME`, `${VAR_NAME}`, or `${VAR_NAME:-default}`
+**Supported in:** `baseUrl`, `apiKey`, `models`, MCP server `command`, `args`, `env`
+
+See `.env.example` for setup instructions
+
 **Timeout Configuration:**
 
 Nanocoder allows you to configure timeouts for your AI providers to handle long-running requests.
@@ -236,6 +245,13 @@ Nanocoder supports connecting to MCP servers to extend its capabilities with add
 }
 ```
 
+**MCP Server Configuration:**
+
+- `name`: Display name for the MCP server
+- `command`: Executable command to start the server
+- `args`: Array of command-line arguments
+- `env`: Environment variables for the server process
+
 When MCP servers are configured, Nanocoder will:
 
 - Automatically connect to all configured servers on startup

package/dist/config/env-substitution.d.ts

@@ -0,0 +1,4 @@
+export declare function isEnvVarReference(str: string): boolean;
+export declare function expandEnvVar(str: string): string;
+export declare function substituteEnvVars(value: any): any;
+//# sourceMappingURL=env-substitution.d.ts.map

package/dist/config/env-substitution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-substitution.d.ts","sourceRoot":"","sources":["../../source/config/env-substitution.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAMtD;AAGD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA8BhD;AAGD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAuBjD"}

package/dist/config/env-substitution.js

@@ -0,0 +1,51 @@
+import { shouldLog } from './logging.js';
+import { logError } from '../utils/message-queue.js';
+// Check if a string contains environment variable references
+export function isEnvVarReference(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
+    return /\$\{[A-Z_][A-Z0-9_]*(?::-[^}]*)?\}|\$[A-Z_][A-Z0-9_]*/g.test(str);
+}
+// Expand environment variable references in a string
+export function expandEnvVar(str) {
+    if (typeof str !== 'string') {
+        return str;
+    }
+    const regex = /\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}|\$([A-Z_][A-Z0-9_]*)/g;
+    return str.replace(regex, (match, bracedVarName, defaultValue, unbracedVarName) => {
+        const varName = bracedVarName || unbracedVarName;
+        const envValue = process.env[varName];
+        if (envValue !== undefined) {
+            return envValue;
+        }
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        }
+        if (shouldLog('warn')) {
+            logError(`Environment variable ${varName} not found in config, using empty string`);
+        }
+        return '';
+    });
+}
+// Recursively substitute environment variables in objects, arrays, and strings
+export function substituteEnvVars(value) {
+    if (value === null || value === undefined) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        return expandEnvVar(value);
+    }
+    if (Array.isArray(value)) {
+        return value.map(item => substituteEnvVars(item));
+    }
+    if (typeof value === 'object') {
+        const result = {};
+        for (const [key, val] of Object.entries(value)) {
+            result[key] = substituteEnvVars(val);
+        }
+        return result;
+    }
+    return value;
+}
+//# sourceMappingURL=env-substitution.js.map

package/dist/config/env-substitution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-substitution.js","sourceRoot":"","sources":["../../source/config/env-substitution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAEnD,6DAA6D;AAC7D,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC5C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,wDAAwD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3E,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,YAAY,CAAC,GAAW;IACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,GAAG,4DAA4D,CAAC;IAE3E,OAAO,GAAG,CAAC,OAAO,CACjB,KAAK,EACL,CAAC,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE;QACvD,MAAM,OAAO,GAAG,aAAa,IAAI,eAAe,CAAC;QACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,YAAY,CAAC;QACrB,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,QAAQ,CACP,wBAAwB,OAAO,0CAA0C,CACzE,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACX,CAAC,CACD,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,iBAAiB,CAAC,KAAU;IAC3C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAC;AA8BzD,eAAO,MAAM,SAAS,WAAkB,CAAC;AAGzC,eAAO,MAAM,YAAY;;;CAGxB,CAAC;AAEF,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAGD,eAAO,MAAM,MAAM,EAAE,MAAoB,CAAC;AAM1C,eAAO,MAAM,UAAU,QAGtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAuCzD,eAAO,MAAM,SAAS,WAAkB,CAAC;AAGzC,eAAO,MAAM,YAAY;;;CAGxB,CAAC;AAEF,wBAAgB,SAAS,IAAI,MAAM,CAIlC;AAGD,eAAO,MAAM,MAAM,EAAE,MAAoB,CAAC;AAM1C,eAAO,MAAM,UAAU,QAGtB,CAAC"}

package/dist/config/index.js

@@ -1,19 +1,26 @@
 import { existsSync, readFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { config as loadEnv } from 'dotenv';
 import { logError } from '../utils/message-queue.js';
 import { loadPreferences } from './preferences.js';
 import { getThemeColors, defaultTheme } from './themes.js';
+import { substituteEnvVars } from './env-substitution.js';
+// Load .env file from working directory (shell environment takes precedence)
+loadEnv({ path: join(process.cwd(), '.env') });
 // Function to load app configuration from agents.config.json if it exists
 function loadAppConfig() {
     const agentsJsonPath = join(process.cwd(), 'agents.config.json');
     if (existsSync(agentsJsonPath)) {
         try {
-            const agentsData = JSON.parse(readFileSync(agentsJsonPath, 'utf-8'));
-            if (agentsData.nanocoder) {
+            const rawData = readFileSync(agentsJsonPath, 'utf-8');
+            const agentsData = JSON.parse(rawData);
+            // Apply environment variable substitution
+            const processedData = substituteEnvVars(agentsData);
+            if (processedData.nanocoder) {
                 return {
-                    providers: agentsData.nanocoder.providers,
-                    mcpServers: agentsData.nanocoder.mcpServers,
+                    providers: processedData.nanocoder.providers,
+                    mcpServers: processedData.nanocoder.mcpServers,
                 };
             }
         }

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,IAAI,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzD,0EAA0E;AAC1E,SAAS,aAAa;IACrB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oBAAoB,CAAC,CAAC;IAEjE,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;YAErE,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBAC1B,OAAO;oBACN,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,SAAS;oBACzC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU;iBAC3C,CAAC;YACH,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,QAAQ,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;AAEzC,iFAAiF;AACjF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC3B,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;CACjB,CAAC;AAEF,MAAM,UAAU,SAAS;IACxB,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,IAAI,YAAY,CAAC;IAChE,OAAO,cAAc,CAAC,aAAa,CAAC,CAAC;AACtC,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,MAAM,MAAM,GAAW,SAAS,EAAE,CAAC;AAE1C,kEAAkE;AAClE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,oFAAoF;AACpF,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAC7B,SAAS,EACT,yCAAyC,CACzC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,IAAI,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAC,MAAM,IAAI,OAAO,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,cAAc,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AACzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAExD,6EAA6E;AAC7E,OAAO,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,EAAC,CAAC,CAAC;AAE7C,0EAA0E;AAC1E,SAAS,aAAa;IACrB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oBAAoB,CAAC,CAAC;IAEjE,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAEvC,0CAA0C;YAC1C,MAAM,aAAa,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAEpD,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO;oBACN,SAAS,EAAE,aAAa,CAAC,SAAS,CAAC,SAAS;oBAC5C,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,UAAU;iBAC9C,CAAC;YACH,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,QAAQ,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;AAEzC,iFAAiF;AACjF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC3B,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;CACjB,CAAC;AAEF,MAAM,UAAU,SAAS;IACxB,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,IAAI,YAAY,CAAC;IAChE,OAAO,cAAc,CAAC,aAAa,CAAC,CAAC;AACtC,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,MAAM,MAAM,GAAW,SAAS,EAAE,CAAC;AAE1C,kEAAkE;AAClE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,oFAAoF;AACpF,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAC7B,SAAS,EACT,yCAAyC,CACzC,CAAC"}

package/dist/types/core.js

@@ -1,5 +1,5 @@
 export const DEVELOPMENT_MODE_LABELS = {
-    normal: '▶ normal model on',
+    normal: '▶ normal mode on',
     'auto-accept': '⏵⏵ auto-accept mode on',
     plan: '⏸ plan mode on',
 };

package/dist/types/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../source/types/core.ts"],"names":[],"mappings":"AA0EA,MAAM,CAAC,MAAM,uBAAuB,GAAoC;IACvE,MAAM,EAAE,mBAAmB;IAC3B,aAAa,EAAE,wBAAwB;IACvC,IAAI,EAAE,gBAAgB;CACtB,CAAC"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../source/types/core.ts"],"names":[],"mappings":"AA0EA,MAAM,CAAC,MAAM,uBAAuB,GAAoC;IACvE,MAAM,EAAE,kBAAkB;IAC1B,aAAa,EAAE,wBAAwB;IACvC,IAAI,EAAE,gBAAgB;CACtB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@nanocollective/nanocoder",
 	"main": "dist/cli.js",
-	"version": "1.13.2",
+	"version": "1.13.3",
 	"description": "A local-first CLI coding agent that brings the power of agentic coding tools like Claude Code and Gemini CLI to local models or controlled APIs like OpenRouter",
 	"keywords": [
 		"cli",
@@ -50,6 +50,7 @@
 		"@nanostores/react": "^1.0.0",
 		"cheerio": "^1.1.2",
 		"cli-highlight": "^2.1.11",
+		"dotenv": "^17.2.3",
 		"ink": "^6.3.1",
 		"ink-big-text": "^2.0.0",
 		"ink-gradient": "^3.0.0",