natureco-cli 5.6.0 → 5.6.2
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/package.json +1 -1
- package/src/commands/setup.js +53 -14
- package/src/utils/tools.js +40 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "natureco-cli",
|
|
3
|
-
"version": "5.6.
|
|
3
|
+
"version": "5.6.2",
|
|
4
4
|
"description": "OpenClaw'dan daha güvenli, daha hızlı, daha ucuz AI agent CLI. Multi-agent, self-evolving skills, audit log, maliyet optimizasyonu ve NatureCo platform-native.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"natureco": "bin/natureco.js"
|
package/src/commands/setup.js
CHANGED
|
@@ -83,35 +83,74 @@ async function cmdWizard() {
|
|
|
83
83
|
|
|
84
84
|
const cfg = getConfig();
|
|
85
85
|
|
|
86
|
-
// Step 1
|
|
87
|
-
console.log(chalk.white(' Step 1: Provider'));
|
|
86
|
+
// v5.6.2: Step 1 - Provider + Model wizard
|
|
87
|
+
console.log(chalk.white(' Step 1: Provider & Model'));
|
|
88
88
|
console.log(chalk.gray(' ─────────────────────────────────────────────'));
|
|
89
|
+
|
|
89
90
|
const providerKeys = Object.keys(PROVIDER_PRESETS);
|
|
91
|
+
|
|
92
|
+
// 1a) Provider secimi
|
|
90
93
|
const { provider } = await inquirer.prompt([{
|
|
91
94
|
type: 'list',
|
|
92
95
|
name: 'provider',
|
|
93
96
|
message: ' AI Provider:',
|
|
94
97
|
choices: [
|
|
95
98
|
...providerKeys.map(k => ({
|
|
96
|
-
name: `${k.
|
|
99
|
+
name: `${PROVIDER_PRESETS[k].name} - ${PROVIDER_PRESETS[k].models[PROVIDER_PRESETS[k].default].label}`,
|
|
97
100
|
value: k,
|
|
98
101
|
})),
|
|
99
|
-
{ name: 'Custom URL', value: 'custom' },
|
|
100
102
|
],
|
|
103
|
+
pageSize: 12,
|
|
101
104
|
}]);
|
|
102
105
|
|
|
103
|
-
|
|
106
|
+
const preset = PROVIDER_PRESETS[provider];
|
|
107
|
+
|
|
108
|
+
// 1b) Model tier secimi
|
|
109
|
+
let providerUrl = preset.url;
|
|
110
|
+
let providerModel = preset.models[preset.default].id;
|
|
111
|
+
|
|
104
112
|
if (provider === 'custom') {
|
|
105
|
-
providerUrl = await rlQuestion(` Provider URL (${cfg.providerUrl || 'https://api.openai.com/v1'}): `);
|
|
106
|
-
providerModel = await rlQuestion(` Model (${cfg.providerModel || 'gpt-4o'}): `);
|
|
107
|
-
providerUrl = providerUrl || cfg.providerUrl || 'https://api.openai.com/v1';
|
|
108
|
-
providerModel = providerModel || cfg.providerModel || 'gpt-4o';
|
|
113
|
+
providerUrl = await rlQuestion(` Provider URL (${cfg.providerUrl || 'https://api.openai.com/v1'}): `) || cfg.providerUrl || 'https://api.openai.com/v1';
|
|
114
|
+
providerModel = await rlQuestion(` Model (${cfg.providerModel || 'gpt-4o'}): `) || cfg.providerModel || 'gpt-4o';
|
|
109
115
|
} else {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
116
|
+
// Tier secimi wizard
|
|
117
|
+
const tierChoices = [
|
|
118
|
+
{
|
|
119
|
+
name: `\u{1F7E2} GUCLU - ${preset.models.powerful.label} | ${preset.models.powerful.desc} | ${preset.models.powerful.cost}`,
|
|
120
|
+
value: 'powerful',
|
|
121
|
+
short: preset.models.powerful.label,
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
name: `\u{1F7E1} ORTA - ${preset.models.balanced.label} | ${preset.models.balanced.desc} | ${preset.models.balanced.cost}`,
|
|
125
|
+
value: 'balanced',
|
|
126
|
+
short: preset.models.balanced.label,
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
name: `\u{1F535} HIZLI - ${preset.models.fast.label} | ${preset.models.fast.desc} | ${preset.models.fast.cost}`,
|
|
130
|
+
value: 'fast',
|
|
131
|
+
short: preset.models.fast.label,
|
|
132
|
+
},
|
|
133
|
+
{ name: '✏️ Custom model adı (ileri düzey)', value: 'custom' },
|
|
134
|
+
];
|
|
135
|
+
|
|
136
|
+
const { tier } = await inquirer.prompt([{
|
|
137
|
+
type: 'list',
|
|
138
|
+
name: 'tier',
|
|
139
|
+
message: ' Model tier:',
|
|
140
|
+
choices: tierChoices,
|
|
141
|
+
pageSize: 5,
|
|
142
|
+
}]);
|
|
143
|
+
|
|
144
|
+
if (tier === 'custom') {
|
|
145
|
+
providerModel = await rlQuestion(` Model adı (${cfg.providerModel || preset.models.balanced.id}): `) || cfg.providerModel || preset.models.balanced.id;
|
|
146
|
+
} else {
|
|
147
|
+
providerModel = preset.models[tier].id;
|
|
148
|
+
console.log(chalk.gray(` \u2713 Secildi: ${preset.models[tier].label} (${tier})`));
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
console.log(chalk.gray(` URL: ${providerUrl}`));
|
|
153
|
+
console.log(chalk.gray(` Model: ${providerModel}`));
|
|
115
154
|
}
|
|
116
155
|
|
|
117
156
|
// Step 2: API Key
|
package/src/utils/tools.js
CHANGED
|
@@ -22,15 +22,55 @@ const TOOLS_DIR = path.join(__dirname, '..', 'tools');
|
|
|
22
22
|
* { name, description, parameters, execute } varsa kullan,
|
|
23
23
|
* yoksa dosya adından otomatik üret.
|
|
24
24
|
*/
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* v5.6.1: Provider'a gore tool filtrele
|
|
28
|
+
* Groq validator cok kati — sadece basit tool'lar
|
|
29
|
+
* Anthropic, OpenAI tam tool seti kullanir
|
|
30
|
+
*/
|
|
31
|
+
function getToolsForProvider(allTools, providerUrl) {
|
|
32
|
+
const url = (providerUrl || '').toLowerCase();
|
|
33
|
+
|
|
34
|
+
// Groq icin minimum tool seti
|
|
35
|
+
if (url.includes('groq.com')) {
|
|
36
|
+
const allowed = ['read_file', 'write_file', 'bash', 'shell_command', 'list_dir', 'soul', 'memory_write', 'memory_search'];
|
|
37
|
+
return allTools.filter(t => allowed.includes(t.name));
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// Anthropic, OpenAI, MiniMax tam set
|
|
41
|
+
return allTools;
|
|
42
|
+
}
|
|
43
|
+
|
|
25
44
|
function loadToolDefinitions() {
|
|
26
45
|
const tools = [];
|
|
27
46
|
const files = fs.readdirSync(TOOLS_DIR).filter(f => f.endsWith('.js'));
|
|
28
47
|
|
|
48
|
+
// v5.6.1: Provider tespiti - Groq icin sadece temel tool'lar
|
|
49
|
+
let isGroq = false;
|
|
50
|
+
try {
|
|
51
|
+
const { getConfig } = require('./config');
|
|
52
|
+
const cfg = getConfig();
|
|
53
|
+
if (cfg.providerUrl && cfg.providerUrl.toLowerCase().includes('groq.com')) {
|
|
54
|
+
isGroq = true;
|
|
55
|
+
}
|
|
56
|
+
} catch (e) {}
|
|
57
|
+
|
|
58
|
+
const GROQ_ALLOWED = new Set([
|
|
59
|
+
'read_file', 'write_file', 'list_dir', 'bash', 'shell_command',
|
|
60
|
+
'soul', 'memory_write', 'memory_search', 'filesystem', 'grep_search'
|
|
61
|
+
]);
|
|
62
|
+
|
|
29
63
|
for (const file of files) {
|
|
30
64
|
try {
|
|
31
65
|
const toolPath = path.join(TOOLS_DIR, file);
|
|
32
66
|
const mod = require(toolPath);
|
|
33
67
|
|
|
68
|
+
// Groq icin sadece temel tool'lar
|
|
69
|
+
if (isGroq) {
|
|
70
|
+
const toolName = mod.name || path.basename(file, '.js');
|
|
71
|
+
if (!GROQ_ALLOWED.has(toolName)) continue;
|
|
72
|
+
}
|
|
73
|
+
|
|
34
74
|
// Tool metadata çıkar
|
|
35
75
|
const meta = {
|
|
36
76
|
name: mod.name || path.basename(file, '.js'),
|