@agentuity/cli 0.0.51 ā 0.0.52
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/api.js +68 -0
- package/dist/api.js.map +1 -0
- package/dist/auth.js +225 -0
- package/dist/auth.js.map +1 -0
- package/dist/banner.js +35 -0
- package/dist/banner.js.map +1 -0
- package/dist/cli-logger.js +72 -0
- package/dist/cli-logger.js.map +1 -0
- package/dist/cli.js +822 -0
- package/dist/cli.js.map +1 -0
- package/dist/cmd/ai/capabilities/index.js +10 -0
- package/dist/cmd/ai/capabilities/index.js.map +1 -0
- package/dist/cmd/ai/capabilities/show.js +221 -0
- package/dist/cmd/ai/capabilities/show.js.map +1 -0
- package/dist/cmd/ai/index.js +11 -0
- package/dist/cmd/ai/index.js.map +1 -0
- package/dist/cmd/ai/prompt/index.js +10 -0
- package/dist/cmd/ai/prompt/index.js.map +1 -0
- package/dist/cmd/ai/prompt/llm.js +365 -0
- package/dist/cmd/ai/prompt/llm.js.map +1 -0
- package/dist/cmd/ai/schema/index.js +10 -0
- package/dist/cmd/ai/schema/index.js.map +1 -0
- package/dist/cmd/ai/schema/show.js +23 -0
- package/dist/cmd/ai/schema/show.js.map +1 -0
- package/dist/cmd/auth/api.js +85 -0
- package/dist/cmd/auth/api.js.map +1 -0
- package/dist/cmd/auth/index.js +13 -0
- package/dist/cmd/auth/index.js.map +1 -0
- package/dist/cmd/auth/login.js +84 -0
- package/dist/cmd/auth/login.js.map +1 -0
- package/dist/cmd/auth/logout.js +17 -0
- package/dist/cmd/auth/logout.js.map +1 -0
- package/dist/cmd/auth/signup.js +55 -0
- package/dist/cmd/auth/signup.js.map +1 -0
- package/dist/cmd/auth/ssh/add.js +239 -0
- package/dist/cmd/auth/ssh/add.js.map +1 -0
- package/dist/cmd/auth/ssh/api.js +53 -0
- package/dist/cmd/auth/ssh/api.js.map +1 -0
- package/dist/cmd/auth/ssh/delete.js +126 -0
- package/dist/cmd/auth/ssh/delete.js.map +1 -0
- package/dist/cmd/auth/ssh/index.js +11 -0
- package/dist/cmd/auth/ssh/index.js.map +1 -0
- package/dist/cmd/auth/ssh/list.js +70 -0
- package/dist/cmd/auth/ssh/list.js.map +1 -0
- package/dist/cmd/auth/whoami.js +68 -0
- package/dist/cmd/auth/whoami.js.map +1 -0
- package/dist/cmd/build/ast.js +608 -0
- package/dist/cmd/build/ast.js.map +1 -0
- package/dist/cmd/build/ast.test.js +389 -0
- package/dist/cmd/build/ast.test.js.map +1 -0
- package/dist/cmd/build/bundler.js +304 -0
- package/dist/cmd/build/bundler.js.map +1 -0
- package/dist/cmd/build/file.js +10 -0
- package/dist/cmd/build/file.js.map +1 -0
- package/dist/cmd/build/fix-duplicate-exports.js +167 -0
- package/dist/cmd/build/fix-duplicate-exports.js.map +1 -0
- package/dist/cmd/build/fix-duplicate-exports.test.js +300 -0
- package/dist/cmd/build/fix-duplicate-exports.test.js.map +1 -0
- package/dist/cmd/build/index.d.ts.map +1 -1
- package/dist/cmd/build/index.js +79 -0
- package/dist/cmd/build/index.js.map +1 -0
- package/dist/cmd/build/patch/_util.js +42 -0
- package/dist/cmd/build/patch/_util.js.map +1 -0
- package/dist/cmd/build/patch/aisdk.js +65 -0
- package/dist/cmd/build/patch/aisdk.js.map +1 -0
- package/dist/cmd/build/patch/index.js +97 -0
- package/dist/cmd/build/patch/index.js.map +1 -0
- package/dist/cmd/build/patch/llm.js +18 -0
- package/dist/cmd/build/patch/llm.js.map +1 -0
- package/dist/cmd/build/plugin.d.ts.map +1 -1
- package/dist/cmd/build/plugin.js +556 -0
- package/dist/cmd/build/plugin.js.map +1 -0
- package/dist/cmd/cloud/agents/index.js +133 -0
- package/dist/cmd/cloud/agents/index.js.map +1 -0
- package/dist/cmd/cloud/deploy.js +341 -0
- package/dist/cmd/cloud/deploy.js.map +1 -0
- package/dist/cmd/cloud/deployment/index.js +20 -0
- package/dist/cmd/cloud/deployment/index.js.map +1 -0
- package/dist/cmd/cloud/deployment/list.js +89 -0
- package/dist/cmd/cloud/deployment/list.js.map +1 -0
- package/dist/cmd/cloud/deployment/remove.js +60 -0
- package/dist/cmd/cloud/deployment/remove.js.map +1 -0
- package/dist/cmd/cloud/deployment/rollback.js +80 -0
- package/dist/cmd/cloud/deployment/rollback.js.map +1 -0
- package/dist/cmd/cloud/deployment/show.js +106 -0
- package/dist/cmd/cloud/deployment/show.js.map +1 -0
- package/dist/cmd/cloud/deployment/undeploy.js +45 -0
- package/dist/cmd/cloud/deployment/undeploy.js.map +1 -0
- package/dist/cmd/cloud/deployment/utils.js +10 -0
- package/dist/cmd/cloud/deployment/utils.js.map +1 -0
- package/dist/cmd/cloud/domain.js +77 -0
- package/dist/cmd/cloud/domain.js.map +1 -0
- package/dist/cmd/cloud/env/delete.js +50 -0
- package/dist/cmd/cloud/env/delete.js.map +1 -0
- package/dist/cmd/cloud/env/get.js +65 -0
- package/dist/cmd/cloud/env/get.js.map +1 -0
- package/dist/cmd/cloud/env/import.js +113 -0
- package/dist/cmd/cloud/env/import.js.map +1 -0
- package/dist/cmd/cloud/env/index.js +24 -0
- package/dist/cmd/cloud/env/index.js.map +1 -0
- package/dist/cmd/cloud/env/list.js +58 -0
- package/dist/cmd/cloud/env/list.js.map +1 -0
- package/dist/cmd/cloud/env/pull.js +81 -0
- package/dist/cmd/cloud/env/pull.js.map +1 -0
- package/dist/cmd/cloud/env/push.js +61 -0
- package/dist/cmd/cloud/env/push.js.map +1 -0
- package/dist/cmd/cloud/env/set.js +73 -0
- package/dist/cmd/cloud/env/set.js.map +1 -0
- package/dist/cmd/cloud/index.js +31 -0
- package/dist/cmd/cloud/index.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/create-namespace.js +41 -0
- package/dist/cmd/cloud/keyvalue/create-namespace.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/delete-namespace.js +64 -0
- package/dist/cmd/cloud/keyvalue/delete-namespace.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/delete.js +47 -0
- package/dist/cmd/cloud/keyvalue/delete.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/get.js +65 -0
- package/dist/cmd/cloud/keyvalue/get.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/index.js +32 -0
- package/dist/cmd/cloud/keyvalue/index.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/keys.js +50 -0
- package/dist/cmd/cloud/keyvalue/keys.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/list-namespaces.js +37 -0
- package/dist/cmd/cloud/keyvalue/list-namespaces.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/repl.js +277 -0
- package/dist/cmd/cloud/keyvalue/repl.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/search.js +72 -0
- package/dist/cmd/cloud/keyvalue/search.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/set.js +59 -0
- package/dist/cmd/cloud/keyvalue/set.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/stats.js +82 -0
- package/dist/cmd/cloud/keyvalue/stats.js.map +1 -0
- package/dist/cmd/cloud/keyvalue/util.js +19 -0
- package/dist/cmd/cloud/keyvalue/util.js.map +1 -0
- package/dist/cmd/cloud/objectstore/delete-bucket.js +66 -0
- package/dist/cmd/cloud/objectstore/delete-bucket.js.map +1 -0
- package/dist/cmd/cloud/objectstore/delete.js +56 -0
- package/dist/cmd/cloud/objectstore/delete.js.map +1 -0
- package/dist/cmd/cloud/objectstore/get.js +64 -0
- package/dist/cmd/cloud/objectstore/get.js.map +1 -0
- package/dist/cmd/cloud/objectstore/index.js +28 -0
- package/dist/cmd/cloud/objectstore/index.js.map +1 -0
- package/dist/cmd/cloud/objectstore/list-buckets.js +37 -0
- package/dist/cmd/cloud/objectstore/list-buckets.js.map +1 -0
- package/dist/cmd/cloud/objectstore/list-keys.js +52 -0
- package/dist/cmd/cloud/objectstore/list-keys.js.map +1 -0
- package/dist/cmd/cloud/objectstore/put.js +57 -0
- package/dist/cmd/cloud/objectstore/put.js.map +1 -0
- package/dist/cmd/cloud/objectstore/repl.js +219 -0
- package/dist/cmd/cloud/objectstore/repl.js.map +1 -0
- package/dist/cmd/cloud/objectstore/url.js +55 -0
- package/dist/cmd/cloud/objectstore/url.js.map +1 -0
- package/dist/cmd/cloud/objectstore/util.js +18 -0
- package/dist/cmd/cloud/objectstore/util.js.map +1 -0
- package/dist/cmd/cloud/resource/add.js +70 -0
- package/dist/cmd/cloud/resource/add.js.map +1 -0
- package/dist/cmd/cloud/resource/delete.js +126 -0
- package/dist/cmd/cloud/resource/delete.js.map +1 -0
- package/dist/cmd/cloud/resource/index.js +12 -0
- package/dist/cmd/cloud/resource/index.js.map +1 -0
- package/dist/cmd/cloud/resource/list.js +89 -0
- package/dist/cmd/cloud/resource/list.js.map +1 -0
- package/dist/cmd/cloud/scp/download.js +72 -0
- package/dist/cmd/cloud/scp/download.js.map +1 -0
- package/dist/cmd/cloud/scp/index.js +10 -0
- package/dist/cmd/cloud/scp/index.js.map +1 -0
- package/dist/cmd/cloud/scp/upload.js +75 -0
- package/dist/cmd/cloud/scp/upload.js.map +1 -0
- package/dist/cmd/cloud/secret/delete.js +50 -0
- package/dist/cmd/cloud/secret/delete.js.map +1 -0
- package/dist/cmd/cloud/secret/get.js +69 -0
- package/dist/cmd/cloud/secret/get.js.map +1 -0
- package/dist/cmd/cloud/secret/import.js +88 -0
- package/dist/cmd/cloud/secret/import.js.map +1 -0
- package/dist/cmd/cloud/secret/index.js +24 -0
- package/dist/cmd/cloud/secret/index.js.map +1 -0
- package/dist/cmd/cloud/secret/list.js +58 -0
- package/dist/cmd/cloud/secret/list.js.map +1 -0
- package/dist/cmd/cloud/secret/pull.js +81 -0
- package/dist/cmd/cloud/secret/pull.js.map +1 -0
- package/dist/cmd/cloud/secret/push.js +61 -0
- package/dist/cmd/cloud/secret/push.js.map +1 -0
- package/dist/cmd/cloud/secret/set.js +57 -0
- package/dist/cmd/cloud/secret/set.js.map +1 -0
- package/dist/cmd/cloud/session/get.d.ts.map +1 -1
- package/dist/cmd/cloud/session/get.js +155 -0
- package/dist/cmd/cloud/session/get.js.map +1 -0
- package/dist/cmd/cloud/session/index.js +11 -0
- package/dist/cmd/cloud/session/index.js.map +1 -0
- package/dist/cmd/cloud/session/list.js +132 -0
- package/dist/cmd/cloud/session/list.js.map +1 -0
- package/dist/cmd/cloud/session/logs.js +56 -0
- package/dist/cmd/cloud/session/logs.js.map +1 -0
- package/dist/cmd/cloud/ssh.js +67 -0
- package/dist/cmd/cloud/ssh.js.map +1 -0
- package/dist/cmd/dev/agents.js +103 -0
- package/dist/cmd/dev/agents.js.map +1 -0
- package/dist/cmd/dev/api.js +26 -0
- package/dist/cmd/dev/api.js.map +1 -0
- package/dist/cmd/dev/download.js +77 -0
- package/dist/cmd/dev/download.js.map +1 -0
- package/dist/cmd/dev/index.js +745 -0
- package/dist/cmd/dev/index.js.map +1 -0
- package/dist/cmd/dev/sync.js +229 -0
- package/dist/cmd/dev/sync.js.map +1 -0
- package/dist/cmd/dev/templates.js +75 -0
- package/dist/cmd/dev/templates.js.map +1 -0
- package/dist/cmd/index.js +49 -0
- package/dist/cmd/index.js.map +1 -0
- package/dist/cmd/profile/create.js +89 -0
- package/dist/cmd/profile/create.js.map +1 -0
- package/dist/cmd/profile/delete.js +63 -0
- package/dist/cmd/profile/delete.js.map +1 -0
- package/dist/cmd/profile/index.js +14 -0
- package/dist/cmd/profile/index.js.map +1 -0
- package/dist/cmd/profile/list.js +28 -0
- package/dist/cmd/profile/list.js.map +1 -0
- package/dist/cmd/profile/show.js +68 -0
- package/dist/cmd/profile/show.js.map +1 -0
- package/dist/cmd/profile/use.js +37 -0
- package/dist/cmd/profile/use.js.map +1 -0
- package/dist/cmd/project/create.js +92 -0
- package/dist/cmd/project/create.js.map +1 -0
- package/dist/cmd/project/delete.js +117 -0
- package/dist/cmd/project/delete.js.map +1 -0
- package/dist/cmd/project/download.js +217 -0
- package/dist/cmd/project/download.js.map +1 -0
- package/dist/cmd/project/index.js +12 -0
- package/dist/cmd/project/index.js.map +1 -0
- package/dist/cmd/project/list.js +51 -0
- package/dist/cmd/project/list.js.map +1 -0
- package/dist/cmd/project/show.js +54 -0
- package/dist/cmd/project/show.js.map +1 -0
- package/dist/cmd/project/template-flow.js +315 -0
- package/dist/cmd/project/template-flow.js.map +1 -0
- package/dist/cmd/project/templates.js +31 -0
- package/dist/cmd/project/templates.js.map +1 -0
- package/dist/cmd/repl/index.js +444 -0
- package/dist/cmd/repl/index.js.map +1 -0
- package/dist/cmd/version/index.js +29 -0
- package/dist/cmd/version/index.js.map +1 -0
- package/dist/command-prefix.js +37 -0
- package/dist/command-prefix.js.map +1 -0
- package/dist/config.js +536 -0
- package/dist/config.js.map +1 -0
- package/dist/crypto/box.js +382 -0
- package/dist/crypto/box.js.map +1 -0
- package/dist/crypto/box.test.js +317 -0
- package/dist/crypto/box.test.js.map +1 -0
- package/dist/download.js +64 -0
- package/dist/download.js.map +1 -0
- package/dist/env-util.js +219 -0
- package/dist/env-util.js.map +1 -0
- package/dist/env-util.test.js +146 -0
- package/dist/env-util.test.js.map +1 -0
- package/dist/errors.js +177 -0
- package/dist/errors.js.map +1 -0
- package/dist/explain.js +90 -0
- package/dist/explain.js.map +1 -0
- package/dist/index.js +23 -0
- package/dist/index.js.map +1 -0
- package/dist/json.js +29 -0
- package/dist/json.js.map +1 -0
- package/dist/legacy-check.js +104 -0
- package/dist/legacy-check.js.map +1 -0
- package/dist/output.js +207 -0
- package/dist/output.js.map +1 -0
- package/dist/repl.js +1176 -0
- package/dist/repl.js.map +1 -0
- package/dist/runtime.js +19 -0
- package/dist/runtime.js.map +1 -0
- package/dist/schema-generator.js +289 -0
- package/dist/schema-generator.js.map +1 -0
- package/dist/schema-parser.js +145 -0
- package/dist/schema-parser.js.map +1 -0
- package/dist/sound.js +44 -0
- package/dist/sound.js.map +1 -0
- package/dist/steps.js +293 -0
- package/dist/steps.js.map +1 -0
- package/dist/terminal.js +130 -0
- package/dist/terminal.js.map +1 -0
- package/dist/tui.js +1124 -0
- package/dist/tui.js.map +1 -0
- package/dist/types.js +163 -0
- package/dist/types.js.map +1 -0
- package/dist/utils/detectSubagent.js +25 -0
- package/dist/utils/detectSubagent.js.map +1 -0
- package/dist/utils/format.js +21 -0
- package/dist/utils/format.js.map +1 -0
- package/dist/utils/zip.js +33 -0
- package/dist/utils/zip.js.map +1 -0
- package/dist/version.js +24 -0
- package/dist/version.js.map +1 -0
- package/package.json +6 -6
- package/src/banner.ts +1 -1
- package/src/cmd/build/index.ts +15 -21
- package/src/cmd/build/plugin.ts +2 -1
- package/src/cmd/cloud/session/get.ts +20 -14
- package/src/cmd/cloud/session/list.ts +1 -1
|
@@ -0,0 +1,304 @@
|
|
|
1
|
+
import { $ } from 'bun';
|
|
2
|
+
import { join, relative, resolve, dirname } from 'node:path';
|
|
3
|
+
import { cpSync, existsSync, mkdirSync, rmSync } from 'node:fs';
|
|
4
|
+
import gitParseUrl from 'git-url-parse';
|
|
5
|
+
import AgentuityBundler, { getBuildMetadata } from './plugin';
|
|
6
|
+
import { getFilesRecursively } from './file';
|
|
7
|
+
import { getVersion } from '../../version';
|
|
8
|
+
import { fixDuplicateExportsInDirectory } from './fix-duplicate-exports';
|
|
9
|
+
export async function bundle({ orgId, projectId, deploymentId, dev = false, rootDir, project, }) {
|
|
10
|
+
const appFile = join(rootDir, 'app.ts');
|
|
11
|
+
if (!existsSync(appFile)) {
|
|
12
|
+
throw new Error(`App file not found at expected location: ${appFile}`);
|
|
13
|
+
}
|
|
14
|
+
const outDir = join(rootDir, '.agentuity');
|
|
15
|
+
const srcDir = join(rootDir, 'src');
|
|
16
|
+
const appEntrypoints = [];
|
|
17
|
+
for (const folder of ['apis', 'agents']) {
|
|
18
|
+
const dir = join(srcDir, folder);
|
|
19
|
+
if (!existsSync(dir)) {
|
|
20
|
+
if (folder === 'agents') {
|
|
21
|
+
throw new Error(`Expected directory not found: ${dir}`);
|
|
22
|
+
}
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
const files = await getFilesRecursively(dir);
|
|
26
|
+
for (const filename of files) {
|
|
27
|
+
if (/\.[jt]s?$/.test(filename)) {
|
|
28
|
+
appEntrypoints.push(filename);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
appEntrypoints.push(appFile);
|
|
33
|
+
if (existsSync(outDir)) {
|
|
34
|
+
rmSync(outDir, { recursive: true, force: true });
|
|
35
|
+
}
|
|
36
|
+
// Ensure output directory and subdirectories exist before building
|
|
37
|
+
mkdirSync(outDir, { recursive: true });
|
|
38
|
+
mkdirSync(join(outDir, 'chunk'), { recursive: true });
|
|
39
|
+
mkdirSync(join(outDir, 'asset'), { recursive: true });
|
|
40
|
+
const pkgFile = Bun.file(join(rootDir, 'package.json'));
|
|
41
|
+
const pkgContents = JSON.parse(await pkgFile.text());
|
|
42
|
+
const isProd = !dev;
|
|
43
|
+
const define = {
|
|
44
|
+
'process.env.AGENTUITY_CLOUD_SDK_VERSION': JSON.stringify(getVersion() ?? '1.0.0'),
|
|
45
|
+
'process.env.NODE_ENV': JSON.stringify(isProd ? 'production' : 'development'),
|
|
46
|
+
};
|
|
47
|
+
if (orgId) {
|
|
48
|
+
define['process.env.AGENTUITY_CLOUD_ORG_ID'] = JSON.stringify(orgId);
|
|
49
|
+
}
|
|
50
|
+
if (projectId) {
|
|
51
|
+
define['process.env.AGENTUITY_CLOUD_PROJECT_ID'] = JSON.stringify(projectId);
|
|
52
|
+
}
|
|
53
|
+
if (deploymentId) {
|
|
54
|
+
define['process.env.AGENTUITY_CLOUD_DEPLOYMENT_ID'] = JSON.stringify(deploymentId);
|
|
55
|
+
}
|
|
56
|
+
await (async () => {
|
|
57
|
+
const config = {
|
|
58
|
+
entrypoints: appEntrypoints,
|
|
59
|
+
root: rootDir,
|
|
60
|
+
outdir: outDir,
|
|
61
|
+
define,
|
|
62
|
+
sourcemap: dev ? 'inline' : 'external',
|
|
63
|
+
env: 'disable',
|
|
64
|
+
plugins: [AgentuityBundler],
|
|
65
|
+
target: 'bun',
|
|
66
|
+
format: 'esm',
|
|
67
|
+
banner: `// Generated file. DO NOT EDIT`,
|
|
68
|
+
// Disable minify for server bundle (keep code readable for debugging)
|
|
69
|
+
// Enable splitting to reduce bundle size by extracting common code
|
|
70
|
+
minify: false,
|
|
71
|
+
drop: isProd ? ['debugger'] : undefined,
|
|
72
|
+
splitting: true,
|
|
73
|
+
conditions: [isProd ? 'production' : 'development', 'bun'],
|
|
74
|
+
naming: {
|
|
75
|
+
entry: '[dir]/[name].[ext]',
|
|
76
|
+
chunk: 'chunk/[name]-[hash].[ext]',
|
|
77
|
+
asset: 'asset/[name]-[hash].[ext]',
|
|
78
|
+
},
|
|
79
|
+
};
|
|
80
|
+
try {
|
|
81
|
+
await Bun.build(config);
|
|
82
|
+
// Fix duplicate exports caused by Bun splitting bug
|
|
83
|
+
// See: https://github.com/oven-sh/bun/issues/5344
|
|
84
|
+
await fixDuplicateExportsInDirectory(outDir, false);
|
|
85
|
+
}
|
|
86
|
+
catch (ex) {
|
|
87
|
+
console.error(ex);
|
|
88
|
+
process.exit(1);
|
|
89
|
+
}
|
|
90
|
+
})();
|
|
91
|
+
const buildmetadata = getBuildMetadata();
|
|
92
|
+
buildmetadata.assets = [];
|
|
93
|
+
buildmetadata.project = {
|
|
94
|
+
id: projectId ?? '',
|
|
95
|
+
name: pkgContents.name,
|
|
96
|
+
version: pkgContents.version,
|
|
97
|
+
orgId: orgId ?? '',
|
|
98
|
+
};
|
|
99
|
+
buildmetadata.deployment = {
|
|
100
|
+
...(project?.deployment ?? {}),
|
|
101
|
+
build: {
|
|
102
|
+
bun: Bun.version,
|
|
103
|
+
agentuity: '',
|
|
104
|
+
arch: process.arch,
|
|
105
|
+
platform: process.platform,
|
|
106
|
+
},
|
|
107
|
+
date: new Date().toUTCString(),
|
|
108
|
+
id: deploymentId ?? '',
|
|
109
|
+
};
|
|
110
|
+
if (!dev) {
|
|
111
|
+
// try local first
|
|
112
|
+
const agNMPackage = join(rootDir, 'node_modules', '@agentuity', 'cli', 'package.json');
|
|
113
|
+
if (existsSync(agNMPackage)) {
|
|
114
|
+
try {
|
|
115
|
+
const npmpkg = await Bun.file(agNMPackage).json();
|
|
116
|
+
if (npmpkg.version) {
|
|
117
|
+
buildmetadata.deployment.build.agentuity = npmpkg.version;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
// Ignore malformed package.json
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
try {
|
|
126
|
+
// now try the global
|
|
127
|
+
const r = $ `bunx @agentuity/cli version`.quiet().nothrow();
|
|
128
|
+
if (r) {
|
|
129
|
+
const version = await r.text();
|
|
130
|
+
if (version) {
|
|
131
|
+
buildmetadata.deployment.build.agentuity = version.trim();
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
catch {
|
|
136
|
+
// ignore error from bunx
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
// web folder is optional
|
|
141
|
+
const webDir = join(srcDir, 'web');
|
|
142
|
+
if (existsSync(webDir)) {
|
|
143
|
+
await (async () => {
|
|
144
|
+
// Find workspace root for monorepo support
|
|
145
|
+
let workspaceRoot = rootDir;
|
|
146
|
+
let currentDir = rootDir;
|
|
147
|
+
while (true) {
|
|
148
|
+
const pkgPath = join(currentDir, 'package.json');
|
|
149
|
+
if (existsSync(pkgPath)) {
|
|
150
|
+
const pkg = JSON.parse(await Bun.file(pkgPath).text());
|
|
151
|
+
if (pkg.workspaces) {
|
|
152
|
+
workspaceRoot = currentDir;
|
|
153
|
+
break;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
const parent = resolve(currentDir, '..');
|
|
157
|
+
if (parent === currentDir)
|
|
158
|
+
break; // reached filesystem root
|
|
159
|
+
currentDir = parent;
|
|
160
|
+
}
|
|
161
|
+
// Make webEntrypoints - just the HTML files themselves
|
|
162
|
+
const webEntrypoints = [...new Bun.Glob('**.html').scanSync(webDir)].map((htmlFile) => resolve(webDir, htmlFile));
|
|
163
|
+
if (webEntrypoints.length) {
|
|
164
|
+
const config = {
|
|
165
|
+
entrypoints: webEntrypoints,
|
|
166
|
+
root: webDir,
|
|
167
|
+
outdir: join(outDir, 'web'),
|
|
168
|
+
define,
|
|
169
|
+
sourcemap: dev ? 'inline' : 'linked',
|
|
170
|
+
env: 'AGENTUITY_PUBLIC_*',
|
|
171
|
+
plugins: [AgentuityBundler],
|
|
172
|
+
target: 'browser',
|
|
173
|
+
format: 'esm',
|
|
174
|
+
banner: `// Generated file. DO NOT EDIT`,
|
|
175
|
+
minify: true,
|
|
176
|
+
drop: isProd ? ['debugger'] : undefined,
|
|
177
|
+
splitting: true,
|
|
178
|
+
packages: 'bundle',
|
|
179
|
+
external: workspaceRoot !== rootDir ? [] : undefined,
|
|
180
|
+
publicPath: isProd && deploymentId
|
|
181
|
+
? `https://static.agentuity.com/${deploymentId}/`
|
|
182
|
+
: undefined,
|
|
183
|
+
naming: {
|
|
184
|
+
entry: '[dir]/[name].[ext]',
|
|
185
|
+
chunk: 'web/chunk/[name]-[hash].[ext]',
|
|
186
|
+
asset: 'web/asset/[name]-[hash].[ext]',
|
|
187
|
+
},
|
|
188
|
+
};
|
|
189
|
+
try {
|
|
190
|
+
const result = await Bun.build(config);
|
|
191
|
+
if (result.success) {
|
|
192
|
+
// Fix duplicate exports caused by Bun splitting bug
|
|
193
|
+
// See: https://github.com/oven-sh/bun/issues/5344
|
|
194
|
+
await fixDuplicateExportsInDirectory(join(outDir, 'web'), false);
|
|
195
|
+
if (!dev && buildmetadata?.assets) {
|
|
196
|
+
const assets = buildmetadata.assets;
|
|
197
|
+
result.outputs
|
|
198
|
+
// Filter for deployable assets: sourcemaps (hash '00000000') and content-addressed files
|
|
199
|
+
.filter((x) => x.hash === '00000000' || (x.hash && x.path.includes(x.hash)))
|
|
200
|
+
.forEach((artifact) => {
|
|
201
|
+
const r = relative(join(outDir, 'web'), artifact.path);
|
|
202
|
+
assets.push({
|
|
203
|
+
filename: r,
|
|
204
|
+
kind: artifact.kind,
|
|
205
|
+
contentType: artifact.type,
|
|
206
|
+
size: artifact.size,
|
|
207
|
+
});
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
console.error(result.logs.join('\n'));
|
|
213
|
+
process.exit(1);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
catch (ex) {
|
|
217
|
+
console.error(ex);
|
|
218
|
+
process.exit(1);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
})();
|
|
222
|
+
if (!dev && buildmetadata) {
|
|
223
|
+
const webPublicDir = join(webDir, 'public');
|
|
224
|
+
if (existsSync(webPublicDir)) {
|
|
225
|
+
const assets = buildmetadata.assets;
|
|
226
|
+
const webOutPublicDir = join(outDir, 'web', 'public');
|
|
227
|
+
cpSync(webPublicDir, webOutPublicDir, { recursive: true });
|
|
228
|
+
[...new Bun.Glob('**.*').scanSync(webOutPublicDir)].forEach((f) => {
|
|
229
|
+
const bf = Bun.file(join(webOutPublicDir, f));
|
|
230
|
+
assets.push({
|
|
231
|
+
filename: join('public', f),
|
|
232
|
+
kind: 'static',
|
|
233
|
+
contentType: bf.type,
|
|
234
|
+
size: bf.size,
|
|
235
|
+
});
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
if (!dev && Bun.which('git') && buildmetadata?.deployment) {
|
|
241
|
+
buildmetadata.deployment.git = {
|
|
242
|
+
commit: process.env.GIT_SHA || process.env.GITHUB_SHA,
|
|
243
|
+
branch: process.env.GITHUB_REF ? process.env.GITHUB_REF.replace('refs/heads/', '') : '',
|
|
244
|
+
repo: process.env.GITHUB_REPOSITORY
|
|
245
|
+
? gitParseUrl(process.env.GITHUB_REPOSITORY).toString('https')
|
|
246
|
+
: '',
|
|
247
|
+
};
|
|
248
|
+
// pull out the git information if we have it
|
|
249
|
+
try {
|
|
250
|
+
let gitDir = join(rootDir, '.git');
|
|
251
|
+
let parentDir = dirname(dirname(gitDir));
|
|
252
|
+
while (!existsSync(gitDir) && parentDir !== dirname(parentDir) && gitDir !== '/') {
|
|
253
|
+
gitDir = join(parentDir, '.git');
|
|
254
|
+
parentDir = dirname(parentDir);
|
|
255
|
+
}
|
|
256
|
+
if (existsSync(gitDir)) {
|
|
257
|
+
const tag = $ `git tag -l --points-at HEAD`.nothrow().quiet();
|
|
258
|
+
if (tag) {
|
|
259
|
+
const tags = await tag.text();
|
|
260
|
+
buildmetadata.deployment.git.tags = tags
|
|
261
|
+
.trim()
|
|
262
|
+
.split(/\n/)
|
|
263
|
+
.map((s) => s.trim())
|
|
264
|
+
.filter(Boolean);
|
|
265
|
+
}
|
|
266
|
+
const branch = $ `git branch --show-current`.nothrow().quiet();
|
|
267
|
+
if (branch) {
|
|
268
|
+
const _branch = await branch.text();
|
|
269
|
+
if (_branch) {
|
|
270
|
+
buildmetadata.deployment.git.branch = _branch.trim();
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
const commit = $ `git rev-parse HEAD`.nothrow().quiet();
|
|
274
|
+
if (commit) {
|
|
275
|
+
const sha = await commit.text();
|
|
276
|
+
if (sha) {
|
|
277
|
+
buildmetadata.deployment.git.commit = sha.trim();
|
|
278
|
+
const msg = $ `git log --pretty=format:%s -n1 ${buildmetadata.deployment.git.commit}`;
|
|
279
|
+
if (msg) {
|
|
280
|
+
const _msg = await msg.text();
|
|
281
|
+
if (_msg) {
|
|
282
|
+
buildmetadata.deployment.git.message = _msg.trim();
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
const origin = $ `git config --get remote.origin.url`.nothrow().quiet();
|
|
286
|
+
if (origin) {
|
|
287
|
+
const _origin = await origin.text();
|
|
288
|
+
if (_origin) {
|
|
289
|
+
const _url = gitParseUrl(_origin.trim());
|
|
290
|
+
buildmetadata.deployment.git.repo = _url.toString('https');
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
catch {
|
|
298
|
+
// ignore errors
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
await Bun.write(`${outDir}/package.json`, JSON.stringify({ name: pkgContents.name, version: pkgContents.version }, null, 2));
|
|
302
|
+
await Bun.write(`${outDir}/agentuity.metadata.json`, dev ? JSON.stringify(buildmetadata, null, 2) : JSON.stringify(buildmetadata));
|
|
303
|
+
}
|
|
304
|
+
//# sourceMappingURL=bundler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../src/cmd/build/bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
|
+
export async function getFilesRecursively(dir) {
|
|
3
|
+
const glob = new Bun.Glob('**/*');
|
|
4
|
+
const files = [];
|
|
5
|
+
for await (const file of glob.scan({ cwd: dir, onlyFiles: true, absolute: false })) {
|
|
6
|
+
files.push(resolve(dir, file));
|
|
7
|
+
}
|
|
8
|
+
return files;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/cmd/build/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW;IACpD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QACpF,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
export async function fixDuplicateExportsInDirectory(dir, verbose = false) {
|
|
3
|
+
if (verbose) {
|
|
4
|
+
console.log(`Scanning for .js files in: ${dir}`);
|
|
5
|
+
}
|
|
6
|
+
const jsFiles = await getAllJsFiles(dir);
|
|
7
|
+
if (verbose) {
|
|
8
|
+
console.log(`Found ${jsFiles.length} .js files`);
|
|
9
|
+
}
|
|
10
|
+
if (jsFiles.length === 0) {
|
|
11
|
+
if (verbose) {
|
|
12
|
+
console.log('No .js files found');
|
|
13
|
+
}
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
// Process all files in parallel
|
|
17
|
+
const results = await Promise.all(jsFiles.map(async (filePath) => {
|
|
18
|
+
try {
|
|
19
|
+
const wasFixed = await fixDuplicateExportsInFile(filePath, verbose);
|
|
20
|
+
return { filePath, wasFixed, error: null };
|
|
21
|
+
}
|
|
22
|
+
catch (error) {
|
|
23
|
+
return { filePath, wasFixed: false, error };
|
|
24
|
+
}
|
|
25
|
+
}));
|
|
26
|
+
// Report results
|
|
27
|
+
const fixed = results.filter((r) => r.wasFixed);
|
|
28
|
+
const errors = results.filter((r) => r.error);
|
|
29
|
+
if (verbose) {
|
|
30
|
+
console.log(`\nResults:`);
|
|
31
|
+
console.log(`- Total files: ${jsFiles.length}`);
|
|
32
|
+
console.log(`- Files fixed: ${fixed.length}`);
|
|
33
|
+
console.log(`- Errors: ${errors.length}`);
|
|
34
|
+
if (fixed.length > 0) {
|
|
35
|
+
console.log('\nFixed files:');
|
|
36
|
+
fixed.forEach(({ filePath }) => {
|
|
37
|
+
console.log(` - ${filePath}`);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
if (errors.length > 0) {
|
|
41
|
+
console.log('\nErrors:');
|
|
42
|
+
errors.forEach(({ filePath, error }) => {
|
|
43
|
+
console.log(` - ${filePath}: ${error}`);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
async function fixDuplicateExportsInFile(filePath, verbose = false) {
|
|
49
|
+
const originalCode = await Bun.file(filePath).text();
|
|
50
|
+
// Only fix __INVALID__REF__ - remove it from imports and exports
|
|
51
|
+
let code = originalCode;
|
|
52
|
+
// Pattern 1: __INVALID__REF__ at start with comma after: "__INVALID__REF__, foo" -> "foo"
|
|
53
|
+
code = code.replace(/\b__INVALID__REF__\s*,\s*/g, '');
|
|
54
|
+
// Pattern 2: __INVALID__REF__ at end with comma before: "foo, __INVALID__REF__" -> "foo"
|
|
55
|
+
code = code.replace(/,\s*__INVALID__REF__\b/g, '');
|
|
56
|
+
// Pattern 3: __INVALID__REF__ alone (shouldn't happen but handle it)
|
|
57
|
+
code = code.replace(/\b__INVALID__REF__\b/g, '');
|
|
58
|
+
// Remove duplicate export statements
|
|
59
|
+
// Find all export { ... } statements (allow leading whitespace)
|
|
60
|
+
const exportPattern = /^\s*export\s*\{([^}]+)\}\s*;?\s*$/gm;
|
|
61
|
+
const exports = [];
|
|
62
|
+
let match;
|
|
63
|
+
while ((match = exportPattern.exec(code)) !== null) {
|
|
64
|
+
const nameToSyntax = new Map();
|
|
65
|
+
const names = [];
|
|
66
|
+
match[1].split(',').forEach((n) => {
|
|
67
|
+
const fullSyntax = n.trim();
|
|
68
|
+
const parts = fullSyntax.split(/\s+as\s+/);
|
|
69
|
+
const exportedName = parts.length > 1 ? parts[1].trim() : parts[0].trim();
|
|
70
|
+
if (exportedName) {
|
|
71
|
+
names.push(exportedName);
|
|
72
|
+
nameToSyntax.set(exportedName, fullSyntax);
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
exports.push({
|
|
76
|
+
match: match[0],
|
|
77
|
+
names: new Set(names),
|
|
78
|
+
nameToSyntax,
|
|
79
|
+
start: match.index,
|
|
80
|
+
end: match.index + match[0].length,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
// Track which names we've seen and which export statements to remove/modify
|
|
84
|
+
const seenNames = new Set();
|
|
85
|
+
const indicesToRemove = [];
|
|
86
|
+
const modificationsNeeded = new Map(); // index -> names to keep
|
|
87
|
+
for (let i = 0; i < exports.length; i++) {
|
|
88
|
+
const exp = exports[i];
|
|
89
|
+
const duplicateNames = [...exp.names].filter((name) => seenNames.has(name));
|
|
90
|
+
const newNames = [...exp.names].filter((name) => !seenNames.has(name));
|
|
91
|
+
const allDuplicates = duplicateNames.length === exp.names.size;
|
|
92
|
+
if (verbose && duplicateNames.length > 0) {
|
|
93
|
+
console.log(` Duplicate exports found in statement ${i}: ${duplicateNames.join(', ')}`);
|
|
94
|
+
}
|
|
95
|
+
if (allDuplicates && exp.names.size > 0) {
|
|
96
|
+
// This entire export statement is a duplicate - remove it
|
|
97
|
+
indicesToRemove.push(i);
|
|
98
|
+
if (verbose) {
|
|
99
|
+
console.log(` -> Will remove entire statement`);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
else if (duplicateNames.length > 0) {
|
|
103
|
+
// Partial duplicates - need to remove just the duplicate names
|
|
104
|
+
modificationsNeeded.set(i, new Set(newNames));
|
|
105
|
+
if (verbose) {
|
|
106
|
+
console.log(` -> Will keep only: ${newNames.join(', ')}`);
|
|
107
|
+
}
|
|
108
|
+
// Mark the new names as seen
|
|
109
|
+
newNames.forEach((name) => seenNames.add(name));
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
// No duplicates - mark these names as seen
|
|
113
|
+
exp.names.forEach((name) => seenNames.add(name));
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
// Build patches for modifications and removals, then apply from end to preserve indices
|
|
117
|
+
const patches = [];
|
|
118
|
+
// Partial duplicates: replace the export statement with only the kept names
|
|
119
|
+
for (const [i, namesToKeep] of modificationsNeeded.entries()) {
|
|
120
|
+
const exp = exports[i];
|
|
121
|
+
const syntaxToKeep = [...namesToKeep].map((name) => exp.nameToSyntax.get(name));
|
|
122
|
+
const newExport = `export { ${syntaxToKeep.join(', ')} };`;
|
|
123
|
+
patches.push({ start: exp.start, end: exp.end, replacement: newExport });
|
|
124
|
+
}
|
|
125
|
+
// Full duplicates: remove the entire export statement
|
|
126
|
+
for (const idx of indicesToRemove) {
|
|
127
|
+
const exp = exports[idx];
|
|
128
|
+
patches.push({ start: exp.start, end: exp.end, replacement: '' });
|
|
129
|
+
}
|
|
130
|
+
// Apply all patches from right to left so earlier indices remain valid
|
|
131
|
+
patches.sort((a, b) => b.start - a.start);
|
|
132
|
+
for (const { start, end, replacement } of patches) {
|
|
133
|
+
code = code.slice(0, start) + replacement + code.slice(end);
|
|
134
|
+
}
|
|
135
|
+
// Nothing changed
|
|
136
|
+
if (code === originalCode) {
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
// Write the fixed content back to the file
|
|
140
|
+
await Bun.write(filePath, code);
|
|
141
|
+
if (verbose) {
|
|
142
|
+
console.log(`\nš§ Fixed exports in: ${filePath}`);
|
|
143
|
+
}
|
|
144
|
+
return true;
|
|
145
|
+
}
|
|
146
|
+
async function getAllJsFiles(dir) {
|
|
147
|
+
const glob = new Bun.Glob('**/*.js');
|
|
148
|
+
const files = await Array.fromAsync(glob.scan({ cwd: dir }));
|
|
149
|
+
return files.map((file) => path.join(dir, file));
|
|
150
|
+
}
|
|
151
|
+
async function main() {
|
|
152
|
+
const dir = process.argv[2];
|
|
153
|
+
if (!dir) {
|
|
154
|
+
console.error('Usage: bun fix-duplicate-exports.ts <directory>');
|
|
155
|
+
process.exit(1);
|
|
156
|
+
}
|
|
157
|
+
const { existsSync } = await import('node:fs');
|
|
158
|
+
if (!existsSync(dir)) {
|
|
159
|
+
console.error(`Error: Directory does not exist: ${dir}`);
|
|
160
|
+
process.exit(1);
|
|
161
|
+
}
|
|
162
|
+
await fixDuplicateExportsInDirectory(dir, true);
|
|
163
|
+
}
|
|
164
|
+
if (import.meta.main) {
|
|
165
|
+
await main();
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=fix-duplicate-exports.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-duplicate-exports.js","sourceRoot":"","sources":["../../../src/cmd/build/fix-duplicate-exports.ts"],"names":[],"mappings":"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"}
|