@slashfi/agents-sdk 0.69.12 → 0.70.1
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/dist/adk-check.d.ts.map +1 -1
- package/dist/adk-check.js +146 -50
- package/dist/adk-check.js.map +1 -1
- package/dist/cjs/adk-check.js +146 -50
- package/dist/cjs/adk-check.js.map +1 -1
- package/dist/cjs/registry-consumer.js +15 -1
- package/dist/cjs/registry-consumer.js.map +1 -1
- package/dist/registry-consumer.d.ts.map +1 -1
- package/dist/registry-consumer.js +15 -1
- package/dist/registry-consumer.js.map +1 -1
- package/package.json +1 -1
- package/src/adk-check.ts +207 -70
- package/src/registry-consumer.ts +16 -1
package/dist/adk-check.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adk-check.d.ts","sourceRoot":"","sources":["../src/adk-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;
|
|
1
|
+
{"version":3,"file":"adk-check.d.ts","sourceRoot":"","sources":["../src/adk-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAaH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA4CD,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA4K5C"}
|
package/dist/adk-check.js
CHANGED
|
@@ -12,48 +12,70 @@
|
|
|
12
12
|
* adk run --no-check <file> Execute without type-checking
|
|
13
13
|
* adk run --no-check -e "code" Execute inline without type-checking
|
|
14
14
|
*/
|
|
15
|
-
import { join, dirname, basename, resolve } from "node:path";
|
|
16
|
-
import { homedir } from "node:os";
|
|
17
|
-
import { existsSync, writeFileSync, readFileSync, unlinkSync, copyFileSync } from "node:fs";
|
|
18
15
|
import { spawnSync } from "node:child_process";
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
16
|
+
import { copyFileSync, existsSync, readFileSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
17
|
+
import { homedir } from "node:os";
|
|
18
|
+
import { basename, dirname, join, resolve } from "node:path";
|
|
19
|
+
/**
|
|
20
|
+
* Resolve the absolute path to the @slashfi/agents-sdk package.
|
|
21
|
+
* This ensures the preamble works regardless of the script's working directory,
|
|
22
|
+
* since bare specifiers like "@slashfi/agents-sdk" may not resolve from arbitrary cwds.
|
|
23
|
+
*/
|
|
24
|
+
function resolveAgentsSdkPath() {
|
|
25
|
+
try {
|
|
26
|
+
// require.resolve gives us the main entry point, e.g.
|
|
27
|
+
// /root/.bun/install/global/node_modules/@slashfi/agents-sdk/dist/index.js
|
|
28
|
+
const resolved = require.resolve("@slashfi/agents-sdk");
|
|
29
|
+
// Extract package root path
|
|
30
|
+
const marker = "@slashfi/agents-sdk";
|
|
31
|
+
const idx = resolved.indexOf(marker);
|
|
32
|
+
if (idx !== -1) {
|
|
33
|
+
return resolved.substring(0, idx + marker.length);
|
|
34
|
+
}
|
|
35
|
+
return "@slashfi/agents-sdk";
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return "@slashfi/agents-sdk";
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function makePreambleCheck(sdkPath) {
|
|
42
|
+
return `import "./.adk_types";\nimport { createAdk, createLocalFsStore } from "${sdkPath}";\nimport { join } from "node:path";\nimport { homedir } from "node:os";\nconst adk = createAdk(\n createLocalFsStore(process.env.ADK_CONFIG_DIR ?? join(homedir(), ".adk")),\n { token: process.env.ATLAS_TOKEN ?? process.env.ADK_TOKEN ?? "" },\n);\n`;
|
|
43
|
+
}
|
|
44
|
+
function makePreambleRun(sdkPath) {
|
|
45
|
+
return `import { createAdk, createLocalFsStore } from "${sdkPath}";\nimport { join } from "node:path";\nimport { homedir } from "node:os";\nconst adk = createAdk(\n createLocalFsStore(process.env.ADK_CONFIG_DIR ?? join(homedir(), ".adk")),\n { token: process.env.ATLAS_TOKEN ?? process.env.ADK_TOKEN ?? "" },\n);\n`;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Create a run wrapper file that injects the adk preamble before the user's code.
|
|
49
|
+
* Works for both inline (-e) and file mode.
|
|
50
|
+
*/
|
|
51
|
+
function writeRunWrapper(tmpFile, preamble, userCode) {
|
|
52
|
+
writeFileSync(tmpFile, preamble + userCode);
|
|
53
|
+
}
|
|
34
54
|
export async function adkCheck(opts) {
|
|
35
55
|
const configDir = opts.configDir ?? process.env.ADK_CONFIG_DIR ?? join(homedir(), ".adk");
|
|
36
56
|
const adkTypes = join(configDir, "adk.d.ts");
|
|
37
57
|
const hasTypes = existsSync(adkTypes);
|
|
38
58
|
const isInline = !!opts.code;
|
|
59
|
+
const sdkPath = resolveAgentsSdkPath();
|
|
60
|
+
const PREAMBLE_RUN = makePreambleRun(sdkPath);
|
|
39
61
|
// --no-check: skip typecheck, just run
|
|
40
62
|
if (opts.noCheck && opts.run) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
});
|
|
55
|
-
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
63
|
+
const cwd = isInline ? process.cwd() : dirname(resolve(opts.file));
|
|
64
|
+
const userCode = isInline
|
|
65
|
+
? opts.code
|
|
66
|
+
: readFileSync(resolve(opts.file), "utf-8");
|
|
67
|
+
const tmpFile = join(cwd, ".adk_run.ts");
|
|
68
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
69
|
+
const r = spawnSync("bun", ["run", tmpFile], {
|
|
70
|
+
cwd,
|
|
71
|
+
stdio: "inherit",
|
|
72
|
+
env: process.env,
|
|
73
|
+
});
|
|
74
|
+
try {
|
|
75
|
+
unlinkSync(tmpFile);
|
|
56
76
|
}
|
|
77
|
+
catch { }
|
|
78
|
+
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
57
79
|
}
|
|
58
80
|
if (!hasTypes) {
|
|
59
81
|
console.error("\x1b[33m\u26a0\x1b[0m No adk.d.ts found. Run `adk sync` first to generate agent types.");
|
|
@@ -62,10 +84,11 @@ export async function adkCheck(opts) {
|
|
|
62
84
|
let checkFile;
|
|
63
85
|
let originalFile;
|
|
64
86
|
const cleanup = [];
|
|
87
|
+
const PREAMBLE_CHECK = makePreambleCheck("@slashfi/agents-sdk");
|
|
65
88
|
if (isInline) {
|
|
66
89
|
cwd = process.cwd();
|
|
67
90
|
checkFile = join(cwd, ".adk_check.ts");
|
|
68
|
-
writeFileSync(checkFile,
|
|
91
|
+
writeFileSync(checkFile, PREAMBLE_CHECK + opts.code);
|
|
69
92
|
cleanup.push(checkFile);
|
|
70
93
|
}
|
|
71
94
|
else if (opts.file) {
|
|
@@ -76,8 +99,10 @@ export async function adkCheck(opts) {
|
|
|
76
99
|
}
|
|
77
100
|
cwd = dirname(originalFile);
|
|
78
101
|
checkFile = join(cwd, `.adk_check_${basename(originalFile)}`);
|
|
102
|
+
// File mode: inject preamble so `adk` is typed and available
|
|
79
103
|
const typesImport = hasTypes ? `import "./.adk_types";\n` : "";
|
|
80
|
-
|
|
104
|
+
const preambleNoTypes = PREAMBLE_CHECK.replace(`import "./.adk_types";\n`, "");
|
|
105
|
+
writeFileSync(checkFile, typesImport + preambleNoTypes + readFileSync(originalFile, "utf-8"));
|
|
81
106
|
cleanup.push(checkFile);
|
|
82
107
|
}
|
|
83
108
|
else {
|
|
@@ -108,9 +133,39 @@ export async function adkCheck(opts) {
|
|
|
108
133
|
cleanup.push(tsconfigFile);
|
|
109
134
|
// Find type checker
|
|
110
135
|
const checker = findTypeChecker();
|
|
136
|
+
if (!checker) {
|
|
137
|
+
console.error("\x1b[33m\u26a0\x1b[0m No TypeScript type checker found (tsgo or tsc). Skipping type check.");
|
|
138
|
+
for (const f of cleanup) {
|
|
139
|
+
try {
|
|
140
|
+
unlinkSync(f);
|
|
141
|
+
}
|
|
142
|
+
catch { }
|
|
143
|
+
}
|
|
144
|
+
// Still run if requested
|
|
145
|
+
if (opts.run) {
|
|
146
|
+
const userCode = isInline
|
|
147
|
+
? opts.code
|
|
148
|
+
: readFileSync(originalFile, "utf-8");
|
|
149
|
+
const tmpFile = join(cwd, ".adk_run.ts");
|
|
150
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
151
|
+
const r = spawnSync("bun", ["run", tmpFile], {
|
|
152
|
+
cwd,
|
|
153
|
+
stdio: "inherit",
|
|
154
|
+
env: process.env,
|
|
155
|
+
});
|
|
156
|
+
try {
|
|
157
|
+
unlinkSync(tmpFile);
|
|
158
|
+
}
|
|
159
|
+
catch { }
|
|
160
|
+
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
161
|
+
}
|
|
162
|
+
return { ok: true, exitCode: 0 };
|
|
163
|
+
}
|
|
111
164
|
// Type-check
|
|
112
165
|
const result = spawnSync(checker.cmd, [...checker.args, "--project", tsconfigFile], {
|
|
113
|
-
cwd,
|
|
166
|
+
cwd,
|
|
167
|
+
stdio: "inherit",
|
|
168
|
+
env: process.env,
|
|
114
169
|
});
|
|
115
170
|
// Clean up
|
|
116
171
|
for (const f of cleanup) {
|
|
@@ -125,30 +180,71 @@ export async function adkCheck(opts) {
|
|
|
125
180
|
console.error("\x1b[32m\u2713\x1b[0m Type check passed");
|
|
126
181
|
// Run
|
|
127
182
|
if (opts.run) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
|
|
183
|
+
const userCode = isInline
|
|
184
|
+
? opts.code
|
|
185
|
+
: readFileSync(originalFile, "utf-8");
|
|
186
|
+
const tmpFile = join(cwd, ".adk_run.ts");
|
|
187
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
188
|
+
const runResult = spawnSync("bun", ["run", tmpFile], {
|
|
189
|
+
cwd,
|
|
190
|
+
stdio: "inherit",
|
|
191
|
+
env: process.env,
|
|
192
|
+
});
|
|
193
|
+
try {
|
|
194
|
+
unlinkSync(tmpFile);
|
|
140
195
|
}
|
|
196
|
+
catch { }
|
|
141
197
|
return { ok: runResult.status === 0, exitCode: runResult.status ?? 1 };
|
|
142
198
|
}
|
|
143
199
|
return { ok: true, exitCode: 0 };
|
|
144
200
|
}
|
|
201
|
+
/**
|
|
202
|
+
* Find a working TypeScript type checker.
|
|
203
|
+
* Returns null if none found — callers should skip type checking gracefully.
|
|
204
|
+
*
|
|
205
|
+
* Checks:
|
|
206
|
+
* 1. tsgo binary (fastest — native TypeScript compiler)
|
|
207
|
+
* 2. npx tsgo (if installed as a package)
|
|
208
|
+
* 3. tsc binary (standard TypeScript compiler, verified via --version)
|
|
209
|
+
* 4. npx tsc — but ONLY if it's the real TypeScript compiler, not the
|
|
210
|
+
* unrelated `tsc` npm package that prints "This is not the tsc command
|
|
211
|
+
* you are looking for"
|
|
212
|
+
*/
|
|
145
213
|
function findTypeChecker() {
|
|
214
|
+
// 1. tsgo binary
|
|
146
215
|
const tsgo = spawnSync("which", ["tsgo"], { stdio: "pipe" });
|
|
147
216
|
if (tsgo.status === 0)
|
|
148
217
|
return { cmd: "tsgo", args: [] };
|
|
149
|
-
|
|
218
|
+
// 2. npx tsgo
|
|
219
|
+
const npxTsgo = spawnSync("npx", ["tsgo", "--version"], {
|
|
220
|
+
stdio: "pipe",
|
|
221
|
+
timeout: 5000,
|
|
222
|
+
});
|
|
150
223
|
if (npxTsgo.status === 0)
|
|
151
224
|
return { cmd: "npx", args: ["tsgo"] };
|
|
152
|
-
|
|
225
|
+
// 3. tsc binary (e.g. from `npm install -g typescript`)
|
|
226
|
+
const tscWhich = spawnSync("which", ["tsc"], { stdio: "pipe" });
|
|
227
|
+
if (tscWhich.status === 0) {
|
|
228
|
+
// Verify it's the real TypeScript compiler, not the bogus `tsc` npm package
|
|
229
|
+
const tscVersion = spawnSync("tsc", ["--version"], {
|
|
230
|
+
stdio: "pipe",
|
|
231
|
+
timeout: 5000,
|
|
232
|
+
});
|
|
233
|
+
const output = tscVersion.stdout?.toString() ?? "";
|
|
234
|
+
if (tscVersion.status === 0 && output.includes("Version")) {
|
|
235
|
+
return { cmd: "tsc", args: [] };
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
// 4. npx tsc — validate it's actually TypeScript
|
|
239
|
+
const npxTsc = spawnSync("npx", ["--no-install", "tsc", "--version"], {
|
|
240
|
+
stdio: "pipe",
|
|
241
|
+
timeout: 10000,
|
|
242
|
+
});
|
|
243
|
+
const npxOutput = npxTsc.stdout?.toString() ?? "";
|
|
244
|
+
if (npxTsc.status === 0 && npxOutput.includes("Version")) {
|
|
245
|
+
return { cmd: "npx", args: ["tsc"] };
|
|
246
|
+
}
|
|
247
|
+
// No type checker found
|
|
248
|
+
return null;
|
|
153
249
|
}
|
|
154
250
|
//# sourceMappingURL=adk-check.js.map
|
package/dist/adk-check.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adk-check.js","sourceRoot":"","sources":["../src/adk-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"adk-check.js","sourceRoot":"","sources":["../src/adk-check.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/adk-check.js
CHANGED
|
@@ -15,48 +15,70 @@
|
|
|
15
15
|
*/
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.adkCheck = adkCheck;
|
|
18
|
-
const node_path_1 = require("node:path");
|
|
19
|
-
const node_os_1 = require("node:os");
|
|
20
|
-
const node_fs_1 = require("node:fs");
|
|
21
18
|
const node_child_process_1 = require("node:child_process");
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
19
|
+
const node_fs_1 = require("node:fs");
|
|
20
|
+
const node_os_1 = require("node:os");
|
|
21
|
+
const node_path_1 = require("node:path");
|
|
22
|
+
/**
|
|
23
|
+
* Resolve the absolute path to the @slashfi/agents-sdk package.
|
|
24
|
+
* This ensures the preamble works regardless of the script's working directory,
|
|
25
|
+
* since bare specifiers like "@slashfi/agents-sdk" may not resolve from arbitrary cwds.
|
|
26
|
+
*/
|
|
27
|
+
function resolveAgentsSdkPath() {
|
|
28
|
+
try {
|
|
29
|
+
// require.resolve gives us the main entry point, e.g.
|
|
30
|
+
// /root/.bun/install/global/node_modules/@slashfi/agents-sdk/dist/index.js
|
|
31
|
+
const resolved = require.resolve("@slashfi/agents-sdk");
|
|
32
|
+
// Extract package root path
|
|
33
|
+
const marker = "@slashfi/agents-sdk";
|
|
34
|
+
const idx = resolved.indexOf(marker);
|
|
35
|
+
if (idx !== -1) {
|
|
36
|
+
return resolved.substring(0, idx + marker.length);
|
|
37
|
+
}
|
|
38
|
+
return "@slashfi/agents-sdk";
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return "@slashfi/agents-sdk";
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function makePreambleCheck(sdkPath) {
|
|
45
|
+
return `import "./.adk_types";\nimport { createAdk, createLocalFsStore } from "${sdkPath}";\nimport { join } from "node:path";\nimport { homedir } from "node:os";\nconst adk = createAdk(\n createLocalFsStore(process.env.ADK_CONFIG_DIR ?? join(homedir(), ".adk")),\n { token: process.env.ATLAS_TOKEN ?? process.env.ADK_TOKEN ?? "" },\n);\n`;
|
|
46
|
+
}
|
|
47
|
+
function makePreambleRun(sdkPath) {
|
|
48
|
+
return `import { createAdk, createLocalFsStore } from "${sdkPath}";\nimport { join } from "node:path";\nimport { homedir } from "node:os";\nconst adk = createAdk(\n createLocalFsStore(process.env.ADK_CONFIG_DIR ?? join(homedir(), ".adk")),\n { token: process.env.ATLAS_TOKEN ?? process.env.ADK_TOKEN ?? "" },\n);\n`;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Create a run wrapper file that injects the adk preamble before the user's code.
|
|
52
|
+
* Works for both inline (-e) and file mode.
|
|
53
|
+
*/
|
|
54
|
+
function writeRunWrapper(tmpFile, preamble, userCode) {
|
|
55
|
+
(0, node_fs_1.writeFileSync)(tmpFile, preamble + userCode);
|
|
56
|
+
}
|
|
37
57
|
async function adkCheck(opts) {
|
|
38
58
|
const configDir = opts.configDir ?? process.env.ADK_CONFIG_DIR ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".adk");
|
|
39
59
|
const adkTypes = (0, node_path_1.join)(configDir, "adk.d.ts");
|
|
40
60
|
const hasTypes = (0, node_fs_1.existsSync)(adkTypes);
|
|
41
61
|
const isInline = !!opts.code;
|
|
62
|
+
const sdkPath = resolveAgentsSdkPath();
|
|
63
|
+
const PREAMBLE_RUN = makePreambleRun(sdkPath);
|
|
42
64
|
// --no-check: skip typecheck, just run
|
|
43
65
|
if (opts.noCheck && opts.run) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
});
|
|
58
|
-
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
66
|
+
const cwd = isInline ? process.cwd() : (0, node_path_1.dirname)((0, node_path_1.resolve)(opts.file));
|
|
67
|
+
const userCode = isInline
|
|
68
|
+
? opts.code
|
|
69
|
+
: (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(opts.file), "utf-8");
|
|
70
|
+
const tmpFile = (0, node_path_1.join)(cwd, ".adk_run.ts");
|
|
71
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
72
|
+
const r = (0, node_child_process_1.spawnSync)("bun", ["run", tmpFile], {
|
|
73
|
+
cwd,
|
|
74
|
+
stdio: "inherit",
|
|
75
|
+
env: process.env,
|
|
76
|
+
});
|
|
77
|
+
try {
|
|
78
|
+
(0, node_fs_1.unlinkSync)(tmpFile);
|
|
59
79
|
}
|
|
80
|
+
catch { }
|
|
81
|
+
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
60
82
|
}
|
|
61
83
|
if (!hasTypes) {
|
|
62
84
|
console.error("\x1b[33m\u26a0\x1b[0m No adk.d.ts found. Run `adk sync` first to generate agent types.");
|
|
@@ -65,10 +87,11 @@ async function adkCheck(opts) {
|
|
|
65
87
|
let checkFile;
|
|
66
88
|
let originalFile;
|
|
67
89
|
const cleanup = [];
|
|
90
|
+
const PREAMBLE_CHECK = makePreambleCheck("@slashfi/agents-sdk");
|
|
68
91
|
if (isInline) {
|
|
69
92
|
cwd = process.cwd();
|
|
70
93
|
checkFile = (0, node_path_1.join)(cwd, ".adk_check.ts");
|
|
71
|
-
(0, node_fs_1.writeFileSync)(checkFile,
|
|
94
|
+
(0, node_fs_1.writeFileSync)(checkFile, PREAMBLE_CHECK + opts.code);
|
|
72
95
|
cleanup.push(checkFile);
|
|
73
96
|
}
|
|
74
97
|
else if (opts.file) {
|
|
@@ -79,8 +102,10 @@ async function adkCheck(opts) {
|
|
|
79
102
|
}
|
|
80
103
|
cwd = (0, node_path_1.dirname)(originalFile);
|
|
81
104
|
checkFile = (0, node_path_1.join)(cwd, `.adk_check_${(0, node_path_1.basename)(originalFile)}`);
|
|
105
|
+
// File mode: inject preamble so `adk` is typed and available
|
|
82
106
|
const typesImport = hasTypes ? `import "./.adk_types";\n` : "";
|
|
83
|
-
|
|
107
|
+
const preambleNoTypes = PREAMBLE_CHECK.replace(`import "./.adk_types";\n`, "");
|
|
108
|
+
(0, node_fs_1.writeFileSync)(checkFile, typesImport + preambleNoTypes + (0, node_fs_1.readFileSync)(originalFile, "utf-8"));
|
|
84
109
|
cleanup.push(checkFile);
|
|
85
110
|
}
|
|
86
111
|
else {
|
|
@@ -111,9 +136,39 @@ async function adkCheck(opts) {
|
|
|
111
136
|
cleanup.push(tsconfigFile);
|
|
112
137
|
// Find type checker
|
|
113
138
|
const checker = findTypeChecker();
|
|
139
|
+
if (!checker) {
|
|
140
|
+
console.error("\x1b[33m\u26a0\x1b[0m No TypeScript type checker found (tsgo or tsc). Skipping type check.");
|
|
141
|
+
for (const f of cleanup) {
|
|
142
|
+
try {
|
|
143
|
+
(0, node_fs_1.unlinkSync)(f);
|
|
144
|
+
}
|
|
145
|
+
catch { }
|
|
146
|
+
}
|
|
147
|
+
// Still run if requested
|
|
148
|
+
if (opts.run) {
|
|
149
|
+
const userCode = isInline
|
|
150
|
+
? opts.code
|
|
151
|
+
: (0, node_fs_1.readFileSync)(originalFile, "utf-8");
|
|
152
|
+
const tmpFile = (0, node_path_1.join)(cwd, ".adk_run.ts");
|
|
153
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
154
|
+
const r = (0, node_child_process_1.spawnSync)("bun", ["run", tmpFile], {
|
|
155
|
+
cwd,
|
|
156
|
+
stdio: "inherit",
|
|
157
|
+
env: process.env,
|
|
158
|
+
});
|
|
159
|
+
try {
|
|
160
|
+
(0, node_fs_1.unlinkSync)(tmpFile);
|
|
161
|
+
}
|
|
162
|
+
catch { }
|
|
163
|
+
return { ok: r.status === 0, exitCode: r.status ?? 1 };
|
|
164
|
+
}
|
|
165
|
+
return { ok: true, exitCode: 0 };
|
|
166
|
+
}
|
|
114
167
|
// Type-check
|
|
115
168
|
const result = (0, node_child_process_1.spawnSync)(checker.cmd, [...checker.args, "--project", tsconfigFile], {
|
|
116
|
-
cwd,
|
|
169
|
+
cwd,
|
|
170
|
+
stdio: "inherit",
|
|
171
|
+
env: process.env,
|
|
117
172
|
});
|
|
118
173
|
// Clean up
|
|
119
174
|
for (const f of cleanup) {
|
|
@@ -128,30 +183,71 @@ async function adkCheck(opts) {
|
|
|
128
183
|
console.error("\x1b[32m\u2713\x1b[0m Type check passed");
|
|
129
184
|
// Run
|
|
130
185
|
if (opts.run) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
|
|
186
|
+
const userCode = isInline
|
|
187
|
+
? opts.code
|
|
188
|
+
: (0, node_fs_1.readFileSync)(originalFile, "utf-8");
|
|
189
|
+
const tmpFile = (0, node_path_1.join)(cwd, ".adk_run.ts");
|
|
190
|
+
writeRunWrapper(tmpFile, PREAMBLE_RUN, userCode);
|
|
191
|
+
const runResult = (0, node_child_process_1.spawnSync)("bun", ["run", tmpFile], {
|
|
192
|
+
cwd,
|
|
193
|
+
stdio: "inherit",
|
|
194
|
+
env: process.env,
|
|
195
|
+
});
|
|
196
|
+
try {
|
|
197
|
+
(0, node_fs_1.unlinkSync)(tmpFile);
|
|
143
198
|
}
|
|
199
|
+
catch { }
|
|
144
200
|
return { ok: runResult.status === 0, exitCode: runResult.status ?? 1 };
|
|
145
201
|
}
|
|
146
202
|
return { ok: true, exitCode: 0 };
|
|
147
203
|
}
|
|
204
|
+
/**
|
|
205
|
+
* Find a working TypeScript type checker.
|
|
206
|
+
* Returns null if none found — callers should skip type checking gracefully.
|
|
207
|
+
*
|
|
208
|
+
* Checks:
|
|
209
|
+
* 1. tsgo binary (fastest — native TypeScript compiler)
|
|
210
|
+
* 2. npx tsgo (if installed as a package)
|
|
211
|
+
* 3. tsc binary (standard TypeScript compiler, verified via --version)
|
|
212
|
+
* 4. npx tsc — but ONLY if it's the real TypeScript compiler, not the
|
|
213
|
+
* unrelated `tsc` npm package that prints "This is not the tsc command
|
|
214
|
+
* you are looking for"
|
|
215
|
+
*/
|
|
148
216
|
function findTypeChecker() {
|
|
217
|
+
// 1. tsgo binary
|
|
149
218
|
const tsgo = (0, node_child_process_1.spawnSync)("which", ["tsgo"], { stdio: "pipe" });
|
|
150
219
|
if (tsgo.status === 0)
|
|
151
220
|
return { cmd: "tsgo", args: [] };
|
|
152
|
-
|
|
221
|
+
// 2. npx tsgo
|
|
222
|
+
const npxTsgo = (0, node_child_process_1.spawnSync)("npx", ["tsgo", "--version"], {
|
|
223
|
+
stdio: "pipe",
|
|
224
|
+
timeout: 5000,
|
|
225
|
+
});
|
|
153
226
|
if (npxTsgo.status === 0)
|
|
154
227
|
return { cmd: "npx", args: ["tsgo"] };
|
|
155
|
-
|
|
228
|
+
// 3. tsc binary (e.g. from `npm install -g typescript`)
|
|
229
|
+
const tscWhich = (0, node_child_process_1.spawnSync)("which", ["tsc"], { stdio: "pipe" });
|
|
230
|
+
if (tscWhich.status === 0) {
|
|
231
|
+
// Verify it's the real TypeScript compiler, not the bogus `tsc` npm package
|
|
232
|
+
const tscVersion = (0, node_child_process_1.spawnSync)("tsc", ["--version"], {
|
|
233
|
+
stdio: "pipe",
|
|
234
|
+
timeout: 5000,
|
|
235
|
+
});
|
|
236
|
+
const output = tscVersion.stdout?.toString() ?? "";
|
|
237
|
+
if (tscVersion.status === 0 && output.includes("Version")) {
|
|
238
|
+
return { cmd: "tsc", args: [] };
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
// 4. npx tsc — validate it's actually TypeScript
|
|
242
|
+
const npxTsc = (0, node_child_process_1.spawnSync)("npx", ["--no-install", "tsc", "--version"], {
|
|
243
|
+
stdio: "pipe",
|
|
244
|
+
timeout: 10000,
|
|
245
|
+
});
|
|
246
|
+
const npxOutput = npxTsc.stdout?.toString() ?? "";
|
|
247
|
+
if (npxTsc.status === 0 && npxOutput.includes("Version")) {
|
|
248
|
+
return { cmd: "npx", args: ["tsc"] };
|
|
249
|
+
}
|
|
250
|
+
// No type checker found
|
|
251
|
+
return null;
|
|
156
252
|
}
|
|
157
253
|
//# sourceMappingURL=adk-check.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adk-check.js","sourceRoot":"","sources":["../../src/adk-check.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;
|
|
1
|
+
{"version":3,"file":"adk-check.js","sourceRoot":"","sources":["../../src/adk-check.ts"],"names":[],"mappings":"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"}
|