@xaidenlabs/uso 1.1.99 → 1.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/package.json +1 -1
- package/packages/uso-core/dist/cjs/agent/tools/environment.d.ts.map +1 -1
- package/packages/uso-core/dist/cjs/agent/tools/environment.js +34 -12
- package/packages/uso-core/dist/cjs/agent/tools/environment.js.map +1 -1
- package/packages/uso-core/dist/cjs/agent/tools/terminal.js +2 -2
- package/packages/uso-core/dist/cjs/agent/tools/terminal.js.map +1 -1
- package/packages/uso-core/dist/cjs/execution/runner.js +2 -2
- package/packages/uso-core/dist/cjs/execution/runner.js.map +1 -1
- package/packages/uso-core/dist/cjs/runtime/toolchain.js +2 -2
- package/packages/uso-core/dist/cjs/runtime/toolchain.js.map +1 -1
- package/packages/uso-core/dist/esm/agent/tools/environment.d.ts.map +1 -1
- package/packages/uso-core/dist/esm/agent/tools/environment.js +34 -12
- package/packages/uso-core/dist/esm/agent/tools/environment.js.map +1 -1
- package/packages/uso-core/dist/esm/agent/tools/terminal.js +2 -2
- package/packages/uso-core/dist/esm/agent/tools/terminal.js.map +1 -1
- package/packages/uso-core/dist/esm/execution/runner.js +2 -2
- package/packages/uso-core/dist/esm/execution/runner.js.map +1 -1
- package/packages/uso-core/dist/esm/runtime/toolchain.js +2 -2
- package/packages/uso-core/dist/esm/runtime/toolchain.js.map +1 -1
- package/packages/uso-core/src/agent/tools/environment.ts +37 -11
- package/packages/uso-core/src/agent/tools/terminal.ts +2 -2
- package/packages/uso-core/src/execution/runner.ts +2 -2
- package/packages/uso-core/src/runtime/toolchain.ts +2 -2
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAoGlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAoGlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAgEpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAuD9B,CAAC"}
|
|
@@ -37,10 +37,10 @@ exports.checkEnvironmentTool = {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
40
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
40
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
41
41
|
function spawnSolana(args) {
|
|
42
42
|
if (isWsl) {
|
|
43
|
-
return (0, node_child_process_1.spawnSync)("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
43
|
+
return (0, node_child_process_1.spawnSync)("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
44
44
|
encoding: "utf8",
|
|
45
45
|
timeout: 5000,
|
|
46
46
|
});
|
|
@@ -118,14 +118,25 @@ exports.checkWalletBalanceTool = {
|
|
|
118
118
|
},
|
|
119
119
|
},
|
|
120
120
|
},
|
|
121
|
-
async execute(params) {
|
|
121
|
+
async execute(params, state) {
|
|
122
122
|
const address = params.address ? String(params.address) : undefined;
|
|
123
123
|
const args = address ? ["balance", address] : ["balance"];
|
|
124
124
|
try {
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
125
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
126
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
127
|
+
let result;
|
|
128
|
+
if (isWsl) {
|
|
129
|
+
result = (0, node_child_process_1.spawnSync)("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
130
|
+
encoding: "utf8",
|
|
131
|
+
timeout: 10000,
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
result = (0, node_child_process_1.spawnSync)("solana", args, {
|
|
136
|
+
encoding: "utf8",
|
|
137
|
+
timeout: 10000,
|
|
138
|
+
});
|
|
139
|
+
}
|
|
129
140
|
if (result.status === 0 && result.stdout) {
|
|
130
141
|
return {
|
|
131
142
|
success: true,
|
|
@@ -161,12 +172,23 @@ exports.checkClusterTool = {
|
|
|
161
172
|
properties: {},
|
|
162
173
|
},
|
|
163
174
|
},
|
|
164
|
-
async execute() {
|
|
175
|
+
async execute(_params, state) {
|
|
165
176
|
try {
|
|
166
|
-
const
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
177
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
178
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" 2>/dev/null';
|
|
179
|
+
let result;
|
|
180
|
+
if (isWsl) {
|
|
181
|
+
result = (0, node_child_process_1.spawnSync)("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana config get`], {
|
|
182
|
+
encoding: "utf8",
|
|
183
|
+
timeout: 5000,
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
result = (0, node_child_process_1.spawnSync)("solana", ["config", "get"], {
|
|
188
|
+
encoding: "utf8",
|
|
189
|
+
timeout: 5000,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
170
192
|
if (result.status === 0 && result.stdout) {
|
|
171
193
|
return {
|
|
172
194
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":";;;AAAA,2DAA+C;AAG/C,uDAA+D;AAE/D;;;;GAIG;AACU,QAAA,oBAAoB,GAAc;IAC7C,IAAI,EAAE,mBAAmB;IACzB,WAAW,EACT,sFAAsF;QACtF,6DAA6D;QAC7D,sEAAsE;IAExE,UAAU,EAAE;QACV,IAAI,EAAE,mBAAmB;QACzB,WAAW,EACT,sFAAsF;QACxF,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;IAED,KAAK,CAAC,OAAO,CACX,OAAgC,EAChC,KAAiB;QAEjB,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK;QACL,OAAO,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;QAE1D,YAAY;QACZ,MAAM,SAAS,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,iBAAiB,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC;QACtF,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,8 @@ exports.runTerminalCommandTool = {
|
|
|
49
49
|
if (isWindows && isWslRoute) {
|
|
50
50
|
shell = "wsl.exe";
|
|
51
51
|
// Setup the environment like the CLI does
|
|
52
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
53
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
52
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
53
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command}`];
|
|
54
54
|
}
|
|
55
55
|
const child = (0, node_child_process_1.spawn)(shell, shellArgs, {
|
|
56
56
|
cwd,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":";;;AAAA,2DAA2C;AAK3C;;;GAGG;AACU,QAAA,sBAAsB,GAAc;IAC/C,IAAI,EAAE,sBAAsB;IAC5B,WAAW,EACT,oEAAoE;QACpE,qEAAqE;QACrE,4CAA4C;IAE9C,UAAU,EAAE;QACV,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EACT,mEAAmE;QACrE,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,uEAAuE;iBAC1E;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,0EAA0E;iBAC7E;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,0DAA0D;oBAC5D,OAAO,EAAE,KAAK;iBACf;aACF;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC;SACtB;KACF;IAED,KAAK,CAAC,OAAO,CACX,MAA+B,EAC/B,KAAiB;QAEjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,SAAS,CAAC;YACrD,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC;YAErD,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;YAChD,IAAI,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9D,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;gBAC5B,KAAK,GAAG,SAAS,CAAC;gBAClB,0CAA0C;gBAC1C,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ async function runTask(task, route, attempt) {
|
|
|
9
9
|
let shellArgs = [isWindows ? "/c" : "-c", `${task.command} ${task.args.join(" ")}`];
|
|
10
10
|
if (isWindows && route === "wsl") {
|
|
11
11
|
shell = "wsl.exe";
|
|
12
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
13
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
12
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
13
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${task.command} ${task.args.join(" ")}`];
|
|
14
14
|
}
|
|
15
15
|
const child = (0, node_child_process_1.spawn)(shell, shellArgs, {
|
|
16
16
|
env: process.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":";;AAGA,0BA6CC;AAhDD,2DAA2C;AAGpC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":";;AAGA,0BA6CC;AAhDD,2DAA2C;AAGpC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,4PAA4P,CAAC;YAC9Q,SAAS,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,KAAK,EAAE,SAAS,EAAE;YACpC,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;YAC3B,OAAO,CAAC;gBACN,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,OAAO;gBACP,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACjD,KAAK;gBACL,MAAM,EAAE,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gBAC7C,MAAM;gBACN,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -43,8 +43,8 @@ function probe(command, args, timeout) {
|
|
|
43
43
|
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
44
44
|
if (configJson.mode === "wsl") {
|
|
45
45
|
executable = "wsl.exe";
|
|
46
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
47
|
-
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
46
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
47
|
+
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command} ${args.join(" ")}`];
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":";;AAoGA,oDAqBC;AAED,wCAGC;AAED,kDAGC;AAnID,2DAA+C;AAG/C,yCAAyC;AACzC,IAAI,eAAe,GAAyB,IAAI,CAAC;AACjD,IAAI,cAAc,GAAG,CAAC,CAAC;AACvB,MAAM,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC;AAE/B,MAAM,WAAW,GACf;IACE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACvD,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACxD,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACzD,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;CAC1D,CAAC;AAEJ,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,8BAA8B;IAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAChD,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,sEAAsE;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAClE,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,KAAK,CAAC,OAAe,EAAE,IAAc,EAAE,OAAe;IAC7D,IAAI,CAAC;QACH,IAAI,UAAU,GAAG,OAAO,CAAC;QACzB,IAAI,SAAS,GAAG,IAAI,CAAC;QAErB,yBAAyB;QACzB,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;oBACnE,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBAC9B,UAAU,GAAG,SAAS,CAAC;wBACvB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAoGlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAoGlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAgEpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAuD9B,CAAC"}
|
|
@@ -34,10 +34,10 @@ export const checkEnvironmentTool = {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
37
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
37
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
38
38
|
function spawnSolana(args) {
|
|
39
39
|
if (isWsl) {
|
|
40
|
-
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
40
|
+
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
41
41
|
encoding: "utf8",
|
|
42
42
|
timeout: 5000,
|
|
43
43
|
});
|
|
@@ -115,14 +115,25 @@ export const checkWalletBalanceTool = {
|
|
|
115
115
|
},
|
|
116
116
|
},
|
|
117
117
|
},
|
|
118
|
-
async execute(params) {
|
|
118
|
+
async execute(params, state) {
|
|
119
119
|
const address = params.address ? String(params.address) : undefined;
|
|
120
120
|
const args = address ? ["balance", address] : ["balance"];
|
|
121
121
|
try {
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
122
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
123
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
124
|
+
let result;
|
|
125
|
+
if (isWsl) {
|
|
126
|
+
result = spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
127
|
+
encoding: "utf8",
|
|
128
|
+
timeout: 10000,
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
result = spawnSync("solana", args, {
|
|
133
|
+
encoding: "utf8",
|
|
134
|
+
timeout: 10000,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
126
137
|
if (result.status === 0 && result.stdout) {
|
|
127
138
|
return {
|
|
128
139
|
success: true,
|
|
@@ -158,12 +169,23 @@ export const checkClusterTool = {
|
|
|
158
169
|
properties: {},
|
|
159
170
|
},
|
|
160
171
|
},
|
|
161
|
-
async execute() {
|
|
172
|
+
async execute(_params, state) {
|
|
162
173
|
try {
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
174
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
175
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" 2>/dev/null';
|
|
176
|
+
let result;
|
|
177
|
+
if (isWsl) {
|
|
178
|
+
result = spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana config get`], {
|
|
179
|
+
encoding: "utf8",
|
|
180
|
+
timeout: 5000,
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
result = spawnSync("solana", ["config", "get"], {
|
|
185
|
+
encoding: "utf8",
|
|
186
|
+
timeout: 5000,
|
|
187
|
+
});
|
|
188
|
+
}
|
|
167
189
|
if (result.status === 0 && result.stdout) {
|
|
168
190
|
return {
|
|
169
191
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAc;IAC7C,IAAI,EAAE,mBAAmB;IACzB,WAAW,EACT,sFAAsF;QACtF,6DAA6D;QAC7D,sEAAsE;IAExE,UAAU,EAAE;QACV,IAAI,EAAE,mBAAmB;QACzB,WAAW,EACT,sFAAsF;QACxF,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;IAED,KAAK,CAAC,OAAO,CACX,OAAgC,EAChC,KAAiB;QAEjB,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK;QACL,OAAO,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;QAE1D,YAAY;QACZ,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,iBAAiB,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC;QACtF,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,8 +46,8 @@ export const runTerminalCommandTool = {
|
|
|
46
46
|
if (isWindows && isWslRoute) {
|
|
47
47
|
shell = "wsl.exe";
|
|
48
48
|
// Setup the environment like the CLI does
|
|
49
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
50
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
49
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
50
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command}`];
|
|
51
51
|
}
|
|
52
52
|
const child = spawn(shell, shellArgs, {
|
|
53
53
|
cwd,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAK3C;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAc;IAC/C,IAAI,EAAE,sBAAsB;IAC5B,WAAW,EACT,oEAAoE;QACpE,qEAAqE;QACrE,4CAA4C;IAE9C,UAAU,EAAE;QACV,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EACT,mEAAmE;QACrE,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,uEAAuE;iBAC1E;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,0EAA0E;iBAC7E;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,0DAA0D;oBAC5D,OAAO,EAAE,KAAK;iBACf;aACF;YACD,QAAQ,EAAE,CAAC,SAAS,CAAC;SACtB;KACF;IAED,KAAK,CAAC,OAAO,CACX,MAA+B,EAC/B,KAAiB;QAEjB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,SAAS,CAAC;YACrD,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,KAAK,KAAK,CAAC;YAErD,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;YAChD,IAAI,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9D,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;gBAC5B,KAAK,GAAG,SAAS,CAAC;gBAClB,0CAA0C;gBAC1C,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ export async function runTask(task, route, attempt) {
|
|
|
6
6
|
let shellArgs = [isWindows ? "/c" : "-c", `${task.command} ${task.args.join(" ")}`];
|
|
7
7
|
if (isWindows && route === "wsl") {
|
|
8
8
|
shell = "wsl.exe";
|
|
9
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
10
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
9
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
10
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${task.command} ${task.args.join(" ")}`];
|
|
11
11
|
}
|
|
12
12
|
const child = spawn(shell, shellArgs, {
|
|
13
13
|
env: process.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,4PAA4P,CAAC;YAC9Q,SAAS,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,KAAK,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE;YACpC,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;YAC3B,OAAO,CAAC;gBACN,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,OAAO;gBACP,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACjD,KAAK;gBACL,MAAM,EAAE,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gBAC7C,MAAM;gBACN,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -38,8 +38,8 @@ function probe(command, args, timeout) {
|
|
|
38
38
|
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
39
39
|
if (configJson.mode === "wsl") {
|
|
40
40
|
executable = "wsl.exe";
|
|
41
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
42
|
-
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
41
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
42
|
+
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command} ${args.join(" ")}`];
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,yCAAyC;AACzC,IAAI,eAAe,GAAyB,IAAI,CAAC;AACjD,IAAI,cAAc,GAAG,CAAC,CAAC;AACvB,MAAM,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC;AAE/B,MAAM,WAAW,GACf;IACE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACvD,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACxD,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;IACzD,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;CAC1D,CAAC;AAEJ,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,8BAA8B;IAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAChD,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,sEAAsE;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAClE,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,KAAK,CAAC,OAAe,EAAE,IAAc,EAAE,OAAe;IAC7D,IAAI,CAAC;QACH,IAAI,UAAU,GAAG,OAAO,CAAC;QACzB,IAAI,SAAS,GAAG,IAAI,CAAC;QAErB,yBAAyB;QACzB,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,kBAAkB,CAAC,CAAC;gBAC/D,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;oBACnE,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBAC9B,UAAU,GAAG,SAAS,CAAC;wBACvB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,11 +46,11 @@ export const checkEnvironmentTool: AgentTool = {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
49
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
49
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
50
50
|
|
|
51
51
|
function spawnSolana(args: string[]) {
|
|
52
52
|
if (isWsl) {
|
|
53
|
-
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
53
|
+
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
54
54
|
encoding: "utf8",
|
|
55
55
|
timeout: 5000,
|
|
56
56
|
});
|
|
@@ -135,15 +135,27 @@ export const checkWalletBalanceTool: AgentTool = {
|
|
|
135
135
|
|
|
136
136
|
async execute(
|
|
137
137
|
params: Record<string, unknown>,
|
|
138
|
+
state: AgentState,
|
|
138
139
|
): Promise<ToolResult> {
|
|
139
140
|
const address = params.address ? String(params.address) : undefined;
|
|
140
141
|
const args = address ? ["balance", address] : ["balance"];
|
|
141
142
|
|
|
142
143
|
try {
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
144
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
145
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
146
|
+
|
|
147
|
+
let result;
|
|
148
|
+
if (isWsl) {
|
|
149
|
+
result = spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana ${args.join(" ")}`], {
|
|
150
|
+
encoding: "utf8",
|
|
151
|
+
timeout: 10000,
|
|
152
|
+
});
|
|
153
|
+
} else {
|
|
154
|
+
result = spawnSync("solana", args, {
|
|
155
|
+
encoding: "utf8",
|
|
156
|
+
timeout: 10000,
|
|
157
|
+
});
|
|
158
|
+
}
|
|
147
159
|
|
|
148
160
|
if (result.status === 0 && result.stdout) {
|
|
149
161
|
return {
|
|
@@ -184,12 +196,26 @@ export const checkClusterTool: AgentTool = {
|
|
|
184
196
|
},
|
|
185
197
|
},
|
|
186
198
|
|
|
187
|
-
async execute(
|
|
199
|
+
async execute(
|
|
200
|
+
_params: Record<string, unknown>,
|
|
201
|
+
state: AgentState,
|
|
202
|
+
): Promise<ToolResult> {
|
|
188
203
|
try {
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
204
|
+
const isWsl = state.environment.os === "windows" && state.environment.route === "wsl";
|
|
205
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" 2>/dev/null';
|
|
206
|
+
|
|
207
|
+
let result;
|
|
208
|
+
if (isWsl) {
|
|
209
|
+
result = spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; solana config get`], {
|
|
210
|
+
encoding: "utf8",
|
|
211
|
+
timeout: 5000,
|
|
212
|
+
});
|
|
213
|
+
} else {
|
|
214
|
+
result = spawnSync("solana", ["config", "get"], {
|
|
215
|
+
encoding: "utf8",
|
|
216
|
+
timeout: 5000,
|
|
217
|
+
});
|
|
218
|
+
}
|
|
193
219
|
|
|
194
220
|
if (result.status === 0 && result.stdout) {
|
|
195
221
|
return {
|
|
@@ -64,8 +64,8 @@ export const runTerminalCommandTool: AgentTool = {
|
|
|
64
64
|
if (isWindows && isWslRoute) {
|
|
65
65
|
shell = "wsl.exe";
|
|
66
66
|
// Setup the environment like the CLI does
|
|
67
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
68
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
67
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
68
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command}`];
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
const child = spawn(shell, shellArgs, {
|
|
@@ -13,8 +13,8 @@ export async function runTask(
|
|
|
13
13
|
|
|
14
14
|
if (isWindows && route === "wsl") {
|
|
15
15
|
shell = "wsl.exe";
|
|
16
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
17
|
-
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
16
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
17
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${task.command} ${task.args.join(" ")}`];
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
const child = spawn(shell, shellArgs, {
|
|
@@ -45,8 +45,8 @@ function probe(command: string, args: string[], timeout: number): ToolVersion {
|
|
|
45
45
|
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
46
46
|
if (configJson.mode === "wsl") {
|
|
47
47
|
executable = "wsl.exe";
|
|
48
|
-
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
49
|
-
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}
|
|
48
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"; export NVM_DIR="$HOME/.nvm"; if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh" 2>/dev/null; nvm use node 2>/dev/null; fi';
|
|
49
|
+
spawnArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup}; ${command} ${args.join(" ")}`];
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
} catch (e) {
|