@xaidenlabs/uso 1.1.96 → 1.1.97
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 +16 -11
- package/packages/uso-core/dist/cjs/agent/tools/environment.js.map +1 -1
- package/packages/uso-core/dist/cjs/agent/tools/terminal.d.ts.map +1 -1
- package/packages/uso-core/dist/cjs/agent/tools/terminal.js +10 -3
- package/packages/uso-core/dist/cjs/agent/tools/terminal.js.map +1 -1
- package/packages/uso-core/dist/cjs/runtime/discovery.d.ts.map +1 -1
- package/packages/uso-core/dist/cjs/runtime/discovery.js +22 -1
- package/packages/uso-core/dist/cjs/runtime/discovery.js.map +1 -1
- package/packages/uso-core/dist/cjs/runtime/toolchain.d.ts.map +1 -1
- package/packages/uso-core/dist/cjs/runtime/toolchain.js +23 -1
- 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 +16 -11
- package/packages/uso-core/dist/esm/agent/tools/environment.js.map +1 -1
- package/packages/uso-core/dist/esm/agent/tools/terminal.d.ts.map +1 -1
- package/packages/uso-core/dist/esm/agent/tools/terminal.js +10 -3
- package/packages/uso-core/dist/esm/agent/tools/terminal.js.map +1 -1
- package/packages/uso-core/dist/esm/runtime/discovery.d.ts.map +1 -1
- package/packages/uso-core/dist/esm/runtime/discovery.js +19 -1
- package/packages/uso-core/dist/esm/runtime/discovery.js.map +1 -1
- package/packages/uso-core/dist/esm/runtime/toolchain.d.ts.map +1 -1
- package/packages/uso-core/dist/esm/runtime/toolchain.js +23 -1
- package/packages/uso-core/dist/esm/runtime/toolchain.js.map +1 -1
- package/packages/uso-core/src/agent/tools/environment.ts +18 -11
- package/packages/uso-core/src/agent/tools/terminal.ts +12 -3
- package/packages/uso-core/src/runtime/discovery.ts +18 -1
- package/packages/uso-core/src/runtime/toolchain.ts +24 -1
- package/src/commands/agent.js +19 -0
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,
|
|
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,SAoDpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAyC9B,CAAC"}
|
|
@@ -36,12 +36,23 @@ exports.checkEnvironmentTool = {
|
|
|
36
36
|
results.push(`❌ ${tool.name}: NOT INSTALLED`);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
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"';
|
|
41
|
+
function spawnSolana(args) {
|
|
42
|
+
if (isWsl) {
|
|
43
|
+
return (0, node_child_process_1.spawnSync)("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && solana ${args.join(" ")}`], {
|
|
44
|
+
encoding: "utf8",
|
|
45
|
+
timeout: 5000,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return (0, node_child_process_1.spawnSync)("solana", args, {
|
|
42
49
|
encoding: "utf8",
|
|
43
50
|
timeout: 5000,
|
|
44
51
|
});
|
|
52
|
+
}
|
|
53
|
+
// Wallet
|
|
54
|
+
try {
|
|
55
|
+
const walletResult = spawnSolana(["address"]);
|
|
45
56
|
if (walletResult.status === 0 && walletResult.stdout) {
|
|
46
57
|
results.push(`Wallet: ${walletResult.stdout.trim()}`);
|
|
47
58
|
}
|
|
@@ -54,10 +65,7 @@ exports.checkEnvironmentTool = {
|
|
|
54
65
|
}
|
|
55
66
|
// Balance
|
|
56
67
|
try {
|
|
57
|
-
const balResult = (
|
|
58
|
-
encoding: "utf8",
|
|
59
|
-
timeout: 5000,
|
|
60
|
-
});
|
|
68
|
+
const balResult = spawnSolana(["balance"]);
|
|
61
69
|
if (balResult.status === 0 && balResult.stdout) {
|
|
62
70
|
results.push(`Balance: ${balResult.stdout.trim()}`);
|
|
63
71
|
}
|
|
@@ -67,10 +75,7 @@ exports.checkEnvironmentTool = {
|
|
|
67
75
|
}
|
|
68
76
|
// Cluster
|
|
69
77
|
try {
|
|
70
|
-
const clusterResult = (
|
|
71
|
-
encoding: "utf8",
|
|
72
|
-
timeout: 5000,
|
|
73
|
-
});
|
|
78
|
+
const clusterResult = spawnSolana(["config", "get"]);
|
|
74
79
|
if (clusterResult.status === 0 && clusterResult.stdout) {
|
|
75
80
|
const rpcMatch = clusterResult.stdout.match(/RPC URL:\s*([^\n]+)/);
|
|
76
81
|
if (rpcMatch) {
|
|
@@ -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,SAAS
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAiHpC,CAAC"}
|
|
@@ -43,9 +43,16 @@ exports.runTerminalCommandTool = {
|
|
|
43
43
|
}
|
|
44
44
|
return new Promise((resolve) => {
|
|
45
45
|
const isWindows = state.environment.os === "windows";
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
const isWslRoute = state.environment.route === "wsl";
|
|
47
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
48
|
+
let shellArgs = isWindows ? ["/c", command] : ["-c", command];
|
|
49
|
+
if (isWindows && isWslRoute) {
|
|
50
|
+
shell = "wsl.exe";
|
|
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} && ${command}`];
|
|
54
|
+
}
|
|
55
|
+
const child = (0, node_child_process_1.spawn)(shell, shellArgs, {
|
|
49
56
|
cwd,
|
|
50
57
|
env: process.env,
|
|
51
58
|
timeout: timeoutMs,
|
|
@@ -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,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AA4G5D,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AA4G5D,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,gBAAgB,CA8CnE"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.discoverRuntime = discoverRuntime;
|
|
7
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
4
8
|
const node_child_process_1 = require("node:child_process");
|
|
5
9
|
// Cache for runtime discovery (TTL: 5 minutes)
|
|
6
10
|
let cachedRuntime = null;
|
|
@@ -96,7 +100,24 @@ function discoverRuntime(config) {
|
|
|
96
100
|
const wslStatus = detectWslVersion();
|
|
97
101
|
const shellPrefs = detectShellPreference();
|
|
98
102
|
const defaultDistro = getDefaultDistro(wslStatus);
|
|
99
|
-
|
|
103
|
+
// Check ~/.uso-config.json for Stealth Mode
|
|
104
|
+
let stealthWsl = false;
|
|
105
|
+
try {
|
|
106
|
+
const fs = require("node:fs");
|
|
107
|
+
const path = require("node:path");
|
|
108
|
+
const configPath = path.join(node_os_1.default.homedir(), ".uso-config.json");
|
|
109
|
+
if (fs.existsSync(configPath)) {
|
|
110
|
+
const raw = fs.readFileSync(configPath, "utf8");
|
|
111
|
+
const configJson = JSON.parse(raw);
|
|
112
|
+
if (configJson.mode === "wsl") {
|
|
113
|
+
stealthWsl = true;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
// Ignore config read errors
|
|
119
|
+
}
|
|
120
|
+
const preferWsl = stealthWsl || (config.runtime?.preferWsl ?? false);
|
|
100
121
|
const route = preferWsl && wslStatus.available ? "wsl" : "native";
|
|
101
122
|
const shell = config.runtime?.shell ?? shellPrefs.shell;
|
|
102
123
|
const result = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.d.ts","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"toolchain.d.ts","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAmG5C,wBAAgB,oBAAoB,CAAC,SAAS,UAAQ,GAAG,WAAW,EAAE,CAqBrE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C"}
|
|
@@ -30,7 +30,29 @@ function parseVersion(raw) {
|
|
|
30
30
|
}
|
|
31
31
|
function probe(command, args, timeout) {
|
|
32
32
|
try {
|
|
33
|
-
|
|
33
|
+
let executable = command;
|
|
34
|
+
let spawnArgs = args;
|
|
35
|
+
// Check for stealth mode
|
|
36
|
+
const os = require("node:os");
|
|
37
|
+
const fs = require("node:fs");
|
|
38
|
+
const path = require("node:path");
|
|
39
|
+
if (process.platform === "win32") {
|
|
40
|
+
try {
|
|
41
|
+
const configPath = path.join(os.homedir(), ".uso-config.json");
|
|
42
|
+
if (fs.existsSync(configPath)) {
|
|
43
|
+
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
44
|
+
if (configJson.mode === "wsl") {
|
|
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} && ${command} ${args.join(" ")}`];
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
// ignore
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
const result = (0, node_child_process_1.spawnSync)(executable, spawnArgs, {
|
|
34
56
|
encoding: "utf8",
|
|
35
57
|
timeout,
|
|
36
58
|
stdio: ["ignore", "pipe", "pipe"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":";;
|
|
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,
|
|
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,SAoDpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAyC9B,CAAC"}
|
|
@@ -33,12 +33,23 @@ export const checkEnvironmentTool = {
|
|
|
33
33
|
results.push(`❌ ${tool.name}: NOT INSTALLED`);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
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"';
|
|
38
|
+
function spawnSolana(args) {
|
|
39
|
+
if (isWsl) {
|
|
40
|
+
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && solana ${args.join(" ")}`], {
|
|
41
|
+
encoding: "utf8",
|
|
42
|
+
timeout: 5000,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
return spawnSync("solana", args, {
|
|
39
46
|
encoding: "utf8",
|
|
40
47
|
timeout: 5000,
|
|
41
48
|
});
|
|
49
|
+
}
|
|
50
|
+
// Wallet
|
|
51
|
+
try {
|
|
52
|
+
const walletResult = spawnSolana(["address"]);
|
|
42
53
|
if (walletResult.status === 0 && walletResult.stdout) {
|
|
43
54
|
results.push(`Wallet: ${walletResult.stdout.trim()}`);
|
|
44
55
|
}
|
|
@@ -51,10 +62,7 @@ export const checkEnvironmentTool = {
|
|
|
51
62
|
}
|
|
52
63
|
// Balance
|
|
53
64
|
try {
|
|
54
|
-
const balResult =
|
|
55
|
-
encoding: "utf8",
|
|
56
|
-
timeout: 5000,
|
|
57
|
-
});
|
|
65
|
+
const balResult = spawnSolana(["balance"]);
|
|
58
66
|
if (balResult.status === 0 && balResult.stdout) {
|
|
59
67
|
results.push(`Balance: ${balResult.stdout.trim()}`);
|
|
60
68
|
}
|
|
@@ -64,10 +72,7 @@ export const checkEnvironmentTool = {
|
|
|
64
72
|
}
|
|
65
73
|
// Cluster
|
|
66
74
|
try {
|
|
67
|
-
const clusterResult =
|
|
68
|
-
encoding: "utf8",
|
|
69
|
-
timeout: 5000,
|
|
70
|
-
});
|
|
75
|
+
const clusterResult = spawnSolana(["config", "get"]);
|
|
71
76
|
if (clusterResult.status === 0 && clusterResult.stdout) {
|
|
72
77
|
const rpcMatch = clusterResult.stdout.match(/RPC URL:\s*([^\n]+)/);
|
|
73
78
|
if (rpcMatch) {
|
|
@@ -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,SAAS
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/agent/tools/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,kBAAkB,CAAC;AAI9D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAiHpC,CAAC"}
|
|
@@ -40,9 +40,16 @@ export const runTerminalCommandTool = {
|
|
|
40
40
|
}
|
|
41
41
|
return new Promise((resolve) => {
|
|
42
42
|
const isWindows = state.environment.os === "windows";
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
const isWslRoute = state.environment.route === "wsl";
|
|
44
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
45
|
+
let shellArgs = isWindows ? ["/c", command] : ["-c", command];
|
|
46
|
+
if (isWindows && isWslRoute) {
|
|
47
|
+
shell = "wsl.exe";
|
|
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} && ${command}`];
|
|
51
|
+
}
|
|
52
|
+
const child = spawn(shell, shellArgs, {
|
|
46
53
|
cwd,
|
|
47
54
|
env: process.env,
|
|
48
55
|
timeout: timeoutMs,
|
|
@@ -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,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/agent/tools/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AA4G5D,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AA4G5D,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,gBAAgB,CA8CnE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import os from "node:os";
|
|
1
2
|
import { spawnSync } from "node:child_process";
|
|
2
3
|
// Cache for runtime discovery (TTL: 5 minutes)
|
|
3
4
|
let cachedRuntime = null;
|
|
@@ -93,7 +94,24 @@ export function discoverRuntime(config) {
|
|
|
93
94
|
const wslStatus = detectWslVersion();
|
|
94
95
|
const shellPrefs = detectShellPreference();
|
|
95
96
|
const defaultDistro = getDefaultDistro(wslStatus);
|
|
96
|
-
|
|
97
|
+
// Check ~/.uso-config.json for Stealth Mode
|
|
98
|
+
let stealthWsl = false;
|
|
99
|
+
try {
|
|
100
|
+
const fs = require("node:fs");
|
|
101
|
+
const path = require("node:path");
|
|
102
|
+
const configPath = path.join(os.homedir(), ".uso-config.json");
|
|
103
|
+
if (fs.existsSync(configPath)) {
|
|
104
|
+
const raw = fs.readFileSync(configPath, "utf8");
|
|
105
|
+
const configJson = JSON.parse(raw);
|
|
106
|
+
if (configJson.mode === "wsl") {
|
|
107
|
+
stealthWsl = true;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
// Ignore config read errors
|
|
113
|
+
}
|
|
114
|
+
const preferWsl = stealthWsl || (config.runtime?.preferWsl ?? false);
|
|
97
115
|
const route = preferWsl && wslStatus.available ? "wsl" : "native";
|
|
98
116
|
const shell = config.runtime?.shell ?? shellPrefs.shell;
|
|
99
117
|
const result = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/runtime/discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolchain.d.ts","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"toolchain.d.ts","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAmG5C,wBAAgB,oBAAoB,CAAC,SAAS,UAAQ,GAAG,WAAW,EAAE,CAqBrE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C"}
|
|
@@ -25,7 +25,29 @@ function parseVersion(raw) {
|
|
|
25
25
|
}
|
|
26
26
|
function probe(command, args, timeout) {
|
|
27
27
|
try {
|
|
28
|
-
|
|
28
|
+
let executable = command;
|
|
29
|
+
let spawnArgs = args;
|
|
30
|
+
// Check for stealth mode
|
|
31
|
+
const os = require("node:os");
|
|
32
|
+
const fs = require("node:fs");
|
|
33
|
+
const path = require("node:path");
|
|
34
|
+
if (process.platform === "win32") {
|
|
35
|
+
try {
|
|
36
|
+
const configPath = path.join(os.homedir(), ".uso-config.json");
|
|
37
|
+
if (fs.existsSync(configPath)) {
|
|
38
|
+
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
39
|
+
if (configJson.mode === "wsl") {
|
|
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} && ${command} ${args.join(" ")}`];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch (e) {
|
|
47
|
+
// ignore
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const result = spawnSync(executable, spawnArgs, {
|
|
29
51
|
encoding: "utf8",
|
|
30
52
|
timeout,
|
|
31
53
|
stdio: ["ignore", "pipe", "pipe"],
|
|
@@ -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,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../../../src/runtime/toolchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,12 +45,25 @@ export const checkEnvironmentTool: AgentTool = {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
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"';
|
|
50
|
+
|
|
51
|
+
function spawnSolana(args: string[]) {
|
|
52
|
+
if (isWsl) {
|
|
53
|
+
return spawnSync("wsl.exe", ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && solana ${args.join(" ")}`], {
|
|
54
|
+
encoding: "utf8",
|
|
55
|
+
timeout: 5000,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
return spawnSync("solana", args, {
|
|
51
59
|
encoding: "utf8",
|
|
52
60
|
timeout: 5000,
|
|
53
61
|
});
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// Wallet
|
|
65
|
+
try {
|
|
66
|
+
const walletResult = spawnSolana(["address"]);
|
|
54
67
|
if (walletResult.status === 0 && walletResult.stdout) {
|
|
55
68
|
results.push(`Wallet: ${walletResult.stdout.trim()}`);
|
|
56
69
|
} else {
|
|
@@ -62,10 +75,7 @@ export const checkEnvironmentTool: AgentTool = {
|
|
|
62
75
|
|
|
63
76
|
// Balance
|
|
64
77
|
try {
|
|
65
|
-
const balResult =
|
|
66
|
-
encoding: "utf8",
|
|
67
|
-
timeout: 5000,
|
|
68
|
-
});
|
|
78
|
+
const balResult = spawnSolana(["balance"]);
|
|
69
79
|
if (balResult.status === 0 && balResult.stdout) {
|
|
70
80
|
results.push(`Balance: ${balResult.stdout.trim()}`);
|
|
71
81
|
}
|
|
@@ -75,10 +85,7 @@ export const checkEnvironmentTool: AgentTool = {
|
|
|
75
85
|
|
|
76
86
|
// Cluster
|
|
77
87
|
try {
|
|
78
|
-
const clusterResult =
|
|
79
|
-
encoding: "utf8",
|
|
80
|
-
timeout: 5000,
|
|
81
|
-
});
|
|
88
|
+
const clusterResult = spawnSolana(["config", "get"]);
|
|
82
89
|
if (clusterResult.status === 0 && clusterResult.stdout) {
|
|
83
90
|
const rpcMatch = clusterResult.stdout.match(/RPC URL:\s*([^\n]+)/);
|
|
84
91
|
if (rpcMatch) {
|
|
@@ -56,10 +56,19 @@ export const runTerminalCommandTool: AgentTool = {
|
|
|
56
56
|
|
|
57
57
|
return new Promise((resolve) => {
|
|
58
58
|
const isWindows = state.environment.os === "windows";
|
|
59
|
-
const
|
|
60
|
-
|
|
59
|
+
const isWslRoute = state.environment.route === "wsl";
|
|
60
|
+
|
|
61
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
62
|
+
let shellArgs = isWindows ? ["/c", command] : ["-c", command];
|
|
61
63
|
|
|
62
|
-
|
|
64
|
+
if (isWindows && isWslRoute) {
|
|
65
|
+
shell = "wsl.exe";
|
|
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} && ${command}`];
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const child = spawn(shell, shellArgs, {
|
|
63
72
|
cwd,
|
|
64
73
|
env: process.env,
|
|
65
74
|
timeout: timeoutMs,
|
|
@@ -120,7 +120,24 @@ export function discoverRuntime(config: UsoConfig): RuntimeDiscovery {
|
|
|
120
120
|
const shellPrefs = detectShellPreference();
|
|
121
121
|
const defaultDistro = getDefaultDistro(wslStatus);
|
|
122
122
|
|
|
123
|
-
|
|
123
|
+
// Check ~/.uso-config.json for Stealth Mode
|
|
124
|
+
let stealthWsl = false;
|
|
125
|
+
try {
|
|
126
|
+
const fs = require("node:fs");
|
|
127
|
+
const path = require("node:path");
|
|
128
|
+
const configPath = path.join(os.homedir(), ".uso-config.json");
|
|
129
|
+
if (fs.existsSync(configPath)) {
|
|
130
|
+
const raw = fs.readFileSync(configPath, "utf8");
|
|
131
|
+
const configJson = JSON.parse(raw);
|
|
132
|
+
if (configJson.mode === "wsl") {
|
|
133
|
+
stealthWsl = true;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
} catch (e) {
|
|
137
|
+
// Ignore config read errors
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
const preferWsl = stealthWsl || (config.runtime?.preferWsl ?? false);
|
|
124
141
|
const route = preferWsl && wslStatus.available ? "wsl" : "native";
|
|
125
142
|
const shell: "powershell" | "bash" =
|
|
126
143
|
config.runtime?.shell ?? shellPrefs.shell;
|
|
@@ -31,7 +31,30 @@ function parseVersion(raw: string): string | undefined {
|
|
|
31
31
|
|
|
32
32
|
function probe(command: string, args: string[], timeout: number): ToolVersion {
|
|
33
33
|
try {
|
|
34
|
-
|
|
34
|
+
let executable = command;
|
|
35
|
+
let spawnArgs = args;
|
|
36
|
+
|
|
37
|
+
// Check for stealth mode
|
|
38
|
+
const os = require("node:os");
|
|
39
|
+
const fs = require("node:fs");
|
|
40
|
+
const path = require("node:path");
|
|
41
|
+
if (process.platform === "win32") {
|
|
42
|
+
try {
|
|
43
|
+
const configPath = path.join(os.homedir(), ".uso-config.json");
|
|
44
|
+
if (fs.existsSync(configPath)) {
|
|
45
|
+
const configJson = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
46
|
+
if (configJson.mode === "wsl") {
|
|
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} && ${command} ${args.join(" ")}`];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
} catch (e) {
|
|
53
|
+
// ignore
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const result = spawnSync(executable, spawnArgs, {
|
|
35
58
|
encoding: "utf8",
|
|
36
59
|
timeout,
|
|
37
60
|
stdio: ["ignore", "pipe", "pipe"],
|
package/src/commands/agent.js
CHANGED
|
@@ -285,6 +285,25 @@ const agentConfig = async (options) => {
|
|
|
285
285
|
console.log(
|
|
286
286
|
` Confirm destructive: ${chalk.cyan(config.agent?.confirmDestructive ?? true)}`,
|
|
287
287
|
);
|
|
288
|
+
console.log();
|
|
289
|
+
|
|
290
|
+
// Attempt to determine the active provider
|
|
291
|
+
try {
|
|
292
|
+
const core = require("../../packages/uso-core/dist/cjs/index.js");
|
|
293
|
+
const usoAgent = new core.UsoAgent(config);
|
|
294
|
+
const llmDiag = await usoAgent.diagnoseLlm();
|
|
295
|
+
const available = llmDiag.filter((d) => d.available);
|
|
296
|
+
if (available.length > 0) {
|
|
297
|
+
console.log(chalk.bold("Active Provider:"));
|
|
298
|
+
console.log(` ✅ ${chalk.green(available[0].name)}`);
|
|
299
|
+
} else {
|
|
300
|
+
console.log(chalk.bold("Active Provider:"));
|
|
301
|
+
console.log(` ❌ ${chalk.red("No LLM provider available. Please set an API key.")}`);
|
|
302
|
+
}
|
|
303
|
+
} catch (e) {
|
|
304
|
+
// Ignore if core fails to load here
|
|
305
|
+
}
|
|
306
|
+
|
|
288
307
|
console.log();
|
|
289
308
|
console.log(chalk.dim("Set API keys:"));
|
|
290
309
|
console.log(
|