@agentuity/cli 0.1.38 → 0.1.40
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/bin/cli.ts +11 -9
- package/dist/cmd/build/vite/registry-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/registry-generator.js +24 -3
- package/dist/cmd/build/vite/registry-generator.js.map +1 -1
- package/dist/cmd/cloud/queue/publish.d.ts.map +1 -1
- package/dist/cmd/cloud/queue/publish.js +6 -1
- package/dist/cmd/cloud/queue/publish.js.map +1 -1
- package/dist/cmd/cloud/queue/util.d.ts +2 -1
- package/dist/cmd/cloud/queue/util.d.ts.map +1 -1
- package/dist/cmd/cloud/queue/util.js +3 -2
- package/dist/cmd/cloud/queue/util.js.map +1 -1
- package/dist/cmd/dev/templates.d.ts.map +1 -1
- package/dist/cmd/dev/templates.js +1 -4
- package/dist/cmd/dev/templates.js.map +1 -1
- package/dist/utils/deps.d.ts +51 -0
- package/dist/utils/deps.d.ts.map +1 -1
- package/dist/utils/deps.js +124 -1
- package/dist/utils/deps.js.map +1 -1
- package/package.json +6 -6
- package/src/cmd/build/vite/registry-generator.ts +24 -3
- package/src/cmd/cloud/queue/publish.ts +7 -1
- package/src/cmd/cloud/queue/util.ts +3 -2
- package/src/cmd/dev/templates.ts +1 -5
- package/src/utils/deps.ts +164 -1
- package/dist/legacy-check.d.ts +0 -6
- package/dist/legacy-check.d.ts.map +0 -1
- package/dist/legacy-check.js +0 -112
- package/dist/legacy-check.js.map +0 -1
- package/src/legacy-check.ts +0 -137
package/bin/cli.ts
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env bun
|
|
2
|
+
|
|
3
|
+
// Fast-path for version command - check before loading heavy modules
|
|
4
|
+
const versionArgs = process.argv.slice(2);
|
|
5
|
+
if (versionArgs.length === 1 && ['version', '-v', '--version', '-V'].includes(versionArgs[0])) {
|
|
6
|
+
const { getVersion } = await import('../src/version');
|
|
7
|
+
console.log(getVersion());
|
|
8
|
+
process.exit(0);
|
|
9
|
+
}
|
|
10
|
+
|
|
2
11
|
import { ConsoleLogger } from '@agentuity/server';
|
|
3
12
|
import { isStructuredError } from '@agentuity/core';
|
|
4
13
|
import { createCLI, registerCommands } from '../src/cli';
|
|
@@ -8,7 +17,7 @@ import { discoverCommands } from '../src/cmd';
|
|
|
8
17
|
import { detectColorScheme } from '../src/terminal';
|
|
9
18
|
import { setColorScheme } from '../src/tui';
|
|
10
19
|
import { getVersion, getPackageName } from '../src/version';
|
|
11
|
-
|
|
20
|
+
|
|
12
21
|
import type { CommandContext, LogLevel } from '../src/types';
|
|
13
22
|
import { generateCLISchema } from '../src/schema-generator';
|
|
14
23
|
import { setOutputOptions } from '../src/output';
|
|
@@ -123,14 +132,7 @@ if (
|
|
|
123
132
|
exit(0);
|
|
124
133
|
}
|
|
125
134
|
|
|
126
|
-
|
|
127
|
-
// Env var is preferred for programmatic use (e.g., test runners) since Commander.js
|
|
128
|
-
// would fail on unknown CLI flags
|
|
129
|
-
const skipLegacyCheck =
|
|
130
|
-
process.argv.includes('--skip-legacy-check') || process.env.AGENTUITY_SKIP_LEGACY_CHECK === '1';
|
|
131
|
-
if (!skipLegacyCheck) {
|
|
132
|
-
await checkLegacyCLI();
|
|
133
|
-
}
|
|
135
|
+
|
|
134
136
|
|
|
135
137
|
const version = getVersion();
|
|
136
138
|
const program = await createCLI(version);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry-generator.d.ts","sourceRoot":"","sources":["../../../../src/cmd/build/vite/registry-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAiFnD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CA+OnF;AAgPD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EAAE,EACnB,MAAM,GAAE,aAAa,EAAO,GAC1B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"registry-generator.d.ts","sourceRoot":"","sources":["../../../../src/cmd/build/vite/registry-generator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAiFnD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CA+OnF;AAgPD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EAAE,EACnB,MAAM,GAAE,aAAa,EAAO,GAC1B,OAAO,CAAC,IAAI,CAAC,CA+mBf"}
|
|
@@ -618,9 +618,30 @@ export async function generateRouteRegistry(srcDir, routes, agents = []) {
|
|
|
618
618
|
const withoutSrc = normalized.startsWith('src/') ? normalized.substring(4) : normalized;
|
|
619
619
|
// Make it relative from src/generated/
|
|
620
620
|
resolvedPath = `../${withoutSrc}`;
|
|
621
|
-
//
|
|
622
|
-
|
|
623
|
-
|
|
621
|
+
// Check if this is a directory import (no file extension) vs a file import
|
|
622
|
+
// Directory imports like '../agent/translate' should resolve to '../agent/translate/index.js'
|
|
623
|
+
// File imports like '../agent/translate/agent' should resolve to '../agent/translate/agent.js'
|
|
624
|
+
const hasExtension = /\.(ts|tsx|js|jsx|mjs|cjs)$/.test(resolvedPath);
|
|
625
|
+
if (!hasExtension) {
|
|
626
|
+
// No extension - check if it's a directory or a file
|
|
627
|
+
// Try to resolve the actual path on disk to determine
|
|
628
|
+
const absolutePath = join(srcDir, withoutSrc);
|
|
629
|
+
const isDirectory = existsSync(absolutePath) ||
|
|
630
|
+
existsSync(join(absolutePath, 'index.ts')) ||
|
|
631
|
+
existsSync(join(absolutePath, 'index.tsx'));
|
|
632
|
+
const isFile = existsSync(`${absolutePath}.ts`) || existsSync(`${absolutePath}.tsx`);
|
|
633
|
+
if (isDirectory && !isFile) {
|
|
634
|
+
// It's a directory import, add /index.js
|
|
635
|
+
resolvedPath = `${resolvedPath}/index.js`;
|
|
636
|
+
}
|
|
637
|
+
else {
|
|
638
|
+
// It's a file import (or we can't determine), add .js
|
|
639
|
+
resolvedPath = `${resolvedPath}.js`;
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
else {
|
|
643
|
+
// Has extension - replace with .js
|
|
644
|
+
resolvedPath = resolvedPath.replace(/\.tsx?$/, '.js');
|
|
624
645
|
}
|
|
625
646
|
}
|
|
626
647
|
const uniqueImportName = route.agentVariable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry-generator.js","sourceRoot":"","sources":["../../../../src/cmd/build/vite/registry-generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry-generator.js","sourceRoot":"","sources":["../../../../src/cmd/build/vite/registry-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/publish.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/publish.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,iBAAiB,sCAmF5B,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
|
|
@@ -35,6 +35,7 @@ export const publishSubcommand = createCommand({
|
|
|
35
35
|
partitionKey: z.string().optional().describe('Partition key for ordering'),
|
|
36
36
|
idempotencyKey: z.string().optional().describe('Idempotency key to prevent duplicates'),
|
|
37
37
|
ttl: z.coerce.number().optional().describe('Message TTL in seconds'),
|
|
38
|
+
sync: z.boolean().optional().describe('Publish synchronously (wait for persistence)'),
|
|
38
39
|
}),
|
|
39
40
|
response: MessageSchema,
|
|
40
41
|
},
|
|
@@ -57,13 +58,17 @@ export const publishSubcommand = createCommand({
|
|
|
57
58
|
tui.fatal('Invalid metadata JSON', ErrorCode.INVALID_ARGUMENT);
|
|
58
59
|
}
|
|
59
60
|
}
|
|
61
|
+
const apiOptions = getQueueApiOptions(ctx) ?? {};
|
|
62
|
+
if (opts.sync) {
|
|
63
|
+
apiOptions.sync = true;
|
|
64
|
+
}
|
|
60
65
|
const message = await publishMessage(client, args.queue_name, {
|
|
61
66
|
payload,
|
|
62
67
|
metadata,
|
|
63
68
|
partition_key: opts.partitionKey,
|
|
64
69
|
idempotency_key: opts.idempotencyKey,
|
|
65
70
|
ttl_seconds: opts.ttl,
|
|
66
|
-
},
|
|
71
|
+
}, apiOptions);
|
|
67
72
|
if (!options.json) {
|
|
68
73
|
tui.success(`Published message: ${message.id}`);
|
|
69
74
|
console.log(` Offset: ${message.offset}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAAC;IAC9C,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,8BAA8B;IAC3C,IAAI,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,eAAe,CAAC;IACvD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACxB,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,UAAU,CAAC,qDAAqD,CAAC;YAC1E,WAAW,EAAE,wBAAwB;SACrC;QACD;YACC,OAAO,EAAE,UAAU,CAClB,wFAAwF,CACxF;YACD,WAAW,EAAE,uBAAuB;SACpC;QACD;YACC,OAAO,EAAE,UAAU,CAAC,iDAAiD,CAAC;YACtE,WAAW,EAAE,qBAAqB;SAClC;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;YACpD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAwB,CAAC;SAC7D,CAAC;QACF,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;YACpE,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;YAC1E,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;YACvF,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,8 @@ export interface QueueContext {
|
|
|
20
20
|
export declare function createQueueAPIClient(ctx: QueueContext): Promise<APIClient>;
|
|
21
21
|
/**
|
|
22
22
|
* Creates QueueApiOptions from the CLI context.
|
|
23
|
-
* Prioritizes explicit orgId on context, then falls back to global --org-id option
|
|
23
|
+
* Prioritizes explicit orgId on context, then falls back to global --org-id option,
|
|
24
|
+
* and finally to the preferred org from the profile configuration.
|
|
24
25
|
*/
|
|
25
26
|
export declare function getQueueApiOptions(ctx: QueueContext): QueueApiOptions | undefined;
|
|
26
27
|
//# sourceMappingURL=util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF;AAED
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,eAAe,GAAG,SAAS,CAGjF"}
|
|
@@ -10,10 +10,11 @@ export async function createQueueAPIClient(ctx) {
|
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* Creates QueueApiOptions from the CLI context.
|
|
13
|
-
* Prioritizes explicit orgId on context, then falls back to global --org-id option
|
|
13
|
+
* Prioritizes explicit orgId on context, then falls back to global --org-id option,
|
|
14
|
+
* and finally to the preferred org from the profile configuration.
|
|
14
15
|
*/
|
|
15
16
|
export function getQueueApiOptions(ctx) {
|
|
16
|
-
const orgId = ctx.orgId ?? ctx.options.orgId;
|
|
17
|
+
const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
|
|
17
18
|
return orgId ? { orgId } : undefined;
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAc7D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAiB;IAC3D,OAAO,0BAA0B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/cmd/cloud/queue/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAc7D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAiB;IAC3D,OAAO,0BAA0B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAiB;IACnD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC;IAC/E,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/templates.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/templates.ts"],"names":[],"mappings":"AAmDA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,QAO/C;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,QAM7C"}
|
|
@@ -17,8 +17,6 @@ export default createAgent('${name}', {
|
|
|
17
17
|
},
|
|
18
18
|
});
|
|
19
19
|
`;
|
|
20
|
-
const newAgentIndexTemplate = (_name) => `export { default } from './agent';
|
|
21
|
-
`;
|
|
22
20
|
const newRouteTemplate = () => {
|
|
23
21
|
return `import { createRouter } from '@agentuity/runtime';
|
|
24
22
|
|
|
@@ -49,8 +47,7 @@ export function createAgentTemplates(dir) {
|
|
|
49
47
|
return;
|
|
50
48
|
}
|
|
51
49
|
const agentName = toPascalCase(name);
|
|
52
|
-
writeFileSync(join(dir, '
|
|
53
|
-
writeFileSync(join(dir, 'index.ts'), newAgentIndexTemplate(agentName));
|
|
50
|
+
writeFileSync(join(dir, 'index.ts'), newAgentTemplate(agentName));
|
|
54
51
|
}
|
|
55
52
|
export function createAPITemplates(dir) {
|
|
56
53
|
const name = basename(dir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/cmd/dev/templates.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC;;;8BAGb,IAAI;;;;;;;;;;;CAWjC,CAAC;AAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/cmd/dev/templates.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC;;;8BAGb,IAAI;;;;;;;;;;;CAWjC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC7B,OAAO;;;;;;;;;;CAUP,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,cAAc,CAAC;AAEvC,sHAAsH;AACtH,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAC9C,MAAM,oBAAoB,GAAG,wCAAwC,CAAC;AACtE,MAAM,eAAe,GAAG,OAAO,CAAC;AAEhC,SAAS,oBAAoB,CAAC,IAAY;IACzC,OAAO,CACN,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3B,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;QAC/B,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,OAAO;IACR,CAAC;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC7C,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,OAAO;IACR,CAAC;IACD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/utils/deps.d.ts
CHANGED
|
@@ -3,6 +3,57 @@ export interface PackageRef {
|
|
|
3
3
|
name: string;
|
|
4
4
|
version: string;
|
|
5
5
|
}
|
|
6
|
+
/**
|
|
7
|
+
* Mapping from alias key (aliasName@version) to actual package reference.
|
|
8
|
+
* Used to resolve npm aliases (e.g., "tailwind-merge-v2": "npm:tailwind-merge@2.6.0")
|
|
9
|
+
* to their actual package names for accurate malware detection.
|
|
10
|
+
*/
|
|
11
|
+
export type AliasMap = Map<string, PackageRef>;
|
|
6
12
|
export declare function extractDependencies(projectDir: string, logger: Logger): Promise<PackageRef[]>;
|
|
7
13
|
export declare function parseBunPmLsOutput(output: string): PackageRef[];
|
|
14
|
+
/**
|
|
15
|
+
* Load alias mappings from bun.lock file.
|
|
16
|
+
*
|
|
17
|
+
* The bun.lock file contains a "packages" object where:
|
|
18
|
+
* - Keys are the package names as they appear in node_modules (alias names for aliased packages)
|
|
19
|
+
* - Values are arrays where the first element is "actualPackageName@version"
|
|
20
|
+
*
|
|
21
|
+
* For npm aliases like `"tailwind-merge-v2": "npm:tailwind-merge@2.6.0"`:
|
|
22
|
+
* - Key: "tailwind-merge-v2"
|
|
23
|
+
* - Value[0]: "tailwind-merge@2.6.0"
|
|
24
|
+
*
|
|
25
|
+
* This function builds a map from "aliasName@version" to the actual PackageRef.
|
|
26
|
+
*/
|
|
27
|
+
export declare function loadAliasMap(projectDir: string, logger: Logger): Promise<AliasMap>;
|
|
28
|
+
/**
|
|
29
|
+
* Parse bun.lock file content.
|
|
30
|
+
*
|
|
31
|
+
* bun.lock uses a relaxed JSON format (JSONC) with trailing commas, which
|
|
32
|
+
* standard JSON.parse cannot handle. We need to strip trailing commas before parsing.
|
|
33
|
+
*
|
|
34
|
+
* Structure:
|
|
35
|
+
* {
|
|
36
|
+
* "lockfileVersion": 1,
|
|
37
|
+
* "packages": {
|
|
38
|
+
* "package-name": ["actual-package@version", "", {}, "sha512-..."],
|
|
39
|
+
* ...
|
|
40
|
+
* }
|
|
41
|
+
* }
|
|
42
|
+
*/
|
|
43
|
+
export declare function parseBunLockFile(content: string): BunLockFile | null;
|
|
44
|
+
/**
|
|
45
|
+
* Represents the structure of a bun.lock file.
|
|
46
|
+
*/
|
|
47
|
+
export interface BunLockFile {
|
|
48
|
+
lockfileVersion?: number;
|
|
49
|
+
packages?: Record<string, unknown[]>;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Resolve npm aliases in the package list to their actual package names.
|
|
53
|
+
*
|
|
54
|
+
* This prevents false positives in malware detection where alias names
|
|
55
|
+
* (e.g., "tailwind-merge-v2") are flagged as suspicious when they're
|
|
56
|
+
* actually legitimate aliases for real packages (e.g., "tailwind-merge").
|
|
57
|
+
*/
|
|
58
|
+
export declare function resolveAliases(packages: PackageRef[], aliasMap: AliasMap, logger: Logger): PackageRef[];
|
|
8
59
|
//# sourceMappingURL=deps.d.ts.map
|
package/dist/utils/deps.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAE/C,wBAAsB,mBAAmB,CACxC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,UAAU,EAAE,CAAC,CA8BvB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAiB/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkDxF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAQpE;AAWD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;CACrC;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC7B,QAAQ,EAAE,UAAU,EAAE,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GACZ,UAAU,EAAE,CA4Bd"}
|
package/dist/utils/deps.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { $ } from 'bun';
|
|
2
|
+
import { join } from 'node:path';
|
|
2
3
|
export async function extractDependencies(projectDir, logger) {
|
|
3
4
|
try {
|
|
4
5
|
logger.debug('Extracting dependencies using bun pm ls --all');
|
|
@@ -8,7 +9,13 @@ export async function extractDependencies(projectDir, logger) {
|
|
|
8
9
|
return [];
|
|
9
10
|
}
|
|
10
11
|
const output = result.stdout.toString();
|
|
11
|
-
|
|
12
|
+
let packages = parseBunPmLsOutput(output);
|
|
13
|
+
// Load alias map from bun.lock to resolve npm aliases to actual package names
|
|
14
|
+
const aliasMap = await loadAliasMap(projectDir, logger);
|
|
15
|
+
if (aliasMap.size > 0) {
|
|
16
|
+
logger.debug('Loaded %d package aliases from bun.lock', aliasMap.size);
|
|
17
|
+
packages = resolveAliases(packages, aliasMap, logger);
|
|
18
|
+
}
|
|
12
19
|
logger.debug('Extracted %d unique packages', packages.length);
|
|
13
20
|
return packages;
|
|
14
21
|
}
|
|
@@ -33,4 +40,120 @@ export function parseBunPmLsOutput(output) {
|
|
|
33
40
|
}
|
|
34
41
|
return Array.from(packages.values());
|
|
35
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Load alias mappings from bun.lock file.
|
|
45
|
+
*
|
|
46
|
+
* The bun.lock file contains a "packages" object where:
|
|
47
|
+
* - Keys are the package names as they appear in node_modules (alias names for aliased packages)
|
|
48
|
+
* - Values are arrays where the first element is "actualPackageName@version"
|
|
49
|
+
*
|
|
50
|
+
* For npm aliases like `"tailwind-merge-v2": "npm:tailwind-merge@2.6.0"`:
|
|
51
|
+
* - Key: "tailwind-merge-v2"
|
|
52
|
+
* - Value[0]: "tailwind-merge@2.6.0"
|
|
53
|
+
*
|
|
54
|
+
* This function builds a map from "aliasName@version" to the actual PackageRef.
|
|
55
|
+
*/
|
|
56
|
+
export async function loadAliasMap(projectDir, logger) {
|
|
57
|
+
const aliasMap = new Map();
|
|
58
|
+
try {
|
|
59
|
+
const lockfilePath = join(projectDir, 'bun.lock');
|
|
60
|
+
const lockfile = Bun.file(lockfilePath);
|
|
61
|
+
if (!(await lockfile.exists())) {
|
|
62
|
+
logger.debug('No bun.lock file found, skipping alias resolution');
|
|
63
|
+
return aliasMap;
|
|
64
|
+
}
|
|
65
|
+
const content = await lockfile.text();
|
|
66
|
+
const parsed = parseBunLockFile(content);
|
|
67
|
+
if (!parsed || !parsed.packages) {
|
|
68
|
+
return aliasMap;
|
|
69
|
+
}
|
|
70
|
+
for (const [aliasName, packageInfo] of Object.entries(parsed.packages)) {
|
|
71
|
+
if (!Array.isArray(packageInfo) || packageInfo.length === 0) {
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
const actualPackageSpec = packageInfo[0];
|
|
75
|
+
if (typeof actualPackageSpec !== 'string') {
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
// Parse "actualPackageName@version" from the first element
|
|
79
|
+
const atIndex = actualPackageSpec.lastIndexOf('@');
|
|
80
|
+
if (atIndex <= 0) {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
const actualName = actualPackageSpec.substring(0, atIndex);
|
|
84
|
+
const actualVersion = actualPackageSpec.substring(atIndex + 1);
|
|
85
|
+
// Only add to alias map if the alias name differs from the actual name
|
|
86
|
+
// This indicates an npm alias (e.g., tailwind-merge-v2 -> tailwind-merge)
|
|
87
|
+
if (aliasName !== actualName) {
|
|
88
|
+
const aliasKey = `${aliasName}@${actualVersion}`;
|
|
89
|
+
aliasMap.set(aliasKey, { name: actualName, version: actualVersion });
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
logger.debug('Failed to parse bun.lock for alias resolution: %s', error);
|
|
95
|
+
}
|
|
96
|
+
return aliasMap;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Parse bun.lock file content.
|
|
100
|
+
*
|
|
101
|
+
* bun.lock uses a relaxed JSON format (JSONC) with trailing commas, which
|
|
102
|
+
* standard JSON.parse cannot handle. We need to strip trailing commas before parsing.
|
|
103
|
+
*
|
|
104
|
+
* Structure:
|
|
105
|
+
* {
|
|
106
|
+
* "lockfileVersion": 1,
|
|
107
|
+
* "packages": {
|
|
108
|
+
* "package-name": ["actual-package@version", "", {}, "sha512-..."],
|
|
109
|
+
* ...
|
|
110
|
+
* }
|
|
111
|
+
* }
|
|
112
|
+
*/
|
|
113
|
+
export function parseBunLockFile(content) {
|
|
114
|
+
try {
|
|
115
|
+
// bun.lock uses JSONC format with trailing commas - strip them before parsing
|
|
116
|
+
const sanitized = stripTrailingCommas(content);
|
|
117
|
+
return JSON.parse(sanitized);
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return null;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Strip trailing commas from JSONC content to make it valid JSON.
|
|
125
|
+
* Handles trailing commas before ] and } characters.
|
|
126
|
+
*/
|
|
127
|
+
function stripTrailingCommas(content) {
|
|
128
|
+
// Match comma followed by optional whitespace and then ] or }
|
|
129
|
+
return content.replace(/,(\s*[}\]])/g, '$1');
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Resolve npm aliases in the package list to their actual package names.
|
|
133
|
+
*
|
|
134
|
+
* This prevents false positives in malware detection where alias names
|
|
135
|
+
* (e.g., "tailwind-merge-v2") are flagged as suspicious when they're
|
|
136
|
+
* actually legitimate aliases for real packages (e.g., "tailwind-merge").
|
|
137
|
+
*/
|
|
138
|
+
export function resolveAliases(packages, aliasMap, logger) {
|
|
139
|
+
const resolved = new Map();
|
|
140
|
+
for (const pkg of packages) {
|
|
141
|
+
const aliasKey = `${pkg.name}@${pkg.version}`;
|
|
142
|
+
const actualPkg = aliasMap.get(aliasKey);
|
|
143
|
+
if (actualPkg) {
|
|
144
|
+
logger.debug('Resolved npm alias: %s@%s -> %s@%s', pkg.name, pkg.version, actualPkg.name, actualPkg.version);
|
|
145
|
+
const resolvedKey = `${actualPkg.name}@${actualPkg.version}`;
|
|
146
|
+
if (!resolved.has(resolvedKey)) {
|
|
147
|
+
resolved.set(resolvedKey, actualPkg);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
const key = `${pkg.name}@${pkg.version}`;
|
|
152
|
+
if (!resolved.has(key)) {
|
|
153
|
+
resolved.set(key, pkg);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return Array.from(resolved.values());
|
|
158
|
+
}
|
|
36
159
|
//# sourceMappingURL=deps.js.map
|
package/dist/utils/deps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../src/utils/deps.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentuity/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.40",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Agentuity employees and contributors",
|
|
6
6
|
"type": "module",
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
"prepublishOnly": "bun run clean && bun run build"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@agentuity/auth": "0.1.
|
|
44
|
-
"@agentuity/core": "0.1.
|
|
45
|
-
"@agentuity/server": "0.1.
|
|
43
|
+
"@agentuity/auth": "0.1.40",
|
|
44
|
+
"@agentuity/core": "0.1.40",
|
|
45
|
+
"@agentuity/server": "0.1.40",
|
|
46
46
|
"@datasert/cronjs-parser": "^1.4.0",
|
|
47
47
|
"@terascope/fetch-github-release": "^2.2.1",
|
|
48
48
|
"@vitejs/plugin-react": "^5.1.2",
|
|
@@ -60,10 +60,10 @@
|
|
|
60
60
|
"typescript": "^5.9.0",
|
|
61
61
|
"vite": "^7.2.7",
|
|
62
62
|
"zod": "^4.3.5",
|
|
63
|
-
"@agentuity/frontend": "0.1.
|
|
63
|
+
"@agentuity/frontend": "0.1.40"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@agentuity/test-utils": "0.1.
|
|
66
|
+
"@agentuity/test-utils": "0.1.40",
|
|
67
67
|
"@types/adm-zip": "^0.5.7",
|
|
68
68
|
"@types/bun": "latest",
|
|
69
69
|
"@types/tar-fs": "^2.0.4",
|
|
@@ -719,9 +719,30 @@ export async function generateRouteRegistry(
|
|
|
719
719
|
const withoutSrc = normalized.startsWith('src/') ? normalized.substring(4) : normalized;
|
|
720
720
|
// Make it relative from src/generated/
|
|
721
721
|
resolvedPath = `../${withoutSrc}`;
|
|
722
|
-
//
|
|
723
|
-
|
|
724
|
-
|
|
722
|
+
// Check if this is a directory import (no file extension) vs a file import
|
|
723
|
+
// Directory imports like '../agent/translate' should resolve to '../agent/translate/index.js'
|
|
724
|
+
// File imports like '../agent/translate/agent' should resolve to '../agent/translate/agent.js'
|
|
725
|
+
const hasExtension = /\.(ts|tsx|js|jsx|mjs|cjs)$/.test(resolvedPath);
|
|
726
|
+
if (!hasExtension) {
|
|
727
|
+
// No extension - check if it's a directory or a file
|
|
728
|
+
// Try to resolve the actual path on disk to determine
|
|
729
|
+
const absolutePath = join(srcDir, withoutSrc);
|
|
730
|
+
const isDirectory =
|
|
731
|
+
existsSync(absolutePath) ||
|
|
732
|
+
existsSync(join(absolutePath, 'index.ts')) ||
|
|
733
|
+
existsSync(join(absolutePath, 'index.tsx'));
|
|
734
|
+
const isFile = existsSync(`${absolutePath}.ts`) || existsSync(`${absolutePath}.tsx`);
|
|
735
|
+
|
|
736
|
+
if (isDirectory && !isFile) {
|
|
737
|
+
// It's a directory import, add /index.js
|
|
738
|
+
resolvedPath = `${resolvedPath}/index.js`;
|
|
739
|
+
} else {
|
|
740
|
+
// It's a file import (or we can't determine), add .js
|
|
741
|
+
resolvedPath = `${resolvedPath}.js`;
|
|
742
|
+
}
|
|
743
|
+
} else {
|
|
744
|
+
// Has extension - replace with .js
|
|
745
|
+
resolvedPath = resolvedPath.replace(/\.tsx?$/, '.js');
|
|
725
746
|
}
|
|
726
747
|
}
|
|
727
748
|
|
|
@@ -38,6 +38,7 @@ export const publishSubcommand = createCommand({
|
|
|
38
38
|
partitionKey: z.string().optional().describe('Partition key for ordering'),
|
|
39
39
|
idempotencyKey: z.string().optional().describe('Idempotency key to prevent duplicates'),
|
|
40
40
|
ttl: z.coerce.number().optional().describe('Message TTL in seconds'),
|
|
41
|
+
sync: z.boolean().optional().describe('Publish synchronously (wait for persistence)'),
|
|
41
42
|
}),
|
|
42
43
|
response: MessageSchema,
|
|
43
44
|
},
|
|
@@ -62,6 +63,11 @@ export const publishSubcommand = createCommand({
|
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
|
|
66
|
+
const apiOptions = getQueueApiOptions(ctx) ?? {};
|
|
67
|
+
if (opts.sync) {
|
|
68
|
+
apiOptions.sync = true;
|
|
69
|
+
}
|
|
70
|
+
|
|
65
71
|
const message = await publishMessage(
|
|
66
72
|
client,
|
|
67
73
|
args.queue_name,
|
|
@@ -72,7 +78,7 @@ export const publishSubcommand = createCommand({
|
|
|
72
78
|
idempotency_key: opts.idempotencyKey,
|
|
73
79
|
ttl_seconds: opts.ttl,
|
|
74
80
|
},
|
|
75
|
-
|
|
81
|
+
apiOptions
|
|
76
82
|
);
|
|
77
83
|
|
|
78
84
|
if (!options.json) {
|
|
@@ -26,9 +26,10 @@ export async function createQueueAPIClient(ctx: QueueContext): Promise<APIClient
|
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* Creates QueueApiOptions from the CLI context.
|
|
29
|
-
* Prioritizes explicit orgId on context, then falls back to global --org-id option
|
|
29
|
+
* Prioritizes explicit orgId on context, then falls back to global --org-id option,
|
|
30
|
+
* and finally to the preferred org from the profile configuration.
|
|
30
31
|
*/
|
|
31
32
|
export function getQueueApiOptions(ctx: QueueContext): QueueApiOptions | undefined {
|
|
32
|
-
const orgId = ctx.orgId ?? ctx.options.orgId;
|
|
33
|
+
const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
|
|
33
34
|
return orgId ? { orgId } : undefined;
|
|
34
35
|
}
|
package/src/cmd/dev/templates.ts
CHANGED
|
@@ -19,9 +19,6 @@ export default createAgent('${name}', {
|
|
|
19
19
|
});
|
|
20
20
|
`;
|
|
21
21
|
|
|
22
|
-
const newAgentIndexTemplate = (_name: string) => `export { default } from './agent';
|
|
23
|
-
`;
|
|
24
|
-
|
|
25
22
|
const newRouteTemplate = () => {
|
|
26
23
|
return `import { createRouter } from '@agentuity/runtime';
|
|
27
24
|
|
|
@@ -58,8 +55,7 @@ export function createAgentTemplates(dir: string) {
|
|
|
58
55
|
return;
|
|
59
56
|
}
|
|
60
57
|
const agentName = toPascalCase(name);
|
|
61
|
-
writeFileSync(join(dir, '
|
|
62
|
-
writeFileSync(join(dir, 'index.ts'), newAgentIndexTemplate(agentName));
|
|
58
|
+
writeFileSync(join(dir, 'index.ts'), newAgentTemplate(agentName));
|
|
63
59
|
}
|
|
64
60
|
|
|
65
61
|
export function createAPITemplates(dir: string) {
|
package/src/utils/deps.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { $ } from 'bun';
|
|
2
|
+
import { join } from 'node:path';
|
|
2
3
|
import type { Logger } from '../types';
|
|
3
4
|
|
|
4
5
|
export interface PackageRef {
|
|
@@ -6,6 +7,13 @@ export interface PackageRef {
|
|
|
6
7
|
version: string;
|
|
7
8
|
}
|
|
8
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Mapping from alias key (aliasName@version) to actual package reference.
|
|
12
|
+
* Used to resolve npm aliases (e.g., "tailwind-merge-v2": "npm:tailwind-merge@2.6.0")
|
|
13
|
+
* to their actual package names for accurate malware detection.
|
|
14
|
+
*/
|
|
15
|
+
export type AliasMap = Map<string, PackageRef>;
|
|
16
|
+
|
|
9
17
|
export async function extractDependencies(
|
|
10
18
|
projectDir: string,
|
|
11
19
|
logger: Logger
|
|
@@ -24,7 +32,14 @@ export async function extractDependencies(
|
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
const output = result.stdout.toString();
|
|
27
|
-
|
|
35
|
+
let packages = parseBunPmLsOutput(output);
|
|
36
|
+
|
|
37
|
+
// Load alias map from bun.lock to resolve npm aliases to actual package names
|
|
38
|
+
const aliasMap = await loadAliasMap(projectDir, logger);
|
|
39
|
+
if (aliasMap.size > 0) {
|
|
40
|
+
logger.debug('Loaded %d package aliases from bun.lock', aliasMap.size);
|
|
41
|
+
packages = resolveAliases(packages, aliasMap, logger);
|
|
42
|
+
}
|
|
28
43
|
|
|
29
44
|
logger.debug('Extracted %d unique packages', packages.length);
|
|
30
45
|
return packages;
|
|
@@ -52,3 +67,151 @@ export function parseBunPmLsOutput(output: string): PackageRef[] {
|
|
|
52
67
|
|
|
53
68
|
return Array.from(packages.values());
|
|
54
69
|
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Load alias mappings from bun.lock file.
|
|
73
|
+
*
|
|
74
|
+
* The bun.lock file contains a "packages" object where:
|
|
75
|
+
* - Keys are the package names as they appear in node_modules (alias names for aliased packages)
|
|
76
|
+
* - Values are arrays where the first element is "actualPackageName@version"
|
|
77
|
+
*
|
|
78
|
+
* For npm aliases like `"tailwind-merge-v2": "npm:tailwind-merge@2.6.0"`:
|
|
79
|
+
* - Key: "tailwind-merge-v2"
|
|
80
|
+
* - Value[0]: "tailwind-merge@2.6.0"
|
|
81
|
+
*
|
|
82
|
+
* This function builds a map from "aliasName@version" to the actual PackageRef.
|
|
83
|
+
*/
|
|
84
|
+
export async function loadAliasMap(projectDir: string, logger: Logger): Promise<AliasMap> {
|
|
85
|
+
const aliasMap: AliasMap = new Map();
|
|
86
|
+
|
|
87
|
+
try {
|
|
88
|
+
const lockfilePath = join(projectDir, 'bun.lock');
|
|
89
|
+
const lockfile = Bun.file(lockfilePath);
|
|
90
|
+
|
|
91
|
+
if (!(await lockfile.exists())) {
|
|
92
|
+
logger.debug('No bun.lock file found, skipping alias resolution');
|
|
93
|
+
return aliasMap;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const content = await lockfile.text();
|
|
97
|
+
const parsed = parseBunLockFile(content);
|
|
98
|
+
|
|
99
|
+
if (!parsed || !parsed.packages) {
|
|
100
|
+
return aliasMap;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
for (const [aliasName, packageInfo] of Object.entries(parsed.packages)) {
|
|
104
|
+
if (!Array.isArray(packageInfo) || packageInfo.length === 0) {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
const actualPackageSpec = packageInfo[0];
|
|
109
|
+
if (typeof actualPackageSpec !== 'string') {
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// Parse "actualPackageName@version" from the first element
|
|
114
|
+
const atIndex = actualPackageSpec.lastIndexOf('@');
|
|
115
|
+
if (atIndex <= 0) {
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
const actualName = actualPackageSpec.substring(0, atIndex);
|
|
120
|
+
const actualVersion = actualPackageSpec.substring(atIndex + 1);
|
|
121
|
+
|
|
122
|
+
// Only add to alias map if the alias name differs from the actual name
|
|
123
|
+
// This indicates an npm alias (e.g., tailwind-merge-v2 -> tailwind-merge)
|
|
124
|
+
if (aliasName !== actualName) {
|
|
125
|
+
const aliasKey = `${aliasName}@${actualVersion}`;
|
|
126
|
+
aliasMap.set(aliasKey, { name: actualName, version: actualVersion });
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
} catch (error) {
|
|
130
|
+
logger.debug('Failed to parse bun.lock for alias resolution: %s', error);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
return aliasMap;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* Parse bun.lock file content.
|
|
138
|
+
*
|
|
139
|
+
* bun.lock uses a relaxed JSON format (JSONC) with trailing commas, which
|
|
140
|
+
* standard JSON.parse cannot handle. We need to strip trailing commas before parsing.
|
|
141
|
+
*
|
|
142
|
+
* Structure:
|
|
143
|
+
* {
|
|
144
|
+
* "lockfileVersion": 1,
|
|
145
|
+
* "packages": {
|
|
146
|
+
* "package-name": ["actual-package@version", "", {}, "sha512-..."],
|
|
147
|
+
* ...
|
|
148
|
+
* }
|
|
149
|
+
* }
|
|
150
|
+
*/
|
|
151
|
+
export function parseBunLockFile(content: string): BunLockFile | null {
|
|
152
|
+
try {
|
|
153
|
+
// bun.lock uses JSONC format with trailing commas - strip them before parsing
|
|
154
|
+
const sanitized = stripTrailingCommas(content);
|
|
155
|
+
return JSON.parse(sanitized) as BunLockFile;
|
|
156
|
+
} catch {
|
|
157
|
+
return null;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* Strip trailing commas from JSONC content to make it valid JSON.
|
|
163
|
+
* Handles trailing commas before ] and } characters.
|
|
164
|
+
*/
|
|
165
|
+
function stripTrailingCommas(content: string): string {
|
|
166
|
+
// Match comma followed by optional whitespace and then ] or }
|
|
167
|
+
return content.replace(/,(\s*[}\]])/g, '$1');
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/**
|
|
171
|
+
* Represents the structure of a bun.lock file.
|
|
172
|
+
*/
|
|
173
|
+
export interface BunLockFile {
|
|
174
|
+
lockfileVersion?: number;
|
|
175
|
+
packages?: Record<string, unknown[]>;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/**
|
|
179
|
+
* Resolve npm aliases in the package list to their actual package names.
|
|
180
|
+
*
|
|
181
|
+
* This prevents false positives in malware detection where alias names
|
|
182
|
+
* (e.g., "tailwind-merge-v2") are flagged as suspicious when they're
|
|
183
|
+
* actually legitimate aliases for real packages (e.g., "tailwind-merge").
|
|
184
|
+
*/
|
|
185
|
+
export function resolveAliases(
|
|
186
|
+
packages: PackageRef[],
|
|
187
|
+
aliasMap: AliasMap,
|
|
188
|
+
logger: Logger
|
|
189
|
+
): PackageRef[] {
|
|
190
|
+
const resolved = new Map<string, PackageRef>();
|
|
191
|
+
|
|
192
|
+
for (const pkg of packages) {
|
|
193
|
+
const aliasKey = `${pkg.name}@${pkg.version}`;
|
|
194
|
+
const actualPkg = aliasMap.get(aliasKey);
|
|
195
|
+
|
|
196
|
+
if (actualPkg) {
|
|
197
|
+
logger.debug(
|
|
198
|
+
'Resolved npm alias: %s@%s -> %s@%s',
|
|
199
|
+
pkg.name,
|
|
200
|
+
pkg.version,
|
|
201
|
+
actualPkg.name,
|
|
202
|
+
actualPkg.version
|
|
203
|
+
);
|
|
204
|
+
const resolvedKey = `${actualPkg.name}@${actualPkg.version}`;
|
|
205
|
+
if (!resolved.has(resolvedKey)) {
|
|
206
|
+
resolved.set(resolvedKey, actualPkg);
|
|
207
|
+
}
|
|
208
|
+
} else {
|
|
209
|
+
const key = `${pkg.name}@${pkg.version}`;
|
|
210
|
+
if (!resolved.has(key)) {
|
|
211
|
+
resolved.set(key, pkg);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
return Array.from(resolved.values());
|
|
217
|
+
}
|
package/dist/legacy-check.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-check.d.ts","sourceRoot":"","sources":["../src/legacy-check.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CA2HpD"}
|
package/dist/legacy-check.js
DELETED
|
@@ -1,112 +0,0 @@
|
|
|
1
|
-
import { homedir } from 'node:os';
|
|
2
|
-
import { join } from 'node:path';
|
|
3
|
-
import * as tui from './tui';
|
|
4
|
-
/**
|
|
5
|
-
* Check if the legacy (Go-based) Agentuity CLI is installed
|
|
6
|
-
* and block execution with migration instructions
|
|
7
|
-
*/
|
|
8
|
-
export async function checkLegacyCLI() {
|
|
9
|
-
const homeDir = homedir();
|
|
10
|
-
const legacyLocations = [
|
|
11
|
-
'/opt/homebrew/bin/agentuity', // Homebrew ARM64 (M1/M2/M3 Macs)
|
|
12
|
-
'/usr/local/bin/agentuity', // Homebrew Intel Macs / Linux
|
|
13
|
-
'/usr/bin/agentuity', // System install
|
|
14
|
-
join(homeDir, '.bin/agentuity'), // User bin from install script
|
|
15
|
-
join(homeDir, 'bin/agentuity'), // User bin alternate
|
|
16
|
-
join(homeDir, '.local/bin/agentuity'), // XDG user bin
|
|
17
|
-
];
|
|
18
|
-
// Exclude the currently running executable from the legacy check
|
|
19
|
-
// This prevents the new CLI from detecting itself as legacy when installed
|
|
20
|
-
// in standard system locations like /usr/local/bin
|
|
21
|
-
const currentExecutable = process.execPath;
|
|
22
|
-
const foundInstalls = [];
|
|
23
|
-
// Check if Homebrew manages the agentuity package
|
|
24
|
-
let isBrewManaged = false;
|
|
25
|
-
try {
|
|
26
|
-
const brewCheck = Bun.spawn(['brew', 'list', '--versions', 'agentuity'], {
|
|
27
|
-
stdout: 'ignore',
|
|
28
|
-
stderr: 'ignore',
|
|
29
|
-
});
|
|
30
|
-
const exitCode = await brewCheck.exited;
|
|
31
|
-
isBrewManaged = exitCode === 0;
|
|
32
|
-
}
|
|
33
|
-
catch {
|
|
34
|
-
// Homebrew not installed or command failed
|
|
35
|
-
}
|
|
36
|
-
// Check file system locations
|
|
37
|
-
for (const location of legacyLocations) {
|
|
38
|
-
// Skip if this is the currently running executable
|
|
39
|
-
if (location === currentExecutable) {
|
|
40
|
-
continue;
|
|
41
|
-
}
|
|
42
|
-
const file = Bun.file(location);
|
|
43
|
-
if (await file.exists()) {
|
|
44
|
-
try {
|
|
45
|
-
// Check if it's a compiled binary (not TypeScript)
|
|
46
|
-
const proc = Bun.spawn(['file', location], { stdout: 'pipe' });
|
|
47
|
-
const output = await new Response(proc.stdout).text();
|
|
48
|
-
await proc.exited;
|
|
49
|
-
if (output.includes('Mach-O') || output.includes('ELF')) {
|
|
50
|
-
// Determine method: if brew manages the package, mark all installs as homebrew
|
|
51
|
-
// otherwise check if it's in user home (install-script) or system (manual)
|
|
52
|
-
const method = isBrewManaged
|
|
53
|
-
? 'homebrew'
|
|
54
|
-
: location.includes(homeDir)
|
|
55
|
-
? 'install-script'
|
|
56
|
-
: 'manual';
|
|
57
|
-
foundInstalls.push({ path: location, method });
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
catch {
|
|
61
|
-
// Ignore errors
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
if (foundInstalls.length === 0 && !isBrewManaged) {
|
|
66
|
-
return; // No legacy CLI found
|
|
67
|
-
}
|
|
68
|
-
// Block execution and show removal instructions
|
|
69
|
-
tui.newline();
|
|
70
|
-
tui.error('Legacy CLI Conflict Detected');
|
|
71
|
-
tui.newline();
|
|
72
|
-
console.log(' The legacy (Go-based) Agentuity CLI is installed and conflicts with the new');
|
|
73
|
-
console.log(' TypeScript-based CLI. Please remove it before continuing.');
|
|
74
|
-
tui.newline();
|
|
75
|
-
// Filter installs into brew-managed and manual
|
|
76
|
-
const brewInstalls = foundInstalls.filter((install) => isBrewManaged || install.method === 'homebrew');
|
|
77
|
-
const manualInstalls = foundInstalls.filter((install) => !isBrewManaged && install.method !== 'homebrew');
|
|
78
|
-
// Show Homebrew removal section if any brew-managed installs
|
|
79
|
-
if (brewInstalls.length > 0) {
|
|
80
|
-
console.log(' ' + tui.bold('Remove via Homebrew:'));
|
|
81
|
-
tui.bullet('brew uninstall agentuity');
|
|
82
|
-
tui.newline();
|
|
83
|
-
// Show which files will be removed by brew
|
|
84
|
-
console.log(' ' + tui.muted('This will remove:'));
|
|
85
|
-
for (const install of brewInstalls) {
|
|
86
|
-
console.log(` "${install.path}"`);
|
|
87
|
-
}
|
|
88
|
-
tui.newline();
|
|
89
|
-
}
|
|
90
|
-
// Show manual removal section if any manual installs
|
|
91
|
-
if (manualInstalls.length > 0) {
|
|
92
|
-
console.log(' ' + tui.bold('Remove the following legacy CLI installations:'));
|
|
93
|
-
tui.newline();
|
|
94
|
-
for (const install of manualInstalls) {
|
|
95
|
-
console.log(` ${tui.muted('"' + install.path + '"')}`);
|
|
96
|
-
if (install.method === 'install-script') {
|
|
97
|
-
tui.bullet(`rm "${install.path}"`);
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
tui.bullet(`sudo rm "${install.path}"`);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
tui.newline();
|
|
104
|
-
}
|
|
105
|
-
console.log(' ' + tui.bold('After removal, install the new CLI:'));
|
|
106
|
-
tui.bullet('curl -sSL https://agentuity.sh | sh');
|
|
107
|
-
tui.newline();
|
|
108
|
-
console.log(` Learn more: ${tui.link('https://agentuity.dev/Reference/migration-guide')}`);
|
|
109
|
-
tui.newline();
|
|
110
|
-
process.exit(1);
|
|
111
|
-
}
|
|
112
|
-
//# sourceMappingURL=legacy-check.js.map
|
package/dist/legacy-check.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-check.js","sourceRoot":"","sources":["../src/legacy-check.ts"],"names":[],"mappings":"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"}
|
package/src/legacy-check.ts
DELETED
|
@@ -1,137 +0,0 @@
|
|
|
1
|
-
import { homedir } from 'node:os';
|
|
2
|
-
import { join } from 'node:path';
|
|
3
|
-
import * as tui from './tui';
|
|
4
|
-
|
|
5
|
-
interface LegacyInstall {
|
|
6
|
-
path: string;
|
|
7
|
-
method: 'homebrew' | 'manual' | 'install-script';
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
/**
|
|
11
|
-
* Check if the legacy (Go-based) Agentuity CLI is installed
|
|
12
|
-
* and block execution with migration instructions
|
|
13
|
-
*/
|
|
14
|
-
export async function checkLegacyCLI(): Promise<void> {
|
|
15
|
-
const homeDir = homedir();
|
|
16
|
-
|
|
17
|
-
const legacyLocations = [
|
|
18
|
-
'/opt/homebrew/bin/agentuity', // Homebrew ARM64 (M1/M2/M3 Macs)
|
|
19
|
-
'/usr/local/bin/agentuity', // Homebrew Intel Macs / Linux
|
|
20
|
-
'/usr/bin/agentuity', // System install
|
|
21
|
-
join(homeDir, '.bin/agentuity'), // User bin from install script
|
|
22
|
-
join(homeDir, 'bin/agentuity'), // User bin alternate
|
|
23
|
-
join(homeDir, '.local/bin/agentuity'), // XDG user bin
|
|
24
|
-
];
|
|
25
|
-
|
|
26
|
-
// Exclude the currently running executable from the legacy check
|
|
27
|
-
// This prevents the new CLI from detecting itself as legacy when installed
|
|
28
|
-
// in standard system locations like /usr/local/bin
|
|
29
|
-
const currentExecutable = process.execPath;
|
|
30
|
-
|
|
31
|
-
const foundInstalls: LegacyInstall[] = [];
|
|
32
|
-
|
|
33
|
-
// Check if Homebrew manages the agentuity package
|
|
34
|
-
let isBrewManaged = false;
|
|
35
|
-
try {
|
|
36
|
-
const brewCheck = Bun.spawn(['brew', 'list', '--versions', 'agentuity'], {
|
|
37
|
-
stdout: 'ignore',
|
|
38
|
-
stderr: 'ignore',
|
|
39
|
-
});
|
|
40
|
-
const exitCode = await brewCheck.exited;
|
|
41
|
-
isBrewManaged = exitCode === 0;
|
|
42
|
-
} catch {
|
|
43
|
-
// Homebrew not installed or command failed
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
// Check file system locations
|
|
47
|
-
for (const location of legacyLocations) {
|
|
48
|
-
// Skip if this is the currently running executable
|
|
49
|
-
if (location === currentExecutable) {
|
|
50
|
-
continue;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
const file = Bun.file(location);
|
|
54
|
-
if (await file.exists()) {
|
|
55
|
-
try {
|
|
56
|
-
// Check if it's a compiled binary (not TypeScript)
|
|
57
|
-
const proc = Bun.spawn(['file', location], { stdout: 'pipe' });
|
|
58
|
-
const output = await new Response(proc.stdout).text();
|
|
59
|
-
await proc.exited;
|
|
60
|
-
|
|
61
|
-
if (output.includes('Mach-O') || output.includes('ELF')) {
|
|
62
|
-
// Determine method: if brew manages the package, mark all installs as homebrew
|
|
63
|
-
// otherwise check if it's in user home (install-script) or system (manual)
|
|
64
|
-
const method = isBrewManaged
|
|
65
|
-
? 'homebrew'
|
|
66
|
-
: location.includes(homeDir)
|
|
67
|
-
? 'install-script'
|
|
68
|
-
: 'manual';
|
|
69
|
-
foundInstalls.push({ path: location, method });
|
|
70
|
-
}
|
|
71
|
-
} catch {
|
|
72
|
-
// Ignore errors
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
if (foundInstalls.length === 0 && !isBrewManaged) {
|
|
78
|
-
return; // No legacy CLI found
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
// Block execution and show removal instructions
|
|
82
|
-
tui.newline();
|
|
83
|
-
tui.error('Legacy CLI Conflict Detected');
|
|
84
|
-
tui.newline();
|
|
85
|
-
|
|
86
|
-
console.log(' The legacy (Go-based) Agentuity CLI is installed and conflicts with the new');
|
|
87
|
-
console.log(' TypeScript-based CLI. Please remove it before continuing.');
|
|
88
|
-
tui.newline();
|
|
89
|
-
|
|
90
|
-
// Filter installs into brew-managed and manual
|
|
91
|
-
const brewInstalls = foundInstalls.filter(
|
|
92
|
-
(install) => isBrewManaged || install.method === 'homebrew'
|
|
93
|
-
);
|
|
94
|
-
const manualInstalls = foundInstalls.filter(
|
|
95
|
-
(install) => !isBrewManaged && install.method !== 'homebrew'
|
|
96
|
-
);
|
|
97
|
-
|
|
98
|
-
// Show Homebrew removal section if any brew-managed installs
|
|
99
|
-
if (brewInstalls.length > 0) {
|
|
100
|
-
console.log(' ' + tui.bold('Remove via Homebrew:'));
|
|
101
|
-
tui.bullet('brew uninstall agentuity');
|
|
102
|
-
tui.newline();
|
|
103
|
-
|
|
104
|
-
// Show which files will be removed by brew
|
|
105
|
-
console.log(' ' + tui.muted('This will remove:'));
|
|
106
|
-
for (const install of brewInstalls) {
|
|
107
|
-
console.log(` "${install.path}"`);
|
|
108
|
-
}
|
|
109
|
-
tui.newline();
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
// Show manual removal section if any manual installs
|
|
113
|
-
if (manualInstalls.length > 0) {
|
|
114
|
-
console.log(' ' + tui.bold('Remove the following legacy CLI installations:'));
|
|
115
|
-
tui.newline();
|
|
116
|
-
|
|
117
|
-
for (const install of manualInstalls) {
|
|
118
|
-
console.log(` ${tui.muted('"' + install.path + '"')}`);
|
|
119
|
-
|
|
120
|
-
if (install.method === 'install-script') {
|
|
121
|
-
tui.bullet(`rm "${install.path}"`);
|
|
122
|
-
} else {
|
|
123
|
-
tui.bullet(`sudo rm "${install.path}"`);
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
tui.newline();
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
console.log(' ' + tui.bold('After removal, install the new CLI:'));
|
|
130
|
-
tui.bullet('curl -sSL https://agentuity.sh | sh');
|
|
131
|
-
tui.newline();
|
|
132
|
-
|
|
133
|
-
console.log(` Learn more: ${tui.link('https://agentuity.dev/Reference/migration-guide')}`);
|
|
134
|
-
tui.newline();
|
|
135
|
-
|
|
136
|
-
process.exit(1);
|
|
137
|
-
}
|