@agentuity/cli 1.0.5 → 1.0.6
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/cmd/build/entry-generator.js +29 -29
- package/dist/cmd/build/entry-generator.js.map +1 -1
- package/dist/domain.d.ts.map +1 -1
- package/dist/domain.js +22 -0
- package/dist/domain.js.map +1 -1
- package/package.json +6 -6
- package/src/cmd/build/entry-generator.ts +29 -29
- package/src/domain.ts +22 -0
|
@@ -98,17 +98,19 @@ export async function generateEntryFile(options) {
|
|
|
98
98
|
${routeImportsAndMounts.join('\n')}
|
|
99
99
|
`
|
|
100
100
|
: '';
|
|
101
|
-
// Workbench API routes mounting
|
|
102
|
-
//
|
|
103
|
-
//
|
|
101
|
+
// Workbench API routes mounting
|
|
102
|
+
// Always mounted - these routes are needed for the cloud workbench to communicate with deployed agents
|
|
103
|
+
// Auth is handled by middleware inside the router (signature verification in production, no auth in development)
|
|
104
|
+
// The hasWorkbenchConfig flag only controls whether the local workbench UI is served
|
|
104
105
|
const workbenchApiMount = `
|
|
106
|
+
// Mount workbench API routes (/_agentuity/workbench/*)
|
|
107
|
+
// Always available for cloud workbench communication
|
|
108
|
+
// Auth is handled inside the router (signature verification in production)
|
|
109
|
+
const workbenchRouter = createWorkbenchRouter();
|
|
110
|
+
app.route('/', workbenchRouter);
|
|
111
|
+
|
|
112
|
+
// hasWorkbenchConfig controls whether the local workbench UI is served (dev mode only)
|
|
105
113
|
const hasWorkbenchConfig = ${hasWorkbenchConfig};
|
|
106
|
-
const hasWorkbench = isDevelopment() && hasWorkbenchConfig;
|
|
107
|
-
if (hasWorkbench) {
|
|
108
|
-
// Mount workbench API routes (/_agentuity/workbench/*)
|
|
109
|
-
const workbenchRouter = createWorkbenchRouter();
|
|
110
|
-
app.route('/', workbenchRouter);
|
|
111
|
-
}
|
|
112
114
|
`;
|
|
113
115
|
// Asset proxy routes - Always generated, but only active at runtime when:
|
|
114
116
|
// - NODE_ENV !== 'production' (isDevelopment())
|
|
@@ -333,7 +335,7 @@ ${analyticsEnabled
|
|
|
333
335
|
// 404 for unmatched API/system routes
|
|
334
336
|
app.all('/_agentuity/*', (c: Context) => c.notFound());
|
|
335
337
|
app.all('/api/*', (c: Context) => c.notFound());
|
|
336
|
-
if (!
|
|
338
|
+
if (!(hasWorkbenchConfig && isDevelopment())) {
|
|
337
339
|
app.all('/workbench/*', (c: Context) => c.notFound());
|
|
338
340
|
}
|
|
339
341
|
|
|
@@ -379,7 +381,7 @@ ${analyticsEnabled
|
|
|
379
381
|
// 404 for unmatched API/system routes (IMPORTANT: comes before SPA fallback)
|
|
380
382
|
app.all('/_agentuity/*', (c: Context) => c.notFound());
|
|
381
383
|
app.all('/api/*', (c: Context) => c.notFound());
|
|
382
|
-
if (!
|
|
384
|
+
if (!(hasWorkbenchConfig && isDevelopment())) {
|
|
383
385
|
app.all('/workbench/*', (c: Context) => c.notFound());
|
|
384
386
|
}
|
|
385
387
|
|
|
@@ -395,25 +397,22 @@ ${analyticsEnabled
|
|
|
395
397
|
}
|
|
396
398
|
`;
|
|
397
399
|
}
|
|
398
|
-
// Workbench routes (
|
|
400
|
+
// Workbench UI routes (development only)
|
|
401
|
+
// The workbench UI is only served in development mode; the API routes are always available
|
|
399
402
|
const workbenchRoute = workbench?.route ?? '/workbench';
|
|
400
403
|
const workbenchRoutes = `
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
});
|
|
414
|
-
} else {
|
|
415
|
-
// Production mode disables the workbench assets
|
|
416
|
-
}
|
|
404
|
+
// Workbench UI is only available in development mode (API routes are always available)
|
|
405
|
+
if (hasWorkbenchConfig && isDevelopment()) {
|
|
406
|
+
const workbenchSrcDir = import.meta.dir + '/workbench-src';
|
|
407
|
+
const workbenchIndexPath = import.meta.dir + '/workbench-src/index.html';
|
|
408
|
+
app.get('${workbenchRoute}', async (c: Context) => {
|
|
409
|
+
const html = await Bun.file(workbenchIndexPath).text();
|
|
410
|
+
// Rewrite script/css paths to use Vite's @fs protocol
|
|
411
|
+
const withVite = html
|
|
412
|
+
.replace('src="./main.tsx"', \`src="/@fs\${workbenchSrcDir}/main.tsx"\`)
|
|
413
|
+
.replace('href="./styles.css"', \`href="/@fs\${workbenchSrcDir}/styles.css"\`);
|
|
414
|
+
return c.html(withVite);
|
|
415
|
+
});
|
|
417
416
|
}
|
|
418
417
|
`;
|
|
419
418
|
// Server startup (same for dev and prod - Bun.serve with native WebSocket)
|
|
@@ -600,7 +599,8 @@ app.use('*', createBaseMiddleware({
|
|
|
600
599
|
meter: otel.meter,
|
|
601
600
|
}));
|
|
602
601
|
|
|
603
|
-
|
|
602
|
+
// Note: Workbench routes use their own CORS middleware (defined in createWorkbenchRouter)
|
|
603
|
+
// which includes signature headers for production authentication
|
|
604
604
|
app.use('/api/*', createCorsMiddleware());
|
|
605
605
|
|
|
606
606
|
// Critical: otelMiddleware creates session/thread/waitUntilHandler
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-generator.js","sourceRoot":"","sources":["../../../src/cmd/build/entry-generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entry-generator.js","sourceRoot":"","sources":["../../../src/cmd/build/entry-generator.ts"],"names":[],"mappings":"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"}
|
package/dist/domain.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domain.d.ts","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC,UAAU,aAAa;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,IAAI,CAAC;CACd;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,IAAI,CAAC;CACd;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;CACf;AAED,UAAU,QAAS,SAAQ,aAAa;IACvC,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC/C,OAAO,EAAE,KAAK,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC;AAC3F,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC;AAE9E,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,gBAAgB,CAEnE;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,QAAQ,CAEnD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAqCD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"domain.d.ts","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC,UAAU,aAAa;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,IAAI,CAAC;CACd;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,IAAI,CAAC;CACd;AAED,UAAU,UAAW,SAAQ,aAAa;IACzC,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;CACf;AAED,UAAU,QAAS,SAAQ,aAAa;IACvC,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC/C,OAAO,EAAE,KAAK,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC;AAC3F,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC;AAE9E,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,gBAAgB,CAEnE;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,QAAQ,CAEnD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,UAAU,CAEvD;AAqCD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAkGtB;AAED,wBAAsB,YAAY,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,MAAM,IAAI,iBAsF3B"}
|
package/dist/domain.js
CHANGED
|
@@ -51,6 +51,28 @@ export async function checkCustomDomainForDNS(projectId, domains, config) {
|
|
|
51
51
|
const id = Bun.hash.xxHash64(projectId).toString(16).padStart(16, '0');
|
|
52
52
|
const proxy = `p${id}.${suffix}`;
|
|
53
53
|
return Promise.all(domains.map(async (domain) => {
|
|
54
|
+
// Detect if user passed a URL instead of a domain name
|
|
55
|
+
if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(domain)) {
|
|
56
|
+
try {
|
|
57
|
+
const url = new URL(domain);
|
|
58
|
+
return {
|
|
59
|
+
domain,
|
|
60
|
+
target: proxy,
|
|
61
|
+
recordType: 'CNAME',
|
|
62
|
+
success: false,
|
|
63
|
+
error: `Invalid domain format: "${domain}" appears to be a URL. Use just the domain name: "${url.hostname}"`,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
return {
|
|
68
|
+
domain,
|
|
69
|
+
target: proxy,
|
|
70
|
+
recordType: 'CNAME',
|
|
71
|
+
success: false,
|
|
72
|
+
error: `Invalid domain format: "${domain}" appears to be a URL. Use just the domain name without the protocol (e.g., "example.com" not "https://example.com")`,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
}
|
|
54
76
|
try {
|
|
55
77
|
let timeoutId;
|
|
56
78
|
const timeoutPromise = new Promise((_, reject) => {
|
package/dist/domain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAmC7B,MAAM,UAAU,eAAe,CAAC,CAAY;IAC3C,OAAO,eAAe,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,CAAY;IACnC,OAAO,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,CAAC,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,MAAM,eAAe,GAAG,eAAe,CACtC,iBAAiB,EACjB,8BAA8B,SAAS,IAAI,CAC3C,CAAC;AAQF,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,wCAAwC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE;QACpF,OAAO,EAAE;YACR,MAAM,EAAE,sBAAsB;SAC9B;KACD,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAa,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,WAAW,EAAE,CAAC;YACjB,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,2CAA2C;QACxF,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,SAAS,GAAG,cAAc,CAAC;AACjC,MAAM,cAAc,GAAG,eAAe,CAAC;AAEvC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,SAAiB,EACjB,OAAiB,EACjB,MAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;IACjG,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;IAEjC,OAAO,OAAO,CAAC,GAAG,CACjB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5B,uDAAuD;QACvD,IAAI,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5B,OAAO;oBACN,MAAM;oBACN,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,2BAA2B,MAAM,qDAAqD,GAAG,CAAC,QAAQ,GAAG;iBAChG,CAAC;YACf,CAAC;YAAC,MAAM,CAAC;gBACR,OAAO;oBACN,MAAM;oBACN,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,2BAA2B,MAAM,sHAAsH;iBAClJ,CAAC;YACf,CAAC;QACF,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,SAA4B,CAAC;YAEjC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACvD,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC3B,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;gBAC/B,CAAC,EAAE,SAAS,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gBACjC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC;gBAC/B,cAAc;aACd,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACf,IAAI,SAAS;oBAAE,YAAY,CAAC,SAAS,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YAEH,IAAI,MAAM,EAAE,CAAC;gBACZ,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;oBACtB,OAAO;wBACN,MAAM;wBACN,MAAM,EAAE,KAAK;wBACb,UAAU,EAAE,OAAO;wBACnB,OAAO,EAAE,IAAI;qBACC,CAAC;gBACjB,CAAC;gBACD,OAAO;oBACN,MAAM;oBACN,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,KAAK;oBACd,aAAa,EAAE,mBAAmB,MAAM,EAAE;iBACtB,CAAC;YACvB,CAAC;QACF,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,EAAwC,CAAC;YACrD,IAAI,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxC,OAAO;oBACN,MAAM;oBACN,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,4EAA4E;iBACvE,CAAC;YACf,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC9B,MAAM,MAAM,GACX,EAAE,YAAY,KAAK;oBAClB,CAAC,CAAC,EAAE,CAAC,OAAO;oBACZ,CAAC,CAAC,OAAO,EAAE,KAAK,QAAQ;wBACvB,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBACxB,OAAO;oBACN,MAAM;oBACN,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,OAAO;oBACnB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,MAAM;iBACD,CAAC;YACf,CAAC;QACF,CAAC;QACD,OAAO;YACN,MAAM;YACN,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,KAAK;SACA,CAAC;IACjB,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,SAAiB,EACjB,OAAiB,EACjB,MAAe,EACf,QAA2B;IAE3B,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAgC,CAAC;IACrC,SAAS,CAAC;QACT,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAkB,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,OAAO,GAKP,EAAE,CAAC;YACT,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,IAAI,EAAE,CAAC,CAAC,UAAU;wBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC;qBAC3D,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,MAAM,GAAG,QAAQ,EAAE,EAAE,CAAC;gBACtB,MAAM,GAAG,IAAI,CAAC;YACf,CAAC;YACD,GAAG,CAAC,KAAK,CACR,YAAY,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,qBAAqB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,0CAA0C,CAC1J,CAAC;YACF,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;gBACxB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChB,MAAM,EAAE,EAAE,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;qBAAM,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/B,OAAO,CAAC,IAAI,CAAC;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,IAAI,EAAE,CAAC,CAAC,UAAU;wBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;qBACjE,CAAC,CAAC;gBACJ,CAAC;qBAAM,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzB,OAAO,CAAC,IAAI,CAAC;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,IAAI,EAAE,CAAC,CAAC,UAAU;wBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC;qBACtC,CAAC,CAAC;gBACJ,CAAC;qBAAM,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzB,OAAO,CAAC,IAAI,CAAC;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,IAAI,EAAE,CAAC,CAAC,UAAU;wBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,UAAU,CAAC;qBACpD,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YAED,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,kBAAkB;YACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7E,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,UAAU,IAAI,CAAC,CAAC;YACjB,CAAC;YAED,kFAAkF;YAClF,MAAM,GAAG,CAAC,OAAO,CAAC;gBACjB,OAAO,EAAE,yBAAyB;gBAClC,cAAc,EAAE,IAAI;gBACpB,QAAQ,EAAE,GAAG,EAAE;oBACd,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC;aACD,CAAC,CAAC;YACH,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC/B,UAAU,GAAG,CAAC,CAAC;YACf,SAAS;QACV,CAAC;QACD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,EAAE,EAAE,CAAC;QACX,MAAM;IACP,CAAC;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentuity/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.6",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Agentuity employees and contributors",
|
|
6
6
|
"type": "module",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"prepublishOnly": "bun run clean && bun run build"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@agentuity/auth": "1.0.
|
|
45
|
-
"@agentuity/core": "1.0.
|
|
46
|
-
"@agentuity/server": "1.0.
|
|
44
|
+
"@agentuity/auth": "1.0.6",
|
|
45
|
+
"@agentuity/core": "1.0.6",
|
|
46
|
+
"@agentuity/server": "1.0.6",
|
|
47
47
|
"@datasert/cronjs-parser": "^1.4.0",
|
|
48
48
|
"@terascope/fetch-github-release": "^2.2.1",
|
|
49
49
|
"@vitejs/plugin-react": "^5.1.2",
|
|
@@ -61,10 +61,10 @@
|
|
|
61
61
|
"typescript": "^5.9.0",
|
|
62
62
|
"vite": "^7.2.7",
|
|
63
63
|
"zod": "^4.3.5",
|
|
64
|
-
"@agentuity/frontend": "1.0.
|
|
64
|
+
"@agentuity/frontend": "1.0.6"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@agentuity/test-utils": "1.0.
|
|
67
|
+
"@agentuity/test-utils": "1.0.6",
|
|
68
68
|
"@types/adm-zip": "^0.5.7",
|
|
69
69
|
"@types/bun": "latest",
|
|
70
70
|
"@types/tar-fs": "^2.0.4",
|
|
@@ -133,17 +133,19 @@ ${routeImportsAndMounts.join('\n')}
|
|
|
133
133
|
`
|
|
134
134
|
: '';
|
|
135
135
|
|
|
136
|
-
// Workbench API routes mounting
|
|
137
|
-
//
|
|
138
|
-
//
|
|
136
|
+
// Workbench API routes mounting
|
|
137
|
+
// Always mounted - these routes are needed for the cloud workbench to communicate with deployed agents
|
|
138
|
+
// Auth is handled by middleware inside the router (signature verification in production, no auth in development)
|
|
139
|
+
// The hasWorkbenchConfig flag only controls whether the local workbench UI is served
|
|
139
140
|
const workbenchApiMount = `
|
|
141
|
+
// Mount workbench API routes (/_agentuity/workbench/*)
|
|
142
|
+
// Always available for cloud workbench communication
|
|
143
|
+
// Auth is handled inside the router (signature verification in production)
|
|
144
|
+
const workbenchRouter = createWorkbenchRouter();
|
|
145
|
+
app.route('/', workbenchRouter);
|
|
146
|
+
|
|
147
|
+
// hasWorkbenchConfig controls whether the local workbench UI is served (dev mode only)
|
|
140
148
|
const hasWorkbenchConfig = ${hasWorkbenchConfig};
|
|
141
|
-
const hasWorkbench = isDevelopment() && hasWorkbenchConfig;
|
|
142
|
-
if (hasWorkbench) {
|
|
143
|
-
// Mount workbench API routes (/_agentuity/workbench/*)
|
|
144
|
-
const workbenchRouter = createWorkbenchRouter();
|
|
145
|
-
app.route('/', workbenchRouter);
|
|
146
|
-
}
|
|
147
149
|
`;
|
|
148
150
|
|
|
149
151
|
// Asset proxy routes - Always generated, but only active at runtime when:
|
|
@@ -373,7 +375,7 @@ ${
|
|
|
373
375
|
// 404 for unmatched API/system routes
|
|
374
376
|
app.all('/_agentuity/*', (c: Context) => c.notFound());
|
|
375
377
|
app.all('/api/*', (c: Context) => c.notFound());
|
|
376
|
-
if (!
|
|
378
|
+
if (!(hasWorkbenchConfig && isDevelopment())) {
|
|
377
379
|
app.all('/workbench/*', (c: Context) => c.notFound());
|
|
378
380
|
}
|
|
379
381
|
|
|
@@ -421,7 +423,7 @@ ${
|
|
|
421
423
|
// 404 for unmatched API/system routes (IMPORTANT: comes before SPA fallback)
|
|
422
424
|
app.all('/_agentuity/*', (c: Context) => c.notFound());
|
|
423
425
|
app.all('/api/*', (c: Context) => c.notFound());
|
|
424
|
-
if (!
|
|
426
|
+
if (!(hasWorkbenchConfig && isDevelopment())) {
|
|
425
427
|
app.all('/workbench/*', (c: Context) => c.notFound());
|
|
426
428
|
}
|
|
427
429
|
|
|
@@ -438,25 +440,22 @@ ${
|
|
|
438
440
|
`;
|
|
439
441
|
}
|
|
440
442
|
|
|
441
|
-
// Workbench routes (
|
|
443
|
+
// Workbench UI routes (development only)
|
|
444
|
+
// The workbench UI is only served in development mode; the API routes are always available
|
|
442
445
|
const workbenchRoute = workbench?.route ?? '/workbench';
|
|
443
446
|
const workbenchRoutes = `
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
});
|
|
457
|
-
} else {
|
|
458
|
-
// Production mode disables the workbench assets
|
|
459
|
-
}
|
|
447
|
+
// Workbench UI is only available in development mode (API routes are always available)
|
|
448
|
+
if (hasWorkbenchConfig && isDevelopment()) {
|
|
449
|
+
const workbenchSrcDir = import.meta.dir + '/workbench-src';
|
|
450
|
+
const workbenchIndexPath = import.meta.dir + '/workbench-src/index.html';
|
|
451
|
+
app.get('${workbenchRoute}', async (c: Context) => {
|
|
452
|
+
const html = await Bun.file(workbenchIndexPath).text();
|
|
453
|
+
// Rewrite script/css paths to use Vite's @fs protocol
|
|
454
|
+
const withVite = html
|
|
455
|
+
.replace('src="./main.tsx"', \`src="/@fs\${workbenchSrcDir}/main.tsx"\`)
|
|
456
|
+
.replace('href="./styles.css"', \`href="/@fs\${workbenchSrcDir}/styles.css"\`);
|
|
457
|
+
return c.html(withVite);
|
|
458
|
+
});
|
|
460
459
|
}
|
|
461
460
|
`;
|
|
462
461
|
|
|
@@ -646,7 +645,8 @@ app.use('*', createBaseMiddleware({
|
|
|
646
645
|
meter: otel.meter,
|
|
647
646
|
}));
|
|
648
647
|
|
|
649
|
-
|
|
648
|
+
// Note: Workbench routes use their own CORS middleware (defined in createWorkbenchRouter)
|
|
649
|
+
// which includes signature headers for production authentication
|
|
650
650
|
app.use('/api/*', createCorsMiddleware());
|
|
651
651
|
|
|
652
652
|
// Critical: otelMiddleware creates session/thread/waitUntilHandler
|
package/src/domain.ts
CHANGED
|
@@ -110,6 +110,28 @@ export async function checkCustomDomainForDNS(
|
|
|
110
110
|
|
|
111
111
|
return Promise.all(
|
|
112
112
|
domains.map(async (domain) => {
|
|
113
|
+
// Detect if user passed a URL instead of a domain name
|
|
114
|
+
if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(domain)) {
|
|
115
|
+
try {
|
|
116
|
+
const url = new URL(domain);
|
|
117
|
+
return {
|
|
118
|
+
domain,
|
|
119
|
+
target: proxy,
|
|
120
|
+
recordType: 'CNAME',
|
|
121
|
+
success: false,
|
|
122
|
+
error: `Invalid domain format: "${domain}" appears to be a URL. Use just the domain name: "${url.hostname}"`,
|
|
123
|
+
} as DNSError;
|
|
124
|
+
} catch {
|
|
125
|
+
return {
|
|
126
|
+
domain,
|
|
127
|
+
target: proxy,
|
|
128
|
+
recordType: 'CNAME',
|
|
129
|
+
success: false,
|
|
130
|
+
error: `Invalid domain format: "${domain}" appears to be a URL. Use just the domain name without the protocol (e.g., "example.com" not "https://example.com")`,
|
|
131
|
+
} as DNSError;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
113
135
|
try {
|
|
114
136
|
let timeoutId: Timer | undefined;
|
|
115
137
|
|