@defai.digital/ax-cli 4.1.16 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +31 -0
- package/dist/llm/client.js +6 -0
- package/dist/llm/client.js.map +1 -1
- package/dist/mcp/config.js +38 -5
- package/dist/mcp/config.js.map +1 -1
- package/dist/mcp/index.d.ts +4 -1
- package/dist/mcp/index.js +2 -0
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/provider-mcp-loader.d.ts +118 -0
- package/dist/mcp/provider-mcp-loader.js +219 -0
- package/dist/mcp/provider-mcp-loader.js.map +1 -0
- package/dist/provider/config.d.ts +169 -0
- package/dist/provider/config.js +326 -0
- package/dist/provider/config.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -223,6 +223,37 @@ ax-glm memory status # View token distribution
|
|
|
223
223
|
|
|
224
224
|
## Changelog
|
|
225
225
|
|
|
226
|
+
### v4.2.0 - Provider-Specific MCP Configuration
|
|
227
|
+
|
|
228
|
+
**Provider MCP Isolation**: ax-glm and ax-grok now have separate MCP configurations, allowing both CLIs to run simultaneously without conflicts.
|
|
229
|
+
|
|
230
|
+
- **Claude Code Format Support**: New `.mcp.json` format following Claude Code best practices
|
|
231
|
+
- **Provider-Specific Directories**: `.ax-glm/.mcp.json` and `.ax-grok/.mcp.json` for isolated MCP server configs
|
|
232
|
+
- **Legacy Format Support**: Backward compatible with existing `mcp-config.json` files
|
|
233
|
+
- **Configuration Priority**: Clear priority order for MCP config loading (project settings > provider MCP > AutomatosX config)
|
|
234
|
+
- **Documentation Updates**: Comprehensive guides for multi-provider MCP setup
|
|
235
|
+
|
|
236
|
+
**MCP Configuration Example** (`.ax-glm/.mcp.json`):
|
|
237
|
+
```json
|
|
238
|
+
{
|
|
239
|
+
"mcpServers": {
|
|
240
|
+
"automatosx": {
|
|
241
|
+
"command": "automatosx",
|
|
242
|
+
"args": ["mcp", "server"],
|
|
243
|
+
"env": { "AUTOMATOSX_PROJECT_DIR": "/path/to/project" }
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
```
|
|
248
|
+
|
|
249
|
+
### v4.1.18 - CI/CD Fix
|
|
250
|
+
- **Fixed Tests**: Added missing `provider/config.ts` to root src for test compatibility
|
|
251
|
+
|
|
252
|
+
### v4.1.17 - Grok Model Fixes
|
|
253
|
+
- **Fixed Grok Model Names**: Updated to correct xAI API model IDs (`grok-2-1212`, `grok-2-vision-1212`)
|
|
254
|
+
- **Model Validation**: Grok models now properly recognized (no more "custom model" warnings)
|
|
255
|
+
- **Default Model**: Set `grok-3` as default for ax-grok
|
|
256
|
+
|
|
226
257
|
### v4.1.16 - Code Quality & Stability Improvements
|
|
227
258
|
- **Terminal State Management**: Integrated terminal lifecycle manager to prevent corruption from overlapping spinners/prompts
|
|
228
259
|
- **Unified Exit Handling**: Centralized exit handler with proper cleanup callbacks and exit codes
|
package/dist/llm/client.js
CHANGED
|
@@ -3,6 +3,7 @@ import { safeValidateGrokResponse } from "../schemas/api-schemas.js";
|
|
|
3
3
|
import { ErrorCategory, createErrorMessage } from "../utils/error-handler.js";
|
|
4
4
|
import { extractAndTranslateError } from "../utils/error-translator.js";
|
|
5
5
|
import { GLM_MODELS, TIMEOUT_CONFIG } from "../constants.js";
|
|
6
|
+
import { GLM_PROVIDER, GROK_PROVIDER } from "../provider/config.js";
|
|
6
7
|
import { getUsageTracker } from "../utils/usage-tracker.js";
|
|
7
8
|
import { RateLimiter, DEFAULT_RATE_LIMITS } from "../utils/rate-limiter.js";
|
|
8
9
|
import { getAuditLogger, AuditCategory } from "../utils/audit-logger.js";
|
|
@@ -76,9 +77,14 @@ export class LLMClient {
|
|
|
76
77
|
* For unknown models (e.g., Ollama), pass through without validation
|
|
77
78
|
*/
|
|
78
79
|
validateModel(model) {
|
|
80
|
+
// Check GLM models (legacy constant)
|
|
79
81
|
if (model in GLM_MODELS) {
|
|
80
82
|
return model;
|
|
81
83
|
}
|
|
84
|
+
// Check provider-specific models (GLM and Grok)
|
|
85
|
+
if (model in GLM_PROVIDER.models || model in GROK_PROVIDER.models) {
|
|
86
|
+
return model;
|
|
87
|
+
}
|
|
82
88
|
// Allow arbitrary model names for providers like Ollama
|
|
83
89
|
// Don't fall back to DEFAULT_MODEL - respect user's choice
|
|
84
90
|
console.warn(`Using custom model "${model}" (not in predefined list)`);
|
package/dist/llm/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/llm/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/llm/client.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/config.js
CHANGED
|
@@ -6,6 +6,7 @@ import { migrateConfig } from "./config-migrator.js";
|
|
|
6
6
|
import { detectConfigFormat } from "./config-detector.js";
|
|
7
7
|
import { formatMCPConfigError, formatWarning, formatInfo } from "./error-formatter.js";
|
|
8
8
|
import { ZAI_SERVER_NAMES, isZAIServer } from "./zai-templates.js";
|
|
9
|
+
import { loadProviderMCPConfig } from "./provider-mcp-loader.js";
|
|
9
10
|
// Track if we've already shown migration warnings this session
|
|
10
11
|
let hasShownMigrationWarnings = false;
|
|
11
12
|
// Track which REPL warnings we've already shown
|
|
@@ -136,7 +137,23 @@ export function loadMCPConfig() {
|
|
|
136
137
|
}
|
|
137
138
|
}
|
|
138
139
|
}
|
|
139
|
-
// Load
|
|
140
|
+
// Load provider-specific MCP config following Claude Code best practices:
|
|
141
|
+
// 1. .ax-glm/.mcp.json or .ax-grok/.mcp.json (Claude Code format - recommended)
|
|
142
|
+
// 2. .ax-glm/mcp-config.json or .ax-grok/mcp-config.json (legacy format)
|
|
143
|
+
// This ensures ax-glm and ax-grok use their own config directories
|
|
144
|
+
const providerMCPResult = loadProviderMCPConfig();
|
|
145
|
+
const providerMCPServers = providerMCPResult.serverConfigs;
|
|
146
|
+
if (providerMCPResult.found && !hasShownMigrationWarnings) {
|
|
147
|
+
if (providerMCPResult.error) {
|
|
148
|
+
console.warn(formatWarning('Provider MCP config found but has errors:', [providerMCPResult.error]));
|
|
149
|
+
}
|
|
150
|
+
if (providerMCPResult.warnings.length > 0 && process.env.DEBUG) {
|
|
151
|
+
providerMCPResult.warnings.forEach(warning => {
|
|
152
|
+
console.warn(formatInfo(warning));
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
// Load AutomatosX servers from .automatosx/config.json (legacy location)
|
|
140
157
|
const automatosXResult = loadAutomatosXMCPServers();
|
|
141
158
|
if (automatosXResult.found && !hasShownMigrationWarnings) {
|
|
142
159
|
if (automatosXResult.errors.length > 0) {
|
|
@@ -148,10 +165,26 @@ export function loadMCPConfig() {
|
|
|
148
165
|
});
|
|
149
166
|
}
|
|
150
167
|
}
|
|
151
|
-
// Merge
|
|
168
|
+
// Merge all config sources with priority:
|
|
169
|
+
// 1. ax-cli project settings (highest priority)
|
|
170
|
+
// 2. Provider-specific MCP config (.ax-glm/mcp-config.json or .ax-grok/mcp-config.json)
|
|
171
|
+
// 3. AutomatosX config (.automatosx/config.json) (lowest priority)
|
|
152
172
|
let finalServers;
|
|
153
|
-
|
|
154
|
-
|
|
173
|
+
// Start with AutomatosX servers (lowest priority)
|
|
174
|
+
let mergedServers = automatosXResult.found && automatosXResult.servers.length > 0
|
|
175
|
+
? automatosXResult.servers
|
|
176
|
+
: [];
|
|
177
|
+
// Merge provider-specific MCP servers (higher priority than AutomatosX)
|
|
178
|
+
if (providerMCPServers.length > 0) {
|
|
179
|
+
const providerMergeResult = mergeConfigs(providerMCPServers, mergedServers);
|
|
180
|
+
mergedServers = providerMergeResult.servers;
|
|
181
|
+
if (!hasShownMigrationWarnings && process.env.DEBUG) {
|
|
182
|
+
console.log(formatInfo(`Loaded ${providerMCPServers.length} server(s) from provider MCP config`));
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
// Merge ax-cli servers (highest priority)
|
|
186
|
+
if (axCliServers.length > 0 || mergedServers.length > 0) {
|
|
187
|
+
const mergeResult = mergeConfigs(axCliServers, mergedServers);
|
|
155
188
|
finalServers = mergeResult.servers;
|
|
156
189
|
// Show merge info only in debug mode or if there are conflicts
|
|
157
190
|
if (!hasShownMigrationWarnings && (mergeResult.conflicts.length > 0 || process.env.DEBUG)) {
|
|
@@ -168,7 +201,7 @@ export function loadMCPConfig() {
|
|
|
168
201
|
finalServers = axCliServers;
|
|
169
202
|
}
|
|
170
203
|
// Mark that we've shown warnings this session
|
|
171
|
-
if (axCliHadLegacy || automatosXResult.found) {
|
|
204
|
+
if (axCliHadLegacy || automatosXResult.found || providerMCPResult.found) {
|
|
172
205
|
hasShownMigrationWarnings = true;
|
|
173
206
|
}
|
|
174
207
|
return { servers: finalServers };
|
package/dist/mcp/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/mcp/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC5H,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/mcp/config.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/index.d.ts
CHANGED
|
@@ -34,6 +34,8 @@ export { MCPManagerV2, createServerName, createToolName, type ConnectionState, t
|
|
|
34
34
|
export type { ServerName, ToolName } from "./client-v2.js";
|
|
35
35
|
export { loadMCPConfig, addMCPServer, removeMCPServer, PREDEFINED_SERVERS, getTemplate, generateConfigFromTemplate, } from "./config.js";
|
|
36
36
|
export type { MCPConfig } from "./config.js";
|
|
37
|
+
export { loadProviderMCPConfig, getProviderMCPServers, providerMCPConfigExists, getClaudeCodeMCPConfigPath, getLegacyMCPConfigPath, } from "./provider-mcp-loader.js";
|
|
38
|
+
export type { ProviderMCPLoadResult, ClaudeCodeMCPConfig, LegacyProviderMCPConfig, } from "./provider-mcp-loader.js";
|
|
37
39
|
export { detectConfigFormat, detectMultipleConfigs, getDetectionSummary } from "./config-detector.js";
|
|
38
40
|
export { migrateConfig, batchMigrateConfigs, formatBatchMigrationResult } from "./config-migrator.js";
|
|
39
41
|
export { createTransport, type MCPTransport, type TransportType, type TransportConfig, type StdioFraming, } from "./transports.js";
|
|
@@ -42,7 +44,8 @@ export { CancellationManager, getCancellationManager, resetCancellationManager,
|
|
|
42
44
|
export { SubscriptionManager, getSubscriptionManager, resetSubscriptionManager, type ResourceSubscription, } from "./subscriptions.js";
|
|
43
45
|
export { ToolOutputValidator, getToolOutputValidator, resetToolOutputValidator, type SchemaValidationResult, type SchemaValidationStatus, } from "./schema-validator.js";
|
|
44
46
|
export { MCP_TIMEOUTS, MCP_LIMITS, MCP_ERROR_CODES, MCP_RECONNECTION, MCP_TRANSPORT_DEFAULTS, MCP_PATTERNS, } from "./constants.js";
|
|
45
|
-
export {
|
|
47
|
+
export { Ok, Err, toError } from "./type-safety.js";
|
|
48
|
+
export type { Result } from "./type-safety.js";
|
|
46
49
|
export { matchErrorPattern, getTransportHints, getEnvVarHints, ERROR_REMEDIATION, type Remediation } from "./error-remediation.js";
|
|
47
50
|
export { resolveMCPReferences, extractMCPReferences } from "./resources.js";
|
|
48
51
|
export { parseMCPIdentifier, promptToSlashCommand, parsePromptCommand, formatPromptResult, getPromptDescription, } from "./prompts.js";
|
package/dist/mcp/index.js
CHANGED
|
@@ -40,6 +40,8 @@ export { MCPManagerV2, createServerName, createToolName, } from "./client-v2.js"
|
|
|
40
40
|
// ============================================================================
|
|
41
41
|
// Config loading and management
|
|
42
42
|
export { loadMCPConfig, addMCPServer, removeMCPServer, PREDEFINED_SERVERS, getTemplate, generateConfigFromTemplate, } from "./config.js";
|
|
43
|
+
// Provider-specific MCP config loading (Claude Code format support)
|
|
44
|
+
export { loadProviderMCPConfig, getProviderMCPServers, providerMCPConfigExists, getClaudeCodeMCPConfigPath, getLegacyMCPConfigPath, } from "./provider-mcp-loader.js";
|
|
43
45
|
// Config detection and migration
|
|
44
46
|
export { detectConfigFormat, detectMultipleConfigs, getDetectionSummary } from "./config-detector.js";
|
|
45
47
|
export { migrateConfig, batchMigrateConfigs, formatBatchMigrationResult } from "./config-migrator.js";
|
package/dist/mcp/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,+EAA+E;AAC/E,WAAW;AACX,+EAA+E;AAE/E,kEAAkE;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,+DAA+D;AAC/D,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,cAAc,GAIf,MAAM,gBAAgB,CAAC;AAGxB,+EAA+E;AAC/E,gBAAgB;AAChB,+EAA+E;AAE/E,gCAAgC;AAChC,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,0BAA0B,GAC3B,MAAM,aAAa,CAAC;AAGrB,iCAAiC;AACjC,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEtG,+EAA+E;AAC/E,aAAa;AACb,+EAA+E;AAE/E,OAAO,EACL,eAAe,GAKhB,MAAM,iBAAiB,CAAC;AAEzB,+EAA+E;AAC/E,0CAA0C;AAC1C,+EAA+E;AAE/E,oBAAoB;AACpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,GAGlB,MAAM,eAAe,CAAC;AAEvB,uBAAuB;AACvB,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,GAGrB,MAAM,mBAAmB,CAAC;AAE3B,yBAAyB;AACzB,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,GAEzB,MAAM,oBAAoB,CAAC;AAE5B,oBAAoB;AACpB,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,GAGzB,MAAM,uBAAuB,CAAC;AAE/B,+EAA+E;AAC/E,YAAY;AACZ,+EAA+E;AAE/E,YAAY;AACZ,OAAO,EACL,YAAY,EACZ,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAExB,+CAA+C;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Provider-Specific MCP Configuration Loader
|
|
3
|
+
*
|
|
4
|
+
* Loads MCP configurations from provider-specific directories following
|
|
5
|
+
* Claude Code best practices:
|
|
6
|
+
*
|
|
7
|
+
* Priority (highest to lowest):
|
|
8
|
+
* 1. .ax-glm/.mcp.json or .ax-grok/.mcp.json (Claude Code format - recommended)
|
|
9
|
+
* 2. .ax-glm/mcp-config.json or .ax-grok/mcp-config.json (legacy format)
|
|
10
|
+
*
|
|
11
|
+
* Claude Code Format (.mcp.json):
|
|
12
|
+
* ```json
|
|
13
|
+
* {
|
|
14
|
+
* "mcpServers": {
|
|
15
|
+
* "serverName": {
|
|
16
|
+
* "command": "...",
|
|
17
|
+
* "args": [...],
|
|
18
|
+
* "env": {...}
|
|
19
|
+
* }
|
|
20
|
+
* }
|
|
21
|
+
* }
|
|
22
|
+
* ```
|
|
23
|
+
*
|
|
24
|
+
* This ensures that when both ax-glm and ax-grok are installed,
|
|
25
|
+
* they maintain separate MCP configurations without conflicts.
|
|
26
|
+
*/
|
|
27
|
+
import type { MCPServerConfig } from '../schemas/settings-schemas.js';
|
|
28
|
+
/**
|
|
29
|
+
* Claude Code MCP format (.mcp.json)
|
|
30
|
+
* This is the recommended format, same as Claude Code
|
|
31
|
+
*/
|
|
32
|
+
export interface ClaudeCodeMCPConfig {
|
|
33
|
+
mcpServers?: Record<string, {
|
|
34
|
+
command: string;
|
|
35
|
+
args?: string[];
|
|
36
|
+
env?: Record<string, string>;
|
|
37
|
+
disabled?: boolean;
|
|
38
|
+
}>;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Legacy provider-specific MCP configuration format
|
|
42
|
+
* This is the format used in .ax-glm/mcp-config.json and .ax-grok/mcp-config.json
|
|
43
|
+
*/
|
|
44
|
+
export interface LegacyProviderMCPConfig {
|
|
45
|
+
mcp?: {
|
|
46
|
+
/** Whether MCP is enabled for this provider */
|
|
47
|
+
enabled?: boolean;
|
|
48
|
+
/** Command to start the MCP server */
|
|
49
|
+
serverCommand?: string;
|
|
50
|
+
/** Arguments for the MCP server command */
|
|
51
|
+
serverArgs?: string[];
|
|
52
|
+
/** Whether to auto-connect on startup */
|
|
53
|
+
autoConnect?: boolean;
|
|
54
|
+
/** Connection timeout in milliseconds */
|
|
55
|
+
timeout?: number;
|
|
56
|
+
/** Environment variables for the MCP server */
|
|
57
|
+
env?: Record<string, string>;
|
|
58
|
+
};
|
|
59
|
+
provider?: {
|
|
60
|
+
/** Provider name (e.g., 'glm', 'grok') */
|
|
61
|
+
name?: string;
|
|
62
|
+
/** Environment variable for API key */
|
|
63
|
+
apiKeyEnv?: string;
|
|
64
|
+
/** Default model */
|
|
65
|
+
defaultModel?: string;
|
|
66
|
+
};
|
|
67
|
+
integration?: {
|
|
68
|
+
/** Use AutomatosX memory system */
|
|
69
|
+
useMemory?: boolean;
|
|
70
|
+
/** Use agent context for enhanced prompts */
|
|
71
|
+
useAgentContext?: boolean;
|
|
72
|
+
/** Save responses to memory */
|
|
73
|
+
saveResponsesToMemory?: boolean;
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Result of loading provider-specific MCP config
|
|
78
|
+
*/
|
|
79
|
+
export interface ProviderMCPLoadResult {
|
|
80
|
+
/** Whether config was found */
|
|
81
|
+
found: boolean;
|
|
82
|
+
/** Path to config file */
|
|
83
|
+
configPath?: string;
|
|
84
|
+
/** Format of the config file */
|
|
85
|
+
format?: 'claude-code' | 'legacy';
|
|
86
|
+
/** Converted MCPServerConfigs (if found and valid) */
|
|
87
|
+
serverConfigs: MCPServerConfig[];
|
|
88
|
+
/** Error message if loading failed */
|
|
89
|
+
error?: string;
|
|
90
|
+
/** Warnings during loading */
|
|
91
|
+
warnings: string[];
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Get the path to the Claude Code format MCP config file (.mcp.json)
|
|
95
|
+
*/
|
|
96
|
+
export declare function getClaudeCodeMCPConfigPath(projectRoot?: string): string;
|
|
97
|
+
/**
|
|
98
|
+
* Get the path to the legacy MCP config file (mcp-config.json)
|
|
99
|
+
*/
|
|
100
|
+
export declare function getLegacyMCPConfigPath(projectRoot?: string): string;
|
|
101
|
+
/**
|
|
102
|
+
* Check if provider-specific MCP config exists (either format)
|
|
103
|
+
*/
|
|
104
|
+
export declare function providerMCPConfigExists(projectRoot?: string): boolean;
|
|
105
|
+
/**
|
|
106
|
+
* Load provider-specific MCP configuration
|
|
107
|
+
*
|
|
108
|
+
* This function:
|
|
109
|
+
* 1. First tries to load Claude Code format (.mcp.json) - recommended
|
|
110
|
+
* 2. Falls back to legacy format (mcp-config.json)
|
|
111
|
+
* 3. Converts to MCPServerConfig[] format
|
|
112
|
+
* 4. Returns the configs or error information
|
|
113
|
+
*/
|
|
114
|
+
export declare function loadProviderMCPConfig(projectRoot?: string): ProviderMCPLoadResult;
|
|
115
|
+
/**
|
|
116
|
+
* Get provider MCP servers ready to be merged with other sources
|
|
117
|
+
*/
|
|
118
|
+
export declare function getProviderMCPServers(projectRoot?: string): MCPServerConfig[];
|
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Provider-Specific MCP Configuration Loader
|
|
3
|
+
*
|
|
4
|
+
* Loads MCP configurations from provider-specific directories following
|
|
5
|
+
* Claude Code best practices:
|
|
6
|
+
*
|
|
7
|
+
* Priority (highest to lowest):
|
|
8
|
+
* 1. .ax-glm/.mcp.json or .ax-grok/.mcp.json (Claude Code format - recommended)
|
|
9
|
+
* 2. .ax-glm/mcp-config.json or .ax-grok/mcp-config.json (legacy format)
|
|
10
|
+
*
|
|
11
|
+
* Claude Code Format (.mcp.json):
|
|
12
|
+
* ```json
|
|
13
|
+
* {
|
|
14
|
+
* "mcpServers": {
|
|
15
|
+
* "serverName": {
|
|
16
|
+
* "command": "...",
|
|
17
|
+
* "args": [...],
|
|
18
|
+
* "env": {...}
|
|
19
|
+
* }
|
|
20
|
+
* }
|
|
21
|
+
* }
|
|
22
|
+
* ```
|
|
23
|
+
*
|
|
24
|
+
* This ensures that when both ax-glm and ax-grok are installed,
|
|
25
|
+
* they maintain separate MCP configurations without conflicts.
|
|
26
|
+
*/
|
|
27
|
+
import fs from 'fs';
|
|
28
|
+
import path from 'path';
|
|
29
|
+
import { getActiveConfigPaths, getActiveProvider } from '../provider/config.js';
|
|
30
|
+
import { extractErrorMessage } from '../utils/error-handler.js';
|
|
31
|
+
/**
|
|
32
|
+
* Get the path to the Claude Code format MCP config file (.mcp.json)
|
|
33
|
+
*/
|
|
34
|
+
export function getClaudeCodeMCPConfigPath(projectRoot) {
|
|
35
|
+
const configPaths = getActiveConfigPaths();
|
|
36
|
+
const root = projectRoot || process.cwd();
|
|
37
|
+
return path.join(root, configPaths.DIR_NAME, '.mcp.json');
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Get the path to the legacy MCP config file (mcp-config.json)
|
|
41
|
+
*/
|
|
42
|
+
export function getLegacyMCPConfigPath(projectRoot) {
|
|
43
|
+
const configPaths = getActiveConfigPaths();
|
|
44
|
+
const root = projectRoot || process.cwd();
|
|
45
|
+
return path.join(root, configPaths.DIR_NAME, 'mcp-config.json');
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Check if provider-specific MCP config exists (either format)
|
|
49
|
+
*/
|
|
50
|
+
export function providerMCPConfigExists(projectRoot) {
|
|
51
|
+
return fs.existsSync(getClaudeCodeMCPConfigPath(projectRoot)) ||
|
|
52
|
+
fs.existsSync(getLegacyMCPConfigPath(projectRoot));
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Load provider-specific MCP configuration
|
|
56
|
+
*
|
|
57
|
+
* This function:
|
|
58
|
+
* 1. First tries to load Claude Code format (.mcp.json) - recommended
|
|
59
|
+
* 2. Falls back to legacy format (mcp-config.json)
|
|
60
|
+
* 3. Converts to MCPServerConfig[] format
|
|
61
|
+
* 4. Returns the configs or error information
|
|
62
|
+
*/
|
|
63
|
+
export function loadProviderMCPConfig(projectRoot) {
|
|
64
|
+
const warnings = [];
|
|
65
|
+
const claudeCodePath = getClaudeCodeMCPConfigPath(projectRoot);
|
|
66
|
+
const legacyPath = getLegacyMCPConfigPath(projectRoot);
|
|
67
|
+
// Try Claude Code format first (.mcp.json)
|
|
68
|
+
if (fs.existsSync(claudeCodePath)) {
|
|
69
|
+
try {
|
|
70
|
+
const raw = fs.readFileSync(claudeCodePath, 'utf-8');
|
|
71
|
+
const config = JSON.parse(raw);
|
|
72
|
+
const serverConfigs = convertClaudeCodeFormat(config);
|
|
73
|
+
return {
|
|
74
|
+
found: true,
|
|
75
|
+
configPath: claudeCodePath,
|
|
76
|
+
format: 'claude-code',
|
|
77
|
+
serverConfigs,
|
|
78
|
+
warnings,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
return {
|
|
83
|
+
found: true,
|
|
84
|
+
configPath: claudeCodePath,
|
|
85
|
+
format: 'claude-code',
|
|
86
|
+
serverConfigs: [],
|
|
87
|
+
error: `Failed to parse .mcp.json: ${extractErrorMessage(error)}`,
|
|
88
|
+
warnings,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
// Fall back to legacy format (mcp-config.json)
|
|
93
|
+
if (fs.existsSync(legacyPath)) {
|
|
94
|
+
warnings.push(`Using legacy mcp-config.json format. Consider migrating to .mcp.json (Claude Code format)`);
|
|
95
|
+
try {
|
|
96
|
+
const raw = fs.readFileSync(legacyPath, 'utf-8');
|
|
97
|
+
const config = JSON.parse(raw);
|
|
98
|
+
const serverConfigs = convertLegacyFormat(config);
|
|
99
|
+
return {
|
|
100
|
+
found: true,
|
|
101
|
+
configPath: legacyPath,
|
|
102
|
+
format: 'legacy',
|
|
103
|
+
serverConfigs,
|
|
104
|
+
warnings,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
return {
|
|
109
|
+
found: true,
|
|
110
|
+
configPath: legacyPath,
|
|
111
|
+
format: 'legacy',
|
|
112
|
+
serverConfigs: [],
|
|
113
|
+
error: `Failed to parse mcp-config.json: ${extractErrorMessage(error)}`,
|
|
114
|
+
warnings,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
// No config found
|
|
119
|
+
return {
|
|
120
|
+
found: false,
|
|
121
|
+
serverConfigs: [],
|
|
122
|
+
warnings,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Convert Claude Code format (.mcp.json) to MCPServerConfig[]
|
|
127
|
+
*/
|
|
128
|
+
function convertClaudeCodeFormat(config) {
|
|
129
|
+
if (!config.mcpServers || typeof config.mcpServers !== 'object') {
|
|
130
|
+
return [];
|
|
131
|
+
}
|
|
132
|
+
const servers = [];
|
|
133
|
+
for (const [name, serverDef] of Object.entries(config.mcpServers)) {
|
|
134
|
+
if (serverDef.disabled) {
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
// Build environment variables
|
|
138
|
+
const env = {
|
|
139
|
+
AUTOMATOSX_PROJECT_DIR: process.cwd(),
|
|
140
|
+
...(serverDef.env || {}),
|
|
141
|
+
};
|
|
142
|
+
const transport = {
|
|
143
|
+
type: 'stdio',
|
|
144
|
+
command: serverDef.command,
|
|
145
|
+
args: serverDef.args || [],
|
|
146
|
+
env,
|
|
147
|
+
};
|
|
148
|
+
servers.push({
|
|
149
|
+
name,
|
|
150
|
+
enabled: true,
|
|
151
|
+
transport,
|
|
152
|
+
// Default timeout for provider MCP servers
|
|
153
|
+
initTimeout: 30000,
|
|
154
|
+
// Suppress verbose output by default
|
|
155
|
+
quiet: true,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
return servers;
|
|
159
|
+
}
|
|
160
|
+
/**
|
|
161
|
+
* Convert legacy format (mcp-config.json) to MCPServerConfig[]
|
|
162
|
+
*/
|
|
163
|
+
function convertLegacyFormat(config) {
|
|
164
|
+
const mcp = config.mcp;
|
|
165
|
+
if (!mcp?.serverCommand) {
|
|
166
|
+
return [];
|
|
167
|
+
}
|
|
168
|
+
// Check if MCP is disabled
|
|
169
|
+
if (mcp.enabled === false) {
|
|
170
|
+
return [];
|
|
171
|
+
}
|
|
172
|
+
const provider = getActiveProvider();
|
|
173
|
+
// Build the server name based on provider
|
|
174
|
+
// e.g., "automatosx-glm" or "automatosx-grok"
|
|
175
|
+
const serverName = `automatosx-${provider.name}`;
|
|
176
|
+
// Build environment variables
|
|
177
|
+
const env = {
|
|
178
|
+
AUTOMATOSX_PROJECT_DIR: process.cwd(),
|
|
179
|
+
...(mcp.env || {}),
|
|
180
|
+
};
|
|
181
|
+
// Add provider-specific env vars from the config
|
|
182
|
+
if (config.provider?.apiKeyEnv) {
|
|
183
|
+
env.AUTOMATOSX_API_KEY_ENV = config.provider.apiKeyEnv;
|
|
184
|
+
}
|
|
185
|
+
// Add integration settings as env vars
|
|
186
|
+
if (config.integration) {
|
|
187
|
+
if (config.integration.useMemory !== undefined) {
|
|
188
|
+
env.AUTOMATOSX_USE_MEMORY = String(config.integration.useMemory);
|
|
189
|
+
}
|
|
190
|
+
if (config.integration.useAgentContext !== undefined) {
|
|
191
|
+
env.AUTOMATOSX_USE_AGENT_CONTEXT = String(config.integration.useAgentContext);
|
|
192
|
+
}
|
|
193
|
+
if (config.integration.saveResponsesToMemory !== undefined) {
|
|
194
|
+
env.AUTOMATOSX_SAVE_RESPONSES = String(config.integration.saveResponsesToMemory);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
const transport = {
|
|
198
|
+
type: 'stdio',
|
|
199
|
+
command: mcp.serverCommand,
|
|
200
|
+
args: mcp.serverArgs || [],
|
|
201
|
+
env,
|
|
202
|
+
};
|
|
203
|
+
return [{
|
|
204
|
+
name: serverName,
|
|
205
|
+
enabled: true,
|
|
206
|
+
transport,
|
|
207
|
+
initTimeout: mcp.timeout || 30000,
|
|
208
|
+
// Suppress verbose output by default
|
|
209
|
+
quiet: true,
|
|
210
|
+
}];
|
|
211
|
+
}
|
|
212
|
+
/**
|
|
213
|
+
* Get provider MCP servers ready to be merged with other sources
|
|
214
|
+
*/
|
|
215
|
+
export function getProviderMCPServers(projectRoot) {
|
|
216
|
+
const result = loadProviderMCPConfig(projectRoot);
|
|
217
|
+
return result.serverConfigs;
|
|
218
|
+
}
|
|
219
|
+
//# sourceMappingURL=provider-mcp-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-mcp-loader.js","sourceRoot":"","sources":["../../src/mcp/provider-mcp-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Provider Configuration System
|
|
3
|
+
*
|
|
4
|
+
* Defines provider-specific configurations for GLM, Grok, and other providers.
|
|
5
|
+
* Each provider has its own defaults, model configs, and feature flags.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Model configuration for a specific model
|
|
9
|
+
*/
|
|
10
|
+
export interface ProviderModelConfig {
|
|
11
|
+
name: string;
|
|
12
|
+
contextWindow: number;
|
|
13
|
+
maxOutputTokens: number;
|
|
14
|
+
supportsThinking: boolean;
|
|
15
|
+
supportsVision: boolean;
|
|
16
|
+
supportsSearch: boolean;
|
|
17
|
+
supportsSeed: boolean;
|
|
18
|
+
defaultTemperature: number;
|
|
19
|
+
description: string;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Provider feature flags
|
|
23
|
+
*/
|
|
24
|
+
export interface ProviderFeatures {
|
|
25
|
+
supportsThinking: boolean;
|
|
26
|
+
supportsVision: boolean;
|
|
27
|
+
supportsSearch: boolean;
|
|
28
|
+
supportsSeed: boolean;
|
|
29
|
+
supportsDoSample: boolean;
|
|
30
|
+
/**
|
|
31
|
+
* How thinking mode is activated:
|
|
32
|
+
* - 'thinking_mode': GLM style - uses thinking_mode parameter
|
|
33
|
+
* - 'reasoning_effort': Grok 3 style - uses reasoning_effort parameter (low/high)
|
|
34
|
+
*/
|
|
35
|
+
thinkingModeStyle?: 'thinking_mode' | 'reasoning_effort';
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Provider definition - full configuration for a provider
|
|
39
|
+
* (Different from ProviderConfig which is API key config)
|
|
40
|
+
*/
|
|
41
|
+
export interface ProviderDefinition {
|
|
42
|
+
/** Provider identifier (e.g., 'glm', 'grok') */
|
|
43
|
+
name: string;
|
|
44
|
+
/** Display name for UI (e.g., 'GLM (Z.AI)') */
|
|
45
|
+
displayName: string;
|
|
46
|
+
/** Environment variable for API key */
|
|
47
|
+
apiKeyEnvVar: string;
|
|
48
|
+
/** Alternative env vars for API key (fallbacks) */
|
|
49
|
+
apiKeyEnvVarAliases?: string[];
|
|
50
|
+
/** Default API base URL */
|
|
51
|
+
defaultBaseURL: string;
|
|
52
|
+
/** Default model */
|
|
53
|
+
defaultModel: string;
|
|
54
|
+
/** Supported models */
|
|
55
|
+
models: Record<string, ProviderModelConfig>;
|
|
56
|
+
/** Provider feature flags */
|
|
57
|
+
features: ProviderFeatures;
|
|
58
|
+
/** CLI branding */
|
|
59
|
+
branding: {
|
|
60
|
+
cliName: string;
|
|
61
|
+
description: string;
|
|
62
|
+
welcomeMessage: string;
|
|
63
|
+
/** Primary color for UI elements (Ink color name) */
|
|
64
|
+
primaryColor: string;
|
|
65
|
+
/** Secondary/accent color */
|
|
66
|
+
secondaryColor: string;
|
|
67
|
+
/** ASCII art logo for welcome screen */
|
|
68
|
+
asciiLogo: string;
|
|
69
|
+
/** Short tagline */
|
|
70
|
+
tagline: string;
|
|
71
|
+
};
|
|
72
|
+
/** Configuration directory name (e.g., '.ax-glm', '.ax-grok') */
|
|
73
|
+
configDirName: string;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* GLM Provider Definition (Z.AI)
|
|
77
|
+
*/
|
|
78
|
+
export declare const GLM_PROVIDER: ProviderDefinition;
|
|
79
|
+
/**
|
|
80
|
+
* Grok Provider Definition (xAI)
|
|
81
|
+
*/
|
|
82
|
+
export declare const GROK_PROVIDER: ProviderDefinition;
|
|
83
|
+
/**
|
|
84
|
+
* Default provider (GLM)
|
|
85
|
+
*/
|
|
86
|
+
export declare const DEFAULT_PROVIDER: ProviderDefinition;
|
|
87
|
+
/**
|
|
88
|
+
* Get provider definition by name
|
|
89
|
+
*/
|
|
90
|
+
export declare function getProviderDefinition(name: string): ProviderDefinition | undefined;
|
|
91
|
+
/**
|
|
92
|
+
* Get all available providers
|
|
93
|
+
*/
|
|
94
|
+
export declare function getAvailableProviders(): ProviderDefinition[];
|
|
95
|
+
/**
|
|
96
|
+
* Get model config from provider
|
|
97
|
+
*/
|
|
98
|
+
export declare function getProviderModelConfig(provider: ProviderDefinition, modelName: string): ProviderModelConfig | undefined;
|
|
99
|
+
/**
|
|
100
|
+
* Get API key from environment for a provider
|
|
101
|
+
*/
|
|
102
|
+
export declare function getApiKeyFromEnv(provider: ProviderDefinition): string | undefined;
|
|
103
|
+
/**
|
|
104
|
+
* File names for config files
|
|
105
|
+
*/
|
|
106
|
+
export declare const CONFIG_FILE_NAMES: {
|
|
107
|
+
readonly USER_CONFIG: "config.json";
|
|
108
|
+
readonly PROJECT_SETTINGS: "settings.json";
|
|
109
|
+
readonly CUSTOM_MD: "CUSTOM.md";
|
|
110
|
+
readonly INDEX_JSON: "index.json";
|
|
111
|
+
readonly MEMORY_JSON: "memory.json";
|
|
112
|
+
readonly HISTORY_JSON: "history.json";
|
|
113
|
+
readonly SESSIONS_DIR: "sessions";
|
|
114
|
+
readonly TEMPLATES_DIR: "templates";
|
|
115
|
+
readonly PLANS_DIR: "plans";
|
|
116
|
+
readonly BACKUPS_DIR: "backups";
|
|
117
|
+
readonly CACHE_DIR: "cache";
|
|
118
|
+
};
|
|
119
|
+
/**
|
|
120
|
+
* Config paths structure for a provider
|
|
121
|
+
*/
|
|
122
|
+
export interface ProviderConfigPaths {
|
|
123
|
+
/** Configuration directory name */
|
|
124
|
+
DIR_NAME: string;
|
|
125
|
+
/** User-level settings directory */
|
|
126
|
+
USER_DIR: string;
|
|
127
|
+
/** User-level configuration file */
|
|
128
|
+
USER_CONFIG: string;
|
|
129
|
+
/** Project-level settings directory */
|
|
130
|
+
PROJECT_DIR: string;
|
|
131
|
+
/** Project-level settings file */
|
|
132
|
+
PROJECT_SETTINGS: string;
|
|
133
|
+
/** Custom instructions file path (project-level) */
|
|
134
|
+
CUSTOM_MD: string;
|
|
135
|
+
/** Project index file path (project-level) */
|
|
136
|
+
INDEX_JSON: string;
|
|
137
|
+
/** Project memory file path (project-level) */
|
|
138
|
+
MEMORY_JSON: string;
|
|
139
|
+
/** User templates directory */
|
|
140
|
+
USER_TEMPLATES_DIR: string;
|
|
141
|
+
/** User plans directory */
|
|
142
|
+
USER_PLANS_DIR: string;
|
|
143
|
+
/** User history file */
|
|
144
|
+
USER_HISTORY: string;
|
|
145
|
+
/** User sessions directory */
|
|
146
|
+
USER_SESSIONS_DIR: string;
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
149
|
+
* Get config paths for a specific provider
|
|
150
|
+
*/
|
|
151
|
+
export declare function getProviderConfigPaths(provider: ProviderDefinition): ProviderConfigPaths;
|
|
152
|
+
/**
|
|
153
|
+
* Get config paths for a provider by name
|
|
154
|
+
*/
|
|
155
|
+
export declare function getConfigPathsByProviderName(providerName: string): ProviderConfigPaths | undefined;
|
|
156
|
+
/**
|
|
157
|
+
* Set the active provider (called by cli-factory on startup)
|
|
158
|
+
*/
|
|
159
|
+
export declare function setActiveProviderConfigPaths(provider: ProviderDefinition): void;
|
|
160
|
+
/**
|
|
161
|
+
* Get the active provider definition
|
|
162
|
+
* Falls back to GLM provider if not set
|
|
163
|
+
*/
|
|
164
|
+
export declare function getActiveProvider(): ProviderDefinition;
|
|
165
|
+
/**
|
|
166
|
+
* Get the active provider config paths
|
|
167
|
+
* Falls back to GLM provider if not set
|
|
168
|
+
*/
|
|
169
|
+
export declare function getActiveConfigPaths(): ProviderConfigPaths;
|
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Provider Configuration System
|
|
3
|
+
*
|
|
4
|
+
* Defines provider-specific configurations for GLM, Grok, and other providers.
|
|
5
|
+
* Each provider has its own defaults, model configs, and feature flags.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* GLM Provider Definition (Z.AI)
|
|
9
|
+
*/
|
|
10
|
+
export const GLM_PROVIDER = {
|
|
11
|
+
name: 'glm',
|
|
12
|
+
displayName: 'GLM (Z.AI)',
|
|
13
|
+
apiKeyEnvVar: 'ZAI_API_KEY',
|
|
14
|
+
apiKeyEnvVarAliases: ['GLM_API_KEY', 'YOUR_API_KEY'],
|
|
15
|
+
defaultBaseURL: 'https://api.z.ai/api/coding/paas/v4',
|
|
16
|
+
defaultModel: 'glm-4.6',
|
|
17
|
+
configDirName: '.ax-glm',
|
|
18
|
+
models: {
|
|
19
|
+
'glm-4.6': {
|
|
20
|
+
name: 'GLM-4.6',
|
|
21
|
+
contextWindow: 200000,
|
|
22
|
+
maxOutputTokens: 128000,
|
|
23
|
+
supportsThinking: true,
|
|
24
|
+
supportsVision: false,
|
|
25
|
+
supportsSearch: false,
|
|
26
|
+
supportsSeed: false,
|
|
27
|
+
defaultTemperature: 0.7,
|
|
28
|
+
description: 'Most capable GLM model with thinking mode support',
|
|
29
|
+
},
|
|
30
|
+
'glm-4.5v': {
|
|
31
|
+
name: 'GLM-4.5V',
|
|
32
|
+
contextWindow: 64000,
|
|
33
|
+
maxOutputTokens: 16000,
|
|
34
|
+
supportsThinking: true,
|
|
35
|
+
supportsVision: true,
|
|
36
|
+
supportsSearch: false,
|
|
37
|
+
supportsSeed: false,
|
|
38
|
+
defaultTemperature: 0.7,
|
|
39
|
+
description: 'Vision-capable GLM model',
|
|
40
|
+
},
|
|
41
|
+
'glm-4': {
|
|
42
|
+
name: 'GLM-4',
|
|
43
|
+
contextWindow: 128000,
|
|
44
|
+
maxOutputTokens: 8000,
|
|
45
|
+
supportsThinking: false,
|
|
46
|
+
supportsVision: false,
|
|
47
|
+
supportsSearch: false,
|
|
48
|
+
supportsSeed: false,
|
|
49
|
+
defaultTemperature: 0.7,
|
|
50
|
+
description: 'Standard GLM-4 model',
|
|
51
|
+
},
|
|
52
|
+
'glm-4-flash': {
|
|
53
|
+
name: 'GLM-4 Flash',
|
|
54
|
+
contextWindow: 128000,
|
|
55
|
+
maxOutputTokens: 4000,
|
|
56
|
+
supportsThinking: false,
|
|
57
|
+
supportsVision: false,
|
|
58
|
+
supportsSearch: false,
|
|
59
|
+
supportsSeed: false,
|
|
60
|
+
defaultTemperature: 0.7,
|
|
61
|
+
description: 'Fast, efficient GLM model for quick tasks',
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
features: {
|
|
65
|
+
supportsThinking: true,
|
|
66
|
+
supportsVision: true, // via glm-4.5v
|
|
67
|
+
supportsSearch: false,
|
|
68
|
+
supportsSeed: false,
|
|
69
|
+
supportsDoSample: true,
|
|
70
|
+
thinkingModeStyle: 'thinking_mode',
|
|
71
|
+
},
|
|
72
|
+
branding: {
|
|
73
|
+
cliName: 'ax-glm',
|
|
74
|
+
description: 'GLM-optimized AI coding assistant powered by Z.AI',
|
|
75
|
+
welcomeMessage: '🤖 Starting AX-GLM AI Assistant (powered by Z.AI)...',
|
|
76
|
+
primaryColor: 'cyan',
|
|
77
|
+
secondaryColor: 'green',
|
|
78
|
+
tagline: 'Powered by Z.AI',
|
|
79
|
+
asciiLogo: `
|
|
80
|
+
██████╗ ██╗ ███╗ ███╗
|
|
81
|
+
██╔════╝ ██║ ████╗ ████║
|
|
82
|
+
██║ ███╗██║ ██╔████╔██║
|
|
83
|
+
██║ ██║██║ ██║╚██╔╝██║
|
|
84
|
+
╚██████╔╝███████╗██║ ╚═╝ ██║
|
|
85
|
+
╚═════╝ ╚══════╝╚═╝ ╚═╝
|
|
86
|
+
═══════════════════════
|
|
87
|
+
A X - G L M`,
|
|
88
|
+
},
|
|
89
|
+
};
|
|
90
|
+
/**
|
|
91
|
+
* Grok Provider Definition (xAI)
|
|
92
|
+
*/
|
|
93
|
+
export const GROK_PROVIDER = {
|
|
94
|
+
name: 'grok',
|
|
95
|
+
displayName: 'Grok (xAI)',
|
|
96
|
+
apiKeyEnvVar: 'XAI_API_KEY',
|
|
97
|
+
apiKeyEnvVarAliases: ['GROK_API_KEY'],
|
|
98
|
+
defaultBaseURL: 'https://api.x.ai/v1',
|
|
99
|
+
defaultModel: 'grok-3',
|
|
100
|
+
configDirName: '.ax-grok',
|
|
101
|
+
models: {
|
|
102
|
+
// Grok 3 models with thinking mode (reasoning_effort)
|
|
103
|
+
'grok-3': {
|
|
104
|
+
name: 'Grok-3',
|
|
105
|
+
contextWindow: 131072,
|
|
106
|
+
maxOutputTokens: 131072,
|
|
107
|
+
supportsThinking: true,
|
|
108
|
+
supportsVision: false,
|
|
109
|
+
supportsSearch: true,
|
|
110
|
+
supportsSeed: true,
|
|
111
|
+
defaultTemperature: 0.7,
|
|
112
|
+
description: 'Most capable Grok model with extended thinking via reasoning_effort',
|
|
113
|
+
},
|
|
114
|
+
'grok-3-mini': {
|
|
115
|
+
name: 'Grok-3 Mini',
|
|
116
|
+
contextWindow: 131072,
|
|
117
|
+
maxOutputTokens: 131072,
|
|
118
|
+
supportsThinking: true,
|
|
119
|
+
supportsVision: false,
|
|
120
|
+
supportsSearch: true,
|
|
121
|
+
supportsSeed: true,
|
|
122
|
+
defaultTemperature: 0.7,
|
|
123
|
+
description: 'Efficient Grok 3 model with thinking support',
|
|
124
|
+
},
|
|
125
|
+
// Grok 2 models (no thinking mode) - use dated versions for API compatibility
|
|
126
|
+
'grok-2-1212': {
|
|
127
|
+
name: 'Grok-2',
|
|
128
|
+
contextWindow: 131072,
|
|
129
|
+
maxOutputTokens: 32768,
|
|
130
|
+
supportsThinking: false,
|
|
131
|
+
supportsVision: false,
|
|
132
|
+
supportsSearch: true,
|
|
133
|
+
supportsSeed: true,
|
|
134
|
+
defaultTemperature: 0.7,
|
|
135
|
+
description: 'Capable Grok 2 model with advanced reasoning and web search',
|
|
136
|
+
},
|
|
137
|
+
'grok-2-vision-1212': {
|
|
138
|
+
name: 'Grok-2 Vision',
|
|
139
|
+
contextWindow: 32768,
|
|
140
|
+
maxOutputTokens: 8192,
|
|
141
|
+
supportsThinking: false,
|
|
142
|
+
supportsVision: true,
|
|
143
|
+
supportsSearch: true,
|
|
144
|
+
supportsSeed: true,
|
|
145
|
+
defaultTemperature: 0.7,
|
|
146
|
+
description: 'Vision-capable Grok model for image understanding',
|
|
147
|
+
},
|
|
148
|
+
'grok-2-image-1212': {
|
|
149
|
+
name: 'Grok-2 Image',
|
|
150
|
+
contextWindow: 32768,
|
|
151
|
+
maxOutputTokens: 8192,
|
|
152
|
+
supportsThinking: false,
|
|
153
|
+
supportsVision: false,
|
|
154
|
+
supportsSearch: false,
|
|
155
|
+
supportsSeed: true,
|
|
156
|
+
defaultTemperature: 0.7,
|
|
157
|
+
description: 'Text-to-image generation model',
|
|
158
|
+
},
|
|
159
|
+
// Legacy beta models
|
|
160
|
+
'grok-beta': {
|
|
161
|
+
name: 'Grok Beta',
|
|
162
|
+
contextWindow: 131072,
|
|
163
|
+
maxOutputTokens: 32768,
|
|
164
|
+
supportsThinking: false,
|
|
165
|
+
supportsVision: false,
|
|
166
|
+
supportsSearch: false,
|
|
167
|
+
supportsSeed: true,
|
|
168
|
+
defaultTemperature: 0.7,
|
|
169
|
+
description: 'Legacy Grok beta model',
|
|
170
|
+
},
|
|
171
|
+
'grok-vision-beta': {
|
|
172
|
+
name: 'Grok Vision Beta',
|
|
173
|
+
contextWindow: 8192,
|
|
174
|
+
maxOutputTokens: 4096,
|
|
175
|
+
supportsThinking: false,
|
|
176
|
+
supportsVision: true,
|
|
177
|
+
supportsSearch: false,
|
|
178
|
+
supportsSeed: true,
|
|
179
|
+
defaultTemperature: 0.7,
|
|
180
|
+
description: 'Legacy vision-capable beta model',
|
|
181
|
+
},
|
|
182
|
+
},
|
|
183
|
+
features: {
|
|
184
|
+
supportsThinking: true, // via grok-3 models with reasoning_effort
|
|
185
|
+
supportsVision: true, // via grok-2-vision
|
|
186
|
+
supportsSearch: true,
|
|
187
|
+
supportsSeed: true,
|
|
188
|
+
supportsDoSample: false,
|
|
189
|
+
thinkingModeStyle: 'reasoning_effort',
|
|
190
|
+
},
|
|
191
|
+
branding: {
|
|
192
|
+
cliName: 'ax-grok',
|
|
193
|
+
description: 'Grok-optimized AI coding assistant powered by xAI',
|
|
194
|
+
welcomeMessage: '🤖 Starting AX-Grok AI Assistant (powered by xAI)...',
|
|
195
|
+
primaryColor: 'magenta',
|
|
196
|
+
secondaryColor: 'yellow',
|
|
197
|
+
tagline: 'Powered by xAI',
|
|
198
|
+
asciiLogo: `
|
|
199
|
+
██████╗ ██████╗ ██████╗ ██╗ ██╗
|
|
200
|
+
██╔════╝ ██╔══██╗██╔═══██╗██║ ██╔╝
|
|
201
|
+
██║ ███╗██████╔╝██║ ██║█████╔╝
|
|
202
|
+
██║ ██║██╔══██╗██║ ██║██╔═██╗
|
|
203
|
+
╚██████╔╝██║ ██║╚██████╔╝██║ ██╗
|
|
204
|
+
╚═════╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝
|
|
205
|
+
═══════════════════════════
|
|
206
|
+
A X - G R O K`,
|
|
207
|
+
},
|
|
208
|
+
};
|
|
209
|
+
/**
|
|
210
|
+
* Default provider (GLM)
|
|
211
|
+
*/
|
|
212
|
+
export const DEFAULT_PROVIDER = GLM_PROVIDER;
|
|
213
|
+
/**
|
|
214
|
+
* Get provider definition by name
|
|
215
|
+
*/
|
|
216
|
+
export function getProviderDefinition(name) {
|
|
217
|
+
const providers = {
|
|
218
|
+
glm: GLM_PROVIDER,
|
|
219
|
+
grok: GROK_PROVIDER,
|
|
220
|
+
};
|
|
221
|
+
return providers[name.toLowerCase()];
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* Get all available providers
|
|
225
|
+
*/
|
|
226
|
+
export function getAvailableProviders() {
|
|
227
|
+
return [GLM_PROVIDER, GROK_PROVIDER];
|
|
228
|
+
}
|
|
229
|
+
/**
|
|
230
|
+
* Get model config from provider
|
|
231
|
+
*/
|
|
232
|
+
export function getProviderModelConfig(provider, modelName) {
|
|
233
|
+
return provider.models[modelName];
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* Get API key from environment for a provider
|
|
237
|
+
*/
|
|
238
|
+
export function getApiKeyFromEnv(provider) {
|
|
239
|
+
// Check primary env var
|
|
240
|
+
let apiKey = process.env[provider.apiKeyEnvVar];
|
|
241
|
+
// Check aliases
|
|
242
|
+
if (!apiKey && provider.apiKeyEnvVarAliases) {
|
|
243
|
+
for (const alias of provider.apiKeyEnvVarAliases) {
|
|
244
|
+
apiKey = process.env[alias];
|
|
245
|
+
if (apiKey)
|
|
246
|
+
break;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
return apiKey;
|
|
250
|
+
}
|
|
251
|
+
import { homedir } from 'os';
|
|
252
|
+
import { join } from 'path';
|
|
253
|
+
/**
|
|
254
|
+
* File names for config files
|
|
255
|
+
*/
|
|
256
|
+
export const CONFIG_FILE_NAMES = {
|
|
257
|
+
USER_CONFIG: 'config.json',
|
|
258
|
+
PROJECT_SETTINGS: 'settings.json',
|
|
259
|
+
CUSTOM_MD: 'CUSTOM.md',
|
|
260
|
+
INDEX_JSON: 'index.json',
|
|
261
|
+
MEMORY_JSON: 'memory.json',
|
|
262
|
+
HISTORY_JSON: 'history.json',
|
|
263
|
+
SESSIONS_DIR: 'sessions',
|
|
264
|
+
TEMPLATES_DIR: 'templates',
|
|
265
|
+
PLANS_DIR: 'plans',
|
|
266
|
+
BACKUPS_DIR: 'backups',
|
|
267
|
+
CACHE_DIR: 'cache',
|
|
268
|
+
};
|
|
269
|
+
/**
|
|
270
|
+
* Get config paths for a specific provider
|
|
271
|
+
*/
|
|
272
|
+
export function getProviderConfigPaths(provider) {
|
|
273
|
+
const configDirName = provider.configDirName;
|
|
274
|
+
return {
|
|
275
|
+
DIR_NAME: configDirName,
|
|
276
|
+
USER_DIR: join(homedir(), configDirName),
|
|
277
|
+
USER_CONFIG: join(homedir(), configDirName, CONFIG_FILE_NAMES.USER_CONFIG),
|
|
278
|
+
PROJECT_DIR: join(process.cwd(), configDirName),
|
|
279
|
+
PROJECT_SETTINGS: join(process.cwd(), configDirName, CONFIG_FILE_NAMES.PROJECT_SETTINGS),
|
|
280
|
+
CUSTOM_MD: join(process.cwd(), configDirName, CONFIG_FILE_NAMES.CUSTOM_MD),
|
|
281
|
+
INDEX_JSON: join(process.cwd(), configDirName, CONFIG_FILE_NAMES.INDEX_JSON),
|
|
282
|
+
MEMORY_JSON: join(process.cwd(), configDirName, CONFIG_FILE_NAMES.MEMORY_JSON),
|
|
283
|
+
USER_TEMPLATES_DIR: join(homedir(), configDirName, CONFIG_FILE_NAMES.TEMPLATES_DIR),
|
|
284
|
+
USER_PLANS_DIR: join(homedir(), configDirName, CONFIG_FILE_NAMES.PLANS_DIR),
|
|
285
|
+
USER_HISTORY: join(homedir(), configDirName, CONFIG_FILE_NAMES.HISTORY_JSON),
|
|
286
|
+
USER_SESSIONS_DIR: join(homedir(), configDirName, CONFIG_FILE_NAMES.SESSIONS_DIR),
|
|
287
|
+
};
|
|
288
|
+
}
|
|
289
|
+
/**
|
|
290
|
+
* Get config paths for a provider by name
|
|
291
|
+
*/
|
|
292
|
+
export function getConfigPathsByProviderName(providerName) {
|
|
293
|
+
const provider = getProviderDefinition(providerName);
|
|
294
|
+
if (!provider)
|
|
295
|
+
return undefined;
|
|
296
|
+
return getProviderConfigPaths(provider);
|
|
297
|
+
}
|
|
298
|
+
// Current active provider (set by cli-factory)
|
|
299
|
+
let activeProvider = null;
|
|
300
|
+
let activeConfigPaths = null;
|
|
301
|
+
/**
|
|
302
|
+
* Set the active provider (called by cli-factory on startup)
|
|
303
|
+
*/
|
|
304
|
+
export function setActiveProviderConfigPaths(provider) {
|
|
305
|
+
activeProvider = provider;
|
|
306
|
+
activeConfigPaths = getProviderConfigPaths(provider);
|
|
307
|
+
}
|
|
308
|
+
/**
|
|
309
|
+
* Get the active provider definition
|
|
310
|
+
* Falls back to GLM provider if not set
|
|
311
|
+
*/
|
|
312
|
+
export function getActiveProvider() {
|
|
313
|
+
return activeProvider || GLM_PROVIDER;
|
|
314
|
+
}
|
|
315
|
+
/**
|
|
316
|
+
* Get the active provider config paths
|
|
317
|
+
* Falls back to GLM provider if not set
|
|
318
|
+
*/
|
|
319
|
+
export function getActiveConfigPaths() {
|
|
320
|
+
if (!activeConfigPaths) {
|
|
321
|
+
// Default to GLM if not initialized
|
|
322
|
+
activeConfigPaths = getProviderConfigPaths(GLM_PROVIDER);
|
|
323
|
+
}
|
|
324
|
+
return activeConfigPaths;
|
|
325
|
+
}
|
|
326
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/provider/config.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defai.digital/ax-cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"sdkVersion": "1.4.0",
|
|
5
5
|
"description": "Enterprise-Class AI Command Line Interface - Primary support for GLM (General Language Model) with multi-provider AI orchestration powered by AutomatosX.",
|
|
6
6
|
"type": "module",
|