Skip to content

The open alternative to Salesforce, designed for AI.

fix(cli): accept default role references without local definitions (#29318)

Weikobd60ebc306e6
diff --git a/packages/twenty-cli/src/app/manifest/__tests__/manifest-fixtures.spec.ts b/packages/twenty-cli/src/app/manifest/__tests__/manifest-fixtures.spec.ts
index b1ed7c6464d..76c19bc2cbe 100644
--- a/packages/twenty-cli/src/app/manifest/__tests__/manifest-fixtures.spec.ts
+++ b/packages/twenty-cli/src/app/manifest/__tests__/manifest-fixtures.spec.ts
@@ -28,6 +28,8 @@ import {
import { buildTestAppWorker } from '@/app/__tests__/utils/build-test-app-worker';
import { buildAndValidateManifest } from '@/app/manifest/build-and-validate-manifest';
import { buildManifest } from '@/app/manifest/manifest-build';
+import { buildPullEntities } from '@/app/pull/build-pull-entities';
+import { writeDefineFile } from '@/app/pull/write-define-file';
import { createAppProject } from '@/app/create-app-project';
import { runAppWorker } from '@/app/run-app-worker';
import { compileApplicationTranslations } from '@/app/translations/compile-application-translations';
@@ -242,6 +244,39 @@ describe('CLI manifest fixtures and worker transport', () => {
60000,
);
+ it('builds pulled definitions while preserving an external default role reference', async () => {
+ const appPath = await copyFixture('minimal-app');
+ const { manifest } = await buildManifest(appPath);
+
+ if (!manifest) throw new Error('Failed to build the minimal app fixture');
+
+ const { entities } = buildPullEntities({
+ manifest: { ...manifest, roles: [] },
+ });
+ const application = entities.find(
+ (entity) => entity.kind === 'application',
+ );
+
+ if (!application) throw new Error('Pull did not generate the application');
+
+ await writeFile(
+ join(appPath, 'application.config.ts'),
+ writeDefineFile(application).content,
+ );
+ await rm(join(appPath, 'my.role.ts'));
+
+ const result = await compareManifest(appPath);
+
+ expect(result.success).toBe(true);
+ if (result.success) {
+ expect(result.manifest.application.defaultRoleUniversalIdentifier).toBe(
+ manifest.application.defaultRoleUniversalIdentifier,
+ );
+ expect(result.manifest.roles).toEqual([]);
+ expect(result.filePaths.roles).toEqual([]);
+ }
+ }, 60000);
+
it('matches a freshly initialized app and its server requirement', async () => {
const appPath = join(root, 'fresh-app');
diff --git a/packages/twenty-cli/src/app/manifest/utils/__tests__/validate-agent-roles-within-application-role.spec.ts b/packages/twenty-cli/src/app/manifest/utils/__tests__/validate-agent-roles-within-application-role.spec.ts
index e8ff36fd0e0..84eca250811 100644
--- a/packages/twenty-cli/src/app/manifest/utils/__tests__/validate-agent-roles-within-application-role.spec.ts
+++ b/packages/twenty-cli/src/app/manifest/utils/__tests__/validate-agent-roles-within-application-role.spec.ts
@@ -221,7 +221,24 @@ describe('validateAgentRolesWithinApplicationRole', () => {
]);
});
- it('reports a missing application role and still checks agent role references', () => {
+ it('accepts an external application role without a local definition', () => {
+ const errors = validateAgentRolesWithinApplicationRole({
+ agents: [
+ buildAgent({ roleUniversalIdentifier: undefined }),
+ buildAgent({
+ roleUniversalIdentifier: APPLICATION_ROLE_UNIVERSAL_IDENTIFIER,
+ }),
+ ],
+ roles: [],
+ objects: [],
+ permissionFlags: [],
+ defaultRoleUniversalIdentifier: APPLICATION_ROLE_UNIVERSAL_IDENTIFIER,
+ });
+
+ expect(errors).toEqual([]);
+ });
+
+ it('still checks agent role references with an external application role', () => {
const errors = validateAgentRolesWithinApplicationRole({
agents: [
buildAgent(),
@@ -237,7 +254,6 @@ describe('validateAgentRolesWithinApplicationRole', () => {
});
expect(errors).toEqual([
- 'Application default role "application-role" is not defined by this application.',
'Agent "lost-assistant" references role "missing-role", which is not defined by this application.',
]);
});
diff --git a/packages/twenty-cli/src/app/manifest/utils/validate-agent-roles-within-application-role.ts b/packages/twenty-cli/src/app/manifest/utils/validate-agent-roles-within-application-role.ts
index 7b872850062..d91a5da08ab 100644
--- a/packages/twenty-cli/src/app/manifest/utils/validate-agent-roles-within-application-role.ts
+++ b/packages/twenty-cli/src/app/manifest/utils/validate-agent-roles-within-application-role.ts
@@ -132,19 +132,6 @@ const groupAgentNamesByRoleUniversalIdentifier = ({
return agentNamesByRoleUniversalIdentifier;
};
-const validateApplicationDefaultRoleIsDefined = ({
- applicationRole,
- defaultRoleUniversalIdentifier,
-}: {
- applicationRole: RoleManifest | undefined;
- defaultRoleUniversalIdentifier: string;
-}): string[] =>
- isDefined(applicationRole)
- ? []
- : [
- `Application default role "${defaultRoleUniversalIdentifier}" is not defined by this application.`,
- ];
-
const validateAgentRolesAreDefined = ({
agentNamesByRoleUniversalIdentifier,
roles,
@@ -246,10 +233,6 @@ export const validateAgentRolesWithinApplicationRole = ({
});
return [
- ...validateApplicationDefaultRoleIsDefined({
- applicationRole,
- defaultRoleUniversalIdentifier,
- }),
...validateAgentRolesAreDefined({
agentNamesByRoleUniversalIdentifier,
roles,