@iqai/adk-cli 0.3.38 → 0.4.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/CHANGELOG.md +31 -0
- package/dist/cli/new.command.d.ts.map +1 -1
- package/dist/cli/new.command.js +93 -0
- package/dist/cli/new.command.js.map +1 -1
- package/dist/cli/run.command.d.ts.map +1 -1
- package/dist/cli/run.command.js +4 -3
- package/dist/cli/run.command.js.map +1 -1
- package/dist/cli/serve.command.d.ts.map +1 -1
- package/dist/cli/serve.command.js +2 -1
- package/dist/cli/serve.command.js.map +1 -1
- package/dist/cli/web.command.d.ts.map +1 -1
- package/dist/cli/web.command.js +36 -15
- package/dist/cli/web.command.js.map +1 -1
- package/dist/common/constants.d.ts +4 -0
- package/dist/common/constants.d.ts.map +1 -1
- package/dist/common/constants.js +5 -1
- package/dist/common/constants.js.map +1 -1
- package/dist/http/bootstrap.d.ts +2 -0
- package/dist/http/bootstrap.d.ts.map +1 -1
- package/dist/http/bootstrap.js +50 -1
- package/dist/http/bootstrap.js.map +1 -1
- package/dist/http/runtime-config.d.ts +6 -0
- package/dist/http/runtime-config.d.ts.map +1 -1
- package/dist/http/runtime-config.js.map +1 -1
- package/package.json +5 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# @iqai/adk-cli
|
|
2
2
|
|
|
3
|
+
## 0.4.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [78bac0e]
|
|
8
|
+
- @iqai/adk@0.6.6
|
|
9
|
+
|
|
10
|
+
## 0.4.0
|
|
11
|
+
|
|
12
|
+
### Minor Changes
|
|
13
|
+
|
|
14
|
+
- e0d20c0: Add MCP docs IDE integration step to `adk new` command flow. Users can now configure the @iqai/mcp-docs server directly during project creation for seamless access to ADK documentation in their IDE.
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- f85e4bb: ADK Web Versioning - Bundled UI Support
|
|
19
|
+
|
|
20
|
+
Added bundled web UI mode allowing the CLI to serve the web interface directly, eliminating CORS issues and simplifying local development setup.
|
|
21
|
+
|
|
22
|
+
**Key Changes:**
|
|
23
|
+
- Configured Next.js for static export with automatic asset copying to CLI package
|
|
24
|
+
- Enhanced API URL resolution to support both bundled (same-origin) and hosted modes
|
|
25
|
+
- Implemented SPA fallback middleware for serving static web assets
|
|
26
|
+
- Extracted DEFAULT_API_PORT constant and added --web-url option for custom configurations
|
|
27
|
+
- Updated API client hooks with proper SSR guards for static generation
|
|
28
|
+
|
|
29
|
+
**Benefits:**
|
|
30
|
+
- Eliminates CORS issues when running locally
|
|
31
|
+
- Simplifies setup (no separate web server needed)
|
|
32
|
+
- Maintains compatibility with hosted mode for development/production
|
|
33
|
+
|
|
3
34
|
## 0.3.38
|
|
4
35
|
|
|
5
36
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../src/cli/new.command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAEhE,UAAU,UAAU;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAyFD,qBAKa,UAAW,SAAQ,aAAa;IACtC,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../src/cli/new.command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAEhE,UAAU,UAAU;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAyFD,qBAKa,UAAW,SAAQ,aAAa;IACtC,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAkStE,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGlC"}
|
package/dist/cli/new.command.js
CHANGED
|
@@ -244,6 +244,99 @@ let NewCommand = class NewCommand extends nest_commander_1.CommandRunner {
|
|
|
244
244
|
console.log(chalk_1.default.cyan(`cd ${finalProjectName} && ${selectedPackageManager.command} ${selectedPackageManager.args.join(" ")}`));
|
|
245
245
|
}
|
|
246
246
|
}
|
|
247
|
+
const shouldSetupMcpDocs = await (0, prompts_1.confirm)({
|
|
248
|
+
message: "Set up ADK docs MCP server for your IDE?",
|
|
249
|
+
initialValue: true,
|
|
250
|
+
});
|
|
251
|
+
if (typeof shouldSetupMcpDocs === "symbol") {
|
|
252
|
+
(0, prompts_1.outro)("Operation cancelled");
|
|
253
|
+
process.exit(0);
|
|
254
|
+
}
|
|
255
|
+
if (shouldSetupMcpDocs) {
|
|
256
|
+
const ideChoice = await (0, prompts_1.select)({
|
|
257
|
+
message: "Which IDE or environment are you using?",
|
|
258
|
+
options: [
|
|
259
|
+
{
|
|
260
|
+
value: "cursor",
|
|
261
|
+
label: "Cursor / VS Code (Cursor extension)",
|
|
262
|
+
hint: ".cursor/mcp.json in this project",
|
|
263
|
+
},
|
|
264
|
+
{
|
|
265
|
+
value: "claude",
|
|
266
|
+
label: "Claude Code / Claude Desktop",
|
|
267
|
+
hint: "Uses `claude mcp add` command",
|
|
268
|
+
},
|
|
269
|
+
{
|
|
270
|
+
value: "windsurf",
|
|
271
|
+
label: "Windsurf",
|
|
272
|
+
hint: "~/.codeium/windsurf/mcp_config.json",
|
|
273
|
+
},
|
|
274
|
+
{
|
|
275
|
+
value: "other",
|
|
276
|
+
label: "Other IDE / environment",
|
|
277
|
+
hint: "Shows generic MCP setup instructions",
|
|
278
|
+
},
|
|
279
|
+
],
|
|
280
|
+
});
|
|
281
|
+
if (typeof ideChoice === "symbol") {
|
|
282
|
+
(0, prompts_1.outro)("Operation cancelled");
|
|
283
|
+
process.exit(0);
|
|
284
|
+
}
|
|
285
|
+
const s3 = (0, prompts_1.spinner)();
|
|
286
|
+
s3.start("Configuring MCP docs server...");
|
|
287
|
+
const projectPath = (0, node_path_1.join)(process.cwd(), finalProjectName);
|
|
288
|
+
const cursorDir = (0, node_path_1.join)(projectPath, ".cursor");
|
|
289
|
+
const isWindows = process.platform === "win32";
|
|
290
|
+
try {
|
|
291
|
+
if (ideChoice === "cursor") {
|
|
292
|
+
if (!(0, node_fs_1.existsSync)(cursorDir)) {
|
|
293
|
+
(0, node_fs_1.mkdirSync)(cursorDir, { recursive: true });
|
|
294
|
+
}
|
|
295
|
+
const mcpConfigPath = (0, node_path_1.join)(cursorDir, "mcp.json");
|
|
296
|
+
const mcpConfig = {
|
|
297
|
+
mcpServers: {
|
|
298
|
+
"adk-docs": isWindows
|
|
299
|
+
? {
|
|
300
|
+
command: "cmd",
|
|
301
|
+
args: ["/c", "npx", "-y", "@iqai/mcp-docs"],
|
|
302
|
+
}
|
|
303
|
+
: {
|
|
304
|
+
command: "npx",
|
|
305
|
+
args: ["-y", "@iqai/mcp-docs"],
|
|
306
|
+
},
|
|
307
|
+
},
|
|
308
|
+
};
|
|
309
|
+
(0, node_fs_1.writeFileSync)(mcpConfigPath, `${JSON.stringify(mcpConfig, null, 2)}\n`);
|
|
310
|
+
s3.stop("MCP docs server configured for Cursor!");
|
|
311
|
+
}
|
|
312
|
+
else if (ideChoice === "claude") {
|
|
313
|
+
s3.stop("MCP docs server instructions for Claude:");
|
|
314
|
+
console.log(chalk_1.default.cyan("\nRun this in your terminal to add the MCP server to Claude:"));
|
|
315
|
+
console.log(chalk_1.default.cyan("claude mcp add adk-docs -- npx -y @iqai/mcp-docs"));
|
|
316
|
+
}
|
|
317
|
+
else if (ideChoice === "windsurf") {
|
|
318
|
+
s3.stop("MCP docs server instructions for Windsurf:");
|
|
319
|
+
console.log(chalk_1.default.cyan("\nAdd this to your ~/.codeium/windsurf/mcp_config.json file:"));
|
|
320
|
+
console.log(chalk_1.default.cyan(JSON.stringify({
|
|
321
|
+
mcpServers: {
|
|
322
|
+
"adk-docs": {
|
|
323
|
+
command: "npx",
|
|
324
|
+
args: ["-y", "@iqai/mcp-docs"],
|
|
325
|
+
},
|
|
326
|
+
},
|
|
327
|
+
}, null, 2)));
|
|
328
|
+
}
|
|
329
|
+
else {
|
|
330
|
+
s3.stop("MCP docs server generic instructions:");
|
|
331
|
+
console.log(chalk_1.default.cyan('\nConfigure an MCP server named "adk-docs" in your IDE pointing to:'));
|
|
332
|
+
console.log(chalk_1.default.cyan("command: npx, args: [-y, @iqai/mcp-docs] (or the Windows equivalent)"));
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
catch (_error) {
|
|
336
|
+
s3.stop("Failed to configure MCP docs server");
|
|
337
|
+
console.log(chalk_1.default.yellow("\nYou can configure it manually by following the instructions in the @iqai/mcp-docs README."));
|
|
338
|
+
}
|
|
339
|
+
}
|
|
247
340
|
(0, prompts_1.outro)(chalk_1.default.green((0, dedent_1.default) `
|
|
248
341
|
🎉 Project created successfully!
|
|
249
342
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.command.js","sourceRoot":"","sources":["../../src/cli/new.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"new.command.js","sourceRoot":"","sources":["../../src/cli/new.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.command.d.ts","sourceRoot":"","sources":["../../src/cli/run.command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.command.d.ts","sourceRoot":"","sources":["../../src/cli/run.command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAUhE,UAAU,UAAU;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AA+fD,qBAKa,UAAW,SAAQ,aAAa;IACtC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAqHhE,WAAW,IAAI,OAAO;IAQtB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ9B,YAAY,IAAI,OAAO;IAQvB,QAAQ,IAAI,OAAO;IASnB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CAMjC"}
|
package/dist/cli/run.command.js
CHANGED
|
@@ -51,6 +51,7 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
51
51
|
const marked_1 = require("marked");
|
|
52
52
|
const markedTerminal = __importStar(require("marked-terminal"));
|
|
53
53
|
const nest_commander_1 = require("nest-commander");
|
|
54
|
+
const constants_1 = require("../common/constants");
|
|
54
55
|
const schema_1 = require("../common/schema");
|
|
55
56
|
const bootstrap_1 = require("../http/bootstrap");
|
|
56
57
|
// Setup markdown terminal renderer
|
|
@@ -503,7 +504,7 @@ let RunCommand = class RunCommand extends nest_commander_1.CommandRunner {
|
|
|
503
504
|
consoleManager.hookChildProcessSilence();
|
|
504
505
|
}
|
|
505
506
|
if (options?.server) {
|
|
506
|
-
const apiPort =
|
|
507
|
+
const apiPort = constants_1.DEFAULT_API_PORT;
|
|
507
508
|
const host = options.host || "localhost";
|
|
508
509
|
if (isVerbose) {
|
|
509
510
|
console.log(chalk_1.default.blue("🚀 Starting ADK Server..."));
|
|
@@ -528,7 +529,7 @@ let RunCommand = class RunCommand extends nest_commander_1.CommandRunner {
|
|
|
528
529
|
return;
|
|
529
530
|
}
|
|
530
531
|
// Interactive chat mode
|
|
531
|
-
const apiUrl = `http://${options?.host || "localhost"}
|
|
532
|
+
const apiUrl = `http://${options?.host || "localhost"}:${constants_1.DEFAULT_API_PORT}`;
|
|
532
533
|
await consoleManager.withAllowedOutput(async () => {
|
|
533
534
|
p.intro("🤖 ADK Agent Chat");
|
|
534
535
|
});
|
|
@@ -536,7 +537,7 @@ let RunCommand = class RunCommand extends nest_commander_1.CommandRunner {
|
|
|
536
537
|
const healthResponse = await fetch(`${apiUrl}/health`).catch(() => null);
|
|
537
538
|
if (!healthResponse || !healthResponse.ok) {
|
|
538
539
|
await (0, bootstrap_1.startHttpServer)({
|
|
539
|
-
port:
|
|
540
|
+
port: constants_1.DEFAULT_API_PORT,
|
|
540
541
|
host: options?.host || "localhost",
|
|
541
542
|
agentsDir: process.cwd(),
|
|
542
543
|
quiet: !isVerbose,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../src/cli/run.command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../src/cli/run.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.command.d.ts","sourceRoot":"","sources":["../../src/cli/serve.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.command.d.ts","sourceRoot":"","sources":["../../src/cli/serve.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAKhE,UAAU,mBAAmB;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,qBAIa,YAAa,SAAQ,aAAa;IACxC,GAAG,CACR,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC;IA6ChB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ9B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAS7B,UAAU,IAAI,OAAO;IASrB,YAAY,IAAI,OAAO;IAQvB,cAAc,IAAI,OAAO;CAGzB"}
|
|
@@ -15,11 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.ServeCommand = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const nest_commander_1 = require("nest-commander");
|
|
18
|
+
const constants_1 = require("../common/constants");
|
|
18
19
|
const bootstrap_1 = require("../http/bootstrap");
|
|
19
20
|
const graceful_shutdown_1 = require("../utils/graceful-shutdown");
|
|
20
21
|
let ServeCommand = class ServeCommand extends nest_commander_1.CommandRunner {
|
|
21
22
|
async run(_passedParams, options) {
|
|
22
|
-
const port = options?.port ??
|
|
23
|
+
const port = options?.port ?? constants_1.DEFAULT_API_PORT;
|
|
23
24
|
const host = options?.host ?? "localhost";
|
|
24
25
|
const agentsDir = options?.dir ?? process.cwd();
|
|
25
26
|
const quiet = !!options?.quiet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.command.js","sourceRoot":"","sources":["../../src/cli/serve.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,mDAAgE;AAChE,iDAAoD;AACpD,kEAA2E;AAepE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,8BAAa;IAC9C,KAAK,CAAC,GAAG,CACR,aAAuB,EACvB,OAA6B;QAE7B,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"serve.command.js","sourceRoot":"","sources":["../../src/cli/serve.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,mDAAgE;AAChE,mDAAuD;AACvD,iDAAoD;AACpD,kEAA2E;AAepE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,8BAAa;IAC9C,KAAK,CAAC,GAAG,CACR,aAAuB,EACvB,OAA6B;QAE7B,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,4BAAgB,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,WAAW,CAAC;QAC1C,MAAM,SAAS,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;QAC/B,IAAI,OAA4B,CAAC;QACjC,IAAI,OAAO,EAAE,OAAO;YAAE,OAAO,GAAG,IAAI,CAAC;aAChC,IAAI,OAAO,EAAE,SAAS;YAAE,OAAO,GAAG,KAAK,CAAC;QAE7C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CACV,eAAK,CAAC,IAAI,CAAC,oCAAoC,IAAI,IAAI,IAAI,EAAE,CAAC,CAC9D,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAe,EAAC;YACpC,IAAI;YACJ,IAAI;YACJ,SAAS;YACT,KAAK;YACL,OAAO;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,yEAAyE;QACzE,MAAM,OAAO,GAAG,IAAA,iDAA6B,EAAC,MAAM,EAAE;YACrD,KAAK;YACL,IAAI,EAAE,QAAQ;SACd,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE/B,uBAAuB;QACvB,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAMD,SAAS,CAAC,GAAW;QACpB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAMD,SAAS,CAAC,GAAW;QACpB,OAAO,GAAG,CAAC;IACZ,CAAC;IAMD,QAAQ,CAAC,GAAW;QACnB,OAAO,GAAG,CAAC;IACZ,CAAC;IAOD,UAAU;QACT,OAAO,IAAI,CAAC;IACb,CAAC;IAOD,YAAY;QACX,OAAO,IAAI,CAAC;IACb,CAAC;IAMD,cAAc;QACb,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA9FY,oCAAY;AAiDxB;IAJC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,mBAAmB;QAC1B,WAAW,EAAE,qBAAqB;KAClC,CAAC;;;;6CAGD;AAMD;IAJC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,mBAAmB;QAC1B,WAAW,EAAE,qBAAqB;KAClC,CAAC;;;;6CAGD;AAMD;IAJC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,uBAAuB;QAC9B,WAAW,EAAE,2DAA2D;KACxE,CAAC;;;;4CAGD;AAOD;IALC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,aAAa;QACpB,WAAW,EAAE,uBAAuB;QACpC,YAAY,EAAE,KAAK;KACnB,CAAC;;;;8CAGD;AAOD;IALC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,WAAW;QAClB,WAAW,EACV,uEAAuE;KACxE,CAAC;;;;gDAGD;AAMD;IAJC,IAAA,uBAAM,EAAC;QACP,KAAK,EAAE,cAAc;QACrB,WAAW,EAAE,+CAA+C;KAC5D,CAAC;;;;kDAGD;uBA7FW,YAAY;IAJxB,IAAA,wBAAO,EAAC;QACR,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,0CAA0C;KACvD,CAAC;GACW,YAAY,CA8FxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.command.d.ts","sourceRoot":"","sources":["../../src/cli/web.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"web.command.d.ts","sourceRoot":"","sources":["../../src/cli/web.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAQhE,UAAU,iBAAiB;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAIa,UAAW,SAAQ,aAAa;IACtC,GAAG,CACR,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC;IAuEhB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ9B,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAS7B,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGhC"}
|
package/dist/cli/web.command.js
CHANGED
|
@@ -15,34 +15,55 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.WebCommand = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const nest_commander_1 = require("nest-commander");
|
|
18
|
+
const constants_1 = require("../common/constants");
|
|
18
19
|
const bootstrap_1 = require("../http/bootstrap");
|
|
19
20
|
const graceful_shutdown_1 = require("../utils/graceful-shutdown");
|
|
21
|
+
// Default hosted web app URL (fallback when bundled assets unavailable or --web-url provided)
|
|
22
|
+
const HOSTED_WEB_URL = "https://adk-web.iqai.com";
|
|
20
23
|
let WebCommand = class WebCommand extends nest_commander_1.CommandRunner {
|
|
21
24
|
async run(_passedParams, options) {
|
|
22
|
-
const apiPort = options?.port ??
|
|
25
|
+
const apiPort = options?.port ?? constants_1.DEFAULT_API_PORT;
|
|
23
26
|
const host = options?.host ?? "localhost";
|
|
24
|
-
const
|
|
27
|
+
const agentsDir = options?.dir ?? process.cwd();
|
|
28
|
+
// Determine mode: bundled (default) vs hosted (when --web-url provided)
|
|
29
|
+
const useHostedMode = !!options?.webUrl;
|
|
30
|
+
const webUrl = options?.webUrl ?? HOSTED_WEB_URL;
|
|
25
31
|
console.log(chalk_1.default.blue("🌐 Starting ADK Web Interface..."));
|
|
26
|
-
// Start the
|
|
32
|
+
// Start the server with web serving enabled in bundled mode
|
|
27
33
|
const server = await (0, bootstrap_1.startHttpServer)({
|
|
28
34
|
port: apiPort,
|
|
29
35
|
host,
|
|
30
|
-
agentsDir
|
|
36
|
+
agentsDir,
|
|
31
37
|
quiet: true,
|
|
38
|
+
serveWeb: !useHostedMode, // Only serve bundled web UI if not using hosted mode
|
|
32
39
|
});
|
|
33
|
-
//
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
40
|
+
// Determine what URL to show the user
|
|
41
|
+
if (!useHostedMode && server.webAssetsAvailable) {
|
|
42
|
+
// BUNDLED MODE: Web UI is served on the same port as API
|
|
43
|
+
const localUrl = `http://${host}:${apiPort}`;
|
|
44
|
+
console.log(chalk_1.default.green("✅ Web UI and API running on the same server"));
|
|
45
|
+
console.log(chalk_1.default.cyan(`🔗 Open in your browser: ${localUrl}`));
|
|
37
46
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
47
|
+
else {
|
|
48
|
+
// HOSTED MODE: Either explicitly requested or bundled assets not available
|
|
49
|
+
if (!useHostedMode && !server.webAssetsAvailable) {
|
|
50
|
+
console.log(chalk_1.default.yellow("⚠️ Bundled web assets not found. Falling back to hosted version."));
|
|
51
|
+
console.log(chalk_1.default.gray(" Run 'pnpm build' in the adk-cli package to enable bundled mode."));
|
|
52
|
+
}
|
|
53
|
+
// Build the web app URL - add port param if not using default
|
|
54
|
+
const url = new URL(webUrl);
|
|
55
|
+
if (apiPort !== constants_1.DEFAULT_API_PORT) {
|
|
56
|
+
url.searchParams.set("port", apiPort.toString());
|
|
57
|
+
}
|
|
58
|
+
const webAppUrl = url.toString();
|
|
59
|
+
console.log(chalk_1.default.cyan(`🔗 Open this URL in your browser: ${webAppUrl}`));
|
|
60
|
+
console.log(chalk_1.default.gray(` API Server: http://${host}:${apiPort}`));
|
|
61
|
+
}
|
|
62
|
+
console.log(chalk_1.default.cyan("Press Ctrl+C to stop the server"));
|
|
42
63
|
// Graceful shutdown with single-invocation guard and force-exit fallback
|
|
43
64
|
const cleanup = (0, graceful_shutdown_1.createGracefulShutdownHandler)(server, {
|
|
44
65
|
quiet: false, // web command always shows output
|
|
45
|
-
name: "
|
|
66
|
+
name: "server",
|
|
46
67
|
});
|
|
47
68
|
process.on("SIGINT", cleanup);
|
|
48
69
|
process.on("SIGTERM", cleanup);
|
|
@@ -66,7 +87,7 @@ exports.WebCommand = WebCommand;
|
|
|
66
87
|
__decorate([
|
|
67
88
|
(0, nest_commander_1.Option)({
|
|
68
89
|
flags: "-p, --port <port>",
|
|
69
|
-
description: "Port for API server",
|
|
90
|
+
description: "Port for API server (and web UI in bundled mode)",
|
|
70
91
|
}),
|
|
71
92
|
__metadata("design:type", Function),
|
|
72
93
|
__metadata("design:paramtypes", [String]),
|
|
@@ -93,7 +114,7 @@ __decorate([
|
|
|
93
114
|
__decorate([
|
|
94
115
|
(0, nest_commander_1.Option)({
|
|
95
116
|
flags: "--web-url <url>",
|
|
96
|
-
description: "
|
|
117
|
+
description: "Use hosted web UI instead of bundled (e.g., https://adk-web.iqai.com)",
|
|
97
118
|
}),
|
|
98
119
|
__metadata("design:type", Function),
|
|
99
120
|
__metadata("design:paramtypes", [String]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.command.js","sourceRoot":"","sources":["../../src/cli/web.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,mDAAgE;AAChE,iDAAoD;AACpD,kEAA2E;
|
|
1
|
+
{"version":3,"file":"web.command.js","sourceRoot":"","sources":["../../src/cli/web.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,4 +10,8 @@ export declare const USER_ID_PREFIX = "user_";
|
|
|
10
10
|
* Default app name for agent sessions
|
|
11
11
|
*/
|
|
12
12
|
export declare const DEFAULT_APP_NAME = "adk-server";
|
|
13
|
+
/**
|
|
14
|
+
* Default port for the ADK API server
|
|
15
|
+
*/
|
|
16
|
+
export declare const DEFAULT_API_PORT = 8042;
|
|
13
17
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,UAAU,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,gBAAgB,eAAe,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,UAAU,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAC"}
|
package/dist/common/constants.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Common constants used across the HTTP module
|
|
4
4
|
*/
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DEFAULT_APP_NAME = exports.USER_ID_PREFIX = void 0;
|
|
6
|
+
exports.DEFAULT_API_PORT = exports.DEFAULT_APP_NAME = exports.USER_ID_PREFIX = void 0;
|
|
7
7
|
/**
|
|
8
8
|
* Prefix used to create user IDs for agents in the session service.
|
|
9
9
|
* Format: "user_" + agentPath
|
|
@@ -13,4 +13,8 @@ exports.USER_ID_PREFIX = "user_";
|
|
|
13
13
|
* Default app name for agent sessions
|
|
14
14
|
*/
|
|
15
15
|
exports.DEFAULT_APP_NAME = "adk-server";
|
|
16
|
+
/**
|
|
17
|
+
* Default port for the ADK API server
|
|
18
|
+
*/
|
|
19
|
+
exports.DEFAULT_API_PORT = 8042;
|
|
16
20
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH;;;GAGG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC;AAEtC;;GAEG;AACU,QAAA,gBAAgB,GAAG,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH;;;GAGG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC;AAEtC;;GAEG;AACU,QAAA,gBAAgB,GAAG,YAAY,CAAC;AAE7C;;GAEG;AACU,QAAA,gBAAgB,GAAG,IAAI,CAAC"}
|
package/dist/http/bootstrap.d.ts
CHANGED
|
@@ -5,6 +5,8 @@ export interface StartedHttpServer {
|
|
|
5
5
|
app: NestExpressApplication;
|
|
6
6
|
url: string;
|
|
7
7
|
stop: () => Promise<void>;
|
|
8
|
+
/** True if bundled web UI is being served (serveWeb was enabled and assets exist) */
|
|
9
|
+
webAssetsAvailable: boolean;
|
|
8
10
|
}
|
|
9
11
|
/**
|
|
10
12
|
* Start a Nest Express HTTP server with the ADK controllers and providers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/http/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AASvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/http/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AASvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAgMtD,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,sBAAsB,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,qFAAqF;IACrF,kBAAkB,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACpC,MAAM,EAAE,aAAa,GACnB,OAAO,CAAC,iBAAiB,CAAC,CAiI5B"}
|
package/dist/http/bootstrap.js
CHANGED
|
@@ -12,6 +12,16 @@ const http_module_1 = require("./http.module");
|
|
|
12
12
|
const agent_manager_service_1 = require("./providers/agent-manager.service");
|
|
13
13
|
const agent_scanner_service_1 = require("./providers/agent-scanner.service");
|
|
14
14
|
const hot_reload_service_1 = require("./reload/hot-reload.service");
|
|
15
|
+
/**
|
|
16
|
+
* Resolves the path to the bundled web assets directory.
|
|
17
|
+
* The web/ directory is at the package root, relative to dist/http/bootstrap.js
|
|
18
|
+
*/
|
|
19
|
+
function getWebAssetsDir() {
|
|
20
|
+
// In CommonJS build, __dirname is available
|
|
21
|
+
// Path: dist/http/bootstrap.js -> ../../web
|
|
22
|
+
const currentDir = __dirname;
|
|
23
|
+
return (0, node_path_1.join)(currentDir, "..", "..", "web");
|
|
24
|
+
}
|
|
15
25
|
function pathHasSkippedDir(p) {
|
|
16
26
|
const parts = p.split(node_path_1.sep).filter(Boolean);
|
|
17
27
|
return parts.some((part) => agent_scanner_service_1.DIRECTORIES_TO_SKIP.includes(part));
|
|
@@ -212,6 +222,45 @@ async function startHttpServer(config) {
|
|
|
212
222
|
if (!config.quiet && debug)
|
|
213
223
|
console.log("[openapi] Docs available at /docs (json: /openapi.json)");
|
|
214
224
|
}
|
|
225
|
+
// Serve bundled web UI when enabled (used by `adk web` command)
|
|
226
|
+
let webAssetsAvailable = false;
|
|
227
|
+
if (config.serveWeb) {
|
|
228
|
+
const webDir = getWebAssetsDir();
|
|
229
|
+
if ((0, node_fs_1.existsSync)(webDir)) {
|
|
230
|
+
webAssetsAvailable = true;
|
|
231
|
+
// Serve static assets from the web/ directory
|
|
232
|
+
app.useStaticAssets(webDir);
|
|
233
|
+
// SPA fallback: serve index.html for non-API routes
|
|
234
|
+
// This must be added after all other routes are registered
|
|
235
|
+
const indexPath = (0, node_path_1.join)(webDir, "index.html");
|
|
236
|
+
// Use type assertion since we know NestExpressApplication uses Express
|
|
237
|
+
app.use((req, res, next) => {
|
|
238
|
+
// Skip API routes, health checks, docs, and reload endpoints
|
|
239
|
+
const API_ROUTE_PREFIXES = [
|
|
240
|
+
"/api",
|
|
241
|
+
"/health",
|
|
242
|
+
"/docs",
|
|
243
|
+
"/openapi",
|
|
244
|
+
"/reload",
|
|
245
|
+
];
|
|
246
|
+
if (API_ROUTE_PREFIXES.some((prefix) => req.path.startsWith(prefix))) {
|
|
247
|
+
return next();
|
|
248
|
+
}
|
|
249
|
+
// Skip requests for static files (have extensions)
|
|
250
|
+
if (req.path.includes(".")) {
|
|
251
|
+
return next();
|
|
252
|
+
}
|
|
253
|
+
// Serve index.html for SPA client-side routing
|
|
254
|
+
return res.sendFile(indexPath);
|
|
255
|
+
});
|
|
256
|
+
if (!config.quiet)
|
|
257
|
+
console.log(`[web] Serving bundled UI from ${webDir}`);
|
|
258
|
+
}
|
|
259
|
+
else {
|
|
260
|
+
if (!config.quiet)
|
|
261
|
+
console.warn("[web] Web assets not found. Run 'pnpm build' to generate them.");
|
|
262
|
+
}
|
|
263
|
+
}
|
|
215
264
|
const { teardownHotReload } = setupHotReload(agentManager, hotReload, config, env);
|
|
216
265
|
await app.listen(config.port, config.host);
|
|
217
266
|
const url = `http://${config.host}:${config.port}`;
|
|
@@ -227,6 +276,6 @@ async function startHttpServer(config) {
|
|
|
227
276
|
await app.close();
|
|
228
277
|
}
|
|
229
278
|
};
|
|
230
|
-
return { app, url, stop };
|
|
279
|
+
return { app, url, stop, webAssetsAvailable };
|
|
231
280
|
}
|
|
232
281
|
//# sourceMappingURL=bootstrap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/http/bootstrap.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/http/bootstrap.ts"],"names":[],"mappings":";;AA6NA,0CAmIC;AAhWD,4BAA0B;AAE1B,qCAA0D;AAC1D,yCAA+C;AAC/C,uCAA2C;AAE3C,6CAAiE;AAEjE,6CAA8D;AAC9D,uEAAkE;AAClE,+CAA2C;AAC3C,6EAAiE;AACjE,6EAAwE;AACxE,oEAA+D;AAI/D;;;GAGG;AACH,SAAS,eAAe;IACvB,4CAA4C;IAC5C,4CAA4C;IAC5C,MAAM,UAAU,GAAG,SAAS,CAAC;IAC7B,OAAO,IAAA,gBAAI,EAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS;IACnC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACzB,2CAAyC,CAAC,QAAQ,CAAC,IAAI,CAAC,CACzD,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC7C,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAA,oBAAU,EAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,IAAA,sBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC5C,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,SAAS;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,eAAG,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB,EAAE,QAAkB;IAC7D,IAAI,iBAAiB,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CACtB,YAA0B,EAC1B,SAAuC,EACvC,MAAqB,EACrB,GAA8B;IAM9B,MAAM,QAAQ,GAAgB,EAAE,CAAC;IACjC,MAAM,UAAU,GAAqB,EAAE,CAAC;IACxC,MAAM,WAAW,GAChB,MAAM,CAAC,SAAS,IAAI,GAAG,CAAC,QAAQ,KAAK,wBAAe,CAAC,IAAI,CAAC,UAAU,CAAC;IACtE,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC;IAE5B,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,QAAQ,GACb,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC/D,CAAC,CAAC,MAAM,CAAC,UAAU;QACnB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACd,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mBAAO,EAAC,CAAW,CAAC,CAAC,CAAC;IAExE,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,IAAA,eAAK,EAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBAClE,MAAM,QAAQ,GACb,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzD,IAAI,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBACnD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;wBACzB,OAAO,CAAC,GAAG,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;oBAC3D,OAAO;gBACR,CAAC;gBACD,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC;oBAC1B,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;oBAC3B,IAAI,CAAC;wBAAE,YAAY,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC;gBACD,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;oBAC/B,IAAI,CAAC;wBACJ,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,sBAAsB,EAAE,CAAC;wBACjE,IAAI,YAAY,EAAE,CAAC;4BAClB,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;gCACzB,OAAO,CAAC,GAAG,CACV,wFAAwF,CACxF,CAAC;4BACH,YAAY,CAAC,aAAa,EAAE,CAAC;4BAC7B,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;4BAC1C,KAAK,MAAM,SAAS,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gCACzD,IAAI,CAAC;oCACJ,MAAM,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;oCAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;wCACzB,OAAO,CAAC,GAAG,CACV,0CAA0C,SAAS,EAAE,CACrD,CAAC;gCACJ,CAAC;gCAAC,OAAO,CAAC,EAAE,CAAC;oCACZ,IAAI,CAAC,MAAM,CAAC,KAAK;wCAChB,OAAO,CAAC,KAAK,CACZ,4CAA4C,SAAS,GAAG,EACxD,CAAC,CACD,CAAC;gCACJ,CAAC;4BACF,CAAC;wBACF,CAAC;6BAAM,CAAC;4BACP,MAAM,iBAAiB,GAAG,YAAY,CAAC,sBAAsB,EAAE,CAAC;4BAChE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;gCACzB,OAAO,CAAC,GAAG,CACV,0CAA0C,iBAAiB,CAAC,IAAI,aAAa,CAC7E,CAAC;4BACH,YAAY,CAAC,aAAa,EAAE,CAAC;4BAC7B,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;4BAC1C,KAAK,MAAM,CACV,SAAS,EACT,SAAS,EACT,IAAI,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC;gCAClC,IAAI,CAAC;oCACJ,MAAM,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oCACpD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;wCACzB,OAAO,CAAC,GAAG,CACV,iCAAiC,SAAS,QAAQ,SAAS,EAAE,CAC7D,CAAC;gCACJ,CAAC;gCAAC,OAAO,CAAC,EAAE,CAAC;oCACZ,IAAI,CAAC,MAAM,CAAC,KAAK;wCAChB,OAAO,CAAC,KAAK,CACZ,wCAAwC,SAAS,GAAG,EACpD,CAAC,CACD,CAAC;gCACJ,CAAC;4BACF,CAAC;wBACF,CAAC;wBACD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;4BACzB,OAAO,CAAC,GAAG,CACV,gDAAgD,QAAQ,IAAI,CAAC,EAAE,CAC/D,CAAC;wBACH,IAAI,CAAC;4BACJ,SAAS,EAAE,eAAe,CACzB,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAC9C,CAAC;wBACH,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACZ,IAAI,KAAK;gCACR,OAAO,CAAC,IAAI,CACX,iDAAiD,EACjD,CAAC,CACD,CAAC;wBACJ,CAAC;oBACF,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACZ,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;oBACvD,CAAC;gBACF,CAAC,EAAE,GAAG,CAAC,CAAC;gBACR,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CACX,gCAAgC,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAClF,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC9B,KAAK,MAAM,CAAC,IAAI,UAAU;YAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACJ,CAAC,CAAC,KAAK,EAAE,CAAC;YACX,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACX,CAAC;QACD,IAAI,CAAC;YACJ,SAAS,EAAE,QAAQ,EAAE,CAAC;QACvB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACX,CAAC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;AACpD,CAAC;AAUD;;;;;;GAMG;AACI,KAAK,UAAU,eAAe,CACpC,MAAqB;IAErB,MAAM,GAAG,GAAG,kBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC;IAE5B,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CACnC,wBAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAC3B;QACC,MAAM,EAAE,KAAK;YACZ,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC;YAC9C,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC;KACpB,CACD,CAAC;IAEF,4DAA4D;IAC5D,MAAM,eAAe,GACpB,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAC7E,GAAG,CAAC,gBAAgB,CAAC,IAAI,uCAAiB,CAAC,eAAe,CAAC,CAAC,CAAC;IAE7D,uDAAuD;IACvD,GAAG,CAAC,UAAU,CAAC;QACd,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC;QACpD,cAAc,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;KACjD,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,GAAG,CAAC,mBAAmB,CAAC;IAC1C,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,GAAG,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtE,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,oCAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,qCAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/D,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAE1C,MAAM,aAAa,GAClB,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,wBAAe,CAAC,IAAI,CAAC,UAAU,CAAC;IACpE,IAAI,aAAa,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAI,yBAAe,EAAE;aACnC,QAAQ,CAAC,cAAc,CAAC;aACxB,cAAc,CACd,6DAA6D,CAC7D;aACA,UAAU,CAAC,OAAO,CAAC;aACnB,MAAM,CAAC,QAAQ,CAAC;aAChB,MAAM,CAAC,UAAU,CAAC;aAClB,MAAM,CAAC,QAAQ,CAAC;aAChB,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CAAC,WAAW,CAAC;aACnB,MAAM,CAAC,QAAQ,CAAC;aAChB,MAAM,CAAC,OAAO,CAAC;aACf,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE;YAC3D,cAAc,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,uBAAa,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE;YAC1C,eAAe,EAAE,cAAc;YAC/B,eAAe,EAAE,eAAe;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;YACzB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IAED,gEAAgE;IAChE,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;QACjC,IAAI,IAAA,oBAAU,EAAC,MAAM,CAAC,EAAE,CAAC;YACxB,kBAAkB,GAAG,IAAI,CAAC;YAE1B,8CAA8C;YAC9C,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAE5B,oDAAoD;YACpD,2DAA2D;YAC3D,MAAM,SAAS,GAAG,IAAA,gBAAI,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAE7C,uEAAuE;YACvE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;gBAC3D,6DAA6D;gBAC7D,MAAM,kBAAkB,GAAG;oBAC1B,MAAM;oBACN,SAAS;oBACT,OAAO;oBACP,UAAU;oBACV,SAAS;iBACA,CAAC;gBACX,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBACtE,OAAO,IAAI,EAAE,CAAC;gBACf,CAAC;gBAED,mDAAmD;gBACnD,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC5B,OAAO,IAAI,EAAE,CAAC;gBACf,CAAC;gBAED,+CAA+C;gBAC/C,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,MAAM,EAAE,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,KAAK;gBAChB,OAAO,CAAC,IAAI,CACX,gEAAgE,CAChE,CAAC;QACJ,CAAC;IACF,CAAC;IAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,cAAc,CAC3C,YAAY,EACZ,SAAS,EACT,MAAM,EACN,GAAG,CACH,CAAC;IAEF,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,UAAU,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;IAEnD,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC;YACJ,YAAY,CAAC,aAAa,EAAE,CAAC;QAC9B,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC;gBACJ,iBAAiB,EAAE,CAAC;YACrB,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YACV,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;IACF,CAAC,CAAC;IAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;AAC/C,CAAC"}
|
|
@@ -17,6 +17,12 @@ export interface RuntimeConfig {
|
|
|
17
17
|
* Defaults to true in non-production when not provided. Disable explicitly in prod if needed.
|
|
18
18
|
*/
|
|
19
19
|
swagger?: boolean;
|
|
20
|
+
/**
|
|
21
|
+
* Serve bundled web UI from the CLI package.
|
|
22
|
+
* When enabled, static files from the web/ directory are served on the same port.
|
|
23
|
+
* Used by the `adk web` command for bundled mode.
|
|
24
|
+
*/
|
|
25
|
+
serveWeb?: boolean;
|
|
20
26
|
}
|
|
21
27
|
export declare const RUNTIME_CONFIG = "RUNTIME_CONFIG";
|
|
22
28
|
//# sourceMappingURL=runtime-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-config.d.ts","sourceRoot":"","sources":["../../src/http/runtime-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime-config.d.ts","sourceRoot":"","sources":["../../src/http/runtime-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,cAAc,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-config.js","sourceRoot":"","sources":["../../src/http/runtime-config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"runtime-config.js","sourceRoot":"","sources":["../../src/http/runtime-config.ts"],"names":[],"mappings":";;;AA2Ba,QAAA,cAAc,GAAG,gBAAgB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@iqai/adk-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.1",
|
|
4
4
|
"description": "CLI tool for creating, running, and testing ADK agents",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"types": "dist/main.d.ts",
|
|
@@ -44,9 +44,10 @@
|
|
|
44
44
|
"rxjs": "^7.8.2",
|
|
45
45
|
"swagger-ui-express": "^5.0.1",
|
|
46
46
|
"zod": "^4.1.5",
|
|
47
|
-
"@iqai/adk": "0.6.
|
|
47
|
+
"@iqai/adk": "0.6.6"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
+
"@types/express": "^5.0.6",
|
|
50
51
|
"@types/marked-terminal": "^6.1.1",
|
|
51
52
|
"@types/node": "^24.3.1",
|
|
52
53
|
"typescript": "^5.9.2",
|
|
@@ -59,6 +60,7 @@
|
|
|
59
60
|
},
|
|
60
61
|
"files": [
|
|
61
62
|
"dist",
|
|
63
|
+
"web",
|
|
62
64
|
"!**/*.test.*",
|
|
63
65
|
"!**/*.json",
|
|
64
66
|
"CHANGELOG.md",
|
|
@@ -70,6 +72,7 @@
|
|
|
70
72
|
},
|
|
71
73
|
"scripts": {
|
|
72
74
|
"build": "tsc -p tsconfig.json",
|
|
75
|
+
"postbuild": "node scripts/copy-web-assets.js",
|
|
73
76
|
"dev": "tsc -w -p tsconfig.json",
|
|
74
77
|
"test": "echo 'No tests found in adk-cli, skipping.'",
|
|
75
78
|
"test:watch": "vitest"
|